CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-07-03 21:21:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only stop PCAP dump after capture

Browse Source 
This ensures that all the monitored data is actually exported, avoiding
a possible inconsistency between the data shown on the screen and the
exported PCAP data.
This commit is contained in:
emanuele-f 2023-08-18 21:11:53 +02:00
parent 6c8abf92c5
commit 1463e1656f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/emanuelef/remote_capture/CaptureService.java
View File

@ -878,9 +878,7 @@ public class CaptureService extends VpnService implements Runnable {
return;
captureService.mStopping = true;
stopPacketLoop();
captureService.signalServicesTermination();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
captureService.stopForeground(STOP_FOREGROUND_REMOVE);

3
app/src/main/jni/core/capture_libpcap.c
View File

@ -533,6 +533,9 @@ static void process_pcapd_rv(pcapdroid_t *pd, int rv) {
case PCAPD_PCAP_READ_ERROR:
log_f(PD_ERR_PCAP_READ);
break;
case PCAPD_SOCKET_WRITE_ERROR:
// ignore, as it can be caused by PCAPdroid stopping the capture
break;
default:
log_f("pcapd daemon exited with code %d", rv);
}