reverse parsing: Pass dgram and labstart instead of label

[adns] / src / internal.h

diff --git a/src/internal.h b/src/internal.h
index 3ea8a934426bb3e576944a169f981c88eb5854e8..49f5e666c48a9e8014e55701bf7948a0e1449593 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -131,13 +131,6 @@ typedef struct {
   struct timeval now;
 } parseinfo;
 
   struct timeval now;
 } parseinfo;
 

-union gen_addr {
-  struct in_addr v4;
-  struct in6_addr v6;
-};
-
-struct af_addr { int af; union gen_addr addr; };
-

 #define NREVDOMAINS 2                  /* keep in sync with addrfam! */
 struct revparse_state {
   unsigned map;                                /* which domains are still live */
 #define NREVDOMAINS 2                  /* keep in sync with addrfam! */
 struct revparse_state {
   unsigned map;                                /* which domains are still live */


@@ -155,7 +148,7 @@ typedef struct {
   union {
     struct {
       adns_rrtype rev_rrtype;
   union {
     struct {
       adns_rrtype rev_rrtype;

-      struct af_addr addr;
+      adns_sockaddr addr;

     } ptr;
     struct {
       unsigned want, have;
     } ptr;
     struct {
       unsigned want, have;


@@ -205,7 +198,8 @@ typedef struct typeinfo {
 
   adns_status (*checklabel)(adns_state ads, adns_queryflags flags,
                            union checklabel_state *cls, qcontext *ctx,
 
   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
   /* 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


@@ -237,7 +231,7 @@ typedef struct typeinfo {
 adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
                               union checklabel_state *cls,
                               qcontext *ctx, int labnum,
 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 */
   /* implemented in query.c, used by types.c as default
    * and as part of implementation for some fancier types
    * doesn't require any state */


@@ -395,8 +389,7 @@ struct adns__state {
   struct pollfd pollfds_buf[MAX_POLLFDS];
   adns_rr_addr servers[MAXSERVERS];
   struct sortlist {
   struct pollfd pollfds_buf[MAX_POLLFDS];
   adns_rr_addr servers[MAXSERVERS];
   struct sortlist {

-    int af;
-    union gen_addr base, mask;
+    adns_sockaddr base, mask;

   } sortlist[MAXSORTLIST];
   char **searchlist;
   unsigned short rand48xsubi[3];
   } sortlist[MAXSORTLIST];
   char **searchlist;
   unsigned short rand48xsubi[3];


@@ -404,21 +397,20 @@ struct adns__state {
 
 /* From addrfam.c: */
 
 
 /* From addrfam.c: */
 

-extern int adns__af_supported_p(int af);
-/* Return nonzero if the address family af known to the library and supported
- * by the other addrfam operations.  Note that the other operations will
- * abort on an unrecognized address family rather than returning an error
- * code.
+extern int adns__addrs_equal_raw(const struct sockaddr *a,
+                                int bf, const void *b);
+/* Returns nonzero a's family is bf and a's protocol address field
+ * refers to the same protocol address as that stored at ba.

  */
 
  */
 

-extern int adns__genaddr_equal_p(int af, const union gen_addr *a,
-                                int bf, const void *b);
-/* b should point to a `struct in_addr' or equivalent for the address family
- * bf.  Returns nonzero if the two addresses are equal.
+extern int adns__addrs_equal(const adns_sockaddr *a,
+                            const adns_sockaddr *b);
+/* Returns nonzero if the two refer to the same protocol address
+ * (disregarding port, IPv6 scope, etc).

  */
 
  */
 

-extern int adns__sockaddr_equal_p(const struct sockaddr *sa,
-                                 const struct sockaddr *sb);
+extern int adns__sockaddrs_equal(const struct sockaddr *sa,
+                                const struct sockaddr *sb);

 /* Return nonzero if the two socket addresses are equal (in all significant
  * respects).
  */
 /* Return nonzero if the two socket addresses are equal (in all significant
  * respects).
  */


@@ -426,39 +418,33 @@ extern int adns__sockaddr_equal_p(const struct sockaddr *sa,
 extern int adns__addr_width(int af);
 /* Return the width of addresses of family af, in bits. */
 
 extern int adns__addr_width(int af);
 /* Return the width of addresses of family af, in bits. */
 

-extern void adns__prefix_mask(int af, int len, union gen_addr *mask_r);
-/* Store in mask_r an address mask for address family af, whose first len
- * bits are set and the remainder are clear.  This is what you want for
- * converting a prefix length into a netmask.
+extern void adns__prefix_mask(adns_sockaddr *sa, int len);
+/* Stores in sa's protocol address field an address mask for address
+ * family af, whose first len bits are set and the remainder are
+ * clear.  On entry, sa's af field must be set.  This is what you want
+ * for converting a prefix length into a netmask.

  */
 
  */
 

-extern int adns__guess_prefix_length(int af, const union gen_addr *addr);
+extern int adns__guess_prefix_length(const adns_sockaddr *addr);

 /* Given a network base address, guess the appropriate prefix length based on
  * the appropriate rules for the address family (e.g., for IPv4, this uses
  * the old address classes).
  */
 
 /* Given a network base address, guess the appropriate prefix length based on
  * the appropriate rules for the address family (e.g., for IPv4, this uses
  * the old address classes).
  */
 

-extern int adns__addr_match_p(int addraf, const union gen_addr *addr,
-                             int netaf, const union gen_addr *base,
-                             const union gen_addr *mask);
-/* Given an address af (with family addraf) and a network (with family netaf,
- * base address base, and netmask mask), return nonzero if the address lies
- * within the network.
+extern int adns__addr_matches(int af, const void *addr,
+                             const adns_sockaddr *base,
+                             const adns_sockaddr *mask);
+/* Return nonzero if the protocol address specified by af and addr
+ * lies within the network specified by base and mask.

  */
 
  */
 

-extern void adns__sockaddr_extract(const struct sockaddr *sa,
-                                  union gen_addr *a_r, int *port_r);
-/* Extract fields from the socket address, filling in *a_r and *port_r with
- * the address and (integer, host byte-order) port number, respectively.
- * Either (or, pointlessly, both) of a_r and port_r may be null to mean
- * `don't care'.
+extern void adns__addr_inject(const void *a, adns_sockaddr *sa);
+/* Injects the protocol address *a into the socket adress sa.  Assumes
+ * that sa->sa_family is already set correctly.

  */
 
  */
 

-extern void adns__sockaddr_inject(const union gen_addr *a, int port,
-                                 struct sockaddr *sa);
-/* Inject fields into the socket adress sa.  If a is not null, copy the
- * address in; if port is not -1, then copy the port (converting from host
- * byte-order).  Assumes that sa->sa_family is already set correctly.
+extern const void *adns__sockaddr_addr(const struct sockaddr *sa);
+/* Returns the address of the protocol address field in sa.

  */
 
 char *adns__sockaddr_ntoa(const struct sockaddr *sa, char *buf);
  */
 
 char *adns__sockaddr_ntoa(const struct sockaddr *sa, char *buf);


@@ -482,7 +468,8 @@ extern int adns__make_reverse_domain(const struct sockaddr *sa,
  */
 
 extern int adns__revparse_label(struct revparse_state *rps, int labnum,
  */
 
 extern int adns__revparse_label(struct revparse_state *rps, int labnum,

-                               const char *label, int lablen);
+                               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
 /* 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


@@ -492,12 +479,14 @@ extern int adns__revparse_label(struct revparse_state *rps, int labnum,
  * definitely invalid and the parse must be abandoned.
  */
 
  * definitely invalid and the parse must be abandoned.
  */
 

-extern int adns__revparse_done(struct revparse_state *rps, int nlabels,
-                              adns_rrtype *rrtype_r, struct af_addr *addr_r);
-/* Finishes parsing a reverse-domain name, given the total number of labels
- * in the name.  On success, fills in the 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.
+extern int 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.

  */
 
 /* From setup.c: */
  */
 
 /* From setup.c: */


@@ -865,6 +854,8 @@ void adns__update_expires(adns_query qu, unsigned long ttl,
 
 int vbuf__append_quoted1035(vbuf *vb, const byte *buf, int len);
 
 
 int vbuf__append_quoted1035(vbuf *vb, const byte *buf, int len);
 

+bool adns__labels_equal(const byte *a, int al, const byte *b, int bl);
+

 /* From event.c: */
 
 void adns__tcp_broken(adns_state ads, const char *what, const char *why);
 /* From event.c: */
 
 void adns__tcp_broken(adns_state ads, const char *what, const char *why);


@@ -912,6 +903,9 @@ static inline int ctype_digit(int c) { return c>='0' && c<='9'; }
 static inline int ctype_alpha(int c) {
   return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }
 static inline int ctype_alpha(int c) {
   return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }

+static inline int ctype_toupper(int c) {
+  return ctype_alpha(c) ? (c & ~32) : c;
+}

 static inline int ctype_822special(int c) {
   return strchr("()<>@,;:\\\".[]",c) != 0;
 }
 static inline int ctype_822special(int c) {
   return strchr("()<>@,;:\\\".[]",c) != 0;
 }