routing/check_net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace 'ifconfig' calls with 'ip'.

Browse Source
This commit is contained in:
Christoph
2018-03-16 08:50:36 +01:00
parent 8a569b1622
commit 6bde0e7c07
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
check_net.sh
View File

@@ -194,7 +194,7 @@ declare -A filetime_PID_arr
for inet_device in "${online_devices_arr[@]}" ; do for inet_device in "${online_devices_arr[@]}" ; do
if containsElement "$inet_device" "${dsl_devices_arr[@]}" ; then if containsElement "$inet_device" "${dsl_devices_arr[@]}" ; then
remote_gw_address=`ifconfig $inet_device 2> /dev/null | grep "inet Adresse" | cut -d":" -f3 | cut -d" " -f1` remote_gw_address="$(ip addr show $inet_device 2> /dev/null | grep peer | awk '{print$4}' | cut -d "/" -f1)"
else else
remote_gw_address=${static_gw_arr[$inet_device]} remote_gw_address=${static_gw_arr[$inet_device]}
fi fi
@@ -263,7 +263,7 @@ while true ; do
## - Is remote a remote gateway for this device knpn? ## - Is remote a remote gateway for this device knpn?
## - ## -
remote_gw_address=`ifconfig $inet_device 2> /dev/null | grep "inet Adresse" | cut -d":" -f3 | cut -d" " -f1` remote_gw_address="$(ip addr show $inet_device 2> /dev/null | grep peer | awk '{print$4}' | cut -d "/" -f1)"
iface_name="dsl-`echo $inet_device | cut -d '-' -f2`" iface_name="dsl-`echo $inet_device | cut -d '-' -f2`"
rt_name="dsl_`echo $inet_device | cut -d '-' -f2`" rt_name="dsl_`echo $inet_device | cut -d '-' -f2`"
if [[ -n "$remote_gw_address" ]]; then if [[ -n "$remote_gw_address" ]]; then

4
netconfig.sh
View File

@@ -308,7 +308,7 @@ while ! $configured && [ $_try_number -lt $max_attempts ] ; do
## - Is the device present and has local Address ? ## - Is the device present and has local Address ?
## - ## -
local_gw_address=`ifconfig $inet_device 2> /dev/null | grep "inet Adresse" | cut -d":" -f2 | cut -d" " -f1` local_gw_address="$(ip addr show $inet_device 2> /dev/null | grep inet | awk '{print$2}')"
if [ -z $local_gw_address ]; then if [ -z $local_gw_address ]; then
if $LOGGING_CONSOLE ; then if $LOGGING_CONSOLE ; then
echo -e "\n\t[ Error ]: Connection at interface \"$inet_device\" seems to be down !" echo -e "\n\t[ Error ]: Connection at interface \"$inet_device\" seems to be down !"
@@ -350,7 +350,7 @@ while ! $configured && [ $_try_number -lt $max_attempts ] ; do
## - Is the DSL-device known and has remote Address ? ## - Is the DSL-device known and has remote Address ?
## - ## -
if containsElement "$inet_device" "${dsl_devices_arr[@]}" ; then if containsElement "$inet_device" "${dsl_devices_arr[@]}" ; then
remote_gw_address=`ifconfig $inet_device 2> /dev/null | grep "inet Adresse" | cut -d":" -f3 | cut -d" " -f1` remote_gw_address="$(ip addr show $inet_device 2> /dev/null | grep peer | awk '{print$4}' | cut -d "/" -f1)"
remote_gw_net="$remote_gw_address/32" remote_gw_net="$remote_gw_address/32"
else else
net_address=`sipcalc $inet_device 2> /dev/null | grep -i -e "^network\s*address\s*-" | awk '{print$4}'` net_address=`sipcalc $inet_device 2> /dev/null | grep -i -e "^network\s*address\s*-" | awk '{print$4}'`