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

servald now can return arbitrary URIs in response to DNA requests.

Browse Source
This commit is contained in:
gardners 2012-06-20 12:56:32 +09:30 committed by Jeremy Lakeman
parent 500b9f9f28
commit 8ea37af64d
2 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
commandline.c
View File

@ -426,8 +426,10 @@ int app_dna_lookup(int argc, const char *const *argv, struct command_line_option
if (create_serval_instance_dir() == -1)
return -1;
int sid_count=0;
unsigned char sids[128][SID_SIZE];
int uri_count=0;
#define MAXREPLIES 256
#define MAXURILEN 256
char uris[MAXREPLIES][MAXURILEN];
const char *did;
if (cli_arg(argc, argv, o, "did", &did, NULL, "*") == -1)
@ -484,19 +486,28 @@ int app_dna_lookup(int argc, const char *const *argv, struct command_line_option
WHYF(" Error message: %s", mdp.error.message);
}
else if ((rx.packetTypeAndFlags&MDP_TYPE_MASK)==MDP_TX) {
/* Display match unless it is a duplicate.
XXX - For wildcard searches, each sid will only show up once. */
/* Extract DID, Name, URI from response. */
if (strlen((char *)rx.in.payload)<512) {
char did[512];
char name[512];
char uri[512];
/* Check if reply is validly formatted */
if (sscanf((char *)rx.in.payload,"%[^\n]\n%[^\n]\n%400s",
did,name,uri)==3) {
/* Have we seen this response before? */
int i;
for(i=0;i<sid_count;i++)
if (!memcmp(&rx.in.src.sid[0],&sids[i][0],SID_SIZE))
break;
if (i==sid_count) {
cli_puts(overlay_render_sid(&rx.in.src.sid[0])); cli_delim(":");
cli_puts((char *)&rx.in.payload[0]); cli_delim(":");
cli_puts((char *)&rx.in.payload[32]); cli_delim("\n");
if (sid_count<128) {
bcopy(&rx.in.src.sid[0],&sids[i][0],SID_SIZE);
sid_count++;
for(i=0;i<uri_count;i++)
if (!strcmp(uri,uris[i])) break;
if (i==uri_count) {
/* Not previously seen, so report it */
cli_puts(uri); cli_delim(":");
cli_puts(did); cli_delim(":");
cli_puts(name); cli_delim("\n");
/* Remember that we have seen it */
if (uri_count<MAXREPLIES&&strlen(uri)<MAXURILEN) {
strcpy(uris[uri_count++],uri);
}
}
}
}
}

36
overlay_mdp.c
View File

@ -518,28 +518,24 @@ int overlay_saw_mdp_frame(int interface, overlay_mdp_frame *mdp,long long now)
->private_key_len>64)
/* skip excessively long DID records */
continue;
/* copy SID out into source address of frame */
/* and null-terminated DID */
bcopy(&keyring->contexts[cn]->identities[in]->keypairs[0]
->public_key[0],&mdp->out.src.sid[0],SID_SIZE);
bcopy(keyring->contexts[cn]->identities[in]->keypairs[kp]
->private_key,&mdp->out.payload[0],
unsigned char *unpackedDid=
keyring->contexts[cn]->identities[in]->keypairs[kp]
->private_key_len);
bcopy(keyring->contexts[cn]->identities[in]->keypairs[kp]
->public_key,&mdp->out.payload[keyring
->contexts[cn]
->identities[in]
->keypairs[kp]
->private_key_len],
keyring->contexts[cn]->identities[in]->keypairs[kp]
->private_key_len);
/* set length */
mdp->out.payload_length=
keyring->contexts[cn]->identities[in]->keypairs[kp]
->private_key_len
+keyring->contexts[cn]->identities[in]->keypairs[kp]
->public_key_len;
->private_key;
unsigned char *packedSid=
keyring->contexts[cn]->identities[in]->keypairs[0]
->public_key;
char *name=
(char *)keyring->contexts[cn]->identities[in]->keypairs[kp]
->public_key;
/* copy SID out into source address of frame */
bcopy(packedSid,&mdp->out.src.sid[0],SID_SIZE);
/* and build reply as did\nname\nURI<NUL> */
snprintf((char *)&mdp->out.payload[0],512,"%s\n%s\nsid://%s/%s",
unpackedDid,name,overlay_render_sid(packedSid),
unpackedDid);
mdp->out.payload_length=strlen((char *)mdp->out.payload)+1;
/* mark as outgoing MDP message */
mdp->packetTypeAndFlags&=MDP_FLAG_MASK;
mdp->packetTypeAndFlags|=MDP_TX;