Browse Source

Renamed question to query

develop
Robin Thoni 6 years ago
parent
commit
e2805b9e9b

+ 3
- 3
src/modules/dns/includes/dns/QDnsHeader.h View File

61
         void setReplyCode(quint8 replyCode);
61
         void setReplyCode(quint8 replyCode);
62
 
62
 
63
 
63
 
64
-        quint16 getQuestionCount() const;
65
-        void setQuestionCount(quint16 questionCount);
64
+        quint16 getQueryCount() const;
65
+        void setQueryCount(quint16 questionCount);
66
 
66
 
67
         quint16 getAnswerCount() const;
67
         quint16 getAnswerCount() const;
68
         void setAnswerCount(quint16 answerCount);
68
         void setAnswerCount(quint16 answerCount);
77
         bool m_isValid;
77
         bool m_isValid;
78
         quint16 m_id;
78
         quint16 m_id;
79
         quint16 m_flags;
79
         quint16 m_flags;
80
-        quint16 m_questionCount;
80
+        quint16 m_queryCount;
81
         quint16 m_answerCount;
81
         quint16 m_answerCount;
82
         quint16 m_authorityCount;
82
         quint16 m_authorityCount;
83
         quint16 m_additionalCount;
83
         quint16 m_additionalCount;

+ 7
- 7
src/modules/dns/src/QDnsHeader.cpp View File

12
             : m_isValid(true)
12
             : m_isValid(true)
13
             , m_id(0)
13
             , m_id(0)
14
             , m_flags(0)
14
             , m_flags(0)
15
-            , m_questionCount(0)
15
+            , m_queryCount(0)
16
             , m_answerCount(0)
16
             , m_answerCount(0)
17
             , m_authorityCount(0)
17
             , m_authorityCount(0)
18
             , m_additionalCount(0)
18
             , m_additionalCount(0)
