tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
usm = (struct GNUNET_EXIT_UdpServiceMessage *) &tnq[1];
usm->header.size = htons ((uint16_t) mlen);
+ usm->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_UDP_TO_SERVICE);
+ /* if the source port is below 32000, we assume it has a special
+ meaning; if not, we pick a random port (this is a heuristic) */
+ usm->source_port = (ntohs (udp->spt) < 32000) ? udp->spt : 0;
+ usm->destination_port = udp->dpt;
usm->service_descriptor = destination->details.service_destination.service_descriptor;
- // FIXME: build message!
+ memcpy (&usm[1],
+ &udp[1],
+ payload_length - sizeof (struct udp_packet));
}
else
{
struct GNUNET_EXIT_UdpInternetMessage *uim;
+ struct in_addr *ip4dst;
+ struct in6_addr *ip6dst;
+ void *payload;
mlen = sizeof (struct GNUNET_EXIT_UdpInternetMessage) +
alen + payload_length - sizeof (struct udp_packet);
mlen);
uim = (struct GNUNET_EXIT_UdpInternetMessage *) &tnq[1];
uim->header.size = htons ((uint16_t) mlen);
+ uim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_UDP_TO_INTERNET);
uim->af = htonl (destination->details.exit_destination.af);
-
- // FIXME: build message!
+ uim->source_port = (ntohs (udp->spt) < 32000) ? udp->spt : 0;
+ uim->destination_port = udp->dpt;
+ switch (destination->details.exit_destination.af)
+ {
+ case AF_INET:
+ ip4dst = (struct in_addr *) &uim[1];
+ *ip4dst = destination->details.exit_destination.ip.v4;
+ payload = &ip4dst[1];
+ break;
+ case AF_INET6:
+ ip6dst = (struct in6_addr *) &uim[1];
+ *ip6dst = destination->details.exit_destination.ip.v6;
+ payload = &ip6dst[1];
+ break;
+ default:
+ GNUNET_assert (0);
+ }
+ memcpy (payload,
+ &udp[1],
+ payload_length - sizeof (struct udp_packet));
}
break;
case IPPROTO_TCP:
tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
tsm = (struct GNUNET_EXIT_TcpServiceStartMessage *) &tnq[1];
tsm->header.size = htons ((uint16_t) mlen);
- // FIXME: build message!
+ tsm->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_TCP_TO_SERVICE_START);
+ tsm->reserved = htonl (0);
+ tsm->service_descriptor = destination->details.service_destination.service_descriptor;
+ tsm->tcp_header = *tcp;
+ memcpy (&tsm[1],
+ &tcp[1],
+ payload_length - sizeof (struct tcp_packet));
}
else
{
struct GNUNET_EXIT_TcpInternetStartMessage *tim;
+ struct in_addr *ip4dst;
+ struct in6_addr *ip6dst;
+ void *payload;
mlen = sizeof (struct GNUNET_EXIT_TcpInternetStartMessage) +
alen + payload_length - sizeof (struct tcp_packet);
tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
tim = (struct GNUNET_EXIT_TcpInternetStartMessage *) &tnq[1];
tim->header.size = htons ((uint16_t) mlen);
- // FIXME: build message!
+ tim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_TCP_TO_INTERNET_START);
+ tim->af = htonl (destination->details.exit_destination.af);
+ tim->tcp_header = *tcp;
+ switch (destination->details.exit_destination.af)
+ {
+ case AF_INET:
+ ip4dst = (struct in_addr *) &tim[1];
+ *ip4dst = destination->details.exit_destination.ip.v4;
+ payload = &ip4dst[1];
+ break;
+ case AF_INET6:
+ ip6dst = (struct in6_addr *) &tim[1];
+ *ip6dst = destination->details.exit_destination.ip.v6;
+ payload = &ip6dst[1];
+ break;
+ default:
+ GNUNET_assert (0);
+ }
+ memcpy (payload,
+ &tcp[1],
+ payload_length - sizeof (struct tcp_packet));
}
}
else
tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
tdm = (struct GNUNET_EXIT_TcpDataMessage *) &tnq[1];
tdm->header.size = htons ((uint16_t) mlen);
- // FIXME: build message!
+ tdm->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_TCP_DATA);
+ tdm->reserved = htonl (0);
+ tdm->tcp_header = *tcp;
+ memcpy (&tdm[1],
+ &tcp[1],
+ payload_length - sizeof (struct tcp_packet));
}
break;
default:
const struct GNUNET_MessageHeader *message,
const struct GNUNET_ATS_Information *atsi GNUNET_UNUSED)
{
- // FIXME: parse message, build IP packet, give to TUN!
-#if 0
- GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
- struct remote_addr *s = (struct remote_addr *) desc;
- struct udp_pkt *pkt = (struct udp_pkt *) (desc + 1);
- const struct GNUNET_PeerIdentity *other = sender;
struct TunnelState *ts = *tunnel_ctx;
+ const struct GNUNET_EXIT_UdpReplyMessage *reply;
+ size_t mlen;
- if (16 == ts->addrlen)
+ mlen = ntohs (message->size);
+ if (mlen < sizeof (struct GNUNET_EXIT_UdpReplyMessage))
{
- size_t size =
- sizeof (struct ip6_udp) + ntohs (pkt->len) - 1 -
- sizeof (struct udp_pkt);
-
- struct ip6_udp *pkt6 = alloca (size);
-
- GNUNET_assert (pkt6 != NULL);
-
- 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);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Relaying calc:%d gnu:%d udp:%d bytes!\n", size,
- ntohs (message->size), ntohs (pkt->len));
-
- pkt6->shdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_HELPER);
- pkt6->shdr.size = htons (size);
-
- pkt6->tun.flags = 0;
- pkt6->tun.type = htons (0x86dd);
-
- pkt6->ip6_hdr.version = 6;
- pkt6->ip6_hdr.tclass_h = 0;
- pkt6->ip6_hdr.tclass_l = 0;
- pkt6->ip6_hdr.flowlbl = 0;
- pkt6->ip6_hdr.paylgth = pkt->len;
- pkt6->ip6_hdr.nxthdr = IPPROTO_UDP;
- pkt6->ip6_hdr.hoplmt = 0xff;
-
- {
- char *ipv6addr;
-
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "vpn",
- "IPV6ADDR",
- &ipv6addr));
- inet_pton (AF_INET6, ipv6addr, &pkt6->ip6_hdr.dadr);
- GNUNET_free (ipv6addr);
- }
- memcpy (&pkt6->udp_hdr, pkt, ntohs (pkt->len));
-
- GNUNET_HashCode *key = address6_mapping_exists (&pkt6->ip6_hdr.sadr);
-
- GNUNET_assert (key != NULL);
-
- struct map_entry *me = GNUNET_CONTAINER_multihashmap_get (hashmap, key);
-
- GNUNET_CONTAINER_heap_update_cost (heap, me->heap_node,
- GNUNET_TIME_absolute_get ().abs_value);
-
- GNUNET_free (key);
-
- GNUNET_assert (me != NULL);
-
- pkt6->udp_hdr.crc = 0;
- uint32_t sum = 0;
-
- sum =
- GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16);
- sum =
- GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.dadr, 16);
- uint32_t tmp = (pkt6->udp_hdr.len & 0xffff);
-
- sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
- tmp = htons (((pkt6->ip6_hdr.nxthdr & 0x00ff)));
- sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
-
- sum =
- GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->udp_hdr,
- ntohs (pkt->len));
- pkt6->udp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
-
- (void) GNUNET_HELPER_send (helper_handle,
- &pkt6->shdr,
- GNUNET_YES,
- NULL, NULL);
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
}
- else
+ if (NULL == ts->heap_node)
{
- size_t size =
- sizeof (struct ip_udp) + ntohs (pkt->len) - 1 - sizeof (struct udp_pkt);
-
- struct ip_udp *pkt4 = alloca (size);
-
- GNUNET_assert (pkt4 != NULL);
-
- 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.s_addr = sadr;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Relaying calc:%d gnu:%d udp:%d bytes!\n", size,
- ntohs (message->size), ntohs (pkt->len));
-
- pkt4->shdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_HELPER);
- pkt4->shdr.size = htons (size);
-
- pkt4->tun.flags = 0;
- pkt4->tun.type = htons (0x0800);
-
- pkt4->ip_hdr.version = 4;
- pkt4->ip_hdr.hdr_lngth = 5;
- pkt4->ip_hdr.diff_serv = 0;
- pkt4->ip_hdr.tot_lngth = htons (20 + ntohs (pkt->len));
- pkt4->ip_hdr.ident = 0;
- pkt4->ip_hdr.flags = 0;
- pkt4->ip_hdr.frag_off = 0;
- pkt4->ip_hdr.ttl = 255;
- pkt4->ip_hdr.proto = IPPROTO_UDP;
- pkt4->ip_hdr.chks = 0; /* Will be calculated later */
-
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ reply = (const struct GNUNET_EXIT_UdpReplyMessage *) message;
+ mlen -= sizeof (struct GNUNET_EXIT_UdpReplyMessage);
+ switch (ts->af)
+ {
+ case AF_INET:
{
- char *ipv4addr;
- uint32_t dadr;
-
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "vpn",
- "IPV4ADDR",
- &ipv4addr));
- inet_pton (AF_INET, ipv4addr, &dadr);
- GNUNET_free (ipv4addr);
- pkt4->ip_hdr.dadr.s_addr = dadr;
+ size_t size = sizeof (struct ip4_header)
+ + sizeof (struct udp_packet)
+ + sizeof (struct GNUNET_MessageHeader) +
+ sizeof (struct tun_header) +
+ mlen;
+ {
+ char buf[size];
+ struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf;
+ struct tun_header *tun = (struct tun_header*) &msg[1];
+ struct ip4_header *ipv4 = (struct ip4_header *) &tun[1];
+ struct udp_packet *udp = (struct udp_packet *) &ipv4[1];
+ msg->type = htons (GNUNET_MESSAGE_TYPE_VPN_HELPER);
+ msg->size = htons (size);
+ tun->flags = htons (0);
+ tun->proto = htons (ETH_P_IPV4);
+ ipv4->version = 4;
+ ipv4->header_length = sizeof (struct ip4_header) / 4;
+ ipv4->diff_serv = 0;
+ ipv4->total_length = htons (sizeof (struct ip4_header) +
+ sizeof (struct udp_packet) +
+ mlen);
+ ipv4->identification = (uint16_t) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT16_MAX + 1);
+ ipv4->flags = 0;
+ ipv4->fragmentation_offset = 0;
+ ipv4->ttl = 255;
+ ipv4->protocol = IPPROTO_UDP;
+ ipv4->checksum = 0;
+ ipv4->source_address = ts->destination_ip.v4;
+ ipv4->destination_address = ts->source_ip.v4;
+ ipv4->checksum =
+ GNUNET_CRYPTO_crc16_n (ipv4, sizeof (struct ip4_header));
+ if (0 == ntohs (reply->source_port))
+ udp->spt = htons (ts->destination_port);
+ else
+ udp->spt = reply->source_port;
+ if (0 == ntohs (reply->destination_port))
+ udp->dpt = htons (ts->source_port);
+ else
+ udp->dpt = reply->destination_port;
+ udp->len = htons (mlen + sizeof (struct udp_packet));
+ udp->crc = 0; // FIXME: optional, but we might want to calculate this one anyway
+ memcpy (&udp[1],
+ &reply[1],
+ mlen);
+ (void) GNUNET_HELPER_send (helper_handle,
+ msg,
+ GNUNET_YES,
+ NULL, NULL);
+ }
}
- memcpy (&pkt4->udp_hdr, pkt, ntohs (pkt->len));
-
- GNUNET_HashCode *key = address4_mapping_exists (pkt4->ip_hdr.sadr.s_addr);
-
- GNUNET_assert (key != NULL);
-
- struct map_entry *me = GNUNET_CONTAINER_multihashmap_get (hashmap, key);
-
- GNUNET_CONTAINER_heap_update_cost (heap, me->heap_node,
- GNUNET_TIME_absolute_get ().abs_value);
-
- GNUNET_free (key);
-
- GNUNET_assert (me != NULL);
-
- pkt4->udp_hdr.crc = 0; /* Optional for IPv4 */
-
- pkt4->ip_hdr.chks =
- GNUNET_CRYPTO_crc16_n ((uint16_t *) & pkt4->ip_hdr, 5 * 4);
-
- (void) GNUNET_HELPER_send (helper_handle,
- &pkt4->shdr,
- GNUNET_YES,
- NULL, NULL);
+ break;
+ case AF_INET6:
+ {
+ size_t size = sizeof (struct ip6_header)
+ + sizeof (struct udp_packet)
+ + sizeof (struct GNUNET_MessageHeader) +
+ sizeof (struct tun_header) +
+ mlen;
+ {
+ char buf[size];
+ struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf;
+ struct tun_header *tun = (struct tun_header*) &msg[1];
+ struct ip6_header *ipv6 = (struct ip6_header *) &tun[1];
+ struct udp_packet *udp = (struct udp_packet *) &ipv6[1];
+ msg->type = htons (GNUNET_MESSAGE_TYPE_VPN_HELPER);
+ msg->size = htons (size);
+ tun->flags = htons (0);
+ tun->proto = htons (ETH_P_IPV6);
+ ipv6->traffic_class_h = 0;
+ ipv6->version = 6;
+ ipv6->traffic_class_l = 0;
+ ipv6->flow_label = 0;
+ ipv6->payload_length = htons (sizeof (struct udp_packet) + sizeof (struct ip6_header) + mlen);
+ ipv6->next_header = IPPROTO_UDP;
+ ipv6->hop_limit = 255;
+ ipv6->source_address = ts->destination_ip.v6;
+ ipv6->destination_address = ts->source_ip.v6;
+ if (0 == ntohs (reply->source_port))
+ udp->spt = htons (ts->destination_port);
+ else
+ udp->spt = reply->source_port;
+ if (0 == ntohs (reply->destination_port))
+ udp->dpt = htons (ts->source_port);
+ else
+ udp->dpt = reply->destination_port;
+ udp->len = htons (mlen + sizeof (struct udp_packet));
+ udp->crc = 0;
+ memcpy (&udp[1],
+ &reply[1],
+ mlen);
+ {
+ uint32_t sum = 0;
+ sum =
+ GNUNET_CRYPTO_crc16_step (sum, &ipv6->source_address,
+ sizeof (struct in6_addr) * 2);
+ uint32_t tmp = udp->len;
+ sum = GNUNET_CRYPTO_crc16_step (sum, &tmp, sizeof (uint32_t));
+ tmp = htons (IPPROTO_UDP);
+ sum = GNUNET_CRYPTO_crc16_step (sum, &tmp, sizeof (uint32_t));
+ sum = GNUNET_CRYPTO_crc16_step (sum,
+ udp,
+ ntohs (udp->len));
+ udp->crc = GNUNET_CRYPTO_crc16_finish (sum);
+ }
+ (void) GNUNET_HELPER_send (helper_handle,
+ msg,
+ GNUNET_YES,
+ NULL, NULL);
+ }
+ }
+ break;
+ default:
+ GNUNET_assert (0);
}
+#if 0
+ // FIXME: refresh entry to avoid expiration...
+ struct map_entry *me = GNUNET_CONTAINER_multihashmap_get (hashmap, key);
+
+ GNUNET_CONTAINER_heap_update_cost (heap, me->heap_node,
+ GNUNET_TIME_absolute_get ().abs_value);
+
#endif
return GNUNET_OK;
}
const struct GNUNET_MessageHeader *message,
const struct GNUNET_ATS_Information *atsi GNUNET_UNUSED)
{
+ struct TunnelState *ts = *tunnel_ctx;
+ const struct GNUNET_EXIT_TcpDataMessage *data;
+ size_t mlen;
+
+ mlen = ntohs (message->size);
+ if (mlen < sizeof (struct GNUNET_EXIT_TcpDataMessage))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ if (NULL == ts->heap_node)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ data = (const struct GNUNET_EXIT_TcpDataMessage *) message;
+ mlen -= sizeof (struct GNUNET_EXIT_TcpDataMessage);
+ switch (ts->af)
+ {
+ case AF_INET:
+ {
+ size_t size = sizeof (struct ip4_header)
+ + sizeof (struct tcp_packet)
+ + sizeof (struct GNUNET_MessageHeader) +
+ sizeof (struct tun_header) +
+ mlen;
+ {
+ char buf[size];
+ struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) buf;
+ struct tun_header *tun = (struct tun_header*) &msg[1];
+ struct ip4_header *ipv4 = (struct ip4_header *) &tun[1];
+ struct tcp_packet *tcp = (struct tcp_packet *) &ipv4[1];
+ msg->type = htons (GNUNET_MESSAGE_TYPE_VPN_HELPER);
+ msg->size = htons (size);
+ tun->flags = htons (0);
+ tun->proto = htons (ETH_P_IPV4);
+ ipv4->version = 4;
+ ipv4->header_length = sizeof (struct ip4_header) / 4;
+ ipv4->diff_serv = 0;
+ ipv4->total_length = htons (sizeof (struct ip4_header) +
+ sizeof (struct tcp_packet) +
+ mlen);
+ ipv4->identification = (uint16_t) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT16_MAX + 1);
+ ipv4->flags = 0;
+ ipv4->fragmentation_offset = 0;
+ ipv4->ttl = 255;
+ ipv4->protocol = IPPROTO_TCP;
+ ipv4->checksum = 0;
+ ipv4->source_address = ts->destination_ip.v4;
+ ipv4->destination_address = ts->source_ip.v4;
+ ipv4->checksum =
+ GNUNET_CRYPTO_crc16_n (ipv4, sizeof (struct ip4_header));
+ *tcp = data->tcp_header;
+ tcp->spt = htons (ts->destination_port);
+ tcp->dpt = htons (ts->source_port);
+ tcp->crc = 0;
+ memcpy (&tcp[1],
+ &data[1],
+ mlen);
+ {
+ uint32_t sum = 0;
+ uint32_t tmp;
+
+ sum = GNUNET_CRYPTO_crc16_step (sum,
+ &ipv4->source_address,
+ 2 * sizeof (struct in_addr));
+ tmp = htonl ((IPPROTO_TCP << 16) | (mlen + sizeof (struct tcp_packet)));
+ sum = GNUNET_CRYPTO_crc16_step (sum, &tmp, sizeof (uint32_t));
+ sum = GNUNET_CRYPTO_crc16_step (sum, tcp, mlen + sizeof (struct tcp_packet));
+ tcp->crc = GNUNET_CRYPTO_crc16_finish (sum);
+ }
+ (void) GNUNET_HELPER_send (helper_handle,
+ msg,
+ GNUNET_YES,
+ NULL, NULL);
+ }
+ }
+ break;
+ case AF_INET6:
+ break;
+ default:
+ GNUNET_assert (0);
+ }
// FIXME: parse message, build IP packet, give to TUN!
#if 0
GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1);
GNUNET_assert (me != NULL);
pkt6->tcp_hdr.crc = 0;
- uint32_t sum = 0;
- uint32_t tmp;
- sum =
- GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16);
+ uint32_t sum = 0;
+ uint32_t tmp;
+
+ sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16);
sum =
GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.dadr, 16);
tmp = htonl (pktlen);
ntohs (pkt6->ip6_hdr.paylgth));
pkt6->tcp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
+
(void) GNUNET_HELPER_send (helper_handle,
&pkt6->shdr,
GNUNET_YES,
GNUNET_assert (me != NULL);
pkt4->tcp_hdr.crc = 0;
- uint32_t sum = 0;
- uint32_t tmp;
-
- sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) &pkt4->ip_hdr.sadr, 4);
- sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) &pkt4->ip_hdr.dadr, 4);
-
- tmp = (0x06 << 16) | (0xffff & pktlen); // 0x06 for TCP?
-
- tmp = htonl (tmp);
-
- sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
-
- sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt4->tcp_hdr, pktlen);
- pkt4->tcp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
-
- pkt4->ip_hdr.chks =
- GNUNET_CRYPTO_crc16_n ((uint16_t *) & pkt4->ip_hdr, 5 * 4);
(void) GNUNET_HELPER_send (helper_handle,
&pkt4->shdr,
NULL, NULL);
}
+#endif
+
+#if 0
+ // FIXME: refresh entry to avoid expiration...
+ struct map_entry *me = GNUNET_CONTAINER_multihashmap_get (hashmap, key);
+
+ GNUNET_CONTAINER_heap_update_cost (heap, me->heap_node,
+ GNUNET_TIME_absolute_get ().abs_value);
+
#endif
return GNUNET_OK;
}
projects / oweals / gnunet.git / blobdiff