aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

json-dns: sync field names with draft rfc2629

Browse Source 
This patch updates DNS field name to be in sync with RFC 2629:
 https://github.com/adulau/pdns-qof
This will allow to easily use Suricata with other passive DNS tools.
pull/810/head
Eric Leblond 12 years ago
parent 7a9efd74e4
commit eab0b7fae9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
src/output-json-dns.c
Unescape Escape View File

@ -120,14 +120,14 @@ static void LogQuery(LogDnsLogThread *aft, json_t *js, DNSTransaction *tx, DNSQu
/* query */ /* query */
char *c; char *c;
c = SCStrndup((char *)((char *)entry + sizeof(DNSQueryEntry)), entry->len); c = SCStrndup((char *)((char *)entry + sizeof(DNSQueryEntry)), entry->len);
json_object_set_new(djs, "query", json_string(c)); json_object_set_new(djs, "rrname", json_string(c));
if (c != NULL) if (c != NULL)
SCFree(c); SCFree(c);
/* name */ /* name */
char record[16] = ""; char record[16] = "";
CreateTypeString(entry->type, record, sizeof(record)); CreateTypeString(entry->type, record, sizeof(record));
json_object_set_new(djs, "record", json_string(record)); json_object_set_new(djs, "rrtype", json_string(record));
/* dns */ /* dns */
json_object_set_new(js, "dns", djs); json_object_set_new(js, "dns", djs);
@ -152,7 +152,7 @@ static void AppendAnswer(json_t *djs, DNSTransaction *tx, DNSAnswerEntry *entry)
char *c; char *c;
c = SCStrndup((char *)((char *)entry + sizeof(DNSAnswerEntry)), c = SCStrndup((char *)((char *)entry + sizeof(DNSAnswerEntry)),
entry->fqdn_len); entry->fqdn_len);
json_object_set_new(js, "query", json_string(c)); json_object_set_new(js, "rrname", json_string(c));
if (c != NULL) { if (c != NULL) {
SCFree(c); SCFree(c);
} }
@ -161,7 +161,7 @@ static void AppendAnswer(json_t *djs, DNSTransaction *tx, DNSAnswerEntry *entry)
/* name */ /* name */
char record[16] = ""; char record[16] = "";
CreateTypeString(entry->type, record, sizeof(record)); CreateTypeString(entry->type, record, sizeof(record));
json_object_set_new(js, "record", json_string(record)); json_object_set_new(js, "rrtype", json_string(record));
/* ttl */ /* ttl */
json_object_set_new(js, "ttl", json_integer(entry->ttl)); json_object_set_new(js, "ttl", json_integer(entry->ttl));
@ -170,13 +170,13 @@ static void AppendAnswer(json_t *djs, DNSTransaction *tx, DNSAnswerEntry *entry)
if (entry->type == DNS_RECORD_TYPE_A) { if (entry->type == DNS_RECORD_TYPE_A) {
char a[16] = ""; char a[16] = "";
PrintInet(AF_INET, (const void *)ptr, a, sizeof(a)); PrintInet(AF_INET, (const void *)ptr, a, sizeof(a));
json_object_set_new(js, "addr", json_string(a)); json_object_set_new(js, "rdata", json_string(a));
} else if (entry->type == DNS_RECORD_TYPE_AAAA) { } else if (entry->type == DNS_RECORD_TYPE_AAAA) {
char a[46] = ""; char a[46] = "";
PrintInet(AF_INET6, (const void *)ptr, a, sizeof(a)); PrintInet(AF_INET6, (const void *)ptr, a, sizeof(a));
json_object_set_new(js, "addr", json_string(a)); json_object_set_new(js, "rdata", json_string(a));
} else if (entry->data_len == 0) { } else if (entry->data_len == 0) {
json_object_set_new(js, "addr", json_string("")); json_object_set_new(js, "rdata", json_string(""));
} }
} }
json_array_append_new(djs, js); json_array_append_new(djs, js);

Write Preview
Loading…
Cancel
Save