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

[gnunet]

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

Modified:
   gnunet/src/vpn/packet.c
   gnunet/src/vpn/pretty-print.c
Log:
vpn: cleanup of the code

Modified: gnunet/src/vpn/packet.c
===================================================================
--- gnunet/src/vpn/packet.c     2010-06-28 12:37:44 UTC (rev 12028)
+++ gnunet/src/vpn/packet.c     2010-06-28 12:37:44 UTC (rev 12029)
@@ -31,21 +31,20 @@
        free(buf);
 }}}
 
-int recv_ipv6pkt(int fd, struct pkt_tun** pkt) {{{
-}}}
-
 int recv_pkt(int fd, struct pkt_tun** pkt) {{{
-       // TODO: länge lesen?
-       *pkt = (struct pkt_tun*)malloc(1504);
-       struct pkt_tun* _pkt = *pkt;
+       int size = 1504;
+       unsigned char data[size];
 
-       unsigned char *data = (unsigned char*)_pkt;
-
        debug(1, 0, "beginning to read...\n");
 
-       int r = read(fd, data, 1504);
+       int r = read(fd, data, size);
        debug(1, 0, "read %d bytes\n", r);
 
+       *pkt = (struct pkt_tun*)malloc(r);
+
+       memcpy(*pkt, data, r);
+       struct pkt_tun *_pkt = *pkt;
+
        debug(1, 0, "read the flags: %04x\n", ntohs(_pkt->flags));
        debug(1, 0, "read the type: %04x\n", ntohs(_pkt->type));
 
@@ -53,7 +52,7 @@
                case 0x86dd:
                        debug(1, 0, "reading an ipv6-packet\n");
                        struct ip6_pkt * pkt6 = (struct ip6_pkt*) *pkt;
-                       int size = payload(&(pkt6->hdr));
+                       size = payload(&(pkt6->hdr));
                        debug(1, 0, "read the size: %d\n", size);
                        return size;
                        break;

Modified: gnunet/src/vpn/pretty-print.c
===================================================================
--- gnunet/src/vpn/pretty-print.c       2010-06-28 12:37:44 UTC (rev 12028)
+++ gnunet/src/vpn/pretty-print.c       2010-06-28 12:37:44 UTC (rev 12029)
@@ -151,7 +151,7 @@
        printf("ack: %u\n", ntohs(pkt->data.ack));
        printf("off: %u\n", ntohs(pkt->data.off));
        printf("wsz: %u\n", ntohs(pkt->data.wsz));
-       printf("crc: %u\n", ntohs(pkt->data.crc));
+       printf("crc: 0x%x\n", ntohs(pkt->data.crc));
        printf("urg: %u\n", ntohs(pkt->data.urg));
        printf("flags: %c%c%c%c%c%c%c%c\n",
                        pkt->data.flg & 0x80 ? 'C' : '.',