Lots of changes. It compiles, but doesn't do much yet.

[tinc] / tnl / tnl.h

diff --git a/tnl/tnl.h b/tnl/tnl.h
index 9f1f836..6b18408 100644 (file)
--- a/tnl/tnl.h
+++ b/tnl/tnl.h
@@ -27,6 +27,8 @@
 
 #include "fd/fd.h"
 
+#define TNL_PROTOCOL 0
+
 #define TNL_RECORD_PACKET 0
 #define TNL_RECORD_META 1
 #define TNL_RECORD_HELLO 2
@@ -47,7 +49,8 @@ typedef enum tnl_status {
 
 typedef struct tnl_ep {
        struct sockaddr_storage address;
-       struct tnl_ep_identity *id;
+       char *id;
+       char *hostname;
        struct tnl_ep_credentials *cred;
        struct tnl_ep_cryptoparm *parm;
 } tnl_ep_t;
@@ -61,12 +64,12 @@ typedef struct tnl {
        enum tnl_status status;
        void *data;
 
-       bool (*send_packet)(struct tnl *tnl, const char *buf, int len);
-       bool (*send_meta)(struct tnl *tnl, const char *buf, int len);
+       bool (*send_packet)(struct tnl *tnl, const void *buf, int len);
+       bool (*send_meta)(struct tnl *tnl, const void *buf, int len);
        bool (*close)(struct tnl *tnl);
 
-       bool (*recv_packet)(struct tnl *tnl, const char *buf, int len);
-       bool (*recv_meta)(struct tnl *tnl, const char *buf, int len);
+       bool (*recv_packet)(struct tnl *tnl, const void *buf, int len);
+       bool (*recv_meta)(struct tnl *tnl, const void *buf, int len);
        bool (*accept)(struct tnl *tnl);
        bool (*error)(struct tnl *tnl, int errnum);
 
@@ -89,8 +92,6 @@ typedef struct tnl_listen {
        struct fd fd;
 } tnl_listen_t;
 
-extern bool tnl_init(void);
-extern bool tnl_exit(void);
 extern bool tnl_listen(struct tnl_listen *listener);
 extern bool tnl_connect(struct tnl *tnl);