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

[gnunet]

Author: grothoff
Date: 2011-10-26 09:35:23 +0200 (Wed, 26 Oct 2011)
New Revision: 17766

Modified:
   gnunet/src/vpn/gnunet-daemon-vpn-helper.c
   gnunet/src/vpn/gnunet-helper-vpn.c
Log:
fix compiler warnings

Modified: gnunet/src/vpn/gnunet-daemon-vpn-helper.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn-helper.c   2011-10-26 07:25:10 UTC (rev 
17765)
+++ gnunet/src/vpn/gnunet-daemon-vpn-helper.c   2011-10-26 07:35:23 UTC (rev 
17766)
@@ -277,6 +277,8 @@
       memcpy (&pkt->udp_dns.data, ans->pkt.data, data_len);
       buf = pkt;
     }
+  else
+    GNUNET_assert (0);
 
   GNUNET_CONTAINER_DLL_remove (answer_proc_head, answer_proc_tail, ans);
   GNUNET_free (ans);
@@ -318,6 +320,7 @@
     struct ip6_udp *pkt6_udp;
     struct ip6_icmp *pkt6_icmp;
 
+    pkt6_udp = NULL; /* make compiler happy */
     switch (pkt6->ip6_hdr.nxthdr)
     {
     case IPPROTO_UDP:
@@ -347,7 +350,8 @@
                                                                        
GNUNET_TIME_UNIT_FOREVER_REL,
                                                                        
GNUNET_YES, &send_query, NULL);
           break;
-        }
+        } 
+      /* fall through */
     case IPPROTO_TCP:
       pkt6_tcp = (struct ip6_tcp *) pkt6;
 
@@ -436,7 +440,7 @@
           memcpy (s->addr, me->addr, me->addrlen);
           s->proto = pkt6->ip6_hdr.nxthdr;
           if (s->proto == IPPROTO_UDP)
-          {
+         {
             hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP);
             memcpy (hc + 1, &pkt6_udp->udp_hdr, ntohs (pkt6_udp->udp_hdr.len));
             app_type = GNUNET_APPLICATION_TYPE_INTERNET_UDP_GATEWAY;

Modified: gnunet/src/vpn/gnunet-helper-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-helper-vpn.c  2011-10-26 07:25:10 UTC (rev 17765)
+++ gnunet/src/vpn/gnunet-helper-vpn.c  2011-10-26 07:35:23 UTC (rev 17766)
@@ -304,7 +304,7 @@
    */
   unsigned char buftun[MAX_SIZE];
   ssize_t buftun_size = 0;
-  unsigned char *buftun_read;
+  unsigned char *buftun_read = NULL;
 
   /*
    * The buffer filled by reading from stdin