diff --git a/overlay_packetformats.c b/overlay_packetformats.c index b143cccf..5737ea9d 100644 --- a/overlay_packetformats.c +++ b/overlay_packetformats.c @@ -321,9 +321,6 @@ int overlay_add_selfannouncement(int interface,overlay_buffer *b) /* Sequence number range. Based on one tick per milli-second. */ overlay_update_sequence_number(); - WHYF("selfannounce interval = %08llx-%08llx", - overlay_interfaces[interface].last_tick_ms, - now); if (ob_append_int(b,overlay_interfaces[interface].last_tick_ms)) return WHY("ob_append_int() could not add low sequence number to self-announcement"); if (ob_append_int(b,overlay_sequence_number)) diff --git a/overlay_payload.c b/overlay_payload.c index d71ef0fb..1a98eb85 100644 --- a/overlay_payload.c +++ b/overlay_payload.c @@ -81,8 +81,8 @@ int overlay_frame_package_fmt1(overlay_frame *p,overlay_buffer *b) int fail=0; if (p->nexthop_address_status!=OA_RESOLVED) { - WHYF("next hop is NOT resolved for packet to %s", - overlay_render_sid(p->destination)); + if (0) WHYF("next hop is NOT resolved for packet to %s", + overlay_render_sid(p->destination)); if (overlay_address_is_broadcast(p->destination)) { /* Broadcast frames are broadcast rather than unicast to next hop. Just check if the broadcast frame should be dropped first. */ diff --git a/overlay_route.c b/overlay_route.c index a712d3e2..d41957d3 100644 --- a/overlay_route.c +++ b/overlay_route.c @@ -731,7 +731,7 @@ int overlay_route_node_can_hear_me(unsigned char *who,int sender_interface, /* Update reachability metrics for node */ if (overlay_route_recalc_neighbour_metrics(neh,now)) WHY("overlay_route_recalc_neighbour_metrics() failed"); - overlay_route_dump(); + if (debug&DEBUG_OVERLAYROUTEMONITOR) overlay_route_dump(); return 0; } @@ -1056,17 +1056,17 @@ int overlay_route_record_link(long long now,unsigned char *to, /* Don't record routes to ourselves */ if (overlay_address_is_local(to)) { - WHYF("Ignoring self announce ack addressed to me (%s).", - overlay_render_sid(to)); + if (0) WHYF("Ignoring self announce ack addressed to me (%s).", + overlay_render_sid(to)); return 0; } - else WHYF("Recording link to %s",overlay_render_sid(to)); + else if (0) WHYF("Recording link to %s",overlay_render_sid(to)); for(i=0;i