X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=socket.c;h=1655bf3cdb31c42c4539eebd6963bbf5327a4121;hb=644edf8bdd22284c96b471a9857dfd8dd8d6d087;hp=4088e74f968e63b3caf0170ef0688b6087432504;hpb=1a794b3b00bd4b2f720f3426a386d5c86cc65ea8;p=~andy%2Ffetchmail diff --git a/socket.c b/socket.c index 4088e74f..1655bf3c 100644 --- a/socket.c +++ b/socket.c @@ -10,68 +10,36 @@ #include #include #include /* isspace() */ -#ifdef HAVE_MEMORY_H -#include -#endif /* HAVE_MEMORY_H */ #include #include -#ifndef HAVE_NET_SOCKET_H #include -#else -#include -#endif #include #include -#ifdef HAVE_ARPA_INET_H #include -#endif #include -#if defined(STDC_HEADERS) #include -#endif -#if defined(HAVE_UNISTD_H) #include -#endif -#if defined(HAVE_STDARG_H) #include -#else -#include -#endif -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif +#include +#include #include "socket.h" #include "fetchmail.h" #include "getaddrinfo.h" -#include "i18n.h" +#include "gettext.h" #include "sdump.h" -/* Defines to allow BeOS and Cygwin to play nice... */ -#ifdef __BEOS__ -static char peeked; -#define fm_close(a) closesocket(a) -#define fm_write(a,b,c) send(a,b,c,0) -#define fm_peek(a,b,c) recv(a,b,c,0) -#define fm_read(a,b,c) recv(a,b,c,0) -#else -#define fm_close(a) close(a) +/* Defines to allow Cygwin to play nice... */ +#define fm_close(a) close(a) #define fm_write(a,b,c) write(a,b,c) #define fm_peek(a,b,c) recv(a,b,c, MSG_PEEK) + #ifdef __CYGWIN__ #define fm_read(a,b,c) cygwin_read(a,b,c) static ssize_t cygwin_read(int sock, void *buf, size_t count); #else /* ! __CYGWIN__ */ #define fm_read(a,b,c) read(a,b,c) #endif /* __CYGWIN__ */ -#endif /* We need to define h_errno only if it is not already */ #ifndef h_errno @@ -80,7 +48,6 @@ extern int h_errno; # endif #endif /* ndef h_errno */ -#ifdef HAVE_SOCKETPAIR static char *const *parse_plugin(const char *plugin, const char *host, const char *service) { char **argvec; @@ -134,6 +101,7 @@ static char *const *parse_plugin(const char *plugin, const char *host, const cha if (!argvec) { report(stderr, GT_("fetchmail: malloc failed\n")); + free(plugin_copy); return NULL; } memset(argvec, 0, s); @@ -168,10 +136,6 @@ static int handle_plugin(const char *host, report(stderr, GT_("fetchmail: socketpair failed\n")); return -1; } - - if (SockTimeout(fds[0], mytimeout)) return -1; - if (SockTimeout(fds[1], mytimeout)) return -1; - switch (fork()) { case -1: /* error */ @@ -202,33 +166,6 @@ static int handle_plugin(const char *host, (void) close(fds[0]); return fds[1]; } -#endif /* HAVE_SOCKETPAIR */ - -static int setsocktimeout(int sock, int which, int timeout) { - struct timeval tv; - int rc; - - tv.tv_sec = timeout; - tv.tv_usec = 0; - rc = setsockopt(sock, SOL_SOCKET, which, &tv, sizeof(tv)); - if (rc) { - report(stderr, GT_("setsockopt(%d, SOL_SOCKET) failed: %s"), sock, strerror(errno)); - } - return rc; -} - -/** Configure socket options such as send/receive timeout at the socket - * level, to avoid network-induced stalls. \return 0 for success, 1 for - * error. - */ -int SockTimeout(int sock, int timeout) -{ - int err = 0; - - if (setsocktimeout(sock, SO_RCVTIMEO, timeout)) err = 1; - if (setsocktimeout(sock, SO_SNDTIMEO, timeout)) err = 1; - return err; -} /** Set socket to SO_KEEPALIVE. \return 0 for success. */ int SockKeepalive(int sock) { @@ -251,14 +188,12 @@ int UnixOpen(const char *path) return -1; } - SockTimeout(sock, mytimeout); + /* Socket opened saved. Useful if connect timeout + * because it can be closed. + */ + mailserver_socket_temp = sock; - /* Socket opened saved. Usefull if connect timeout - * because it can be closed. - */ - mailserver_socket_temp = sock; - - if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) < 0) + if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) < 0) { int olderr = errno; fm_close(sock); /* don't use SockClose, no traffic yet */ @@ -266,9 +201,9 @@ int UnixOpen(const char *path) errno = olderr; sock = -1; } - - /* No connect timeout, then no need to set mailserver_socket_temp */ - mailserver_socket_temp = -1; + + /* No connect timeout, then no need to set mailserver_socket_temp */ + mailserver_socket_temp = -1; return sock; } @@ -281,10 +216,8 @@ int SockOpen(const char *host, const char *service, int ord; char errbuf[8192] = ""; -#ifdef HAVE_SOCKETPAIR if (plugin) return handle_plugin(host,service,plugin); -#endif /* HAVE_SOCKETPAIR */ memset(&req, 0, sizeof(struct addrinfo)); req.ai_socktype = SOCK_STREAM; @@ -332,7 +265,6 @@ int SockOpen(const char *host, const char *service, continue; } - SockTimeout(i, mytimeout); SockKeepalive(i); /* Save socket descriptor. @@ -376,31 +308,19 @@ int SockOpen(const char *host, const char *service, return i; } -#if defined(HAVE_STDARG_H) int SockPrintf(int sock, const char* format, ...) { -#else -int SockPrintf(sock,format,va_alist) -int sock; -char *format; -va_dcl { -#endif - va_list ap; char buf[8192]; -#if defined(HAVE_STDARG_H) va_start(ap, format) ; -#else - va_start(ap); -#endif vsnprintf(buf, sizeof(buf), format, ap); va_end(ap); return SockWrite(sock, buf, strlen(buf)); - } #ifdef SSL_ENABLE +#define OPENSSL_NO_SSL_INTERN 1 #include #include #include @@ -447,14 +367,6 @@ int SockRead(int sock, char *buf, int len) if (--len < 1) return(-1); -#ifdef __BEOS__ - if (peeked != 0){ - (*bp) = peeked; - bp++; - len--; - peeked = 0; - } -#endif do { /* * The reason for these gymnastics is that we want two things: @@ -517,18 +429,12 @@ int SockRead(int sock, char *buf, int len) #endif /* SSL_ENABLE */ { -#ifdef __BEOS__ - if ((n = fm_read(sock, bp, 1)) <= 0) -#else if ((n = fm_peek(sock, bp, len)) <= 0) -#endif return (-1); if ((newline = (char *)memchr(bp, '\n', n)) != NULL) n = newline - bp + 1; -#ifndef __BEOS__ if ((n = fm_read(sock, bp, n)) == -1) return(-1); -#endif /* __BEOS__ */ } bp += n; len -= n; @@ -583,9 +489,6 @@ int SockPeek(int sock) if (n == -1) return -1; -#ifdef __BEOS__ - peeked = ch; -#endif return(ch); } @@ -634,7 +537,7 @@ static int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict ) if (outlevel >= O_VERBOSE) { if (depth == 0 && SSLverbose) - report(stderr, GT_("Server certificate:\n")); + report(stdout, GT_("Server certificate:\n")); else { if (_firstrun) { _firstrun = 0; @@ -905,14 +808,21 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck /* Make sure a connection referring to an older context is not left */ _ssl_context[sock] = NULL; if(myproto) { - if(!strcasecmp("ssl3",myproto)) { + if(!strcasecmp("ssl2",myproto)) { +#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 + _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); +#else + report(stderr, GT_("Your operating system does not support SSLv2.\n")); + return -1; +#endif + } else if(!strcasecmp("ssl3",myproto)) { _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); } else if(!strcasecmp("tls1",myproto)) { _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); } else if (!strcasecmp("ssl23",myproto)) { myproto = NULL; } else { - fprintf(stderr,GT_("Invalid SSL protocol '%s' specified, using default (SSL23).\n"), myproto); + fprintf(stderr,GT_("Invalid SSL protocol '%s' specified, using default (SSLv23).\n"), myproto); myproto = NULL; } } @@ -924,7 +834,7 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck return(-1); } - SSL_CTX_set_options(_ctx[sock], SSL_OP_ALL | SSL_OP_NO_SSLv2); + SSL_CTX_set_options(_ctx[sock], (SSL_OP_ALL | SSL_OP_NO_SSLv2) & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); if (certck) { SSL_CTX_set_verify(_ctx[sock], SSL_VERIFY_PEER, SSL_ck_verify_callback);