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

tweak debug output

Browse Source
This commit is contained in:
gardners 2013-09-03 02:08:25 +09:30 committed by Jeremy Lakeman
parent fa157500b3
commit c120f27e99
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mavlink.c
View File

@ -240,10 +240,15 @@ int mavlink_parse(struct slip_decode_state *state)
if (config.debug.mavlink) DEBUG("Received MAVLink DATASTREAM message for us");
if (state->mavlink_componentid&0x01) {
if (config.debug.mavlink) {
DEBUG("Found start of PDU");
DEBUGF("Found start of PDU mavlink-seq=0x%02x",state->mavlink_sequence);
if (state->packet_length) DEBUGF("... previous packet had not ended, discarding");
}
state->packet_length=0;
} else {
if (config.debug.mavlink) {
DEBUGF("Extension PDU mavlink-seq=0x%02x",state->mavlink_sequence);
if (state->packet_length) DEBUGF("... previous packet had not ended, discarding");
}
}
if (state->packet_length+state->mavlink_payload_length>sizeof(state->dst))
{
@ -262,7 +267,7 @@ int mavlink_parse(struct slip_decode_state *state)
state->packet_length+=state->mavlink_payload_length-30;
if (state->mavlink_componentid&0x02) {
if (config.debug.mavlink)
DEBUGF("Found end of PDU (length=%d)",state->packet_length);
DEBUGF("PDU Complete (length=%d)",state->packet_length);
state->dst_offset=0;
return 1;
} else return 0;

8
route_link.c
View File

@ -690,7 +690,7 @@ static int neighbour_link_sent(struct overlay_frame *frame, int sequence, void *
if (!neighbour)
return 0;
neighbour->last_update_seq = sequence;
if (config.debug.linkstate && config.debug.verbose)
if ((config.debug.linkstate && config.debug.verbose)||config.debug.ack)
DEBUGF("LINK STATE; ack sent to neighbour %s in seq %d", alloca_tohex_sid(subscriber->sid), sequence);
return 0;
}
@ -721,7 +721,7 @@ static int send_neighbour_link(struct neighbour *n)
frame->destination = n->subscriber;
}else{
// no routing decision yet? send this packet to all probable destinations.
if (config.debug.linkstate && config.debug.verbose)
if ((config.debug.linkstate && config.debug.verbose)|| config.debug.ack)
DEBUGF("Sending link state ack to all possibilities");
struct link_out *out = n->out_links;
while(out){
@ -1079,7 +1079,7 @@ int link_received_packet(struct decode_context *context, int sender_seq, char un
if (link->ack_sequence == sender_seq)
break;
// missed a packet? send a link state soon
if (config.debug.verbose && config.debug.linkstate)
if ((config.debug.verbose && config.debug.linkstate)||config.debug.ack)
DEBUGF("LINK STATE; missed seq %d from %s on %s",
link->ack_sequence, alloca_tohex_sid(context->sender->sid), context->interface->name);
link->ack_mask = link->ack_mask << 1;
@ -1191,7 +1191,7 @@ int link_receive(struct overlay_frame *frame, overlay_mdp_frame *mdp)
if (context.invalid_addresses)
continue;
if (config.debug.verbose && config.debug.linkstate)
if ((config.debug.verbose && config.debug.linkstate)||config.debug.ack)
DEBUGF("LINK STATE; record - %d, %s, %s, %d, %d, %x, %d",
flags,
receiver?alloca_tohex_sid(receiver->sid):"NULL",