TiagoRG
/
it2s-itss-facilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.es.av.it.pt/its/it2s-itss-facilities

This commit is contained in:
emanuel 2021-09-02 15:29:46 +01:00
parent 4086995a15 cf1eb85c95
commit da5b2cb482
1 changed files with 80 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/cpm.c
View File

@ -47,30 +47,29 @@ S_INTERFACE_CONNECTION_T raw_socket;
S_OBJECT_CONTROL_T s_objectControl; S_OBJECT_CONTROL_T s_objectControl;
S_OBJECTS_T as_objects[NOF_OBJECTS]; S_OBJECTS_T as_objects[NOF_OBJECTS];
int radar_ready(facilities_t* facilities){
// Create temporary ifr struct and socket to
// check if the radar interface is running i.e if the
// radar has booted up
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
bool waitingIncomingConnection(void){ int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
// Listening to the socket (Waiting for incoming connection)
unsigned int len = sizeof(s_socket.s_client);
if(listen(s_socket.i32_socket,1)<0){ strncpy(ifr.ifr_name, facilities->dissemination->int_radar, sizeof(ifr.ifr_name));
syslog_err("Waiting for incoming requests failed..."); if(ioctl(sock, SIOCGIFFLAGS, &ifr) <0)
return false; syslog_err(" IOCTL failed, could not retrieve radar interface flags");
close(sock);
return (ifr.ifr_flags & IFF_UP) && (ifr.ifr_flags & IFF_RUNNING);
} }
if((s_socket.i32_client = accept(s_socket.i32_socket, (struct sockaddr*)&s_socket.s_server, &len)) < 0){
syslog_err("Client disconnected...");
return false;
}
syslog_debug("Radar connected");
return true;
}
bool radar_connection(char* radar_port, facilities_t* facilities){ bool radar_connection(char* radar_port, facilities_t* facilities){
if(radar_ready(facilities) == 1){
if(facilities->dissemination->tmc_connect == false){ if(facilities->dissemination->tmc_connect == false){
// Create TCP socket // Create TCP socket
@ -92,10 +91,21 @@ bool radar_connection(char* radar_port, facilities_t* facilities){
return false; return false;
} }
// Listening to the socket (Waiting for incoming connection)
unsigned int len = sizeof(s_socket.s_client);
if(!waitingIncomingConnection()){ if(listen(s_socket.i32_socket,1)<0){
syslog_err("Waiting for incoming requests failed...");
return false; return false;
} }
if((s_socket.i32_client = accept(s_socket.i32_socket, (struct sockaddr*)&s_socket.s_server, &len)) < 0){
syslog_err("Client disconnected...");
return false;
}
syslog_debug("Radar connected");
} }
// Create RAW socket // Create RAW socket
@ -131,7 +141,9 @@ bool radar_connection(char* radar_port, facilities_t* facilities){
return true; return true;
}else{
return false;
}
} }
@ -728,7 +740,7 @@ void *cp_service(void *fc){
dissemination_reset_timer(facilities->dissemination, &facilities->epv,1); dissemination_reset_timer(facilities->dissemination, &facilities->epv,1);
}else{ }else{
is_radar_connected = waitingIncomingConnection(); is_radar_connected = radar_connection(RADAR_PORT,facilities);
} }
} }
} }