ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-21 17:56:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed dna query bugs and split wildcard query test into star and

Browse Source 
empty string versions.
This commit is contained in:
gardners 2012-06-21 13:43:28 +09:30
parent c3649c415f
commit fefe7d2e91
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overlay_mdp.c
View File

@ -483,8 +483,6 @@ int overlay_saw_mdp_frame(int interface, overlay_mdp_frame *mdp,long long now)
int len=overlay_mdp_relevant_bytes(mdp); int len=overlay_mdp_relevant_bytes(mdp);
int r=sendto(mdp_named_socket,mdp,len,0,(struct sockaddr*)&addr,sizeof(addr)); int r=sendto(mdp_named_socket,mdp,len,0,(struct sockaddr*)&addr,sizeof(addr));
if (r==overlay_mdp_relevant_bytes(mdp)) { if (r==overlay_mdp_relevant_bytes(mdp)) {
dump("Sent to MDP client",(unsigned char *)mdp,len);
perror("errno after sendto()");
return 0; return 0;
} }
if (errno==ENOENT) { if (errno==ENOENT) {
@ -1097,7 +1095,7 @@ int overlay_mdp_relevant_bytes(overlay_mdp_frame *mdp)
end of the string, to avoid information leaks */ end of the string, to avoid information leaks */
len=&mdp->error.message[0]-(char *)mdp; len=&mdp->error.message[0]-(char *)mdp;
len+=strlen(mdp->error.message)+1; len+=strlen(mdp->error.message)+1;
INFOF("mdp return/error code: %d:%s",mdp->error.error,mdp->error.message); if (mdp->error.error) INFOF("mdp return/error code: %d:%s",mdp->error.error,mdp->error.message);
break; break;
case MDP_VOMPEVENT: case MDP_VOMPEVENT:
/* XXX too hard to work out precisely for now. */ /* XXX too hard to work out precisely for now. */

15
tests/dnaprotocol
View File

@ -48,14 +48,25 @@ setup_servald_instance() {
start_servald_server start_servald_server
} }
doc_DNAWildcardSearchFindsSelf="DNA lookup of wildcard finds self" doc_DNAWildcardSearchFindsSelf="DNA lookup of wildcard finds self (star method)"
setup_DNAWildcardSearchFindsSelf() { setup_DNAWildcardSearchFindsSelf() {
setup setup
} }
test_DNAWildcardSearchFindsSelf() { test_DNAWildcardSearchFindsSelf() {
setup_servald_instance setup_servald_instance
executeOk_servald dna lookup "\*" executeOk_servald dna lookup "*"
assertStdoutLineCount '==' 1 assertStdoutLineCount '==' 1
} }
doc_DNAWildcardSearchFindsSelfEmpty="DNA lookup of wildcard finds self (empty query method)"
setup_DNAWildcardSearchFindsSelfEmpty() {
setup
}
test_DNAWildcardSearchFindsSelfEmpty() {
setup_servald_instance
executeOk_servald dna lookup ""
assertStdoutLineCount '==' 1
}
runTests "$@" runTests "$@"