X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Frmr%2Fnng%2Fsrc%2Frmr_nng.c;h=d9c4c061c3759cea494b3d3260bcb2df642461c1;hb=7d1b7b0de82414ad25ebd323b2913de72ab448c1;hp=45a0e2349e96098533dfe20ba322f0267188e1e4;hpb=50b92c56c2bbe5c4405f0bdd2eefbd21d65a8416;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/nng/src/rmr_nng.c b/src/rmr/nng/src/rmr_nng.c
index 45a0e23..d9c4c06 100644
--- a/src/rmr/nng/src/rmr_nng.c
+++ b/src/rmr/nng/src/rmr_nng.c
@@ -454,7 +454,12 @@ extern rmr_mbuf_t* rmr_torcv_msg( void* vctx, rmr_mbuf_t* old_msg, int ms_to ) {
 		if( (eps->ep_fd = epoll_create1( 0 )) < 0 ) {
 	    	fprintf( stderr, "[FAIL] unable to create epoll fd: %d\n", errno );
 			free( eps );
-			return NULL;
+			ctx->eps = NULL;
+			if( old_msg != NULL ) {
+				old_msg->state = RMR_ERR_INITFAILED;
+				old_msg->tp_state = errno;
+			}
+			return old_msg;
 		}
 
 		eps->nng_fd = rmr_get_rcvfd( ctx );
@@ -464,7 +469,12 @@ extern rmr_mbuf_t* rmr_torcv_msg( void* vctx, rmr_mbuf_t* old_msg, int ms_to ) {
 		if( epoll_ctl( eps->ep_fd, EPOLL_CTL_ADD, eps->nng_fd, &eps->epe ) != 0 )  {
 	    	fprintf( stderr, "[FAIL] epoll_ctl status not 0 : %s\n", strerror( errno ) );
 			free( eps );
-			return NULL;
+			ctx->eps = NULL;
+			if( old_msg != NULL ) {
+				old_msg->state = RMR_ERR_INITFAILED;
+				old_msg->tp_state = errno;
+			}
+			return old_msg;
 		}
 
 		ctx->eps = eps;