X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmessaging%2Fmessenger.cpp;h=4e5a278c4dca1a67dfafaf1d1f50c5ec6ab0266f;hb=0ac0fb452f47bf32beb4965bf7569034c415be93;hp=24fe1640ae3cf1fe8f10cfb28373323570ec3e25;hpb=caed01aad345ebae5f7538276f110e57e77f3c95;p=ric-plt%2Fxapp-frame-cpp.git diff --git a/src/messaging/messenger.cpp b/src/messaging/messenger.cpp index 24fe164..4e5a278 100644 --- a/src/messaging/messenger.cpp +++ b/src/messaging/messenger.cpp @@ -60,13 +60,15 @@ const int Messenger::DEFAULT_CALLBACK = -1; If port is nil, then the default port is used (4560). */ -Messenger::Messenger( char* port, bool wait4table ) { - if( port == NULL ) { - port = (char *) "4560"; +Messenger::Messenger( const char* uport, bool wait4table ) { + + if( uport == NULL ) { + listen_port = strdup( "4560" ); + } else { + listen_port = strdup( uport ); } gate = new std::mutex(); - listen_port = strdup( port ); mrc = rmr_init( listen_port, Messenger::MAX_PAYLOAD, 0 ); if( wait4table ) { @@ -79,9 +81,9 @@ Messenger::Messenger( char* port, bool wait4table ) { } /* - Move support. We DO allow the instance to be moved as only one copy + Move support. We DO allow the instance to be moved as only one copy remains following the move. - Given a source object instance (soi) we move the information to + Given a source object instance (soi) we move the information to the new object, and then DELETE what was moved so that when the user frees the soi, it doesn't destroy what we snarfed. */ @@ -91,7 +93,7 @@ Messenger::Messenger( Messenger&& soi ) { ok_2_run = soi.ok_2_run; gate = soi.gate; cb_hash = soi.cb_hash; // this seems dodgy - + soi.gate = NULL; soi.listen_port = NULL; soi.mrc = NULL; @@ -115,7 +117,7 @@ Messenger& Messenger::operator=( Messenger&& soi ) { ok_2_run = soi.ok_2_run; gate = soi.gate; cb_hash = soi.cb_hash; // this seems dodgy - + soi.gate = NULL; soi.listen_port = NULL; soi.mrc = NULL;