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

Remove inactive connections

Browse Source
This commit is contained in:
emanuele-f 2019-11-09 19:59:03 +01:00
parent a7f926f763
commit acfabc2991
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/emanuelef/remote_capture/ConnectionsAdapter.java
View File

@ -21,10 +21,12 @@ public class ConnectionsAdapter extends BaseAdapter {
private static final String TAG = "ConnectionsAdapter";
private MainActivity mActivity;
private ArrayList<ConnDescriptor> mItems;
private Drawable mUnknownIcon;
ConnectionsAdapter(MainActivity context) {
mActivity = context;
mItems = new ArrayList<>();
mUnknownIcon = mActivity.getResources().getDrawable(android.R.drawable.ic_menu_help);
}
@NonNull
@ -48,7 +50,7 @@ public class ConnectionsAdapter extends BaseAdapter {
if(app != null)
appIcon = Objects.requireNonNull(app.getIcon().getConstantState()).newDrawable();
else
appIcon = mActivity.getResources().getDrawable(android.R.drawable.ic_menu_help);
appIcon = mUnknownIcon;
icon.setImageDrawable(appIcon);
@ -87,17 +89,18 @@ public class ConnectionsAdapter extends BaseAdapter {
}
});
/* The existing items will be updated, wherease the new
* items will be added. Old items will be just set as closed. */
/* NOTE: we could just replace all the connections objects instead of the merge code
* below. However, the code below might be useful in the future to implement more complex
* status change/cleanup. */
int adapter_pos = 0;
for (ConnDescriptor eval_conn : connections) {
ConnDescriptor adapter_conn = getItem(adapter_pos);
/* Skip the closed connections */
/* Remove the closed connections */
while ((adapter_conn != null) && (eval_conn.incr_id > adapter_conn.incr_id)) {
// TODO set closed
adapter_conn = getItem(++adapter_pos);
mItems.remove(adapter_pos);
adapter_conn = getItem(adapter_pos);
}
if (adapter_conn == null)

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

@ -632,7 +632,7 @@ static int running = 0;
static int run_tun(JNIEnv *env, jclass vpn, int tapfd, jint sdk) {
zdtun_t *tun;
char buffer[32767];
time_t last_connections_dump = time(NULL);
time_t last_connections_dump = (time(NULL) * 1000) - CONNECTION_DUMP_UPDATE_FREQUENCY_MS + 1000 /* update in a second */;
vpnproxy_data_t proxy = {
.tapfd = tapfd,