Loading src/in-binary.c +2 −2 Original line number Diff line number Diff line Loading @@ -43,7 +43,7 @@ parse_status(struct Output *out, record.ttl = buf[11]; /* * Now report ther result * Now report the result */ output_report_status(out, record.timestamp, Loading Loading @@ -90,7 +90,7 @@ parse_banner3(struct Output *out, unsigned char *buf, size_t buf_length) } /*************************************************************************** * Parse the BANNER record, extracting the timestamp, IP addres, and port * Parse the BANNER record, extracting the timestamp, IP address, and port * number. We also convert the banner string into a safer form. ***************************************************************************/ static void Loading src/main-conf.c +6 −6 Original line number Diff line number Diff line Loading @@ -327,7 +327,7 @@ masscan_save_state(struct Masscan *masscan) * There can be multiple ranges on a line, delimited by spaces. In fact, * millions of ranges can be on a line: there is limit to the line length. * That makes reading the file a little bit squirrelly. From one perspective * this parser doesn't treat the the new-line '\n' any different than other * this parser doesn't treat the new-line '\n' any different than other * space. But, from another perspective, it has to, because things like * comments are terminated by a newline. Also, it has to count the number * of lines correctly to print error messages. Loading Loading @@ -940,7 +940,7 @@ masscan_set_parameter(struct Masscan *masscan, unsigned value_length = (unsigned)strlen(value); unsigned char *newvalue; /* allcoate new value */ /* allocate new value */ newvalue = (unsigned char*)malloc(value_length+1); memcpy(newvalue, value, value_length+1); newvalue[value_length] = '\0'; Loading Loading @@ -1272,7 +1272,7 @@ masscan_help() " adapter-ip = 192.168.10.123\n" " adapter-mac = 00-11-22-33-44-55\n" " router-mac = 66-55-44-33-22-11\n" "All single-dash parameters have a spelled out double-dash equivelent,\n" "All single-dash parameters have a spelled out double-dash equivalent,\n" "so '-p80' is the same as '--ports 80' (or 'ports = 80' in config file).\n" "To use the config file, type:\n" " masscan -c <filename>\n" Loading Loading @@ -1414,7 +1414,7 @@ masscan_command_line(struct Masscan *masscan, int argc, char *argv[]) break; case 'R': /* -iR in nmap makes it randomize addresses completely. Thus, * it's nearest equivelent is scanning the entire Internet range */ * it's nearest equivalent is scanning the entire Internet range */ masscan_set_parameter(masscan, "include", "0.0.0.0/0"); break; default: Loading src/main.c +3 −3 Original line number Diff line number Diff line Loading @@ -156,7 +156,7 @@ struct ThreadPair { /*************************************************************************** * The recieve thread doesn't transmit packets. Instead, it queues them * The receive thread doesn't transmit packets. Instead, it queues them * up on the transmit thread. Every so often, the transmit thread needs * to flush this transmit queue and send everything. * Loading Loading @@ -354,7 +354,7 @@ infinite: * that index into some other, but unique/1-to-1, number in the * same range. That way we visit all targets, but in a random * order. Then, once we've shuffled the index, we "pick" the * the IP address and port that the index refers to. * IP address and port that the index refers to. */ xXx = (i + (r--) * rate); if (rate > range) Loading Loading @@ -1274,7 +1274,7 @@ int main(int argc, char *argv[]) * On non-Windows systems, read the defaults from the file in * the /etc directory. These defaults will contain things * like the output directory, max packet rates, and so on. Most * importanlty, the master "--excludefile" might be placed here, * importantly, the master "--excludefile" might be placed here, * so that blacklisted ranges won't be scanned, even if the user * makes a mistake */ Loading src/masscan.h +3 −3 Original line number Diff line number Diff line Loading @@ -70,8 +70,8 @@ struct Masscan struct RangeList ports; /** * IPv4 addresses/ranges that are to be exluded from the scan. This teakes * precendence over any 'include' statement * IPv4 addresses/ranges that are to be exluded from the scan. This takes * precedence over any 'include' statement */ struct RangeList exclude_ip; struct RangeList exclude_port; Loading Loading @@ -145,7 +145,7 @@ struct Masscan unsigned ttl; /* starting IP TTL field */ unsigned badsum; /* bad TCP/UDP/SCTP checksum */ /* ouput options */ /* output options */ unsigned packet_trace:1; /* print transmit messages */ unsigned open_only:1; /* show only open ports */ unsigned reason; /* print reason port is open, which is redundant for us */ Loading src/output.c +7 −7 Original line number Diff line number Diff line Loading @@ -235,7 +235,7 @@ close_rotate(struct Output *out, FILE *fp) /***************************************************************************** * Returns the time when the next rotate should occur. Rotations are * aligned to the period, which means that if you rotate hourly, it's done * on the hour every hour, like at 9:00:00 oclock exactly. In other words, * on the hour every hour, like at 9:00:00 o'clock exactly. In other words, * a period of "hourly" doesn't really mean "every 60 minutes", but * on the hour". Since the program will be launched midway in a period, * that means the first rotation will happen in less than a full period. Loading Loading @@ -390,7 +390,7 @@ output_create(const struct Masscan *masscan, unsigned thread_index) } /* * Link the the appropriate output module. * Link the appropriate output module. * TODO: support multiple output modules */ out->format = masscan->nmap.format; Loading @@ -417,7 +417,7 @@ output_create(const struct Masscan *masscan, unsigned thread_index) /* * Open the desired output file. We do this now at the start of the scan * so that we can immediatley notify the user of an error, rather than * so that we can immediately notify the user of an error, rather than * waiting midway through a long scan and have it fail. */ if (masscan->nmap.filename[0] && out->funcs != &null_output) { Loading Loading @@ -644,7 +644,7 @@ output_report_status(struct Output *out, time_t timestamp, int status, return; /* Rotate, if we've pass the time limit. Rotating the log files happens * inline while writing output, whenever there's ouitput to write to the * inline while writing output, whenever there's output to write to the * file, rather than in a separate thread right at the time interval. * Thus, if results are coming in slowly, the rotation won't happen * on precise boundaries */ Loading Loading @@ -740,7 +740,7 @@ output_report_banner(struct Output *out, time_t now, return; /* Rotate, if we've pass the time limit. Rotating the log files happens * inline while writing output, whenever there's ouitput to write to the * inline while writing output, whenever there's output to write to the * file, rather than in a separate thread right at the time interval. * Thus, if results are coming in slowly, the rotation won't happen * on precise boundaries */ Loading Loading
src/in-binary.c +2 −2 Original line number Diff line number Diff line Loading @@ -43,7 +43,7 @@ parse_status(struct Output *out, record.ttl = buf[11]; /* * Now report ther result * Now report the result */ output_report_status(out, record.timestamp, Loading Loading @@ -90,7 +90,7 @@ parse_banner3(struct Output *out, unsigned char *buf, size_t buf_length) } /*************************************************************************** * Parse the BANNER record, extracting the timestamp, IP addres, and port * Parse the BANNER record, extracting the timestamp, IP address, and port * number. We also convert the banner string into a safer form. ***************************************************************************/ static void Loading
src/main-conf.c +6 −6 Original line number Diff line number Diff line Loading @@ -327,7 +327,7 @@ masscan_save_state(struct Masscan *masscan) * There can be multiple ranges on a line, delimited by spaces. In fact, * millions of ranges can be on a line: there is limit to the line length. * That makes reading the file a little bit squirrelly. From one perspective * this parser doesn't treat the the new-line '\n' any different than other * this parser doesn't treat the new-line '\n' any different than other * space. But, from another perspective, it has to, because things like * comments are terminated by a newline. Also, it has to count the number * of lines correctly to print error messages. Loading Loading @@ -940,7 +940,7 @@ masscan_set_parameter(struct Masscan *masscan, unsigned value_length = (unsigned)strlen(value); unsigned char *newvalue; /* allcoate new value */ /* allocate new value */ newvalue = (unsigned char*)malloc(value_length+1); memcpy(newvalue, value, value_length+1); newvalue[value_length] = '\0'; Loading Loading @@ -1272,7 +1272,7 @@ masscan_help() " adapter-ip = 192.168.10.123\n" " adapter-mac = 00-11-22-33-44-55\n" " router-mac = 66-55-44-33-22-11\n" "All single-dash parameters have a spelled out double-dash equivelent,\n" "All single-dash parameters have a spelled out double-dash equivalent,\n" "so '-p80' is the same as '--ports 80' (or 'ports = 80' in config file).\n" "To use the config file, type:\n" " masscan -c <filename>\n" Loading Loading @@ -1414,7 +1414,7 @@ masscan_command_line(struct Masscan *masscan, int argc, char *argv[]) break; case 'R': /* -iR in nmap makes it randomize addresses completely. Thus, * it's nearest equivelent is scanning the entire Internet range */ * it's nearest equivalent is scanning the entire Internet range */ masscan_set_parameter(masscan, "include", "0.0.0.0/0"); break; default: Loading
src/main.c +3 −3 Original line number Diff line number Diff line Loading @@ -156,7 +156,7 @@ struct ThreadPair { /*************************************************************************** * The recieve thread doesn't transmit packets. Instead, it queues them * The receive thread doesn't transmit packets. Instead, it queues them * up on the transmit thread. Every so often, the transmit thread needs * to flush this transmit queue and send everything. * Loading Loading @@ -354,7 +354,7 @@ infinite: * that index into some other, but unique/1-to-1, number in the * same range. That way we visit all targets, but in a random * order. Then, once we've shuffled the index, we "pick" the * the IP address and port that the index refers to. * IP address and port that the index refers to. */ xXx = (i + (r--) * rate); if (rate > range) Loading Loading @@ -1274,7 +1274,7 @@ int main(int argc, char *argv[]) * On non-Windows systems, read the defaults from the file in * the /etc directory. These defaults will contain things * like the output directory, max packet rates, and so on. Most * importanlty, the master "--excludefile" might be placed here, * importantly, the master "--excludefile" might be placed here, * so that blacklisted ranges won't be scanned, even if the user * makes a mistake */ Loading
src/masscan.h +3 −3 Original line number Diff line number Diff line Loading @@ -70,8 +70,8 @@ struct Masscan struct RangeList ports; /** * IPv4 addresses/ranges that are to be exluded from the scan. This teakes * precendence over any 'include' statement * IPv4 addresses/ranges that are to be exluded from the scan. This takes * precedence over any 'include' statement */ struct RangeList exclude_ip; struct RangeList exclude_port; Loading Loading @@ -145,7 +145,7 @@ struct Masscan unsigned ttl; /* starting IP TTL field */ unsigned badsum; /* bad TCP/UDP/SCTP checksum */ /* ouput options */ /* output options */ unsigned packet_trace:1; /* print transmit messages */ unsigned open_only:1; /* show only open ports */ unsigned reason; /* print reason port is open, which is redundant for us */ Loading
src/output.c +7 −7 Original line number Diff line number Diff line Loading @@ -235,7 +235,7 @@ close_rotate(struct Output *out, FILE *fp) /***************************************************************************** * Returns the time when the next rotate should occur. Rotations are * aligned to the period, which means that if you rotate hourly, it's done * on the hour every hour, like at 9:00:00 oclock exactly. In other words, * on the hour every hour, like at 9:00:00 o'clock exactly. In other words, * a period of "hourly" doesn't really mean "every 60 minutes", but * on the hour". Since the program will be launched midway in a period, * that means the first rotation will happen in less than a full period. Loading Loading @@ -390,7 +390,7 @@ output_create(const struct Masscan *masscan, unsigned thread_index) } /* * Link the the appropriate output module. * Link the appropriate output module. * TODO: support multiple output modules */ out->format = masscan->nmap.format; Loading @@ -417,7 +417,7 @@ output_create(const struct Masscan *masscan, unsigned thread_index) /* * Open the desired output file. We do this now at the start of the scan * so that we can immediatley notify the user of an error, rather than * so that we can immediately notify the user of an error, rather than * waiting midway through a long scan and have it fail. */ if (masscan->nmap.filename[0] && out->funcs != &null_output) { Loading Loading @@ -644,7 +644,7 @@ output_report_status(struct Output *out, time_t timestamp, int status, return; /* Rotate, if we've pass the time limit. Rotating the log files happens * inline while writing output, whenever there's ouitput to write to the * inline while writing output, whenever there's output to write to the * file, rather than in a separate thread right at the time interval. * Thus, if results are coming in slowly, the rotation won't happen * on precise boundaries */ Loading Loading @@ -740,7 +740,7 @@ output_report_banner(struct Output *out, time_t now, return; /* Rotate, if we've pass the time limit. Rotating the log files happens * inline while writing output, whenever there's ouitput to write to the * inline while writing output, whenever there's output to write to the * file, rather than in a separate thread right at the time interval. * Thus, if results are coming in slowly, the rotation won't happen * on precise boundaries */ Loading