diff options
author | Philipp Tölke <toelke@in.tum.de> | 2011-05-04 07:30:05 +0000 |
---|---|---|
committer | Philipp Tölke <toelke@in.tum.de> | 2011-05-04 07:30:05 +0000 |
commit | b0a0cc3b954911a42ffd376b9d84d9536fc82a5c (patch) | |
tree | 6abe4925c68d022ff660db47920294ff15be4082 /src/vpn | |
parent | 2dd926e8fd80a05d3dffbf05845fffec638a282d (diff) | |
download | gnunet-b0a0cc3b954911a42ffd376b9d84d9536fc82a5c.tar.gz gnunet-b0a0cc3b954911a42ffd376b9d84d9536fc82a5c.zip |
fix compile-errors
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/gnunet-daemon-exit.c | 2 | ||||
-rw-r--r-- | src/vpn/gnunet-daemon-vpn.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/vpn/gnunet-daemon-exit.c b/src/vpn/gnunet-daemon-exit.c index 3e49a3290..5a9be9335 100644 --- a/src/vpn/gnunet-daemon-exit.c +++ b/src/vpn/gnunet-daemon-exit.c | |||
@@ -814,7 +814,6 @@ receive_tcp_service (void *cls, | |||
814 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) | 814 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) |
815 | { | 815 | { |
816 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received TCP-Packet\n"); | 816 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received TCP-Packet\n"); |
817 | GNUNET_HashCode hash; | ||
818 | GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1); | 817 | GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1); |
819 | struct tcp_pkt *pkt = (struct tcp_pkt *) (desc + 1); | 818 | struct tcp_pkt *pkt = (struct tcp_pkt *) (desc + 1); |
820 | unsigned int pkt_len = ntohs (message->size) - sizeof (struct | 819 | unsigned int pkt_len = ntohs (message->size) - sizeof (struct |
@@ -917,7 +916,6 @@ receive_udp_service (void *cls, | |||
917 | const struct GNUNET_MessageHeader *message, | 916 | const struct GNUNET_MessageHeader *message, |
918 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) | 917 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) |
919 | { | 918 | { |
920 | GNUNET_HashCode hash; | ||
921 | GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1); | 919 | GNUNET_HashCode *desc = (GNUNET_HashCode *) (message + 1); |
922 | struct udp_pkt *pkt = (struct udp_pkt *) (desc + 1); | 920 | struct udp_pkt *pkt = (struct udp_pkt *) (desc + 1); |
923 | 921 | ||
diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c index 6829b3cd9..72f52eccc 100644 --- a/src/vpn/gnunet-daemon-vpn.c +++ b/src/vpn/gnunet-daemon-vpn.c | |||
@@ -236,6 +236,12 @@ new_ip6addr(unsigned char* buf, const GNUNET_HashCode *peer, const GNUNET_HashCo | |||
236 | } | 236 | } |
237 | /*}}}*/ | 237 | /*}}}*/ |
238 | 238 | ||
239 | char | ||
240 | max (char a, char b) | ||
241 | { | ||
242 | return a > b ? a : b; | ||
243 | } | ||
244 | |||
239 | /** | 245 | /** |
240 | * Create a new Address from an answer-packet | 246 | * Create a new Address from an answer-packet |
241 | */ | 247 | */ |
@@ -396,7 +402,7 @@ process_answer(void* cls, const struct GNUNET_SCHEDULER_TaskContext* tc) { | |||
396 | memset(&key, 0, sizeof(GNUNET_HashCode)); | 402 | memset(&key, 0, sizeof(GNUNET_HashCode)); |
397 | 403 | ||
398 | unsigned char* c = ((unsigned char*)pkt)+ntohs(pkt->addroffset); | 404 | unsigned char* c = ((unsigned char*)pkt)+ntohs(pkt->addroffset); |
399 | new_ip6addr_remote(c, &pkt->addr, pkt->addrsize); | 405 | new_ip6addr_remote(c, pkt->addr, pkt->addrsize); |
400 | unsigned char* k = (unsigned char*)&key; | 406 | unsigned char* k = (unsigned char*)&key; |
401 | /* | 407 | /* |
402 | * Copy the newly generated ip-address to the key backwards (as only the first part is used in the hash-table) | 408 | * Copy the newly generated ip-address to the key backwards (as only the first part is used in the hash-table) |