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

Add packet drops for root capture

Browse Source
This commit is contained in:
emanuele-f 2021-06-27 19:43:18 +02:00
parent bfb1390499
commit b308666687
9 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/emanuelef/remote_capture/activities/StatsActivity.java
View File

@ -24,8 +24,6 @@ import androidx.appcompat.app.ActionBar;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.content.BroadcastReceiver;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@ -51,6 +49,7 @@ public class StatsActivity extends BaseActivity {
private TextView mPacketsRcvd;
private TextView mActiveConns;
private TextView mDroppedConns;
private TextView mDroppedPkts;
private TextView mTotConns;
private TextView mMaxFd;
private TextView mOpenSocks;
@ -71,6 +70,7 @@ public class StatsActivity extends BaseActivity {
mPacketsRcvd = findViewById(R.id.packets_rcvd);
mActiveConns = findViewById(R.id.active_connections);
mDroppedConns = findViewById(R.id.dropped_connections);
mDroppedPkts = findViewById(R.id.pkts_dropped);
mTotConns = findViewById(R.id.tot_connections);
mMaxFd = findViewById(R.id.max_fd);
mOpenSocks = findViewById(R.id.open_sockets);
@ -82,7 +82,9 @@ public class StatsActivity extends BaseActivity {
findViewById(R.id.dns_queries_row).setVisibility(View.GONE);
findViewById(R.id.open_sockets_row).setVisibility(View.GONE);
findViewById(R.id.max_fd_row).setVisibility(View.GONE);
}
findViewById(R.id.row_dropped_connections).setVisibility(View.GONE);
} else
findViewById(R.id.row_pkts_dropped).setVisibility(View.GONE);
mReceiver = new BroadcastReceiver() {
@Override
@ -121,6 +123,7 @@ public class StatsActivity extends BaseActivity {
mPacketsRcvd.setText(Utils.formatPkts(stats.pkts_rcvd));
mActiveConns.setText(Utils.formatNumber(this, stats.active_conns));
mDroppedConns.setText(Utils.formatNumber(this, stats.num_dropped_conns));
mDroppedPkts.setText(Utils.formatNumber(this, stats.pkts_dropped));
mTotConns.setText(Utils.formatNumber(this, stats.tot_conns));
mMaxFd.setText(Utils.formatNumber(this, stats.max_fd));
mOpenSocks.setText(Utils.formatNumber(this, stats.num_open_sockets));

6
app/src/main/java/com/emanuelef/remote_capture/model/VPNStats.java
View File

@ -26,6 +26,7 @@ public class VPNStats implements Serializable {
public long bytes_rcvd;
public int pkts_sent;
public int pkts_rcvd;
public int pkts_dropped;
public int num_dropped_conns;
public int num_open_sockets;
public int max_fd;
@ -35,12 +36,13 @@ public class VPNStats implements Serializable {
/* Invoked by native code */
public void setData(long _bytes_sent, long _bytes_rcvd, int _pkts_sent, int _pkts_rcvd,
int _num_dropped_conns, int _num_open_sockets, int _max_fd,
int _active_conns, int _tot_conns, int _num_dns_queries) {
int _pkts_dropped, int _num_dropped_conns, int _num_open_sockets,
int _max_fd, int _active_conns, int _tot_conns, int _num_dns_queries) {
bytes_sent = _bytes_sent;
bytes_rcvd = _bytes_rcvd;
pkts_sent = _pkts_sent;
pkts_rcvd = _pkts_rcvd;
pkts_dropped = _pkts_dropped;
num_dropped_conns = _num_dropped_conns;
num_open_sockets = _num_open_sockets;
max_fd = _max_fd;

12
app/src/main/jni/pcapd/pcapd.c
View File

@ -490,8 +490,10 @@ static int is_tx_packet(pcapd_runtime_t *rt, const u_char *pkt, u_int16_t len) {
static int run_pcap_dump(int uid_filter) {
int rv = -1;
struct pcap_stat stats = {0};
pcapd_runtime_t rt = {0};
time_t next_interface_recheck = 0;
time_t next_stats_update = 0;
uid_resolver_t *resolver = NULL;
uid_lru_t *lru = NULL;
@ -575,6 +577,7 @@ static int run_pcap_dump(int uid_filter) {
if((uid_filter == -1) || (uid_filter == uid)) {
phdr.ts = hdr->ts;
phdr.len = hdr->caplen;
phdr.pkt_drops = stats.ps_drop;
phdr.uid = uid;
phdr.flags = is_tx ? PCAPD_FLAG_TX : 0;
@ -591,9 +594,14 @@ static int run_pcap_dump(int uid_filter) {
}
}
if((rt.pd == NULL) && (time(NULL) >= next_interface_recheck)) {
time_t now = time(NULL);
if((rt.pd == NULL) && (now >= next_interface_recheck)) {
check_capture_interface(&rt);
next_interface_recheck = time(NULL) + 5;
next_interface_recheck = now + 5;
} else if((now >= next_stats_update)) {
pcap_stats(rt.pd, &stats);
next_stats_update = now + 3;
}
}

1
app/src/main/jni/pcapd/pcapd.h
View File

@ -31,6 +31,7 @@
typedef struct {
struct timeval ts;
u_int pkt_drops;
uid_t uid;
uint16_t len;
uint8_t flags;

1
app/src/main/jni/vpnproxy-jni/capture_root.c
View File

@ -358,6 +358,7 @@ int run_root(vpnproxy_data_t *proxy) {
goto cleanup;
}
proxy->num_dropped_pkts = hdr.pkt_drops;
handle_packet(proxy, &connections, &hdr, buffer);
housekeeping:

4
app/src/main/jni/vpnproxy-jni/vpnproxy.c
View File

@ -734,7 +734,7 @@ static void sendStatsDump(const vpnproxy_data_t *proxy, const zdtun_statistics_t
(*env)->CallVoidMethod(env, stats_obj, mids.statsSetData,
capstats->sent_bytes, capstats->rcvd_bytes,
capstats->sent_pkts, capstats->rcvd_pkts,
proxy->num_dropped_connections,
min(proxy->num_dropped_pkts, INT_MAX), proxy->num_dropped_connections,
stats->num_open_sockets, stats->all_max_fd, active_conns, tot_conns, proxy->num_dns_requests);
if(!jniCheckException(env)) {
@ -967,7 +967,7 @@ static int run_tun(JNIEnv *env, jclass vpn, int tunfd, jint sdk) {
/* NOTE: must match ConnectionDescriptor::setData */
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIIJJJJIIII)V");
mids.statsInit = jniGetMethodID(env, cls.stats, "<init>", "()V");
mids.statsSetData = jniGetMethodID(env, cls.stats, "setData", "(JJIIIIIIII)V");
mids.statsSetData = jniGetMethodID(env, cls.stats, "setData", "(JJIIIIIIIII)V");
vpnproxy_data_t proxy = {
.tunfd = tunfd,

1
app/src/main/jni/vpnproxy-jni/vpnproxy.h
View File

@ -101,6 +101,7 @@ typedef struct vpnproxy_data {
uid_resolver_t *resolver;
ip_lru_t *ip_to_host;
uint64_t now_ms;
u_int num_dropped_pkts;
u_int32_t num_dropped_connections;
u_int32_t num_dns_requests;
conn_array_t new_conns;

20
app/src/main/res/layout/activity_stats.xml
View File

@ -82,6 +82,25 @@ android:layout_height="fill_parent">
android:textIsSelectable="true" />
</TableRow>
<TableRow
android:id="@+id/row_pkts_dropped"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="4dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.60"
android:textStyle="bold"
android:text="@string/packets_dropped" />
<TextView
android:id="@+id/pkts_dropped"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.40"
android:textIsSelectable="true" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="0dp"
@ -102,6 +121,7 @@ android:layout_height="fill_parent">
</TableRow>
<TableRow
android:id="@+id/row_dropped_connections"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="4dp">

1
app/src/main/res/values/strings.xml
View File

@ -158,5 +158,6 @@
<string name="permissions">Permissions</string>
<string name="virtual_app_info">This is a system daemon.</string>
<string name="unknown_app_info">\"Unknown\" marks connections whose app could not be determined</string>
<string name="packets_dropped">Packets Dropped</string>
</resources>