38
         {
38
         {
39
             dataStream >> header.m_id;
39
             dataStream >> header.m_id;
40
             dataStream >> header.m_flags;
40
             dataStream >> header.m_flags;
41
-            dataStream >> header.m_questionCount;
41
+            dataStream >> header.m_queryCount;
42
             dataStream >> header.m_answerCount;
42
             dataStream >> header.m_answerCount;
43
             dataStream >> header.m_authorityCount;
43
             dataStream >> header.m_authorityCount;
44
             dataStream >> header.m_additionalCount;
44
             dataStream >> header.m_additionalCount;
59
     {
59
     {
60
         dataStream << m_id;
60
         dataStream << m_id;
61
         dataStream << m_flags;
61
         dataStream << m_flags;
62
-        dataStream << m_questionCount;
62
+        dataStream << m_queryCount;
63
         dataStream << m_answerCount;
63
         dataStream << m_answerCount;
64
         dataStream << m_authorityCount;
64
         dataStream << m_authorityCount;
65
         dataStream << m_additionalCount;
65
         dataStream << m_additionalCount;
213
         setFlagBits(15, (quint8) replyCode, 4);
213
         setFlagBits(15, (quint8) replyCode, 4);
214
     }
214
     }
215
 
215
 
216
-    quint16 QDnsHeader::getQuestionCount() const
216
+    quint16 QDnsHeader::getQueryCount() const
217
     {
217
     {
218
-        return m_questionCount;
218
+        return m_queryCount;
219
     }
219
     }
220
 
220
 
221
-    void QDnsHeader::setQuestionCount(quint16 questionCount)
221
+    void QDnsHeader::setQueryCount(quint16 questionCount)
222
     {
222
     {
223
-        m_questionCount = questionCount;
223
+        m_queryCount = questionCount;
224
     }
224
     }
225
 
225
 
226
     quint16 QDnsHeader::getAnswerCount() const
226
     quint16 QDnsHeader::getAnswerCount() const

+ 6
- 6
tests/DnsHeader.cpp View File

26
     bool flagNonAuthenticatedAcceptable;
26
     bool flagNonAuthenticatedAcceptable;
27
     quint8 flagReplyCode;
27
     quint8 flagReplyCode;
28
 
28
 
29
-    quint16 questionCount;
29
+    quint16 queryCount;
30
     quint16 answerCount;
30
     quint16 answerCount;
31
     quint16 authorityCount;
31
     quint16 authorityCount;
32
     quint16 additionalCount;
32
     quint16 additionalCount;
58
         ASSERT_EQ(header.isNonAuthenticatedAcceptable(), params.flagNonAuthenticatedAcceptable);
58
         ASSERT_EQ(header.isNonAuthenticatedAcceptable(), params.flagNonAuthenticatedAcceptable);
59
         ASSERT_EQ(header.getReplyCode(), params.flagReplyCode);
59
         ASSERT_EQ(header.getReplyCode(), params.flagReplyCode);
60
 
60
 
61
-        ASSERT_EQ(header.getQuestionCount(), params.questionCount);
61
+        ASSERT_EQ(header.getQueryCount(), params.queryCount);
62
         ASSERT_EQ(header.getAnswerCount(), params.answerCount);
62
         ASSERT_EQ(header.getAnswerCount(), params.answerCount);
63
         ASSERT_EQ(header.getAuthorityCount(), params.authorityCount);
63
         ASSERT_EQ(header.getAuthorityCount(), params.authorityCount);
64
         ASSERT_EQ(header.getAdditionalCount(), params.additionalCount);
64
         ASSERT_EQ(header.getAdditionalCount(), params.additionalCount);
81
 
81
 
82
     header.setId(params.id);
82
     header.setId(params.id);
83
     header.setFlags(params.flags);
83
     header.setFlags(params.flags);
84
-    header.setQuestionCount(params.questionCount);
84
+    header.setQueryCount(params.queryCount);
85
     header.setAnswerCount(params.answerCount);
85
     header.setAnswerCount(params.answerCount);
86
     header.setAuthorityCount(params.authorityCount);
86
     header.setAuthorityCount(params.authorityCount);
87
     header.setAdditionalCount(params.additionalCount);
87
     header.setAdditionalCount(params.additionalCount);
99
     ASSERT_EQ(header.isNonAuthenticatedAcceptable(), params.flagNonAuthenticatedAcceptable);
99
     ASSERT_EQ(header.isNonAuthenticatedAcceptable(), params.flagNonAuthenticatedAcceptable);
100
     ASSERT_EQ(header.getReplyCode(), params.flagReplyCode);
100
     ASSERT_EQ(header.getReplyCode(), params.flagReplyCode);
101
 
101
 
102
-    ASSERT_EQ(header.getQuestionCount(), params.questionCount);
102
+    ASSERT_EQ(header.getQueryCount(), params.queryCount);
103
     ASSERT_EQ(header.getAnswerCount(), params.answerCount);
103
     ASSERT_EQ(header.getAnswerCount(), params.answerCount);
104
     ASSERT_EQ(header.getAuthorityCount(), params.authorityCount);
104
     ASSERT_EQ(header.getAuthorityCount(), params.authorityCount);
105
     ASSERT_EQ(header.getAdditionalCount(), params.additionalCount);
105
     ASSERT_EQ(header.getAdditionalCount(), params.additionalCount);
130
     header.setIsAnswerAuthenticated(params.flagAnswerAuthenticated);
130
     header.setIsAnswerAuthenticated(params.flagAnswerAuthenticated);
131
     header.setNonAuthenticatedAcceptable(params.flagNonAuthenticatedAcceptable);
131
     header.setNonAuthenticatedAcceptable(params.flagNonAuthenticatedAcceptable);
132
     header.setReplyCode(params.flagReplyCode);
132
     header.setReplyCode(params.flagReplyCode);
133
-    header.setQuestionCount(params.questionCount);
133
+    header.setQueryCount(params.queryCount);
134
     header.setAnswerCount(params.answerCount);
134
     header.setAnswerCount(params.answerCount);
135
     header.setAuthorityCount(params.authorityCount);
135
     header.setAuthorityCount(params.authorityCount);
136
     header.setAdditionalCount(params.additionalCount);
136
     header.setAdditionalCount(params.additionalCount);
148
     ASSERT_EQ(header.isNonAuthenticatedAcceptable(), params.flagNonAuthenticatedAcceptable);
148
     ASSERT_EQ(header.isNonAuthenticatedAcceptable(), params.flagNonAuthenticatedAcceptable);
149
     ASSERT_EQ(header.getReplyCode(), params.flagReplyCode);
149
     ASSERT_EQ(header.getReplyCode(), params.flagReplyCode);
150
 
150
 
151
-    ASSERT_EQ(header.getQuestionCount(), params.questionCount);
151
+    ASSERT_EQ(header.getQueryCount(), params.queryCount);
152
     ASSERT_EQ(header.getAnswerCount(), params.answerCount);
152
     ASSERT_EQ(header.getAnswerCount(), params.answerCount);
153
     ASSERT_EQ(header.getAuthorityCount(), params.authorityCount);
153
     ASSERT_EQ(header.getAuthorityCount(), params.authorityCount);
154
     ASSERT_EQ(header.getAdditionalCount(), params.additionalCount);
154
     ASSERT_EQ(header.getAdditionalCount(), params.additionalCount);

Loading…
Cancel
Save