github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-06-09 12:03:41 +02:00
Code Releases Activity

make real_dprintf available even if DEBUGTRACE is not set

Browse Source 
By making this a static _inline, it is not necessary to guard it, since
an inline is only instantiated if it is used. This also allows adding
one-off debug message for use during debugging sessions, without turning
on DEBUGTRACE all over the place.

Convert a few of the extensions to also do this as well, making them perhaps
slightly smaller.

I am curious why Windows builds define debug this way, vs posix that
just includes it in common.c. Could I just do that instead, assuming
there's no historical reason.

Finally, correct the docs in the posix version of real_dprintf.
This commit is contained in:
Brent Cook 2015-02-25 12:20:02 -06:00
parent 4ad58d65b4
commit a4f81a51b5
5 changed files with 10 additions and 19 deletions
c/meterpreter/source
common
common.ccommon.h
elevator
elevator.h
extensions/kiwi
debug.h
screenshot
screenshot.h

6
c/meterpreter/source/common/common.c

@ -47,11 +47,7 @@ int current_unix_timestamp(void) {
int debugging_enabled; int debugging_enabled;
/*! /*!
* @brief Output a debug string to the debug console. * @brief Writes debug to a temporary file based on the current PID.
* @details The function emits debug strings via `OutputDebugStringA`, hence all messages can be viewed
* using Visual Studio's _Output_ window, _DebugView_ from _SysInternals_, or _Windbg_.
* @remark If we supply real_dprintf in the common.h, each .o file will have a private copy of that symbol.
* This leads to bloat. Defining it here means that there will only be a single implementation of it.
*/ */
void real_dprintf(char *filename, int line, const char *function, char *format, ...) void real_dprintf(char *filename, int line, const char *function, char *format, ...)
{ {

4
c/meterpreter/source/common/common.h

@ -190,13 +190,12 @@ void real_dprintf(char *filename, int line, const char *function, char *format,
/*! @brief Close a handle if not already closed and set the handle to NULL. */ /*! @brief Close a handle if not already closed and set the handle to NULL. */
#define CLOSE_HANDLE( h ) if( h ) { DWORD dwHandleFlags; if(GetHandleInformation( h , &dwHandleFlags)) CloseHandle( h ); h = NULL; } #define CLOSE_HANDLE( h ) if( h ) { DWORD dwHandleFlags; if(GetHandleInformation( h , &dwHandleFlags)) CloseHandle( h ); h = NULL; }
#ifdef DEBUGTRACE
/*! /*!
* @brief Output a debug string to the debug console. * @brief Output a debug string to the debug console.
* @details The function emits debug strings via `OutputDebugStringA`, hence all messages can be viewed * @details The function emits debug strings via `OutputDebugStringA`, hence all messages can be viewed
* using Visual Studio's _Output_ window, _DebugView_ from _SysInternals_, or _Windbg_. * using Visual Studio's _Output_ window, _DebugView_ from _SysInternals_, or _Windbg_.
*/ */
static void real_dprintf(char *format, ...) { static _inline void real_dprintf(char *format, ...) {
va_list args; va_list args;
char buffer[1024]; char buffer[1024];
va_start(args,format); va_start(args,format);
@ -204,7 +203,6 @@ static void real_dprintf(char *format, ...) {
strcat_s(buffer, sizeof(buffer), "\r\n"); strcat_s(buffer, sizeof(buffer), "\r\n");
OutputDebugStringA(buffer); OutputDebugStringA(buffer);
} }
#endif
#endif #endif

2
c/meterpreter/source/elevator/elevator.h

@ -14,7 +14,7 @@
#define dprintf(...) do{}while(0); #define dprintf(...) do{}while(0);
#endif #endif
static void real_dprintf(char *format, ...) { static _inline void real_dprintf(char *format, ...) {
va_list args; va_list args;
char buffer[1024]; char buffer[1024];
va_start(args,format); va_start(args,format);

5
c/meterpreter/source/extensions/kiwi/debug.h

@ -22,8 +22,7 @@
/*! @brief Close a handle if not already closed and set the handle to NULL. */ /*! @brief Close a handle if not already closed and set the handle to NULL. */
#define CLOSE_HANDLE( h ) if( h ) { DWORD dwHandleFlags; if(GetHandleInformation( h , &dwHandleFlags)) CloseHandle( h ); h = NULL; } #define CLOSE_HANDLE( h ) if( h ) { DWORD dwHandleFlags; if(GetHandleInformation( h , &dwHandleFlags)) CloseHandle( h ); h = NULL; }
#ifdef KIWIDEBUGTRACE static _inline void real_dprintf(wchar_t *format, ...) {
static void real_dprintf(wchar_t *format, ...) {
va_list args; va_list args;
wchar_t buffer[1024]; wchar_t buffer[1024];
va_start(args,format); va_start(args,format);
@ -31,5 +30,3 @@ static void real_dprintf(wchar_t *format, ...) {
wcscat_s(buffer, sizeof(buffer), L"\r\n"); wcscat_s(buffer, sizeof(buffer), L"\r\n");
OutputDebugStringW(buffer); OutputDebugStringW(buffer);
} }
#endif

2
c/meterpreter/source/screenshot/screenshot.h

@ -14,7 +14,7 @@
#define dprintf(...) do{}while(0); #define dprintf(...) do{}while(0);
#endif #endif
static void real_dprintf(char *format, ...) { static _inline void real_dprintf(char *format, ...) {
va_list args; va_list args;
char buffer[1024]; char buffer[1024];
va_start(args,format); va_start(args,format);