ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-30 08:03:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed infinite loop when responding to DNA lookups.

Browse Source
This commit is contained in:
gardners 2012-04-25 20:24:08 +09:30
parent a2880ada1e
commit 0133ea972a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
overlay_mdp.c
View File

@ -498,8 +498,13 @@ int overlay_saw_mdp_frame(int interface, overlay_mdp_frame *mdp,long long now)
mdp->out.payload_length=
keyring->contexts[cn]->identities[in]->keypairs[kp]
->private_key_len;
/* mark as outgoing MDP message */
mdp->packetTypeAndFlags&=MDP_FLAG_MASK;
mdp->packetTypeAndFlags|=MDP_TX;
overlay_mdp_dispatch(mdp,0 /* system generated */,
NULL,0);
kp++;
}
/* and switch addresses back around in case the caller was planning on
using MDP structure again (this happens if there is a loop-back reply
@ -522,7 +527,7 @@ int overlay_saw_mdp_frame(int interface, overlay_mdp_frame *mdp,long long now)
/* Swap addresses */
overlay_mdp_swap_src_dst(mdp);
if (mdp->out.dst.port==7) return WHY("echo loop averted");
if (mdp->out.dst.port==MDP_PORT_ECHO) return WHY("echo loop averted");
/* If the packet was sent to broadcast, then replace broadcast address
with our local address. For now just responds with first local address */
if (overlay_address_is_broadcast(mdp->out.src.sid))
@ -558,7 +563,8 @@ int overlay_saw_mdp_frame(int interface, overlay_mdp_frame *mdp,long long now)
}
break;
default:
return WHY("We should only see MDP_TX frames here");
return WHYF("We should only see MDP_TX frames here (MDP message type = 0x%x)",
mdp->packetTypeAndFlags);
}
return WHY("Not implemented");

2
serval.h
View File

@ -1337,7 +1337,7 @@ int cli_printf(const char *fmt, ...);
int cli_delim(const char *opt);
int overlay_mdp_getmyaddr(int index,unsigned char *sid);
int overlay_mdp_bind(unsigned char *localaddr,int port);
int overlay_mdp_bind(unsigned char *localaddr,int port);
int app_vomp_status(int argc, const char *const *argv, struct command_line_option *o);
int app_vomp_dial(int argc, const char *const *argv, struct command_line_option *o);