Author: fischer Date: Tue Aug 25 17:08:30 2009 New Revision: 864 Log: fixed warning and added a flag for nat Modified: trunk/include/debug.h trunk/trust-point/pisasd/sdmain.c Modified: trunk/include/debug.h ============================================================================== --- trunk/include/debug.h Tue Aug 25 17:06:05 2009 (r863) +++ trunk/include/debug.h Tue Aug 25 17:08:30 2009 (r864) @@ -64,9 +64,9 @@ // value+=1 // value=1 // cog.outl("#ifndef DEBUG_PL_LOOKUP_TABLE") -// cog.outl("extern struct {const char* symbol; unsigned value;}pl_lookup_table[];") +// cog.outl("extern struct {const char* symbol;unsigned value;}pl_lookup_table[];") // cog.outl("#else") -// cog.outl("struct {const char* symbol; unsigned value;}pl_lookup_table[]={") +// cog.outl("struct {const char* symbol;unsigned value;}pl_lookup_table[]={") // for s in symbols: // cog.outl('\t{"%s",\t%i}, %s' % (s.lower()[3:],value,WARNING)) // value+=1 @@ -91,9 +91,9 @@ #define PL_LEGACY 1<<15 /* DONT EDIT ME!!! AUTOGENERATED, SEE ABOVE! */ #define PL_NAT 1<<16 /* DONT EDIT ME!!! AUTOGENERATED, SEE ABOVE! */ #ifndef DEBUG_PL_LOOKUP_TABLE -extern struct {const char* symbol; unsigned value;} pl_lookup_table[]; +extern struct {const char* symbol;unsigned value;}pl_lookup_table[]; #else -struct {const char* symbol; unsigned value;} pl_lookup_table[]={ +struct {const char* symbol;unsigned value;}pl_lookup_table[]={ {"error", 1}, /* DONT EDIT ME!!! AUTOGENERATED, SEE ABOVE! */ {"generic", 2}, /* DONT EDIT ME!!! AUTOGENERATED, SEE ABOVE! */ {"init", 3}, /* DONT EDIT ME!!! AUTOGENERATED, SEE ABOVE! */ Modified: trunk/trust-point/pisasd/sdmain.c ============================================================================== --- trunk/trust-point/pisasd/sdmain.c Tue Aug 25 17:06:05 2009 (r863) +++ trunk/trust-point/pisasd/sdmain.c Tue Aug 25 17:08:30 2009 (r864) @@ -247,6 +247,7 @@ /* disable ip forwarding */ if (sd_ctx.disable_ip4_forward==1){ PISA_DEBUG(PL_NAT,"Disabling ip_forwarding.\n"); + sd_ctx.disable_ip4_forward=0; } /* TODO clear iptables (at least/most from nat stuff) */