X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fnng%2Finclude%2Frmr_nng_private.h;h=efb2daabc3356a66f3194d24e5d98dc8d5fe9bdf;hb=58ccd68c7e98074aa65cb9fc271db963192de68d;hp=6bca91f83bfcab37670ab9b15abf5c958edfcc62;hpb=68c1ab2191d9959fde0bd275a560f7c9cf6df485;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/nng/include/rmr_nng_private.h b/src/rmr/nng/include/rmr_nng_private.h
index 6bca91f..efb2daa 100644
--- a/src/rmr/nng/include/rmr_nng_private.h
+++ b/src/rmr/nng/include/rmr_nng_private.h
@@ -1,4 +1,4 @@
-// : vi ts=4 sw=4 noet :
+//  vim: ts=4 sw=4 noet :
 /*
 ==================================================================================
 	Copyright (c) 2019 Nokia
@@ -43,6 +43,8 @@ struct endpoint {
 	nng_socket	nn_sock;	// the nano-msg socket to write to for this entry
 	nng_dialer	dialer;		// the connection specific information (retry timout etc)
 	int		open;			// set to true if we've connected as socket cannot be checked directly)
+	pthread_mutex_t	gate;	// we must serialise when we open/link to the endpoint
+	long long scounts[EPSC_SIZE];		// send counts (indexed by EPSCOUNT_* constants
 };
 
 /*
@@ -64,6 +66,7 @@ typedef struct epoll_stuff {
 */
 struct uta_ctx {
 	char*	my_name;			// dns name of this host to set in sender field of a message
+	char*	my_ip;				// the ip address we _think_ we are using sent in src_ip of the message for rts
 	int	shutdown;				// thread notification if we need to tell them to stop
 	int max_mlen;				// max message length payload+header
 	int	max_plen;				// max payload length
@@ -71,7 +74,7 @@ struct uta_ctx {
 	int nrtele;					// number of elements in the routing table
 	int send_retries;			// number of retries send_msg() should attempt if eagain/timeout indicated by nng
 	int	trace_data_len;			// number of bytes to allocate in header for trace data
-	int d1_len;					// extra header data 1 length	(future)
+	int d1_len;					// extra header data 1 length
 	int d2_len;					// extra header data 2 length	(future)
 	nng_socket	nn_sock;		// our general listen socket
 	route_table_t* rtable;		// the active route table
@@ -79,6 +82,7 @@ struct uta_ctx {
 	route_table_t* new_rtable;	// route table under construction
 	if_addrs_t*	ip_list;		// list manager of the IP addresses that are on our known interfaces
 	void*	mring;				// ring where msgs are queued while waiting for a call response msg
+	chute_t*	chutes;
 
 	char*	rtg_addr;			// addr/port of the route table generation publisher
 	int		rtg_port;			// the port that the rtg listens on
@@ -87,6 +91,7 @@ struct uta_ctx {
 	epoll_stuff_t*	eps;		// epoll information needed for the rcv with timeout call
 
 	pthread_t	rtc_th;			// thread info for the rtc listener
+	pthread_t	mtc_th;			// thread info for the multi-thread call receive process
 };
 
 
@@ -101,10 +106,11 @@ static void* init(  char* uproto_port, int max_msg_size, int flags );
 static void free_ctx( uta_ctx_t* ctx );
 
 // --- rt table things ---------------------------
-static int uta_link2( char* target, nng_socket* nn_sock, nng_dialer* dialer );
+static int uta_link2( endpoint_t* ep );
 static int rt_link2_ep( endpoint_t* ep );
-static int uta_epsock_byname( route_table_t* rt, char* ep_name, nng_socket* nn_sock );
-static int uta_epsock_rr( route_table_t *rt, uint64_t key, int group, int* more, nng_socket* nn_sock );
+static int uta_epsock_byname( route_table_t* rt, char* ep_name, nng_socket* nn_sock, endpoint_t** uepp );
+static int uta_epsock_rr( rtable_ent_t* rte, int group, int* more, nng_socket* nn_sock, endpoint_t** uepp );
+static rtable_ent_t* uta_get_rte( route_table_t *rt, int sid, int mtype, int try_alt );
 static inline int xlate_nng_state( int state, int def_state );