diff --git a/README.md b/README.md index ba4780a..3e01173 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Set Linux as router in one command. Able to provide Internet, or create WiFi hot It wraps `iptables`, `dnsmasq` etc. stuff. Use in one command, restore in one command or by `control-c` (or even by closing terminal window). -[📰 News & Developer Notes](https://github.com/garywill/linux-router/issues/28) | [More tools and projects 🛠️](https://garywill.github.io) | [🍻 Buy me a coffee ❤️](https://github.com/garywill/receiving/blob/master/receiving_methods.md) +[Linux-Router News & Developer Notes 📰](https://github.com/garywill/linux-router/issues/28) | [More tools and projects 🛠️](https://garywill.github.io) | [🍻 Buy me a coffee ❤️](https://github.com/garywill/receiving/blob/master/receiving_methods.md) ## Features @@ -413,16 +413,15 @@ On exit of a linux-router instance, script **will do cleanup**, i.e. undo most c ## TODO -
- +Sooner is better: - Detect firewalld and make sure it won't interfere our interface + +Future: - WPA3 - Global IPv6 - Explictly ban forwarding if not needed - Bring bridging method back -
- ## License linux-router is LGPL licensed @@ -486,7 +485,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Visit [**my homepage** 🏡](https://garywill.github.io) to see **more tools and projects** 🛠️. -> [❤️ Buy me a coffee](https://github.com/garywill/receiving/blob/master/receiving_methods.md) , this project took me lots of time! ([❤️ 扫个码打赏一个!](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! ([❤️ 扫码领红包并打赏一个!](https://github.com/garywill/receiving/blob/master/receiving_methods.md)) > > 🥂 ( ^\_^) o自自o (^_^ ) 🍻 diff --git a/lnxrouter b/lnxrouter old mode 100644 new mode 100755 index 2dd5941..a8bdde3 --- a/lnxrouter +++ b/lnxrouter @@ -626,6 +626,32 @@ get_interface_mac() { cat "/sys/class/net/${1}/address" } +get_interface_pci_info() { # pci id / model / virtual + is_interface "$1" || return + + local device_path + local pci_id + local pci_full + + device_path="$(readlink -f /sys/class/net/$1)" + + if [[ "$device_path" == "/sys/devices/pci"* ]]; then + pci_id="$(echo $device_path | sed 's/\//\n/g' | tail -n 3 |sed -n 1p)" + + if which lspci >/dev/null 2>&1 ; then + pci_full="$( lspci -D -nn | grep -E "^$pci_id " )" + echo " PCI: $pci_full" + else + echo " PCI: $pci_id" + fi + elif [[ "$device_path" == *"/virtual/"* ]]; then + echo " virtual interface" + fi + # TODO usb + # TODO current driver +} + + alloc_new_vface_name() { # only for wifi local i=0 local v_iface_name= @@ -1928,8 +1954,7 @@ echo echo "PID: $$" TARGET_IFACE="$(decide_target_interface)" || exit 1 # judge wired (-i CONN_IFACE) or wireless hotspot (--ap $WIFI_IFACE) -echo "Target interface is ${TARGET_IFACE} ($(get_interface_mac $TARGET_IFACE))" -# TODO: show interface type, device model and pci/usb id (hwdata pci.ids), current driver +echo "Target interface is ${TARGET_IFACE} ($(get_interface_mac $TARGET_IFACE)) $(get_interface_pci_info $TARGET_IFACE)" if [[ "$MAC_USE_RANDOM" -eq 1 ]] ; then NEW_MACADDR="$(generate_random_mac)" @@ -2065,7 +2090,7 @@ fi [[ $NO_DNSMASQ -eq 0 ]] && ( allow_dhcp ; start_dnsmasq ) echo -echo "== Setting up completed, now linux-router is working ==" +echo "== Setting up completed, now linux-router should be working ==" #============================================================ #============================================================