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 #303 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2023-02-19 01:34:50 +08:00 committed by GitHub
commit 376ad250d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 32 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmbim/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libmbim
PKG_SOURCE_VERSION:=1.28.2
PKG_SOURCE_VERSION:=1.29.2
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
PKG_MIRROR_HASH:=0b0b46016738fc22355d5a58c8a2d1b2f04906c49c51a50b57a09640d13b00b7
#PKG_MIRROR_HASH:=0b0b46016738fc22355d5a58c8a2d1b2f04906c49c51a50b57a09640d13b00b7
PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>

4
libqmi/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libqmi
PKG_SOURCE_VERSION:=1.32.2
PKG_SOURCE_VERSION:=1.33.3
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
PKG_MIRROR_HASH:=711d16d75a6a9afaefcf2be1bc845a4a6181dff786dfbd079e41e91279a0be91
#PKG_MIRROR_HASH:=711d16d75a6a9afaefcf2be1bc845a4a6181dff786dfbd079e41e91279a0be91
PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>

10
luci-app-openmptcprouter/root/bin/omr-modemmanager
View file

@ -6,11 +6,11 @@ timeout 1 mmcli -L | while read MODEM; do
MODEM_ID=$(echo $MODEM | awk -F' ' '{print $1}' | awk -F/ '{print $6}')
MODEM_INFO="$(timeout 1 mmcli -m $MODEM_ID --output-keyvalue)"
if [ -n "$MODEM_INFO" ] && [ "$(echo "$MODEM_INFO" | grep 'modem.generic.device ' | awk -F": " '{print $2}')" = "$MODEM_INTF" ]; then
PERCENT=$(echo "$MODEM_INFO" | grep 'modem.generic.signal-quality.value ' | awk -F": " '{print $2}')
OPERATOR=$(echo "$MODEM_INFO" | grep 'modem.3gpp.operator-name ' | awk -F": " '{print $2}')
NUMBER=$(echo "$MODEM_INFO" | grep 'modem.generic.own-numbders.value[1]' | awk -F": " '{print $2}')
STATE=$(echo "$MODEM_INFO" | grep 'modem.generic.state ' | awk -F": " '{print $2}')
TYPE=$(echo "$MODEM_INFO" | grep 'modem.generic.access-technologies.value\[1\]' | awk -F": " '{print $2}')
PERCENT=$(echo "$MODEM_INFO" | grep -m 1 'modem.generic.signal-quality.value ' | awk -F": " '{print $2}')
OPERATOR=$(echo "$MODEM_INFO" | grep -m 1 'modem.3gpp.operator-name ' | awk -F": " '{print $2}')
NUMBER=$(echo "$MODEM_INFO" | grep -m 1 'modem.generic.own-numbders.value[1]' | awk -F": " '{print $2}')
STATE=$(echo "$MODEM_INFO" | grep -m 1 'modem.generic.state ' | awk -F": " '{print $2}')
TYPE=$(echo "$MODEM_INFO" | grep -m 1 'modem.generic.access-technologies.value\[1\]' | awk -F": " '{print $2}')
[ -z "$INFO" ] && echo $PERCENT
[ "$INFO" = "all" ] && echo "$PERCENT;$OPERATOR;$NUMBER;$STATE;$TYPE"
exit

6
luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
View file

