dns-oarc/dnswire
1
0
Fork 0
Code Issues Activity

Merging upstream version 0.4.0.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 06:37:39 +01:00
parent 584e0220fa
commit 59def95384
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
20 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/decoder.c
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

4
src/dnstap.c
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.
@ -57,6 +57,7 @@ const char* const DNSTAP_SOCKET_PROTOCOL_STRING[] = {
"DOH",
"DNSCryptUDP",
"DNSCryptTCP",
"DOQ",
};
const char* const DNSTAP_POLICY_ACTION_STRING[] = {
"UNKNOWN",
@ -143,6 +144,7 @@ int dnstap_decode_protobuf(struct dnstap* dnstap, const uint8_t* data, size_t le
case DNSTAP_SOCKET_PROTOCOL_DOH:
case DNSTAP_SOCKET_PROTOCOL_DNSCryptUDP:
case DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP:
case DNSTAP_SOCKET_PROTOCOL_DOQ:
break;
default:
dnstap->message.has_socket_protocol = false;

2
src/dnswire.c
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/dnswire/decoder.h
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

3
src/dnswire/dnstap.h
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.
@ -72,6 +72,7 @@ enum dnstap_socket_protocol {
DNSTAP_SOCKET_PROTOCOL_DOH = 4,
DNSTAP_SOCKET_PROTOCOL_DNSCryptUDP = 5,
DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP = 6,
DNSTAP_SOCKET_PROTOCOL_DOQ = 7,
};
extern const char* const DNSTAP_SOCKET_PROTOCOL_STRING[];

2
src/dnswire/dnswire.h
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/dnswire/encoder.h
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/dnswire/reader.h
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/dnswire/trace.h.in
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/dnswire/version.h.in
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/dnswire/writer.h
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/encoder.c
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/reader.c
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/test/test_dnstap.c
View file

@ -47,7 +47,7 @@ int main(void)
d.message.socket_family = (enum _Dnstap__SocketFamily)DNSTAP_SOCKET_FAMILY_INET;
// invalid message.socket_protocol
d.message.socket_protocol = (enum _Dnstap__SocketProtocol)(DNSTAP_SOCKET_PROTOCOL_DNSCryptTCP + 1);
d.message.socket_protocol = (enum _Dnstap__SocketProtocol)(DNSTAP_SOCKET_PROTOCOL_DOQ + 1);
s = dnstap_encode_protobuf_size(&d);
assert(s < sizeof(buf));
assert(dnstap_encode_protobuf(&d, buf) == s);

2
src/trace.c
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.

2
src/writer.c
View file

@ -1,6 +1,6 @@
/*
* Author Jerry Lundström <jerry@dns-oarc.net>
* Copyright (c) 2019, OARC, Inc.
* Copyright (c) 2019-2023, OARC, Inc.
* All rights reserved.
*
* This file is part of the dnswire library.