ng_ipaddr.h must include netinet/in.h.

[ngircd-alex.git] / src / ngircd / resolve.h

diff --git a/src/ngircd/resolve.h b/src/ngircd/resolve.h
index b13962a86b57bfda1c079c2e1e31243b62c75a97..8ff88c8b128ff8398b374c2f5dd78403818aece5 100644 (file)
--- a/src/ngircd/resolve.h
+++ b/src/ngircd/resolve.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: resolve.h,v 1.9 2005/07/28 16:13:09 fw Exp $
+ * $Id: resolve.h,v 1.14 2008/02/26 22:04:17 fw Exp $
  *
  * Asynchronous resolver (header)
  */
@@ -18,38 +18,24 @@
 #define __resolve_h__
 
 #include "array.h"
+#include "tool.h"
+#include "ng_ipaddr.h"
 
-#ifdef HAVE_SYS_SELECT_H
-#      include <sys/select.h>
-#endif
-#include <sys/types.h>
-#include <netinet/in.h>
-
-
-typedef struct _Res_Stat
-{
-       int pid;                        /* PID of resolver process */
-       int pipe[2];                    /* pipe for lookup result */
-       int stage;                      /* Hostname/IP(0) or IDENT(1)? */
-       array buffer;                   /* resolved hostname / ident result */
+/* This struct must not be accessed directly */
+typedef struct _Res_Stat {
+       pid_t pid;                      /* PID of resolver process */
+       int resolver_fd;                /* pipe fd for lookup result. */
 } RES_STAT;
 
 
-GLOBAL fd_set Resolver_FDs;
-
-
-GLOBAL void Resolve_Init PARAMS(( void ));
-
-#ifdef IDENTAUTH
-GLOBAL RES_STAT *Resolve_Addr PARAMS(( struct sockaddr_in *Addr, int Sock ));
-#else
-GLOBAL RES_STAT *Resolve_Addr PARAMS(( struct sockaddr_in *Addr ));
-#endif
-
-GLOBAL RES_STAT *Resolve_Name PARAMS(( char *Host ));
+#define Resolve_Getfd(x)               ((x)->resolver_fd)
+#define Resolve_INPROGRESS(x)          ((x)->resolver_fd >= 0)
 
+GLOBAL bool Resolve_Addr PARAMS(( RES_STAT *s, const ng_ipaddr_t *Addr, int identsock, void (*cbfunc)(int, short)));
+GLOBAL bool Resolve_Name PARAMS(( RES_STAT *s, const char *Host, void (*cbfunc)(int, short) ));
+GLOBAL size_t Resolve_Read PARAMS(( RES_STAT *s, void *buf, size_t buflen));
+GLOBAL void Resolve_Init PARAMS(( RES_STAT *s));
+GLOBAL bool Resolve_Shutdown PARAMS(( RES_STAT *s));
 
 #endif
-
-
 /* -eof- */