diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-01-30 10:26:33 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-01-30 10:26:33 +0000 |
| commit | ce286ecc2626c736b2776a6983fd1f3811e231ae (patch) | |
| tree | 22c15306a8af96cbe40e9b7181b868adf75a8a8e | |
| parent | 0b7ee8e3e58895d4c2853e2b3fa1860e1c80277f (diff) | |
| download | toolchains-ce286ecc2626c736b2776a6983fd1f3811e231ae.tar.gz toolchains-ce286ecc2626c736b2776a6983fd1f3811e231ae.tar.bz2 | |
Initial threaded resolver patch from kas1e
| -rw-r--r-- | sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p new file mode 100644 index 0000000..c663716 --- /dev/null +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p @@ -0,0 +1,61 @@ +--- curl_orig/lib/hostip4.c 2013-10-23 21:55:34.000000000 +0100 ++++ curl/lib/hostip4.c 2014-01-30 10:19:46.900018967 +0000 +@@ -122,6 +122,11 @@ Curl_addrinfo *Curl_getaddrinfo(struct c + * implying that only threadsafe code and function calls may be used. + * + */ ++#ifdef __amigaos4__ ++#include <proto/exec.h> ++#include <proto/bsdsocket.h> ++#endif ++ + Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, + int port) + { +@@ -132,6 +137,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const + struct hostent *h = NULL; + struct in_addr in; + struct hostent *buf = NULL; ++#ifdef __amigaos4__ ++ struct SocketIFace *ISocket = NULL; ++#endif + + if(Curl_inet_pton(AF_INET, hostname, &in) > 0) + /* This is a dotted IP address 123.123.123.123-style */ +@@ -294,7 +302,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const + * gethostbyname() is the preferred one. + */ + else { ++#ifdef __amigaos4__ ++ struct Library *SocketBase = IExec->OpenLibrary("bsdsocket.library", 4); ++ if (SocketBase) ++ { ++ ISocket = (struct SocketIFace *)IExec->GetInterface(SocketBase, "main", 1, NULL); ++ } ++ ++ if (ISocket) ++ { ++ h = ISocket->gethostbyname((void*)hostname); ++ } ++#else + h = gethostbyname((void*)hostname); ++#endif + #endif /* HAVE_GETADDRINFO_THREADSAFE || HAVE_GETHOSTBYNAME_R */ + } + +@@ -304,7 +325,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const + if(buf) /* used a *_r() function */ + free(buf); + } +- ++#ifdef __amigaos4__ ++ if (ISocket) ++ { ++ struct Library *SocketBase = ISocket->Data.LibBase; ++ IExec->DropInterface((struct Interface *)ISocket); ++ IExec->CloseLibrary(SocketBase); ++ } ++#endif + return ai; + } + #endif /* defined(CURLRES_IPV4) && !defined(CURLRES_ARES) */ |