*/
/*
* This file is part of adns, which is
- * Copyright (C) 1997-2000,2003,2006 Ian Jackson
+ * Copyright (C) 1997-2000,2003,2006,2014-2016 Ian Jackson
+ * Copyright (C) 2014 Mark Wooding
* Copyright (C) 1999-2000,2003,2006 Tony Finch
* Copyright (C) 1991 Massachusetts Institute of Technology
* (See the file INSTALL for full details.)
*
* 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>
while (p!=pe && (c= *p++)!='.') {
if (c=='\\') {
if (!(flags & adns_qf_quoteok_query)) return adns_s_querydomaininvalid;
+ if (p==pe) return adns_s_querydomaininvalid;
if (ctype_digit(p[0])) {
if (p+1==pe || p+2==pe) return adns_s_querydomaininvalid;
if (ctype_digit(p[1]) && ctype_digit(p[2])) {
const char *p, *pe;
adns_status st;
- if (!((type^adns_r_addr) & adns_rrt_reprmask)) ads->nextid++; /* bodge */
st= mkquery_header(ads,vb,id_r,ol+2); if (st) return st;
MKQUERY_START(vb);
int lablen, labstart;
adns_status st;
- if (!((type^adns_r_addr) & adns_rrt_reprmask)) ads->nextid++; /* bodge */
st= mkquery_header(ads,vb,id_r,qd_dglen); if (st) return st;
MKQUERY_START(vb);
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);