tags 345969 +patch
thanks
With the attached patch 'nepenthes' can be compiled on amd64.
Regards
Andreas Jochens
diff -urN ../tmp-orig/nepenthes-0.1.5/modules/log-surfnet/log-surfnet.cpp
./modules/log-surfnet/log-surfnet.cpp
--- ../tmp-orig/nepenthes-0.1.5/modules/log-surfnet/log-surfnet.cpp
2005-12-01 20:10:38.000000000 +0000
+++ ./modules/log-surfnet/log-surfnet.cpp 2006-01-17 13:26:24.000000000
+0000
@@ -265,13 +265,13 @@
case EV_DIALOGUE_ASSIGN_AND_DONE:
case EV_SHELLCODE_DONE:
{
- if (m_SocketTracker.count((uint32_t) socket) == 0)
+ if (m_SocketTracker.count((uintptr_t) socket) == 0)
{
process=false;
}else
{
process=true;
- attackit = m_SocketTracker.find((uint32_t)
socket);
+ attackit = m_SocketTracker.find((uintptr_t)
socket);
attackid = attackit->second;
}
}
@@ -328,13 +328,13 @@
void LogSurfNET::handleTCPAccept(Socket *socket)
{
logCrit("handleTCPAccept()\n"
- "\tSocket 0x%x\n",
- (uint32_t) socket);
+ "\tSocket 0x%lx\n",
+ (uintptr_t) socket);
int32_t sensorid = m_DB->getSensorID(socket->getLocalHost());
int32_t attackid = m_DB->addAttack(AS_POSSIBLE_MALICIOUS_CONNECTION,
socket->getRemoteHost(), socket->getRemotePort(), socket->getLocalHost(),
socket->getLocalPort(),sensorid);
- m_SocketTracker[(uint32_t)socket] = attackid;
+ m_SocketTracker[(uintptr_t)socket] = attackid;
}
void LogSurfNET::handleTCPclose(Socket *socket, uint32_t attackid)
@@ -342,10 +342,10 @@
logCrit("handleTCPclose()\n"
"\tSocket 0x%x\n"
"\tattackID %i\n",
- (uint32_t) socket,
+ (uintptr_t) socket,
attackid);
- m_SocketTracker.erase((uint32_t) socket);
+ m_SocketTracker.erase((uintptr_t) socket);
}
void LogSurfNET::handleDialogueAssignAndDone(Socket *socket, Dialogue *dia,
uint32_t attackid)
@@ -354,7 +354,7 @@
"\tSocket 0x%x\n"
"\tDialogue %s\n"
"\tattackID %i\n",
- (uint32_t) socket,
+ (uintptr_t) socket,
dia->getDialogueName().c_str(),
attackid);
@@ -373,7 +373,7 @@
"\tSocket 0x%x\n"
"\tShellcodeHandler %s\n"
"\tattackID %i\n",
- (uint32_t) socket,
+ (uintptr_t) socket,
handler->getShellcodeHandlerName().c_str(),
attackid);
diff -urN ../tmp-orig/nepenthes-0.1.5/modules/submit-xmlrpc/XMLRPCParser.cpp
./modules/submit-xmlrpc/XMLRPCParser.cpp
--- ../tmp-orig/nepenthes-0.1.5/modules/submit-xmlrpc/XMLRPCParser.cpp
2005-12-01 20:12:10.000000000 +0000
+++ ./modules/submit-xmlrpc/XMLRPCParser.cpp 2006-01-17 13:21:36.000000000
+0000
@@ -345,7 +345,7 @@
for( i = 0; i < depth; i++ )
printf(" ");
- printf("%s %08x:", n->m_key, (uint32_t)n);
+ printf("%s %16lx:", n->m_key, (uintptr_t)n);
if( n->m_type == n_value )
{
diff -urN ../tmp-orig/nepenthes-0.1.5/modules/submit-xmlrpc/submit-xmlrpc.cpp
./modules/submit-xmlrpc/submit-xmlrpc.cpp
--- ../tmp-orig/nepenthes-0.1.5/modules/submit-xmlrpc/submit-xmlrpc.cpp
2005-10-31 15:47:19.000000000 +0000
+++ ./modules/submit-xmlrpc/submit-xmlrpc.cpp 2006-01-17 13:22:07.000000000
+0000
@@ -284,7 +284,7 @@
void SubmitXMLRPC::uploadFailure(UploadResult *up)
{
- logCrit("UPLOAD FAILED %x\n",(uint32_t )up);
+ logCrit("UPLOAD FAILED %lx\n",(uintptr_t )up);
XMLRPCContext *ctx = (XMLRPCContext *)up->getObject();
delete ctx;
}
diff -urN ../tmp-orig/nepenthes-0.1.5/modules/upload-http/upload-http.cpp
./modules/upload-http/upload-http.cpp
--- ../tmp-orig/nepenthes-0.1.5/modules/upload-http/upload-http.cpp
2005-10-31 15:47:23.000000000 +0000
+++ ./modules/upload-http/upload-http.cpp 2006-01-17 13:20:53.000000000
+0000
@@ -119,7 +119,7 @@
bool HTTPUploadHandler::dnsResolved(DNSResult *result)
{
- logDebug("url %s resolved %i for %x\n",result->getDNS().c_str(),
result->getIP4List().size(), (uint32_t) result->getObject());
+ logDebug("url %s resolved %i for %lx\n",result->getDNS().c_str(),
result->getIP4List().size(), (uintptr_t) result->getObject());
list <uint32_t> resolved = result->getIP4List();
uint32_t host = resolved.front();
diff -urN ../tmp-orig/nepenthes-0.1.5/modules/x-6/x-6.cpp ./modules/x-6/x-6.cpp
--- ../tmp-orig/nepenthes-0.1.5/modules/x-6/x-6.cpp 2005-10-31
16:04:20.000000000 +0000
+++ ./modules/x-6/x-6.cpp 2006-01-17 13:25:10.000000000 +0000
@@ -290,7 +290,7 @@
printf("NUM %i\n",i);
logSpam( "domain %s has ip %s
\n",result->getDNS().c_str(),inet_ntoa(*(in_addr *)&*it));
char *reply;
- asprintf(&reply,"domain %s has A %s (context
%8x)\n",result->getDNS().c_str(), inet_ntoa(*(in_addr *)&*it),
(uint32_t)result->getObject());
+ asprintf(&reply,"domain %s has A %s (context
%16lx)\n",result->getDNS().c_str(), inet_ntoa(*(in_addr *)&*it),
(uintptr_t)result->getObject());
m_Socket->doRespond(reply,strlen(reply));
free(reply);
diff -urN ../tmp-orig/nepenthes-0.1.5/nepenthes-core/src/Buffer.cpp
./nepenthes-core/src/Buffer.cpp
--- ../tmp-orig/nepenthes-0.1.5/nepenthes-core/src/Buffer.cpp 2005-10-31
15:47:28.000000000 +0000
+++ ./nepenthes-core/src/Buffer.cpp 2006-01-17 13:16:14.000000000 +0000
@@ -149,7 +149,7 @@
resize(newSize);
}
- memcpy((void *)((int32_t)m_data + m_offset), data, size);
+ memcpy((void *)((intptr_t)m_data + m_offset), data, size);
}
m_offset += size;
@@ -175,12 +175,12 @@
*/
void Buffer::cut(int32_t size)
{
- assert(size <= (int32_t)m_offset);
+ assert(size <= (intptr_t)m_offset);
if( size > 0 )
{
- //memcpy(m_data, (void *)((int32_t)m_data + size), m_offset -
size);
- memmove(m_data, (void *)((int32_t)m_data + size), m_offset -
size);
+ //memcpy(m_data, (void *)((intptr_t)m_data + size), m_offset -
size);
+ memmove(m_data, (void *)((intptr_t)m_data + size), m_offset -
size);
m_offset -= size;
}
}
@@ -214,7 +214,7 @@
void Buffer::debug()
{
printf("SB shellbuffer debug\n");
- printf(" > m_data = 0x%08x\n", (int32_t)m_data);
+ printf(" > m_data = 0x%lx\n", (intptr_t)m_data);
printf(" > m_offset = %d\n", m_offset);
printf(" > m_allocSize = %d\n", m_allocSize);
}
diff -urN ../tmp-orig/nepenthes-0.1.5/nepenthes-core/src/ShellcodeManager.cpp
./nepenthes-core/src/ShellcodeManager.cpp
--- ../tmp-orig/nepenthes-0.1.5/nepenthes-core/src/ShellcodeManager.cpp
2005-11-02 10:03:00.000000000 +0000
+++ ./nepenthes-core/src/ShellcodeManager.cpp 2006-01-17 13:16:51.000000000
+0000
@@ -230,7 +230,7 @@
case SCH_REPROCESS:
shandler = m_ShellcodeHandlers.begin();
nnmsg = *nmsg;
- logDebug("SCHMGR REPROCESS Msg ptr is %x \n",(uint32_t
)*msg);
+ logDebug("SCHMGR REPROCESS Msg ptr is %lx
\n",(uintptr_t )*msg);
break;
case SCH_REPROCESS_BUT_NOT_ME:
diff -urN ../tmp-orig/nepenthes-0.1.5/nepenthes-core/src/Utilities.cpp
./nepenthes-core/src/Utilities.cpp
--- ../tmp-orig/nepenthes-0.1.5/nepenthes-core/src/Utilities.cpp
2005-11-11 20:09:01.000000000 +0000
+++ ./nepenthes-core/src/Utilities.cpp 2006-01-17 13:17:57.000000000 +0000
@@ -345,7 +345,7 @@
{
char conv[] = "0123456789abcdef";
- printf("=------------------[ hexdump(0x%08x , 0x%08x)
]-------------------=\n", (uint32_t)data, len);
+ printf("=------------------[ hexdump(0x%16lx , 0x%08lx)
]-------------------=\n", (uintptr_t)data, len);
for( uint32_t i = 0; i < len; i += 0x10 )
{
printf("0x%04x ", i);
@@ -411,7 +411,7 @@
g_Nepenthes->getLogMgr()->logf(mask,"=--------[ %s
]---------=\n", md5.c_str());
}
- g_Nepenthes->getLogMgr()->logf(mask,"=------------------[
hexdump(0x%08x , 0x%08x) ]-------------------=\n", (uint32_t)data, len);
+ g_Nepenthes->getLogMgr()->logf(mask,"=------------------[
hexdump(0x%16lx , 0x%08x) ]-------------------=\n", (uintptr_t)data, len);
for( uint32_t i = 0; i < len; i += 0x10 )
{
string line;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
