James Turner
837ba86d57
Fixes crashes where a request times-out, but then is completed by UDN sometime afterwards, with a free-d object. Have the DNS::Client own requests, and be able to retrieve the udns_query to cancel them, in the timeout case. Fixes a couple of Sentry reports.
154 lines
3.7 KiB
C++
154 lines
3.7 KiB
C++
/**
|
|
* \file DNSClient.hxx - simple DNS resolver client for SimGear
|
|
*/
|
|
|
|
// Written by Torsten Dreyer
|
|
//
|
|
// Copyright (C) 2016 Torsten Dreyer - torsten (at) t3r (dot) de
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Library General Public
|
|
// License as published by the Free Software Foundation; either
|
|
// version 2 of the License, or (at your option) any later version.
|
|
//
|
|
// This library 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
|
|
// Library 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.
|
|
//
|
|
|
|
#ifndef SG_DNS_CLIENT_HXX
|
|
#define SG_DNS_CLIENT_HXX
|
|
|
|
#include <memory> // for std::unique_ptr
|
|
#include <string>
|
|
#include <vector>
|
|
#include <ctime> // for time_t
|
|
|
|
#include <simgear/structure/SGReferenced.hxx>
|
|
#include <simgear/structure/SGSharedPtr.hxx>
|
|
#include <simgear/structure/event_mgr.hxx>
|
|
|
|
namespace simgear
|
|
{
|
|
|
|
namespace DNS
|
|
{
|
|
|
|
class Client;
|
|
|
|
using UDNSQueryPtr = void*;
|
|
|
|
class Request : public SGReferenced
|
|
{
|
|
public:
|
|
Request( const std::string & dn );
|
|
virtual ~Request();
|
|
const std::string& getDn() const { return _dn; }
|
|
int getType() const { return _type; }
|
|
bool isComplete() const { return _complete; }
|
|
bool isTimeout() const;
|
|
void setComplete( bool b = true ) { _complete = b; }
|
|
bool isCancelled() const { return _cancelled; }
|
|
|
|
virtual void submit( Client * client) = 0;
|
|
|
|
void cancel();
|
|
|
|
std::string cname;
|
|
std::string qname;
|
|
unsigned ttl;
|
|
protected:
|
|
friend class Client;
|
|
|
|
UDNSQueryPtr _query = nullptr;
|
|
std::string _dn;
|
|
int _type;
|
|
bool _complete;
|
|
time_t _timeout_secs;
|
|
time_t _start;
|
|
bool _cancelled = false;
|
|
};
|
|
typedef SGSharedPtr<Request> Request_ptr;
|
|
|
|
class NAPTRRequest : public Request
|
|
{
|
|
public:
|
|
NAPTRRequest( const std::string & dn );
|
|
void submit(Client* client) override;
|
|
|
|
struct NAPTR : SGReferenced {
|
|
int order;
|
|
int preference;
|
|
std::string flags;
|
|
std::string service;
|
|
std::string regexp;
|
|
std::string replacement;
|
|
};
|
|
typedef SGSharedPtr<NAPTR> NAPTR_ptr;
|
|
typedef std::vector<NAPTR_ptr> NAPTR_list;
|
|
NAPTR_list entries;
|
|
|
|
std::string qflags;
|
|
std::string qservice;
|
|
};
|
|
|
|
class SRVRequest : public Request
|
|
{
|
|
public:
|
|
SRVRequest( const std::string & dn );
|
|
SRVRequest( const std::string & dn, const string & service, const string & protocol );
|
|
void submit(Client* client) override;
|
|
|
|
struct SRV : SGReferenced {
|
|
int priority;
|
|
int weight;
|
|
int port;
|
|
std::string target;
|
|
};
|
|
typedef SGSharedPtr<SRV> SRV_ptr;
|
|
typedef std::vector<SRV_ptr> SRV_list;
|
|
SRV_list entries;
|
|
private:
|
|
std::string _service;
|
|
std::string _protocol;
|
|
};
|
|
|
|
class TXTRequest : public Request
|
|
{
|
|
public:
|
|
TXTRequest( const std::string & dn );
|
|
void submit(Client* client) override;
|
|
|
|
typedef std::vector<string> TXT_list;
|
|
typedef std::map<std::string,std::string> TXT_Attribute_map;
|
|
TXT_list entries;
|
|
TXT_Attribute_map attributes;
|
|
};
|
|
|
|
class Client
|
|
{
|
|
public:
|
|
Client();
|
|
~Client();
|
|
|
|
void update(int waitTimeout = 0);
|
|
|
|
void makeRequest(const Request_ptr& r);
|
|
|
|
// void cancelRequest(const Request_ptr& r, std::string reason = std::string());
|
|
|
|
class ClientPrivate;
|
|
std::unique_ptr<ClientPrivate> d;
|
|
};
|
|
|
|
} // of namespace DNS
|
|
|
|
} // of namespace simgear
|
|
|
|
#endif // of SG_DNS_CLIENT_HXX
|