osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Falcodump: Improve scap event code handling 

Check timeouts and filtered events.
This commit is contained in:
Gerald Combs 2023-01-11 12:32:54 -08:00
parent 943bede110
commit 809b34455e
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
extcap/falcodump.cpp
View File

@ -961,15 +961,33 @@ int main(int argc, char **argv)
goto end;
}
sinsp_evt *evt;
#define FALCODUMP_SCAP_EVENT_TIMEOUT 5 // seconds; arbitrary
GTimer *event_timer = g_timer_new();
ws_noisy("Starting capture loop.");
while (!extcap_end_application) {
try {
int32_t res = inspector.next(&evt);
if (res != SCAP_SUCCESS) {
switch (res) {
case SCAP_TIMEOUT:
{
double elapsed = g_timer_elapsed(event_timer, NULL);
if (elapsed > FALCODUMP_SCAP_EVENT_TIMEOUT) {
ws_warning("Inspector timed out after %0.1f seconds", elapsed);
extcap_end_application = true;
}
break;
}
case SCAP_FILTERED_EVENT:
break;
case SCAP_SUCCESS:
dumper.dump(evt);
dumper.flush();
break;
default:
ws_noisy("Inspector exited with %d", res);
extcap_end_application = true;
break;
}
dumper.dump(evt);
dumper.flush();
} catch (sinsp_exception &e) {
ws_warning("%s", e.what());
goto end;