PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-04 13:49:03 +00:00
Code Issues Projects Releases Wiki Activity

Move some functions to more appropriate files

Browse Source
This commit is contained in:
dmiller
2017-08-02 05:10:19 +00:00
parent b70ee4f531
commit 31dd0876a4
5 changed files with 139 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
nmap.cc
View File

@@ -2453,143 +2453,6 @@ int gather_logfile_resumption_state(char *fname, int *myargc, char ***myargv) {
}
void free_scan_lists(struct scan_lists *ports) {
if (ports->tcp_ports)
free(ports->tcp_ports);
if (ports->udp_ports)
free(ports->udp_ports);
if (ports->sctp_ports)
free(ports->sctp_ports);
if (ports->prots)
free(ports->prots);
if (ports->syn_ping_ports)
free(ports->syn_ping_ports);
if (ports->ack_ping_ports)
free(ports->ack_ping_ports);
if (ports->udp_ping_ports)
free(ports->udp_ping_ports);
if (ports->proto_ping_ports)
free(ports->proto_ping_ports);
}
/* Just a routine for obtaining a string for printing based on the scantype */
const char *scantype2str(stype scantype) {
switch (scantype) {
case STYPE_UNKNOWN:
return "Unknown Scan Type";
break;
case HOST_DISCOVERY:
return "Host Discovery";
break;
case ACK_SCAN:
return "ACK Scan";
break;
case SYN_SCAN:
return "SYN Stealth Scan";
break;
case FIN_SCAN:
return "FIN Scan";
break;
case XMAS_SCAN:
return "XMAS Scan";
break;
case UDP_SCAN:
return "UDP Scan";
break;
case CONNECT_SCAN:
return "Connect Scan";
break;
case NULL_SCAN:
return "NULL Scan";
break;
case WINDOW_SCAN:
return "Window Scan";
break;
case SCTP_INIT_SCAN:
return "SCTP INIT Scan";
break;
case SCTP_COOKIE_ECHO_SCAN:
return "SCTP COOKIE-ECHO Scan";
break;
case MAIMON_SCAN:
return "Maimon Scan";
break;
case IPPROT_SCAN:
return "IPProto Scan";
break;
case PING_SCAN:
return "Ping Scan";
break;
case PING_SCAN_ARP:
return "ARP Ping Scan";
break;
case PING_SCAN_ND:
return "ND Ping Scan";
break;
case IDLE_SCAN:
return "Idle Scan";
break;
case BOUNCE_SCAN:
return "Bounce Scan";
break;
case SERVICE_SCAN:
return "Service Scan";
break;
case OS_SCAN:
return "OS Scan";
break;
case SCRIPT_PRE_SCAN:
return "Script Pre-Scan";
break;
case SCRIPT_SCAN:
return "Script Scan";
break;
case SCRIPT_POST_SCAN:
return "Script Post-Scan";
break;
case TRACEROUTE:
return "Traceroute" ;
break;
default:
assert(0);
break;
}
return NULL; /* Unreached */
}
const char *statenum2str(int state) {
switch (state) {
case PORT_OPEN:
return "open";
break;
case PORT_FILTERED:
return "filtered";
break;
case PORT_UNFILTERED:
return "unfiltered";
break;
case PORT_CLOSED:
return "closed";
break;
case PORT_OPENFILTERED:
return "open|filtered";
break;
case PORT_CLOSEDFILTERED:
return "closed|filtered";
break;
default:
return "unknown";
break;
}
return "unknown";
}
static char *executable_dir(const char *argv0) {
char *path, *dir;

28
portlist.cc
View File

@@ -977,3 +977,31 @@ void random_port_cheat(u16 *ports, int portcount) {
}
}
}
const char *statenum2str(int state) {
switch (state) {
case PORT_OPEN:
return "open";
break;
case PORT_FILTERED:
return "filtered";
break;
case PORT_UNFILTERED:
return "unfiltered";
break;
case PORT_CLOSED:
return "closed";
break;
case PORT_OPENFILTERED:
return "open|filtered";
break;
case PORT_CLOSEDFILTERED:
return "closed|filtered";
break;
default:
return "unknown";
break;
}
return "unknown";
}

1
portlist.h
View File

@@ -153,6 +153,7 @@
#define PORT_CLOSEDFILTERED 8 /* Idle scan */
#define PORT_HIGHEST_STATE 9 /* ***IMPORTANT -- BUMP THIS UP WHEN STATES ARE
ADDED *** */
const char *statenum2str(int state);
#define TCPANDUDPANDSCTP IPPROTO_MAX
#define UDPANDSCTP (IPPROTO_MAX + 1)

110
scan_lists.cc
View File

@@ -573,3 +573,113 @@ static void getpts_aux(const char *origexpr, int nested, u8 *porttbl, int range_
} while (current_range && *current_range);
}
void free_scan_lists(struct scan_lists *ports) {
if (ports->tcp_ports)
free(ports->tcp_ports);
if (ports->udp_ports)
free(ports->udp_ports);
if (ports->sctp_ports)
free(ports->sctp_ports);
if (ports->prots)
free(ports->prots);
if (ports->syn_ping_ports)
free(ports->syn_ping_ports);
if (ports->ack_ping_ports)
free(ports->ack_ping_ports);
if (ports->udp_ping_ports)
free(ports->udp_ping_ports);
if (ports->proto_ping_ports)
free(ports->proto_ping_ports);
}
/* Just a routine for obtaining a string for printing based on the scantype */
const char *scantype2str(stype scantype) {
switch (scantype) {
case STYPE_UNKNOWN:
return "Unknown Scan Type";
break;
case HOST_DISCOVERY:
return "Host Discovery";
break;
case ACK_SCAN:
return "ACK Scan";
break;
case SYN_SCAN:
return "SYN Stealth Scan";
break;
case FIN_SCAN:
return "FIN Scan";
break;
case XMAS_SCAN:
return "XMAS Scan";
break;
case UDP_SCAN:
return "UDP Scan";
break;
case CONNECT_SCAN:
return "Connect Scan";
break;
case NULL_SCAN:
return "NULL Scan";
break;
case WINDOW_SCAN:
return "Window Scan";
break;
case SCTP_INIT_SCAN:
return "SCTP INIT Scan";
break;
case SCTP_COOKIE_ECHO_SCAN:
return "SCTP COOKIE-ECHO Scan";
break;
case MAIMON_SCAN:
return "Maimon Scan";
break;
case IPPROT_SCAN:
return "IPProto Scan";
break;
case PING_SCAN:
return "Ping Scan";
break;
case PING_SCAN_ARP:
return "ARP Ping Scan";
break;
case PING_SCAN_ND:
return "ND Ping Scan";
break;
case IDLE_SCAN:
return "Idle Scan";
break;
case BOUNCE_SCAN:
return "Bounce Scan";
break;
case SERVICE_SCAN:
return "Service Scan";
break;
case OS_SCAN:
return "OS Scan";
break;
case SCRIPT_PRE_SCAN:
return "Script Pre-Scan";
break;
case SCRIPT_SCAN:
return "Script Scan";
break;
case SCRIPT_POST_SCAN:
return "Script Post-Scan";
break;
case TRACEROUTE:
return "Traceroute" ;
break;
default:
assert(0);
break;
}
return NULL; /* Unreached */
}

1
scan_lists.h
View File

@@ -192,7 +192,6 @@ void removepts(const char *expr, struct scan_lists * ports);
void free_scan_lists(struct scan_lists *ports);
/* general helper functions */
const char *statenum2str(int state);
const char *scantype2str(stype scantype);
#endif /* SCAN_LISTS_H */