Currently, if enable both wifi and usb tethering and them turn them off the first disabled one will not be cleared correctly. reproduce steps: 1. Enable Data Connection / Disable wifi 2. Turning wifi tethering 3. Turning usb tethering 4. Use "adb shell iptables -L FORWARD -vnx" to check the both two tethering types are turning on 5. Disable one of tethering type 6. redo the 4. step expect reuslt: the corresponding interface is turned off in forward chain actual result: the result of 6. is the same as the result of 4.

remove the check of interfacelist in disablenat to make sure the corresponding interface will be removed in forward chain

Comment on attachment 829184 [details] [diff] [review] Bug 936393 - Make sure stop tethering works correctly when there are different tethering types enabled. r=vchang Review of attachment 829184 [details] [diff] [review]: ----------------------------------------------------------------- Before I stamp for the patch, may I know what test cases have you tried ? Which phones do you use for test ?

(In reply to Vincent Chang[:vchang] from comment #2) > Comment on attachment 829184 [details] [diff] [review] > Bug 936393 - Make sure stop tethering works correctly when there are > different tethering types enabled. r=vchang > > Review of attachment 829184 [details] [diff] [review]: > ----------------------------------------------------------------- > > Before I stamp for the patch, may I know what test cases have you tried ? > Which phones do you use for test ? I used unagi and tested with following steps: 1. enabled both WiFi and USB tethering 2. have another device and computer to connect to the phone 3. connect to Internet to make sure the connection is available 4. turn off WiFi tethering 5. Check the device's connection is available or not result: still can see the connection, but can not connect to Internet anymore 6. Check the computer's connection result: the connection is still available 7. Turn off the USB tetethering 8. Check the iptable result: the FORWARD CHAIN are cleared correctly

Comment on attachment 829184 [details] [diff] [review] Bug 936393 - Make sure stop tethering works correctly when there are different tethering types enabled. r=vchang Review of attachment 829184 [details] [diff] [review]: ----------------------------------------------------------------- Thanks, it looks good for me.