From 89975a4c15ba6829bcf10e3287aac013d2f58973 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 14 Aug 2011 20:05:17 +0000 Subject: stuff --- src/vpn/gnunet-daemon-vpn.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/vpn/gnunet-daemon-vpn.c') diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c index 1e1e957d8..15ed379df 100644 --- a/src/vpn/gnunet-daemon-vpn.c +++ b/src/vpn/gnunet-daemon-vpn.c @@ -812,7 +812,7 @@ receive_udp_back (void *cls GNUNET_assert (pkt6 != NULL); - if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_SERVICE_UDP_BACK) + if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP_BACK) new_ip6addr (pkt6->ip6_hdr.sadr, &other->hashPubKey, desc); else new_ip6addr_remote (pkt6->ip6_hdr.sadr, s->addr, s->addrlen); @@ -857,7 +857,7 @@ receive_udp_back (void *cls GNUNET_free (key); GNUNET_assert (me != NULL); - if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_SERVICE_UDP_BACK) + if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP_BACK) { GNUNET_assert (me->desc. service_type & htonl (GNUNET_DNS_SERVICE_TYPE_UDP)); @@ -897,7 +897,7 @@ receive_udp_back (void *cls GNUNET_assert (pkt4 != NULL); - GNUNET_assert (ntohs (message->type) == GNUNET_MESSAGE_TYPE_REMOTE_UDP_BACK); + GNUNET_assert (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP_BACK); uint32_t sadr; new_ip4addr_remote ((unsigned char*)&sadr, s->addr, s->addrlen); pkt4->ip_hdr.sadr = sadr; @@ -984,7 +984,7 @@ receive_tcp_back (void *cls __attribute__((unused)), struct GNUNET_MESH_Tunnel* GNUNET_assert (pkt6 != NULL); - if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_SERVICE_TCP_BACK) + if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_SERVICE_TCP_BACK) new_ip6addr (pkt6->ip6_hdr.sadr, &other->hashPubKey, desc); else new_ip6addr_remote (pkt6->ip6_hdr.sadr, s->addr, s->addrlen); @@ -1025,7 +1025,7 @@ receive_tcp_back (void *cls __attribute__((unused)), struct GNUNET_MESH_Tunnel* GNUNET_free (key); GNUNET_assert (me != NULL); - if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_SERVICE_UDP_BACK) + if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP_BACK) GNUNET_assert (me->desc. service_type & htonl (GNUNET_DNS_SERVICE_TYPE_TCP)); @@ -1058,7 +1058,7 @@ receive_tcp_back (void *cls __attribute__((unused)), struct GNUNET_MESH_Tunnel* GNUNET_assert (pkt4 != NULL); memset (pkt4, 0, size); - GNUNET_assert (ntohs (message->type) == GNUNET_MESSAGE_TYPE_REMOTE_TCP_BACK); + GNUNET_assert (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP_BACK); uint32_t sadr; new_ip4addr_remote ((unsigned char*)&sadr, s->addr, s->addrlen); pkt4->ip_hdr.sadr = sadr; @@ -1149,10 +1149,10 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg_) { static const struct GNUNET_MESH_MessageHandler handlers[] = { - {receive_udp_back, GNUNET_MESSAGE_TYPE_SERVICE_UDP_BACK, 0}, - {receive_tcp_back, GNUNET_MESSAGE_TYPE_SERVICE_TCP_BACK, 0}, - {receive_udp_back, GNUNET_MESSAGE_TYPE_REMOTE_UDP_BACK, 0}, - {receive_tcp_back, GNUNET_MESSAGE_TYPE_REMOTE_TCP_BACK, 0}, + {receive_udp_back, GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP_BACK, 0}, + {receive_tcp_back, GNUNET_MESSAGE_TYPE_VPN_SERVICE_TCP_BACK, 0}, + {receive_udp_back, GNUNET_MESSAGE_TYPE_VPN_REMOTE_UDP_BACK, 0}, + {receive_tcp_back, GNUNET_MESSAGE_TYPE_VPN_REMOTE_TCP_BACK, 0}, {NULL, 0, 0} }; -- cgit v1.2.3