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

Fix ping via directory service test

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-08-13 10:55:48 +09:30
parent a516af616e
commit 36b0fe51ae
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
overlay_interface.c
View File

@ -433,8 +433,6 @@ overlay_interface_init(const char *name, struct in_addr src_addr, struct in_addr
tick_ms=0;
}else if (!interface->send_broadcasts){
INFOF("Interface %s is not sending any broadcast traffic!", name);
// no broadcast traffic implies no ticks
tick_ms=0;
}else if (tick_ms==0)
INFOF("Interface %s is running tickless", name);
@ -756,7 +754,9 @@ static void overlay_interface_poll(struct sched_ent *alarm)
alarm->alarm=-1;
time_ms_t now = gettime_ms();
if (interface->state==INTERFACE_STATE_UP && interface->destination->tick_ms>0){
if (interface->state==INTERFACE_STATE_UP
&& interface->destination->tick_ms>0
&& interface->send_broadcasts){
if (now >= interface->destination->last_tx+interface->destination->tick_ms)
overlay_send_tick_packet(interface->destination);
alarm->alarm=interface->destination->last_tx+interface->destination->tick_ms;

2
route_link.c
View File

@ -917,6 +917,8 @@ int link_add_destinations(struct overlay_frame *frame)
frame->packet_version = neighbour->subscriber->max_packet_version;
if (!dest->unicast){
if (!dest->interface->send_broadcasts)
continue;
// make sure we only add broadcast interfaces once
int id = dest->interface - overlay_interfaces;
if (added_interface[id]){

20
tests/directory_service
View File

@ -107,25 +107,29 @@ start_routing_instance() {
wait_until interface_up
}
configure_node() {
executeOk_servald config \
set interfaces.0.file dummy1 \
set interfaces.0.send_broadcasts 0 \
set interfaces.0.drop_broadcasts on \
set interfaces.0.default_route 1 \
set interfaces.0.dummy_address 10.0.${instance_number}.1 \
set interfaces.0.dummy_netmask 255.255.255.0
}
setup_routing() {
setup_servald
assert_no_servald_processes
foreach_instance +A +B +C create_single_identity
>$SERVALD_VAR/dummy1
foreach_instance +A +B +C \
executeOk_servald config \
set interfaces.0.file dummy1 \
set interfaces.0.send_broadcasts 0 \
set interfaces.0.default_route 1 \
set interfaces.0.dummy_netmask 255.255.255.0
configure_node
set_instance +A
executeOk_servald config \
set interfaces.0.dummy_address 10.0.${instance_number}.1 \
set dna.helper.executable "$servald_build_root/directory_service" \
set debug.dnahelper on
foreach_instance +B +C \
executeOk_servald config \
set interfaces.0.dummy_address 10.0.${instance_number}.1 \
set directory.service $SIDA \
set hosts.$SIDA.address 10.0.1.1
foreach_instance +A +B +C start_routing_instance
@ -135,8 +139,6 @@ setup_routing() {
doc_routing="Ping via relay node"
test_routing() {
foreach_instance +B +C \
executeOk_servald scan 10.0.1.1
foreach_instance +B +C \
wait_until sent_directory_request
set_instance +A