$Id: changes_patch

Changes I applied to Debian packaged GNUnet for local use.

--- debian/rules       Mon Apr 18 17:27:55 2005
+++ debian/rules  Mon Apr 18 17:30:00 2005
@@ -39,14 +39,14 @@
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--disable-ipv6 \
+		--enable-ipv6 \
 		--with-gcrypt=/usr \
-		--without-crypto \
+		--with-crypto=/usr \
 		--with-gtk=/usr \
 		--with-gdbm=/usr \
 		--with-tdb=/usr \
 		--with-bdb=/usr \
-		--without-mysql \
+		--with-mysql=/usr \
 		--with-libextractor=/usr \
 		--enable-guile \
 		--with-pic
--- src/include/gnunet_util.h	Thu Nov  4 18:36:56 2004
+++ src/include/gnunet_util.h	Sun Dec 19 17:48:03 2004
@@ -1053,8 +1053,8 @@
  * @param ip the IP to check (in network byte order)
  * @return NO if the IP is not in the list, YES if it it is
  */
-int checkIP6Listed(const CIDR6Network * list,
-		   const IP6addr * ip);
+// int checkIP6Listed(const CIDR6Network * list,
+// 		   const IP6addr * ip);
 
 /**
  * Parse a network specification. The argument specifies
@@ -1067,7 +1067,7 @@
  * @param routeList a string specifying the forbidden networks
  * @return the converted list, NULL if the synatx is flawed
  */
-CIDR6Network * parseRoutes6(const char * routeList);
+// CIDR6Network * parseRoutes6(const char * routeList);
 
 
 
--- src/transports/udp6.c	Mon Oct 11 09:21:53 2004
+++ src/transports/udp6.c	Sun Dec 19 18:57:20 2004
@@ -201,9 +201,7 @@
   EncName enc;
   MessagePack * mp;
   UDP6Message udp6m;
-#if DEBUG_UDP6
-  char * tmp;
-#endif
+  char inet6[INET6_ADDRSTRLEN];
 
   SEMAPHORE_UP(serverSignal);
   while (udp6_shutdown == NO) {
@@ -242,15 +240,13 @@
     statChange(stat_octets_total_udp6_in,
 	       size);
     if ((unsigned int)size <= sizeof(UDP6Message)) {
-      char * tmp = MALLOC(INET6_ADDRSTRLEN);
       LOG(LOG_INFO,
 	  _("Received invalid UDP6 message from %s:%d, dropping.\n"),
 	  inet_ntop(AF_INET6,
 		    &incoming,
-		    tmp,
+		    &inet6,
 		    INET6_ADDRSTRLEN), 
 	  ntohs(incoming.sin6_port));
-      FREE(tmp);
       goto RETRY;
     }
     memcpy(&udp6m,
@@ -261,17 +257,15 @@
 	  hash2enc(&udp6m.sender.hashPubKey,
 		   &enc));
 #if DEBUG_UDP6
-    tmp = MALLOC(INET6_ADDRSTRLEN);
     LOG(LOG_DEBUG,
 	"Received %d bytes via UDP6 from %s:%d (%s).\n",
 	size,
 	inet_ntop(AF_INET6,
 		  &incoming,
-		  tmp,
+		  &inet6,
 		  INET6_ADDRSTRLEN), 
 	ntohs(incoming.sin6_port),
 	&enc);
-    FREE(tmp);
 #endif
     /* quick test of the packet, if failed, repeat! */
     if (size != ntohs(udp6m.size)) {
@@ -279,21 +273,19 @@
 	  _("Packed received from %s:%d (UDP6) failed format check."),
 	  inet_ntop(AF_INET6,
 		    &incoming,
-		    tmp,
+		    &inet6,
 		    INET6_ADDRSTRLEN), 
 	  ntohs(incoming.sin6_port));
       goto RETRY;
     }
     GNUNET_ASSERT(sizeof(struct in6_addr) == sizeof(IP6addr));
     if (YES == isBlacklisted((IP6addr*)&incoming.sin6_addr)) {
-      char * tmp = MALLOC(INET6_ADDRSTRLEN);
       LOG(LOG_WARNING,
 	  _("Sender %s is blacklisted, dropping message.\n"),
 	  inet_ntop(AF_INET6,
 		    &incoming,
-		    tmp,
+		    &inet6,
 		    INET6_ADDRSTRLEN));
-      FREE(tmp);
       goto RETRY; /* drop on the floor */
     }
     /* message ok, fill in mp and pass to core */
@@ -673,7 +665,7 @@
 
   udp6API.protocolNumber       = UDP6_PROTOCOL_NUMBER;
   udp6API.mtu                  = mtu - sizeof(UDP6Message);
-  udp6API.cost                 = 19950;
+  udp6API.cost                 = 50;
   udp6API.verifyHelo           = &verifyHelo;
   udp6API.createHELO           = &createHELO;
   udp6API.connect              = &udp6Connect;
--- src/transports/tcp6.c	Mon Oct 11 09:22:05 2004
+++ src/transports/tcp6.c	Sun Dec 19 19:32:30 2004
@@ -1386,7 +1386,7 @@
  
   tcp6API.protocolNumber       = TCP6_PROTOCOL_NUMBER;
   tcp6API.mtu                  = mtu - sizeof(TCP6MessagePack);
-  tcp6API.cost                 = 19950; /* about equal to udp6 */
+  tcp6API.cost                 = 50; /* about equal to udp6 */
   tcp6API.verifyHelo           = &verifyHelo;
   tcp6API.createHELO           = &createHELO;
   tcp6API.connect              = &tcp6Connect;
--- src/transports/tcp6.c       Sun Mar  6 02:52:29 2005
+++ src/transports/tcp6.c	Sun Mar  6 03:05:25 2005
@@ -828,7 +828,7 @@
   if (tcp6Session->wpos > 0) {
     ret = 0;
   } else {
-    sucess = SEND_NONBLOCKING(tcp6Session->sock,
+    success = SEND_NONBLOCKING(tcp6Session->sock,
                               mp,
                               ssize,
                               &ret);