Skip to content

Commit

Permalink
Replace inout parameter by proper return type
Browse files Browse the repository at this point in the history
  • Loading branch information
svanveen committed Mar 16, 2021
1 parent 7af1ac0 commit 2f4c694
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/include/qmdnsengine/dns.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ QMDNSENGINE_EXPORT bool fromPacket(const QByteArray &packet, Message &message);
/**
* @brief Create a raw DNS packet from a Message
* @param message Message to create the packet from
* @param packet storage for raw DNS packet
* @return packet storage for raw DNS packet
*/
QMDNSENGINE_EXPORT void toPacket(const Message &message, QByteArray &packet);
QMDNSENGINE_EXPORT QByteArray toPacket(const Message &message);

/**
* @brief Retrieve the string representation of a DNS type
Expand Down
4 changes: 3 additions & 1 deletion src/src/dns.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,9 @@ bool fromPacket(const QByteArray &packet, Message &message)
return true;
}

void toPacket(const Message &message, QByteArray &packet)
QByteArray toPacket(const Message &message)
{
QByteArray packet;
quint16 offset = 0;
quint16 flags = (message.isResponse() ? 0x8400 : 0) |
(message.isTruncated() ? 0x200 : 0);
Expand All @@ -357,6 +358,7 @@ void toPacket(const Message &message, QByteArray &packet)
for (Record record : records) {
writeRecord(packet, offset, record, nameMap);
}
return packet;
}

QString typeName(quint16 type)
Expand Down
6 changes: 2 additions & 4 deletions src/src/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ Server::Server(QObject *parent)

void Server::sendMessage(const Message &message)
{
QByteArray packet;
toPacket(message, packet);
const auto packet = toPacket(message);
if (message.address().protocol() == QAbstractSocket::IPv4Protocol) {
d->ipv4Socket.writeDatagram(packet, message.address(), message.port());
} else {
Expand All @@ -152,8 +151,7 @@ void Server::sendMessage(const Message &message)

void Server::sendMessageToAll(const Message &message)
{
QByteArray packet;
toPacket(message, packet);
const auto packet = toPacket(message);
d->ipv4Socket.writeDatagram(packet, MdnsIpv4Address, MdnsPort);
d->ipv6Socket.writeDatagram(packet, MdnsIpv6Address, MdnsPort);
}

0 comments on commit 2f4c694

Please sign in to comment.