@@ -1,3 +1,7 @@

+Sun Aug 21 01:06:54 CEST 2005 (tk)

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

+  * clamd: use reentrant version of gethostbyname when available

+

 Sun Aug 21 00:32:10 CEST 2005 (tk)

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

   * shared/network.[ch]: new files (include r_gethostbyname by NJH)

@@ -30,6 +30,8 @@ clamd_SOURCES = \

     $(top_srcdir)/shared/memory.h \

     $(top_srcdir)/shared/misc.c \

     $(top_srcdir)/shared/misc.h \

+    $(top_srcdir)/shared/network.c \

+    $(top_srcdir)/shared/network.h \

     options.c \

     options.h \

     clamd.c \

@@ -75,7 +75,8 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 	$(top_srcdir)/shared/cfgparser.h $(top_srcdir)/shared/getopt.c \

 	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/memory.c \

 	$(top_srcdir)/shared/memory.h $(top_srcdir)/shared/misc.c \

-	$(top_srcdir)/shared/misc.h options.c options.h clamd.c \

+	$(top_srcdir)/shared/misc.h $(top_srcdir)/shared/network.c \

+	$(top_srcdir)/shared/network.h options.c options.h clamd.c \

 	tcpserver.c tcpserver.h localserver.c localserver.h session.c \

 	session.h thrmgr.c thrmgr.h server-th.c server.h scanner.c \

 	scanner.h others.c others.h clamuko.c clamuko.h \

@@ -84,11 +85,12 @@ am__clamd_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 @BUILD_CLAMD_TRUE@am_clamd_OBJECTS = output.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	cfgparser.$(OBJEXT) getopt.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	memory.$(OBJEXT) misc.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	options.$(OBJEXT) clamd.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	tcpserver.$(OBJEXT) localserver.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	session.$(OBJEXT) thrmgr.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	server-th.$(OBJEXT) scanner.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	others.$(OBJEXT) clamuko.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	network.$(OBJEXT) options.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	clamd.$(OBJEXT) tcpserver.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	localserver.$(OBJEXT) session.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	thrmgr.$(OBJEXT) server-th.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	scanner.$(OBJEXT) others.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	clamuko.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	dazukoio_compat12.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	dazukoio.$(OBJEXT)

 clamd_OBJECTS = $(am_clamd_OBJECTS)

@@ -228,6 +230,8 @@ target_vendor = @target_vendor@

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/memory.h \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.c \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/misc.h \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/network.c \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/network.h \

 @BUILD_CLAMD_TRUE@    options.c \

 @BUILD_CLAMD_TRUE@    options.h \

 @BUILD_CLAMD_TRUE@    clamd.c \

@@ -336,6 +340,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localserver.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memory.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/others.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/output.Po@am__quote@

@@ -436,6 +441,20 @@ misc.obj: $(top_srcdir)/shared/misc.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o misc.obj `if test -f '$(top_srcdir)/shared/misc.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/misc.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/misc.c'; fi`

+network.o: $(top_srcdir)/shared/network.c

+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT network.o -MD -MP -MF "$(DEPDIR)/network.Tpo" -c -o network.o `test -f '$(top_srcdir)/shared/network.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/network.c; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/network.Tpo" "$(DEPDIR)/network.Po"; else rm -f "$(DEPDIR)/network.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/network.c' object='network.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o network.o `test -f '$(top_srcdir)/shared/network.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/network.c

+

+network.obj: $(top_srcdir)/shared/network.c

+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT network.obj -MD -MP -MF "$(DEPDIR)/network.Tpo" -c -o network.obj `if test -f '$(top_srcdir)/shared/network.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/network.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/network.c'; fi`; \

+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/network.Tpo" "$(DEPDIR)/network.Po"; else rm -f "$(DEPDIR)/network.Tpo"; exit 1; fi

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/network.c' object='network.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o network.obj `if test -f '$(top_srcdir)/shared/network.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/network.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/network.c'; fi`

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -24,6 +24,7 @@

 #include <stdlib.h>

 #include <string.h>

 #include <unistd.h>

+#include <errno.h>

 #include <sys/stat.h>

 #include <sys/types.h>

 #include <sys/time.h>

@@ -48,6 +49,7 @@

 #include "memory.h"

 #include "shared.h"

 #include "output.h"

+#include "network.h"

 #include "../libclamav/others.h"

@@ -66,8 +68,6 @@ dev_t procdev; /* /proc device */

 # endif

 #endif

-pthread_mutex_t gh_mutex = PTHREAD_MUTEX_INITIALIZER;

-

 int checksymlink(const char *path)

 {

 	struct stat statbuf;

@@ -299,7 +299,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	const char *virname;

 	char buff[FILEBUFF];

 	struct sockaddr_in server;

-	struct hostent *he;

+	struct hostent he;

 	struct cfgstruct *cpt;

 	char *tmpname;

@@ -331,15 +331,12 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	server.sin_port = htons(port);

 	if((cpt = cfgopt(copt, "TCPAddr"))->enabled) {

-	    pthread_mutex_lock(&gh_mutex);

-	    if((he = gethostbyname(cpt->strarg)) == 0) {

-		logg("!gethostbyname(%s) error: %s\n", cpt->strarg);

-		mdprintf(odesc, "gethostbyname(%s) ERROR\n", cpt->strarg);

-		pthread_mutex_unlock(&gh_mutex);

+	    if(r_gethostbyname(cpt->strarg, &he, buff, sizeof(buff)) == -1) {

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

+		mdprintf(odesc, "r_gethostbyname(%s) ERROR\n", cpt->strarg);

 		return -1;

 	    }

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

-	    pthread_mutex_unlock(&gh_mutex);

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

 	} else

 	    server.sin_addr.s_addr = INADDR_ANY;

@@ -42,8 +42,8 @@ int tcpserver(const struct cfgstruct *copt, struct cl_node *root)

 	int sockfd, backlog;

 	struct cfgstruct *cpt;

 	struct cfgstruct *taddr;

-	struct hostent *he;

-	char *estr;

+	struct hostent he;

+	char *estr, buf[1024];

 	int true = 1;

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

@@ -51,11 +51,11 @@ int tcpserver(const struct cfgstruct *copt, struct cl_node *root)

     server.sin_port = htons(cfgopt(copt, "TCPSocket")->numarg);

     if((taddr = cfgopt(copt, "TCPAddr"))->enabled) {

-	if ((he = gethostbyname(taddr->strarg)) == 0) {

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

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

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

 	    exit(1);

 	}

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

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

     } else

 	server.sin_addr.s_addr = INADDR_ANY;

@@ -85,4 +85,5 @@ int r_gethostbyname(const char *hostname, struct hostent *hp, char *buf, size_t

 #endif

 	return 0;

+#endif

 }