FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort DNS TXT entries and provide an attribute map

Browse Source
This commit is contained in:
Torsten Dreyer 2016-11-09 12:03:37 +01:00
parent 6a9235223e
commit 27fff3b72a
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
simgear/io/DNSClient.cxx
View File

@ -75,6 +75,13 @@ SRVRequest::SRVRequest( const std::string & dn ) :
_type = DNS_T_SRV; _type = DNS_T_SRV;
} }
static bool sortSRV( const SRVRequest::SRV_ptr a, const SRVRequest::SRV_ptr b )
{
if( a->priority > b->priority ) return false;
if( a->priority < b->priority ) return true;
return a->weight > b->weight;
}
static void dnscbSRV(struct dns_ctx *ctx, struct dns_rr_srv *result, void *data) static void dnscbSRV(struct dns_ctx *ctx, struct dns_rr_srv *result, void *data)
{ {
SRVRequest * r = static_cast<SRVRequest*>(data); SRVRequest * r = static_cast<SRVRequest*>(data);
@ -90,7 +97,7 @@ static void dnscbSRV(struct dns_ctx *ctx, struct dns_rr_srv *result, void *data)
srv->port = result->dnssrv_srv[i].port; srv->port = result->dnssrv_srv[i].port;
srv->target = result->dnssrv_srv[i].name; srv->target = result->dnssrv_srv[i].name;
} }
// std::sort( r->entries.begin(), r->entries.end(), sortNAPTR ); std::sort( r->entries.begin(), r->entries.end(), sortSRV );
free(result); free(result);
} }
r->setComplete(); r->setComplete();
@ -120,7 +127,12 @@ static void dnscbTXT(struct dns_ctx *ctx, struct dns_rr_txt *result, void *data)
r->ttl = result->dnstxt_ttl; r->ttl = result->dnstxt_ttl;
for (int i = 0; i < result->dnstxt_nrr; i++) { for (int i = 0; i < result->dnstxt_nrr; i++) {
//TODO: interprete the .len field of dnstxt_txt? //TODO: interprete the .len field of dnstxt_txt?
r->entries.push_back(string((char*)result->dnstxt_txt[i].txt)); string txt = string((char*)result->dnstxt_txt[i].txt);
r->entries.push_back( txt );
string_list tokens = simgear::strutils::split( txt, "=", 1 );
if( tokens.size() == 2 ) {
r->attributes[tokens[0]] = tokens[1];
}
} }
free(result); free(result);
} }

2
simgear/io/DNSClient.hxx
View File

@ -110,7 +110,9 @@ public:
virtual void submit(); virtual void submit();
typedef std::vector<string> TXT_list; typedef std::vector<string> TXT_list;
typedef std::map<std::string,std::string> TXT_Attribute_map;
TXT_list entries; TXT_list entries;
TXT_Attribute_map attributes;
}; };
class Client class Client