mirror of
https://github.com/nmap/nmap.git
synced 2025-12-07 05:01:29 +00:00
First commit from rpc-grind branch.
This commit is contained in:
@@ -96,11 +96,11 @@ NSE_OBJS+=nse_openssl.o nse_ssl_cert.o
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export SRCS = main.cc nmap.cc targets.cc tcpip.cc nmap_error.cc utils.cc idle_scan.cc osscan.cc osscan2.cc FPEngine.cc FPModel.cc output.cc payload.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 xml.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 FPEngine.cc FPModel.cc output.cc payload.cc scan_engine.cc timing.cc charpool.cc services.cc protocols.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 xml.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 FPEngine.h output.h payload.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 xml.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_tty.h nmap_winconfig.h osscan.h osscan2.h FPEngine.h output.h payload.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 xml.h $(NSE_HDRS)
|
||||||
|
|
||||||
OBJS = main.o nmap.o targets.o tcpip.o nmap_error.o utils.o idle_scan.o osscan.o osscan2.o FPEngine.o FPModel.o output.o payload.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 xml.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 FPEngine.o FPModel.o output.o payload.o scan_engine.o timing.o charpool.o services.o protocols.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 xml.o $(NSE_OBJS) @COMPAT_OBJS@
|
||||||
|
|
||||||
# %.o : %.cc -- nope this is a GNU extension
|
# %.o : %.cc -- nope this is a GNU extension
|
||||||
.cc.o:
|
.cc.o:
|
||||||
|
|||||||
@@ -320,6 +320,6 @@ struct scan_lists {
|
|||||||
int prot_count;
|
int prot_count;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef enum { STYPE_UNKNOWN, HOST_DISCOVERY, ACK_SCAN, SYN_SCAN, FIN_SCAN, XMAS_SCAN, UDP_SCAN, CONNECT_SCAN, NULL_SCAN, WINDOW_SCAN, SCTP_INIT_SCAN, SCTP_COOKIE_ECHO_SCAN, RPC_SCAN, MAIMON_SCAN, IPPROT_SCAN, PING_SCAN, PING_SCAN_ARP, IDLE_SCAN, BOUNCE_SCAN, SERVICE_SCAN, OS_SCAN, SCRIPT_PRE_SCAN, SCRIPT_SCAN, SCRIPT_POST_SCAN, TRACEROUTE, PING_SCAN_ND }stype;
|
typedef enum { STYPE_UNKNOWN, HOST_DISCOVERY, ACK_SCAN, SYN_SCAN, FIN_SCAN, XMAS_SCAN, UDP_SCAN, CONNECT_SCAN, NULL_SCAN, WINDOW_SCAN, SCTP_INIT_SCAN, SCTP_COOKIE_ECHO_SCAN, MAIMON_SCAN, IPPROT_SCAN, PING_SCAN, PING_SCAN_ARP, IDLE_SCAN, BOUNCE_SCAN, SERVICE_SCAN, OS_SCAN, SCRIPT_PRE_SCAN, SCRIPT_SCAN, SCRIPT_POST_SCAN, TRACEROUTE, PING_SCAN_ND }stype;
|
||||||
|
|
||||||
#endif /*GLOBAL_STRUCTURES_H */
|
#endif /*GLOBAL_STRUCTURES_H */
|
||||||
|
|||||||
10
nmap.cc
10
nmap.cc
@@ -1976,15 +1976,6 @@ int nmap_main(int argc, char *argv[]) {
|
|||||||
|
|
||||||
service_scan(Targets);
|
service_scan(Targets);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (o.servicescan) {
|
|
||||||
/* This scantype must be after any TCP or UDP scans since it
|
|
||||||
* get's it's port scan list from the open port list of the current
|
|
||||||
* host rather than port list the user specified.
|
|
||||||
*/
|
|
||||||
for(targetno = 0; targetno < Targets.size(); targetno++)
|
|
||||||
pos_scan(Targets[targetno], NULL, 0, RPC_SCAN);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (o.osscan){
|
if (o.osscan){
|
||||||
@@ -2716,7 +2707,6 @@ const char *scantype2str(stype scantype) {
|
|||||||
case WINDOW_SCAN: return "Window Scan"; break;
|
case WINDOW_SCAN: return "Window Scan"; break;
|
||||||
case SCTP_INIT_SCAN: return "SCTP INIT Scan"; break;
|
case SCTP_INIT_SCAN: return "SCTP INIT Scan"; break;
|
||||||
case SCTP_COOKIE_ECHO_SCAN: return "SCTP COOKIE-ECHO Scan"; break;
|
case SCTP_COOKIE_ECHO_SCAN: return "SCTP COOKIE-ECHO Scan"; break;
|
||||||
case RPC_SCAN: return "RPCGrind Scan"; break;
|
|
||||||
case MAIMON_SCAN: return "Maimon Scan"; break;
|
case MAIMON_SCAN: return "Maimon Scan"; break;
|
||||||
case IPPROT_SCAN: return "IPProto Scan"; break;
|
case IPPROT_SCAN: return "IPProto Scan"; break;
|
||||||
case PING_SCAN: return "Ping Scan"; break;
|
case PING_SCAN: return "Ping Scan"; break;
|
||||||
|
|||||||
Reference in New Issue
Block a user