aboutsummaryrefslogtreecommitdiff
path: root/src/vpn
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-06-09 17:21:27 +0000
committerChristian Grothoff <christian@grothoff.org>2011-06-09 17:21:27 +0000
commit6112697b4d897cca54972eec49ac96cb2224d28b (patch)
treef3a563deaa27289b9412f644dc0df256f75f803d /src/vpn
parentd137ef455b759490dfc4c658054fdbe3bc8708e7 (diff)
downloadgnunet-6112697b4d897cca54972eec49ac96cb2224d28b.tar.gz
gnunet-6112697b4d897cca54972eec49ac96cb2224d28b.zip
fix
Diffstat (limited to 'src/vpn')
-rw-r--r--src/vpn/gnunet-daemon-vpn.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c
index 384018107..6da86a0eb 100644
--- a/src/vpn/gnunet-daemon-vpn.c
+++ b/src/vpn/gnunet-daemon-vpn.c
@@ -236,11 +236,6 @@ new_ip6addr(unsigned char* buf, const GNUNET_HashCode *peer, const GNUNET_HashCo
236} 236}
237/*}}}*/ 237/*}}}*/
238 238
239char
240max (char a, char b)
241{
242 return a > b ? a : b;
243}
244 239
245/** 240/**
246 * Create a new Address from an answer-packet 241 * Create a new Address from an answer-packet
@@ -266,7 +261,7 @@ new_ip6addr_remote (unsigned char *buf, unsigned char *addr, char addrlen)
266 261
267 int local_length = 16 - ipv6prefix; 262 int local_length = 16 - ipv6prefix;
268 263
269 memcpy (buf + ipv6prefix, addr, max (addrlen, local_length)); 264 memcpy (buf + ipv6prefix, addr, GNUNET_MAX (addrlen, local_length));
270} 265}
271/*}}}*/ 266/*}}}*/
272 267