From: E. Scott Daniels <daniels@research.att.com>
Date: Mon, 7 Oct 2019 20:47:33 +0000 (-0400)
Subject: Invert the meaning of the -e flag for listener
X-Git-Tag: 1.0.1~17
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=9c6bfeaa83dfcae7e2ed6998f8a645ea49a47bcb;p=ric-app%2Fmc.git

Invert the meaning of the -e flag for listener

The -e flog for the listener now disables the extended
header; the extended header will be on by default.

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

diff --git a/src/sidecars/listener/mc_listener.c b/src/sidecars/listener/mc_listener.c
index 6b8da45..a5effcd 100644
--- a/src/sidecars/listener/mc_listener.c
+++ b/src/sidecars/listener/mc_listener.c
@@ -59,7 +59,7 @@ static void bad_arg( char* what ) {
 
 static void usage( char* argv0 ) {
 	fprintf( stderr, "usage: %s [-d fifo-dir] [-e] [-p listen-port] [-q | -r report-freq]\n", argv0 );
-	fprintf( stderr, "  -e  enable extended header in buffers written to FIFOs\n" );
+	fprintf( stderr, "  -e  disable extended header in buffers written to FIFOs\n" );
 }
 
 //------------------------------------------------------------------------------------------
@@ -72,7 +72,7 @@ int main( int argc,  char** argv ) {
 	int		report_freq = 60;				// report stats every n seconds
 	int		pidx = 1;						// parameter index
 	int		error = 0;
-	int		long_hdrs = 0;					// -e sets and causes extended headers to be written
+	int		long_hdrs = 1;					// -e sets and causes extended headers to be written
 
 	while( pidx < argc && argv[pidx][0] == '-' ) {			// simple argument parsing (-x  or -x value)
 		switch( argv[pidx][1] ) {
@@ -87,7 +87,7 @@ int main( int argc,  char** argv ) {
 				break;
 
 			case 'e':
-				long_hdrs = 1;
+				long_hdrs = 0;
 				break;
 
 			case 'p':
diff --git a/src/sidecars/listener/pipe_reader.c b/src/sidecars/listener/pipe_reader.c
index 58a11ff..4804266 100644
--- a/src/sidecars/listener/pipe_reader.c
+++ b/src/sidecars/listener/pipe_reader.c
@@ -46,7 +46,7 @@ static void bad_arg( char* what ) {
 static void usage( char* argv0 ) {
 	fprintf( stderr, "usage: %s [-d fifo-dir] [-e] [-m msg-type] [-s]\n", argv0 );
 	fprintf( stderr, "   -d  dir (default is /tmp/mcl/fifos)\n" );
-	fprintf( stderr, "   -e  extended headers expected in FIFO data\n" );
+	fprintf( stderr, "   -e  disable extended headers expectation in FIFO data\n" );
 	fprintf( stderr, "   -m  msg-type (default is 0)\n" );
 	fprintf( stderr, "   -s  stats only mode\n" );
 }
@@ -61,7 +61,7 @@ int main( int argc,  char** argv ) {
 	int		mtype = 0;
 	char	buf[4096];
 	int		flush_often = 0;
-	int		long_hdrs = 0;					// if -e is on command line, we expect long headers
+	int		long_hdrs = 1;					// -e is on command line turns this off, by default we expect long headers
 	int		stats_only = 0;
 	char	timestamp[MCL_TSTAMP_SIZE];		// we'll get the timestamp from this
 	long	count = 0;
@@ -80,7 +80,7 @@ int main( int argc,  char** argv ) {
 				break;
 
 			case 'e':
-				long_hdrs = 1;
+				long_hdrs = 0;
 				break;
 
 			case 'f':
diff --git a/src/sidecars/listener/verify.sh b/src/sidecars/listener/verify.sh
index 3183e8f..e293d49 100755
--- a/src/sidecars/listener/verify.sh
+++ b/src/sidecars/listener/verify.sh
@@ -87,7 +87,7 @@ endKat
 
 # ---- run everything ---------------------------------------------------
 
-ext_hdr="-e"				# run with extended header enabled
+ext_hdr=""					# run with extended header enabled (-e turns extended off)
 fifo_dir=/tmp/fifos
 mkdir -p $fifo_dir			# redirect fifos so we don't depend on mount