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

"node info" command can now do DNA lookups to get phone #

Browse Source
This commit is contained in:
gardners 2012-04-30 15:12:31 +09:30
parent fcb329f828
commit 808ef53d0f
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
commandline.c
View File

@ -1178,9 +1178,11 @@ int app_node_info(int argc, const char *const *argv, struct command_line_option
overlay_mdp_frame mdp;
bzero(&mdp,sizeof(mdp));
int resolveDid=0;
mdp.packetTypeAndFlags=MDP_NODEINFO;
if (argc>3) mdp.nodeinfo.resolve_did=1;
resolveDid=mdp.nodeinfo.resolve_did;
/* get SID or SID prefix
XXX - Doesn't correctly handle odd-lengthed SID prefixes (ignores last digit).
@ -1204,6 +1206,44 @@ int app_node_info(int argc, const char *const *argv, struct command_line_option
return WHYF("Could not get information about node.");
}
if (resolveDid&&(!mdp.nodeinfo.resolve_did)) {
/* Asked for DID resolution, but did not get it, so do a DNA lookup
here. We do this on the client side, so that we don't block the
single-threaded server. */
overlay_mdp_frame m2;
bzero(&m2,sizeof(m2));
int port=32768+(random()&0xffff);
unsigned char srcsid[SID_SIZE];
if (overlay_mdp_getmyaddr(0,srcsid)) port=0;
if (overlay_mdp_bind(srcsid,port)) port=0;
if (port) {
int i;
for(i=0;i<(3000/125);i++) {
m2.packetTypeAndFlags=MDP_TX;
m2.out.src.port=port;
bcopy(&srcsid[0],&m2.out.src.sid[0],SID_SIZE);
bcopy(&mdp.nodeinfo.sid[0],&m2.out.dst.sid[0],SID_SIZE);
m2.out.dst.port=MDP_PORT_DNALOOKUP;
/* search for any DID */
m2.out.payload[0]=0;
m2.out.payload_length=1;
if (!overlay_mdp_send(&m2,MDP_AWAITREPLY,125))
{
int bytes=m2.in.payload_length;
if ((bytes+1)<sizeof(mdp.nodeinfo.did))
{
bcopy(&m2.in.payload[0],&mdp.nodeinfo.did[0],bytes);
mdp.nodeinfo.did[bytes]=0;
mdp.nodeinfo.resolve_did=1;
}
break;
}
}
}
}
cli_printf("record"); cli_delim(":");
cli_printf("%d",mdp.nodeinfo.index); cli_delim(":");
cli_printf("%d",mdp.nodeinfo.count); cli_delim(":");

2
overlay_route.c
View File

@ -1394,6 +1394,7 @@ int overlay_route_node_info(overlay_mdp_frame *mdp,
-overlay_neighbours[n].last_observation_time_ms;
mdp->nodeinfo.score=-1;
mdp->nodeinfo.interface_number=-1;
mdp->nodeinfo.resolve_did=0;
int i;
for(i=0;i<OVERLAY_MAX_INTERFACES;i++)
if (overlay_neighbours[n].scores[i]>mdp->nodeinfo.score)
@ -1427,6 +1428,7 @@ int overlay_route_node_info(overlay_mdp_frame *mdp,
mdp->nodeinfo.time_since_last_observation=overlay_gettime_ms();
mdp->nodeinfo.score=-1;
mdp->nodeinfo.interface_number=-1;
mdp->nodeinfo.resolve_did=0;
int o;
for(o=0;o<OVERLAY_MAX_OBSERVATIONS;o++)
if (overlay_nodes[bin][slot].observations[o].observed_score)