From: Victor Julien <victor@inliniac.net>
Date: Mon, 29 Aug 2016 11:17:31 +0000 (+0200)
Subject: output dns: fix bit declarations
X-Git-Tag: suricata-3.1.2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2205%2Fhead;p=thirdparty%2Fsuricata.git

output dns: fix bit declarations
---

diff --git a/src/output-json-dns.c b/src/output-json-dns.c
index ea218aac9b..5b35949318 100644
--- a/src/output-json-dns.c
+++ b/src/output-json-dns.c
@@ -56,67 +56,67 @@
  * TX id handling doesn't expect it */
 #define QUERY 0
 
-#define LOG_QUERIES    (1L<<0)
-#define LOG_ANSWERS    (1L<<1)
-
-#define LOG_A          (1L<<2)
-#define LOG_NS         (1L<<3)
-#define LOG_MD         (1L<<4)
-#define LOG_MF         (1L<<5)
-#define LOG_CNAME      (1L<<6)
-#define LOG_SOA        (1L<<7)
-#define LOG_MB         (1L<<8)
-#define LOG_MG         (1L<<9)
-#define LOG_MR         (1L<<10)
-#define LOG_NULL       (1L<<11)
-#define LOG_WKS        (1L<<12)
-#define LOG_PTR        (1L<<13)
-#define LOG_HINFO      (1L<<14)
-#define LOG_MINFO      (1L<<15)
-#define LOG_MX         (1L<<16)
-#define LOG_TXT        (1L<<17)
-#define LOG_RP         (1L<<18)
-#define LOG_AFSDB      (1L<<19)
-#define LOG_X25        (1L<<20)
-#define LOG_ISDN       (1L<<21)
-#define LOG_RT         (1L<<22)
-#define LOG_NSAP       (1L<<23)
-#define LOG_NSAPPTR    (1L<<24)
-#define LOG_SIG        (1L<<25)
-#define LOG_KEY        (1L<<26)
-#define LOG_PX         (1L<<27)
-#define LOG_GPOS       (1L<<28)
-#define LOG_AAAA       (1L<<29)
-#define LOG_LOC        (1L<<30)
-#define LOG_NXT        (1L<<31)
-#define LOG_SRV        (1L<<32)
-#define LOG_ATMA       (1L<<33)
-#define LOG_NAPTR      (1L<<34)
-#define LOG_KX         (1L<<35)
-#define LOG_CERT       (1L<<36)
-#define LOG_A6         (1L<<37)
-#define LOG_DNAME      (1L<<38)
-#define LOG_OPT        (1L<<39)
-#define LOG_APL        (1L<<40)
-#define LOG_DS         (1L<<41)
-#define LOG_SSHFP      (1L<<42)
-#define LOG_IPSECKEY   (1L<<43)
-#define LOG_RRSIG      (1L<<44)
-#define LOG_NSEC       (1L<<45)
-#define LOG_DNSKEY     (1L<<46)
-#define LOG_DHCID      (1L<<47)
-#define LOG_NSEC3      (1L<<48)
-#define LOG_NSEC3PARAM (1L<<49)
-#define LOG_TLSA       (1L<<50)
-#define LOG_HIP        (1L<<51)
-#define LOG_CDS        (1L<<52)
-#define LOG_CDNSKEY    (1L<<53)
-#define LOG_SPF        (1L<<54)
-#define LOG_TKEY       (1L<<55)
-#define LOG_TSIG       (1L<<56)
-#define LOG_MAILA      (1L<<57)
-#define LOG_ANY        (1L<<58)
-#define LOG_URI        (1L<<59)
+#define LOG_QUERIES    BIT_U64(0)
+#define LOG_ANSWERS    BIT_U64(1)
+
+#define LOG_A          BIT_U64(2)
+#define LOG_NS         BIT_U64(3)
+#define LOG_MD         BIT_U64(4)
+#define LOG_MF         BIT_U64(5)
+#define LOG_CNAME      BIT_U64(6)
+#define LOG_SOA        BIT_U64(7)
+#define LOG_MB         BIT_U64(8)
+#define LOG_MG         BIT_U64(9)
+#define LOG_MR         BIT_U64(10)
+#define LOG_NULL       BIT_U64(11)
+#define LOG_WKS        BIT_U64(12)
+#define LOG_PTR        BIT_U64(13)
+#define LOG_HINFO      BIT_U64(14)
+#define LOG_MINFO      BIT_U64(15)
+#define LOG_MX         BIT_U64(16)
+#define LOG_TXT        BIT_U64(17)
+#define LOG_RP         BIT_U64(18)
+#define LOG_AFSDB      BIT_U64(19)
+#define LOG_X25        BIT_U64(20)
+#define LOG_ISDN       BIT_U64(21)
+#define LOG_RT         BIT_U64(22)
+#define LOG_NSAP       BIT_U64(23)
+#define LOG_NSAPPTR    BIT_U64(24)
+#define LOG_SIG        BIT_U64(25)
+#define LOG_KEY        BIT_U64(26)
+#define LOG_PX         BIT_U64(27)
+#define LOG_GPOS       BIT_U64(28)
+#define LOG_AAAA       BIT_U64(29)
+#define LOG_LOC        BIT_U64(30)
+#define LOG_NXT        BIT_U64(31)
+#define LOG_SRV        BIT_U64(32)
+#define LOG_ATMA       BIT_U64(33)
+#define LOG_NAPTR      BIT_U64(34)
+#define LOG_KX         BIT_U64(35)
+#define LOG_CERT       BIT_U64(36)
+#define LOG_A6         BIT_U64(37)
+#define LOG_DNAME      BIT_U64(38)
+#define LOG_OPT        BIT_U64(39)
+#define LOG_APL        BIT_U64(40)
+#define LOG_DS         BIT_U64(41)
+#define LOG_SSHFP      BIT_U64(42)
+#define LOG_IPSECKEY   BIT_U64(43)
+#define LOG_RRSIG      BIT_U64(44)
+#define LOG_NSEC       BIT_U64(45)
+#define LOG_DNSKEY     BIT_U64(46)
+#define LOG_DHCID      BIT_U64(47)
+#define LOG_NSEC3      BIT_U64(48)
+#define LOG_NSEC3PARAM BIT_U64(49)
+#define LOG_TLSA       BIT_U64(50)
+#define LOG_HIP        BIT_U64(51)
+#define LOG_CDS        BIT_U64(52)
+#define LOG_CDNSKEY    BIT_U64(53)
+#define LOG_SPF        BIT_U64(54)
+#define LOG_TKEY       BIT_U64(55)
+#define LOG_TSIG       BIT_U64(56)
+#define LOG_MAILA      BIT_U64(57)
+#define LOG_ANY        BIT_U64(58)
+#define LOG_URI        BIT_U64(59)
 
 #define LOG_ALL_RRTYPES (~(uint64_t)(LOG_QUERIES|LOG_ANSWERS))