Commit 1139b399 authored by Robert David Graham's avatar Robert David Graham
Browse files

Merge pull request #111 from LukeBeer/master

JSON names/keys are now quoted to be strings in output
parents 4692c303 34e43606
Loading
Loading
Loading
Loading
+5 −5
Changes for src/out-json.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ json_out_status(struct Output *out, FILE *fp, time_t timestamp, int status,
    UNUSEDPARM(timestamp);
    
    fprintf(fp, "{ ");
    fprintf(fp, "  ip: \"%u.%u.%u.%u\", ", 
    fprintf(fp, "  \"ip\": \"%u.%u.%u.%u\", ", 
            (ip>>24)&0xFF, (ip>>16)&0xFF, (ip>> 8)&0xFF, (ip>> 0)&0xFF);
    fprintf(fp, "  ports: [ {port: %u, proto: \"%s\", status: \"%s\","
                " reason: \"%s\", ttl: %u} ] ",
    fprintf(fp, "  \"ports\": [ {\"port\": %u, \"proto\": \"%s\", \"status\": \"%s\","
                " \"reason\": \"%s\", \"ttl\": %u} ] ",
                port,
                name_from_ip_proto(ip_proto),
                status_string(status),
@@ -101,9 +101,9 @@ json_out_banner(struct Output *out, FILE *fp, time_t timestamp,
    UNUSEDPARM(timestamp);
    
    fprintf(fp, "{ ");
    fprintf(fp, "  ip: \"%u.%u.%u.%u\", ", 
    fprintf(fp, "  \"ip\": \"%u.%u.%u.%u\", ", 
            (ip>>24)&0xFF, (ip>>16)&0xFF, (ip>> 8)&0xFF, (ip>> 0)&0xFF);
    fprintf(fp, "  ports: [ {port: %u, proto: \"%s\", service: {name: \"%s\", banner: \"%s\"} } ] ",
    fprintf(fp, "  \"ports\": [ {\"port\": %u, \"proto\": \"%s\", \"service\": {\"name\": \"%s\", \"banner\": \"%s\"} } ] ",
            port,
            name_from_ip_proto(ip_proto),
            masscan_app_to_string(proto),