Added MX record data

src/modules/dns-base/CMakeLists.txt

@@ -30,7 +30,7 @@ add_library(${PROJECT_NAME}
         src/RecordData/QDnsRecordDataRaw.cpp
         includes/dns-base/RecordData/QDnsRecordDataRaw.h
         src/RecordData/QDnsRecordDataAAAA.cpp
-        includes/dns-base/RecordData/QDnsRecordDataAAAA.h)
+        includes/dns-base/RecordData/QDnsRecordDataAAAA.h src/RecordData/QDnsRecordDataMX.cpp includes/dns-base/RecordData/QDnsRecordDataMX.h)
 
 target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network)
 

src/modules/dns-base/includes/dns-base/RecordData/QDnsRecordDataMX.h

@@ -0,0 +1,53 @@
+//
+// Created by robin on 1/23/18.
+//
+
+#ifndef QDNSAGG_QDNSRECORDDATAMX_H
+#define QDNSAGG_QDNSRECORDDATAMX_H
+
+#include <qplatformdefs.h>
+#include <QByteArray>
+#include <QDataStream>
+#include <QHostAddress>
+
+#include "QDnsRecordData.h"
+
+namespace QDns
+{
+    namespace Base
+    {
+        class QDnsRecordDataMX : public QDnsRecordData
+        {
+        public:
+            QDnsRecordDataMX();
+
+            QDnsRecordDataMX(const QByteArray &packetData, quint32 pos);
+
+            QDnsRecordDataMX(const QByteArray &packetData, QDataStream &dataStream);
+
+            QByteArray serialize() const override;
+
+            void serialize(QDataStream &dataStream) const override;
+
+            virtual QDnsRecordData* clone() const override;
+
+            quint16 getPreference() const;
+
+            void setPreference(quint16 preference);
+
+            const QString &getMx() const;
+
+            void setMx(const QString &mx);
+
+        private:
+            void parse(const QByteArray &packetData, QDataStream &dataStream);
+
+            quint16 m_preference;
+
+            QString m_mx;
+        };
+    }
+}
+
+
+#endif //QDNSAGG_QDNSRECORDDATAMX_H

src/modules/dns-base/src/RecordData/QDnsRecordDataMX.cpp

@@ -0,0 +1,92 @@
+//
+// Created by robin on 1/23/18.
+//
+
+#include <includes/dns-base/QDnsLabel.h>
+#include "dns-base/RecordData/QDnsRecordDataMX.h"
+
+
+namespace QDns
+{
+    namespace Base
+    {
+        QDnsRecordDataMX::QDnsRecordDataMX()
+                : QDnsRecordData()
+        {
+        }
+
+        QDnsRecordDataMX::QDnsRecordDataMX(const QByteArray &packetData, quint32 pos)
+                : QDnsRecordDataMX()
+        {
+            QDataStream dataStream(packetData);
+            dataStream.skipRawData(pos);
+            parse(packetData, dataStream);
+        }
+
+        QDnsRecordDataMX::QDnsRecordDataMX(const QByteArray &packetData, QDataStream &dataStream)
+                : QDnsRecordDataMX()
+        {
+            parse(packetData, dataStream);
+        }
+
+        void QDnsRecordDataMX::parse(const QByteArray &packetData, QDataStream &dataStream)
+        {
+            if (dataStream.device()->bytesAvailable() < 3)
+            {
+                m_isValid = false;
+            }
+            else
+            {
+                dataStream >> m_preference;
+                m_mx = QDnsLabel::parse(packetData, dataStream);
+                if (m_mx.isNull())
+                {
+                    m_isValid = false;
+                }
+            }
+        }
+
+        QByteArray QDnsRecordDataMX::serialize() const
+        {
+            QByteArray byteArray;
+            QDataStream dataStream(&byteArray, QIODevice::WriteOnly);
+            serialize(dataStream);
+            return byteArray;
+        }
+
+        void QDnsRecordDataMX::serialize(QDataStream &dataStream) const
+        {
+            dataStream << m_preference;
+            QDnsLabel::serialize(m_mx, dataStream);
+        }
+
+        QDnsRecordData *QDnsRecordDataMX::clone() const
+        {
+            auto data = new QDnsRecordDataMX();
+            data->m_isValid = m_isValid;
+            data->m_preference = m_preference;
+            data->m_mx = m_mx;
+            return nullptr;
+        }
+
+        quint16 QDnsRecordDataMX::getPreference() const
+        {
+            return m_preference;
+        }
+
+        void QDnsRecordDataMX::setPreference(quint16 preference)
+        {
+            m_preference = preference;
+        }
+
+        const QString &QDnsRecordDataMX::getMx() const
+        {
+            return m_mx;
+        }
+
+        void QDnsRecordDataMX::setMx(const QString &mx)
+        {
+            m_mx = mx;
+        }
+    }
+}

src/modules/dns-base/tests/CMakeLists.txt

@@ -9,7 +9,8 @@ add_executable(${PROJECT_NAME}
         DnsResourceRecord.cpp
         DnsPacket.cpp
         RecordData/DnsRDataA.cpp
-        RecordData/DnsRDataAAAA.cpp)
+        RecordData/DnsRDataAAAA.cpp
+        RecordData/DnsRDataMX.cpp)
 
 target_link_libraries(${PROJECT_NAME} gtest pthread qdnsagg-dns-base)
 

src/modules/dns-base/tests/RecordData/DnsRDataMX.cpp

@@ -0,0 +1,47 @@
+//
+// Created by robin on 1/14/18.
+//
+
+#include <gtest/gtest.h>
+#include <QByteArray>
+#include <QString>
+#include <QtNetwork/QHostAddress>
+#include <dns-base/RecordData/QDnsRecordDataMX.h>
+
+struct DnsRDataMXTestParams
+{
+    bool isValid;
+    const char* hexData;
+    quint32 pos;
+
+    quint16 preference;
+    QString mx;
+};
+
+class DnsRDataMXTest : public ::testing::TestWithParam<DnsRDataMXTestParams>
+{
+};
+
+TEST_P(DnsRDataMXTest, parseAndGetters)
+{
+    auto params = GetParam();
+    auto data = QByteArray::fromHex(params.hexData);
+    auto rdata = QDns::Base::QDnsRecordDataMX(data, params.pos);
+    ASSERT_EQ(rdata.isValid(), params.isValid);
+    
+    if (rdata.isValid())
+    {
+        ASSERT_EQ(params.preference, rdata.getPreference());
+        ASSERT_EQ(params.mx, rdata.getMx());
+
+        ASSERT_EQ(rdata.serialize().toHex(), QString(params.hexData).remove(" "));
+    }
+}
+
+INSTANTIATE_TEST_CASE_P(DnsRDataMXTestInst,
+                        DnsRDataMXTest,
+                        ::testing::Values(
+                                DnsRDataMXTestParams {false, "", 0},
+                                DnsRDataMXTestParams {false, "00", 0},
+                                DnsRDataMXTestParams {true, "003204616c7434056173706d78016c06676f6f676c6503636f6d00", 0, 50, "alt4.aspmx.l.google.com"}
+                        ));