From d073a1910507ec676041e30ea9aa3e63c6ff19b2 Mon Sep 17 00:00:00 2001
From: kris <kris@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 15 Aug 2007 19:26:26 +0000
Subject: [PATCH] Change reason.cc/h to portreasons.cc/h.  This is because of a
 reason.h on Windows which causes compilation problems.  A workaround was
 employed, but this is incase it pops up again.  I also changed the recent
 CHANGELOG entry mentioning reason.h so there's no confusion

---
 CHANGELOG                   | 2 +-
 Makefile.in                 | 6 +++---
 Target.h                    | 2 +-
 mswin32/nmap.vcproj         | 4 ++--
 output.cc                   | 2 +-
 portlist.h                  | 2 +-
 reason.cc => portreasons.cc | 4 ++--
 reason.h => portreasons.h   | 4 ++--
 scan_engine.cc              | 2 +-
 tcpip.cc                    | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)
 rename reason.cc => portreasons.cc (99%)
 rename reason.h => portreasons.h (98%)

diff --git a/CHANGELOG b/CHANGELOG
index 839a1426c..795667e56 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,7 +7,7 @@ o Fixed an output bug on systems like Windows which return -1 when
   vsnprintf is passed a too-small buffer rather than returning the
   size needed.  Thanks to jah (jah(a)zadkiel.plus.com) for the report.
 
-o Added sys/types.h include to reason.h to help OpenBSD compilation.  
+o Added sys/types.h include to portreasons.h to help OpenBSD compilation.  
   Thanks to Olivier Meyer for the patch.
 
 o Updated IANA assignment IP list for random IP (-iR) generation. [Kris]
diff --git a/Makefile.in b/Makefile.in
index ca709dd75..b71ee9bc5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,11 +62,11 @@ NSE_OBJS=nse_main.o nse_auxiliar.o nse_nsock.o nse_init.o nse_nmaplib.o nse_debu
 NSESTDLIB=nsestdlib
 endif
 
-export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc osscan2.cc output.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc nmap_tty.cc nmap_dns.cc traceroute.cc reason.cc $(NSE_SRC) @COMPAT_SRCS@
+export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc osscan2.cc output.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.cc nmap_rpc.cc portlist.cc NmapOps.cc TargetGroup.cc Target.cc FingerPrintResults.cc service_scan.cc NmapOutputTable.cc MACLookup.cc nmap_tty.cc nmap_dns.cc traceroute.cc portreasons.cc $(NSE_SRC) @COMPAT_SRCS@
 
-export HDRS = charpool.h FingerPrintResults.h global_structures.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h NmapOps.h NmapOutputTable.h nmap_rpc.h nmap_tty.h nmap_winconfig.h osscan.h osscan2.h output.h portlist.h protocols.h scan_engine.h service_scan.h services.h TargetGroup.h Target.h targets.h tcpip.h timing.h utils.h traceroute.h reason.h $(NSE_HDRS)
+export HDRS = charpool.h FingerPrintResults.h global_structures.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h NmapOps.h NmapOutputTable.h nmap_rpc.h nmap_tty.h nmap_winconfig.h osscan.h osscan2.h output.h portlist.h protocols.h scan_engine.h service_scan.h services.h TargetGroup.h Target.h targets.h tcpip.h timing.h utils.h traceroute.h portreasons.h $(NSE_HDRS)
 
-OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o osscan2.o output.o scan_engine.o timing.o charpool.o services.o protocols.o nmap_rpc.o portlist.o NmapOps.o TargetGroup.o Target.o FingerPrintResults.o service_scan.o NmapOutputTable.o MACLookup.o nmap_tty.o nmap_dns.o  traceroute.o reason.o $(NSE_OBJS) @COMPAT_OBJS@
+OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o osscan2.o output.o scan_engine.o timing.o charpool.o services.o protocols.o nmap_rpc.o portlist.o NmapOps.o TargetGroup.o Target.o FingerPrintResults.o service_scan.o NmapOutputTable.o MACLookup.o nmap_tty.o nmap_dns.o  traceroute.o portreasons.o $(NSE_OBJS) @COMPAT_OBJS@
 
 # %.o : %.cc -- nope this is a GNU extension
 .cc.o:
