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

[gnunet]

Author: toelke
Date: 2010-11-04 18:26:58 +0100 (Thu, 04 Nov 2010)
New Revision: 13551

Modified:
   gnunet/src/vpn/gnunet-daemon-vpn.c
   gnunet/src/vpn/gnunet-vpn-packet.h
   gnunet/src/vpn/gnunet-vpn-pretty-print.c
Log:
This bitfield-stuff does not work as I expect

Modified: gnunet/src/vpn/gnunet-daemon-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.c  2010-11-04 17:26:57 UTC (rev 13550)
+++ gnunet/src/vpn/gnunet-daemon-vpn.c  2010-11-04 17:26:58 UTC (rev 13551)
@@ -365,6 +365,7 @@
     if (ntohs(pkt_tun->tun.type) == 0x86dd)
       {
        struct ip6_pkt *pkt6 = (struct ip6_pkt*) message;
+       GNUNET_assert(pkt6->ip6_hdr.version == 6);
        struct ip6_tcp *pkt6_tcp;
        struct ip6_udp *pkt6_udp;
 

Modified: gnunet/src/vpn/gnunet-vpn-packet.h
===================================================================
--- gnunet/src/vpn/gnunet-vpn-packet.h  2010-11-04 17:26:57 UTC (rev 13550)
+++ gnunet/src/vpn/gnunet-vpn-packet.h  2010-11-04 17:26:58 UTC (rev 13551)
@@ -11,8 +11,9 @@
 };
 
 struct ip6_hdr {
+       unsigned tclass_h:4 GNUNET_PACKED;
        unsigned version:4 GNUNET_PACKED;
-       unsigned tclass:8 GNUNET_PACKED;
+       unsigned tclass_l:4 GNUNET_PACKED;
        unsigned flowlbl:20 GNUNET_PACKED;
        unsigned paylgth:16 GNUNET_PACKED;
        unsigned nxthdr:8 GNUNET_PACKED;

Modified: gnunet/src/vpn/gnunet-vpn-pretty-print.c
===================================================================
--- gnunet/src/vpn/gnunet-vpn-pretty-print.c    2010-11-04 17:26:57 UTC (rev 
13550)
+++ gnunet/src/vpn/gnunet-vpn-pretty-print.c    2010-11-04 17:26:58 UTC (rev 
13551)
@@ -151,6 +151,7 @@
        }
 
        printf("%s", buf);
+       printf("version: %d\n", pkt->ip6_hdr.version);
 }}}
 
 void pkt_printf_ip6tcp(struct ip6_tcp* pkt) {{{