diff options
Diffstat (limited to 'src/vpn/gnunet-daemon-vpn-helper.c')
-rw-r--r-- | src/vpn/gnunet-daemon-vpn-helper.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/vpn/gnunet-daemon-vpn-helper.c b/src/vpn/gnunet-daemon-vpn-helper.c index a7ab160ea..29850b446 100644 --- a/src/vpn/gnunet-daemon-vpn-helper.c +++ b/src/vpn/gnunet-daemon-vpn-helper.c | |||
@@ -355,9 +355,10 @@ message_token (void *cls __attribute__ ((unused)), void *client | |||
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 | 358 | } |
359 | else | ||
359 | { | 360 | { |
360 | GNUNET_assert (0); | 361 | GNUNET_assert (0); |
361 | } | 362 | } |
362 | if (me->tunnel == NULL && NULL != cls) | 363 | if (me->tunnel == NULL && NULL != cls) |
363 | { | 364 | { |
@@ -489,17 +490,17 @@ message_token (void *cls __attribute__ ((unused)), void *client | |||
489 | /* This is a mapping to a gnunet-service */ | 490 | /* This is a mapping to a gnunet-service */ |
490 | memcpy (hc, &me->desc.service_descriptor, sizeof (GNUNET_HashCode)); | 491 | memcpy (hc, &me->desc.service_descriptor, sizeof (GNUNET_HashCode)); |
491 | 492 | ||
492 | if ( (IPPROTO_UDP == pkt->ip_hdr.proto) && | 493 | if ((IPPROTO_UDP == pkt->ip_hdr.proto) && |
493 | (me->desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_UDP)) && | 494 | (me->desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_UDP)) && |
494 | (port_in_ports (me->desc.ports, pkt_udp->udp_hdr.dpt) || | 495 | (port_in_ports (me->desc.ports, pkt_udp->udp_hdr.dpt) || |
495 | testBit (me->additional_ports, ntohs (pkt_udp->udp_hdr.dpt))) ) | 496 | testBit (me->additional_ports, ntohs (pkt_udp->udp_hdr.dpt)))) |
496 | { | 497 | { |
497 | hdr->type = ntohs (GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP); | 498 | hdr->type = ntohs (GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP); |
498 | 499 | ||
499 | memcpy (hc + 1, &pkt_udp->udp_hdr, ntohs (pkt_udp->udp_hdr.len)); | 500 | memcpy (hc + 1, &pkt_udp->udp_hdr, ntohs (pkt_udp->udp_hdr.len)); |
500 | 501 | ||
501 | } | 502 | } |
502 | else if ( (IPPROTO_TCP == pkt->ip_hdr.proto) && | 503 | else if ((IPPROTO_TCP == pkt->ip_hdr.proto) && |
503 | (me-> | 504 | (me-> |
504 | desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_TCP)) | 505 | desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_TCP)) |
505 | && (port_in_ports (me->desc.ports, pkt_tcp->tcp_hdr.dpt))) | 506 | && (port_in_ports (me->desc.ports, pkt_tcp->tcp_hdr.dpt))) |