X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fnng%2Finclude%2Frmr_nng_private.h;h=919b2254b7ff781c98335ae1f65a538f207251f5;hb=33a2b86357426380076a408761169f4b698e8f3d;hp=2349ce6be12f44dfb8491db8567779f24b7627e4;hpb=412d53dfa2f9b5b56a448797d0dfec3b0f11f666;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 2349ce6..919b225 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
@@ -44,13 +44,15 @@ struct endpoint {
 	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
+	int		notify;			// when set we can write connect failure msgs to stderr
+	long long scounts[EPSC_SIZE];		// send counts (indexed by EPSCOUNT_* constants
 };
 
 /*
 	Epoll information needed for the rmr_torcv_msg() funciton
 */
 typedef struct epoll_stuff {
-	struct epoll_event events[1];				// wait on 10 possible events
+	struct epoll_event events[1];				// wait on 1 possible events
 	struct epoll_event epe;						// event definition for event to listen to
 	int ep_fd;									// file des from nng
 	int nng_fd;									// fd from nng
@@ -65,6 +67,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
@@ -90,6 +93,10 @@ struct uta_ctx {
 
 	pthread_t	rtc_th;			// thread info for the rtc listener
 	pthread_t	mtc_th;			// thread info for the multi-thread call receive process
+
+								// added for route manager request/states
+	rmr_whid_t	rtg_whid;		// wormhole id to the route manager for acks/requests
+	char*		table_id;		// table ID of the route table load in progress
 };
 
 
@@ -105,9 +112,10 @@ static void free_ctx( uta_ctx_t* ctx );
 
 // --- rt table things ---------------------------
 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 rt_link2_ep( void* vctx,  endpoint_t* ep );
+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 );
 
 
@@ -121,6 +129,7 @@ static void* rcv_payload( uta_ctx_t* ctx, rmr_mbuf_t* old_msg );
 static inline rmr_mbuf_t* realloc_msg( rmr_mbuf_t* old_msg, int tr_len  );
 static rmr_mbuf_t* send_msg( uta_ctx_t* ctx, rmr_mbuf_t* msg, nng_socket nn_sock, int retries );
 static rmr_mbuf_t* send2ep( uta_ctx_t* ctx, endpoint_t* ep, rmr_mbuf_t* msg );
+static rmr_mbuf_t* realloc_payload( rmr_mbuf_t* mbuf, int new_len, int copy, int clone );