aboutsummaryrefslogtreecommitdiff
path: root/src/vpn/gnunet-daemon-vpn.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/vpn/gnunet-daemon-vpn.c')
-rw-r--r--src/vpn/gnunet-daemon-vpn.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c
index 35db8af7b..ad6ed5044 100644
--- a/src/vpn/gnunet-daemon-vpn.c
+++ b/src/vpn/gnunet-daemon-vpn.c
@@ -299,18 +299,18 @@ helper_write (void *cls GNUNET_UNUSED,
299 pkt->udp_dns.udp_hdr.crc = 0; 299 pkt->udp_dns.udp_hdr.crc = 0;
300 uint32_t sum = 0; 300 uint32_t sum = 0;
301 301
302 sum = calculate_checksum_update (sum, (uint16_t *) & pkt->ip6_hdr.sadr, 16); 302 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt->ip6_hdr.sadr, 16);
303 sum = calculate_checksum_update (sum, (uint16_t *) & pkt->ip6_hdr.dadr, 16); 303 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt->ip6_hdr.dadr, 16);
304 uint32_t tmp = (pkt->udp_dns.udp_hdr.len & 0xffff); 304 uint32_t tmp = (pkt->udp_dns.udp_hdr.len & 0xffff);
305 305
306 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 306 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
307 tmp = htons (((pkt->ip6_hdr.nxthdr & 0x00ff))); 307 tmp = htons (((pkt->ip6_hdr.nxthdr & 0x00ff)));
308 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 308 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
309 309
310 sum = 310 sum =
311 calculate_checksum_update (sum, (uint16_t *) & pkt->udp_dns.udp_hdr, 311 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt->udp_dns.udp_hdr,
312 ntohs (net_len - sizeof (struct ip6_hdr))); 312 ntohs (net_len - sizeof (struct ip6_hdr)));
313 pkt->udp_dns.udp_hdr.crc = calculate_checksum_end (sum); 313 pkt->udp_dns.udp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
314 314
315 pkt->ip6_hdr.version = 6; 315 pkt->ip6_hdr.version = 6;
316 pkt->ip6_hdr.paylgth = net_len - sizeof (struct ip6_hdr); 316 pkt->ip6_hdr.paylgth = net_len - sizeof (struct ip6_hdr);
@@ -360,7 +360,7 @@ helper_write (void *cls GNUNET_UNUSED,
360 memcpy (&pkt->ip_hdr.dadr, ans->pkt.to, 4); 360 memcpy (&pkt->ip_hdr.dadr, ans->pkt.to, 4);
361 361
362 pkt->ip_hdr.chks = 362 pkt->ip_hdr.chks =
363 calculate_ip_checksum ((uint16_t *) & pkt->ip_hdr, 5 * 4); 363 GNUNET_CRYPTO_crc16_n ((uint16_t *) & pkt->ip_hdr, 5 * 4);
364 364
365 /* set the udp-header */ 365 /* set the udp-header */
366 pkt->udp_dns.udp_hdr.spt = htons (53); 366 pkt->udp_dns.udp_hdr.spt = htons (53);
@@ -805,7 +805,7 @@ send_icmp4_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
805 response->ip_hdr.tot_lngth = request->ip_hdr.tot_lngth; 805 response->ip_hdr.tot_lngth = request->ip_hdr.tot_lngth;
806 806
807 response->ip_hdr.chks = 807 response->ip_hdr.chks =
808 calculate_ip_checksum ((uint16_t *) & response->ip_hdr, 20); 808 GNUNET_CRYPTO_crc16_n ((uint16_t *) & response->ip_hdr, 20);
809 809
810 response->icmp_hdr.code = 0; 810 response->icmp_hdr.code = 0;
811 response->icmp_hdr.type = 0x0; 811 response->icmp_hdr.type = 0x0;
@@ -1475,19 +1475,19 @@ receive_udp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
1475 uint32_t sum = 0; 1475 uint32_t sum = 0;
1476 1476
1477 sum = 1477 sum =
1478 calculate_checksum_update (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16); 1478 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16);
1479 sum = 1479 sum =
1480 calculate_checksum_update (sum, (uint16_t *) & pkt6->ip6_hdr.dadr, 16); 1480 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.dadr, 16);
1481 uint32_t tmp = (pkt6->udp_hdr.len & 0xffff); 1481 uint32_t tmp = (pkt6->udp_hdr.len & 0xffff);
1482 1482
1483 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 1483 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
1484 tmp = htons (((pkt6->ip6_hdr.nxthdr & 0x00ff))); 1484 tmp = htons (((pkt6->ip6_hdr.nxthdr & 0x00ff)));
1485 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 1485 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
1486 1486
1487 sum = 1487 sum =
1488 calculate_checksum_update (sum, (uint16_t *) & pkt6->udp_hdr, 1488 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->udp_hdr,
1489 ntohs (pkt->len)); 1489 ntohs (pkt->len));
1490 pkt6->udp_hdr.crc = calculate_checksum_end (sum); 1490 pkt6->udp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
1491 1491
1492 (void) GNUNET_HELPER_send (helper_handle, 1492 (void) GNUNET_HELPER_send (helper_handle,
1493 &pkt6->shdr, 1493 &pkt6->shdr,
@@ -1561,7 +1561,7 @@ receive_udp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
1561 pkt4->udp_hdr.crc = 0; /* Optional for IPv4 */ 1561 pkt4->udp_hdr.crc = 0; /* Optional for IPv4 */
1562 1562
1563 pkt4->ip_hdr.chks = 1563 pkt4->ip_hdr.chks =
1564 calculate_ip_checksum ((uint16_t *) & pkt4->ip_hdr, 5 * 4); 1564 GNUNET_CRYPTO_crc16_n ((uint16_t *) & pkt4->ip_hdr, 5 * 4);
1565 1565
1566 (void) GNUNET_HELPER_send (helper_handle, 1566 (void) GNUNET_HELPER_send (helper_handle,
1567 &pkt4->shdr, 1567 &pkt4->shdr,
@@ -1655,18 +1655,18 @@ receive_tcp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
1655 uint32_t tmp; 1655 uint32_t tmp;
1656 1656
1657 sum = 1657 sum =
1658 calculate_checksum_update (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16); 1658 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16);
1659 sum = 1659 sum =
1660 calculate_checksum_update (sum, (uint16_t *) & pkt6->ip6_hdr.dadr, 16); 1660 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.dadr, 16);
1661 tmp = htonl (pktlen); 1661 tmp = htonl (pktlen);
1662 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 1662 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
1663 tmp = htonl (((pkt6->ip6_hdr.nxthdr & 0x000000ff))); 1663 tmp = htonl (((pkt6->ip6_hdr.nxthdr & 0x000000ff)));
1664 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 1664 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
1665 1665
1666 sum = 1666 sum =
1667 calculate_checksum_update (sum, (uint16_t *) & pkt6->tcp_hdr, 1667 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->tcp_hdr,
1668 ntohs (pkt6->ip6_hdr.paylgth)); 1668 ntohs (pkt6->ip6_hdr.paylgth));
1669 pkt6->tcp_hdr.crc = calculate_checksum_end (sum); 1669 pkt6->tcp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
1670 1670
1671 (void) GNUNET_HELPER_send (helper_handle, 1671 (void) GNUNET_HELPER_send (helper_handle,
1672 &pkt6->shdr, 1672 &pkt6->shdr,
@@ -1737,20 +1737,20 @@ receive_tcp_back (void *cls GNUNET_UNUSED, struct GNUNET_MESH_Tunnel *tunnel,
1737 uint32_t sum = 0; 1737 uint32_t sum = 0;
1738 uint32_t tmp; 1738 uint32_t tmp;
1739 1739
1740 sum = calculate_checksum_update (sum, (uint16_t *) &pkt4->ip_hdr.sadr, 4); 1740 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) &pkt4->ip_hdr.sadr, 4);
1741 sum = calculate_checksum_update (sum, (uint16_t *) &pkt4->ip_hdr.dadr, 4); 1741 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) &pkt4->ip_hdr.dadr, 4);
1742 1742
1743 tmp = (0x06 << 16) | (0xffff & pktlen); // 0x06 for TCP? 1743 tmp = (0x06 << 16) | (0xffff & pktlen); // 0x06 for TCP?
1744 1744
1745 tmp = htonl (tmp); 1745 tmp = htonl (tmp);
1746 1746
1747 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 1747 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
1748 1748
1749 sum = calculate_checksum_update (sum, (uint16_t *) & pkt4->tcp_hdr, pktlen); 1749 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt4->tcp_hdr, pktlen);
1750 pkt4->tcp_hdr.crc = calculate_checksum_end (sum); 1750 pkt4->tcp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
1751 1751
1752 pkt4->ip_hdr.chks = 1752 pkt4->ip_hdr.chks =
1753 calculate_ip_checksum ((uint16_t *) & pkt4->ip_hdr, 5 * 4); 1753 GNUNET_CRYPTO_crc16_n ((uint16_t *) & pkt4->ip_hdr, 5 * 4);
1754 1754
1755 (void) GNUNET_HELPER_send (helper_handle, 1755 (void) GNUNET_HELPER_send (helper_handle,
1756 &pkt4->shdr, 1756 &pkt4->shdr,
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 04:39:03 +0000