dns: use nonnull attr for log functions

diff --git a/src/output-json-dns.c b/src/output-json-dns.c
index 42fa975b3549fcaf35f6295cea2a31f50c06603b..daa545ee0114c67b9849ac602039b77e17311a61 100644 (file)
--- a/src/output-json-dns.c
+++ b/src/output-json-dns.c
@@ -386,13 +386,15 @@ static int DNSRRTypeEnabled(uint16_t type, uint64_t flags)
     }
 }
 
+static void LogQuery(LogDnsLogThread *aft, json_t *js, DNSTransaction *tx,
+        uint64_t tx_id, DNSQueryEntry *entry) __attribute__((nonnull));
+
 static void LogQuery(LogDnsLogThread *aft, json_t *js, DNSTransaction *tx,
         uint64_t tx_id, DNSQueryEntry *entry)
 {
     SCLogDebug("got a DNS request and now logging !!");
 
-    if (entry != NULL &&
-            !DNSRRTypeEnabled(entry->type, aft->dnslog_ctx->flags)) {
+    if (!DNSRRTypeEnabled(entry->type, aft->dnslog_ctx->flags)) {
         return;
     }
 
@@ -432,10 +434,13 @@ static void LogQuery(LogDnsLogThread *aft, json_t *js, DNSTransaction *tx,
     json_object_del(js, "dns");
 }
 
-static void OutputAnswer(LogDnsLogThread *aft, json_t *djs, DNSTransaction *tx, DNSAnswerEntry *entry)
+static void OutputAnswer(LogDnsLogThread *aft, json_t *djs,
+        DNSTransaction *tx, DNSAnswerEntry *entry) __attribute__((nonnull));
+
+static void OutputAnswer(LogDnsLogThread *aft, json_t *djs,
+        DNSTransaction *tx, DNSAnswerEntry *entry)
 {
-    if (entry != NULL &&
-            !DNSRRTypeEnabled(entry->type, aft->dnslog_ctx->flags)) {
+    if (!DNSRRTypeEnabled(entry->type, aft->dnslog_ctx->flags)) {
         return;
     }
 
@@ -454,82 +459,79 @@ static void OutputAnswer(LogDnsLogThread *aft, json_t *djs, DNSTransaction *tx,
     DNSCreateRcodeString(tx->rcode, rcode, sizeof(rcode));
     json_object_set_new(js, "rcode", json_string(rcode));
 
-    /* we are logging an answer RR */
-    if (entry != NULL) {
-        /* query */
-        if (entry->fqdn_len > 0) {
-            char *c;
-            c = BytesToString((uint8_t *)((uint8_t *)entry + sizeof(DNSAnswerEntry)),
-                    entry->fqdn_len);
-            if (c != NULL) {
-                json_object_set_new(js, "rrname", json_string(c));
-                SCFree(c);
-            }
+    /* query */
+    if (entry->fqdn_len > 0) {
+        char *c;
+        c = BytesToString((uint8_t *)((uint8_t *)entry + sizeof(DNSAnswerEntry)),
+                entry->fqdn_len);
+        if (c != NULL) {
+            json_object_set_new(js, "rrname", json_string(c));
+            SCFree(c);
         }
+    }
 
-        /* name */
-        char record[16] = "";
-        DNSCreateTypeString(entry->type, record, sizeof(record));
-        json_object_set_new(js, "rrtype", json_string(record));
-
-        /* ttl */
-        json_object_set_new(js, "ttl", json_integer(entry->ttl));
-
-        uint8_t *ptr = (uint8_t *)((uint8_t *)entry + sizeof(DNSAnswerEntry)+ entry->fqdn_len);
-        if (entry->type == DNS_RECORD_TYPE_A) {
-            char a[16] = "";
-            PrintInet(AF_INET, (const void *)ptr, a, sizeof(a));
-            json_object_set_new(js, "rdata", json_string(a));
-        } else if (entry->type == DNS_RECORD_TYPE_AAAA) {
-            char a[46] = "";
-            PrintInet(AF_INET6, (const void *)ptr, a, sizeof(a));
-            json_object_set_new(js, "rdata", json_string(a));
-        } else if (entry->data_len == 0) {
+    /* name */
+    char record[16] = "";
+    DNSCreateTypeString(entry->type, record, sizeof(record));
+    json_object_set_new(js, "rrtype", json_string(record));
+
+    /* ttl */
+    json_object_set_new(js, "ttl", json_integer(entry->ttl));
+
+    uint8_t *ptr = (uint8_t *)((uint8_t *)entry + sizeof(DNSAnswerEntry)+ entry->fqdn_len);
+    if (entry->type == DNS_RECORD_TYPE_A) {
+        char a[16] = "";
+        PrintInet(AF_INET, (const void *)ptr, a, sizeof(a));
+        json_object_set_new(js, "rdata", json_string(a));
+    } else if (entry->type == DNS_RECORD_TYPE_AAAA) {
+        char a[46] = "";
+        PrintInet(AF_INET6, (const void *)ptr, a, sizeof(a));
+        json_object_set_new(js, "rdata", json_string(a));
+    } else if (entry->data_len == 0) {
+        json_object_set_new(js, "rdata", json_string(""));
+    } else if (entry->type == DNS_RECORD_TYPE_TXT || entry->type == DNS_RECORD_TYPE_CNAME ||
+            entry->type == DNS_RECORD_TYPE_MX || entry->type == DNS_RECORD_TYPE_PTR ||
+            entry->type == DNS_RECORD_TYPE_NS) {
+        if (entry->data_len != 0) {
+            char buffer[256] = "";
+            uint16_t copy_len = entry->data_len < (sizeof(buffer) - 1) ?
+                entry->data_len : sizeof(buffer) - 1;
+            memcpy(buffer, ptr, copy_len);
+            buffer[copy_len] = '\0';
+            json_object_set_new(js, "rdata", json_string(buffer));
+        } else {
             json_object_set_new(js, "rdata", json_string(""));
-        } else if (entry->type == DNS_RECORD_TYPE_TXT || entry->type == DNS_RECORD_TYPE_CNAME ||
-                   entry->type == DNS_RECORD_TYPE_MX || entry->type == DNS_RECORD_TYPE_PTR ||
-                   entry->type == DNS_RECORD_TYPE_NS) {
-            if (entry->data_len != 0) {
-                char buffer[256] = "";
-                uint16_t copy_len = entry->data_len < (sizeof(buffer) - 1) ?
-                    entry->data_len : sizeof(buffer) - 1;
-                memcpy(buffer, ptr, copy_len);
-                buffer[copy_len] = '\0';
-                json_object_set_new(js, "rdata", json_string(buffer));
-            } else {
-                json_object_set_new(js, "rdata", json_string(""));
+        }
+    } else if (entry->type == DNS_RECORD_TYPE_SSHFP) {
+        if (entry->data_len > 2) {
+            /* get algo and type */
+            uint8_t algo = *ptr;
+            uint8_t fptype = *(ptr+1);
+
+            /* turn fp raw buffer into a nice :-separate hex string */
+            uint16_t fp_len = (entry->data_len - 2);
+            uint8_t *dptr = ptr+2;
+
+            /* c-string for ':' separated hex and trailing \0. */
+            uint32_t output_len = fp_len * 3 + 1;
+            char hexstring[output_len];
+            memset(hexstring, 0x00, output_len);
+
+            uint16_t x;
+            for (x = 0; x < fp_len; x++) {
+                char one[4];
+                snprintf(one, sizeof(one), x == fp_len - 1 ? "%02x" : "%02x:", dptr[x]);
+                strlcat(hexstring, one, output_len);
             }
-        } else if (entry->type == DNS_RECORD_TYPE_SSHFP) {
-            if (entry->data_len > 2) {
-                /* get algo and type */
-                uint8_t algo = *ptr;
-                uint8_t fptype = *(ptr+1);
-
-                /* turn fp raw buffer into a nice :-separate hex string */
-                uint16_t fp_len = (entry->data_len - 2);
-                uint8_t *dptr = ptr+2;
-
-                /* c-string for ':' separated hex and trailing \0. */
-                uint32_t output_len = fp_len * 3 + 1;
-                char hexstring[output_len];
-                memset(hexstring, 0x00, output_len);
-
-                uint16_t x;
-                for (x = 0; x < fp_len; x++) {
-                    char one[4];
-                    snprintf(one, sizeof(one), x == fp_len - 1 ? "%02x" : "%02x:", dptr[x]);
-                    strlcat(hexstring, one, output_len);
-                }
 
-                /* wrap the whole thing in it's own structure */
-                json_t *hjs = json_object();
-                if (hjs != NULL) {
-                    json_object_set_new(hjs, "fingerprint", json_string(hexstring));
-                    json_object_set_new(hjs, "algo", json_integer(algo));
-                    json_object_set_new(hjs, "type", json_integer(fptype));
+            /* wrap the whole thing in it's own structure */
+            json_t *hjs = json_object();
+            if (hjs != NULL) {
+                json_object_set_new(hjs, "fingerprint", json_string(hexstring));
+                json_object_set_new(hjs, "algo", json_integer(algo));
+                json_object_set_new(hjs, "type", json_integer(fptype));
 
-                    json_object_set_new(js, "sshfp", hjs);
-                }
+                json_object_set_new(js, "sshfp", hjs);
             }
         }
     }
@@ -543,10 +545,13 @@ static void OutputAnswer(LogDnsLogThread *aft, json_t *djs, DNSTransaction *tx,
     return;
 }
 
-static void OutputFailure(LogDnsLogThread *aft, json_t *djs, DNSTransaction *tx, DNSQueryEntry *entry)
+static void OutputFailure(LogDnsLogThread *aft, json_t *djs,
+        DNSTransaction *tx, DNSQueryEntry *entry) __attribute__((nonnull));
+
+static void OutputFailure(LogDnsLogThread *aft, json_t *djs,
+        DNSTransaction *tx, DNSQueryEntry *entry)
 {
-    if (entry != NULL &&
-            !DNSRRTypeEnabled(entry->type, aft->dnslog_ctx->flags)) {
+    if (!DNSRRTypeEnabled(entry->type, aft->dnslog_ctx->flags)) {
         return;
     }