ack after a ' F'

pull/14/head
Tom Early 6 years ago
parent f238ceb232
commit fd73e431fd

@ -142,7 +142,7 @@ void CQnetLink::send_heartbeat()
} }
} }
void CQnetLink::rptr_ack(short i) void CQnetLink::rptr_ack(int i)
{ {
static char mod_and_RADIO_ID[3][22]; static char mod_and_RADIO_ID[3][22];
@ -889,7 +889,7 @@ void CQnetLink::Process()
} }
while (keep_running) { while (keep_running) {
static bool loadG = false; static bool loadG[3] = { false, false, false };
time(&tnow); time(&tnow);
if (keep_running && (tnow - hb) > 0) { if (keep_running && (tnow - hb) > 0) {
/* send heartbeat to connected donglers */ /* send heartbeat to connected donglers */
@ -2762,7 +2762,7 @@ void CQnetLink::Process()
if (admin.size()>0 && admin.end()==admin.find(call)) { if (admin.size()>0 && admin.end()==admin.find(call)) {
printf("%s not found in admin list, ignoring gwys read request\n", call); printf("%s not found in admin list, ignoring gwys read request\n", call);
} else { } else {
loadG = true; loadG[i] = true;
} }
} }
} }
@ -3019,16 +3019,17 @@ void CQnetLink::Process()
} }
FD_CLR (Gate2Link.GetFD(), &fdset); FD_CLR (Gate2Link.GetFD(), &fdset);
} }
for (int i=0; i<3; i++) { for (int i=0; i<3 && keep_running; i++) {
if (keep_running && notify_msg[i][0] && 0x0U == tracing[i].streamid) { if (notify_msg[i][0] && 0x0U == tracing[i].streamid) {
PlayAudioNotifyThread(notify_msg[i]); PlayAudioNotifyThread(notify_msg[i]);
notify_msg[i][0] = '\0'; notify_msg[i][0] = '\0';
} }
} if (loadG[i] && 0x0U == tracing[i].streamid) {
if (loadG && 0x0U==(tracing[0].streamid | tracing[1].streamid | tracing[2].streamid)) {
qnDB.ClearGW(); qnDB.ClearGW();
LoadGateways(gwys); LoadGateways(gwys);
loadG = false; loadG[i] = false;
rptr_ack(i);
}
} }
} }
} }

@ -95,7 +95,7 @@ private:
void g2link(const char from_mod, const char *call, const char to_mod); void g2link(const char from_mod, const char *call, const char to_mod);
void send_heartbeat(); void send_heartbeat();
bool resolve_rmt(const char *name, const unsigned short port, CSockAddress &addr); bool resolve_rmt(const char *name, const unsigned short port, CSockAddress &addr);
void rptr_ack(short i); void rptr_ack(int i);
void PlayAudioNotifyThread(char *msg); void PlayAudioNotifyThread(char *msg);
void AudioNotifyThread(SECHO &edata); void AudioNotifyThread(SECHO &edata);
void RptrAckThread(char *arg); void RptrAckThread(char *arg);

Loading…
Cancel
Save

Powered by TurnKey Linux.