X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=client%2Fadnshost.h;h=1918047a8dd6faf2cc27ac7d62395a0aa681b74f;hb=2b1c6979bb36a0e3a5aaa7f18b0c72b528f886b9;hp=3ab665d576e5e215f0450782d61cde1a1cf258f0;hpb=9fa144996b8b6fdcc9b456ac6b19fc6b663c575c;p=adns.git

diff --git a/client/adnshost.h b/client/adnshost.h
index 3ab665d..1918047 100644
--- a/client/adnshost.h
+++ b/client/adnshost.h
@@ -28,6 +28,7 @@
 #ifndef ADNSHOST_H_INCLUDED
 #define ADNSHOST_H_INCLUDED
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -36,6 +37,11 @@
 #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 "dlist.h"
@@ -43,21 +49,22 @@
 /* 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,
-    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;
-  const char *argdesc;
+  const char *argdesc, *argdesc2;
 };
 
 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;
@@ -68,22 +75,22 @@ 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_tcp, ov_cname;
+extern int ov_tcp, ov_cname, ov_format;
 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, 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;
-  char *id;
+  char *id, *owner;
   adns_query qu;
 };
 
@@ -94,9 +101,6 @@ void ensure_adns_init(void);
 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);
-
 /* declarations related to main program and useful utility functions */
 
 void sysfail(const char *what, int errnoval) NONRETURNING;