rev |
line source |
samuel_trassare@14118
|
1 --- nmap-6.25/output.h 2012-08-15 00:36:25.000000000 +0800
|
samuel_trassare@14118
|
2 +++ nmap-6.25-fixed/output.h 2012-12-02 10:30:45.003319377 +0800
|
samuel_trassare@14118
|
3 @@ -226,6 +226,10 @@
|
samuel_trassare@14118
|
4 void printscriptresults(ScriptResults *scriptResults, stype scantype);
|
samuel_trassare@14118
|
5
|
samuel_trassare@14118
|
6 void printhostscriptresults(Target *currenths);
|
samuel_trassare@14118
|
7 +
|
samuel_trassare@14118
|
8 +/*This is a helper function to determine the ordering of the script results
|
samuel_trassare@14118
|
9 + based on their id */
|
samuel_trassare@14118
|
10 +bool comparescriptids(ScriptResult first, ScriptResult second);
|
samuel_trassare@14118
|
11 #endif
|
samuel_trassare@14118
|
12
|
samuel_trassare@14118
|
13 /* Print a table with traceroute hops. */
|
samuel_trassare@14118
|
14 @@ -253,8 +257,4 @@
|
samuel_trassare@14118
|
15 were found. */
|
samuel_trassare@14118
|
16 void printdatafilepaths();
|
samuel_trassare@14118
|
17
|
samuel_trassare@14118
|
18 -/*This is a helper function to determine the ordering of the script results
|
samuel_trassare@14118
|
19 - based on their id */
|
samuel_trassare@14118
|
20 -bool comparescriptids(ScriptResult first, ScriptResult second);
|
samuel_trassare@14118
|
21 -
|
samuel_trassare@14118
|
22 #endif /* OUTPUT_H */
|
samuel_trassare@14118
|
23 --- nmap-6.25.orig/output.cc 2012-11-29 11:19:52.000000000 +0800
|
samuel_trassare@14118
|
24 +++ nmap-6.25/output.cc 2012-12-02 10:44:50.986325233 +0800
|
samuel_trassare@14118
|
25 @@ -2613,6 +2613,7 @@
|
samuel_trassare@14118
|
26 }
|
samuel_trassare@14118
|
27 }
|
samuel_trassare@14118
|
28
|
samuel_trassare@14118
|
29 +#ifndef NOLUA
|
samuel_trassare@14118
|
30 /*This is a helper function to determine the ordering of the script results
|
samuel_trassare@14118
|
31 based on their id */
|
samuel_trassare@14118
|
32 bool comparescriptids(ScriptResult first, ScriptResult second){
|
samuel_trassare@14118
|
33 @@ -2625,5 +2626,6 @@
|
samuel_trassare@14118
|
34 else
|
samuel_trassare@14118
|
35 return false;
|
samuel_trassare@14118
|
36 }
|
samuel_trassare@14118
|
37 +#endif
|
samuel_trassare@14118
|
38
|
samuel_trassare@14118
|
39
|
samuel_trassare@14118
|
40 --- nmap-6.25.orig/portlist.cc 2012-10-11 12:45:50.000000000 +0800
|
samuel_trassare@14118
|
41 +++ nmap-6.25/portlist.cc 2012-12-02 10:51:28.930327962 +0800
|
samuel_trassare@14118
|
42 @@ -144,6 +144,7 @@
|
samuel_trassare@14118
|
43 }
|
samuel_trassare@14118
|
44 }
|
samuel_trassare@14118
|
45
|
samuel_trassare@14118
|
46 +#ifndef NOLUA
|
samuel_trassare@14118
|
47 void Port::freeScriptResults(void)
|
samuel_trassare@14118
|
48 {
|
samuel_trassare@14118
|
49 while (!scriptResults.empty()) {
|
samuel_trassare@14118
|
50 @@ -151,6 +152,7 @@
|
samuel_trassare@14118
|
51 scriptResults.pop_front();
|
samuel_trassare@14118
|
52 }
|
samuel_trassare@14118
|
53 }
|
samuel_trassare@14118
|
54 +#endif
|
samuel_trassare@14118
|
55
|
samuel_trassare@14118
|
56 /* Fills in namebuf (as long as there is space in buflen) with the
|
samuel_trassare@14118
|
57 Name nmap normal output will use to describe the port. This takes
|
samuel_trassare@14118
|
58 --- nmap-6.25.orig/Target.cc 2012-08-15 00:36:25.000000000 +0800
|
samuel_trassare@14118
|
59 +++ nmap-6.25/Target.cc 2012-12-02 10:55:28.097329636 +0800
|
samuel_trassare@14118
|
60 @@ -162,10 +162,12 @@
|
samuel_trassare@14118
|
61
|
samuel_trassare@14118
|
62 Target::~Target() {
|
samuel_trassare@14118
|
63 FreeInternal();
|
samuel_trassare@14118
|
64 +#ifndef NOLUA
|
samuel_trassare@14118
|
65 while (!scriptResults.empty()) {
|
samuel_trassare@14118
|
66 scriptResults.front().clear();
|
samuel_trassare@14118
|
67 scriptResults.pop_front();
|
samuel_trassare@14118
|
68 }
|
samuel_trassare@14118
|
69 +#endif
|
samuel_trassare@14118
|
70 }
|
samuel_trassare@14118
|
71
|
samuel_trassare@14118
|
72 void Target::FreeInternal() {
|