X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Fv_sender.c;h=058e602d2f57b67480976e15259b9e046099026b;hb=a68562a02028434a87149d5996b291e83d33be51;hp=f8700b5a6430c84843addd7832e952fb29cc478f;hpb=de63b2996a1144b55ccaaf7ad552170d18478d5c;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/app_test/v_sender.c b/test/app_test/v_sender.c
index f8700b5..058e602 100644
--- a/test/app_test/v_sender.c
+++ b/test/app_test/v_sender.c
@@ -23,7 +23,7 @@
 	Abstract:	This version of the sender will perform verification on response
 				messages received back from the receiver.
 
-				It is expected that the response messages are created with the 
+				It is expected that the response messages are created with the
 				functions in the test_support module so that they can easily be
 				vetted here.
 
@@ -79,7 +79,7 @@ int main( int argc, char** argv ) {
 	int		stats_freq = 100;
 	int		successful = 0;					// set to true after we have a successful send
 	char	wbuf[DATA_SIZE];
-	char	me[128];						// who I am to vet rts was actually from me
+	char	me[256];						// who I am to vet rts was actually from me
 	char	trace[1024];
 	long	timeout = 0;
 	long	rep_timeout = 0;				// report/stats timeout
@@ -134,7 +134,7 @@ int main( int argc, char** argv ) {
 			exit( 1 );
 		}
 	} else {
-		fprintf( stderr, "<VSNDR> abort: epoll not supported, can't listen for messages\n" );	
+		fprintf( stderr, "<VSNDR> abort: epoll not supported, can't listen for messages\n" );
 	}
 
 	sbuf = rmr_alloc_msg( mrc, MSG_SIZE );						// alloc first send buffer; subsequent buffers allcoated on send
@@ -202,6 +202,12 @@ int main( int argc, char** argv ) {
 			default:
 				if( successful ) {
 					fail_count++;							// count failures after first successful message
+				} else {
+					fail_count++;
+					if( fail_count > 10 ) {
+						fprintf( stderr, "<VSEND> giving up\n" );
+						exit( 1 );
+					}
 				}
 				// some error (not connected likely), don't count this
 				//sleep( 1 );
@@ -222,11 +228,13 @@ int main( int argc, char** argv ) {
 					errno = 0;
 					rbuf = rmr_rcv_msg( mrc, rbuf );
 					if( rbuf && rbuf->state == RMR_OK ) {
-						if( rmr_payload_size( rbuf ) > HDR_SIZE+DATA_SIZE ) {		// verify that response has a larger payload than we should have sent
+						if( rmr_payload_size( rbuf ) >= HDR_SIZE+DATA_SIZE ) {		// vet message
 							rts_ok += validate_msg( rbuf->payload, rbuf->len );
-						} else { 
+						} else {
+							fprintf( stderr, "<VSNDR> received short response: >%d expected, got %d\n", HDR_SIZE+DATA_SIZE, rmr_payload_size( rbuf ) );
 							short_count++;
 						}
+
 						rcvd_count++;
 					}
 				}
@@ -253,7 +261,7 @@ int main( int argc, char** argv ) {
 					rbuf = rmr_rcv_msg( mrc, rbuf );
 					if( rbuf && rbuf->state == RMR_OK ) {
 						rcvd_count++;
-						if( rmr_payload_size( rbuf ) > HDR_SIZE+DATA_SIZE ) {		// verify that response has a larger payload than we should have sent
+						if( rmr_payload_size( rbuf ) >= HDR_SIZE+DATA_SIZE ) {		// vet message
 							rts_ok += validate_msg( rbuf->payload, rbuf->len );
 						}
 
@@ -264,8 +272,8 @@ int main( int argc, char** argv ) {
 		}
 	}
 
-	if( rcvd_count != rts_ok || count != nmsgs ) {			// we might not receive all back if receiver didn't retry, so that is NOT a failure here
-		fprintf( stderr, "<VSNDR> rcvd=%d rts_ok=%d count=%d nmsg=%d\n", rcvd_count, rts_ok, count, nmsgs );
+	if( (rcvd_count != rts_ok) || (count != nmsgs) ) {			// we might not receive all back if receiver didn't retry, so that is NOT a failure here
+		fprintf( stderr, "<VSNDR> recvd=%d rts_ok=%d short=%d count=%d nmsg=%d\n", rcvd_count, rts_ok, short_count, count, nmsgs );
 		pass = 0;
 	}