- Added indirectdata and tcponly functionality.

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index b265122..f335724 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -1,6 +1,7 @@
 /*
     net.h -- header for net.c
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998-2001 Ivo Timmermans <zarq@iname.com>
+                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
     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.19 2000/10/29 01:27:23 guus Exp $
+    $Id: net.h,v 1.9.4.27 2001/01/07 20:19:31 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -78,11 +79,6 @@ typedef struct vpn_packet_t {
   unsigned char data[MAXSIZE];
 } vpn_packet_t;
 
-typedef struct passphrase_t {
-  unsigned short len;
-  unsigned char *phrase;
-} passphrase_t;
-
 typedef struct queue_element_t {
   void *packet;
   struct queue_element_t *prev;
@@ -112,18 +108,26 @@ extern char *unknown;
 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 */
+#include "connection.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 receive_packet(connection_t *, vpn_packet_t *);
 extern int setup_network_connections(void);
 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 flush_queues(conn_list_t *);
-extern int xrecv(vpn_packet_t *);
-extern void add_queue(packet_queue_t **, void *, size_t);
+extern int setup_vpn_connection(connection_t *);
+extern void terminate_connection(connection_t *);
+extern void flush_queue(connection_t *);
+
+#include <config.h>
+#ifdef HAVE_OPENSSL_RSA_H
+# include <openssl/rsa.h>
+#else
+# include <rsa.h>
+#endif
+
+extern int read_rsa_public_key(connection_t *);
 
 #endif /* __TINC_NET_H__ */