mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2026-03-14 05:00:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipping: return error if host name does not resolve

Browse source
This commit is contained in:
Amin Ben Romdhane 2024-01-19 16:31:43 +01:00
parent 106d754c0f
commit 546b5b4533
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libbbfdm/scripts/bbf_api
View file

@ -33,7 +33,7 @@ get_ip_addr_used() {
if [ -n "$interface" ]; then
ip_addr_used=$(ifstatus "$interface" | jsonfilter -e '@["ipv6-address"][0].address')
else
ip_addr_used=$(ip -6 route | grep default | awk -F ' ' '{print $9}')
ip_addr_used=$(ip -6 route | grep default | awk -F ' ' '{print $3}' | head -n 1)
fi
else
if [ -n "$interface" ]; then

11
libbbfdm/scripts/ipping
View file

@ -25,8 +25,9 @@ ipping_error() {
# Store data in dmmap_diagnostics for both protocols (cwmp/usp)
[ "$3" = "both_proto" ] && {
$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.DiagnosticState="$1"
$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.IPAddressUsed=""
$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.SuccessCount=0
$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.FailureCount="$cnt"
$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.FailureCount="$2"
$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.AverageResponseTime=0
$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.MinimumResponseTime=9999
$UCI_SET_BBF_DMMAP dmmap_diagnostics.ipping.MaximumResponseTime=0
@ -80,13 +81,7 @@ ipping_launch() {
res=$(ping -q ${ip_proto} -c 1 -s ${dsize} -W ${timeout} ${device} "${host}" 2>&1)
ba=$(echo "$res" | grep "bad address")
[ -n "$ba" ] && {
ipping_error "Error_CannotResolveHostName" "${nbr_of_rep}" "${proto}"
return
}
ba=$(echo "$res" | grep "unknown host")
ba=$(echo "$res" | grep -E "bad address|unknown host|Name does not resolve")
[ -n "$ba" ] && {
ipping_error "Error_CannotResolveHostName" "${nbr_of_rep}" "${proto}"
return