projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Fixing-things pass: every source file compiles into an object file now,
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
8d416ec
..
e2b6d06
100644
(file)
--- a/
src/net.h
+++ b/
src/net.h
@@
-16,7
+16,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net.h,v 1.9.4.1
4 2000/10/11 10:35:16
guus Exp $
+ $Id: net.h,v 1.9.4.1
5 2000/10/11 22:01:00
guus Exp $
*/
#ifndef __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
@@
-26,7
+26,6
@@
#include "config.h"
#include "conf.h"
#include "config.h"
#include "conf.h"
-#include "connlist.h"
#define MAXSIZE 1700 /* should be a bit more than the MTU for the tapdevice */
#define MTU 1600
#define MAXSIZE 1700 /* should be a bit more than the MTU for the tapdevice */
#define MTU 1600
@@
-129,6
+128,8
@@
extern int total_socket_out;
extern char *request_name[256];
extern char *status_text[10];
extern char *request_name[256];
extern char *status_text[10];
+#include "connlist.h" /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
+
extern int str2opt(const char *);
extern char *opt2str(int);
extern int send_packet(ip_t, vpn_packet_t *);
extern int str2opt(const char *);
extern char *opt2str(int);
extern int send_packet(ip_t, vpn_packet_t *);
@@
-137,7
+138,7
@@
extern void close_network_connections(void);
extern void main_loop(void);
extern int setup_vpn_connection(conn_list_t *);
extern void terminate_connection(conn_list_t *);
extern void main_loop(void);
extern int setup_vpn_connection(conn_list_t *);
extern void terminate_connection(conn_list_t *);
-extern void flush_queues(conn_list_t*);
+extern void flush_queues(conn_list_t
*);
extern int xrecv(vpn_packet_t *);
extern void add_queue(packet_queue_t **, void *, size_t);
extern int xrecv(vpn_packet_t *);
extern void add_queue(packet_queue_t **, void *, size_t);