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

using cli_delim() where appropriate. more work on "id self" /

Browse Source 
"id list".
This commit is contained in:
gardners 2012-04-26 15:47:05 +09:30
parent 88ba56b68b
commit 38c240be58
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
commandline.c
View File

@ -1156,7 +1156,7 @@ int app_id_self(int argc, const char *const *argv, struct command_line_option *o
int i; int i;
WHYF("first_sid=%d, last_sid=%d",a.addrlist.first_sid,a.addrlist.last_sid); WHYF("first_sid=%d, last_sid=%d",a.addrlist.first_sid,a.addrlist.last_sid);
for(i=0;i<a.addrlist.frame_sid_count;i++) { for(i=0;i<a.addrlist.frame_sid_count;i++) {
cli_printf("%s\n",overlay_render_sid(a.addrlist.sids[i])); cli_printf("%s",overlay_render_sid(a.addrlist.sids[i])); cli_delim("\n");
} }
/* get ready to ask for next block of SIDs */ /* get ready to ask for next block of SIDs */
a.packetTypeAndFlags=MDP_GETADDRS; a.packetTypeAndFlags=MDP_GETADDRS;
@ -1169,7 +1169,6 @@ int app_node_info(int argc, const char *const *argv, struct command_line_option
{ {
const char *sid; const char *sid;
cli_arg(argc, argv, o, "sid", &sid, NULL, ""); cli_arg(argc, argv, o, "sid", &sid, NULL, "");
unsigned char packed_sid[SID_SIZE];
overlay_mdp_frame mdp; overlay_mdp_frame mdp;
bzero(&mdp,sizeof(mdp)); bzero(&mdp,sizeof(mdp));
@ -1177,13 +1176,17 @@ int app_node_info(int argc, const char *const *argv, struct command_line_option
mdp.packetTypeAndFlags=MDP_NODEINFO; mdp.packetTypeAndFlags=MDP_NODEINFO;
if (argc>3) mdp.nodeinfo.resolve_did=1; if (argc>3) mdp.nodeinfo.resolve_did=1;
/* get SID or SID prefix */ /* get SID or SID prefix
XXX - Doesn't correctly handle odd-lengthed SID prefixes (ignores last digit).
The matching code in overlay_route.c also has a similar problem with the last
digit of an odd-length prefix being ignored. */
int i; int i;
mdp.nodeinfo.sid_prefix_length=0; mdp.nodeinfo.sid_prefix_length=0;
for(i = 0; i != SID_SIZE&&sid[i<<1]&&sid[(i<<1)+1]; ++i) { for(i = 0; (i != SID_SIZE)&&sid[i<<1]&&sid[(i<<1)+1]; i++) {
packed_sid[mdp.nodeinfo.sid_prefix_length] = hexvalue(sid[i<<1]) << 4; mdp.nodeinfo.sid[mdp.nodeinfo.sid_prefix_length] = hexvalue(sid[i<<1]) << 4;
packed_sid[mdp.nodeinfo.sid_prefix_length++] |= hexvalue(sid[(i<<1)+1]); mdp.nodeinfo.sid[mdp.nodeinfo.sid_prefix_length++] |= hexvalue(sid[(i<<1)+1]);
} }
mdp.nodeinfo.sid_prefix_length*=2;
int result=overlay_mdp_send(&mdp,MDP_AWAITREPLY,5000); int result=overlay_mdp_send(&mdp,MDP_AWAITREPLY,5000);
if (result) { if (result) {
@ -1195,7 +1198,7 @@ int app_node_info(int argc, const char *const *argv, struct command_line_option
return WHYF("Could not get information about node."); return WHYF("Could not get information about node.");
} }
cli_printf("%d:%d:%s:%s:%s:%s:%s:%d:%d\n", cli_printf("%d:%d:%s:%s:%s:%s:%s:%d:%d",
mdp.nodeinfo.index, mdp.nodeinfo.index,
mdp.nodeinfo.count, mdp.nodeinfo.count,
mdp.nodeinfo.foundP?"found":"noresult", mdp.nodeinfo.foundP?"found":"noresult",
@ -1205,6 +1208,7 @@ int app_node_info(int argc, const char *const *argv, struct command_line_option
mdp.nodeinfo.neighbourP?"direct":"indirect", mdp.nodeinfo.neighbourP?"direct":"indirect",
mdp.nodeinfo.score, mdp.nodeinfo.score,
mdp.nodeinfo.interface_number); mdp.nodeinfo.interface_number);
cli_delim("\n");
return 0; return 0;
} }