ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-11 13:16:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bugs with preparing Rhizome MDP packets (source sid was not

Browse Source 
being set properly).
This commit is contained in:
gardners 2012-11-30 20:06:47 +10:30
parent 05745d9b9a
commit 11cce162dc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rhizome_fetch.c
View File

@ -1029,7 +1029,7 @@ static int rhizome_fetch_mdp_requestblocks(struct rhizome_fetch_slot *slot)
overlay_mdp_frame mdp; overlay_mdp_frame mdp;
bzero(&mdp,sizeof(mdp)); bzero(&mdp,sizeof(mdp));
memcpy(my_subscriber->sid,mdp.out.src.sid,SID_SIZE); bcopy(my_subscriber->sid,mdp.out.src.sid,SID_SIZE);
mdp.out.src.port=MDP_PORT_RHIZOME_RESPONSE; mdp.out.src.port=MDP_PORT_RHIZOME_RESPONSE;
bcopy(slot->peer_sid,mdp.out.dst.sid,SID_SIZE); bcopy(slot->peer_sid,mdp.out.dst.sid,SID_SIZE);
mdp.out.dst.port=MDP_PORT_RHIZOME_REQUEST; mdp.out.dst.port=MDP_PORT_RHIZOME_REQUEST;
@ -1044,6 +1044,9 @@ static int rhizome_fetch_mdp_requestblocks(struct rhizome_fetch_slot *slot)
write_uint32(&mdp.out.payload[RHIZOME_BAR_BYTES+8],slot->mdpRXBitmap); write_uint32(&mdp.out.payload[RHIZOME_BAR_BYTES+8],slot->mdpRXBitmap);
write_uint16(&mdp.out.payload[RHIZOME_BAR_BYTES+8+4],slot->mdpRXBlockLength); write_uint16(&mdp.out.payload[RHIZOME_BAR_BYTES+8+4],slot->mdpRXBlockLength);
DEBUGF("src sid=%s, dst sid=%s",
alloca_tohex_sid(mdp.out.src.sid),alloca_tohex_sid(mdp.out.dst.sid));
overlay_mdp_dispatch(&mdp,0 /* system generated */,NULL,0); overlay_mdp_dispatch(&mdp,0 /* system generated */,NULL,0);
slot->alarm.function = rhizome_fetch_mdp_slot_callback; slot->alarm.function = rhizome_fetch_mdp_slot_callback;
@ -1069,7 +1072,7 @@ static int rhizome_fetch_mdp_requestmanifest(struct rhizome_fetch_slot *slot)
overlay_mdp_frame mdp; overlay_mdp_frame mdp;
bzero(&mdp,sizeof(mdp)); bzero(&mdp,sizeof(mdp));
memcpy(my_subscriber->sid,mdp.out.src.sid,SID_SIZE); bcopy(my_subscriber->sid,mdp.out.src.sid,SID_SIZE);
mdp.out.src.port=MDP_PORT_RHIZOME_RESPONSE; mdp.out.src.port=MDP_PORT_RHIZOME_RESPONSE;
bcopy(slot->peer_sid,mdp.out.dst.sid,SID_SIZE); bcopy(slot->peer_sid,mdp.out.dst.sid,SID_SIZE);
mdp.out.dst.port=MDP_PORT_RHIZOME_REQUEST; mdp.out.dst.port=MDP_PORT_RHIZOME_REQUEST;