ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 05:07:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added cleaning up of client socket when ending command line

Browse Source 
execution so that multiple calls from java can succeed.
This commit is contained in:
gardners 2012-04-30 20:04:07 +09:30
parent 7e7ab30808
commit cfe5f303e7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
commandline.c
View File

@ -289,7 +289,10 @@ int parseCommandLine(int argc, const char *const *args)
/* Otherwise, make call */ /* Otherwise, make call */
setVerbosity(confValueGet("debug","")); setVerbosity(confValueGet("debug",""));
return command_line_options[cli_call].function(argc, args, &command_line_options[cli_call]); int result=command_line_options[cli_call].function(argc, args, &command_line_options[cli_call]);
/* clean up after ourselves */
overlay_mdp_client_done();
return result;
} }
int cli_arg(int argc, const char *const *argv, command_line_option *o, char *argname, const char **dst, int (*validator)(const char *arg), char *defaultvalue) int cli_arg(int argc, const char *const *argv, command_line_option *o, char *argname, const char **dst, int (*validator)(const char *arg), char *defaultvalue)
@ -505,6 +508,7 @@ int app_dna_lookup(int argc, const char *const *argv, struct command_line_option
if (servalShutdown) break; if (servalShutdown) break;
} }
overlay_mdp_client_done();
return 0; return 0;
} }
@ -823,6 +827,7 @@ int app_mdp_ping(int argc, const char *const *argv, struct command_line_option *
(samples<rx_count)?" (stddev calculated from last 1024 samples)":"", (samples<rx_count)?" (stddev calculated from last 1024 samples)":"",
rx_mintime,rx_mean,rx_maxtime,rx_stddev); rx_mintime,rx_mean,rx_maxtime,rx_stddev);
overlay_mdp_client_done();
return 0; return 0;
} }
} }
@ -830,6 +835,7 @@ int app_mdp_ping(int argc, const char *const *argv, struct command_line_option *
timeout=now+1000; timeout=now+1000;
} }
overlay_mdp_client_done();
return 0; return 0;
} }
@ -1185,11 +1191,14 @@ int app_node_info(int argc, const char *const *argv, struct command_line_option
if (result) { if (result) {
if (mdp.packetTypeAndFlags==MDP_ERROR) if (mdp.packetTypeAndFlags==MDP_ERROR)
{ {
overlay_mdp_client_done();
return WHYF(" MDP Server error #%d: '%s'",mdp.error.error,mdp.error.message); return WHYF(" MDP Server error #%d: '%s'",mdp.error.error,mdp.error.message);
} }
else else {
overlay_mdp_client_done();
return WHYF("Could not get information about node."); return WHYF("Could not get information about node.");
} }
}
if (resolveDid&&(!mdp.nodeinfo.resolve_did)) { if (resolveDid&&(!mdp.nodeinfo.resolve_did)) {
/* Asked for DID resolution, but did not get it, so do a DNA lookup /* Asked for DID resolution, but did not get it, so do a DNA lookup