@@ -1,11 +1,14 @@

[adns] / client / adnshost.h

diff --git a/client/adnshost.h b/client/adnshost.h
index 46762f3f0469971c40fefb868ad13b6e9a47d830..1918047a8dd6faf2cc27ac7d62395a0aa681b74f 100644 (file)
--- a/client/adnshost.h
+++ b/client/adnshost.h
@@ -28,27 +28,43 @@
 #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 <signal.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <assert.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+

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

+#include "dlist.h"

 
 /* declarations related to option processing */
 
 
 /* declarations related to option processing */
 

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

 
 

-struct optinfo {
+struct optioninfo {

   enum oi_type {
     ot_end, ot_desconly,
   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;


@@ -57,20 +73,43 @@ struct perqueryflags_remember {
 
 extern int ov_env, ov_pipe, ov_asynch;
 extern int ov_verbose;
 
 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_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_help, of_type, of_ptr, of_reverse, of_asynch_id, of_cancel_id;
+
+const struct optioninfo *opt_findl(const char *opt);
+const struct optioninfo *opt_finds(const char **optp);
+void opt_do(const struct optioninfo *oip, int invert, const char *arg, const char *arg2);

 
 /* declarations related to query processing */
 
 
 /* declarations related to query processing */
 

-static void of_asynch_id(const struct optinfo *oi, const char *arg) { abort(); }
-static void of_cancel_id(const struct optinfo *oi, const char *arg) { abort(); }
+struct query_node {
+  struct query_node *next, *back;
+  struct perqueryflags_remember pqfr;
+  char *id, *owner;
+  adns_query qu;
+};
+
+extern adns_state ads;
+extern struct outstanding_list { struct query_node *head, *tail; } outstanding;
+
+void ensure_adns_init(void);
+void query_do(const char *domain);
+void query_done(struct query_node *qun, adns_answer *answer);

 
 /* declarations related to main program and useful utility functions */
 
 void sysfail(const char *what, int errnoval) 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 *xmalloc(size_t sz);
+char *xstrsave(const char *str);
+
+extern int rcode;

 
 #endif
 
 #endif