spacecruft
/
galmon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make navrecv report station id for a new connection, make it set KEEPALIVE so we lose connections that changed IP address etc, some improved debugging messages

pull/118/head
bert hubert 2020-05-05 20:17:15 +02:00
parent cea8f539a0
commit f0269f5660
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
navrecv.cc
View File

@ -15,6 +15,7 @@
#include "CLI/CLI.hpp"
#include "version.hh"
#include <netinet/tcp.h>
#include "navmon.hh"
static char program[]="navrecv";
@ -147,6 +148,7 @@ void recvSession2(Socket&& uns, ComboAddress client)
ZStdReader zsr(uns);
int s = zsr.getFD();
// time_t start = time(0);
bool first=true;
for(;;) {
// enable this to test ubxtool resilience & buffering
// if(time(0) - start > 30)
@ -176,10 +178,17 @@ void recvSession2(Socket&& uns, ComboAddress client)
denum = htonl(denum);
// cerr<<"Received message "<<denum<< " "<<nmm.localutcseconds()<<" " << nmm.localutcnanoseconds()/1000000000.0<<endl;
writeToDisk(nmm.localutcseconds(), nmm.sourceid(), out);
if(first) {
cerr<<"\tstation: "<<nmm.sourceid() << endl;
first=false;
}
#ifdef __linux__
SSetsockopt(uns, IPPROTO_TCP, TCP_CORK, 1 );
#endif
SWrite(uns, num);
}
}
@ -189,8 +198,10 @@ void recvSession(int s, ComboAddress client)
{
try {
Socket sock(s); // this closes on destruction
SSetsockopt(s, SOL_SOCKET, SO_KEEPALIVE, 1); // saves file descriptors
cerr<<"Receiving messages from "<<client.toStringWithPort()<<endl;
for(;;) {
bool first=true;
for(int count=0;;++count) {
string part=SRead(sock, 4);
if(part.empty()) {
cerr<<"EOF from "<<client.toStringWithPort()<<endl;
@ -199,7 +210,7 @@ void recvSession(int s, ComboAddress client)
if(part != "bert") {
if(part == "RNIE")
return recvSession2(std::move(sock), client); // protocol v2, socket is moved cuz cleanup is special
cerr << "Wrong magic from "<<client.toStringWithPort()<<": "<<part<<endl;
cerr << "Message "<<count<<", wrong magic from "<<client.toStringWithPort()<<": "<<makeHexDump(part)<<endl;
break;
}
string out=part;
@ -212,11 +223,17 @@ void recvSession(int s, ComboAddress client)
len = htons(len);
part = SRead(s, len);
if(part.size() != len) {
cerr<<"Mismatch, "<<part.size()<<", len "<<len<<endl;
}
out += part;
NavMonMessage nmm;
nmm.ParseFromString(part);
if(first) {
cerr<<"\tstation: "<<nmm.sourceid() << endl;
first=false;
}
writeToDisk(nmm.localutcseconds(), nmm.sourceid(), out);
}
}