open / keyx sync implemented; vconn close fixed; rendezvous hashing fixed

1 files changed, 6 insertions, 4 deletions

diff --git a/ecp/server/server.h b/ecp/server/server.h
index c17fa62..e8705a7 100644
--- a/ecp/server/server.h
+++ b/ecp/server/server.h
@@ -9,21 +9,23 @@
 
 typedef struct SRVConfig {
     ECPDHKey key_perma;
+    ECPSocket *sock;
     char *acl_fn;
     char *acl_fn_dir;
     ecp_tr_addr_t my_addr;
     uint8_t region;
     uint8_t roles;
     int detach;
-    pthread_t rcvr_thd[MAX_THREADS];
     unsigned int rcvr_thd_num;
-    uid_t uid;
-    gid_t gid;
-    int log_level;
+    pthread_t rcvr_thd[MAX_THREADS];
+    unsigned int log_level;
     char *log_fn;
     FILE *log_file;
+    uid_t uid;
+    gid_t gid;
 } SRVConfig;
 
 SRVConfig *srv_get_config(void);
+int conn_expired(ECPConnection *conn, ecp_sts_t now);
 void log_vprintf(int level, const char *format, va_list ap);
 void log_printf(int level, const char *format, ...);