ua1zbe
/
svxlink
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sm0svx:master' into tetra-sip-usrp

This commit is contained in:
Adi Bier 2023-01-02 22:42:16 +01:00 committed by GitHub
parent 8b1418b800 574c05137d
commit 341fcba418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/async/cpp/AsyncCppDnsLookupWorker.cpp
View File

@ -10,7 +10,7 @@ used by Async::CppApplication to execute DNS queries.
\verbatim
Async - A library for programming event driven applications
Copyright (C) 2003-2022 Tobias Blomberg
Copyright (C) 2003-2023 Tobias Blomberg
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -172,9 +172,7 @@ bool CppDnsLookupWorker::doLookup(void)
int fd[2];
if (pipe(fd) != 0)
{
char errbuf[256];
strerror_r(errno, errbuf, sizeof(errbuf));
std::cerr << "*** ERROR: Could not create pipe: " << errbuf << std::endl;
printErrno("ERROR: Could not create pipe");
setLookupFailed();
return false;
}
@ -314,7 +312,7 @@ void CppDnsLookupWorker::workerFunc(CppDnsLookupWorker::ThreadContext& ctx)
state.options = RES_DEFAULT;
const char *dname = ctx.label.c_str();
ctx.anslen = res_nsearch(&state, dname, ns_c_in, qtype,
ctx.answer, NS_PACKETSZ);
ctx.answer, sizeof(ctx.answer));
if (ctx.anslen == -1)
{
th_cerr << "*** ERROR: Name resolver failure -- res_nsearch: "
@ -412,14 +410,13 @@ void CppDnsLookupWorker::notificationReceived(FdWatch *w)
return;
}
char errbuf[256];
ns_msg msg;
int ret = ns_initparse(m_ctx->answer, m_ctx->anslen, &msg);
if (ret == -1)
{
strerror_r(errno, errbuf, sizeof(errbuf));
std::cerr << "*** WARNING: ns_initparse failed (anslen="
<< m_ctx->anslen << "): " << errbuf << std::endl;
std::stringstream ss;
ss << "WARNING: ns_initparse failed (anslen=" << m_ctx->anslen << ")";
printErrno(ss.str());
setLookupFailed();
workerDone();
return;
@ -436,9 +433,7 @@ void CppDnsLookupWorker::notificationReceived(FdWatch *w)
ret = ns_parserr(&msg, ns_s_an, rrnum, &rr);
if (ret == -1)
{
strerror_r(errno, errbuf, sizeof(errbuf));
std::cerr << "*** WARNING: DNS lookup failure in ns_parserr: "
<< errbuf << std::endl;
printErrno("WARNING: DNS lookup failure in ns_parserr");
setLookupFailed();
continue;
}
@ -473,9 +468,7 @@ void CppDnsLookupWorker::notificationReceived(FdWatch *w)
exp_dn, NS_MAXDNAME);
if (ret == -1)
{
strerror_r(errno, errbuf, sizeof(errbuf));
std::cerr << "*** WARNING: DNS lookup failure in "
"ns_name_uncompress: " << errbuf << std::endl;
printErrno("WARNING: DNS lookup failure in ns_name_uncompress");
setLookupFailed();
continue;
}
@ -493,9 +486,7 @@ void CppDnsLookupWorker::notificationReceived(FdWatch *w)
exp_dn, NS_MAXDNAME);
if (ret == -1)
{
strerror_r(errno, errbuf, sizeof(errbuf));
std::cerr << "*** WARNING: DNS lookup failure in "
"ns_name_uncompress" << errbuf << std::endl;
printErrno("WARNING: DNS lookup failure in ns_name_uncompress");
setLookupFailed();
continue;
}
@ -519,9 +510,7 @@ void CppDnsLookupWorker::notificationReceived(FdWatch *w)
exp_dn, NS_MAXDNAME);
if (ret == -1)
{
strerror_r(errno, errbuf, sizeof(errbuf));
std::cerr << "*** WARNING: DNS lookup failure in "
"ns_name_uncompress: " << errbuf << std::endl;
printErrno("WARNING: DNS lookup failure in ns_name_uncompress");
setLookupFailed();
continue;
}
@ -545,6 +534,19 @@ void CppDnsLookupWorker::notificationReceived(FdWatch *w)
} /* CppDnsLookupWorker::notificationReceived */
void CppDnsLookupWorker::printErrno(const std::string& msg)
{
char errbuf[1024];
char* errmsg = errbuf;
#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
int ret = strerror_r(errno, errbuf, sizeof(errbuf));
assert(ret == 0);
#else
errmsg = strerror_r(errno, errbuf, sizeof(errbuf));
#endif
std::cerr << "*** " << msg << ": " << errmsg << std::endl;
} /* CppDnsLookupWorker::printErrno */
/*
* This file has not been truncated

5
src/async/cpp/AsyncCppDnsLookupWorker.h
View File

@ -10,7 +10,7 @@ used by Async::CppApplication to execute DNS queries.
\verbatim
Async - A library for programming event driven applications
Copyright (C) 2003-2022 Tobias Blomberg
Copyright (C) 2003-2023 Tobias Blomberg
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -164,7 +164,7 @@ class CppDnsLookupWorker : public DnsLookupWorker, public sigc::trackable
std::string label;
DnsLookup::Type type = DnsLookup::Type::A;
int notifier_wr = -1;
unsigned char answer[NS_PACKETSZ];
unsigned char answer[NS_MAXMSG];
int anslen = 0;
struct addrinfo* addrinfo = nullptr;
char host[NI_MAXHOST] = {0};
@ -186,6 +186,7 @@ class CppDnsLookupWorker : public DnsLookupWorker, public sigc::trackable
static void workerFunc(ThreadContext& ctx);
void notificationReceived(FdWatch *w);
void printErrno(const std::string& msg);
}; /* class CppDnsLookupWorker */

2
src/versions
View File

@ -8,7 +8,7 @@ QTEL=1.2.4.99.5
LIBECHOLIB=1.3.3.99.2
# Version for the Async library
LIBASYNC=1.6.99.24
LIBASYNC=1.6.99.25
# SvxLink versions
SVXLINK=1.7.99.75