Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check iExit when trying to connect to objects #200

Merged
merged 10 commits into from
Jan 24, 2020
Merged

Check iExit when trying to connect to objects #200

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d6f61b2
sitched from util_error to log error for connection problems
konglobemeralt Jan 14, 2020
89015fe
Cleanup
konglobemeralt Jan 15, 2020
7db2d4b
Cleanup
konglobemeralt Jan 15, 2020
9419c98
Merge branch 'dev' into feature_OCconnectionFixes
konglobemeralt Jan 17, 2020
c49ca8c
noice
konglobemeralt Jan 20, 2020
f96210e
Changed back to util_error
konglobemeralt Jan 20, 2020
9bcba01
Removed empty lines
konglobemeralt Jan 20, 2020
390cf3a
Removed sleep(3)
konglobemeralt Jan 22, 2020
7cf9825
Merge branch 'dev' into feature_OCconnectionFixes
konglobemeralt Jan 23, 2020
23409c9
ran formatting script
konglobemeralt Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions server/src/objectcontrol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,6 @@ void objectcontrol_task(TimeType * GPSTime, GSDType * GSD, LOG_LEVEL logLevel) {
"[ObjectControl] Was not able to connect to object, [IP: %s] [PORT: %d], retry in %d sec...",
object_address_name[iIndex], object_tcp_port[iIndex],
(!(1 & DisconnectU8)) * 3);
(void)sleep(3); // TODO: Move this to the rest of the sleep operations? Also, remove the hardcoded 3
break;
case EADDRINUSE:
util_error("[ObjectControl] Local address/port already in use");
Expand Down Expand Up @@ -878,7 +877,7 @@ void objectcontrol_task(TimeType * GPSTime, GSDType * GSD, LOG_LEVEL logLevel) {

}

} while (iResult < 0 && DisconnectU8 == 0);
} while (iExit == 0 && iResult < 0 && DisconnectU8 == 0);

if (iResult >= 0) {
/* Send OSEM command in mq so that we get some information like GPSweek, origin (latitude,logitude,altitude in gps coordinates) */
Expand Down