From 6ac90d59c9a3e1008598a861413910f4a83839ca Mon Sep 17 00:00:00 2001
From: XT-Martinez <32611135+XT-Martinez@users.noreply.github.com>
Date: Mon, 5 Aug 2024 23:40:50 +0800
Subject: [PATCH] Make IP Multiplexing optional

---
 .../luci-static/resources/protocol/quectel.js | 17 +++++-----
 wwan/app/quectel-cm/files/quectel.sh          | 34 +++++++++++++------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/wwan/app/luci-proto-quectel/htdocs/luci-static/resources/protocol/quectel.js b/wwan/app/luci-proto-quectel/htdocs/luci-static/resources/protocol/quectel.js
index a32eef6..2f19c3c 100644
--- a/wwan/app/luci-proto-quectel/htdocs/luci-static/resources/protocol/quectel.js
+++ b/wwan/app/luci-proto-quectel/htdocs/luci-static/resources/protocol/quectel.js
@@ -65,6 +65,9 @@ return network.registerProtocol('quectel', {
 			}, this));
 		};
 
+		o = s.taboption('general', form.Flag, 'multiplexing', _('Use IP Multiplexing'));
+		o.default = o.disabled;
+
 		apn = s.taboption('general', form.Value, 'apn', _('APN'));
 		apn.depends('pdptype', 'ipv4v6');
 		apn.depends('pdptype', 'ipv4');
@@ -79,8 +82,8 @@ return network.registerProtocol('quectel', {
 		};
 
         apnv6 = s.taboption('general', form.Value, 'apnv6', _('IPv6 APN'));
-        apnv6.depends('pdptype', 'ipv4v6');
-		apnv6.depends('pdptype', 'ipv6');
+        apnv6.depends({ pdptype: 'ipv4v6', multiplexing: '1' });
+        apnv6.depends({ pdptype: 'ipv6', multiplexing: '1' });
 		apnv6.validate = function(section_id, value) {
 			if (value == null || value == '')
 				return true;
@@ -127,17 +130,15 @@ return network.registerProtocol('quectel', {
 		o.datatype    = 'max(9200)';
 
 		o = s.taboption('advanced', form.Value, 'pdnindex', _('PDN index'));
-		o.depends('pdptype', 'ipv4v6');
-		o.depends('pdptype', 'ipv4');
+		o.depends({ pdptype: 'ipv4v6', multiplexing: '1' });
+        o.depends({ pdptype: 'ipv4', multiplexing: '1' });
 		o.placeholder = '1';
-		o.default = 1;
 		o.datatype = 'and(uinteger,min(1),max(7))';
 
 		o = s.taboption('advanced', form.Value, 'pdnindexv6', _('IPv6 PDN index'));
-		o.depends('pdptype', 'ipv4v6');
-		o.depends('pdptype', 'ipv6');
+		o.depends({ pdptype: 'ipv4v6', multiplexing: '1' });
+        o.depends({ pdptype: 'ipv6', multiplexing: '1' });
 		o.placeholder = '2';
-		o.default = 2;
 		o.datatype = 'and(uinteger,min(1),max(7))';
 
 		o = s.taboption('general', form.ListValue, 'pdptype', _('PDP Type'));
diff --git a/wwan/app/quectel-cm/files/quectel.sh b/wwan/app/quectel-cm/files/quectel.sh
index 32dc4d3..2072e61 100644
--- a/wwan/app/quectel-cm/files/quectel.sh
+++ b/wwan/app/quectel-cm/files/quectel.sh
@@ -10,6 +10,7 @@ proto_quectel_init_config() {
 	available=1
 	no_device=1
 	proto_config_add_string "device:device"
+	proto_config_add_boolean "multiplexing"
 	proto_config_add_string "apn"
 	proto_config_add_string "apnv6"
 	proto_config_add_string "pdnindex"
@@ -30,12 +31,12 @@ proto_quectel_init_config() {
 
 proto_quectel_setup() {
 	local interface="$1"
-	local device apn apnv6 auth username password pincode delay pdptype pdnindex pdnindexv6
+	local device apn apnv6 auth username password pincode delay pdptype pdnindex pdnindexv6 multiplexing
 	local dhcp dhcpv6 sourcefilter delegate mtu $PROTO_DEFAULT_OPTIONS
 	local ip4table ip6table
 	local pid zone
 
-	json_get_vars device apn apnv6 auth username password pincode delay pdnindex pdnindexv6
+	json_get_vars device apn apnv6 auth username password pincode delay pdnindex pdnindexv6 multiplexing
 	json_get_vars pdptype dhcp dhcpv6 sourcefilter delegate ip4table
 	json_get_vars ip6table mtu $PROTO_DEFAULT_OPTIONS
 
@@ -75,28 +76,39 @@ proto_quectel_setup() {
 	[ "$pdptype" = "ipv4" -o "$pdptype" = "ipv4v6" ] && ipv4opt="-4"
 	[ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && ipv6opt="-6"
 	[ -n "$auth" ] || auth="none"
-	[ -n "$pdnindex" ] || pdnindex="1"
-	[ -n "$pdnindexv6" ] || pdnindexv6="2"
 
 	quectel-qmi-proxy &
 	sleep 3
 
-	if [ -n "$ipv4opt" ]; then
-		quectel-cm -i "$ifname" $ipv4opt -n $pdnindex -m 1 ${pincode:+-p $pincode} -s "$apn" "$username" "$password" "$auth" &
-	fi
-	if [ -n "$ipv6opt" ]; then
-		quectel-cm -i "$ifname" $ipv6opt -n $pdnindexv6 -m 2 ${pincode:+-p $pincode} -s "$apnv6" "$username" "$password" "$auth" &
+	if [ "$multiplexing" = 1 ]; then
+		[ -n "$pdnindex" ] || pdnindex="1"
+		[ -n "$pdnindexv6" ] || pdnindexv6="2"
+
+		if [ -n "$ipv4opt" ]; then
+			quectel-cm -i "$ifname" $ipv4opt -n $pdnindex -m 1 ${pincode:+-p $pincode} -s "$apn" "$username" "$password" "$auth" &
+		fi
+		if [ -n "$ipv6opt" ]; then
+			quectel-cm -i "$ifname" $ipv6opt -n $pdnindexv6 -m 2 ${pincode:+-p $pincode} -s "$apnv6" "$username" "$password" "$auth" &
+		fi
+	else
+		quectel-cm -i "$ifname" $ipv4opt $ipv6opt ${pincode:+-p $pincode} -s "$apn" "$username" "$password" "$auth" &
 	fi
+	
 	sleep 5
 
 	ifconfig "$ifname" up
 	ifconfig "${ifname}_1" &>"/dev/null" && ifname4="${ifname}_1"
-	ifconfig "${ifname}_2" &>"/dev/null" && ifname6="${ifname}_2"
+	
+	if [ "$multiplexing" = 1 ]; then
+		ifconfig "${ifname}_2" &>"/dev/null" && ifname6="${ifname}_2"
+	else
+		ifname6="$ifname4"
+	fi
 
 	if [ -n "$mtu" ]; then
 		echo "Setting MTU to $mtu"
 		/sbin/ip link set dev "$ifname4" mtu "$mtu"
-		/sbin/ip link set dev "$ifname6" mtu "$mtu"
+		[ "$multiplexing" = 1 ] && /sbin/ip link set dev "$ifname6" mtu "$mtu"
 	fi
 
 	echo "Setting up $ifname"