0.6.2

fix dnsmasq pid not get
watchdog zombie judgement
iptables nft and comment judgement
use fifo for dnsmasq log

README.md

@@ -2,10 +2,11 @@
 
 Set Linux as router in one command. Able to Provide Internet, or create Wifi hotspot. Support transparent proxy (redsocks). Also useful for routing VM/containers.
 
-It wraps `iptables`, `dnsmasq` etc. stuff. Use in one command, restore in one command or by `control-c`.
+It wraps `iptables`, `dnsmasq` etc. stuff. Use in one command, restore in one command or by `control-c` (or even by closing terminal window).
 
 [Buy me a coffee](https://github.com/garywill/receiving/blob/master/receiving_methods.md)
 
+
 ## Features
 
 Basic features:
@@ -14,11 +15,10 @@ Basic features:
 - Provide Internet
 - DHCP server and RA
 - DNS server 
-- IPv6 (NAT only for now)
+- IPv6 (behind NATed LAN, like IPv4)
 - Creating Wifi hotspot:
   - Channel selecting
   - Choose encryptions: WPA2/WPA, WPA2, WPA, No encryption
-  - Hidden SSID
   - Create AP on the same interface you are getting Internet (require same channel)
 - Transparent proxy (redsocks)
 - DNS proxy
@@ -64,49 +64,38 @@ Internet----(eth0/wlan0)-Linux-(virtual interface)-----VM/container
 ### Provide Internet to an interface
 
 ```
-# lnxrouter -i eth1
+sudo lnxrouter -i eth1
 ```
 
 ### Provide an interface's Internet to another interface
 
 ```
-# lnxrouter -i eth1 -o vpn0 --dhcp-dns 1.1.1.1
+sudo lnxrouter -i eth1 -o vpn0 --dhcp-dns 1.1.1.1 -6 --dhcp-dns6 [2606:4700:4700::1111]
 ```
+> Read _Notice 1_
 
 ### Create Wifi hotspot
 
 ```
-# lnxrouter --ap wlan0 MyAccessPoint --password MyPassPhrase
+sudo lnxrouter --ap wlan0 MyAccessPoint -p MyPassPhrase
 ```
 
 ### LAN without Internet
 
 ```
-# lnxrouter -n -i eth1
-# lnxrouter -n --ap wlan0 MyAccessPoint --password MyPassPhrase
+sudo lnxrouter -n -i eth1
+sudo lnxrouter -n --ap wlan0 MyAccessPoint -p MyPassPhrase
 ```
 
-### Transparent proxy with Tor
+> Read _Notice 1_
 
-```
-# lnxrouter -i eth1 --tp 9040 --dns 9053
-```
-
-In `torrc`
-
-```
-TransPort 0.0.0.0:9040 
-DNSPort 0.0.0.0:9053
-TransPort [::]:9040 
-DNSPort [::]:9053
-```
 
 ### Internet for LXC
 
 Create a bridge
 
 ```
-# brctl addbr lxcbr5
+sudo brctl addbr lxcbr5
 ```
 
 In LXC container `config`
@@ -119,22 +108,54 @@ lxc.network.hwaddr = xx:xx:xx:xx:xx:xx
 ```
 
 ```
-# lnxrouter -i lxcbr5
+sudo lnxrouter -i lxcbr5
 ```
 
+### Transparent proxy 
+
+For example through Tor
+
+```
+sudo lnxrouter -i eth1 --tp 9040 --dns 9053 -g 192.168.55.1 --p6 fd00:5:6:7::
+```
+
+In `torrc`
+
+```
+TransPort 192.168.55.1:9040 
+DNSPort 192.168.55.1:9053
+TransPort [fd00:5:6:7::1]:9040 
+DNSPort [fd00:5:6:7::1]:9053
+```
+
+### Clients-in-sandbox network
+
+To not give our infomation to clients. Clients can still access Internet.
+
+```
+sudo lnxrouter -i eth1 \
+    --tp 9040 --dns 9053 \
+    --random-mac \
+    --ban-priv \
+    --catch-dns --log-dns   # optional
+```
+
+> This script comes with no warrenty, use on your own risk
+
+
 ### Use as transparent proxy for LXD
 
 Create a bridge
 
 ```
-# brctl addbr lxdbr5
+sudo brctl addbr lxdbr5
 ```
 
-Create and add LXD profile
+Create and add a new LXD profile overriding container's `eth0`
 
 ```
-$ lxc profile create profile5
-$ lxc profile edit profile5
+lxc profile create profile5
+lxc profile edit profile5
 
 ### profile content ###
 config: {}
@@ -147,41 +168,39 @@ devices:
     type: nic
 name: profile5
 
-$ lxc profile add <container> profile5
+lxc profile add <container> profile5
 ```
 
-That should make one container have 2 profiles. `profile5` will override `eth0`.
-
 ```
-# lnxrouter -i lxdbr5 --tp 9040 --dns 9053
+sudo lnxrouter -i lxdbr5 --tp 9040 --dns 9053
 ```
 
 To remove that new profile from container
 
 ```
-$ lxc profile remove <container> profile5
+lxc profile remove <container> profile5
 ```
 
 #### To not use profile
 
-Add device `eth0` to container overriding default `eth0`
+Add new `eth0` to container overriding default `eth0`
 
 ```
-$ lxc config device add <container> eth0 nic name=eth0 nictype=bridged parent=lxdbr5
+lxc config device add <container> eth0 nic name=eth0 nictype=bridged parent=lxdbr5
 ```
 
 To remove the customized `eth0` to restore default `eth0`
 
 ```
-$ lxc config device remove <container> eth0
+lxc config device remove <container> eth0
 ```
 
 ### Use as transparent proxy for VirtualBox
 
-On VirtualBox's global settings, create a host-only network `vboxnet5` with DHCP disabled.
+In VirtualBox's global settings, create a host-only network `vboxnet5` with DHCP disabled.
 
 ```
-# lnxrouter -i vboxnet5 --tp 9040 --dns 9053
+sudo lnxrouter -i vboxnet5 --tp 9040 --dns 9053
 ```
 
 ### Use as transparent proxy for firejail
@@ -189,12 +208,12 @@ On VirtualBox's global settings, create a host-only network `vboxnet5` with DHCP
 Create a bridge
 
 ```
-# brctl addbr firejail5
+sudo brctl addbr firejail5
 ```
 
 ```
-# lnxrouter -i firejail5 -g 192.168.55.1 --tp 9040 --dns 9053 
-$ firejail --net=firejail5 --dns=192.168.55.1
+sudo lnxrouter -i firejail5 -g 192.168.55.1 --tp 9040 --dns 9053 
+firejail --net=firejail5 --dns=192.168.55.1 --blacklist=/var/run/nscd
 ```
 
 ### CLI usage and other features
@@ -212,11 +231,18 @@ Options:
     -o <interface>          Specify an inteface to provide Internet from.
                             (Note using this with default DNS option may leak
                             queries to other interfaces)
-    -n                      Do not provide Internet
+    -n                      Do not provide Internet (See Notice 1)
+    --ban-priv              Disallow clients to access my private network
     
-    -g <ip>                 Set this host's IPv4 address, netmask is 24 
+    -g <ip>                 This host's IPv4 address in subnet (mask is /24)
+                            (example: '192.168.5.1' or '5' shortly)
     -6                      Enable IPv6 (NAT)
-    --p6 <prefix>           Set IPv6 prefix (length 64) (example: fd00:1:2:3::)
+    --no4                   Disable IPv4 Internet (not forwarding IPv4)
+                            (See Notice 1). Usually used with '-6'
+                            
+    --p6 <prefix>           Set IPv6 LAN address prefix (length 64) 
+                            (example: 'fd00:0:0:5::' or '5' shortly) 
+                            Using this enables '-6'
                             
     --dns <ip>|<port>|<ip:port>
                             DNS server's upstream DNS.
@@ -226,7 +252,7 @@ Options:
     --no-dns                Do not serve DNS
     --no-dnsmasq            Disable dnsmasq server (DHCP, DNS, RA)
     --catch-dns             Transparent DNS proxy, redirect packets(TCP/UDP) 
-                            that destination port is 53 to this host
+                            whose destination port is 53 to this host
     --log-dns               Show DNS query log
     --dhcp-dns <IP1[,IP2]>|no
                             Set IPv4 DNS offered by DHCP (default: this host)
@@ -241,15 +267,18 @@ Options:
                             hosts file
     
     --mac <MAC>             Set MAC address
+    --random-mac            Use random MAC address
  
     --tp <port>             Transparent proxy,
                             redirect non-LAN TCP and UDP traffic to port.
-                            Usually used with '--dns'
+                            (usually used with '--dns')
     
   Wifi hotspot options:
     --ap <wifi interface> <SSID>
                             Create Wifi access point
-    --password <password>   Wifi password
+    -p, --password <password>   
+                            Wifi password
+    --qr                    Show Wifi QR code in terminal
     
     --hidden                Hide access point (not broadcast SSID)
     --no-virt               Do not create virtual interface
@@ -260,8 +289,8 @@ Options:
                             (example: US)
     --freq-band <GHz>       Set frequency band: 2.4 or 5 (default: 2.4)
     --driver                Choose your WiFi adapter driver (default: nl80211)
-    -w <WPA version>        Use 1 for WPA, use 2 for WPA2, use 1+2 for both
-                            (default: 1+2)
+    -w <WPA version>        '2' for WPA2, '1' for WPA, '1+2' for both
+                            (default: 2)
     --psk                   Use 64 hex digits pre-shared-key instead of
                             passphrase
     --mac-filter            Enable Wifi hotspot MAC address filtering
@@ -279,16 +308,29 @@ Options:
 
   Instance managing:
     --daemon                Run in background
-    --list-running          Show running instances
-    --list-clients <id>     List clients of an instance
+    -l, --list-running      Show running instances
+    --lc, --list-clients <id|interface>     
+                            List clients of an instance. Or list neighbors of
+                            an interface, even if it isn't handled by us.
+                            (passive mode)
     --stop <id>             Stop a running instance
         For <id> you can use PID or subnet interface name.
         You can get them with '--list-running'
+
+    Notice 1:   This script assume your host's default policy won't forward
+                packets, so the script won't explictly ban forwarding in any
+                mode. In some unexpected case may cause unwanted packets 
+                leakage between 2 networks, which you should be aware of if you
+                want isolated network
 ```
 
 > These changes to system will not be restored by script's cleanup:
-> 1. `/proc/sys/net/ipv4/ip_forward = 1` and `/proc/sys/net/ipv6/conf/all/forwarding = 1`, needed by NAT Internet sharing.
-> 2. dnsmasq in Apparmor complain mode
+> 1. `/proc/sys/net/ipv4/ip_forward = 1` and `/proc/sys/net/ipv6/conf/all/forwarding = 1`
+> 1. dnsmasq in Apparmor complain mode
+> 1. Kernel module `nf_nat_pptp` loaded
+> 1. The wifi device which is used to create hotspot is `rfkill unblock`ed
+> 1. Wifi country code, if user specified
+
 
 ## Dependencies
 
@@ -296,24 +338,37 @@ Options:
 - procps or procps-ng
 - iproute2
 - dnsmasq
-- iptables
-
-Wifi hotspot:
-
-- hostapd
-- iw
-- iwconfig (you only need this if 'iw' can not recognize your adapter)
-- haveged (optional)
+- iptables (legacy. nft not tested)
+- WiFi hotspot dependencies
+   - hostapd
+   - iw
+   - iwconfig (you only need this if 'iw' can not recognize your adapter)
+   - haveged (optional)
+   - qrencode (optional)
 
 ## TODO
 
-- Option to ban private network access
-- Option to randomize MAC
+- WPA3
+- Global IPv6
+- Explictly ban forwarding if not needed
+- Bring bridging method back
 
 ## Donate
 
-[Buy me a coffee](https://github.com/garywill/receiving/blob/master/receiving_methods.md)
+[Buy me a coffee](https://github.com/garywill/receiving/blob/master/receiving_methods.md) , this project took me lots of time!
 
-## Thanks
 
-Many thanks to project [create_ap](https://github.com/oblique/create_ap).
+[打赏一个](https://github.com/garywill/receiving/blob/master/receiving_methods.md) 
+
+## For developers
+
+**Many thanks to project [create_ap](https://github.com/oblique/create_ap)**.
+
+This script was forked from create\_ap. Now it's quite different from it. (See `history` branch for how I modified create_ap)
+
+There're some TO-DOs listed, at both above and in the code file. We'll appreciate your help.
+
+------------------
+
+More of my projects: https://garywill.github.io
+