@@ -1,3 +1,8 @@

+Thu Feb 12 23:07:51 EET 2009 (edwin)

+------------------------------------

+ * clamd/clamd.c, clamd/tcpserver.c, clamdscan/client.c,

+ shared/misc.c, shared/misc.h: move TCP socket creation to shared/

+

 Thu Feb 12 22:33:30 EET 2009 (edwin)

 ------------------------------------

  * clamd/clamd.c, clamd/server-th.c: Unify error paths.  Remove unix

@@ -477,15 +477,16 @@ int main(int argc, char **argv)

     logg("*Closing the main socket%s.\n", (nlsockets > 1) ? "s" : "");

     for (i = 0; i < nlsockets; i++) {

-	closesocket(socketds[i]);

+	closesocket(lsockets[i]);

     }

 #ifndef C_OS2

-    if(localsock && nlsockets) {

+    if(nlsockets && localsock) {

+	opt = optget(opts, "LocalSocket");

 	if(unlink(opt->strarg) == -1)

 	    logg("!Can't unlink the socket file %s\n", opt->strarg);

 	else

-	     logg("Socket file removed.\n");

+	    logg("Socket file removed.\n");

     }

 #endif

@@ -56,26 +56,15 @@

 int tcpserver(const struct optstruct *opts)

 {

-	struct sockaddr_in server;

-	int sockfd, backlog;

-	const struct optstruct *taddr;

-	struct hostent he;

-	char *estr, buf[1024];

-	int true = 1;

-

-    memset((char *) &server, 0, sizeof(server));

-    server.sin_family = AF_INET;

-    server.sin_port = htons(optget(opts, "TCPSocket")->numarg);

-

-    if((taddr = optget(opts, "TCPAddr"))->enabled) {

-	if(r_gethostbyname(taddr->strarg, &he, buf, sizeof(buf)) == -1) {

-	    logg("!TCP: r_gethostbyname(%s) error: %s\n", taddr->strarg, strerror(errno));

-	    return -1;

-	}

-	server.sin_addr = *(struct in_addr *) he.h_addr_list[0];

-    } else

-	server.sin_addr.s_addr = INADDR_ANY;

+    struct sockaddr_in server;

+    int sockfd, backlog;

+    struct hostent he;

+    char *estr, buf[1024];

+    int true = 1;

+    if (cfg_tcpsock(opts, &server, INADDR_ANY) == -1) {

+	return -1;

+    }

     if((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {

 	estr = strerror(errno);

@@ -93,6 +82,7 @@ int tcpserver(const struct optstruct *opts)

 	closesocket(sockfd);

 	return -1;

     } else {

+	const struct optstruct *taddr = optget(opts, "TCPSocket");

 	if(taddr->enabled)

 	    logg("#TCP: Bound to address %s on port %u\n", taddr->strarg, optget(opts, "TCPSocket")->numarg);

 	else

@@ -103,23 +103,14 @@ static int isremote(const struct optstruct *opts) {

     }

     mainsa = (struct sockaddr *)&tcpsock;

     mainsasz = sizeof(tcpsock);

-    memset((void *)&tcpsock, 0, sizeof(tcpsock));

-    tcpsock.sin_family = AF_INET;

-    tcpsock.sin_port = htons(opt->numarg);

-    if(!(opt = optget(clamdopts, "TCPAddr"))->enabled) {

-	tcpsock.sin_addr.s_addr = htonl(INADDR_LOOPBACK);

+

+    if (cfg_tcpsock(clamdopts, &tcpsock, INADDR_LOOPBACK) == -1) {

+	logg("!Can't lookup clamd hostname: %s.\n", strerror(errno));

 	optfree(clamdopts);

-	return 0;

-    }

-    he = gethostbyname(opt->strarg);

-    optfree(clamdopts);

-    if(!he) {

-	perror("gethostbyname()");

-	logg("!Can't lookup clamd hostname.\n");

 	mainsa = NULL;

 	return 0;

     }

-    tcpsock.sin_addr = *(struct in_addr *) he->h_addr_list[0];

+    optfree(clamdopts);

     memcpy((void *)&testsock, (void *)&tcpsock, sizeof(testsock));

     testsock.sin_port = htons(INADDR_ANY);

     if(!(s = socket(testsock.sin_family, SOCK_STREAM, 0))) return 0;

@@ -267,3 +267,25 @@ int match_regex(const char *filename, const char *pattern)

 	return match;

 }

 #endif

+

+int cfg_tcpsock(const struct optstruct *opts, struct sockaddr_in *tcpsock, in_addr_t defaultbind)

+{

+    struct hostent *he;

+    const struct optstruct *opt = optget(opts, "TCPSocket");

+

+    memset(tcpsock, 0, sizeof(*tcpsock));

+    tcpsock->sin_family = AF_INET;

+    tcpsock->sin_port = htons(opt->numarg);

+

+    if(!(opt = optget(opts, "TCPAddr"))->enabled) {

+	tcpsock->sin_addr.s_addr = htonl(defaultbind);

+	return 0;

+    }

+    he = gethostbyname(opt->strarg);

+    if(!he)

+	return -1;

+

+    tcpsock->sin_addr = *(struct in_addr *) he->h_addr_list[0];

+    return 0;

+}

+

@@ -18,7 +18,8 @@

 #ifndef __MISC_H

 #define __MISC_H

-

+#include <netdb.h>

+#include <netinet/in.h>

 /* Maximum filenames under various systems - njh */

 #ifndef	NAME_MAX	/* e.g. Linux */

 # ifdef	MAXNAMELEN	/* e.g. Solaris */

@@ -36,4 +37,5 @@ int filecopy(const char *src, const char *dest);

 int daemonize(void);

 const char *get_version(void);

 int match_regex(const char *filename, const char *pattern);

+int cfg_tcpsock(const struct optstruct *opts, struct sockaddr_in *server, in_addr_t defaultbind);

 #endif