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

Reduce log noise with debug.overlayframes

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-05-27 16:24:30 +09:30
parent c569503383
commit f1391355e4
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
overlay_packetformats.c
View File

@ -83,19 +83,13 @@ int process_incoming_frame(time_ms_t now, struct overlay_interface *interface, s
break; break;
// data frames // data frames
case OF_TYPE_RHIZOME_ADVERT: case OF_TYPE_RHIZOME_ADVERT:
if (config.debug.overlayframes)
DEBUG("Processing OF_TYPE_RHIZOME_ADVERT");
overlay_rhizome_saw_advertisements(id,f,now); overlay_rhizome_saw_advertisements(id,f,now);
break; break;
case OF_TYPE_DATA: case OF_TYPE_DATA:
case OF_TYPE_DATA_VOICE: case OF_TYPE_DATA_VOICE:
if (config.debug.overlayframes)
DEBUG("Processing OF_TYPE_DATA");
overlay_saw_mdp_containing_frame(f,now); overlay_saw_mdp_containing_frame(f,now);
break; break;
case OF_TYPE_PLEASEEXPLAIN: case OF_TYPE_PLEASEEXPLAIN:
if (config.debug.overlayframes)
DEBUG("Processing OF_TYPE_PLEASEEXPLAIN");
process_explain(f); process_explain(f);
break; break;
default: default:
@ -110,12 +104,12 @@ int process_incoming_frame(time_ms_t now, struct overlay_interface *interface, s
int overlay_forward_payload(struct overlay_frame *f){ int overlay_forward_payload(struct overlay_frame *f){
IN(); IN();
if (f->ttl == 0){ if (f->ttl == 0){
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUGF("NOT FORWARDING, due to ttl=0"); DEBUGF("NOT FORWARDING, due to ttl=0");
RETURN(0); RETURN(0);
} }
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUGF("Forwarding payload for %s, ttl=%u", DEBUGF("Forwarding payload for %s, ttl=%u",
(f->destination?alloca_tohex_sid(f->destination->sid):"broadcast"), (f->destination?alloca_tohex_sid(f->destination->sid):"broadcast"),
(unsigned)f->ttl); (unsigned)f->ttl);
@ -163,7 +157,7 @@ int parseMdpPacketHeader(struct decode_context *context, struct overlay_frame *f
RETURN(WHY("Unable to parse payload source")); RETURN(WHY("Unable to parse payload source"));
if (!frame->source || frame->source->reachable==REACHABLE_SELF){ if (!frame->source || frame->source->reachable==REACHABLE_SELF){
process=forward=0; process=forward=0;
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUGF("Ignoring my packet (or unparsable source)"); DEBUGF("Ignoring my packet (or unparsable source)");
} }
} }
@ -174,7 +168,7 @@ int parseMdpPacketHeader(struct decode_context *context, struct overlay_frame *f
RETURN(WHY("Unable to read broadcast address")); RETURN(WHY("Unable to read broadcast address"));
if (overlay_broadcast_drop_check(&frame->broadcast_id)){ if (overlay_broadcast_drop_check(&frame->broadcast_id)){
process=forward=0; process=forward=0;
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUGF("Ignoring duplicate broadcast (%s)", alloca_tohex(frame->broadcast_id.id, BROADCAST_LEN)); DEBUGF("Ignoring duplicate broadcast (%s)", alloca_tohex(frame->broadcast_id.id, BROADCAST_LEN));
} }
} }
@ -186,7 +180,7 @@ int parseMdpPacketHeader(struct decode_context *context, struct overlay_frame *f
if (!frame->destination || frame->destination->reachable!=REACHABLE_SELF){ if (!frame->destination || frame->destination->reachable!=REACHABLE_SELF){
process=0; process=0;
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUGF("Don't process packet not addressed to me"); DEBUGF("Don't process packet not addressed to me");
} }
@ -197,7 +191,7 @@ int parseMdpPacketHeader(struct decode_context *context, struct overlay_frame *f
if (!(*nexthop) || (*nexthop)->reachable!=REACHABLE_SELF){ if (!(*nexthop) || (*nexthop)->reachable!=REACHABLE_SELF){
forward=0; forward=0;
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUGF("Don't forward packet not addressed to me"); DEBUGF("Don't forward packet not addressed to me");
} }
} }
@ -216,7 +210,7 @@ int parseMdpPacketHeader(struct decode_context *context, struct overlay_frame *f
--frame->ttl; --frame->ttl;
if (frame->ttl == 0) { if (frame->ttl == 0) {
forward = 0; forward = 0;
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUGF("NOT FORWARDING, due to ttl=0"); DEBUGF("NOT FORWARDING, due to ttl=0");
} }
@ -235,7 +229,7 @@ int parseMdpPacketHeader(struct decode_context *context, struct overlay_frame *f
// TODO unicast // TODO unicast
if ((flags & PAYLOAD_FLAG_ONE_HOP) || !(flags & PAYLOAD_FLAG_TO_BROADCAST)){ if ((flags & PAYLOAD_FLAG_ONE_HOP) || !(flags & PAYLOAD_FLAG_TO_BROADCAST)){
if (link_received_duplicate(context->sender, context->interface, context->sender_interface, seq, 0)){ if (link_received_duplicate(context->sender, context->interface, context->sender_interface, seq, 0)){
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUG("Don't process or forward duplicate payloads"); DEBUG("Don't process or forward duplicate payloads");
forward=process=0; forward=process=0;
} }
@ -246,7 +240,7 @@ int parseMdpPacketHeader(struct decode_context *context, struct overlay_frame *f
// if we can't understand one of the addresses, skip processing the payload // if we can't understand one of the addresses, skip processing the payload
if ((forward||process)&&context->invalid_addresses){ if ((forward||process)&&context->invalid_addresses){
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUG("Don't process or forward with invalid addresses"); DEBUG("Don't process or forward with invalid addresses");
forward=process=0; forward=process=0;
} }
@ -286,7 +280,7 @@ int parseEnvelopeHeader(struct decode_context *context, struct overlay_interface
if (context->sender){ if (context->sender){
// ignore packets that have been reflected back to me // ignore packets that have been reflected back to me
if (context->sender->reachable==REACHABLE_SELF){ if (context->sender->reachable==REACHABLE_SELF){
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUG("Completely ignore packets I sent"); DEBUG("Completely ignore packets I sent");
RETURN(1); RETURN(1);
} }
@ -405,7 +399,7 @@ int packetOkOverlay(struct overlay_interface *interface,unsigned char *packet, s
else else
bzero(&f.recvaddr, sizeof f.recvaddr); bzero(&f.recvaddr, sizeof f.recvaddr);
if (config.debug.overlayframes) if (config.debug.verbose && config.debug.overlayframes)
DEBUG("Received overlay packet"); DEBUG("Received overlay packet");
int ret=parseEnvelopeHeader(&context, interface, (struct sockaddr_in *)recvaddr, b); int ret=parseEnvelopeHeader(&context, interface, (struct sockaddr_in *)recvaddr, b);

4
overlay_queue.c
View File

@ -270,6 +270,10 @@ overlay_init_packet(struct outgoing_packet *packet, struct subscriber *destinati
overlay_packet_init_header(packet_version, ENCAP_OVERLAY, &packet->context, packet->buffer, overlay_packet_init_header(packet_version, ENCAP_OVERLAY, &packet->context, packet->buffer,
destination, unicast, packet->i, packet->seq); destination, unicast, packet->i, packet->seq);
packet->header_length = ob_position(packet->buffer); packet->header_length = ob_position(packet->buffer);
if (config.debug.overlayframes)
DEBUGF("Creating packet for interface %s, seq %d, %s",
interface->name, packet->seq,
unicast?"unicast":"broadcast");
} }
int overlay_queue_schedule_next(time_ms_t next_allowed_packet){ int overlay_queue_schedule_next(time_ms_t next_allowed_packet){