j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Browse source 
Conflicts:
	src/net.c
	src/net_packet.c
	src/net_socket.c
This commit is contained in:
Guus Sliepen 2012-02-23 13:26:01 +01:00
commit f5dc136cfd
8 changed files with 67 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/net.h
View file

@ -109,6 +109,7 @@ extern int maxoutbufsize;
extern int seconds_till_retry;
extern int addressfamily;
extern unsigned replaywin;
extern bool localdiscovery;
extern listen_socket_t listen_socket[MAXSOCKETS];
extern int listen_sockets;