diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-09-14 08:06:59 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-09-14 08:06:59 +0000 |
commit | 1834f5d8d620f05ca1e737b25d66379c767294a9 (patch) | |
tree | 3633a39785ab000219b01b5f1c25ef44035c5f62 /src/vpn | |
parent | 9bb898c3291c5cc516f257688c93bb536bad5cfe (diff) | |
download | gnunet-1834f5d8d620f05ca1e737b25d66379c767294a9.tar.gz gnunet-1834f5d8d620f05ca1e737b25d66379c767294a9.zip |
extra assert, use named constants
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/gnunet-daemon-vpn-helper.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/vpn/gnunet-daemon-vpn-helper.c b/src/vpn/gnunet-daemon-vpn-helper.c index ef2833f87..a7ab160ea 100644 --- a/src/vpn/gnunet-daemon-vpn-helper.c +++ b/src/vpn/gnunet-daemon-vpn-helper.c | |||
@@ -256,8 +256,8 @@ message_token (void *cls __attribute__ ((unused)), void *client | |||
256 | 256 | ||
257 | switch (pkt6->ip6_hdr.nxthdr) | 257 | switch (pkt6->ip6_hdr.nxthdr) |
258 | { | 258 | { |
259 | case 0x06: /* TCP */ | 259 | case IPPROTO_TCP: |
260 | case 0x11: /* UDP */ | 260 | case IPPROTO_UDP: |
261 | pkt6_tcp = (struct ip6_tcp *) pkt6; | 261 | pkt6_tcp = (struct ip6_tcp *) pkt6; |
262 | pkt6_udp = (struct ip6_udp *) pkt6; | 262 | pkt6_udp = (struct ip6_udp *) pkt6; |
263 | 263 | ||
@@ -340,7 +340,7 @@ message_token (void *cls __attribute__ ((unused)), void *client | |||
340 | s->addrlen = me->addrlen; | 340 | s->addrlen = me->addrlen; |
341 | memcpy (s->addr, me->addr, me->addrlen); | 341 | memcpy (s->addr, me->addr, me->addrlen); |
342 | s->proto = pkt6->ip6_hdr.nxthdr; | 342 | s->proto = pkt6->ip6_hdr.nxthdr; |
343 | if (s->proto == 0x11) | 343 | if (s->proto == IPPROTO_UDP) |
344 | { | 344 | { |
345 | hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP); | 345 | hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP); |
346 | memcpy (hc + 1, &pkt6_udp->udp_hdr, ntohs (pkt6_udp->udp_hdr.len)); | 346 | memcpy (hc + 1, &pkt6_udp->udp_hdr, ntohs (pkt6_udp->udp_hdr.len)); |
@@ -348,13 +348,16 @@ message_token (void *cls __attribute__ ((unused)), void *client | |||
348 | if (NULL != udp_tunnel) | 348 | if (NULL != udp_tunnel) |
349 | me->tunnel = udp_tunnel; | 349 | me->tunnel = udp_tunnel; |
350 | } | 350 | } |
351 | else if (s->proto == 0x06) | 351 | else if (s->proto == IPPROTO_TCP) |
352 | { | 352 | { |
353 | hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP); | 353 | hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP); |
354 | memcpy (hc + 1, &pkt6_tcp->tcp_hdr, ntohs (pkt6->ip6_hdr.paylgth)); | 354 | memcpy (hc + 1, &pkt6_tcp->tcp_hdr, ntohs (pkt6->ip6_hdr.paylgth)); |
355 | app_type = GNUNET_APPLICATION_TYPE_INTERNET_TCP_GATEWAY; | 355 | app_type = GNUNET_APPLICATION_TYPE_INTERNET_TCP_GATEWAY; |
356 | if (NULL != tcp_tunnel) | 356 | if (NULL != tcp_tunnel) |
357 | me->tunnel = tcp_tunnel; | 357 | me->tunnel = tcp_tunnel; |
358 | } else | ||
359 | { | ||
360 | GNUNET_assert (0); | ||
358 | } | 361 | } |
359 | if (me->tunnel == NULL && NULL != cls) | 362 | if (me->tunnel == NULL && NULL != cls) |
360 | { | 363 | { |
@@ -450,8 +453,8 @@ message_token (void *cls __attribute__ ((unused)), void *client | |||
450 | c[0], c[1], c[2], c[3], pkt->ip_hdr.proto); | 453 | c[0], c[1], c[2], c[3], pkt->ip_hdr.proto); |
451 | switch (pkt->ip_hdr.proto) | 454 | switch (pkt->ip_hdr.proto) |
452 | { | 455 | { |
453 | case 0x06: /* TCP */ | 456 | case IPPROTO_TCP: |
454 | case 0x11: /* UDP */ | 457 | case IPPROTO_UDP: |
455 | pkt_tcp = (struct ip_tcp *) pkt; | 458 | pkt_tcp = (struct ip_tcp *) pkt; |
456 | pkt_udp = (struct ip_udp *) pkt; | 459 | pkt_udp = (struct ip_udp *) pkt; |
457 | 460 | ||
@@ -486,17 +489,17 @@ message_token (void *cls __attribute__ ((unused)), void *client | |||
486 | /* This is a mapping to a gnunet-service */ | 489 | /* This is a mapping to a gnunet-service */ |
487 | memcpy (hc, &me->desc.service_descriptor, sizeof (GNUNET_HashCode)); | 490 | memcpy (hc, &me->desc.service_descriptor, sizeof (GNUNET_HashCode)); |
488 | 491 | ||
489 | if (0x11 == pkt->ip_hdr.proto && | 492 | if ( (IPPROTO_UDP == pkt->ip_hdr.proto) && |
490 | (me->desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_UDP)) && | 493 | (me->desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_UDP)) && |
491 | (port_in_ports (me->desc.ports, pkt_udp->udp_hdr.dpt) || | 494 | (port_in_ports (me->desc.ports, pkt_udp->udp_hdr.dpt) || |
492 | testBit (me->additional_ports, ntohs (pkt_udp->udp_hdr.dpt)))) | 495 | testBit (me->additional_ports, ntohs (pkt_udp->udp_hdr.dpt))) ) |
493 | { | 496 | { |
494 | hdr->type = ntohs (GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP); | 497 | hdr->type = ntohs (GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP); |
495 | 498 | ||
496 | memcpy (hc + 1, &pkt_udp->udp_hdr, ntohs (pkt_udp->udp_hdr.len)); | 499 | memcpy (hc + 1, &pkt_udp->udp_hdr, ntohs (pkt_udp->udp_hdr.len)); |
497 | 500 | ||
498 | } | 501 | } |
499 | else if (0x06 == pkt->ip_hdr.proto && | 502 | else if ( (IPPROTO_TCP == pkt->ip_hdr.proto) && |
500 | (me-> | 503 | (me-> |
501 | desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_TCP)) | 504 | desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_TCP)) |
502 | && (port_in_ports (me->desc.ports, pkt_tcp->tcp_hdr.dpt))) | 505 | && (port_in_ports (me->desc.ports, pkt_tcp->tcp_hdr.dpt))) |