ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed error message for sims with the same port number (#1776)

Browse Source 
* Fixed error message for same port number

* Fixed return values
This commit is contained in:
Mrockwell2 2024-09-26 11:47:45 -05:00 committed by GitHub
parent c9cec718b4
commit c007cfc88a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
trick_source/sim_services/VariableServer/VariableServerListenThread.cpp
View File

@ -112,21 +112,24 @@ int Trick::VariableServerListenThread::init_listen_device() {
// Called from init jobs // Called from init jobs
int Trick::VariableServerListenThread::check_and_move_listen_device() { int Trick::VariableServerListenThread::check_and_move_listen_device() {
int ret ; int ret = 0;
if (_user_requested_address) { if (_user_requested_address) {
/* The user has requested a different source address or port in the input file */ /* The user has requested a different source address or port in the input file */
_listener->disconnect(); _listener->disconnect();
ret = _listener->initialize(_requested_source_address, _requested_port); ret = _listener->initialize(_requested_source_address, _requested_port);
_requested_port = _listener->getPort();
_requested_source_address = _listener->getHostname();
if (ret != 0) { if (ret != 0) {
message_publish(MSG_ERROR, "ERROR: Could not establish variable server source_address %s: port %d. Aborting.\n", message_publish(MSG_ERROR, "ERROR: Could not establish variable server source_address %s: port %d. Aborting.\n",
_requested_source_address.c_str(), _requested_port); _requested_source_address.c_str(), _requested_port);
return -1 ;
ret = -1;
} }
_requested_port = _listener->getPort();
_requested_source_address = _listener->getHostname();
} }
return 0 ; return ret ;
} }
void * Trick::VariableServerListenThread::thread_body() { void * Trick::VariableServerListenThread::thread_body() {