ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-03-11 15:03:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add timeout argument for dna lookup

Browse Source
This commit is contained in:
Jeremy Lakeman 2012-08-10 15:25:06 +09:30
parent 75889355fa
commit f77e055988
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
commandline.c
View File

@ -417,6 +417,7 @@ int app_dna_lookup(int argc, const char *const *argv, struct command_line_option
{ {
if (debug & DEBUG_VERBOSE) DEBUG_argv("command", argc, argv); if (debug & DEBUG_VERBOSE) DEBUG_argv("command", argc, argv);
int i; int i;
/* Create the instance directory if it does not yet exist */ /* Create the instance directory if it does not yet exist */
if (create_serval_instance_dir() == -1) if (create_serval_instance_dir() == -1)
return -1; return -1;
@ -426,9 +427,20 @@ int app_dna_lookup(int argc, const char *const *argv, struct command_line_option
#define MAXURILEN 256 #define MAXURILEN 256
char uris[MAXREPLIES][MAXURILEN]; char uris[MAXREPLIES][MAXURILEN];
const char *did; const char *did, *delay;
if (cli_arg(argc, argv, o, "did", &did, cli_lookup_did, "*") == -1) if (cli_arg(argc, argv, o, "did", &did, cli_lookup_did, "*") == -1)
return -1; return -1;
if (cli_arg(argc, argv, o, "timeout", &delay, NULL, "3000") == -1)
return -1;
int idelay=atoi(delay);
int one_reply=0;
// Ugly hack, if timeout is negative, stop after first reply
if (idelay<0){
one_reply=1;
idelay=-idelay;
}
/* Bind to MDP socket and await confirmation */ /* Bind to MDP socket and await confirmation */
unsigned char srcsid[SID_SIZE]; unsigned char srcsid[SID_SIZE];
@ -443,7 +455,7 @@ int app_dna_lookup(int argc, const char *const *argv, struct command_line_option
/* Now repeatedly send resolution request and collect results until we reach /* Now repeatedly send resolution request and collect results until we reach
timeout. */ timeout. */
time_ms_t timeout = gettime_ms() + 3000; time_ms_t timeout = gettime_ms() + idelay;
time_ms_t last_tx = 0; time_ms_t last_tx = 0;
time_ms_t now; time_ms_t now;
while (timeout > (now = gettime_ms())) while (timeout > (now = gettime_ms()))
@ -502,6 +514,12 @@ int app_dna_lookup(int argc, const char *const *argv, struct command_line_option
cli_puts(uri); cli_delim(":"); cli_puts(uri); cli_delim(":");
cli_puts(did); cli_delim(":"); cli_puts(did); cli_delim(":");
cli_puts(name); cli_delim("\n"); cli_puts(name); cli_delim("\n");
if (one_reply){
timeout=now;
short_timeout=0;
}
/* Remember that we have seen it */ /* Remember that we have seen it */
if (uri_count<MAXREPLIES&&strlen(uri)<MAXURILEN) { if (uri_count<MAXREPLIES&&strlen(uri)<MAXURILEN) {
strcpy(uris[uri_count++],uri); strcpy(uris[uri_count++],uri);
@ -1718,7 +1736,7 @@ int app_node_info(int argc, const char *const *argv, struct command_line_option
Keep this list alphabetically sorted for user convenience. Keep this list alphabetically sorted for user convenience.
*/ */
command_line_option command_line_options[]={ command_line_option command_line_options[]={
{app_dna_lookup,{"dna","lookup","<did>",NULL},0, {app_dna_lookup,{"dna","lookup","<did>","[<timeout>]",NULL},0,
"Lookup the SIP/MDP address of the supplied telephone number (DID)."}, "Lookup the SIP/MDP address of the supplied telephone number (DID)."},
{cli_usage,{"help",NULL},0, {cli_usage,{"help",NULL},0,
"Display command usage."}, "Display command usage."},