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

Prevent trying to send packets that are too large

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-07-11 12:20:12 +09:30
parent 9f9893095b
commit ac734b3161
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
overlay_mdp.c
View File

@ -562,6 +562,9 @@ int overlay_mdp_dispatch(overlay_mdp_frame *mdp,int userGeneratedFrameP,
{
IN();
if (mdp->out.payload_length > sizeof(mdp->out.payload))
FATAL("Payload length is past the end of the buffer");
/* Prepare the overlay frame for dispatch */
struct overlay_frame *frame = calloc(1,sizeof(struct overlay_frame));
if (!frame)

3
overlay_queue.c
View File

@ -198,6 +198,9 @@ int overlay_payload_enqueue(struct overlay_frame *p)
p->interface_sent_sequence[i]=FRAME_DONT_SEND;
}
if (ob_position(p->payload)>=MDP_MTU)
FATAL("Queued packet is too big");
// it should be safe to try sending all packets with an mdp sequence
if (p->packet_version<=0)
p->packet_version=1;

12
rhizome_sync.c
View File

@ -78,7 +78,7 @@ static void rhizome_sync_request(struct subscriber *subscriber, uint64_t token,
static void rhizome_sync_send_requests(struct subscriber *subscriber, struct rhizome_sync *state)
{
int i;
int i, requests=0;
time_ms_t now = gettime_ms();
// send requests for manifests that we have room to fetch
@ -118,12 +118,16 @@ static void rhizome_sync_send_requests(struct subscriber *subscriber, struct rhi
mdp.out.queue=OQ_OPPORTUNISTIC;
}
if (mdp.out.payload_length + RHIZOME_BAR_BYTES>MDP_MTU)
break;
if (config.debug.rhizome)
DEBUGF("Requesting manifest for BAR %s", alloca_tohex(state->bars[i].bar, RHIZOME_BAR_BYTES));
bcopy(state->bars[i].bar, &mdp.out.payload[mdp.out.payload_length], RHIZOME_BAR_BYTES);
mdp.out.payload_length+=RHIZOME_BAR_BYTES;
state->bars[i].next_request = now+1000;
requests++;
if (requests>=BARS_PER_RESPONSE)
break;
}
if (mdp.out.payload_length!=0)
overlay_mdp_dispatch(&mdp,0,NULL,0);
@ -264,11 +268,11 @@ static void sync_process_bar_list(struct subscriber *subscriber, struct rhizome_
// we require the list of BARs to be either ASC or DESC and include BARs for *all* manifests in that range
// TODO stop if we are taking too much CPU time.
int added=0;
for (i=mid_point; i<bar_count && state->bar_count < BARS_PER_RESPONSE; i++){
for (i=mid_point; i<bar_count && state->bar_count < CACHE_BARS; i++){
if (sync_cache_bar(state, bars[i], bar_tokens[i]))
added=1;
}
for (i=mid_point -1; i>=0 && state->bar_count < BARS_PER_RESPONSE; i--){
for (i=mid_point -1; i>=0 && state->bar_count < CACHE_BARS; i--){
if (sync_cache_bar(state, bars[i], bar_tokens[i]))
added=1;
}