DNS: move internal tx id tracking to u64

diff --git a/src/app-layer-dns-common.c b/src/app-layer-dns-common.c
index 949d32e31809dbf56eefcc9a934f9225a0d7848e..95a49935e929437d1696a445334f44f256e4bdbe 100644 (file)
--- a/src/app-layer-dns-common.c
+++ b/src/app-layer-dns-common.c
@@ -265,7 +265,7 @@ void DNSStoreQueryInState(DNSState *dns_state, const uint8_t *fqdn, const uint16
         if (tx == NULL)
             return;
         dns_state->transaction_max++;
-        SCLogDebug("dns_state->transaction_max updated to %u", dns_state->transaction_max);
+        SCLogDebug("dns_state->transaction_max updated to %"PRIu64, dns_state->transaction_max);
         TAILQ_INSERT_TAIL(&dns_state->tx_list, tx, next);
         dns_state->curr = tx;
         tx->tx_num = dns_state->transaction_max;

diff --git a/src/app-layer-dns-common.h b/src/app-layer-dns-common.h
index 25c9896ef2806cdfa03af397ebf3f2e107e624a2..ae1a8c663a9f04ac642487da82665575deba7748 100644 (file)
--- a/src/app-layer-dns-common.h
+++ b/src/app-layer-dns-common.h
@@ -141,7 +141,7 @@ typedef struct DNSTransaction_ {
 typedef struct DNSState_ {
     TAILQ_HEAD(, DNSTransaction_) tx_list;  /**< transaction list */
     DNSTransaction *curr;                   /**< ptr to current tx */
-    uint16_t transaction_max;
+    uint64_t transaction_max;
     uint16_t events;
 
     /* used by TCP only */

diff --git a/src/app-layer-dns-tcp.c b/src/app-layer-dns-tcp.c
index dd0611a1e476a058f16913d34f31659532371e75..32cb0549d33ec561c737b338c12d2b21f968420a 100644 (file)
--- a/src/app-layer-dns-tcp.c
+++ b/src/app-layer-dns-tcp.c
@@ -580,11 +580,11 @@ void DNSStateUpdateTransactionId(void *state, uint16_t *id) {
 
     DNSState *s = state;
 
-    SCLogDebug("original id %"PRIu16", s->transaction_max %"PRIu16,
+    SCLogDebug("original id %"PRIu16", s->transaction_max %"PRIu64,
             *id, (s->transaction_max));
 
     if ((s->transaction_max) > (*id)) {
-        SCLogDebug("original id %"PRIu16", updating with s->transaction_cnt %"PRIu16,
+        SCLogDebug("original id %"PRIu16", updating with s->transaction_max %"PRIu64,
                 *id, (s->transaction_max));
 
         (*id) = (s->transaction_max);

diff --git a/src/app-layer-dns-udp.c b/src/app-layer-dns-udp.c
index f73d57265b822b05174ee63ba5832ebcac09a42d..2c51fa60b489c3c91053a08a428e368fece0fd0f 100644 (file)
--- a/src/app-layer-dns-udp.c
+++ b/src/app-layer-dns-udp.c
@@ -301,11 +301,11 @@ static void DNSStateUpdateTransactionId(void *state, uint16_t *id) {
 
     DNSState *s = state;
 
-    SCLogDebug("original id %"PRIu16", s->transaction_max %"PRIu16,
+    SCLogDebug("original id %"PRIu16", s->transaction_max %"PRIu64,
             *id, (s->transaction_max));
 
     if ((s->transaction_max) > (*id)) {
-        SCLogDebug("original id %"PRIu16", updating with s->transaction_max %"PRIu16,
+        SCLogDebug("original id %"PRIu16", updating with s->transaction_max %"PRIu64,
                 *id, (s->transaction_max));
 
         (*id) = (s->transaction_max);