Added DnsLabel serialize() method and associated tests

src/modules/dns/includes/dns/QDnsLabel.h

@@ -17,6 +17,9 @@ namespace QDns
 
         static QString parse(const QByteArray& packetData, quint32 pos, quint8 maxRecursion = 5);
         static QString parse(const QByteArray& packetData, QDataStream& dataStream, quint8 maxRecursion = 5);
+
+        static QByteArray serialize(const QString& label);
+        static void serialize(const QString& label, QDataStream& dataStream);
     };
 
 }

src/modules/dns/src/QDnsLabel.cpp

@@ -84,4 +84,29 @@ namespace QDns
         }
         return fullLabel;
     }
+
+    QByteArray QDnsLabel::serialize(const QString& label)
+    {
+        QByteArray data;
+        QDataStream dataStream(&data, QIODevice::WriteOnly);
+        serialize(label, dataStream);
+        return data;
+    }
+
+    void QDnsLabel::serialize(const QString& label, QDataStream& dataStream)
+    {
+        if (label.size() != 0)
+        {
+            for (const auto& part : label.split("."))
+            {
+                dataStream << (quint8) part.length();
+                for (const auto& c : part)
+                {
+                    dataStream << (quint8) c.toLatin1();
+                }
+            }
+        }
+        dataStream << (quint8) 0;
+    }
+
 }

tests/DnsLabel.cpp

@@ -8,7 +8,7 @@
 
 #include "dns/QDnsLabel.h"
 
-struct DnsLabelTestParams
+struct DnsLabelParseTestParams
 {
     bool isValid;
     const char* hexData;
@@ -16,11 +16,11 @@ struct DnsLabelTestParams
     const char* label;
 };
 
-class DnsLabelTest : public ::testing::TestWithParam<DnsLabelTestParams>
+class DnsLabelParseTest : public ::testing::TestWithParam<DnsLabelParseTestParams>
 {
 };
 
-TEST_P(DnsLabelTest, parse)
+TEST_P(DnsLabelParseTest, parse)
 {
     auto params = GetParam();
     auto data = QByteArray::fromHex(params.hexData);
@@ -36,51 +36,80 @@ TEST_P(DnsLabelTest, parse)
     }
 }
 
-INSTANTIATE_TEST_CASE_P(DnsLabelTestInst,
-                        DnsLabelTest,
+INSTANTIATE_TEST_CASE_P(DnsLabelParseTestInst,
+                        DnsLabelParseTest,
                         ::testing::Values(
-                                DnsLabelTestParams {false, "", 0},
-                                DnsLabelTestParams {true, "00", 0, ""},
-                                DnsLabelTestParams {true,
+                                DnsLabelParseTestParams {false, "", 0},
+                                DnsLabelParseTestParams {true, "00", 0, ""},
+                                DnsLabelParseTestParams {true,
                                                     "06676f6f676c6502667200",
                                                     0,
                                                     "google.fr"
                                 },
-                                DnsLabelTestParams {true,
+                                DnsLabelParseTestParams {true,
                                                     "587a8180000100010000000006676f6f676c650266720000010001c00c000100010000012c0004acd912a3",
                                                     12,
                                                     "google.fr"
                                 },
-                                DnsLabelTestParams {true,
+                                DnsLabelParseTestParams {true,
                                                     "587a8180000100010000000006676f6f676c650266720000010001c00c000100010000012c0004acd912a3",
                                                     27,
                                                     "google.fr"
                                 },
-                                DnsLabelTestParams {true,
+                                DnsLabelParseTestParams {true,
                                                     "3dcd8580000100020000000003777777067274686f6e6903636f6d0000010001c00c00050001000002580008057365727633c010c02c00010001000002580004d5f6343d",
                                                     12,
                                                     "www.rthoni.com"
                                 },
-                                DnsLabelTestParams {true,
+                                DnsLabelParseTestParams {true,
                                                     "3dcd8580000100020000000003777777067274686f6e6903636f6d0000010001c00c00050001000002580008057365727633c010c02c00010001000002580004d5f6343d",
                                                     32,
                                                     "www.rthoni.com"
                                 },
-                                DnsLabelTestParams {true,
+                                DnsLabelParseTestParams {true,
                                                     "3dcd8580000100020000000003777777067274686f6e6903636f6d0000010001c00c00050001000002580008057365727633c010c02c00010001000002580004d5f6343d",
                                                     44,
                                                     "serv3.rthoni.com"
                                 },
-                                DnsLabelTestParams {false,
+                                DnsLabelParseTestParams {false,
                                                     "3dcd8580000100020000000003777777067274686f6e6903636f6d0000010001c00c00050001000002580008057365727633 c02c c02c00010001000002580004d5f6343d",
                                                     44
                                 },
-                                DnsLabelTestParams {false,
+                                DnsLabelParseTestParams {false,
                                                     "3dcd8580000100020000000003777777067274686f6e6903636f6d0000010001c00c00050001000002580008057365727633 802c c02c00010001000002580004d5f6343d",
                                                     44
                                 },
-                                DnsLabelTestParams {false,
+                                DnsLabelParseTestParams {false,
                                                     "3dcd8580000100020000000003777777067274686f6e6903636f6d0000010001c00c00050001000002580008057365727633 402c c02c00010001000002580004d5f6343d",
                                                     44
                                 }
                         ));
+
+
+struct DnsLabelSerializeTestParams
+{
+    const char* label;
+    const char* hexData;
+};
+
+class DnsLabelSerializeTest : public ::testing::TestWithParam<DnsLabelSerializeTestParams>
+{
+};
+
+TEST_P(DnsLabelSerializeTest, parse)
+{
+    auto params = GetParam();
+    auto label = QDns::QDnsLabel::serialize(params.label);
+    auto data = QByteArray::fromHex(params.hexData);
+    ASSERT_EQ(label, data);
+}
+
+INSTANTIATE_TEST_CASE_P(DnsLabelSerializeTestInst,
+                        DnsLabelSerializeTest,
+                        ::testing::Values(
+                                DnsLabelSerializeTestParams {"", "00"},
+                                DnsLabelSerializeTestParams {"com", "03636f6d00"},
+                                DnsLabelSerializeTestParams {"fr", "02667200"},
+                                DnsLabelSerializeTestParams {"google.fr", "06676f6f676c6502667200"},
+                                DnsLabelSerializeTestParams {"www.rthoni.com", "03777777067274686f6e6903636f6d00"}
+                        ));