View | Details | Raw Unified | Return to bug 101321
Collapse All | Expand All

(-)nepenthes/Makefile (-1 / +2 lines)
Lines 7-17 Link Here
7
7
8
PORTNAME=	nepenthes
8
PORTNAME=	nepenthes
9
PORTVERSION=	0.1.7
9
PORTVERSION=	0.1.7
10
PORTREVISION=	1
10
CATEGORIES=	net
11
CATEGORIES=	net
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	nepenthes
13
MASTER_SITE_SUBDIR=	nepenthes
13
14
14
MAINTAINER=	ryo@aquahill.net
15
MAINTAINER=	systemoperator@gmail.com
15
COMMENT=	Determine the malware activity on a network
16
COMMENT=	Determine the malware activity on a network
16
17
17
LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
18
LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
(-)nepenthes/files/patch-modules-vuln-bagle-BagleDialogue.cpp (+27 lines)
Line 0 Link Here
1
--- modules/vuln-bagle/BagleDialogue.cpp.old	Sun May  7 16:07:25 2006
2
+++ modules/vuln-bagle/BagleDialogue.cpp	Sun May  7 16:08:14 2006
3
@@ -158,6 +158,7 @@
4
 				m_State = BAGLE_BINARY;
5
 				m_Download = new Download(m_Socket->getRemoteHost(),"bagle://",m_Socket->getRemoteHost(),"bagle://foo/bar");
6
 				m_Download->getDownloadBuffer()->addData(msg->getMsg()+4,msg->getSize()-4);
7
+				return CL_ASSIGN_AND_DONE;
8
 			}
9
 		}
10
 		break;
11
@@ -165,6 +166,7 @@
12
 	case BAGLE_BINARY:
13
 		// FIXME m_MaxFileSize
14
 		m_Download->getDownloadBuffer()->addData(msg->getMsg(),msg->getSize());
15
+		return CL_ASSIGN_AND_DONE;
16
 		break;
17
 
18
 	}
19
@@ -232,8 +234,6 @@
20
 		if ( m_Download->getDownloadBuffer()->getSize() == m_FileSize )
21
 		{
22
 			g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
23
-			// destructor will delete it
24
-			return CL_ASSIGN_AND_DONE;
25
 		}
26
 	}
27
 	return CL_DROP;
(-)nepenthes/files/patch-modules-vuln-mydoom-MydoomDialogue.cpp (+27 lines)
Line 0 Link Here
1
--- modules/vuln-mydoom/MydoomDialogue.cpp.old	Sun May  7 16:03:52 2006
2
+++ modules/vuln-mydoom/MydoomDialogue.cpp	Sun May  7 16:05:33 2006
3
@@ -120,7 +120,7 @@
4
 				m_Download = new Download(msg->getRemoteHost(),"mydoom://foo/bar",msg->getRemoteHost(),"some triggerline");
5
 				m_Download->getDownloadBuffer()->addData((char *)m_Buffer->getData(),m_Buffer->getSize());
6
 				m_Buffer->clear();
7
-				return CL_ASSIGN;
8
+				return CL_ASSIGN_AND_DONE;
9
 			}
10
 		}
11
 		if (m_Buffer->getSize() > 128 )
12
@@ -130,6 +130,7 @@
13
 	case MYDOOM_FILETRANSFERR:
14
 		{
15
 			m_Download->getDownloadBuffer()->addData((char *)msg->getMsg(),msg->getSize());
16
+			return CL_ASSIGN_AND_DONE;
17
 		}
18
 		break;
19
 
20
@@ -196,7 +197,6 @@
21
 	if (m_Download != NULL)
22
 	{
23
     	g_Nepenthes->getSubmitMgr()->addSubmission(m_Download);
24
-		return CL_ASSIGN_AND_DONE;
25
 	}
26
 	return CL_DROP;
27
 }

Return to bug 101321