projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'getopt'
[oweals/gnunet.git]
/
src
/
vpn
/
gnunet-service-vpn.c
diff --git
a/src/vpn/gnunet-service-vpn.c
b/src/vpn/gnunet-service-vpn.c
index aab0a143fa5116ffea04e367d5e7e7743d29f8c7..4759f374661e0ba46c4969ee0383ba5e8eade6a6 100644
(file)
--- a/
src/vpn/gnunet-service-vpn.c
+++ b/
src/vpn/gnunet-service-vpn.c
@@
-1384,7
+1384,7
@@
create_channel (struct ChannelState *ts,
GNUNET_MQ_handler_end()
};
GNUNET_MQ_handler_end()
};
- return GNUNET_CADET_channel_creat
E
(cadet_handle,
+ return GNUNET_CADET_channel_creat
e
(cadet_handle,
ts,
target,
port,
ts,
target,
port,
@@
-2217,12
+2217,10
@@
route_packet (struct DestinationEntry *destination,
* and forward the packet.
*
* @param cls closure, NULL
* and forward the packet.
*
* @param cls closure, NULL
- * @param client NULL
* @param message message we got from the client (VPN channel interface)
*/
static int
message_token (void *cls,
* @param message message we got from the client (VPN channel interface)
*/
static int
message_token (void *cls,
- void *client,
const struct GNUNET_MessageHeader *message)
{
const struct GNUNET_TUN_Layer2PacketHeader *tun;
const struct GNUNET_MessageHeader *message)
{
const struct GNUNET_TUN_Layer2PacketHeader *tun;
@@
-3068,7
+3066,7
@@
run (void *cls,
}
vpn_argv[6] = NULL;
}
vpn_argv[6] = NULL;
- cadet_handle = GNUNET_CADET_connec
T
(cfg_);
+ cadet_handle = GNUNET_CADET_connec
t
(cfg_);
// FIXME never opens ports???
helper_handle = GNUNET_HELPER_start (GNUNET_NO,
"gnunet-helper-vpn", vpn_argv,
// FIXME never opens ports???
helper_handle = GNUNET_HELPER_start (GNUNET_NO,
"gnunet-helper-vpn", vpn_argv,