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

[gnunet]

Author: grothoff
Date: 2011-09-16 17:29:59 +0200 (Fri, 16 Sep 2011)
New Revision: 16889

Modified:
   gnunet/src/vpn/gnunet-daemon-exit.c
   gnunet/src/vpn/gnunet-daemon-vpn-helper.c
   gnunet/src/vpn/gnunet-daemon-vpn.c
Log:
use named constants

Modified: gnunet/src/vpn/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-exit.c 2011-09-16 15:24:21 UTC (rev 16888)
+++ gnunet/src/vpn/gnunet-daemon-exit.c 2011-09-16 15:29:59 UTC (rev 16889)
@@ -536,10 +536,10 @@
   {
     struct ip6_pkt *pkt6 = (struct ip6_pkt *) pkt_tun;
 
-    if (0x11 == pkt6->ip6_hdr.nxthdr)
+    if (IPPROTO_UDP == pkt6->ip6_hdr.nxthdr)
       udp_from_helper (&((struct ip6_udp *) pkt6)->udp_hdr,
                        (unsigned char *) &pkt6->ip6_hdr.dadr, 16);
-    else if (0x06 == pkt6->ip6_hdr.nxthdr)
+    else if (IPPROTO_TCP == pkt6->ip6_hdr.nxthdr)
       tcp_from_helper (&((struct ip6_tcp *) pkt6)->tcp_hdr,
                        (unsigned char *) &pkt6->ip6_hdr.dadr, 16,
                        ntohs (pkt6->ip6_hdr.paylgth));
@@ -549,10 +549,10 @@
     struct ip_pkt *pkt4 = (struct ip_pkt *) pkt_tun;
     uint32_t tmp = pkt4->ip_hdr.dadr;
 
-    if (0x11 == pkt4->ip_hdr.proto)
+    if (IPPROTO_UDP == pkt4->ip_hdr.proto)
       udp_from_helper (&((struct ip_udp *) pkt4)->udp_hdr,
                        (unsigned char *) &tmp, 4);
-    else if (0x06 == pkt4->ip_hdr.proto)
+    else if (IPPROTO_TCP == pkt4->ip_hdr.proto)
     {
       size_t pktlen = ntohs (pkt4->ip_hdr.tot_lngth);
 
@@ -784,7 +784,7 @@
 }
 
 static void
-prepare_ipv4_packet (ssize_t len, ssize_t pktlen, void *payload,
+prepare_ipv4_packet (ssize_t len, uint16_t pktlen, void *payload,
                      uint16_t protocol, void *ipaddress, void *tunnel,
                      struct redirect_state *state, struct ip_pkt *pkt4)
 {
@@ -834,7 +834,7 @@
   pkt4->ip_hdr.sadr = tmp;
 
   memcpy (&state->redirect_info.addr, &tmp, 4);
-  if (0x11 == protocol)
+  if (IPPROTO_UDP == protocol)
   {
     struct ip_udp *pkt4_udp = (struct ip_udp *) pkt4;
 
@@ -842,7 +842,7 @@
 
     pkt4_udp->udp_hdr.crc = 0;  /* Optional for IPv4 */
   }
-  else if (0x06 == protocol)
+  else if (IPPROTO_TCP == protocol)
   {
     struct ip_tcp *pkt4_tcp = (struct ip_tcp *) pkt4;
 
@@ -876,7 +876,7 @@
 }
 
 static void
-prepare_ipv6_packet (ssize_t len, ssize_t pktlen, void *payload,
+prepare_ipv6_packet (ssize_t len, uint16_t pktlen, void *payload,
                      uint16_t protocol, void *ipaddress, void *tunnel,
                      struct redirect_state *state, struct ip6_pkt *pkt6)
 {
@@ -927,7 +927,7 @@
   /* copy the needed information into the state */
   memcpy (&state->redirect_info.addr, &pkt6->ip6_hdr.sadr, 16);
 
-  if (0x11 == protocol)
+  if (IPPROTO_UDP == protocol)
   {
     struct ip6_udp *pkt6_udp = (struct ip6_udp *) pkt6;
 
@@ -952,7 +952,7 @@
                                    ntohs (pkt6_udp->udp_hdr.len));
     pkt6_udp->udp_hdr.crc = calculate_checksum_end (sum);
   }
-  else if (0x06 == protocol)
+  else if (IPPROTO_TCP == protocol)
   {
     struct ip6_tcp *pkt6_tcp = (struct ip6_tcp *) pkt6;
 
@@ -994,7 +994,7 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received TCP-Packet\n");
   GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
   struct tcp_pkt *pkt = (struct tcp_pkt *) (desc + 1);
-  unsigned int pkt_len =
+  uint16_t pkt_len =
       ntohs (message->size) - sizeof (struct GNUNET_MessageHeader) -
       sizeof (GNUNET_HashCode);
 
@@ -1049,12 +1049,12 @@
   switch (serv->version)
   {
   case 4:
-    prepare_ipv4_packet (len, pkt_len, pkt, 0x06,       /* TCP */
+    prepare_ipv4_packet (len, pkt_len, pkt, IPPROTO_TCP,
                          &serv->v4.ip4address, tunnel, state,
                          (struct ip_pkt *) buf);
     break;
   case 6:
-    prepare_ipv6_packet (len, pkt_len, pkt, 0x06,       /* TCP */
+    prepare_ipv6_packet (len, pkt_len, pkt, IPPROTO_TCP,
                          &serv->v6.ip6address, tunnel, state,
                          (struct ip6_pkt *) buf);
 
@@ -1104,7 +1104,7 @@
   struct remote_addr *s = (struct remote_addr *) desc;
   char *buf;
   size_t len;
-  unsigned int pkt_len =
+  uint16_t pkt_len =
       ntohs (message->size) - sizeof (struct GNUNET_MessageHeader) -
       sizeof (GNUNET_HashCode);
 
@@ -1125,11 +1125,11 @@
   switch (s->addrlen)
   {
   case 4:
-    prepare_ipv4_packet (len, pkt_len, pkt, 0x06,       /* TCP */
+    prepare_ipv4_packet (len, pkt_len, pkt, IPPROTO_TCP,
                          &s->addr, tunnel, state, (struct ip_pkt *) buf);
     break;
   case 16:
-    prepare_ipv6_packet (len, pkt_len, pkt, 0x06,       /* TCP */
+    prepare_ipv6_packet (len, pkt_len, pkt, IPPROTO_TCP,
                          &s->addr, tunnel, state, (struct ip6_pkt *) buf);
     break;
   default:
@@ -1206,11 +1206,11 @@
   switch (s->addrlen)
   {
   case 4:
-    prepare_ipv4_packet (len, ntohs (pkt->len), pkt, 0x11,      /* UDP */
+    prepare_ipv4_packet (len, ntohs (pkt->len), pkt, IPPROTO_UDP, 
                          &s->addr, tunnel, state, (struct ip_pkt *) buf);
     break;
   case 16:
-    prepare_ipv6_packet (len, ntohs (pkt->len), pkt, 0x11,      /* UDP */
+    prepare_ipv6_packet (len, ntohs (pkt->len), pkt, IPPROTO_UDP, 
                          &s->addr, tunnel, state, (struct ip6_pkt *) buf);
     break;
   default:
@@ -1309,12 +1309,12 @@
   switch (serv->version)
   {
   case 4:
-    prepare_ipv4_packet (len, ntohs (pkt->len), pkt, 0x11,      /* UDP */
+    prepare_ipv4_packet (len, ntohs (pkt->len), pkt, IPPROTO_UDP,
                          &serv->v4.ip4address, tunnel, state,
                          (struct ip_pkt *) buf);
     break;
   case 6:
-    prepare_ipv6_packet (len, ntohs (pkt->len), pkt, 0x11,      /* UDP */
+    prepare_ipv6_packet (len, ntohs (pkt->len), pkt, IPPROTO_UDP,
                          &serv->v6.ip6address, tunnel, state,
                          (struct ip6_pkt *) buf);
 

Modified: gnunet/src/vpn/gnunet-daemon-vpn-helper.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn-helper.c   2011-09-16 15:24:21 UTC (rev 
16888)
+++ gnunet/src/vpn/gnunet-daemon-vpn-helper.c   2011-09-16 15:29:59 UTC (rev 
16889)
@@ -199,7 +199,7 @@
   pkt->ip_hdr.flags = 0;
   pkt->ip_hdr.frag_off = 0;
   pkt->ip_hdr.ttl = 255;
-  pkt->ip_hdr.proto = 0x11;     /* UDP */
+  pkt->ip_hdr.proto = IPPROTO_UDP;
   pkt->ip_hdr.chks = 0;         /* Will be calculated later */
   pkt->ip_hdr.sadr = ans->pkt.from;
   pkt->ip_hdr.dadr = ans->pkt.to;
@@ -291,7 +291,7 @@
           /* This is a mapping to a gnunet-service */
           memcpy (hc, &me->desc.service_descriptor, sizeof (GNUNET_HashCode));
 
-          if (0x11 == pkt6->ip6_hdr.nxthdr &&
+          if (IPPROTO_UDP == pkt6->ip6_hdr.nxthdr &&
               (me->desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_UDP)) &&
               (port_in_ports (me->desc.ports, pkt6_udp->udp_hdr.dpt) ||
                testBit (me->additional_ports, ntohs (pkt6_udp->udp_hdr.dpt))))
@@ -301,7 +301,7 @@
             memcpy (hc + 1, &pkt6_udp->udp_hdr, ntohs (pkt6_udp->udp_hdr.len));
 
           }
-          else if (0x06 == pkt6->ip6_hdr.nxthdr &&
+          else if (IPPROTO_TCP == pkt6->ip6_hdr.nxthdr &&
                    (me->desc.service_type & htonl 
(GNUNET_DNS_SERVICE_TYPE_TCP))
                    && (port_in_ports (me->desc.ports, pkt6_tcp->tcp_hdr.dpt)))
           {
@@ -422,7 +422,7 @@
     GNUNET_assert (pkt->ip_hdr.version == 4);
 
     /* Send dns-packets to the service-dns */
-    if (pkt->ip_hdr.proto == 0x11 && ntohs (udp->udp_hdr.dpt) == 53)
+    if (pkt->ip_hdr.proto == IPPROTO_UDP && ntohs (udp->udp_hdr.dpt) == 53)
     {
       /* 9 = 8 for the udp-header + 1 for the unsigned char data[1]; */
       size_t len = sizeof (struct query_packet) + ntohs (udp->udp_hdr.len) - 9;
@@ -543,13 +543,13 @@
             s->addrlen = me->addrlen;
             memcpy (s->addr, me->addr, me->addrlen);
             s->proto = pkt->ip_hdr.proto;
-            if (s->proto == 0x11)
+            if (s->proto == IPPROTO_UDP)
             {
               hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP);
               memcpy (hc + 1, &pkt_udp->udp_hdr, ntohs (pkt_udp->udp_hdr.len));
               app_type = GNUNET_APPLICATION_TYPE_INTERNET_UDP_GATEWAY;
             }
-            else if (s->proto == 0x06)
+            else if (s->proto == IPPROTO_TCP)
             {
               hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP);
               memcpy (hc + 1, &pkt_tcp->tcp_hdr,

Modified: gnunet/src/vpn/gnunet-daemon-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.c  2011-09-16 15:24:21 UTC (rev 16888)
+++ gnunet/src/vpn/gnunet-daemon-vpn.c  2011-09-16 15:29:59 UTC (rev 16889)
@@ -903,7 +903,7 @@
     pkt6->ip6_hdr.tclass_l = 0;
     pkt6->ip6_hdr.flowlbl = 0;
     pkt6->ip6_hdr.paylgth = pkt->len;
-    pkt6->ip6_hdr.nxthdr = 0x11;
+    pkt6->ip6_hdr.nxthdr = IPPROTO_UDP;
     pkt6->ip6_hdr.hoplmt = 0xff;
 
     {
@@ -995,7 +995,7 @@
     pkt4->ip_hdr.flags = 0;
     pkt4->ip_hdr.frag_off = 0;
     pkt4->ip_hdr.ttl = 255;
-    pkt4->ip_hdr.proto = 0x11;
+    pkt4->ip_hdr.proto = IPPROTO_UDP;
     pkt4->ip_hdr.chks = 0;      /* Will be calculated later */
 
     {
@@ -1082,7 +1082,7 @@
     pkt6->ip6_hdr.tclass_l = 0;
     pkt6->ip6_hdr.flowlbl = 0;
     pkt6->ip6_hdr.paylgth = htons (pktlen);
-    pkt6->ip6_hdr.nxthdr = 0x06;
+    pkt6->ip6_hdr.nxthdr = IPPROTO_TCP;
     pkt6->ip6_hdr.hoplmt = 0xff;
 
     {
@@ -1163,7 +1163,7 @@
     pkt4->ip_hdr.flags = 0;
     pkt4->ip_hdr.frag_off = 0;
     pkt4->ip_hdr.ttl = 255;
-    pkt4->ip_hdr.proto = 0x06;
+    pkt4->ip_hdr.proto = IPPROTO_TCP;
     pkt4->ip_hdr.chks = 0;      /* Will be calculated later */
 
     {
@@ -1202,7 +1202,7 @@
     tmp = pkt4->ip_hdr.dadr;
     sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4);
 
-    tmp = (0x06 << 16) | (0xffff & pktlen);
+    tmp = (0x06 << 16) | (0xffff & pktlen); // 0x06 for TCP?
 
     tmp = htonl (tmp);