mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #289 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2022-11-27 02:55:51 +08:00 committed by GitHub
commit 155662e3bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View file

@ -519,6 +519,14 @@ return view.extend({
so.value(ipv4, ipaddrs[ipv4] ? '%s (%s)'.format(ipv4, ipaddrs[ipv4]) : ipv4);
});
so = ss.options(form.value, 'gw', _('Gateway IPv4 Address'));
so.rmempty = true;
so.datatype = 'or(ip4addr,"ignore")';
Object.keys(hosts).forEach(function(mac) {
if (hosts[mac].ipv4)
so.value(hosts[mac].ipv4);
});
so = ss.option(form.Value, 'leasetime', _('Lease time'));
so.rmempty = true;

5
ndpi-netfilter2/Makefile
View file

@ -10,9 +10,8 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ndpi-netfilter2
PKG_RELEASE:=3
#PKG_REV:=b19e6392cf0c7d51c44e076a91fc4db0cbbd6403
PKG_REV:=ce5cca1ec5972f8404ad66ec750a3c10968010fd
PKG_RELEASE:=4
PKG_REV:=cf017cc2fecee644d0b2ff633a17377f776d1505
PKG_VERSION:=4-$(PKG_REV)
PKG_SOURCE_PROTO:=git

34
ndpi-netfilter2/patches/fix-confidence-level.patch
View file

@ -1,34 +0,0 @@
From d238ff6ad1715a640df62c7b47373293c8c136bd Mon Sep 17 00:00:00 2001
From: Vitaly Lavrov <vel21ripn@gmail.com>
Date: Tue, 22 Nov 2022 15:18:46 +0300
Subject: [PATCH] Fix confidence level after ndpi_detection_giveup()
---
ndpi-netfilter/src/main.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/ndpi-netfilter/src/main.c b/ndpi-netfilter/src/main.c
index 5582eee938..3c39af8d5e 100644
--- a/ndpi-netfilter/src/main.c
+++ b/ndpi-netfilter/src/main.c
@@ -1676,9 +1676,20 @@ ndpi_mt(const struct sk_buff *skb, struct xt_action_param *par)
detect_complete = 1;
if(proto.app_protocol == NDPI_PROTOCOL_UNKNOWN) {
u_int8_t proto_guessed;
+ ndpi_protocol p_old = proto;
proto = ndpi_detection_giveup(n->ndpi_struct, flow, 1, &proto_guessed);
+ if(_DBG_TRACE_DPI) {
+ if( p_old.app_protocol != proto.app_protocol ||
+ p_old.master_protocol != proto.master_protocol ||
+ confidence != flow->confidence)
+ pr_info(" ndpi_process_packet ndpi_detection_giveup app,master [%u,%u]->[%u,%u] c %u->%u\n",
+ p_old.app_protocol,p_old.master_protocol,
+ proto.app_protocol,proto.master_protocol,
+ confidence,flow->confidence);
+ }
ct_ndpi->proto.app_protocol = proto.app_protocol;
ct_ndpi->proto.master_protocol = proto.master_protocol;
+ ct_ndpi->confidence = confidence = flow->confidence;
c_proto->proto = pack_proto(proto);
}
if(_DBG_TRACE_DDONE)