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

Add an option to disable ModemManager

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-04-22 20:20:28 +02:00
parent 7d64036e45
commit 97e104a5e5
6 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -1010,6 +1010,10 @@ function settings_add()
local tracebox = luci.http.formvalue("disabletracebox") or "1"
ucic:set("openmptcprouter","settings","tracebox",tracebox)
-- Enable/disable ModemManager
local modemamanger = luci.http.formvalue("disablemodemmanager") or "1"
ucic:set("openmptcprouter","settings","modemmanager",modemmanager)
-- Enable/disable server ping
local disableserverping = luci.http.formvalue("disableserverping") or "0"
ucic:set("openmptcprouter","settings","disableserverping",disableserverping)

10
luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
View file

@ -300,6 +300,16 @@
</div>
</div>
</div>
<div class="cbi-value">
<label class="cbi-value-title"><%:Disable ModemManager%></label>
<div class="cbi-value-field">
<input type="checkbox" name="disablemodemanager" class="cbi-input-checkbox" value="0" <% if luci.model.uci.cursor():get("openmptcprouter","settings","modemmanager") == "0" then %>checked<% end %>>
<br />
<div class="cbi-value-description">
<%:Disable ModemManager%>
</div>
</div>
</div>
<div class="cbi-value">
<label class="cbi-value-title"><%:Debug%></label>
<div class="cbi-value-field">

35
luci-app-openmptcprouter/po/templates/openmptcprouter.pot
View file

@ -74,7 +74,7 @@ msgstr ""
msgid "Backup on server"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:320
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:330
msgid "Balancing"
msgstr ""
@ -168,7 +168,7 @@ msgstr ""
msgid "DNS issue: can\\'t resolve hostname"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:304
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:314
msgid "Debug"
msgstr ""
@ -195,6 +195,11 @@ msgstr ""
msgid "Disable HTTP test on Server API in status page"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:304
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:309
msgid "Disable ModemManager"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:203
msgid "Disable TCP Fast Open"
msgstr ""
@ -270,11 +275,11 @@ msgstr ""
msgid "Download speed (Kb/s)"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:318
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:328
msgid "Dynamic change"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:339
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:349
msgid "Enable Bridge Acceleration"
msgstr ""
@ -282,7 +287,7 @@ msgstr ""
msgid "Enable DNS64"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:333
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:343
msgid "Enable Fast Patch offloading for connections"
msgstr ""
@ -303,7 +308,7 @@ msgstr ""
msgid "Enable TCP Low Latency"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:309
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:319
msgid "Enable debug logs"
msgstr ""
@ -536,15 +541,15 @@ msgstr ""
msgid "Master"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:314
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:324
msgid "Master interface selection"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:358
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:368
msgid "Maximum scaling CPU frequency"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:352
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:362
msgid "Minimum scaling CPU frequency"
msgstr ""
@ -642,7 +647,7 @@ msgstr ""
msgid "No available backup on server."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:319
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:329
msgid "No change"
msgstr ""
@ -699,7 +704,7 @@ msgstr ""
msgid "Obfuscating will be enabled on both side"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:317
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:327
msgid "On wizard change"
msgstr ""
@ -801,7 +806,7 @@ msgstr ""
msgid "QMI"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:330
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:340
msgid "Qualcomm Shortcut FE driver"
msgstr ""
@ -821,7 +826,7 @@ msgstr ""
msgid "Retrieve settings from server"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:384
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:394
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:993
msgid "Save & Apply"
msgstr ""
@ -834,7 +839,7 @@ msgstr ""
msgid "Save vnstats stats"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:364
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:374
msgid "Scaling governor"
msgstr ""
@ -960,7 +965,7 @@ msgstr ""
msgid "Status"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:349
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:359
msgid "Systems settings"
msgstr ""

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

@ -181,7 +181,7 @@ start_service() {
EOF
/etc/init.d/rpcd restart 2>&1 >/dev/null
fi
if [ "$(pgrep ModemManager)" = "" ] && [ -f /etc/init.d/modemmanager ] && [ -n "$(uci -q show network | grep modemmanager)" ]; then
if [ "$(pgrep ModemManager)" = "" ] && [ -f /etc/init.d/modemmanager ] && [ -n "$(uci -q show network | grep modemmanager)" ] && [ "$(uci -q openmptcprouter.settings.modemanager)" != "0" ]; then
_log "Can't find ModemManager, start it..."
/etc/init.d/modemmanager restart
fi

3
modemmanager/files/modemmanager.common
View file

@ -6,6 +6,7 @@
# If there is no interface that use modemmanager, exit
#[ -z "$(uci -q show network | grep modemmanager)" ] && exit
[ "$(uci -q get openmptcprouter.settings.modemmanager)" = "0" ] && exit
. /lib/functions.sh
. /lib/netifd/netifd-proto.sh
@ -23,7 +24,7 @@ MODEMMANAGER_EVENTS_CACHE="${MODEMMANAGER_RUNDIR}/events.cache"
# Common logging
mm_log() {
[ -n "$(uci -q show network | grep modemmanager)" ] && logger -t "ModemManager" "hotplug: $*"
logger -t "ModemManager" "hotplug: $*"
}
################################################################################

2
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -1313,7 +1313,7 @@ if [ "$(pgrep rpcd)" = "" ] && [ -f /etc/init.d/rpcd ]; then
sleep 5
fi
if [ "$(pgrep ModemManager)" = "" ] && [ -f /etc/init.d/modemmanager ] && [ -n "$(uci -q show network | grep modemmanager)" ]; then
if [ "$(pgrep ModemManager)" = "" ] && [ -f /etc/init.d/modemmanager ] && [ -n "$(uci -q show network | grep modemmanager)" ] && [ "$(uci -q get openmptcprouter.settings.modemmanager)" != "0" ]; then
_log "Can't find ModemManager, restart it..."
/etc/init.d/modemmanager restart
sleep 5