Loading src/out-json.c +6 −4 Changes for src/out-json.c: 6 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -33,13 +33,14 @@ json_out_status(struct Output *out, FILE *fp, time_t timestamp, int status, { char reason_buffer[128]; UNUSEDPARM(out); UNUSEDPARM(timestamp); //UNUSEDPARM(timestamp); fprintf(fp, "{ "); 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\"," fprintf(fp, " \"timestamp\": \"%d\", \"ports\": [ {\"port\": %u, \"proto\": \"%s\", \"status\": \"%s\"," " \"reason\": \"%s\", \"ttl\": %u} ] ", (int) timestamp, port, name_from_ip_proto(ip_proto), status_string(status), Loading Loading @@ -98,12 +99,13 @@ json_out_banner(struct Output *out, FILE *fp, time_t timestamp, char banner_buffer[65536]; UNUSEDPARM(ttl); UNUSEDPARM(timestamp); //UNUSEDPARM(timestamp); fprintf(fp, "{ "); 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, " \"timestamp\": \"%d\", \"ports\": [ {\"port\": %u, \"proto\": \"%s\", \"service\": {\"name\": \"%s\", \"banner\": \"%s\"} } ] ", (int) timestamp, port, name_from_ip_proto(ip_proto), masscan_app_to_string(proto), Loading Loading
src/out-json.c +6 −4 Changes for src/out-json.c: 6 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -33,13 +33,14 @@ json_out_status(struct Output *out, FILE *fp, time_t timestamp, int status, { char reason_buffer[128]; UNUSEDPARM(out); UNUSEDPARM(timestamp); //UNUSEDPARM(timestamp); fprintf(fp, "{ "); 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\"," fprintf(fp, " \"timestamp\": \"%d\", \"ports\": [ {\"port\": %u, \"proto\": \"%s\", \"status\": \"%s\"," " \"reason\": \"%s\", \"ttl\": %u} ] ", (int) timestamp, port, name_from_ip_proto(ip_proto), status_string(status), Loading Loading @@ -98,12 +99,13 @@ json_out_banner(struct Output *out, FILE *fp, time_t timestamp, char banner_buffer[65536]; UNUSEDPARM(ttl); UNUSEDPARM(timestamp); //UNUSEDPARM(timestamp); fprintf(fp, "{ "); 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, " \"timestamp\": \"%d\", \"ports\": [ {\"port\": %u, \"proto\": \"%s\", \"service\": {\"name\": \"%s\", \"banner\": \"%s\"} } ] ", (int) timestamp, port, name_from_ip_proto(ip_proto), masscan_app_to_string(proto), Loading