fixes #47 compat_reqttls fails sometimes

fixes #23 Restore the old idhash logic for sockets

1 files changed, 9 insertions, 13 deletions

diff --git a/src/core/socket.h b/src/core/socket.h
index 6824b04b..76ebca12 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -15,41 +15,39 @@
 // OUSIDE of the core is STRICTLY VERBOTEN.  NO DIRECT ACCESS BY PROTOCOLS OR
 // TRANSPORTS.
 struct nni_socket {
-	nni_mtx s_mx;
-	nni_cv  s_cv;
+	nni_list_node s_node;
+	nni_mtx       s_mx;
+	nni_cv        s_cv;
+	nni_cv        s_close_cv;
 
 	uint32_t s_id;
+	uint32_t s_flags;
+	unsigned s_refcnt; // protected by global lock
+	void *   s_data;   // Protocol private
 
 	nni_msgq *s_uwq; // Upper write queue
 	nni_msgq *s_urq; // Upper read queue
 
-	nni_list_node s_node;
-
 	nni_proto_id s_self_id;
 	nni_proto_id s_peer_id;
 
-	uint32_t s_flags;
-
 	nni_proto_pipe_ops s_pipe_ops;
 	nni_proto_sock_ops s_sock_ops;
 
-	void *s_data; // Protocol private
-
 	// XXX: options
 	nni_duration s_linger;    // linger time
 	nni_duration s_sndtimeo;  // send timeout
 	nni_duration s_rcvtimeo;  // receive timeout
 	nni_duration s_reconn;    // reconnect time
 	nni_duration s_reconnmax; // max reconnect time
+	size_t       s_rcvmaxsz;  // maximum receive size
 
 	nni_list s_eps;   // active endpoints
 	nni_list s_pipes; // active pipes
 
-	size_t s_rcvmaxsz; // maximum receive size
-
 	int s_ep_pend;    // EP dial/listen in progress
 	int s_closing;    // Socket is closing
-	int s_closed;     // Socket closed
+	int s_closed;     // Socket closed, protected by global lock
 	int s_besteffort; // Best effort mode delivery
 	int s_senderr;    // Protocol state machine use
 	int s_recverr;    // Protocol state machine use
@@ -59,8 +57,6 @@ struct nni_socket {
 
 	nni_notifyfd s_send_fd;
 	nni_notifyfd s_recv_fd;
-
-	uint32_t s_nextid; // Next Pipe ID.
 };
 
 extern int  nni_sock_sys_init(void);