*
* 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
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program; if not, write to the Free Software Foundation.
*/
#include <errno.h>
return adns_s_ok;
}
-adns_status adns__qdpl_normal(adns_state ads,
- const char **p_io, const char *pe, int labelnum,
- char label_r[], int *ll_io,
- adns_queryflags flags,
- const typeinfo *typei) {
+static adns_status qdparselabel(adns_state ads,
+ const char **p_io, const char *pe,
+ char label_r[], int *ll_io,
+ adns_queryflags flags) {
int ll, c;
const char *p;
return adns_s_querydomaininvalid;
}
}
- if (!(flags & adns_qf_quoteok_query)) {
- if (c == '-') {
- if (!ll) return adns_s_querydomaininvalid;
- } else if (!ctype_alpha(c) && !ctype_digit(c)) {
- return adns_s_querydomaininvalid;
- }
- }
if (ll == *ll_io) return adns_s_querydomaininvalid;
label_r[ll++]= c;
}
const char *owner, int ol,
const typeinfo *typei, adns_rrtype type,
adns_queryflags flags) {
- int labelnum, ll, nbytes;
+ int ll, nbytes;
byte label[255];
byte *rqp;
const char *p, *pe;
p= owner; pe= owner+ol;
nbytes= 0;
- labelnum= 0;
while (p!=pe) {
ll= sizeof(label);
- st= typei->qdparselabel(ads, &p,pe, labelnum++, label, &ll, flags, typei);
+ st= qdparselabel(ads, &p,pe, label, &ll, flags);
if (st) return st;
if (!ll) return adns_s_querydomaininvalid;
if (ll > DNS_MAXLABEL) return adns_s_querydomaintoolong;
adns__tcp_tryconnect(qu->ads,now);
}
+struct udpsocket *adns__udpsocket_by_af(adns_state ads, int af) {
+ int i;
+ for (i=0; i<ads->nudpsockets; i++)
+ if (ads->udpsockets[i].af == af) return &ads->udpsockets[i];
+ return 0;
+}
+
void adns__query_send(adns_query qu, struct timeval now) {
- struct sockaddr_in servaddr;
int serv, r;
adns_state ads;
+ struct udpsocket *udp;
+ adns_rr_addr *addr;
assert(qu->state == query_tosend);
if ((qu->flags & adns_qf_usevc) || (qu->query_dglen > DNS_MAXUDP)) {
return;
}
- serv= qu->udpnextserver;
- memset(&servaddr,0,sizeof(servaddr));
-
ads= qu->ads;
- servaddr.sin_family= AF_INET;
- servaddr.sin_addr= ads->servers[serv].addr;
- servaddr.sin_port= htons(DNS_PORT);
+ serv= qu->udpnextserver;
+ addr= &ads->servers[serv];
+ udp= adns__udpsocket_by_af(ads, addr->addr.sa.sa_family);
+ assert(udp);
- r= sendto(ads->udpsocket,qu->query_dgram,qu->query_dglen,0,
- (const struct sockaddr*)&servaddr,sizeof(servaddr));
+ r= sendto(udp->fd,qu->query_dgram,qu->query_dglen,0,
+ &addr->addr.sa,addr->len);
if (r<0 && errno == EMSGSIZE) {
qu->retries= 0;
query_usetcp(qu,now);