update copyright dates and ADNS_VERSION_STRING

[adns] / client / adnshost.h

diff --git a/client/adnshost.h b/client/adnshost.h
index 919a758adbf179b58d3ac2b69ca62878ae5b6242..30dd4813cbdda8711151ccd7c4df1c7f85fe868e 100644 (file)
--- a/client/adnshost.h
+++ b/client/adnshost.h
@@ -4,11 +4,11 @@
  */
 /*
  *  This file is
  */
 /*
  *  This file is

- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>

  *
  *  It is part of adns, which is
  *
  *  It is part of adns, which is

- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>

  *  
  *  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
  *  
  *  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


@@ -28,6 +28,7 @@
 #ifndef ADNSHOST_H_INCLUDED
 #define ADNSHOST_H_INCLUDED
 
 #ifndef ADNSHOST_H_INCLUDED
 #define ADNSHOST_H_INCLUDED
 

+#include <stdlib.h>

 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>


@@ -35,29 +36,41 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>

+#include <time.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>

 
 #include "config.h"
 #include "adns.h"
 #include "dlist.h"
 
 #include "config.h"
 #include "adns.h"
 #include "dlist.h"

+#include "client.h"
+
+#ifdef ADNS_REGRESS_TEST
+# include "hredirect.h"
+#endif

 
 /* declarations related to option processing */
 
 struct optioninfo;
 
 /* declarations related to option processing */
 
 struct optioninfo;

-typedef void optfunc(const struct optioninfo *oi, const char *arg);
+typedef void optfunc(const struct optioninfo *oi, const char *arg, const char *arg2);

 
 struct optioninfo {
   enum oi_type {
     ot_end, ot_desconly,
 
 struct optioninfo {
   enum oi_type {
     ot_end, ot_desconly,

-    ot_flag, ot_value, ot_func, ot_funcarg
+    ot_flag, ot_value, ot_func, ot_funcarg, ot_funcarg2

   } type;
   const char *desc;
   const char *sopt, *lopt;
   int *storep, value;
   optfunc *func;
   } type;
   const char *desc;
   const char *sopt, *lopt;
   int *storep, value;
   optfunc *func;

-  const char *argdesc;
+  const char *argdesc, *argdesc2;

 };
 
 enum ttlmode { tm_none, tm_rel, tm_abs };
 };
 
 enum ttlmode { tm_none, tm_rel, tm_abs };

+enum outputformat { fmt_default, fmt_simple, fmt_inline, fmt_asynch };

 
 struct perqueryflags_remember {
   int show_owner, show_type, show_cname;
 
 struct perqueryflags_remember {
   int show_owner, show_type, show_cname;


@@ -68,22 +81,23 @@ extern int ov_env, ov_pipe, ov_asynch;
 extern int ov_verbose;
 extern adns_rrtype ov_type;
 extern int ov_search, ov_qc_query, ov_qc_anshost, ov_qc_cname;
 extern int ov_verbose;
 extern adns_rrtype ov_type;
 extern int ov_search, ov_qc_query, ov_qc_anshost, ov_qc_cname;

-extern int ov_tcp, ov_cname;
+extern int ov_tcp, ov_cname, ov_format;

 extern char *ov_id;
 extern struct perqueryflags_remember ov_pqfr;
 
 extern char *ov_id;
 extern struct perqueryflags_remember ov_pqfr;
 

-extern optfunc of_help, of_type, of_asynch_id, of_cancel_id;
+extern optfunc of_config, of_version, of_help, of_type, of_ptr, of_reverse;
+extern optfunc of_asynch_id, of_cancel_id;

 
 const struct optioninfo *opt_findl(const char *opt);
 const struct optioninfo *opt_finds(const char **optp);
 
 const struct optioninfo *opt_findl(const char *opt);
 const struct optioninfo *opt_finds(const char **optp);

-void opt_do(const struct optioninfo *oip, const char *arg, int invert);
+void opt_do(const struct optioninfo *oip, int invert, const char *arg, const char *arg2);

 
 /* declarations related to query processing */
 
 struct query_node {
   struct query_node *next, *back;
   struct perqueryflags_remember pqfr;
 
 /* declarations related to query processing */
 
 struct query_node {
   struct query_node *next, *back;
   struct perqueryflags_remember pqfr;

-  char *id;
+  char *id, *owner;

   adns_query qu;
 };
 
   adns_query qu;
 };
 


@@ -94,19 +108,22 @@ void ensure_adns_init(void);
 void query_do(const char *domain);
 void query_done(struct query_node *qun, adns_answer *answer);
 
 void query_do(const char *domain);
 void query_done(struct query_node *qun, adns_answer *answer);
 

-void of_asynch_id(const struct optioninfo *oi, const char *arg);
-void of_cancel_id(const struct optioninfo *oi, const char *arg);
+void type_info(adns_rrtype type, const char **typename_r,
+              const void *datap, char **data_r);
+  /* wrapper for adns_rr_info which uses a static buffer to provide
+   * *typename_r for adns_r_unknown */
+

 
 /* declarations related to main program and useful utility functions */
 
 void sysfail(const char *what, int errnoval) NONRETURNING;
 void usageerr(const char *what, ...) NONRETURNPRINTFFORMAT(1,2);
 void outerr(void) NONRETURNING;
 
 /* declarations related to main program and useful utility functions */
 
 void sysfail(const char *what, int errnoval) NONRETURNING;
 void usageerr(const char *what, ...) NONRETURNPRINTFFORMAT(1,2);
 void outerr(void) NONRETURNING;

-void setnonblock(int fd, int nonblock);

 
 void *xmalloc(size_t sz);
 char *xstrsave(const char *str);
 
 extern int rcode;
 
 void *xmalloc(size_t sz);
 char *xstrsave(const char *str);
 
 extern int rcode;

+extern const char *config_text; /* 0 => use defaults */

 
 #endif
 
 #endif