From 088ba97a2471c97e90fe7153dff0ce119faab4ef Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 5 Dec 2011 11:42:10 +0100 Subject: FTP: call opensocket callback properly When the new socket is created for an active connection, it is now done using the open socket callback. Test case 596 was modified to run fine, although it hides the fact that the close callback is still called too many times, as it also gets called for closing sockets that were created with accept(). --- lib/connect.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'lib/connect.c') diff --git a/lib/connect.c b/lib/connect.c index 2eef242d4..445261754 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -1119,8 +1119,10 @@ int Curl_closesocket(struct connectdata *conn, /* * Create a socket based on info from 'conn' and 'ai'. * - * Fill in 'addr' and 'sockfd' accordingly if OK is returned. If the open - * socket callback is set, used that! + * 'addr' should be a pointer to the correct struct to get data back, or NULL. + * 'sockfd' must be a pointer to a socket descriptor. + * + * If the open socket callback is set, used that! * */ CURLcode Curl_socket(struct connectdata *conn, @@ -1129,9 +1131,11 @@ CURLcode Curl_socket(struct connectdata *conn, curl_socket_t *sockfd) { struct SessionHandle *data = conn->data; -#if defined(ENABLE_IPV6) && defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID) - struct sockaddr_in6 * const sa6 = (void *)&addr->sa_addr; -#endif + struct Curl_sockaddr_ex dummy; + + if(!addr) + /* if the caller doesn't want info back, use a local temp copy */ + addr = &dummy; /* * The Curl_sockaddr_ex structure is basically libcurl's external API @@ -1172,8 +1176,10 @@ CURLcode Curl_socket(struct connectdata *conn, return CURLE_FAILED_INIT; #if defined(ENABLE_IPV6) && defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID) - if(conn->scope && (addr->family == AF_INET6)) + if(conn->scope && (addr->family == AF_INET6)) { + struct sockaddr_in6 * const sa6 = (void *)&addr->sa_addr; sa6->sin6_scope_id = conn->scope; + } #endif return CURLE_OK; -- cgit v1.2.3