[GNUnet-SVN] r15140 - gnunet/src/vpn

[gnunet]

Author: toelke
Date: 2011-05-04 09:30:05 +0200 (Wed, 04 May 2011)
New Revision: 15140

Modified:
   gnunet/src/vpn/gnunet-daemon-exit.c
   gnunet/src/vpn/gnunet-daemon-vpn.c
Log:
fix compile-errors

Modified: gnunet/src/vpn/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-exit.c 2011-05-03 21:23:20 UTC (rev 15139)
+++ gnunet/src/vpn/gnunet-daemon-exit.c 2011-05-04 07:30:05 UTC (rev 15140)
@@ -814,7 +814,6 @@
                      const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received TCP-Packet\n");
-  GNUNET_HashCode hash;
   GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
   struct tcp_pkt *pkt = (struct tcp_pkt *) (desc + 1);
   unsigned int pkt_len = ntohs (message->size) - sizeof (struct
@@ -917,7 +916,6 @@
                      const struct GNUNET_MessageHeader *message,
                      const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
-  GNUNET_HashCode hash;
   GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
   struct udp_pkt *pkt = (struct udp_pkt *) (desc + 1);
 

Modified: gnunet/src/vpn/gnunet-daemon-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.c  2011-05-03 21:23:20 UTC (rev 15139)
+++ gnunet/src/vpn/gnunet-daemon-vpn.c  2011-05-04 07:30:05 UTC (rev 15140)
@@ -236,6 +236,12 @@
 }
 /*}}}*/
 
+char
+max (char a, char b)
+{
+  return a > b ? a : b;
+}
+
 /**
  * Create a new Address from an answer-packet
  */
@@ -396,7 +402,7 @@
        memset(&key, 0, sizeof(GNUNET_HashCode));
 
        unsigned char* c = ((unsigned char*)pkt)+ntohs(pkt->addroffset);
-        new_ip6addr_remote(c, &pkt->addr, pkt->addrsize);
+        new_ip6addr_remote(c, pkt->addr, pkt->addrsize);
        unsigned char* k = (unsigned char*)&key;
        /*
         * Copy the newly generated ip-address to the key backwards (as only 
the first part is used in the hash-table)