Commit cfe47b70 authored by Robert David Graham's avatar Robert David Graham
Browse files

Merge pull request #103 from agreene5/master 

fixed bug where --echo didn't set ping = true for --ping scans
parents 2de317ad b299d5c6

src/main-conf.c

+11 −1
Original line number Diff line number Diff line
@@ -353,6 +353,16 @@ masscan_echo(struct Masscan *masscan, FILE *fp) 
    /*

     * Targets

     */



    for (i=0; i<masscan->ports.count; i++) {

	struct Range range = masscan->ports.list[i];

	if ( (range.begin == range.end) && (range.begin == Templ_ICMP_echo) )

		{

		fprintf(fp,"ping = true\n");

		break;

		}

    }



    fprintf(fp, "# TARGET SELECTION (IP, PORTS, EXCLUDES)\n");

    fprintf(fp, "ports = ");

    for (i=0; i<masscan->ports.count; i++) {
@@ -1152,7 +1162,7 @@ masscan_set_parameter(struct Masscan *masscan, 
        exit(1);

    } else if (EQUALS("echo", name)) {

        masscan_echo(masscan, stdout);

        exit(1);

        exit(0);

    } else if (EQUALS("excludefile", name)) {

        unsigned count1 = masscan->exclude_ip.count;

        unsigned count2;