Attachment #194581 for bug #273845

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

Lines 51-60 Link Here

(-)nepenthes-0.2.2.orig/modules/download-creceive/CReceiveDialogue.cpp (+2 lines)
51	#include "DownloadUrl.cpp"	51	#include "DownloadUrl.cpp"
52	#include "DownloadBuffer.cpp"	52	#include "DownloadBuffer.cpp"
53		53
54	#include "SubmitManager.hpp"	54	#include "SubmitManager.hpp"
55		55
		56	#include <cstdio>
		57
56	#ifdef STDTAGS	58	#ifdef STDTAGS
57	#undef STDTAGS	59	#undef STDTAGS
58	#endif	60	#endif
59	#define STDTAGS l_dl \| l_dia \| l_hlr	61	#define STDTAGS l_dl \| l_dia \| l_hlr
60		62

Lines 27-36 Link Here

(-)nepenthes-0.2.2.orig/modules/download-http/HTTPDialogue.cpp (+1 lines)
27		27
28	/* $Id: HTTPDialogue.cpp 836 2007-02-06 15:16:50Z common $ */	28	/* $Id: HTTPDialogue.cpp 836 2007-02-06 15:16:50Z common $ */
29		29
30	#include "HTTPDialogue.hpp"	30	#include "HTTPDialogue.hpp"
31		31
		32	#include <cstdio>
32		33
33	#include "Message.hpp"	34	#include "Message.hpp"
34	#include "Nepenthes.hpp"	35	#include "Nepenthes.hpp"
35	#include "LogManager.hpp"	36	#include "LogManager.hpp"
36		37

Lines 29-38 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_connect_trans.cpp (+1 lines)
29		29
30	#include <sys/types.h>	30	#include <sys/types.h>
31	#include <sys/socket.h>	31	#include <sys/socket.h>
32	#include <netinet/in.h>	32	#include <netinet/in.h>
33	#include <arpa/inet.h>	33	#include <arpa/inet.h>
		34	#include <cstdio>
34		35
35	#include "LogManager.hpp"	36	#include "LogManager.hpp"
36	#include "Message.hpp"	37	#include "Message.hpp"
37	#include "sch_generic_connect_trans.hpp"	38	#include "sch_generic_connect_trans.hpp"
38	#include "Socket.hpp"	39	#include "Socket.hpp"

Lines 36-46 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_createprocess.cpp (-1 / +1 lines)
36	*	36	*
37	*/	37	*/
38		38
39	/* $Id: sch_generic_createprocess.cpp 550 2006-05-04 10:25:35Z common $ */	39	/* $Id: sch_generic_createprocess.cpp 550 2006-05-04 10:25:35Z common $ */
40		40
41		41	#include <cstdio>
42		42
43	#include "sch_generic_createprocess.hpp"	43	#include "sch_generic_createprocess.hpp"
44		44
45	#include "Nepenthes.hpp"	45	#include "Nepenthes.hpp"
46	#include "Message.hpp"	46	#include "Message.hpp"

Lines 25-34 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_bind_trans.cpp (+2 lines)
25	*	25	*
26	*******************************************************************************/	26	*******************************************************************************/
27		27
28	/* $Id: sch_generic_link_bind_trans.cpp 2271 2006-01-14 20:31:52Z common $ */	28	/* $Id: sch_generic_link_bind_trans.cpp 2271 2006-01-14 20:31:52Z common $ */
29		29
		30	#include <cstdio>
		31
30	#include <sys/types.h>	32	#include <sys/types.h>
31	#include <sys/socket.h>	33	#include <sys/socket.h>
32	#include <netinet/in.h>	34	#include <netinet/in.h>
33	#include <arpa/inet.h>	35	#include <arpa/inet.h>
34		36

Lines 25-34 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_link_trans.cpp (+1 lines)
25	*	25	*
26	*******************************************************************************/	26	*******************************************************************************/
27		27
28	/* $Id: sch_generic_link_trans.cpp 2271 2006-01-14 20:31:52Z common $ */	28	/* $Id: sch_generic_link_trans.cpp 2271 2006-01-14 20:31:52Z common $ */
29		29
		30	#include <cstdio>
