projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d137ef4
)
fix
author
Christian Grothoff
<christian@grothoff.org>
Thu, 9 Jun 2011 17:21:27 +0000
(17:21 +0000)
committer
Christian Grothoff
<christian@grothoff.org>
Thu, 9 Jun 2011 17:21:27 +0000
(17:21 +0000)
src/vpn/gnunet-daemon-vpn.c
patch
|
blob
|
history
diff --git
a/src/vpn/gnunet-daemon-vpn.c
b/src/vpn/gnunet-daemon-vpn.c
index 3840181075773dcad89cfc2f3d026d853dab10d1..6da86a0ebdfa571eb15c2770bb76f047ab33e562 100644
(file)
--- 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
}
/*}}}*/
-char
-max (char a, char b)
-{
- return a > b ? a : b;
-}
/**
* Create a new Address from an answer-packet
@@
-266,7
+261,7
@@
new_ip6addr_remote (unsigned char *buf, unsigned char *addr, char addrlen)
int local_length = 16 - ipv6prefix;
- memcpy (buf + ipv6prefix, addr,
max
(addrlen, local_length));
+ memcpy (buf + ipv6prefix, addr,
GNUNET_MAX
(addrlen, local_length));
}
/*}}}*/