Changeset 498

Show
Ignore:
Timestamp:
04/08/06 20:32:39 (3 years ago)
Author:
common
Message:

Nepenthes
- configure.ac added --enable-debug-logging, default is no
- Nepenthes.hpp use the new HAVE_DEBUG_LOGGING define
- shellcode-signatures adjust logging to spam less when compiled without debug-logging

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • nepenthes/trunk/configure.ac

    r441 r498  
    162162AC_TYPE_SIGNAL 
    163163AC_CHECK_FUNCS([strndup alarm bzero gethostbyname gethostname gettimeofday inet_ntoa localtime_r memmove memset munmap select socket strcasecmp strdup strerror strncasecmp strstr strtoul setresgid setresuid]) 
     164 
     165 
     166dnl ************************************************** 
     167dnl * debug logging                                  * 
     168dnl ************************************************** 
     169AC_ARG_ENABLE(debug-logging, [  --enable-debug-logging          spam the console and logfile with all debug information  [default=no]],  
     170                    enable_debug_logging="$enableval", enable_debug_logging="no") 
     171 
     172if test x$enable_debug_logging = "xyes"; then 
     173        AC_DEFINE([HAVE_DEBUG_LOGGING], [1], [Define to 1 if you need debug logging]) 
     174fi       
     175 
    164176 
    165177# Checks for generic libraries. 
    …… 
    904916echo 
    905917echo "*** Dumping Nepenthes Configuration ***" 
     918echo "- Debug Logging               : $enable_debug_logging" 
     919echo "" 
    906920echo "- DNS Resolve                 " 
    907921echo "  - Support adns              : $enable_dnsresolve_adns" 

  • nepenthes/trunk/modules/shellcode-signatures/sch_namespace.cpp

    r466 r498  
    112112        } else 
    113113        { 
    114                 logInfo("%s loaded ...\n",m_ShellcodeHandlerName.c_str()); 
     114                logSpam("%s loaded ...\n",m_ShellcodeHandlerName.c_str()); 
    115115        } 
    116116 

  • nepenthes/trunk/modules/shellcode-signatures/shellcode-signatures.cpp

    r458 r498  
    192192        } 
    193193 
    194         int freed_shellcode = sc_free_shellcodes(sc_free); 
     194        int freed_shellcode =0; 
     195        freed_shellcode = sc_free_shellcodes(sc_free); 
    195196 
    196197        logSpam("Free'd %i shellcodes\n",freed_shellcode);  

  • nepenthes/trunk/nepenthes-core/include/Nepenthes.hpp

    r364 r498  
    7272//#define DEBUG 1 
    7373 
    74 #ifdef WIN32 
    75  
    76 //#define __PRETTY_FUNCTION__ "FOO 
    7774#define logWrite(mask, format, ...) g_Nepenthes->getLogMgr()->logf(mask,format, __VA_ARGS__) 
    7875 
     76#ifdef HAVE_DEBUG_LOGGING 
    7977#define logSpam(format, ...) logWrite(l_spam    | STDTAGS , format, __VA_ARGS__) 
    8078#define logDebug(format, ...) logWrite(l_debug  | STDTAGS , format, __VA_ARGS__) 
     79#else   // HAVE_DEBUG_LOGGING 
     80#define logSpam(format, ...)  
     81#define logDebug(format, ...) 
     82#endif  // HAVE_DEBUG_LOGGING 
     83 
    8184#define logInfo(format, ...) logWrite(l_info    | STDTAGS , format, __VA_ARGS__) 
    8285#define logWarn(format, ...) logWrite(l_warn    | STDTAGS , format, __VA_ARGS__) 
    8386#define logCrit(format, ...) logWrite(l_crit    | STDTAGS , format, __VA_ARGS__) 
    84 #define logPF() logInfo("<in %s>\n", __PRETTY_FUNCTION__) 
    85  
    86  
    87  
    88 #else 
    89  
    90 #ifndef DEBUG 
    91 #define logWrite(mask, format, ...) g_Nepenthes->getLogMgr()->logf(mask,format, __VA_ARGS__) 
    92 #else 
    93 #define logWrite(mask, format, ...) printf("%s:%i ",__FILE__,__LINE__); g_Nepenthes->getLogMgr()->logf(mask,format, __VA_ARGS__) 
    94 #endif  
    95  
    96 #define logSpam(format, ...) logWrite(l_spam    | STDTAGS , format, __VA_ARGS__) 
    97 #define logDebug(format, ...) logWrite(l_debug  | STDTAGS , format, __VA_ARGS__) 
    98 #define logInfo(format, ...) logWrite(l_info    | STDTAGS , format, __VA_ARGS__) 
    99 #define logWarn(format, ...) logWrite(l_warn    | STDTAGS , format, __VA_ARGS__) 
    100 #define logCrit(format, ...) logWrite(l_crit    | STDTAGS , format, __VA_ARGS__) 
     87 
     88#ifdef HAVE_DEBUG_LOGGING 
    10189#define logPF() logSpam("<in %s>\n", __PRETTY_FUNCTION__) 
    102  
    103 #endif 
     90#else   // HAVE_DEBUG_LOGGING 
     91#define logPF() 
     92#endif // HAVE_DEBUG_LOGGING 
     93 
    10494 
    10595namespace nepenthes