Commit c41fc47512ed78697122de7a2b628676e3e08726
2012-06-07T21:26:39
horrid gethostbyname compatibility
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/src/netops.c b/src/netops.c
index e6f3e56..fdbd965 100644
--- a/src/netops.c
+++ b/src/netops.c
@@ -376,11 +376,17 @@ static int ssl_setup(git_transport *t, const char *host)
int gitno_connect(git_transport *t, const char *host, const char *port)
{
+#ifndef __amigaos4__
struct addrinfo *info = NULL, *p;
struct addrinfo hints;
+#else
+ int p;
+ struct hostent *hent;
+ struct sockaddr_in saddr;
+#endif
int ret;
GIT_SOCKET s = INVALID_SOCKET;
-
+#ifndef __amigaos4__
memset(&hints, 0x0, sizeof(struct addrinfo));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
@@ -389,15 +395,29 @@ int gitno_connect(git_transport *t, const char *host, const char *port)
giterr_set(GITERR_NET, "Failed to resolve address for %s: %s", host, gai_strerror(ret));
return -1;
}
+#else
+ hent = gethostbyname(host);
+#endif
+#ifndef __amigaos4__
for (p = info; p != NULL; p = p->ai_next) {
s = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
+#else
+ for (p = 0; hent->h_addr_list[p] != NULL; p++) {
+ s = socket(hent->h_addrtype, SOCK_STREAM, 0);
+#endif
if (s == INVALID_SOCKET) {
net_set_error("error creating socket");
break;
}
-
+#ifndef __amigaos4__
if (connect(s, p->ai_addr, (socklen_t)p->ai_addrlen) == 0)
+#else
+ saddr.sin_addr.s_addr = *hent->h_addr_list[p];
+ saddr.sin_family = hent->h_addrtype;
+ saddr.sin_port = port;
+ if (connect(s, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in)) == 0)
+#endif
break;
/* If we can't connect, try the next one */
@@ -406,14 +426,20 @@ int gitno_connect(git_transport *t, const char *host, const char *port)
}
/* Oops, we couldn't connect to any address */
- if (s == INVALID_SOCKET && p == NULL) {
+ if (s == INVALID_SOCKET &&
+#ifndef __amigaos4__
+ p == NULL) {
+#else
+ hent->h_addr_list[p] == NULL) {
+#endif
giterr_set(GITERR_OS, "Failed to connect to %s", host);
return -1;
}
t->socket = s;
+#ifndef __amigaos4__
freeaddrinfo(info);
-
+#endif
if (t->encrypt && ssl_setup(t, host) < 0)
return -1;