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

[gnunet]

Author: toelke
Date: 2010-07-21 00:22:04 +0200 (Wed, 21 Jul 2010)
New Revision: 12304

Modified:
   gnunet/src/vpn/gnunet-vpn-helper.c
Log:
only read as much as fits inside of a GNUNET_Message

Modified: gnunet/src/vpn/gnunet-vpn-helper.c
===================================================================
--- gnunet/src/vpn/gnunet-vpn-helper.c  2010-07-20 22:22:03 UTC (rev 12303)
+++ gnunet/src/vpn/gnunet-vpn-helper.c  2010-07-20 22:22:04 UTC (rev 12304)
@@ -48,6 +48,8 @@
 #ifndef _LINUX_IN6_H
 // This is in linux/include/net/ipv6.h.
 
+#define MAX_SIZE (65535 - sizeof(struct GNUNET_MessageHeader))
+
 struct in6_ifreq {
     struct in6_addr ifr6_addr;
     __u32 ifr6_prefixlen;
@@ -112,7 +114,7 @@
 }/*}}}*/
 
 int main(int argc, char** argv) {
-       unsigned char buf[65600]; // 64k + 64;
+       unsigned char buf[MAX_SIZE];
 
        char dev[IFNAMSIZ];
        memset(dev, 0, IFNAMSIZ);
@@ -203,7 +205,7 @@
                                }
                        } else if (write_stdout_possible && FD_ISSET(fd_tun, 
&fds_r)) {
                                write_stdout_possible = 0;
-                               r = read(fd_tun, buf, 65600);
+                               r = read(fd_tun, buf, MAX_SIZE);
                                if (r <= 0) {
                                        fprintf(stderr, "read-error: %m\n");
                                        shutdown(fd_tun, SHUT_RD);