X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=27ba87c87890ef8716486715479174bb2fb749d0;hp=b265122a8832762d6348580f19ad8f2cce27cbac;hb=e1707f7739f450c729e26b921e459d5da07602f9;hpb=e8391bd49975aa29fa62d6ae1d2d2ee398e0eb3e

diff --git a/src/net.h b/src/net.h
index b265122a..27ba87c8 100644
--- 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.
 
-    $Id: net.h,v 1.9.4.19 2000/10/29 01:27:23 guus Exp $
+    $Id: net.h,v 1.9.4.24 2000/12/22 21:34:23 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -78,11 +78,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,7 +107,7 @@ 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);
@@ -120,10 +115,19 @@ extern int send_packet(ip_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 int setup_vpn_connection(connection_t *);
+extern void terminate_connection(connection_t *);
+extern void flush_queues(connection_t *);
 extern void add_queue(packet_queue_t **, void *, size_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__ */