RNDIS modem scheme change. Decrease rmem/wmem values, change default congestion to westwood+

Author: voxel

git_home/net-wall.git/net-wall

@@ -1,14 +1,11 @@
 #!/bin/sh
 
-if [ ! -f /tmp/modem ]; then
-	/usr/sbin/net-wall-bin $*
-else
-	/usr/sbin/net-wall-bin -w eth0 $*
-fi
+# Run original firewall
+/usr/sbin/net-wall-bin $*
 
 if [ "$1" = "rule" ]; then
-	# Add own rules and remove "_lz4" occurrences if any
-	sed 's/_lz4//g' /tmp/netwall-rules > /tmp/netwall-rules.tmp
+	# Store rules of original firewall
+	cat /tmp/netwall-rules > /tmp/netwall-rules.tmp
 
 	# Check config file existence, add own rules if exists
 	if [ -f /etc/netwall.conf ]; then

git_home/ntpclient.git/dniconfig.h

@@ -3,9 +3,7 @@
  * you can replace with yours.
  */
 #define NET_IFNAME              "brwan"  /* The router's wan side interface name. */
-#define CDC_IFNAME              "eth0"   /* The router's CDC modem side interface name. */
 #define PPP_IFNAME              "ppp0"
-#define MODEM			"/tmp/modem"
 
 #define NETGEAR_DAYLIGHT_SAVING_TIME
 

git_home/ntpclient.git/ntpclient.c

@@ -702,13 +702,6 @@ static int wan_conn_up(void)
 {
 	int mode, alive;
 	struct in_addr ip;
-	struct stat statbuf;
-
-	if (stat(MODEM, &statbuf) == 0)
-		{
-		ip = get_ipaddr(CDC_IFNAME);
-		return ip.s_addr != 0;
-		}
 
 	alive = net_verified(&mode);
 	if (alive == 0)

package/base-files/files/etc/init.d/modem

@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 START=99
 
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
 CONFIG=/bin/config
 AP_MODE=$($CONFIG get ap_mode)
 BRIDGE_MODE=$($CONFIG get bridge_mode)
@@ -9,34 +10,47 @@ KVER=`uname -r | cut -f 1`
 MODULE_PATH=/lib/modules/$KVER
 
 start() {
-	# Check if not router mode
+	# Check: is router mode, exit if "no"
 	if [ "$AP_MODE" != "0" ] || [ "$BRIDGE_MODE" != "0" ] || [ "$EXTENDER_MODE" != "0" ]; then
 		exit 0;
 	fi
 
-	# Check is cable attached to WAN port, exit if "yes"
+	# Check: is cable attached to WAN port, exit if "yes"
 	detcable show | grep "WAN  : Plug in" > /dev/null
 	if [ $? -eq 0 ]; then
 		exit 0;
 	fi
 
-	# Add kernel object and switch mode of modem
-	/sbin/insmod $MODULE_PATH/rndis_host.ko
-	/sbin/usbmode -s
-	/bin/sleep 10
+	# Try to load kernel object, switch modem mode and up interface eth0
+	insmod $MODULE_PATH/rndis_host.ko
+	usbmode -s
+	sleep 10
+	ifconfig eth0 up
 
-	# Check is modem attached
-	/sbin/ifconfig eth0 up
+	# Check: is modem attached
 	if [ $? -eq 0 ]; then
+		# Attached, rename eth0 to brwan
+		ifconfig eth0 down
+		ip link delete brwan
+		ip link set eth0 name brwan
+		ifconfig brwan up
+
+		# Stop services
 		/etc/init.d/net-wan stop
 		/etc/init.d/detcable stop
 		/etc/init.d/watchdog stop
-		echo -n 1 > /tmp/port_status
+		/etc/init.d/ntpclient stop
 		echo modem > /tmp/modem
+		echo -n 1 > /tmp/port_status
+
+		# Start services and restart firewall
 		/etc/init.d/net-wan start
-		/usr/sbin/net-wall restart
+		net-wall restart
+		killall ntpclient
+		sleep 15
+		/etc/init.d/ntpclient start
 	else
-	# No modem found, restore kernel objects
-		/sbin/rmmod rndis_host
+		# No modem found, just unload kernel objects
+		rmmod rndis_host
 	fi
 }

package/base-files/files/etc/init.d/net-wan

@@ -3,9 +3,6 @@
 
 FIREWALL="/www/cgi-bin/firewall.sh"
 DHCPNAME="/tmp/dhcp_name.conf"
-if [ -f /tmp/modem ]; then
-	WAN_IF=eth0
-fi
 
 check_qca_nss() {
 	local proto=$($CONFIG get wan_proto)

package/base-files/files/etc/sysctl.conf

@@ -7,16 +7,20 @@ net.ipv4.ip_option_rr_ssrr_lsrr_pass_through=1
 net.ipv4.ipfrag_overlap_drop=1
 net.ipv4.icmp_echo_ignore_broadcasts=1
 net.ipv4.icmp_ignore_bogus_error_responses=1
-net.ipv4.tcp_congestion_control=yeah
+net.ipv4.tcp_congestion_control=westwood
 net.ipv4.tcp_ecn=0
 net.ipv4.tcp_fin_timeout=60
 net.ipv4.tcp_keepalive_time=7200
 net.ipv4.tcp_syncookies=0
 net.ipv4.tcp_timestamps=1
+net.ipv4.tcp_rmem=4096 87380 6291456
+net.ipv4.tcp_wmem=4096 16384 4194304
 net.ipv4.udp_ssdp_deliver_all=1
 net.core.netdev_max_backlog=1000
-net.core.rmem_max = 524288
-net.core.wmem_max = 524288
+net.core.rmem_default=212992
+net.core.wmem_default=212992
+net.core.rmem_max=212992
+net.core.wmem_max=212992
 net.netfilter.nf_conntrack_checksum=0
 net.netfilter.nf_conntrack_expect_max=32
 net.netfilter.nf_conntrack_acct=1