[GNUnet-SVN] r19370 - gnunet/src/dns

[gnunet]

Author: grothoff
Date: 2012-01-25 10:56:17 +0100 (Wed, 25 Jan 2012)
New Revision: 19370

Modified:
   gnunet/src/dns/gnunet-service-dns.c
Log:
-fix

Modified: gnunet/src/dns/gnunet-service-dns.c
===================================================================
--- gnunet/src/dns/gnunet-service-dns.c 2012-01-25 09:53:30 UTC (rev 19369)
+++ gnunet/src/dns/gnunet-service-dns.c 2012-01-25 09:56:17 UTC (rev 19370)
@@ -1223,8 +1223,10 @@
 
   /* setup new request */
   rr->phase = RP_INIT;
-  if (ip4->version == 4)
+  switch (ntohs (tun->proto))
   {
+  case ETH_P_IPV4:
+  {
     srca4 = (struct sockaddr_in*) &rr->src_addr;
     dsta4 = (struct sockaddr_in*) &rr->dst_addr;
     memset (srca4, 0, sizeof (struct sockaddr_in));
@@ -1240,7 +1242,8 @@
     dsta4->sin_len = sizeof (sizeof (struct sockaddr_in));
 #endif
   }
-  else /* ipv6 */
+  break;
+  case ETH_P_IPV6:
   {
     srca6 = (struct sockaddr_in6*) &rr->src_addr;
     dsta6 = (struct sockaddr_in6*) &rr->dst_addr;
@@ -1256,6 +1259,9 @@
     srca6->sin6_len = sizeof (sizeof (struct sockaddr_in6));
     dsta6->sin6_len = sizeof (sizeof (struct sockaddr_in6));
 #endif
+    break;
+  default:
+    GNUNET_assert (0);
   }
   rr->payload = GNUNET_malloc (msize);
   rr->payload_length = msize;