aboutsummaryrefslogtreecommitdiff
path: root/src/vpn/gnunet-daemon-exit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/vpn/gnunet-daemon-exit.c')
-rw-r--r--src/vpn/gnunet-daemon-exit.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/vpn/gnunet-daemon-exit.c b/src/vpn/gnunet-daemon-exit.c
index ebe3ec61a..608646202 100644
--- a/src/vpn/gnunet-daemon-exit.c
+++ b/src/vpn/gnunet-daemon-exit.c
@@ -835,8 +835,8 @@ prepare_ipv4_packet (size_t len, uint16_t pktlen, void *payload,
835 pkt4_tcp->tcp_hdr.crc = 0; 835 pkt4_tcp->tcp_hdr.crc = 0;
836 uint32_t sum = 0; 836 uint32_t sum = 0;
837 837
838 sum = calculate_checksum_update (sum, (uint16_t *) &pkt4->ip_hdr.sadr, sizeof (struct in_addr)); 838 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) &pkt4->ip_hdr.sadr, sizeof (struct in_addr));
839 sum = calculate_checksum_update (sum, (uint16_t *) &pkt4->ip_hdr.dadr, sizeof (struct in_addr)); 839 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) &pkt4->ip_hdr.dadr, sizeof (struct in_addr));
840 840
841 tmp = (protocol << 16) | (0xffff & pktlen); 841 tmp = (protocol << 16) | (0xffff & pktlen);
842 842
@@ -845,16 +845,16 @@ prepare_ipv4_packet (size_t len, uint16_t pktlen, void *payload,
845 845
846 tmp = htonl (tmp); 846 tmp = htonl (tmp);
847 847
848 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 848 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
849 849
850 sum = 850 sum =
851 calculate_checksum_update (sum, (uint16_t *) & pkt4_tcp->tcp_hdr, 851 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt4_tcp->tcp_hdr,
852 pktlen); 852 pktlen);
853 pkt4_tcp->tcp_hdr.crc = calculate_checksum_end (sum); 853 pkt4_tcp->tcp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
854 } 854 }
855 855
856 pkt4->ip_hdr.chks = 856 pkt4->ip_hdr.chks =
857 calculate_ip_checksum ((uint16_t *) & pkt4->ip_hdr, 5 * 4); 857 GNUNET_CRYPTO_crc16_n ((uint16_t *) & pkt4->ip_hdr, 5 * 4);
858} 858}
859 859
860static void 860static void
@@ -919,20 +919,20 @@ prepare_ipv6_packet (size_t len, uint16_t pktlen, void *payload,
919 uint32_t sum = 0; 919 uint32_t sum = 0;
920 920
921 sum = 921 sum =
922 calculate_checksum_update (sum, (uint16_t *) & pkt6_udp->ip6_hdr.sadr, 922 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6_udp->ip6_hdr.sadr,
923 16); 923 16);
924 sum = 924 sum =
925 calculate_checksum_update (sum, (uint16_t *) & pkt6_udp->ip6_hdr.dadr, 925 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6_udp->ip6_hdr.dadr,
926 16); 926 16);
927 tmp = (htons (pktlen) & 0xffff); 927 tmp = (htons (pktlen) & 0xffff);
928 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 928 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
929 tmp = htons (((pkt6_udp->ip6_hdr.nxthdr & 0x00ff))); 929 tmp = htons (((pkt6_udp->ip6_hdr.nxthdr & 0x00ff)));
930 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 930 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
931 931
932 sum = 932 sum =
933 calculate_checksum_update (sum, (uint16_t *) & pkt6_udp->udp_hdr, 933 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6_udp->udp_hdr,
934 ntohs (pkt6_udp->udp_hdr.len)); 934 ntohs (pkt6_udp->udp_hdr.len));
935 pkt6_udp->udp_hdr.crc = calculate_checksum_end (sum); 935 pkt6_udp->udp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
936 } 936 }
937 else if (IPPROTO_TCP == protocol) 937 else if (IPPROTO_TCP == protocol)
938 { 938 {
@@ -944,18 +944,18 @@ prepare_ipv6_packet (size_t len, uint16_t pktlen, void *payload,
944 uint32_t sum = 0; 944 uint32_t sum = 0;
945 945
946 sum = 946 sum =
947 calculate_checksum_update (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16); 947 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.sadr, 16);
948 sum = 948 sum =
949 calculate_checksum_update (sum, (uint16_t *) & pkt6->ip6_hdr.dadr, 16); 949 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6->ip6_hdr.dadr, 16);
950 tmp = htonl (pktlen); 950 tmp = htonl (pktlen);
951 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 951 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
952 tmp = htonl (((pkt6->ip6_hdr.nxthdr & 0x000000ff))); 952 tmp = htonl (((pkt6->ip6_hdr.nxthdr & 0x000000ff)));
953 sum = calculate_checksum_update (sum, (uint16_t *) & tmp, 4); 953 sum = GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & tmp, 4);
954 954
955 sum = 955 sum =
956 calculate_checksum_update (sum, (uint16_t *) & pkt6_tcp->tcp_hdr, 956 GNUNET_CRYPTO_crc16_step (sum, (uint16_t *) & pkt6_tcp->tcp_hdr,
957 ntohs (pkt6->ip6_hdr.paylgth)); 957 ntohs (pkt6->ip6_hdr.paylgth));
958 pkt6_tcp->tcp_hdr.crc = calculate_checksum_end (sum); 958 pkt6_tcp->tcp_hdr.crc = GNUNET_CRYPTO_crc16_finish (sum);
959 } 959 }
960} 960}
961 961