refactor listing clients function
This commit is contained in:
garywill
parent
f9874eaed3
commit
92896c3997
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
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.
|
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) :)
|
[Buy me a coffee](https://github.com/garywill/receiving/blob/master/receiving_methods.md) :)
|
||||||
|
|
||||||
|
|
@ -304,7 +304,9 @@ Options:
|
||||||
Instance managing:
|
Instance managing:
|
||||||
--daemon Run in background
|
--daemon Run in background
|
||||||
--list-running Show running instances
|
--list-running Show running instances
|
||||||
--list-clients <id> List clients of an instance
|
--lc, --list-clients <id>
|
||||||
|
List clients of an instance. Or list neighbors of
|
||||||
|
any interface, even if it isn't handled by us
|
||||||
--stop <id> Stop a running instance
|
--stop <id> Stop a running instance
|
||||||
For <id> you can use PID or subnet interface name.
|
For <id> you can use PID or subnet interface name.
|
||||||
You can get them with '--list-running'
|
You can get them with '--list-running'
|
||||||
|
|
@ -342,7 +344,6 @@ Options:
|
||||||
|
|
||||||
- WPA3
|
- WPA3
|
||||||
- Global IPv6
|
- Global IPv6
|
||||||
- Refactor clients(neighbors) listing function
|
|
||||||
- Explictly ban forwarding if not needed
|
- Explictly ban forwarding if not needed
|
||||||
- Bring bridging method back
|
- Bring bridging method back
|
||||||
|
|
||||||
|
|
|
||||||
167
lnxrouter
167
lnxrouter
|
|
@ -101,7 +101,9 @@ Options:
|
||||||
Instance managing:
|
Instance managing:
|
||||||
--daemon Run in background
|
--daemon Run in background
|
||||||
--list-running Show running instances
|
--list-running Show running instances
|
||||||
--list-clients <id> List clients of an instance
|
--lc, --list-clients <id>
|
||||||
|
List clients of an instance. Or list neighbors of
|
||||||
|
any interface, even if it isn't handled by us
|
||||||
--stop <id> Stop a running instance
|
--stop <id> Stop a running instance
|
||||||
For <id> you can use PID or subnet interface name.
|
For <id> you can use PID or subnet interface name.
|
||||||
You can get them with '--list-running'
|
You can get them with '--list-running'
|
||||||
|
|
@ -442,7 +444,7 @@ parse_user_options(){
|
||||||
shift
|
shift
|
||||||
LIST_RUNNING=1
|
LIST_RUNNING=1
|
||||||
;;
|
;;
|
||||||
--list-clients)
|
--lc|--list-clients)
|
||||||
shift
|
shift
|
||||||
LIST_CLIENTS_ID="$1"
|
LIST_CLIENTS_ID="$1"
|
||||||
shift
|
shift
|
||||||
|
|
@ -1255,79 +1257,114 @@ get_confdir_from_pid() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
print_client_by_mac() {
|
#======================================================
|
||||||
local line ipaddr hostname
|
|
||||||
local mac="$1"
|
|
||||||
|
|
||||||
if [[ -f "$CONFDIR/dnsmasq.leases" ]]; then
|
print_clients_from_leases() { # MAC|IP|HOST|lease
|
||||||
line=$(grep " $mac " "$CONFDIR/dnsmasq.leases" | tail -n 1)
|
local LEASE_FILE="$1"
|
||||||
ipaddr=$(echo "$line" | cut -d' ' -f3)
|
local FILEC
|
||||||
hostname=$(echo "$line" | cut -d' ' -f4)
|
local line
|
||||||
fi
|
local LEASEstr LEASEstamp
|
||||||
|
|
||||||
|
FILEC="$(cat "$LEASE_FILE" | grep -v -E "^duid\b" | sed -r '/^\s*$/d' )"
|
||||||
|
|
||||||
[[ -z "$ipaddr" ]] && ipaddr="*"
|
echo "$FILEC" | while read line
|
||||||
[[ -z "$hostname" ]] && hostname="*"
|
do
|
||||||
|
#echo aa$line
|
||||||
printf "%-20s %-18s %s\n" "$mac" "$ipaddr" "$hostname"
|
LEASEstamp="$(echo "$line" | awk '{print $1}')"
|
||||||
}
|
MAC="$(echo "$line" | awk '{print $2}')"
|
||||||
|
IP="$(echo "$line" | awk '{print $3}' | sed 's/\[//g' | sed 's/\]//g')"
|
||||||
print_clients_in_leases() {
|
HOST="$(echo "$line" | awk '{print $4}' | sed 's/*/?/g')"
|
||||||
local line ipaddr hostname
|
|
||||||
local mac
|
if [[ -n "$MAC" ]]; then
|
||||||
|
LEASEstr="$(date -d @${LEASEstamp} +%m-%d_%X)"
|
||||||
if [[ -f "$CONFDIR/dnsmasq.leases" ]]; then
|
|
||||||
while read line
|
|
||||||
do
|
|
||||||
mac=$(echo "$line" | cut -d' ' -f2)
|
|
||||||
ipaddr=$(echo "$line" | cut -d' ' -f3)
|
|
||||||
hostname=$(echo "$line" | cut -d' ' -f4)
|
|
||||||
|
|
||||||
printf "%-20s %-18s %s\n" "MAC" "IP" "Hostname"
|
echo "$MAC|$IP|$HOST|$LEASEstr"
|
||||||
printf "%-20s %-18s %s\n" "$mac" "$ipaddr" "$hostname"
|
fi
|
||||||
done < "$CONFDIR/dnsmasq.leases"
|
done
|
||||||
fi
|
|
||||||
|
}
|
||||||
|
print_interface_neighbors_via_iproute() { # MAC|IP|_|STATUS
|
||||||
|
local IFACE=$1
|
||||||
|
|
||||||
|
local line
|
||||||
|
|
||||||
|
ip n | grep -E "\bdev $IFACE\b" | sed 's/ /|/g' | while read line
|
||||||
|
do
|
||||||
|
local MAC IP STATUS
|
||||||
|
|
||||||
|
IP="$(echo $line | awk -F'|' '{print $1}')"
|
||||||
|
|
||||||
|
if [[ "$(echo $line | awk -F'|' '{print $4}')" == "lladdr" ]]; then # has mac
|
||||||
|
# if has mac, $4="lladdr" and $5=macaddress and $6+=status
|
||||||
|
MAC="$(echo $line | awk -F'|' '{print $5}')"
|
||||||
|
STATUS="$(echo $line | awk -F'|' '$1="";$2="";$3="";$4="";$5="";{print}' | awk '{$1=$1;print}'| sed 's/ /,/g')"
|
||||||
|
else # no mac
|
||||||
|
# if no mac, $4="" and $5+=status
|
||||||
|
MAC="?"
|
||||||
|
STATUS="$(echo $line | awk -F'|' '$1="";$2="";$3="";$4="";{print}' | awk '{$1=$1;print}' | sed 's/ /,/g')"
|
||||||
|
fi
|
||||||
|
if [[ -n "$IP" ]]; then
|
||||||
|
echo "$MAC|$IP|?|$STATUS"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
print_interface_neighbors_via_iw() { # MAC|_|_|signal
|
||||||
|
local IFACE=$1
|
||||||
|
local MAC SIGNAL
|
||||||
|
iw dev $IFACE station dump | awk '($1 ~ /Station$/) {print $2}' | while read MAC
|
||||||
|
do
|
||||||
|
if [[ -n "$MAC" ]]; then
|
||||||
|
SIGNAL="$(iw dev $IFACE station get $MAC | grep "signal:" | awk '{print $2}')"
|
||||||
|
echo "${MAC}|?|?|${SIGNAL} dBm"
|
||||||
|
fi
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
list_clients() {
|
list_clients() {
|
||||||
local subn_iface pid
|
local IFACE pid
|
||||||
|
local CONFDIR
|
||||||
# If PID is given, get the associated wifi iface
|
|
||||||
|
local output=""
|
||||||
|
# If number (PID) is given, get the associated wifi iface
|
||||||
if [[ "$1" =~ ^[1-9][0-9]*$ ]]; then
|
if [[ "$1" =~ ^[1-9][0-9]*$ ]]; then
|
||||||
pid="$1"
|
pid="$1"
|
||||||
subn_iface=$(get_subn_iface_from_pid "$pid")
|
IFACE=$(get_subn_iface_from_pid "$pid")
|
||||||
[[ -z "$subn_iface" ]] && die "'$pid' is not the pid of a running $PROGNAME instance."
|
if [[ -z "$IFACE" ]] ; then
|
||||||
fi
|
echo "'$pid' is not the pid of a running $PROGNAME instance." >&2
|
||||||
|
exit 1
|
||||||
[[ -z "$subn_iface" ]] && subn_iface="$1"
|
|
||||||
|
|
||||||
[[ -z "$pid" ]] && pid=$(get_pid_from_subn_iface "$subn_iface")
|
|
||||||
[[ -z "$pid" ]] && die "'$subn_iface' is not used from $PROGNAME instance.\n\
|
|
||||||
Maybe you need to pass the virtual interface instead.\n\
|
|
||||||
Use --list-running to find it out."
|
|
||||||
[[ -z "$CONFDIR" ]] && CONFDIR=$(get_confdir_from_pid "$pid")
|
|
||||||
# instance check finished
|
|
||||||
|
|
||||||
##################################################
|
|
||||||
# TODO : not compatitable with ipv6 enabled. dns lease and iw is not enough . use 'ip n', so compatitable with any interface
|
|
||||||
if [[ -f "$CONFDIR/hostapd.conf" && $USE_IWCONFIG -eq 0 ]]; then
|
|
||||||
local awk_cmd='($1 ~ /Station$/) {print $2}'
|
|
||||||
local client_list=$(iw dev "$subn_iface" station dump | awk "$awk_cmd")
|
|
||||||
|
|
||||||
if [[ -z "$client_list" ]]; then
|
|
||||||
echo "No clients connected"
|
|
||||||
return
|
|
||||||
fi
|
fi
|
||||||
|
else # non-number given
|
||||||
|
IFACE="$1"
|
||||||
|
if ( ! is_interface $IFACE ) ; then
|
||||||
|
echo "'$IFACE' is not an interface" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
pid=$(get_pid_from_subn_iface "$IFACE")
|
||||||
|
if [[ -n "$pid" ]] ; then # if this interface is hosted by us
|
||||||
|
CONFDIR=$(get_confdir_from_pid "$pid")
|
||||||
|
output="$(print_clients_from_leases "$CONFDIR/dnsmasq.leases" )"
|
||||||
|
else # this interface NOT hosted by us
|
||||||
|
echo "Tip: '$IFACE' is not an interface hosted by $PROGNAME" >&2
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
output="$(echo "$output" ; print_interface_neighbors_via_iw $IFACE) "
|
||||||
|
output="$(echo "$output" ; print_interface_neighbors_via_iproute $IFACE)"
|
||||||
|
|
||||||
|
output="$(echo "$output" | sort -k 1 -k 2 -t '|' | uniq | sed -r '/^\s*$/d')"
|
||||||
|
|
||||||
printf "%-20s %-18s %s\n" "MAC" "IP" "Hostname"
|
echo "$IFACE ($(get_interface_mac $IFACE)) neighbors:"
|
||||||
|
|
||||||
local mac
|
local fmt="%-19s%-41s%-20s%s" # string length: MAC 17, ipv4 15, ipv6 39, hostname ?
|
||||||
for mac in $client_list; do
|
printf "$fmt\n" "MAC" "IP" "HOSTNAME" "INFO"
|
||||||
print_client_by_mac $mac
|
|
||||||
done
|
local line
|
||||||
else
|
echo "$output"| while read line
|
||||||
echo "Listing clients via DNS lease file. non-DHCPed clients won't be showed"
|
do
|
||||||
print_clients_in_leases
|
if [[ -n "$line" ]]; then
|
||||||
fi
|
echo "$line" | awk -F'|' "{printf \"$fmt\n\",\$1,\$2,\$3,\$4}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
# TODO : merge same mac and same ip line
|
||||||
}
|
}
|
||||||
|
|
||||||
has_running_instance() {
|
has_running_instance() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue