*/
/*
* This file is part of adns, which is
- * Copyright (C) 1997-2000,2003,2006 Ian Jackson
+ * Copyright (C) 1997-2000,2003,2006,2014 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.
*/
#ifndef ADNS_INTERNAL_H_INCLUDED
#define DNS_IDOFFSET 0
#define DNS_CLASS_IN 1
-#define DNS_INADDR_ARPA "in-addr", "arpa"
-#define DNS_IP6_ARPA "ip6", "arpa"
-
#define MAX_POLLFDS ADNS_POLLFDS_RECOMMENDED
/* Some preprocessor hackery */
struct timeval now;
} parseinfo;
-#define NREVDOMAINS 2 /* keep in sync with addrfam! */
+#define MAXREVLABELS 34 /* keep in sync with addrfam! */
struct revparse_state {
- unsigned map; /* which domains are still live */
- byte ipv[NREVDOMAINS][32]; /* address components so far */
+ uint16_t labstart[MAXREVLABELS];
+ uint8_t lablen[MAXREVLABELS];
};
union checklabel_state {
adns_status (*checklabel)(adns_state ads, adns_queryflags flags,
union checklabel_state *cls, qcontext *ctx,
- int labnum, const char *label, int lablen);
+ int labnum, const char *dgram,
+ int labstart, int lablen);
/* Check a label from the query domain string. The label is not
* necessarily null-terminated. The hook can refuse the query's submission
* by returning a nonzero status. State can be stored in *cls between
* because lablen is zero.
*/
- void (*postsort)(adns_state ads, void *array, int nrrs,int rrsz,
+ void (*postsort)(adns_state ads, void *array, int nrrs, int rrsz,
const struct typeinfo *typei);
/* Called immediately after the RRs have been sorted, and may rearrange
* them. (This is really for the benefit of SRV's bizarre weighting
adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
union checklabel_state *cls,
qcontext *ctx, int labnum,
- const char *label, int lablen);
+ const char *dgram, int labstart, int lablen);
/* implemented in query.c, used by types.c as default
* and as part of implementation for some fancier types
* doesn't require any state */
struct query_queue udpw, tcpw, childw, output, intdone;
adns_query forallnext;
int nextid, tcpsocket;
- struct udpsocket { int af; int fd; } udpsocket[MAXUDP];
- int nudp;
+ struct udpsocket { int af; int fd; } udpsockets[MAXUDP];
+ int nudpsockets;
vbuf tcpsend, tcprecv;
int nservers, nsortlist, nsearchlist, searchndots, tcpserver, tcprecv_skip;
enum adns__tcpstate {
*/
char *adns__sockaddr_ntoa(const struct sockaddr *sa, char *buf);
-/* Convert sa to a string, and write it to buf, which must be at least
- * ADNS_ADDR2TEXT_BUFLEN bytes long (unchecked). Return buf; can't fail.
+/* Converts sa to a string, and writes it to buf, which must be at
+ * least ADNS_ADDR2TEXT_BUFLEN bytes long (unchecked). Returns buf;
+ * can't fail.
*/
extern int adns__make_reverse_domain(const struct sockaddr *sa,
* allocate an output buffer failed.
*/
-extern int adns__revparse_label(struct revparse_state *rps, int labnum,
- const char *label, int lablen);
+extern bool adns__revparse_label(struct revparse_state *rps, int labnum,
+ const char *dgram,
+ int labstart, int lablen);
/* Parse a label in a reverse-domain name, given its index labnum (starting
* from zero), a pointer to its contents (which need not be null-terminated),
* and its length. The state in *rps is initialized implicitly when labnum
* is zero.
*
- * Returns zero if the parse was successful, nonzero if the domain name is
- * definitely invalid and the parse must be abandoned.
+ * Returns 1 if the parse is proceeding successfully, 0 if the domain
+ * name is definitely invalid and the parse must be abandoned.
*/
-extern int adns__revparse_done(struct revparse_state *rps, int nlabels,
- adns_rrtype *rrtype_r, adns_sockaddr *addr_r);
+extern bool adns__revparse_done(struct revparse_state *rps,
+ const char *dgram, int nlabels,
+ adns_rrtype *rrtype_r, adns_sockaddr *addr_r);
/* Finishes parsing a reverse-domain name, given the total number of
* labels in the name. On success, fills in the af and protocol
* address in *addr_r, and the forward query type in *rrtype_r
- * (because that turns out to be useful). Returns nonzero if the
- * parse must be abandoned.
+ * (because that turns out to be useful). Returns 1 if the parse
+ * was successful.
*/
/* From setup.c: */
void adns__cancel(adns_query qu);
void adns__query_done(adns_query qu);
-void adns__query_fail(adns_query qu, adns_status stat);
+void adns__query_fail(adns_query qu, adns_status st);
void adns__cancel_children(adns_query qu);
void adns__returning(adns_state ads, adns_query qu);
~ianmdlvl / adns.git / blobdiff