Integrate ipv6 patch from brendan at kublai.com should close #5

w8tvi · Jul 17, 2005 · af1715f · af1715f
1 parent 0383bd7
commit af1715f
Show file tree

Hide file tree

Showing 18 changed files with 337 additions and 204 deletions.
diff --git a/.cvsignore b/.cvsignore
@@ -1,15 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.cache
-config.h
-config.h.in
-config.log
-config.status
-configure
-depcomp
-install-sh
-missing
-mkinstalldirs
-stamp-h1

diff --git a/AUTHORS b/AUTHORS
@@ -12,6 +12,7 @@ Gabor Nyeki  - 005 initial support (IRCNET Bounce)
 van Heusden  - binding to local port
 Ryan Tolboom - DCC Resume in capture mode.
 Stephen Cope - Original Documentation
+brendan at kublai.com - IPV6 Support
 Tilman Sauerbeck - Patch
 acklen, W8TVI and the folks on #dircproxy - User support
 

diff --git a/conf/.cvsignore b/conf/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

diff --git a/configure.ac b/configure.ac
@@ -53,6 +53,8 @@ AC_CHECK_FUNCS([alarm dup2 gethostbyaddr inet_ntoa memmove memset mkdir rmdir \
 		realloc select seteuid strcasecmp strchr strcspn strerror \
 		strncasecmp strrchr strspn strstr strtoul])
 
+DIP_NET
+
 # Check whether to debug things
 AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [turn on debugging (default is NO)]),
 	      [	if test "x${enable_debug}" = "xyes"; then

diff --git a/contrib/.cvsignore b/contrib/.cvsignore
@@ -1,4 +0,0 @@
-.deps
-Makefile
-Makefile.in
-dircproxy-crypt

diff --git a/crypt/.cvsignore b/crypt/.cvsignore
@@ -1,4 +0,0 @@
-.deps
-Makefile
-Makefile.in
-dircproxy-crypt

diff --git a/doc/.cvsignore b/doc/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

diff --git a/getopt/.cvsignore b/getopt/.cvsignore
@@ -1,4 +0,0 @@
-.deps
-Makefile
-Makefile.in
-libgetopt.a

diff --git a/src/.cvsignore b/src/.cvsignore
@@ -1,4 +0,0 @@
-.deps
-Makefile
-Makefile.in
-dircproxy

diff --git a/src/dcc_net.c b/src/dcc_net.c
@@ -125,7 +125,7 @@ static int _dccnet_listen(struct dccproxy *p, int *range, size_t range_sz,
                           int *port) {
   int theport;
 
-  p->sendee_sock = net_socket();
+  p->sendee_sock = net_socket(AF_INET);
   if (p->sendee_sock == -1)
     return -1;
 
@@ -162,7 +162,7 @@ static int _dccnet_connect(struct dccproxy *p, struct in_addr addr, int port,
   debug("Connecting to DCC Sender %s:%d", inet_ntoa(p->sender_addr.sin_addr),
         ntohs(p->sender_addr.sin_port));
 
-  p->sender_sock = net_socket();
+  p->sender_sock = net_socket(AF_INET);
   if (p->sender_sock == -1)
     return -1;