ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-18 02:39:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

various fixes to new DNA URI response relating to parsing replies

Browse Source 
that lacked DID and/or name field.
This commit is contained in:
gardners 2012-06-21 12:20:10 +09:30
parent 50eaeca51a
commit 2cb84bb8db
2 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
commandline.c
View File

@ -491,24 +491,24 @@ int app_dna_lookup(int argc, const char *const *argv, struct command_line_option
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<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);
if (!parseDnaReply(rx.in.payload,rx.in.payload_length,
did,name,uri))
{
/* Have we seen this response before? */
int i;
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);
}
}
}
}
}
}
else WHYF("packettype=0x%x",rx.packetTypeAndFlags);
@ -1682,16 +1682,15 @@ int app_node_info(int argc, const char *const *argv, struct command_line_option
char did[512];
char name[512];
char uri[512];
bzero(did,32); bzero(name,64);
/* Check if reply is validly formatted */
if (sscanf((char *)m2.in.payload,"%[^\n]\n%[^\n]\n%400s",
did,name,uri)==3) {
did[31]=0;
bcopy(&did[0],&mdp.nodeinfo.did[0],32);
bcopy(&name[0],&mdp.nodeinfo.name[0],64);
mdp.nodeinfo.resolve_did=1;
break;
}
if (!parseDnaReply(m2.in.payload,m2.in.payload_length,
did,name,uri))
{
/* Got a good DNA reply, copy it into place */
bcopy(did,mdp.nodeinfo.did,32);
bcopy(name,mdp.nodeinfo.name,64);
mdp.nodeinfo.resolve_did=1;
break;
}
}
}
}

26
dna_helper.c
View File

@ -41,6 +41,32 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
int dna_helper_stdin=-1;
int dna_helper_stdout=-1;
int parseDnaReply(unsigned char *bytes,int count,
char *did,char *name,char *uri)
{
bzero(did,32); bzero(name,64);
bzero(uri,512);
int i,l;
l=0;
for(i=0;i<511&&i<count&&bytes[i]!=0x0a;i++)
did[l++]=bytes[i];
did[l]=0;
if (i>=count||i>=511) return WHY("DNA response does not contain name field");
l=0; i++;
for(;i<511&&i<count&&bytes[i]!=0x0a;i++)
name[l++]=bytes[i];
name[l]=0;
if (i>=count||i>=511) return WHY("DNA response does not contain URI field");
l=0; i++;
for(;i<511&&i<count&&bytes[i]!=0;i++)
uri[l++]=bytes[i];
uri[l]=0;
/* DEBUGF("did='%s', name='%s', uri='%s'",did,name,uri); */
return 0;
}
int dna_helper_start(const char *command)
{
int stdin_fds[2];