diff --git a/Target.h b/Target.h
index 6986a2d0a..50efed748 100644
--- a/Target.h
+++ b/Target.h
@@ -110,7 +110,7 @@
 #include "nse_main.h"
 #endif
 
-#include "reason.h"
+#include "portreasons.h"
 #include "portlist.h"
 #include "tcpip.h"
 
diff --git a/mswin32/nmap.vcproj b/mswin32/nmap.vcproj
index f271db204..42ab54a3f 100644
--- a/mswin32/nmap.vcproj
+++ b/mswin32/nmap.vcproj
@@ -310,7 +310,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\reason.cc"
+				RelativePath="..\portreasons.cc"
 				>
 			</File>
 			<File
@@ -495,7 +495,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\reason.h"
+				RelativePath="..\portreasons.h"
 				>
 			</File>
 			<File
diff --git a/output.cc b/output.cc
index 97b5ceb1c..41d6d74da 100644
--- a/output.cc
+++ b/output.cc
@@ -108,7 +108,7 @@
 #include "NmapOps.h"
 #include "NmapOutputTable.h"
 #include "MACLookup.h"
-#include "reason.h"
+#include "portreasons.h"
 #include "protocols.h"
 #include "nmap_rpc.h"
 #include "Target.h"
diff --git a/portlist.h b/portlist.h
index a849068eb..f3fc9df90 100644
--- a/portlist.h
+++ b/portlist.h
@@ -107,7 +107,7 @@
 #include "nse_main.h"
 #endif 
 
-#include "reason.h"
+#include "portreasons.h"
 
 /* port states */
 #define PORT_UNKNOWN 0
diff --git a/reason.cc b/portreasons.cc
similarity index 99%
rename from reason.cc
rename to portreasons.cc
index a31206063..68b50af37 100644
--- a/reason.cc
+++ b/portreasons.cc
@@ -1,5 +1,5 @@
 /***************************************************************************
- * reason.cc -- Verbose packet-level information on port states            *
+ * portreasons.cc -- Verbose packet-level information on port states       *
  *                                                                         *
  ***********************IMPORTANT NMAP LICENSE TERMS************************
  *                                                                         *
@@ -103,7 +103,7 @@
 #include "nmap.h"
 #include "portlist.h"
 #include "NmapOps.h"
-#include "reason.h"
+#include "portreasons.h"
 #include "Target.h"
 #ifdef WIN32
 #include "winfix.h"
diff --git a/reason.h b/portreasons.h
similarity index 98%
rename from reason.h
rename to portreasons.h
index f891c2f32..f9d648317 100644
--- a/reason.h
+++ b/portreasons.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- * reason.cc -- Verbose packet-level information on port states            *
+ * portreasons.h -- Verbose packet-level information on port states        *
  *                                                                         *
  ***********************IMPORTANT NMAP LICENSE TERMS************************
  *                                                                         *
@@ -132,7 +132,7 @@ typedef struct port_reason_summary {
 	struct port_reason_summary *next;
 } state_reason_summary_t;
 
-/* reason.h:reason_codes and reason.cc:reason_str must stay in sync */
+/* portreasons.h:reason_codes and portreasons.cc:reason_str must stay in sync */
 enum reason_codes {
 	ER_RESETPEER=0, ER_CONREFUSED, ER_CONACCEPT, 
 	ER_SYNACK, ER_UDPRESPONSE, ER_PROTORESPONSE, 
diff --git a/scan_engine.cc b/scan_engine.cc
index 1c7596fd3..25baf060e 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -103,7 +103,7 @@
 #ifdef WIN32
 #include "nmap_winconfig.h"
 #endif
-#include "reason.h"
+#include "portreasons.h"
 #include <dnet.h>
 #include "scan_engine.h"
 #include "timing.h"
diff --git a/tcpip.cc b/tcpip.cc
index f8178da3c..ac7adfa65 100644
--- a/tcpip.cc
+++ b/tcpip.cc
@@ -102,7 +102,7 @@
 #ifdef WIN32
 #include "nmap_winconfig.h"
 #endif
-#include "reason.h"
+#include "portreasons.h"
 #include <dnet.h>
 #include "tcpip.h"
 #include "NmapOps.h"