Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7165 from rgacogne/dnsdist-fix-trailing-bis
dnsdist: Add 1.3.3 ChangeLog, update the secpoll zone
- Loading branch information
Showing
24 changed files
with
731 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * This file is part of PowerDNS or dnsdist. | ||
| * Copyright -- PowerDNS.COM B.V. and its contributors | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of version 2 of the GNU General Public License as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * In addition, for the avoidance of any doubt, permission is granted to | ||
| * link this program with OpenSSL and to (re)distribute the binaries | ||
| * produced as the result of such linking. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| */ | ||
|
|
||
| #include "dnsdist-xpf.hh" | ||
|
|
||
| #include "dnsparser.hh" | ||
| #include "xpf.hh" | ||
|
|
||
| bool addXPF(DNSQuestion& dq, uint16_t optionCode, bool preserveTrailingData) | ||
| { | ||
| std::string payload = generateXPFPayload(dq.tcp, *dq.remote, *dq.local); | ||
| uint8_t root = '\0'; | ||
| dnsrecordheader drh; | ||
| drh.d_type = htons(optionCode); | ||
| drh.d_class = htons(QClass::IN); | ||
| drh.d_ttl = 0; | ||
| drh.d_clen = htons(payload.size()); | ||
| size_t recordHeaderLen = sizeof(root) + sizeof(drh); | ||
|
|
||
| size_t available = dq.size - dq.len; | ||
|
|
||
| if ((payload.size() + recordHeaderLen) > available) { | ||
| return false; | ||
| } | ||
|
|
||
| size_t xpfSize = sizeof(root) + sizeof(drh) + payload.size(); | ||
| uint32_t realPacketLen = getDNSPacketLength(reinterpret_cast<const char*>(dq.dh), dq.len); | ||
| if (realPacketLen < dq.len && preserveTrailingData) { | ||
| size_t toMove = dq.len - realPacketLen; | ||
| memmove(reinterpret_cast<char*>(dq.dh) + realPacketLen + xpfSize, reinterpret_cast<const char*>(dq.dh) + realPacketLen, toMove); | ||
| dq.len += xpfSize; | ||
| } | ||
| else { | ||
| dq.len = realPacketLen + xpfSize; | ||
| } | ||
|
|
||
| size_t pos = realPacketLen; | ||
| memcpy(reinterpret_cast<char*>(dq.dh) + pos, &root, sizeof(root)); | ||
| pos += sizeof(root); | ||
| memcpy(reinterpret_cast<char*>(dq.dh) + pos, &drh, sizeof(drh)); | ||
| pos += sizeof(drh); | ||
| memcpy(reinterpret_cast<char*>(dq.dh) + pos, payload.data(), payload.size()); | ||
| pos += payload.size(); | ||
|
|
||
| dq.dh->arcount = htons(ntohs(dq.dh->arcount) + 1); | ||
|
|
||
| return true; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * This file is part of PowerDNS or dnsdist. | ||
| * Copyright -- PowerDNS.COM B.V. and its contributors | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of version 2 of the GNU General Public License as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * In addition, for the avoidance of any doubt, permission is granted to | ||
| * link this program with OpenSSL and to (re)distribute the binaries | ||
| * produced as the result of such linking. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| */ | ||
| #pragma once | ||
|
|
||
| #include "dnsdist.hh" | ||
|
|
||
| bool addXPF(DNSQuestion& dq, uint16_t optionCode, bool preserveTrailingData); | ||
|
|
Oops, something went wrong.