Fix rmr_rpobe command line bug; add test coverage

[ric-plt/lib/rmr.git] / src / rmr / si / include / rmr_si_private.h

diff --git a/src/rmr/si/include/rmr_si_private.h b/src/rmr/si/include/rmr_si_private.h
index 99b5b20..fb4e79f 100644 (file)
--- a/src/rmr/si/include/rmr_si_private.h
+++ b/src/rmr/si/include/rmr_si_private.h
@@ -34,8 +34,8 @@
 #define _uta_private_h
 
 // if pmode is off we don't compile in some checks in hopes of speeding things up
-#ifndef PARINOID_CHECKS
-#      define PARINOID_CHECKS 0
+#ifndef PARANOID_CHECKS
+#      define PARANOID_CHECKS 0
 #endif
 
 
@@ -51,6 +51,10 @@
 #define RF_NOTIFIED    0x01    // notification made about river issue
 #define RF_DROP                0x02    // this message is large and being dropped
 
+#define        TP_SZFIELD_LEN  ((sizeof(uint32_t)*2)+1)        // number of bytes needed for msg size in transport header
+#define        TP_SZ_MARKER    '$'                                                     // marker indicating net byte order used
+
+
 #define SI_MAX_ADDR_LEN                512
 
 /*
@@ -124,6 +128,7 @@ struct uta_ctx {
        int d1_len;                                     // extra header data 1 length
        int d2_len;                                     // extra header data 2 length   (future)
        int     nn_sock;                                // our general listen socket
+       int rtable_ready;                       // set to true when rt is received or loaded
        route_table_t* rtable;          // the active route table
        route_table_t* old_rtable;      // the previously used rt, sits here to allow for draining
        route_table_t* new_rtable;      // route table under construction
@@ -150,7 +155,8 @@ struct uta_ctx {
        river_t*        rivers;                 // inbound flows (index is the socket fd)
        int                     max_ibm;                // max size of an inbound message (river accum alloc size)
        void*           zcb_mring;              // zero copy buffer mbuf ring
-       void*           fd2ep;                  // the symtab mapping file des to endpoints for cleanup on disconnect
+       void*           fd2ep;                          // the symtab mapping file des to endpoints for cleanup on disconnect
+       pthread_mutex_t *fd2ep_gate;    // we must gate add/deletes to the fd2 symtab
 };
 
 typedef uta_ctx_t uta_ctx;
@@ -167,7 +173,8 @@ static void free_ctx( uta_ctx_t* ctx );
 
 // --- rt table things ---------------------------
 static void uta_ep_failed( endpoint_t* ep );
-static int uta_link2( si_ctx_t* si_ctx, endpoint_t* ep );
+static int uta_link2( uta_ctx_t *ctx, endpoint_t* ep );
+
 static int rt_link2_ep( void* vctx, endpoint_t* ep );
 static rtable_ent_t* uta_get_rte( route_table_t *rt, int sid, int mtype, int try_alt );
 static inline int xlate_si_state( int state, int def_state );