lib/dns: fix packing and unpacking OPT record

The RDATA in OPT records can contains zero or _more_ options.
Previously, we only handle unpacking and packing one option, now we
handle multiple options.

1 files changed, 171 insertions, 0 deletions

diff --git a/lib/dns/testdata/message/UnpackMessage_OPT_test.txt b/lib/dns/testdata/message/UnpackMessage_OPT_test.txt
new file mode 100644
index 00000000..244df80a
--- /dev/null
+++ b/lib/dns/testdata/message/UnpackMessage_OPT_test.txt
@@ -0,0 +1,171 @@
+>>> cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org:00
+0000000 4d2d 8182 0001 0000 0000 0001 1c43 4756
+0000010 3548 6936 6843 6e73 4453 6631 6574 4b59
+0000020 515a 7655 7a64 7975 7305 6d75 6c74 6905
+0000030 7375 7262 6c03 6f72 6700 0001 0001 0000
+0000040 2904 d000 0000 0000 1900 0f00 1500 1674
+0000050 696d 6520 6c69 6d69 7420 6578 6365 6564
+0000060 6564
+
+<<< cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org:00
+{
+  "Answer": null,
+  "Authority": null,
+  "Additional": [
+    {
+      "Value": {
+        "ListVar": [
+          {
+            "Data": "ABZ0aW1lIGxpbWl0IGV4Y2VlZGVk",
+            "Code": 15
+          }
+        ],
+        "ExtRCode": 0,
+        "Version": 0,
+        "DO": false
+      },
+      "Name": "",
+      "Type": 41,
+      "Class": 1232,
+      "TTL": 0
+    }
+  ],
+  "Question": {
+    "Name": "cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org",
+    "Type": 1,
+    "Class": 1
+  },
+  "Header": {
+    "ID": 19757,
+    "IsQuery": false,
+    "Op": 0,
+    "IsAA": false,
+    "IsTC": false,
+    "IsRD": true,
+    "IsRA": true,
+    "RCode": 2,
+    "QDCount": 1,
+    "ANCount": 0,
+    "NSCount": 0,
+    "ARCount": 1
+  }
+}
+
+<<< cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org:00.hexdump
+{Name:cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org Type:A}
+          |  0  1  2  3  4  5  6  7 | 01234567 |   0   1   2   3   4   5   6   7 |
+          |  8  9  A  B  C  D  E  F | 89ABCDEF |   8   9   A   B   C   D   E   F |
+0x00000000| 4d 2d 81 82 00 01 00 00 | M-...... |  77  45 129 130   0   1   0   0 |0
+0x00000008| 00 00 00 01 1c 63 67 76 | .....cgv |   0   0   0   1  28  99 103 118 |8
+0x00000010| 35 68 69 36 68 63 6e 73 | 5hi6hcns |  53 104 105  54 104  99 110 115 |16
+0x00000018| 64 73 66 31 65 74 6b 79 | dsf1etky | 100 115 102  49 101 116 107 121 |24
+0x00000020| 71 7a 76 75 7a 64 79 75 | qzvuzdyu | 113 122 118 117 122 100 121 117 |32
+0x00000028| 73 05 6d 75 6c 74 69 05 | s.multi. | 115   5 109 117 108 116 105   5 |40
+0x00000030| 73 75 72 62 6c 03 6f 72 | surbl.or | 115 117 114  98 108   3 111 114 |48
+0x00000038| 67 00 00 01 00 01 00 00 | g....... | 103   0   0   1   0   1   0   0 |56
+0x00000040| 29 04 d0 00 00 00 00 00 | )....... |  41   4 208   0   0   0   0   0 |64
+0x00000048| 19 00 0f 00 15 00 16 74 | .......t |  25   0  15   0  21   0  22 116 |72
+0x00000050| 69 6d 65 20 6c 69 6d 69 | ime.limi | 105 109 101  32 108 105 109 105 |80
+0x00000058| 74 20 65 78 63 65 65 64 | t.exceed | 116  32 101 120  99 101 101 100 |88
+0x00000060| 65 64                   | ed       | 101 100                         |96
+
+>>> cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org:01
+0000000 4d2d 8182 0001 0000
+0000008 0000 0001 1c43 4756
+0000010 3548 6936 6843 6e73
+0000018 4453 6631 6574 4b59
+0000020 515a 7655 7a64 7975
+0000028 7305 6d75 6c74 6905
+0000030 7375 7262 6c03 6f72
+0000038 6700 0001 0001 0000
+0000040 2904 d000 0000 0000
+0000048 6d00 0f00 1500 1674
+0000050 696d 6520 6c69 6d69
+0000058 7420 6578 6365 6564
+0000060 6564 000f 0050 0017
+0000068 3134 352e 3130 302e
+0000070 3138 382e 3232 3a35
+0000078 3320 7469 6d65 6420
+0000080 6f75 7420 666f 7220
+0000088 4347 5635 4869 3668
+0000090 436e 7344 5366 3165
+0000098 744b 5951 5a76 557a
+00000a0 6479 7573 2e6d 756c
+00000a8 7469 2e73 7572 626c
+00000b0 2e6f 7267 2041
+
+<<< cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org:01
+{
+  "Answer": null,
+  "Authority": null,
+  "Additional": [
+    {
+      "Value": {
+        "ListVar": [
+          {
+            "Data": "ABZ0aW1lIGxpbWl0IGV4Y2VlZGVk",
+            "Code": 15
+          },
+          {
+            "Data": "ABcxNDUuMTAwLjE4OC4yMjo1MyB0aW1lZCBvdXQgZm9yIENHVjVIaTZoQ25zRFNmMWV0S1lRWnZVemR5dXMubXVsdGkuc3VyYmwub3JnIEE=",
+            "Code": 15
+          }
+        ],
+        "ExtRCode": 0,
+        "Version": 0,
+        "DO": false
+      },
+      "Name": "",
+      "Type": 41,
+      "Class": 1232,
+      "TTL": 0
+    }
+  ],
+  "Question": {
+    "Name": "cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org",
+    "Type": 1,
+    "Class": 1
+  },
+  "Header": {
+    "ID": 19757,
+    "IsQuery": false,
+    "Op": 0,
+    "IsAA": false,
+    "IsTC": false,
+    "IsRD": true,
+    "IsRA": true,
+    "RCode": 2,
+    "QDCount": 1,
+    "ANCount": 0,
+    "NSCount": 0,
+    "ARCount": 1
+  }
+}
+
+<<< cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org:01.hexdump
+{Name:cgv5hi6hcnsdsf1etkyqzvuzdyus.multi.surbl.org Type:A}
+          |  0  1  2  3  4  5  6  7 | 01234567 |   0   1   2   3   4   5   6   7 |
+          |  8  9  A  B  C  D  E  F | 89ABCDEF |   8   9   A   B   C   D   E   F |
+0x00000000| 4d 2d 81 82 00 01 00 00 | M-...... |  77  45 129 130   0   1   0   0 |0
+0x00000008| 00 00 00 01 1c 63 67 76 | .....cgv |   0   0   0   1  28  99 103 118 |8
+0x00000010| 35 68 69 36 68 63 6e 73 | 5hi6hcns |  53 104 105  54 104  99 110 115 |16
+0x00000018| 64 73 66 31 65 74 6b 79 | dsf1etky | 100 115 102  49 101 116 107 121 |24
+0x00000020| 71 7a 76 75 7a 64 79 75 | qzvuzdyu | 113 122 118 117 122 100 121 117 |32
+0x00000028| 73 05 6d 75 6c 74 69 05 | s.multi. | 115   5 109 117 108 116 105   5 |40
+0x00000030| 73 75 72 62 6c 03 6f 72 | surbl.or | 115 117 114  98 108   3 111 114 |48
+0x00000038| 67 00 00 01 00 01 00 00 | g....... | 103   0   0   1   0   1   0   0 |56
+0x00000040| 29 04 d0 00 00 00 00 00 | )....... |  41   4 208   0   0   0   0   0 |64
+0x00000048| 6d 00 0f 00 15 00 16 74 | m......t | 109   0  15   0  21   0  22 116 |72
+0x00000050| 69 6d 65 20 6c 69 6d 69 | ime.limi | 105 109 101  32 108 105 109 105 |80
+0x00000058| 74 20 65 78 63 65 65 64 | t.exceed | 116  32 101 120  99 101 101 100 |88
+0x00000060| 65 64 00 0f 00 50 00 17 | ed...P.. | 101 100   0  15   0  80   0  23 |96
+0x00000068| 31 34 35 2e 31 30 30 2e | 145.100. |  49  52  53  46  49  48  48  46 |104
+0x00000070| 31 38 38 2e 32 32 3a 35 | 188.22:5 |  49  56  56  46  50  50  58  53 |112
+0x00000078| 33 20 74 69 6d 65 64 20 | 3.timed. |  51  32 116 105 109 101 100  32 |120
+0x00000080| 6f 75 74 20 66 6f 72 20 | out.for. | 111 117 116  32 102 111 114  32 |128
+0x00000088| 43 47 56 35 48 69 36 68 | CGV5Hi6h |  67  71  86  53  72 105  54 104 |136
+0x00000090| 43 6e 73 44 53 66 31 65 | CnsDSf1e |  67 110 115  68  83 102  49 101 |144
+0x00000098| 74 4b 59 51 5a 76 55 7a | tKYQZvUz | 116  75  89  81  90 118  85 122 |152
+0x000000a0| 64 79 75 73 2e 6d 75 6c | dyus.mul | 100 121 117 115  46 109 117 108 |160
+0x000000a8| 74 69 2e 73 75 72 62 6c | ti.surbl | 116 105  46 115 117 114  98 108 |168
+0x000000b0| 2e 6f 72 67 20 41       | .org.A   |  46 111 114 103  32  65         |176