-typedef struct add_host_t {
- unsigned char type;
- char unused1;
- ip_t real_ip;
- ip_t vpn_ip;
- ip_t vpn_mask;
- unsigned short portnr;
-} add_host_t;
-
-typedef struct termreq_t {
- unsigned char type;
- char unused1;
- ip_t vpn_ip;
-} termreq_t;
-
-typedef struct basic_info_t {
- unsigned char type;
- unsigned char protocol;
- unsigned short portnr;
- ip_t vpn_ip;
- ip_t vpn_mask;
-} basic_info_t;
-
-typedef struct calculate_t {
- unsigned char type;
- char unused1;
- unsigned short len;
- char key;
-} calculate_t;
-
-typedef struct public_key_t {
- unsigned char type;
- char unused1;
- unsigned short len;
- char key;
-} public_key_t;
-
-typedef struct key_req_t {
- unsigned char type;
- char unused1;
- ip_t from;
- ip_t to;
- time_t expiry;
- short int len; /* 0 if requesting */
- char key;
-} key_req_t;
-
-typedef struct key_changed_t {
- unsigned char type;
- char unused1;
- ip_t from;
-} key_changed_t;
-
-typedef struct del_host_t {
- unsigned char type;
- char unused1;
- ip_t vpn_ip;
-} del_host_t;
-
-extern int (*request_handlers[256])(conn_list_t*, unsigned char*, int);
-
-extern int send_ping(conn_list_t*);
-extern int send_basic_info(conn_list_t *);
-extern int send_termreq(conn_list_t *);
-extern int send_timeout(conn_list_t *);
-extern int send_key_request(ip_t);
-extern void send_key_changed2(void);
+/* Maximum size of strings in a request */
+
+#define MAX_STRING_SIZE 1024
+#define MAX_STRING "%1024s"
+
+extern int (*request_handlers[])(connection_t*);
+
+extern int send_id(connection_t*);
+extern int send_challenge(connection_t*);
+extern int send_chal_reply(connection_t*);
+extern int send_metakey(connection_t*);
+extern int send_status(connection_t*, int, char*);
+extern int send_error(connection_t*, int, char*);
+extern int send_termreq(connection_t*);
+extern int send_ping(connection_t*);
+extern int send_pong(connection_t*);
+extern int send_add_host(connection_t*, connection_t*);
+extern int send_del_host(connection_t*, connection_t*);
+extern int send_add_subnet(connection_t*, subnet_t*);
+extern int send_del_subnet(connection_t*, subnet_t*);
+extern int send_key_changed(connection_t*, connection_t*);
+extern int send_req_key(connection_t*, connection_t*);
+extern int send_ans_key(connection_t*, connection_t*, char*);
+extern int send_tcppacket(connection_t *, vpn_packet_t *);
+
+/* Old functions */
+
+extern int notify_others(connection_t *, connection_t *, int (*function)(connection_t*, connection_t*));
+extern int receive_request(connection_t *);
+extern int check_id(char *);