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

[gnunet]

Author: toelke
Date: 2010-06-28 14:37:50 +0200 (Mon, 28 Jun 2010)
New Revision: 12035

Modified:
   gnunet/src/vpn/packet.c
   gnunet/src/vpn/packet.h
   gnunet/src/vpn/pretty-print.c
   gnunet/src/vpn/pretty-print.h
   gnunet/src/vpn/test.c
Log:
vpn: pretty-print udp

Modified: gnunet/src/vpn/packet.c
===================================================================
--- gnunet/src/vpn/packet.c     2010-06-28 12:37:49 UTC (rev 12034)
+++ gnunet/src/vpn/packet.c     2010-06-28 12:37:50 UTC (rev 12035)
@@ -80,3 +80,9 @@
 
        return res;
 }}}
+
+struct ip6_udp* parse_ip6_udp(struct ip6_pkt* pkt) {{{
+       struct ip6_udp* res = (struct ip6_udp*) pkt;
+
+       return res;
+}}}

Modified: gnunet/src/vpn/packet.h
===================================================================
--- gnunet/src/vpn/packet.h     2010-06-28 12:37:49 UTC (rev 12034)
+++ gnunet/src/vpn/packet.h     2010-06-28 12:37:50 UTC (rev 12035)
@@ -85,6 +85,7 @@
 extern struct ip6_pkt* parse_ip6(struct pkt_tun* pkt);
 
 extern struct ip6_tcp* parse_ip6_tcp(struct ip6_pkt*);
+extern struct ip6_udp* parse_ip6_udp(struct ip6_pkt*);
 
 extern short payload(struct ip6_hdr* pkt);
 

Modified: gnunet/src/vpn/pretty-print.c
===================================================================
--- gnunet/src/vpn/pretty-print.c       2010-06-28 12:37:49 UTC (rev 12034)
+++ gnunet/src/vpn/pretty-print.c       2010-06-28 12:37:50 UTC (rev 12035)
@@ -98,6 +98,9 @@
                case 0x06:
                        memcpy(dest, "TCP)", 4);
                        break;
+               case 0x11:
+                       memcpy(dest, "UDP)", 4);
+                       break;
                default:
                        memcpy(dest, "unknown)", 8);
                        break;
@@ -164,3 +167,10 @@
                        pkt->data.flg & 0x01 ? 'F' : '.'
                        );
 }}}
+
+void pkt_printf_ip6udp(struct ip6_udp* pkt) {{{
+       printf("spt: %u\n", ntohs(pkt->data.spt));
+       printf("dpt: %u\n", ntohs(pkt->data.dpt));
+       printf("len: %u\n", ntohs(pkt->data.len));
+       printf("crc: 0x%x\n", ntohs(pkt->data.crc));
+}}}

Modified: gnunet/src/vpn/pretty-print.h
===================================================================
--- gnunet/src/vpn/pretty-print.h       2010-06-28 12:37:49 UTC (rev 12034)
+++ gnunet/src/vpn/pretty-print.h       2010-06-28 12:37:50 UTC (rev 12035)
@@ -8,5 +8,6 @@
 extern void pkt_printf(struct ip6_pkt* pkt);
 
 void pkt_printf_ip6tcp(struct ip6_tcp* pkt);
+void pkt_printf_ip6udp(struct ip6_udp* pkt);
 
 #endif

Modified: gnunet/src/vpn/test.c
===================================================================
--- gnunet/src/vpn/test.c       2010-06-28 12:37:49 UTC (rev 12034)
+++ gnunet/src/vpn/test.c       2010-06-28 12:37:50 UTC (rev 12035)
@@ -30,12 +30,17 @@
                                struct ip6_pkt* pkt6 = parse_ip6(pkt);
                                pkt_printf(pkt6);
                                struct ip6_tcp* pkt6_tcp;
+                               struct ip6_udp* pkt6_udp;
                                switch(pkt6->hdr.nxthdr) {
                                        case 0x06:
                                                pkt6_tcp = parse_ip6_tcp(pkt6);
                                                pkt_printf_ip6tcp(pkt6_tcp);
                                                handle_tcp(pkt6_tcp);
                                                break;
+                                       case 0x11:
+                                               pkt6_udp = parse_ip6_udp(pkt6);
+                                               pkt_printf_ip6udp(pkt6_udp);
+                                               break;
                                }
                                break;
                        default: