PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 06:01:28 +00:00
Code Issues Projects Releases Wiki Activity

Whitespace.

Browse Source
This commit is contained in:
david
2010-11-09 18:48:49 +00:00
parent 9cfac77247
commit 6f370e012d
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
output.cc
View File

@@ -269,7 +269,7 @@ static void print_iflist_pcap_mapping(const struct interface_info *iflist,
/* Build a list of "leftover" libpcap interfaces. Initially it contains all /* Build a list of "leftover" libpcap interfaces. Initially it contains all
the interfaces. */ the interfaces. */
pcap_ifs = getpcapinterfaces(); pcap_ifs = getpcapinterfaces();
for (const pcap_if_t * p = pcap_ifs; p != NULL; p = p->next) for (const pcap_if_t *p = pcap_ifs; p != NULL; p = p->next)
leftover_pcap_ifs.push_front(p); leftover_pcap_ifs.push_front(p);
if (numifs > 0 || !leftover_pcap_ifs.empty()) { if (numifs > 0 || !leftover_pcap_ifs.empty()) {
@@ -461,7 +461,7 @@ static char *formatScriptOutput(ScriptResult sr) {
ports found on the machine. It also handles the Machine/Greppable ports found on the machine. It also handles the Machine/Greppable
output and the XML output. It is pretty ugly -- in particular I output and the XML output. It is pretty ugly -- in particular I
should write helper functions to handle the table creation */ should write helper functions to handle the table creation */
void printportoutput(Target * currenths, PortList * plist) { void printportoutput(Target *currenths, PortList *plist) {
char protocol[MAX_IPPROTOSTRLEN + 1]; char protocol[MAX_IPPROTOSTRLEN + 1];
char rpcinfo[64]; char rpcinfo[64];
char rpcmachineinfo[64]; char rpcmachineinfo[64];
@@ -1224,7 +1224,7 @@ void output_xml_scaninfo_records(struct scan_lists *scanlist) {
} }
/* Prints the MAC address (if discovered) to XML output */ /* Prints the MAC address (if discovered) to XML output */
static void print_MAC_XML_Info(Target * currenths) { static void print_MAC_XML_Info(Target *currenths) {
const u8 *mac = currenths->MACAddress(); const u8 *mac = currenths->MACAddress();
char macascii[32]; char macascii[32];
@@ -1343,7 +1343,7 @@ void write_host_header(Target *currenths) {
example is "Host: 10.11.12.13 (foo.bar.example.com)\tStatus: Up\n" to example is "Host: 10.11.12.13 (foo.bar.example.com)\tStatus: Up\n" to
machine log. resolve_all should be passed nonzero if the user asked machine log. resolve_all should be passed nonzero if the user asked
for all hosts (even down ones) to be resolved */ for all hosts (even down ones) to be resolved */
void write_host_status(Target * currenths, int resolve_all) { void write_host_status(Target *currenths, int resolve_all) {
if (o.listscan) { if (o.listscan) {
/* write "unknown" to machine and xml */ /* write "unknown" to machine and xml */
log_write(LOG_MACHINE, "Host: %s (%s)\tStatus: Unknown\n", log_write(LOG_MACHINE, "Host: %s (%s)\tStatus: Unknown\n",
@@ -1538,7 +1538,7 @@ static void printosclassificationoutput(const struct
network. This only prints to human output -- XML is handled by a network. This only prints to human output -- XML is handled by a
separate call ( print_MAC_XML_Info ) because it needs to be printed separate call ( print_MAC_XML_Info ) because it needs to be printed
in a certain place to conform to DTD. */ in a certain place to conform to DTD. */
void printmacinfo(Target * currenths) { void printmacinfo(Target *currenths) {
const u8 *mac = currenths->MACAddress(); const u8 *mac = currenths->MACAddress();
char macascii[32]; char macascii[32];
@@ -1554,8 +1554,8 @@ void printmacinfo(Target * currenths) {
/* A convenience wrapper around mergeFPs. */ /* A convenience wrapper around mergeFPs. */
static const char *merge_fpr(const FingerPrintResults * FPR, static const char *merge_fpr(const FingerPrintResults *FPR,
const Target * currenths, const Target *currenths,
bool isGoodFP, bool wrapit) { bool isGoodFP, bool wrapit) {
return mergeFPs(FPR->FPs, FPR->numFPs, isGoodFP, currenths->v4hostip(), return mergeFPs(FPR->FPs, FPR->numFPs, isGoodFP, currenths->v4hostip(),
currenths->distance, currenths->distance,
@@ -1565,8 +1565,8 @@ static const char *merge_fpr(const FingerPrintResults * FPR,
wrapit); wrapit);
} }
static void write_merged_fpr(const FingerPrintResults * FPR, static void write_merged_fpr(const FingerPrintResults *FPR,
const Target * currenths, const Target *currenths,
bool isGoodFP, bool wrapit) { bool isGoodFP, bool wrapit) {
log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT, log_write(LOG_NORMAL | LOG_SKID_NOXLT | LOG_STDOUT,
"TCP/IP fingerprint:\n%s\n", "TCP/IP fingerprint:\n%s\n",
@@ -1582,7 +1582,7 @@ static void write_merged_fpr(const FingerPrintResults * FPR,
/* Prints the formatted OS Scan output to stdout, logfiles, etc (but only /* Prints the formatted OS Scan output to stdout, logfiles, etc (but only
if an OS Scan was performed).*/ if an OS Scan was performed).*/
void printosscanoutput(Target * currenths) { void printosscanoutput(Target *currenths) {
int i; int i;
char numlst[512]; /* For creating lists of numbers */ char numlst[512]; /* For creating lists of numbers */
char *p; /* Used in manipulating numlst above */ char *p; /* Used in manipulating numlst above */
@@ -1824,7 +1824,7 @@ static int hostcmp(const char *a, const char *b) {
/* Prints the alternate hostname/OS/device information we got from the service /* Prints the alternate hostname/OS/device information we got from the service
scan (if it was performed) */ scan (if it was performed) */
void printserviceinfooutput(Target * currenths) { void printserviceinfooutput(Target *currenths) {
Port *p = NULL; Port *p = NULL;
Port port; Port port;
struct serviceDeductions sd; struct serviceDeductions sd;
@@ -1925,7 +1925,7 @@ void printserviceinfooutput(Target * currenths) {
} }
#ifndef NOLUA #ifndef NOLUA
void printscriptresults(ScriptResults * scriptResults, stype scantype) { void printscriptresults(ScriptResults *scriptResults, stype scantype) {
ScriptResults::iterator iter; ScriptResults::iterator iter;
char *script_output; char *script_output;
@@ -1954,7 +1954,7 @@ void printscriptresults(ScriptResults * scriptResults, stype scantype) {
} }
} }
void printhostscriptresults(Target * currenths) { void printhostscriptresults(Target *currenths) {
ScriptResults::iterator iter; ScriptResults::iterator iter;
char *script_output; char *script_output;
@@ -1978,7 +1978,7 @@ void printhostscriptresults(Target * currenths) {
#endif #endif
/* Print a table with traceroute hops. */ /* Print a table with traceroute hops. */
static void printtraceroute_normal(Target * currenths) { static void printtraceroute_normal(Target *currenths) {
static const int HOP_COL = 0, RTT_COL = 1, HOST_COL = 2; static const int HOP_COL = 0, RTT_COL = 1, HOST_COL = 2;
NmapOutputTable Tbl(currenths->traceroute_hops.size() + 1, 3); NmapOutputTable Tbl(currenths->traceroute_hops.size() + 1, 3);
struct probespec probe; struct probespec probe;
@@ -2085,7 +2085,7 @@ static void printtraceroute_normal(Target * currenths) {
log_flush(LOG_PLAIN); log_flush(LOG_PLAIN);
} }
static void printtraceroute_xml(Target * currenths) { static void printtraceroute_xml(Target *currenths) {
struct probespec probe; struct probespec probe;
list<TracerouteHop>::iterator it; list<TracerouteHop>::iterator it;
@@ -2140,7 +2140,7 @@ static void printtraceroute_xml(Target * currenths) {
log_flush(LOG_XML); log_flush(LOG_XML);
} }
void printtraceroute(Target * currenths) { void printtraceroute(Target *currenths) {
printtraceroute_normal(currenths); printtraceroute_normal(currenths);
printtraceroute_xml(currenths); printtraceroute_xml(currenths);
} }