Merge ab17088 into 7b66620

index.js

@@ -1608,8 +1608,12 @@ question.encode = function (q, buf, offset) {
 
   buf.writeUInt16BE(types.toType(q.type), offset)
   offset += 2
+  if (q.QU === undefined || q.QU !== true) {
+    buf.writeUInt16BE(classes.toClass(q.class === undefined ? 'IN' : q.class), offset)
+  } else {
+    buf.writeUInt16BE(classes.toClass(q.class === undefined ? 'IN' : q.class) + QU_MASK, offset)
+  }
 
-  buf.writeUInt16BE(classes.toClass(q.class === undefined ? 'IN' : q.class), offset)
   offset += 2
 
   question.encode.bytes = offset - oldOffset
@@ -1630,7 +1634,14 @@ question.decode = function (buf, offset) {
   q.type = types.toString(buf.readUInt16BE(offset))
   offset += 2
 
-  q.class = classes.toString(buf.readUInt16BE(offset))
+  const classValue = buf.readUInt16BE(offset)
+  if (classValue >= QU_MASK) {
+    q.QU = true
+    q.class = classes.toString(classValue - QU_MASK)
+  } else {
+    q.class = classes.toString(classValue)
+  }
+
   offset += 2
 
   const qu = !!(q.class & QU_MASK)

test.js

@@ -163,6 +163,45 @@ tape('query', function (t) {
       name: 'hello.srv.com'
     }]
   })
+  testEncoder(t, packet, {
+    type: 'query',
+    questions: [{
+      type: 'A',
+      QU: true,
+      name: 'hello.a.com'
+    }, {
+      type: 'SRV',
+      name: 'hello.srv.com'
+    }]
+  })
+
+  testEncoder(t, packet, {
+    type: 'query',
+    id: 42,
+    questions: [{
+      type: 'A',
+      QU: true,
+      class: 'IN',
+      name: 'hello.a.com'
+    }, {
+      type: 'SRV',
+      name: 'hello.srv.com'
+    }]
+  })
+
+  testEncoder(t, packet, {
+    type: 'query',
+    id: 42,
+    questions: [{
+      type: 'A',
+      QU: true,
+      class: 'CH',
+      name: 'hello.a.com'
+    }, {
+      type: 'SRV',
+      name: 'hello.srv.com'
+    }]
+  })
 
   t.end()
 })