Commit a43ab2bb authored by Francisco Blas Izquierdo Riera's avatar Francisco Blas Izquierdo Riera
Browse files

Fix port echoing

Previoulsy port ranges where echoed without the type which resulted in an error when trying to load the configuration file if using non TCP ports. This patch allows for full generation of prefixed ports to overcome this problem.
parent 32bd94b3
Loading
Loading
Loading
Loading
+35 −14
Changes for src/main-conf.c: 35 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@
#include <ctype.h>
#include <limits.h>

#define min(a,b) ((a)<(b)?(a):(b))

/***************************************************************************
 ***************************************************************************/
/*static struct Range top_ports_tcp[] = {
@@ -290,6 +292,7 @@ static void
masscan_echo(struct Masscan *masscan, FILE *fp)
{
    unsigned i;
    unsigned l = 0;

    fprintf(fp, "rate = %10.2f\n", masscan->max_rate);
    fprintf(fp, "randomize-hosts = true\n");
@@ -355,26 +358,44 @@ 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, "retries = %u\n", masscan->retries);
    fprintf(fp, "ports = ");
    /* Disable comma generation for the first element */
    l = 0;
    for (i=0; i<masscan->ports.count; i++) {
        struct Range range = masscan->ports.list[i];
        if (range.begin == range.end)
            fprintf(fp, "%u", range.begin);
        else
            fprintf(fp, "%u-%u", range.begin, range.end);
        if (i+1 < masscan->ports.count)
        do {
            struct Range rrange = range;
            unsigned done = 0;
            if (l)
                fprintf(fp, ",");
            l = 1;
            if (rrange.begin >= Templ_ICMP_echo) {
                rrange.begin -= Templ_ICMP_echo;
                rrange.end -= Templ_ICMP_echo;
                fprintf(fp,"I:");
                done = 1;
            } else if (rrange.begin >= Templ_SCTP) {
                rrange.begin -= Templ_SCTP;
                rrange.end -= Templ_SCTP;
                fprintf(fp,"S:");
                range.begin = Templ_ICMP_echo;
            } else if (rrange.begin >= Templ_UDP) {
                rrange.begin -= Templ_UDP;
                rrange.end -= Templ_UDP;
                fprintf(fp,"U:");
                range.begin = Templ_SCTP;
            } else
                range.begin = Templ_UDP;
            rrange.end = min(rrange.end, 65535);
            if (rrange.begin == rrange.end)
                fprintf(fp, "%u", rrange.begin);
            else
                fprintf(fp, "%u-%u", rrange.begin, rrange.end);
            if (done)
                break;
        } while (range.begin <= range.end);
    }
    fprintf(fp, "\n");
    for (i=0; i<masscan->targets.count; i++) {