Author: axel Date: 2010-06-04 01:50:21 +0200 (Fri, 04 Jun 2010) New Revision: 1684 Modified: trunk/bmx/Makefile trunk/bmx/bmx.c trunk/bmx/bmx.h trunk/bmx/msg.c trunk/bmx/msg.h Log: Makefile bmx.h : fix -DREVISION_VERSION=0 bmx.c msg.c : less system logging msg.h changed parametrization Modified: trunk/bmx/Makefile =================================================================== --- trunk/bmx/Makefile 2010-06-03 20:07:47 UTC (rev 1683) +++ trunk/bmx/Makefile 2010-06-03 23:50:21 UTC (rev 1684) @@ -13,9 +13,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA -REVISION_VERSION = 0$(shell if [ -d .svn ]; then which svn > /dev/null && which sed > /dev/null && which awk > /dev/null && { svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}';} fi ) +REVISION_VERSION = $(shell if [ -d .svn ]; then which svn > /dev/null && which sed > /dev/null && which awk > /dev/null && { svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}';};else echo 0; fi ) - ##CFLAGS ?= -I./lua-5.1.4/src -I./cyassl-1.4.0/include -O0 -ggdb3 ##LDFLAGS ?= -L./lua-5.1.4/src -L./cyassl-1.4.0/src/.libs Modified: trunk/bmx/bmx.c =================================================================== --- trunk/bmx/bmx.c 2010-06-03 20:07:47 UTC (rev 1683) +++ trunk/bmx/bmx.c 2010-06-03 23:50:21 UTC (rev 1684) @@ -443,7 +443,7 @@ { struct neigh_node *neigh = NULL; - dbgf( DBGL_SYS, DBGT_INFO, "neigh %s neighIID4neigh %d dhn->orig %s", + dbgf( DBGL_CHANGES, DBGT_INFO, "neigh %s neighIID4neigh %d dhn->orig %s", ln->llip4_str, neighIID4neigh, dhn->on->desc0->id.name); assertion(-500389, (ln && neighIID4neigh > IID_RSVD_MAX)); Modified: trunk/bmx/bmx.h =================================================================== --- trunk/bmx/bmx.h 2010-06-03 20:07:47 UTC (rev 1683) +++ trunk/bmx/bmx.h 2010-06-03 23:50:21 UTC (rev 1684) @@ -31,6 +31,10 @@ #include "allocate.h" +#ifndef REVISION_VERSION +#define REVISION_VERSION 0 +#endif + /* * from other headers: */ Modified: trunk/bmx/msg.c =================================================================== --- trunk/bmx/msg.c 2010-06-03 20:07:47 UTC (rev 1683) +++ trunk/bmx/msg.c 2010-06-03 23:50:21 UTC (rev 1684) @@ -742,7 +742,7 @@ if ((ttn = dev_out->my_tx_tasks[frame_type])) { - dbgf(DBGL_SYS, DBGT_WARN, "my_tx_task for %s %s myIID4x %d neighIID4x %d dst %s NOT NULL", + dbgf(DBGL_CHANGES, DBGT_WARN, "my_tx_task for %s %s myIID4x %d neighIID4x %d dst %s NOT NULL", frame_handler[frame_type].name, dev_out->name, myIID4x, neighIID4x, ipStr(dest_ip4)); assertion(-500442, (ttn->myIID4x == IID_RSVD_4YOU)); @@ -1323,7 +1323,7 @@ } else { - dbgf(!dhn ? DBGL_CHANGES : DBGL_SYS, DBGT_WARN, + dbgf((dhn && on) ? DBGL_SYS : DBGL_CHANGES, DBGT_WARN, " %s orig_sqn %d or neighIID4x %d via %s orig %s sqn_min %d sqn_range %d", !dhn ? "UNKNOWN" : on ? "EXCEEDED OGM_SQN RANGE" : "INVALIDATED", orig_sqn, neighIID4x, pb->neigh_str, on ? on->id.name:"---", @@ -1691,7 +1691,7 @@ } if (found > 1) { - dbgf(DBGL_SYS, DBGT_WARN, + dbgf(DBGL_CHANGES, DBGT_WARN, "rcvd %d %s messages in %d-bytes frame", found, frame_handler[FRAME_TYPE_HI40_REPS].name, frame->length); } @@ -1794,7 +1794,7 @@ } else if (fhdl->min_rtq && (!pb->lndev || pb->lndev->mr[SQR_RTQ].val < fhdl->min_rtq)) { - dbg_mute(60, DBGL_SYS, DBGT_WARN, + dbg_mute(60, DBGL_CHANGES, DBGT_WARN, "non-sufficient bidirectional link %s - %s (rtq %d), skipping frame type %s", pb->iif->ip4_str, pb->neigh_str, pb->lndev ? pb->lndev->mr[SQR_RTQ].val : 0, fhdl->name); Modified: trunk/bmx/msg.h =================================================================== --- trunk/bmx/msg.h 2010-06-03 20:07:47 UTC (rev 1683) +++ trunk/bmx/msg.h 2010-06-03 23:50:21 UTC (rev 1684) @@ -34,14 +34,14 @@ #define ARG_AGGREG_INTERVAL "aggregation_interval" #define ARG_HELLO_INTERVAL "hello_interval" -#define DEF_HELLO_INTERVAL DEF_OGM_AGGREG_INTERVAL +#define DEF_HELLO_INTERVAL DEF_AGGREG_INTERVAL #define MIN_HELLO_INTERVAL 50 #define MAX_HELLO_INTERVAL 10000 extern int32_t my_hello_interval; #define ARG_OGM_INTERVAL "ogm_interval" -#define DEF_OGM_INTERVAL 2000 +#define DEF_OGM_INTERVAL 2500 #define MIN_OGM_INTERVAL 200 #define MAX_OGM_INTERVAL 60000 extern int32_t my_ogm_interval; @@ -52,16 +52,16 @@ -#define MIN_OGM_AGGREG_INTERVAL ( MIN_OGM_INTERVAL/10 ) -#define MAX_OGM_AGGREG_INTERVAL ( DEF_OGM_INTERVAL/2 ) -#define DEF_OGM_AGGREG_INTERVAL ( DEF_OGM_INTERVAL/5 ) +#define MIN_OGM_AGGREG_INTERVAL ( (MIN_AGGREG_INTERVAL / 3) * 2 ) +#define MAX_OGM_AGGREG_INTERVAL ( (MAX_AGGREG_INTERVAL / 3) * 2 ) +#define DEF_OGM_AGGREG_INTERVAL ( (DEF_AGGREG_INTERVAL / 3) * 2 ) #define MAX_OGM_RESEND_INTERVAL (MAX_AGGREG_INTERVAL * 2) #define DEF_OGM_RESEND_INTERVAL ((DEF_AGGREG_INTERVAL * 2) / 3) #define MIN_OGM_RESEND_ATTEMPTS 0 #define MAX_OGM_RESEND_ATTEMPTS 5 -#define DEF_OGM_RESEND_ATTEMPTS 3 +#define DEF_OGM_RESEND_ATTEMPTS 2 #define ARG_OGM_RESEND_ATTEMPTS "ogm_resend_attempts" #define MIN_NBDISC_RTQ (PROBE_RANGE / 8)