Import changes from chiark: cvs rdiff -u -r tochiark-1998-11-08 -r

[adns.git] / src / types.c

diff --git a/src/types.c b/src/types.c
index 5219ff5c887d6a72e3e28f8b21334ad22bbae1e2..436cc87734aa44557eeb373ce3ee77118e6945c9 100644 (file)
--- a/src/types.c
+++ b/src/types.c
@@ -20,9 +20,11 @@
  *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
  */
 
+#include <arpa/inet.h>
+
 #include "internal.h"
 
-static adns_status rp_inaddr(adns_query qu, int serv,
+static adns_status pa_inaddr(adns_query qu, int serv,
                             const byte *dgram, int dglen, int cbyte, int max,
                             void *store_r) {
   struct in_addr *dr= store_r;
@@ -32,13 +34,25 @@ static adns_status rp_inaddr(adns_query qu, int serv,
   return adns_s_ok;
 }
 
-static void rmf_null(adns_query qu, void *data) { }
+static adns_status cs_inaddr(vbuf *vb, const void *data) {
+  const struct in_addr *dp= data;
+  const char *ia;
+
+  ia= inet_ntoa(*dp); assert(ia);
+  return adns__vbuf_appendstr(vb,ia) ? adns_s_ok : adns_s_nolocalmem;
+}
 
-#define TYPE_SF(size,func,free)    size, rp_##func, rmf_##free
-#define TYPE_SN(size,func)         size, rp_##func, rmf_null
+static void fr_null(adns_query qu, void *data) { }
+
+#define TYPE_SF(size,func,cp,free) size, pa_##func, fr_##free, cs_##cp
+#define TYPE_SN(size,func,cp)      size, pa_##func, fr_null, cs_##cp
 #define TYPESZ_M(member)           (sizeof(((adns_answer*)0)->rrs.member))
-#define TYPE_MF(member,parse)      TYPE_SF(TYPESZ_M(member),parse,member)
-#define TYPE_MN(member,parse)      TYPE_SN(TYPESZ_M(member),parse)
+#define TYPE_MF(memb,parse)        TYPE_SF(TYPESZ_M(memb),parse,memb,memb)
+#define TYPE_MN(memb,parse)        TYPE_SN(TYPESZ_M(memb),parse,memb)
+
+#define DEEP_MEMB(memb) TYPESZ_M(memb), fr_##memb, cs_##memb
+#define FLAT_MEMB(memb) TYPESZ_M(memb), fr_null, cs_##memb
+#define NULL_MEMB       0, fr_null, cs_null
 
 /* TYPE_<ms><nf>
  *  ms is M  specify member name
@@ -49,26 +63,26 @@ static void rmf_null(adns_query qu, void *data) { }
 
 static const typeinfo typeinfos[] = {
   /* Must be in ascending order of rrtype ! */
-  /* rr type code     name             style     member     size  parser */
+  /* rr type code   rrt     fmt        mem.mgmt  member      parser        */
   
-  {  adns_r_a,        "A",             TYPE_MN(  inaddr,          inaddr       ) },
-#if 0 /*fixme*/                                               
-  {  adns_r_ns_raw,   "NS(raw)",       TYPE_MF(  str,             domain_raw   ) },
-  {  adns_r_cname,    "CNAME",         TYPE_MF(  str,             domain_raw   ) },
-  {  adns_r_soa_raw,  "SOA(raw)",      TYPE_MF(  soa,             soa          ) },
-  {  adns_r_null,     "NULL",          TYPE_SN(              0,   null         ) },
-  {  adns_r_ptr_raw,  "PTR(raw)",      TYPE_MF(  str,             domain_raw   ) },
-  {  adns_r_hinfo,    "HINFO",         TYPE_MF(  strpair,         hinfo        ) },
-  {  adns_r_mx_raw,   "MX(raw)",       TYPE_MF(  intstr,          mx_raw       ) },
-  {  adns_r_txt,      "TXT",           TYPE_MF(  str,             txt          ) },
-  {  adns_r_rp_raw,   "RP(raw)",       TYPE_MF(  strpair,         rp           ) },
-                                                             
-  {  adns_r_ns,       "NS(+addr)",     TYPE_MF(  dmaddr,          dmaddr       ) },
-  {  adns_r_ptr,      "PTR(checked)",  TYPE_MF(  str,             ptr          ) },
-  {  adns_r_mx,       "MX(+addr)",     TYPE_MF(  intdmaddr,       mx           ) },
-                                                             
-  {  adns_r_soa,      "SOA(822)",      TYPE_MF(  soa,             soa          ) },
-  {  adns_r_rp,       "RP(822)",       TYPE_MF(  strpair,         rp           ) },
+  { adns_r_a,       "A",     0,        FLAT_MEMB(inaddr),    pa_inaddr      },
+#if 0 /*fixme*/                                                                   
+  { adns_r_ns_raw,  "NS",   "raw",     DEEP_MEMB(str),       pa_domain_raw  },
+  { adns_r_cname,   "CNAME", 0,        DEEP_MEMB(str),       pa_domain_raw  },
+  { adns_r_soa_raw, "SOA",  "raw",     DEEP_MEMB(soa),       pa_soa         },
+  { adns_r_null,    "NULL",  0,        NULL_MEMB,            pa_null        },
+  { adns_r_ptr_raw, "PTR",  "raw",     DEEP_MEMB(str),       pa_domain_raw  },
+  { adns_r_hinfo,   "HINFO", 0,        DEEP_MEMB(strpair),   pa_hinfo       },
+  { adns_r_mx_raw,  "MX",   "raw",     DEEP_MEMB(intstr),    pa_mx_raw      },
+  { adns_r_txt,     "TXT",   0,        DEEP_MEMB(str),       pa_txt         },
+  { adns_r_rp_raw,  "RP",   "raw",     DEEP_MEMB(strpair),   pa_rp          },
+                                                                          
+  { adns_r_ns,      "NS",   "+addr",   DEEP_MEMB(dmaddr),    pa_dmaddr      },
+  { adns_r_ptr,     "PTR",  "checked", DEEP_MEMB(str),       pa_ptr         },
+  { adns_r_mx,      "MX",   "+addr",   DEEP_MEMB(intdmaddr), pa_mx          },
+                                                                          
+  { adns_r_soa,     "SOA",  "822",     DEEP_MEMB(soa),       pa_soa         },
+  { adns_r_rp,      "RP",   "822",     DEEP_MEMB(strpair),   pa_rp          },
 #endif
 };