X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2Fv_sender.c;h=a597d03591c214c7bbe0d8e0bc6069731a53578b;hb=77406e61f2158f5b88b7a9f6e3e86d8f62c8f71a;hp=f8700b5a6430c84843addd7832e952fb29cc478f;hpb=7924a143675acc1f67b7047ab0c6cef190c547aa;p=ric-plt%2Flib%2Frmr.git diff --git a/test/app_test/v_sender.c b/test/app_test/v_sender.c index f8700b5..a597d03 100644 --- a/test/app_test/v_sender.c +++ b/test/app_test/v_sender.c @@ -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, " 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 { + fprintf( stderr, " 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, " 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, " recvd=%d rts_ok=%d short=%d count=%d nmsg=%d\n", rcvd_count, rts_ok, short_count, count, nmsgs ); pass = 0; }