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

Send both original packet source and transmitter id's in olsr payloads

Browse Source
This commit is contained in:
Jeremy Lakeman 2012-10-09 11:39:28 +10:30
parent 7ee5266998
commit 6e45f264e9
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
overlay_olsr.c
View File

@ -124,6 +124,7 @@ static void parse_frame(struct overlay_buffer *buff){
WHYF("Unexpected magic number %d", magic); WHYF("Unexpected magic number %d", magic);
return; return;
} }
overlay_address_clear();
frame.ttl = ob_get(buff); frame.ttl = ob_get(buff);
addr_len = ob_get(buff); addr_len = ob_get(buff);
@ -134,22 +135,32 @@ static void parse_frame(struct overlay_buffer *buff){
addr = (struct in_addr *)ob_get_bytes_ptr(buff, addr_len); addr = (struct in_addr *)ob_get_bytes_ptr(buff, addr_len);
// read source subscriber // read subscriber id of transmitter
if (overlay_address_parse(&context, buff, NULL, &frame.source)) struct subscriber *sender;
if (overlay_address_parse(&context, buff, NULL, &sender))
goto end; goto end;
if (context.invalid_addresses) if (context.invalid_addresses)
goto end; goto end;
if (frame.source->reachable==REACHABLE_NONE){ overlay_address_set_sender(sender);
if (sender->reachable==REACHABLE_NONE){
// locate the interface we should send outgoing unicast packets to // locate the interface we should send outgoing unicast packets to
overlay_interface *interface = overlay_interface_find(*addr); overlay_interface *interface = overlay_interface_find(*addr);
if (interface){ if (interface){
// assume the port number of the other servald matches our local port number configuration // assume the port number of the other servald matches our local port number configuration
reachable_unicast(frame.source, interface, *addr, interface->port); reachable_unicast(sender, interface, *addr, interface->port);
} }
} }
// read subscriber id of payload origin
if (overlay_address_parse(&context, buff, NULL, &frame.source))
goto end;
if (context.invalid_addresses)
goto end;
// read source broadcast id // read source broadcast id
// assume each packet may arrive multiple times due to routing loops between servald overlay and olsr. // assume each packet may arrive multiple times due to routing loops between servald overlay and olsr.
if (overlay_address_parse(&context, buff, &frame.broadcast_id, NULL)) if (overlay_address_parse(&context, buff, &frame.broadcast_id, NULL))
@ -169,8 +180,10 @@ static void parse_frame(struct overlay_buffer *buff){
overlay_saw_mdp_containing_frame(&frame, gettime_ms()); overlay_saw_mdp_containing_frame(&frame, gettime_ms());
// TODO relay this packet to other non-olsr networks. // TODO relay this packet to other non-olsr networks.
end: end:
send_please_explain(&context, my_subscriber, frame.source); // if we didn't understand one of the address abreviations, ask for explanation
send_please_explain(&context, my_subscriber, sender);
} }
static void olsr_read(struct sched_ent *alarm){ static void olsr_read(struct sched_ent *alarm){
@ -243,9 +256,16 @@ int olsr_send(struct overlay_frame *frame){
return 0; return 0;
struct overlay_buffer *b=ob_new(); struct overlay_buffer *b=ob_new();
overlay_address_clear();
// build olsr specific frame header // build olsr specific frame header
ob_append_byte(b, PACKET_FORMAT_NUMBER); ob_append_byte(b, PACKET_FORMAT_NUMBER);
ob_append_byte(b, frame->ttl); ob_append_byte(b, frame->ttl);
// address the packet as transmitted by me
overlay_address_append(b, my_subscriber);
overlay_address_set_sender(my_subscriber);
overlay_address_append(b, frame->source); overlay_address_append(b, frame->source);
overlay_broadcast_append(b, &frame->broadcast_id); overlay_broadcast_append(b, &frame->broadcast_id);
ob_append_byte(b, frame->modifiers); ob_append_byte(b, frame->modifiers);