From: E. Scott Daniels <daniels@research.att.com>
Date: Tue, 21 Jan 2020 18:22:55 +0000 (-0500)
Subject: Remove bad includes from SI code
X-Git-Tag: 3.0.2^0
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=45b2530ba7fca356c8f5661d9f7d86883ab83481;p=ric-plt%2Flib%2Frmr.git

Remove bad includes from SI code

Code was referencing NNG headers which breaks when building on a
"clean" environment.

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: Ic9501e8c70a0425b96d18c1c22e29cdd7eef601b
---

diff --git a/src/rmr/si/src/rmr_si.c b/src/rmr/si/src/rmr_si.c
index fd8dcb0..6c08e83 100644
--- a/src/rmr/si/src/rmr_si.c
+++ b/src/rmr/si/src/rmr_si.c
@@ -526,7 +526,7 @@ extern int rmr_set_rtimeout( void* vctx, int time ) {
 static void* init(  char* uproto_port, int max_msg_size, int flags ) {
 	static	int announced = 0;
 	uta_ctx_t*	ctx = NULL;
-	char	bind_info[NNG_MAXADDRLEN];	// bind info
+	char	bind_info[256];				// bind info
 	char*	proto = "tcp";				// pointer into the proto/port string user supplied
 	char*	port;
 	char*	interface = NULL;			// interface to bind to (from RMR_BIND_IF, 0.0.0.0 if not defined)
diff --git a/src/rmr/si/src/sr_si_static.c b/src/rmr/si/src/sr_si_static.c
index 0ca5eec..6f433ac 100644
--- a/src/rmr/si/src/sr_si_static.c
+++ b/src/rmr/si/src/sr_si_static.c
@@ -21,7 +21,7 @@
 /*
 	Mnemonic:	sr_si_static.c
 	Abstract:	These are static send/receive primatives which (sadly)
-				differ based on the underlying protocol (nng vs nanomsg).
+				differ based on the underlying protocol (nng vs SI95).
 				Split from rmr_nng.c  for easier wormhole support.
 
 	Author:		E. Scott Daniels
@@ -31,13 +31,6 @@
 #ifndef _sr_si_static_c
 #define _sr_si_static_c
 
-#include <nng/nng.h>
-#include <nng/protocol/pubsub0/pub.h>
-#include <nng/protocol/pubsub0/sub.h>
-#include <nng/protocol/pipeline0/push.h>
-#include <nng/protocol/pipeline0/pull.h>
-
-
 static void dump_40( char *p, char* label ) {
 	int i;