move the order around in the Run() loop

pull/12/head
Tom Early 7 years ago
parent c4cd028084
commit 508b6a01e0

@ -422,7 +422,7 @@ void CQnetGateway::GetIRCDataThread()
if (doFind) { if (doFind) {
printf("Finding Routes for...\n"); printf("Finding Routes for...\n");
for (auto it=findRoute.begin(); it!=findRoute.end(); it++) { for (auto it=findRoute.begin(); it!=findRoute.end(); it++) {
std::this_thread::sleep_for(std::chrono::milliseconds(100)); std::this_thread::sleep_for(std::chrono::milliseconds(200));
printf("\t'%s'\n", it->c_str()); printf("\t'%s'\n", it->c_str());
ii->findUser(*it); ii->findUser(*it);
} }

@ -180,10 +180,12 @@ REPLY_TYPE CQnetITAP::GetITAPData(unsigned char *buf)
SendTo(ack_voice); SendTo(ack_voice);
return RT_DATA; return RT_DATA;
case 0x21U: case 0x21U:
if (acknowledged) if (acknowledged) {
fprintf(stderr, "ERROR: Header already acknowledged!\n"); fprintf(stderr, "ERROR: Header already acknowledged!\n");
else } else {
if (0x0U == buf[2])
acknowledged = true; acknowledged = true;
}
return RT_HEADER_ACK; return RT_HEADER_ACK;
case 0x23U: case 0x23U:
if (acknowledged) { if (acknowledged) {
@ -218,15 +220,6 @@ void CQnetITAP::Run(const char *cfgfile)
while (keep_running) { while (keep_running) {
// send queued frames
if (acknowledged) {
if (! queue.empty()) {
CFrame frame = queue.front();
queue.pop();
SendTo(frame.data());
acknowledged = false;
}
}
fd_set readfds; fd_set readfds;
FD_ZERO(&readfds); FD_ZERO(&readfds);
FD_SET(serfd, &readfds); FD_SET(serfd, &readfds);
@ -306,6 +299,16 @@ void CQnetITAP::Run(const char *cfgfile)
} }
FD_CLR(ug2m, &readfds); FD_CLR(ug2m, &readfds);
} }
// send queued frames
if (keep_running && acknowledged) {
if (! queue.empty()) {
CFrame frame = queue.front();
queue.pop();
SendTo(frame.data());
acknowledged = false;
}
}
} }
close(serfd); close(serfd);

Loading…
Cancel
Save

Powered by TurnKey Linux.