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

[adns] / client / adnshost.h

diff --git a/client/adnshost.h b/client/adnshost.h
index d512b4f184a397b6919bd204b9403b26076c592d..1918047a8dd6faf2cc27ac7d62395a0aa681b74f 100644 (file)
--- a/client/adnshost.h
+++ b/client/adnshost.h
@@ -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>


@@ -36,6 +37,11 @@
 #include <stdlib.h>
 #include <assert.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 "dlist.h"
 #include "config.h"
 #include "adns.h"
 #include "dlist.h"


@@ -43,21 +49,22 @@
 /* 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 +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_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_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);
 
 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);
+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,15 +101,11 @@ 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);
-

 /* 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);
 
 void *xmalloc(size_t sz);
 char *xstrsave(const char *str);