30		31
31	#include <sys/types.h>	32	#include <sys/types.h>
32	#include <sys/socket.h>	33	#include <sys/socket.h>
33	#include <netinet/in.h>	34	#include <netinet/in.h>
34	#include <arpa/inet.h>	35	#include <arpa/inet.h>

Lines 24-34 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_stuttgart.cpp (-1 / +3 lines)
24	* contact nepenthesdev@users.sourceforge.net	24	* contact nepenthesdev@users.sourceforge.net
25	*	25	*
26	*******************************************************************************/	26	*******************************************************************************/
27		27
28	/* $Id: sch_generic_link_trans.cpp 1664 2005-07-15 03:33:39Z common $ */	28	/* $Id: sch_generic_link_trans.cpp 1664 2005-07-15 03:33:39Z common $ */
29		29
		30	#include <cstdio>
		31
30	#include <sys/types.h>	32	#include <sys/types.h>
31	#include <sys/socket.h>	33	#include <sys/socket.h>
32	#include <netinet/in.h>	34	#include <netinet/in.h>
33	#include <arpa/inet.h>	35	#include <arpa/inet.h>
34		36

Lines 36-46 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_url.cpp (-1 / +1 lines)
36	* wikipedia states bsd code can be relicensed on to gpl, but we got no information what has to be done	36	* wikipedia states bsd code can be relicensed on to gpl, but we got no information what has to be done
37	*	37	*
38	*	38	*
39	*/	39	*/
40		40
41		41	#include <cstdio>
42		42
43	#include "sch_generic_url.hpp"	43	#include "sch_generic_url.hpp"
44	#include "LogManager.hpp"	44	#include "LogManager.hpp"
45	#include "Message.hpp"	45	#include "Message.hpp"
46	#include "DownloadManager.hpp"	46	#include "DownloadManager.hpp"

Lines 25-34 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_wuerzburg.cpp (+2 lines)
25	*	25	*
26	*******************************************************************************/	26	*******************************************************************************/
27		27
28	/* $Id: sch_generic_wuerzburg.cpp 2271 2006-01-14 20:31:52Z common $ */	28	/* $Id: sch_generic_wuerzburg.cpp 2271 2006-01-14 20:31:52Z common $ */
29		29
		30	#include <cstdio>
		31
30	#include <sys/types.h>	32	#include <sys/types.h>
31	#include <sys/socket.h>	33	#include <sys/socket.h>
32	#include <netinet/in.h>	34	#include <netinet/in.h>
33	#include <arpa/inet.h>	35	#include <arpa/inet.h>
34		36

Lines 40-49 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-generic/sch_generic_xor.cpp (+2 lines)
40		40
41		41
42		42
43	#include "sch_generic_xor.hpp"	43	#include "sch_generic_xor.hpp"
44		44
		45	#include <cstdio>
		46
45	#include "Nepenthes.hpp"	47	#include "Nepenthes.hpp"
46	#include "Message.hpp"	48	#include "Message.hpp"
47	#include "Message.cpp"	49	#include "Message.cpp"
48	#include "LogManager.hpp"	50	#include "LogManager.hpp"
49	#include "Utilities.hpp"	51	#include "Utilities.hpp"

Lines 25-34 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_bindfiletransfer.cpp (+2 lines)
25	*	25	*
26	*******************************************************************************/	26	*******************************************************************************/
27		27
28	/* $Id: sch_namespace_bindfiletransfer.cpp 499 2006-04-08 18:40:14Z common $ */	28	/* $Id: sch_namespace_bindfiletransfer.cpp 499 2006-04-08 18:40:14Z common $ */
29		29
		30	#include <cstdio>
		31
30	#include <sys/types.h>	32	#include <sys/types.h>
31	#include <sys/socket.h>	33	#include <sys/socket.h>
32	#include <netinet/in.h>	34	#include <netinet/in.h>
33	#include <arpa/inet.h>	35	#include <arpa/inet.h>
34		36

Lines 25-34 Link Here

