mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

UDPEcho diagnostics: use port 7 as default value

Browse source
This commit is contained in:
Amin Ben Ramdhane 2022-04-25 10:55:14 +01:00
parent 0e16d6b040
commit 755437ebe8
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dmtree/tr143/diagnostics.c
View file

@ -1268,7 +1268,7 @@ static int set_IPDiagnosticsUDPEchoDiagnostics_Host(char *refparam, struct dmctx
static int get_IPDiagnosticsUDPEchoDiagnostics_Port(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
*value = get_diagnostics_option_fallback_def("udpechodiag", "port", "1");
*value = get_diagnostics_option_fallback_def("udpechodiag", "port", "7");
return 0;
}
@ -2100,9 +2100,6 @@ static int operate_IPDiagnostics_UDPEchoDiagnostics(char *refparam, struct dmctx
return CMD_INVALID_ARGUMENTS;
char *udpecho_port = dmjson_get_value((json_object *)value, 1, "Port");
if (udpecho_port[0] == '\0')
return CMD_INVALID_ARGUMENTS;
char *udpecho_interface = dmjson_get_value((json_object *)value, 1, "Interface");
char *udpecho_proto = dmjson_get_value((json_object *)value, 1, "ProtocolVersion");
char *udpecho_nbofrepetition = dmjson_get_value((json_object *)value, 1, "NumberOfRepetitions");

8
scripts/udpecho_launch
View file

@ -6,7 +6,7 @@
udpecho_launch() {
host=$(uci_get_bbf_dmmap dmmap_diagnostics.udpechodiag.Host)
port=$(uci_get_bbf_dmmap dmmap_diagnostics.udpechodiag.port)
port=$(uci_get_bbf_dmmap dmmap_diagnostics.udpechodiag.port 7)
cnt=$(uci_get_bbf_dmmap dmmap_diagnostics.udpechodiag.NumberOfRepetitions 1)
dsize=$(uci_get_bbf_dmmap dmmap_diagnostics.udpechodiag.DataBlockSize 24)
dscp=$(uci_get_bbf_dmmap dmmap_diagnostics.udpechodiag.DSCP 0)
@ -19,7 +19,7 @@ udpecho_launch() {
inter_time=$((inter_time/1000))
[ "$inter_time" = "0" ] && inter_time="1"
[ "$host" = "" ] && return
[ "$port" = "" ] && return
[[ "$host" == *"."* ]] && proto="-4" || proto="-6"
micros=1000
success_count=0
avg_time_sum=0
@ -29,11 +29,9 @@ udpecho_launch() {
while [ $i -lt "$cnt" ]; do
i=$((i+1))
res=$(nping "$proto" -c 1 --tos $tos --udp --dest-port "$port" --data-length "$dsize" "$device" "$host" 2>&1)
res=$(nping $proto -c 1 --tos $tos --udp --dest-port "$port" --data-length "$dsize" $device "$host" 2>&1)
ba=$(echo "$res" | grep "RCVD")
[ -z "$ba" ] && { $UCI_SET_BBF_DMMAP dmmap_diagnostics.udpechodiag.DiagnosticState=Error_CannotResolveHostName; $UCI_COMMIT_BBF_DMMAP; return; }
stc=$(echo "$res" | grep "RCVD" | grep "unreachable")
[ -n "$stc" ] && { $UCI_SET_BBF_DMMAP dmmap_diagnostics.udpechodiag.DiagnosticState=Error_Other; $UCI_COMMIT_BBF_DMMAP; return; }
times=$(echo "$res" | grep "rtt")
[ -z "$times" ] && continue
sc1=$(echo "$res" | grep "Rcvd" | awk -F': ' '{print $3}' | awk -F'(' '{ print $1 }')