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

Always send scan packets with full sid

Browse Source
This commit is contained in:
Jeremy Lakeman 2012-12-11 13:32:02 +10:30
parent 7bf6beaf14
commit 5798e5acb5
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overlay_mdp_services.c
View File

@ -340,11 +340,9 @@ int overlay_send_probe(struct subscriber *peer, struct sockaddr_in addr, overlay
frame->flags=PACKET_UNICAST; frame->flags=PACKET_UNICAST;
frame->interface=interface; frame->interface=interface;
frame->payload = ob_new(); frame->payload = ob_new();
frame->source_full = 1;
// TODO call mdp payload encryption / signing without calling overlay_mdp_dispatch... // TODO call mdp payload encryption / signing without calling overlay_mdp_dispatch...
my_subscriber->send_full=1;
if (peer) if (peer)
peer->last_probe=gettime_ms(); peer->last_probe=gettime_ms();

1
overlay_packet.h
View File

@ -47,6 +47,7 @@ struct overlay_frame {
struct subscriber *destination; struct subscriber *destination;
struct subscriber *next_hop; struct subscriber *next_hop;
int source_full;
struct subscriber *source; struct subscriber *source;
/* IPv4 address the frame was received from, or should be sent to */ /* IPv4 address the frame was received from, or should be sent to */

2
overlay_queue.c
View File

@ -403,6 +403,8 @@ overlay_stuff_packet(struct outgoing_packet *packet, overlay_txqueue *queue, tim
} }
if (!packet->buffer){ if (!packet->buffer){
if (frame->source_full)
my_subscriber->send_full=1;
overlay_init_packet(packet, frame->next_hop, frame->flags, frame->interface, frame->recvaddr, 0); overlay_init_packet(packet, frame->next_hop, frame->flags, frame->interface, frame->recvaddr, 0);
}else{ }else{
// is this packet going our way? // is this packet going our way?

3
tests/routing
View File

@ -108,6 +108,9 @@ setup_scan() {
assert_no_servald_processes assert_no_servald_processes
foreach_instance +A +B create_single_identity foreach_instance +A +B create_single_identity
foreach_instance +A +B add_interface 1 foreach_instance +A +B add_interface 1
set_instance +B
executeOk_servald config \
set interfaces.1.dummy_address 127.0.1.11
foreach_instance +A +B \ foreach_instance +A +B \
executeOk_servald config \ executeOk_servald config \
set interfaces.1.dummy_filter_broadcasts 1 set interfaces.1.dummy_filter_broadcasts 1