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

TraceRoute: use script instead rpcd to run traceroute Diagnostics

Browse source
This commit is contained in:
Amin Ben Romdhane 2022-12-05 10:33:10 +01:00
parent fff93eb60f
commit 4ad900a9bb
3 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dmtree/tr143/diagnostics.c
View file

@ -13,6 +13,7 @@
#include "dmbbfcommon.h"
#include "diagnostics.h"
#define TRACEROUTE_DIAGNOSTIC_PATH "/usr/share/bbfdm/traceroute"
#define DOWNLOAD_DIAGNOSTIC_PATH "/usr/share/bbfdm/download"
#define UPLOAD_DIAGNOSTIC_PATH "/usr/share/bbfdm/upload"
@ -1797,11 +1798,14 @@ static int get_operate_args_IPDiagnostics_TraceRoute(char *refparam, struct dmct
static int operate_IPDiagnostics_TraceRoute(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
json_object *res = NULL, *arr_route_hops = NULL, *route_hops_obj = NULL;
json_object *arr_route_hops = NULL, *route_hops_obj = NULL;
char *route_hops_host[2] = {0};
char *route_hops_host_address[2] = {0};
char *route_hops_rttimes[2] = {0};
char *route_hops_errorcode = NULL;
char input[2048] = {0};
char output[2048] = {0};
char cmd[2096] = {0};
int idx = 0;
char *host = dmjson_get_value((json_object *)value, 1, "Host");
@ -1816,21 +1820,29 @@ static int operate_IPDiagnostics_TraceRoute(char *refparam, struct dmctx *ctx, v
char *datablocksize = dmjson_get_value((json_object *)value, 1, "DataBlockSize");
char *dscp = dmjson_get_value((json_object *)value, 1, "DSCP");
char *maxhops = dmjson_get_value((json_object *)value, 1, "MaxHopCount");
char *proto = (bbfdatamodel_type == BBFDM_USP) ? "usp" : "both_proto";
dmubus_call_blocking("bbf.diag", "traceroute",
UBUS_ARGS{
{"host", host, String},
{"iface", interface, String},
{"ip_proto", ip_proto, String},
{"nbr_of_tries", nboftries, String},
{"timeout", timeout, String},
{"data_size", datablocksize, String},
{"dscp", dscp, String},
{"max_hop_cnt", maxhops, String},
{"proto", proto, String}
},
9, &res);
snprintf(input, sizeof(input), "'{\"host\": \"%s\",\"iface\":\"%s\",\"ip_proto\":\"%s\",\"nbr_of_tries\":\"%s\",\"timeout\":\"%s\",\"data_size\":\"%s\",\"dscp\":\"%s\",\"max_hop_cnt\":\"%s\",\"proto\":\"%s\"}'",
host,
interface,
ip_proto,
nboftries,
timeout,
datablocksize,
dscp,
maxhops,
(bbfdatamodel_type == BBFDM_USP) ? "usp" : "both_proto");
snprintf(cmd, sizeof(cmd), "sh %s %s", TRACEROUTE_DIAGNOSTIC_PATH, input);
FILE *pp = popen(cmd, "r");
if (pp != NULL) {
fgets(output, sizeof(output) , pp);
pclose(pp);
} else {
return CMD_FAIL;
}
json_object *res = (DM_STRLEN(output)) ? json_tokener_parse(output) : NULL;
if (res == NULL)
return CMD_FAIL;

5
scripts/bbf.diag
View file

@ -7,13 +7,11 @@ case "$1" in
list)
echo '{ "ipping" : { "host": "str", "iface": "str", "ip_proto": "str", "nbr_of_rep": "str", "timeout": "str", "data_size": "str", "dscp": "str", "proto": "str" },
"nslookup" : { "host": "str", "dns_serevr": "str", "iface": "str", "nbr_of_rep": "str", "timeout": "str", "proto": "str" },
"traceroute" : { "host": "str", "iface": "str", "ip_proto": "str", "nbr_of_tries": "str", "timeout": "str", "data_size": "str", "dscp": "str", "max_hop_cnt":"str", "proto": "str" },
"udpecho" : { "host": "str", "port":"str", "iface": "str", "ip_proto": "str", "nbr_of_rep": "str", "timeout": "str", "data_size": "str", "dscp": "str", "inter_trans_time":"str", "proto": "str" },
"serverselection" : { "hostlist": "str", "port":"str", "iface": "str", "ip_proto": "str", "nbr_of_rep": "str", "timeout": "str", "protocol_used": "str", "proto": "str" },
}'
;;
call)
# read the arguments
read -r input
case "$2" in
@ -23,9 +21,6 @@ case "$1" in
nslookup)
sh ${BBF_SCRIPTS}/nslookup "${input}"
;;
traceroute)
sh ${BBF_SCRIPTS}/traceroute "${input}"
;;
udpecho)
sh ${BBF_SCRIPTS}/udpecho "${input}"
;;

1
scripts/traceroute
View file

@ -54,7 +54,6 @@ traceroute_launch() {
# Assign default value
[ -z "${cnt}" ] && cnt=1
[ -z "${dsize}" ] && dsize=64
[ -z "${maxhop}" ] && maxhop=30
[ -n "${iface}" ] && device=$(ifstatus "${iface}" | jsonfilter -e @.device) && device="-i $device" || device=""
ip_addr_used=$(get_ip_addr_used "${ip_proto}" "${iface}")