The following commit has been merged in the master branch: commit 2496b0a2407ecc32d0ac5c3875482a1e4e723acb Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Apr 7 12:18:03 2007 +0200
send gateway class with vis packet
diff --git a/batman.c b/batman.c index 83b6a90..eb7462a 100644 --- a/batman.c +++ b/batman.c @@ -544,8 +544,10 @@ void send_vis_packet() { } if(packet != NULL) { - send_packet(packet, size * sizeof(unsigned char), &vis_if.addr, vis_if.sock); - debugFree( packet, 1102 ); + packet = debugRealloc(packet, ( size * sizeof(unsigned char) ) + 1, 114); + *(packet + size + 1) = gateway_class; + send_packet(packet, ( size * sizeof(unsigned char) ) + 1, &vis_if.addr, vis_if.sock); + debugFree( packet, 1102 ); } }
diff --git a/posix-specific.c b/posix-specific.c index bad7e05..a5ce1a9 100644 --- a/posix-specific.c +++ b/posix-specific.c @@ -133,7 +133,7 @@ void debug_output( int8_t debug_prio, char *format, ... ) {
} else {
- debug_output( 0, "Error - could not trylock mutex (debug_output): %s \n", strerror( errno ) ); + debug_output( 0, "Warning - could not trylock mutex (debug_output): %s \n", strerror( EBUSY ) );
}
@@ -611,7 +611,7 @@ void apply_init_args( int argc, char *argv[] ) {
signal( SIGINT, handler ); signal( SIGTERM, handler ); -// signal( SIGSEGV, segmentation_fault ); + signal( SIGSEGV, segmentation_fault );
for ( res = 0; res < 4; res++ ) {