reorganized headers

src/vpn.h

@@ -77,81 +77,13 @@ struct cfg_st {
 #define MAX_USERNAME_SIZE 64
 #define MAX_PASSWORD_SIZE 64
 #define TLS_MASTER_SIZE 48
-#define COOKIE_SIZE 32
-
-struct tls_st {
-	gnutls_certificate_credentials_t xcred;
-	gnutls_priority_t cprio;
-};
-
-typedef enum {
-	UP_DISABLED,
-	UP_SETUP,
-	UP_HANDSHAKE,
-	UP_INACTIVE,
-	UP_ACTIVE
-} udp_port_state_t;
-
 #define MAX_HOSTNAME_SIZE MAX_USERNAME_SIZE
-
-typedef struct worker_st {
-	struct tls_st *creds;
-	gnutls_session_t session;
-	gnutls_session_t dtls_session;
-	int cmd_fd;
-	int conn_fd;
-	
-	http_parser *parser;
-	struct cfg_st *config;
-
-	struct sockaddr_storage remote_addr;	/* peer's address */
-	socklen_t remote_addr_len;
-
-	/* set after authentication */
-	int udp_fd;
-	udp_port_state_t udp_state;
-	unsigned int udp_port;
-	int udp_port_proto;
-
-	/* the following are set only if authentication is complete */
-	char tun_name[IFNAMSIZ];
-	char username[MAX_USERNAME_SIZE];
-	char hostname[MAX_HOSTNAME_SIZE];
-	uint8_t cookie[COOKIE_SIZE];
-	uint8_t master_secret[TLS_MASTER_SIZE];
-	uint8_t session_id[GNUTLS_MAX_SESSION_ID];
-	unsigned auth_ok;
-	int tun_fd;
-} worker_st;
-
-
-enum {
-	HEADER_COOKIE = 1,
-	HEADER_MASTER_SECRET,
-	HEADER_HOSTNAME,
-};
-
-struct req_data_st {
-	char url[256];
-	char hostname[MAX_HOSTNAME_SIZE];
-	unsigned int next_header;
-	unsigned char cookie[COOKIE_SIZE];
-	unsigned int cookie_set;
-	unsigned char master_secret[TLS_MASTER_SIZE];
-	unsigned int master_secret_set;
-	char *body;
-	unsigned int headers_complete;
-	unsigned int message_complete;
-};
-
-void vpn_server(struct worker_st* ws);
+#define COOKIE_SIZE 32
+#define MAX_SESSION_DATA_SIZE (4*1024)
 
 const char *human_addr(const struct sockaddr *sa, socklen_t salen,
 		       void *buf, size_t buflen);
 
-void __attribute__ ((format(printf, 3, 4)))
-    oclog(const worker_st * server, int priority, const char *fmt, ...);
-
 /* Helper casts */
 #define SA_IN_P(p) (&((struct sockaddr_in *)(p))->sin_addr)
 #define SA_IN_U8_P(p) ((uint8_t*)(&((struct sockaddr_in *)(p))->sin_addr))