@ -177,7 +177,7 @@ start_service() {
else
rm -f /dev/sfe_ipv6
fi
else
elif [ -d "/sys/module/fast_classifier" ]; then
rmmod fast_classifier 2>&1 >/dev/null
fi
@ -188,9 +188,9 @@ start_service() {
set firewall.zone_vpn.auto_helper='0'
commit firewall
EOF
rmmod nf_nat_sip 2>&1 >/dev/null
[ -n "$(lsmod | grep nf_nat_sip)" ] && rmmod nf_nat_sip 2>&1 >/dev/null
sleep 2
rmmod nf_conntrack_sip 2>&1 >/dev/null
[ -n "$(lsmod | grep nf_conntrack_sip)" ] && rmmod nf_conntrack_sip 2>&1 >/dev/null
else
uci -q batch <<-EOF >/dev/null
set firewall.zone_lan.auto_helper='1'

4
modemmanager/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=modemmanager
PKG_SOURCE_VERSION:=1.20.2
PKG_SOURCE_VERSION:=1.20.4
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
PKG_MIRROR_HASH:=f138effc693456c5040ec22e17c0a8b41143c3b17b62437462995c297a9150dc
#PKG_MIRROR_HASH:=f138effc693456c5040ec22e17c0a8b41143c3b17b62437462995c297a9150dc
PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
PKG_LICENSE:=GPL-2.0-or-later

2
ndpi-netfilter2/Makefile
View file

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ndpi-netfilter2
PKG_RELEASE:=4
PKG_REV:=cf017cc2fecee644d0b2ff633a17377f776d1505
PKG_REV:=ac0ad66b3644a43cbaa821a6135d3e610f8b2c1a
PKG_VERSION:=4-$(PKG_REV)
PKG_SOURCE_PROTO:=git

19
ndpi-netfilter2/patches/fcommon.patch
View file

@ -1,19 +0,0 @@
--- a/ndpi-netfilter/ipt/Makefile.anc 2022-09-05 09:34:30.579787766 +0200
+++ b/ndpi-netfilter/ipt/Makefile 2022-09-05 09:34:42.555588398 +0200
@@ -2,14 +2,14 @@
NDPI_PRO := ${NDPI_SRC}/lib/protocols
XTBL := $(shell pkg-config --variable=xtlibdir xtables)
-CFLAGS = -fPIC -I../.. -I${NDPI_SRC}/include -I${NDPI_SRC}/lib -I../src -I../libre -DOPENDPI_NETFILTER_MODULE -O2 -Wall
+CFLAGS = -fPIC -I../.. -I${NDPI_SRC}/include -I${NDPI_SRC}/lib -I../src -I../libre -DOPENDPI_NETFILTER_MODULE -O2 -Wall -fcommon
all: libxt_ndpi.so
install: libxt_ndpi.so
if [ -n "$(DESTDIR)$(XTBL)" -a -d "$(DESTDIR)$(XTBL)" ]; then install -v libxt_ndpi.so $(DESTDIR)$(XTBL); ln -fs libxt_ndpi.so $(DESTDIR)$(XTBL)/libxt_NDPI.so ; else echo "No pkg-config --variable=xtlibdir xtables"; fi
lib%.so: lib%.o
- $(CC) -shared -o $@ $^;
+ $(CC) -shared -nostartfiles -o $@ $^;
lib%.o: lib%.c ../src/xt_ndpi.h ${NDPI_SRC}/include/ndpi_config.h ../libre/regexp.h ../libre/regexp.c
$(CC) ${CFLAGS} -D_INIT=lib$*_init -c -o $@ $<;
clean:

4
openmptcprouter/files/bin/omr-test-speed
View file

@ -19,9 +19,9 @@ bestping="9999"
for pinghost in $HOSTLST; do
domain=$(echo $pinghost | awk -F/ '{print $3}')
if [ -z "$INTERFACE" ] || [ "$FORCEVPS" = true ]; then
ping=$(ping -c1 -w2 $domain | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
ping=$(ping -4 -c1 -w2 $domain | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
else
ping=$(ping -c1 -w2 -I $INTERFACE -B $domain | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
ping=$(ping -4 -c1 -w2 -I $INTERFACE -B $domain | cut -d "/" -s -f5 | cut -d "." -f1 | tr -d '\n')
fi
echo "host: $domain - ping: $ping"
if [ -n "$ping" ] && [ "$ping" -lt "$bestping" ]; then

4
openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
View file

@ -258,8 +258,8 @@ if [ "$(uci -q get openmptcprouter.settings.sipalg)" = "0" ]; then
set firewall.zone_vpn.auto_helper='0'
commit firewall
EOF
rmmod nf_nat_sip 2>&1 >/dev/null
rmmod nf_conntrack_sip 2>&1 >/dev/null
[ -n "$(lsmod | grep nf_nat_sip)" ] && rmmod nf_nat_sip 2>&1 >/dev/null
[ -n "$(lsmod | grep nf_conntrack_sip)" ] && rmmod nf_conntrack_sip 2>&1 >/dev/null
fi
rm -f /tmp/luci-indexcache

23
shadowsocks-libev/files/shadowsocks.conf
View file

@ -2,18 +2,18 @@
# max open files
fs.file-max = 512000
# max read buffer
net.core.rmem_max = 67108864
net.core.rmem_max = 16777216
# max write buffer
net.core.wmem_max = 67108864
net.core.wmem_max = 16777216
net.core.optmem_max = 33554432
# default read buffer
#net.core.rmem_default = 131072
#net.core.rmem_default = 16777216
# default write buffer
#net.core.wmem_default = 131072
#net.core.wmem_default = 16777216
# max processor input queue
net.core.netdev_max_backlog = 4096
net.core.netdev_max_backlog = 8192
# max backlog
net.core.somaxconn = 4096
net.core.somaxconn = 8192
# resist SYN flood attacks
net.ipv4.tcp_syncookies = 1
@ -36,13 +36,13 @@ net.ipv4.tcp_max_tw_buckets = 10000
# turn on TCP Fast Open on both client and server side
#net.ipv4.tcp_fastopen = 3
# TCP receive buffer
net.ipv4.tcp_rmem = 4096 87380 33554432
net.ipv4.tcp_rmem = 4096 87380 16777216
# TCP write buffer
net.ipv4.tcp_wmem = 4096 65536 33554432
net.ipv4.tcp_wmem = 4096 87380 16777216
# TCP buffer
net.ipv4.tcp_mem = 8092 131072 67108864
net.ipv4.tcp_mem = 8192000 8192000 8192000
# UDP buffer
net.ipv4.udp_mem = 8092 131072 67108864
net.ipv4.udp_mem = 4096 131072 67108864
# turn off path MTU discovery
net.ipv4.tcp_mtu_probing = 0
@ -54,3 +54,6 @@ net.netfilter.nf_conntrack_max = 131072
net.ipv4.tcp_ecn = 2
#net.ipv4.tcp_sack = 0
#net.ipv4.tcp_dsack = 0
#net.ipv4.tcp_fack = 0
net.ipv4.tcp_slow_start_after_idle = 0