Commit 268b848b authored by Robert David Graham's avatar Robert David Graham
Browse files
parent a6140312
Loading
Loading
Loading
Loading
+4 −2
Changes for src/main-conf.c: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1382,8 +1382,10 @@ masscan_set_parameter(struct Masscan *masscan,
        exit(1);
    } else if (EQUALS("output-format", name)) {
        enum OutputFormat x = 0;
        if (EQUALS("interactive", value))
            masscan->output.format = Output_Interactive;
        if (EQUALS("unknown(0)", value)) {
            x = Output_Interactive;
        }
        else if (EQUALS("interactive", value))  x = Output_Interactive;
        else if (EQUALS("list", value))         x = Output_List;
        else if (EQUALS("unicornscan", value))  x = Output_Unicornscan;
        else if (EQUALS("xml", value))          x = Output_XML;
+4 −1
Changes for src/masscan.h: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -288,7 +288,10 @@ struct Masscan
    
        /**
         * --interactive
         * Print to command-line while also writing to output file
         * Print to command-line while also writing to output file. This isn't
         * needed if the output format is already 'interactive' (the default),
         * but only if the default output format is anything else, and the
         * user also wants interactivity.
         */
        unsigned is_interactive:1;
        
+2 −2
Changes for src/output.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ output_report_status(struct Output *out, time_t timestamp, int status,

    /* If in "--interactive" mode, then print the banner to the command
     * line screen */
    if (out->is_interactive || out->format == 0) {
    if (out->is_interactive || out->format == 0 || out->format == Output_Interactive) {
        unsigned count;

        count = fprintf(stdout, "Discovered %s port %u/%s on %u.%u.%u.%u",
@@ -800,7 +800,7 @@ output_report_banner(struct Output *out, time_t now,

    /* If in "--interactive" mode, then print the banner to the command
     * line screen */
    if (out->is_interactive || out->format == 0) {
    if (out->is_interactive || out->format == 0 || out->format == Output_Interactive) {
        unsigned count;
        char banner_buffer[4096];