aboutsummaryrefslogtreecommitdiff
path: root/src/vpn
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-17 11:53:24 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-17 11:53:24 +0100
commitc253a40bae417335fab8446f3c7182c8c5d4833f (patch)
tree0517ab35f90bf290744e5a9ddfeb75ca9547cdbe /src/vpn
parent273188e646ed4d91ced1dac443e976336be877b4 (diff)
parent79fb947eb8fba243ea65e19b40b65e04f8806865 (diff)
downloadgnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.tar.gz
gnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.zip
Merge branch 'master' into getopt
Diffstat (limited to 'src/vpn')
-rw-r--r--src/vpn/gnunet-service-vpn.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index ab0b00d76..4759f3746 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -2217,12 +2217,10 @@ route_packet (struct DestinationEntry *destination,
2217 * and forward the packet. 2217 * and forward the packet.
2218 * 2218 *
2219 * @param cls closure, NULL 2219 * @param cls closure, NULL
2220 * @param client NULL
2221 * @param message message we got from the client (VPN channel interface) 2220 * @param message message we got from the client (VPN channel interface)
2222 */ 2221 */
2223static int 2222static int
2224message_token (void *cls, 2223message_token (void *cls,
2225 void *client,
2226 const struct GNUNET_MessageHeader *message) 2224 const struct GNUNET_MessageHeader *message)
2227{ 2225{
2228 const struct GNUNET_TUN_Layer2PacketHeader *tun; 2226 const struct GNUNET_TUN_Layer2PacketHeader *tun;