(-)nepenthes-0.2.2.orig/modules/shellcode-signatures/sch_namespace_connectbackfiletransfer.cpp (+2 lines)
25	*	25	*
26	*******************************************************************************/	26	*******************************************************************************/
27		27
28	/* $Id: sch_namespace_connectbackfiletransfer.cpp 499 2006-04-08 18:40:14Z common $ */	28	/* $Id: sch_namespace_connectbackfiletransfer.cpp 499 2006-04-08 18:40:14Z common $ */
29		29
		30	#include <cstdio>
		31
30	#include <sys/types.h>	32	#include <sys/types.h>
31	#include <sys/socket.h>	33	#include <sys/socket.h>
32	#include <netinet/in.h>	34	#include <netinet/in.h>
33	#include <arpa/inet.h>	35	#include <arpa/inet.h>
34		36

Lines 20-29 Link Here

(-)nepenthes-0.2.2.orig/modules/shellemu-winnt/VFS.cpp (+1 lines)
20	*	20	*
21	*******************************************************************************/	21	*******************************************************************************/
22		22
23		23
24	#include <ctype.h>	24	#include <ctype.h>
		25	#include <cstdio>
25		26
26	#include "VFS.hpp"	27	#include "VFS.hpp"
27	#include "VFSNode.hpp"	28	#include "VFSNode.hpp"
28	#include "VFSDir.hpp"	29	#include "VFSDir.hpp"
29	#include "VFSFile.hpp"	30	#include "VFSFile.hpp"

Lines 28-37 Link Here

(-)nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommand.hpp (+1 lines)
28	/* $Id: VFSCommand.hpp 1927 2005-08-27 21:56:59Z dp $ */	28	/* $Id: VFSCommand.hpp 1927 2005-08-27 21:56:59Z dp $ */
29		29
30	#ifndef HAVE_VFSCOMMANDECHO	30	#ifndef HAVE_VFSCOMMANDECHO
31	#define HAVE_VFSCOMMANDECHO	31	#define HAVE_VFSCOMMANDECHO
32		32
		33	#include <stdint.h>
33	#include <list>	34	#include <list>
34	#include <string>	35	#include <string>
35	#include <vector>	36	#include <vector>
36		37
37	#include "VFSNode.hpp"	38	#include "VFSNode.hpp"

Lines 24-34 Link Here

(-)nepenthes-0.2.2.orig/modules/shellemu-winnt/VFSCommandRCP.cpp (-1 / +3 lines)
24	* contact nepenthesdev@users.sourceforge.net	24	* contact nepenthesdev@users.sourceforge.net
25	*	25	*
26	*******************************************************************************/	26	*******************************************************************************/
27		27
28	/* $Id: VFSCommandRCP.cpp 550 2006-05-04 10:25:35Z common $ */	28	/* $Id: VFSCommandRCP.cpp 550 2006-05-04 10:25:35Z common $ */
29		29
		30	#include <cstdio>
		31
30	#include "VFSCommandRCP.hpp"	32	#include "VFSCommandRCP.hpp"
31	#include "VFSNode.hpp"	33	#include "VFSNode.hpp"
32	#include "VFSDir.hpp"	34	#include "VFSDir.hpp"
33	#include "VFSFile.hpp"	35	#include "VFSFile.hpp"
34	#include "Nepenthes.hpp"	36	#include "Nepenthes.hpp"

Lines 28-37 Link Here

(-)nepenthes-0.2.2.orig/modules/submit-file/submit-file.cpp (+1 lines)
28	/* $Id: submit-file.cpp 550 2006-05-04 10:25:35Z common $ */	28	/* $Id: submit-file.cpp 550 2006-05-04 10:25:35Z common $ */
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/stat.h>	30	#include <sys/stat.h>
31	#include <unistd.h>	31	#include <unistd.h>
32	#include <errno.h>	32	#include <errno.h>
		33	#include <cstdio>
33		34
34	#include "submit-file.hpp"	35	#include "submit-file.hpp"
35	#include "Download.hpp"	36	#include "Download.hpp"
36	#include "DownloadBuffer.hpp"	37	#include "DownloadBuffer.hpp"
37	#include "Utilities.hpp"	38	#include "Utilities.hpp"

Lines 25-34 Link Here

