From eecb710e7b11227e9ce3ceffc2fed79a7ca48720 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 26 Mar 2022 06:32:59 +0100 Subject: Merging upstream version 1.2.3. Signed-off-by: Daniel Baumann --- src/output/dnscli.c | 8 ++++---- src/output/dnscli.h | 2 +- src/output/dnscli.hh | 2 +- src/output/dnscli.lua | 2 +- src/output/null.lua | 2 +- src/output/pcap.c | 2 +- src/output/pcap.h | 2 +- src/output/pcap.hh | 2 +- src/output/pcap.lua | 2 +- src/output/respdiff.c | 2 +- src/output/respdiff.h | 2 +- src/output/respdiff.hh | 2 +- src/output/respdiff.lua | 2 +- src/output/tcpcli.c | 2 +- src/output/tcpcli.h | 2 +- src/output/tcpcli.hh | 2 +- src/output/tcpcli.lua | 2 +- src/output/tlscli.c | 2 +- src/output/tlscli.h | 2 +- src/output/tlscli.hh | 2 +- src/output/tlscli.lua | 2 +- src/output/udpcli.c | 2 +- src/output/udpcli.h | 2 +- src/output/udpcli.hh | 2 +- src/output/udpcli.lua | 2 +- 25 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/output') diff --git a/src/output/dnscli.c b/src/output/dnscli.c index f7c5b5e..ec8fa57 100644 --- a/src/output/dnscli.c +++ b/src/output/dnscli.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. @@ -248,7 +248,7 @@ int output_dnscli_connect(output_dnscli_t* self, const char* host, const char* p return 0; } -inline ssize_t _send_udp(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) +static inline ssize_t _send_udp(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) { ssize_t n; @@ -331,7 +331,7 @@ static void _receive_udp(output_dnscli_t* self, const core_object_t* obj) self->errs++; } -inline ssize_t _send_tcp(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) +static inline ssize_t _send_tcp(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) { ssize_t n; @@ -432,7 +432,7 @@ static void _receive_tcp(output_dnscli_t* self, const core_object_t* obj) self->errs++; } -inline ssize_t _send_tls(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) +static inline ssize_t _send_tls(output_dnscli_t* self, const uint8_t* payload, size_t len, size_t sent) { ssize_t n; diff --git a/src/output/dnscli.h b/src/output/dnscli.h index 9927bd4..4be9787 100644 --- a/src/output/dnscli.h +++ b/src/output/dnscli.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/dnscli.hh b/src/output/dnscli.hh index 4126423..de9fa23 100644 --- a/src/output/dnscli.hh +++ b/src/output/dnscli.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/dnscli.lua b/src/output/dnscli.lua index bfdaf36..b1a1ac1 100644 --- a/src/output/dnscli.lua +++ b/src/output/dnscli.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2018-2021, OARC, Inc. +-- Copyright (c) 2018-2022, OARC, Inc. -- All rights reserved. -- -- This file is part of dnsjit. diff --git a/src/output/null.lua b/src/output/null.lua index b0e167f..92bec6d 100644 --- a/src/output/null.lua +++ b/src/output/null.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2018-2021, OARC, Inc. +-- Copyright (c) 2018-2022, OARC, Inc. -- All rights reserved. -- -- This file is part of dnsjit. diff --git a/src/output/pcap.c b/src/output/pcap.c index ede9881..81cc353 100644 --- a/src/output/pcap.c +++ b/src/output/pcap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/pcap.h b/src/output/pcap.h index 40146c2..2112826 100644 --- a/src/output/pcap.h +++ b/src/output/pcap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/pcap.hh b/src/output/pcap.hh index 6205333..0f25ca4 100644 --- a/src/output/pcap.hh +++ b/src/output/pcap.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/pcap.lua b/src/output/pcap.lua index 26ae8e7..166b4e5 100644 --- a/src/output/pcap.lua +++ b/src/output/pcap.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2018-2021, OARC, Inc. +-- Copyright (c) 2018-2022, OARC, Inc. -- All rights reserved. -- -- This file is part of dnsjit. diff --git a/src/output/respdiff.c b/src/output/respdiff.c index 834a264..e7f8d07 100644 --- a/src/output/respdiff.c +++ b/src/output/respdiff.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/respdiff.h b/src/output/respdiff.h index 207e225..8a16b8a 100644 --- a/src/output/respdiff.h +++ b/src/output/respdiff.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/respdiff.hh b/src/output/respdiff.hh index 44f597e..9a355da 100644 --- a/src/output/respdiff.hh +++ b/src/output/respdiff.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/respdiff.lua b/src/output/respdiff.lua index 7d17b4a..533cadc 100644 --- a/src/output/respdiff.lua +++ b/src/output/respdiff.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2018-2021, OARC, Inc. +-- Copyright (c) 2018-2022, OARC, Inc. -- All rights reserved. -- -- This file is part of dnsjit. diff --git a/src/output/tcpcli.c b/src/output/tcpcli.c index f2b218b..5051778 100644 --- a/src/output/tcpcli.c +++ b/src/output/tcpcli.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/tcpcli.h b/src/output/tcpcli.h index 83b7ea4..e1bdc50 100644 --- a/src/output/tcpcli.h +++ b/src/output/tcpcli.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/tcpcli.hh b/src/output/tcpcli.hh index 277b0dd..e63812f 100644 --- a/src/output/tcpcli.hh +++ b/src/output/tcpcli.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/tcpcli.lua b/src/output/tcpcli.lua index d57de88..df2a7cc 100644 --- a/src/output/tcpcli.lua +++ b/src/output/tcpcli.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2018-2021, OARC, Inc. +-- Copyright (c) 2018-2022, OARC, Inc. -- All rights reserved. -- -- This file is part of dnsjit. diff --git a/src/output/tlscli.c b/src/output/tlscli.c index 8c5947a..5bb3312 100644 --- a/src/output/tlscli.c +++ b/src/output/tlscli.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/tlscli.h b/src/output/tlscli.h index 72e7b9d..3c8648d 100644 --- a/src/output/tlscli.h +++ b/src/output/tlscli.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/tlscli.hh b/src/output/tlscli.hh index 4a0c142..f2ce3a0 100644 --- a/src/output/tlscli.hh +++ b/src/output/tlscli.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/tlscli.lua b/src/output/tlscli.lua index e37439b..8f10a6f 100644 --- a/src/output/tlscli.lua +++ b/src/output/tlscli.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2018-2021, OARC, Inc. +-- Copyright (c) 2018-2022, OARC, Inc. -- All rights reserved. -- -- This file is part of dnsjit. diff --git a/src/output/udpcli.c b/src/output/udpcli.c index b207d9c..3bea618 100644 --- a/src/output/udpcli.c +++ b/src/output/udpcli.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/udpcli.h b/src/output/udpcli.h index f783642..a2b288b 100644 --- a/src/output/udpcli.h +++ b/src/output/udpcli.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/udpcli.hh b/src/output/udpcli.hh index 084a5b6..9d3cfbd 100644 --- a/src/output/udpcli.hh +++ b/src/output/udpcli.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021, OARC, Inc. + * Copyright (c) 2018-2022, OARC, Inc. * All rights reserved. * * This file is part of dnsjit. diff --git a/src/output/udpcli.lua b/src/output/udpcli.lua index 0584725..50d97db 100644 --- a/src/output/udpcli.lua +++ b/src/output/udpcli.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2018-2021, OARC, Inc. +-- Copyright (c) 2018-2022, OARC, Inc. -- All rights reserved. -- -- This file is part of dnsjit. -- cgit v1.2.3