- Don't even think about using sscanf with %as anymore

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index e3d974e..27ba87c 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.
 
-    $Id: net.h,v 1.9.4.21 2000/11/04 22:57:31 guus Exp $
+    $Id: net.h,v 1.9.4.24 2000/12/22 21:34:23 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -107,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);
@@ -115,9 +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 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__ */