(-)nepenthes-0.2.2.orig/modules/submit-postgres/PGDownloadContext.cpp (+1 lines)
25	*	25	*
26	*******************************************************************************/	26	*******************************************************************************/
27		27
28	/* $Id: PGDownloadContext.cpp 688 2006-10-29 20:08:41Z common $ */	28	/* $Id: PGDownloadContext.cpp 688 2006-10-29 20:08:41Z common $ */
29		29
		30	#include <cstdio>
30		31
31	#include <sys/types.h>	32	#include <sys/types.h>
32	#include <sys/socket.h>	33	#include <sys/socket.h>
33	#include <netinet/in.h>	34	#include <netinet/in.h>
34	#include <arpa/inet.h>	35	#include <arpa/inet.h>

Lines 40-49 Link Here

(-)nepenthes-0.2.2.orig/nepenthes-core/src/DownloadManager.cpp (+2 lines)
40	#include "Config.hpp"	40	#include "Config.hpp"
41		41
42	#include "SubmitEvent.hpp"	42	#include "SubmitEvent.hpp"
43	#include "EventManager.hpp"	43	#include "EventManager.hpp"
44		44
		45	#include <cstdio>
		46
45	using namespace std;	47	using namespace std;
46	using namespace nepenthes;	48	using namespace nepenthes;
47		49
48	#ifdef STDTAGS	50	#ifdef STDTAGS
49	#undef STDTAGS	51	#undef STDTAGS

Lines 33-42 Link Here

(-)nepenthes-0.2.2.orig/nepenthes-core/src/ModuleManager.cpp (+2 lines)
33	#include "Module.hpp"	33	#include "Module.hpp"
34	#include "Config.hpp"	34	#include "Config.hpp"
35	#include "Nepenthes.hpp"	35	#include "Nepenthes.hpp"
36	#include "LogManager.hpp"	36	#include "LogManager.hpp"
37		37
		38	#include <cstdio>
		39
38	using namespace nepenthes;	40	using namespace nepenthes;
39	using namespace std;	41	using namespace std;
40		42
41	#ifdef STDTAGS	43	#ifdef STDTAGS
42	#undef STDTAGS	44	#undef STDTAGS

Lines 33-42 Link Here

(-)nepenthes-0.2.2.orig/nepenthes-core/src/ShellcodeManager.cpp (+2 lines)
33	#include "LogManager.hpp"	33	#include "LogManager.hpp"
34	#include "Message.hpp"	34	#include "Message.hpp"
35	#include "SocketEvent.hpp"	35	#include "SocketEvent.hpp"
36	#include "EventManager.hpp"	36	#include "EventManager.hpp"
37		37
		38	#include <cstdio>
		39
38	using namespace nepenthes;	40	using namespace nepenthes;
39		41
40	#ifdef STDTAGS	42	#ifdef STDTAGS
41	#undef STDTAGS	43	#undef STDTAGS
42	#endif	44	#endif

Lines 27-36 Link Here

(-)nepenthes-0.2.2.orig/nepenthes-core/src/Socket.cpp (+1 lines)
27		27
28	/* $Id: Socket.cpp 699 2006-11-11 09:20:15Z common $ */	28	/* $Id: Socket.cpp 699 2006-11-11 09:20:15Z common $ */
29		29
30	#include <string>	30	#include <string>
31	#include <sstream>	31	#include <sstream>
		32	#include <cstdio>
32		33
33	#include <time.h>	34	#include <time.h>
34		35
35	#include <sys/types.h>	36	#include <sys/types.h>
36	#include <sys/socket.h>	37	#include <sys/socket.h>

Lines 36-45 Link Here

(-)nepenthes-0.2.2.orig/nepenthes-core/src/Utilities.cpp (+2 lines)
36	#include <string.h>	36	#include <string.h>
37	#include <sys/types.h>	37	#include <sys/types.h>
38	#include <inttypes.h>	38	#include <inttypes.h>
39	#include <ctype.h>	39	#include <ctype.h>
40		40
		41	#include <cstdio>
		42
41	#include "Utilities.hpp"	43	#include "Utilities.hpp"
42	#include "LogManager.hpp"	44	#include "LogManager.hpp"
43	#include "Config.hpp"	45	#include "Config.hpp"
44		46
45	using namespace nepenthes;	47	using namespace nepenthes;

Return to bug 273845