ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-21 22:17:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add explicit timeout parameter to mdp trace for slow links

Browse Source
This commit is contained in:
Jeremy Lakeman 2015-04-07 13:56:19 +09:30
parent b75c926ee3
commit d5e0835f21
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
network_cli.c
View File

@ -257,12 +257,13 @@ static int app_mdp_ping(const struct cli_parsed *parsed, struct cli_context *con
DEFINE_CMD(app_trace, 0, DEFINE_CMD(app_trace, 0,
"Trace through the network to the specified node via MDP.", "Trace through the network to the specified node via MDP.",
"mdp","trace","<SID>"); "mdp","trace","[--timeout=<seconds>]","<SID>");
static int app_trace(const struct cli_parsed *parsed, struct cli_context *context) static int app_trace(const struct cli_parsed *parsed, struct cli_context *context)
{ {
int mdp_sockfd; int mdp_sockfd;
const char *sidhex; const char *sidhex, *opt_timeout;
if (cli_arg(parsed, "SID", &sidhex, str_is_subscriber_id, NULL) == -1) if ( cli_arg(parsed, "--timeout", &opt_timeout, cli_interval_ms, "5") == -1
|| cli_arg(parsed, "SID", &sidhex, str_is_subscriber_id, NULL) == -1)
return -1; return -1;
sid_t srcsid; sid_t srcsid;
@ -270,6 +271,11 @@ static int app_trace(const struct cli_parsed *parsed, struct cli_context *contex
if (str_to_sid_t(&dstsid, sidhex) == -1) if (str_to_sid_t(&dstsid, sidhex) == -1)
return WHY("str_to_sid_t() failed"); return WHY("str_to_sid_t() failed");
int64_t timeout_ms = 5000;
str_to_uint64_interval_ms(opt_timeout, &timeout_ms, NULL);
if (timeout_ms == 0)
timeout_ms = 60 * 60000; // 1 hour...
if ((mdp_sockfd = overlay_mdp_client_socket()) < 0) if ((mdp_sockfd = overlay_mdp_client_socket()) < 0)
return WHY("Cannot create MDP socket"); return WHY("Cannot create MDP socket");
mdp_port_t port=32768+(random()&32767); mdp_port_t port=32768+(random()&32767);
@ -287,10 +293,10 @@ static int app_trace(const struct cli_parsed *parsed, struct cli_context *contex
cli_delim(context, "\n"); cli_delim(context, "\n");
cli_flush(context); cli_flush(context);
// TODO keep sending packets till we get a response? // TODO keep sending packets till we get a response?
int ret; int ret=0;
unsigned i; time_ms_t end = gettime_ms() + timeout_ms;
overlay_mdp_frame mdp; overlay_mdp_frame mdp;
for (i=0;i<10;i++){ do{
bzero(&mdp, sizeof(mdp)); bzero(&mdp, sizeof(mdp));
mdp.out.src.sid = srcsid; mdp.out.src.sid = srcsid;
@ -310,9 +316,8 @@ static int app_trace(const struct cli_parsed *parsed, struct cli_context *contex
mdp.out.payload_length = ob_position(b); mdp.out.payload_length = ob_position(b);
ret = overlay_mdp_send(mdp_sockfd, &mdp, MDP_AWAITREPLY, 500); ret = overlay_mdp_send(mdp_sockfd, &mdp, MDP_AWAITREPLY, 500);
ob_free(b); ob_free(b);
if (ret==0) }while(ret && gettime_ms() < end);
break;
}
if (ret) if (ret)
WHYF("overlay_mdp_send returned %d, %s", ret, mdp.error.message); WHYF("overlay_mdp_send returned %d, %s", ret, mdp.error.message);
if (ret == 0) { if (ret == 0) {

2
tests/routing
View File

@ -80,7 +80,7 @@ path_exists() {
done done
# so we think this path should exist, check that it works # so we think this path should exist, check that it works
set_instance $first_inst set_instance $first_inst
executeOk_servald mdp trace "${!dest_sidvar}" executeOk_servald mdp trace --timeout=20 "${!dest_sidvar}"
# assertStdoutGrep "^[0-9]+:${!dest_sidvar}\$" # assertStdoutGrep "^[0-9]+:${!dest_sidvar}\$"
tfw_cat --stdout tfw_cat --stdout
return 0 return 0