- tinc now really does public/private key encryption! It even works, whee!

[tinc] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index f3119aa..c3147a7 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -17,29 +17,20 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.h,v 1.5.4.7 2000/09/11 10:05:35 guus Exp $
+    $Id: protocol.h,v 1.5.4.12 2000/10/20 15:34:38 guus Exp $
 */
 
 #ifndef __TINC_PROTOCOL_H__
 #define __TINC_PROTOCOL_H__
 
 #include "net.h"
+#include "subnet.h"
 
 /* Protocol version. Different versions are incompatible,
    incompatible version have different protocols.
  */
 
-enum {
-  PROT_RESERVED = 0,                 /* reserved: do not use. */
-  PROT_NOT_IN_USE,
-  PROT_TOO_OLD = 2,
-  PROT_3,
-  PROT_4,
-  PROT_ECHELON,
-  PROT_6,
-  PROT_7,
-  PROT_CURRENT,                      /* protocol currently in use */
-};
+#define PROT_CURRENT 8
 
 /* Request numbers */
 
@@ -58,7 +49,7 @@ extern int (*request_handlers[])(conn_list_t*);
 
 extern int send_id(conn_list_t*);
 extern int send_challenge(conn_list_t*);
-extern int send_chal_reply(conn_list_t*, char*);
+extern int send_chal_reply(conn_list_t*);
 extern int send_ack(conn_list_t*);
 extern int send_status(conn_list_t*, int, char*);
 extern int send_error(conn_list_t*, int, char*);
@@ -79,5 +70,3 @@ extern int send_tcppacket(conn_list_t *, void *, int);
 extern int notify_others(conn_list_t *, conn_list_t *, int (*function)(conn_list_t*, conn_list_t*));
 
 #endif /* __TINC_PROTOCOL_H__ */
-
-