X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fevent_client.h;h=4be26614c215837d904f70d508aafd5a82e1f1e2;hb=4b49575b46e9726cc7f629c935bf4e110361d01c;hp=90f5247a61126be23a8a99436f5e9677d01c93cf;hpb=72a4e9f304cff9f487b334f0d70f09142fee4183;p=citadel.git

diff --git a/citadel/event_client.h b/citadel/event_client.h
index 90f5247a6..4be26614c 100644
--- a/citadel/event_client.h
+++ b/citadel/event_client.h
@@ -3,18 +3,12 @@
  * Copyright (c) 1998-2012 by the citadel.org team
  *
  *  This program is open source software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License, version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef __EVENT_CLIENT_H__
@@ -30,6 +24,7 @@
 #include <curl/curl.h>
 
 typedef struct AsyncIO AsyncIO;
+typedef struct CitContext CitContext;
 
 typedef enum _eNextState {
 	eSendDNSQuery,
@@ -76,6 +71,8 @@ typedef struct _DNSQueryParts {
 	ParseDNSAnswerCb DNS_CB;
 	IO_CallBack PostDNS;
 
+	const char *QueryTYPE;
+	const char *QStr;
 	int DNSStatus;
 	void *VParsedDNSReply;
 	FreeDNSReply DNSReplyFree;
@@ -104,9 +101,8 @@ typedef struct __evcares_data {
 	ev_io recv_event,
 		send_event;
 	ev_timer timeout;           /* timeout while requesting ips */
-#ifdef DEBUG_CARES
 	short int SourcePort;
-#endif
+
 	struct ares_options Options;
 	ares_channel Channel;
 	DNSQueryParts *Query;
@@ -171,7 +167,7 @@ struct AsyncIO {
 
 	/* Context specific data; Hint: put AsyncIO in there */
 	void *Data;        /* application specific data */
-	void *CitContext;  /* Citadel Session context... */
+	CitContext *CitContext;  /* Citadel Session context... */
 };
 
 typedef struct _IOAddHandler {
@@ -188,48 +184,61 @@ extern int DebugCAres;
 
 #define CCID ((CitContext*)IO->CitContext)->cs_pid
 
-#define EV_syslog(LEVEL, FORMAT, ...) \
-	EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d]" FORMAT, IO->ID, CCID, __VA_ARGS__)
+#define EVQ_syslog(LEVEL, FORMAT, ...)					\
+	EDBGLOG (LEVEL) syslog(LEVEL, "IOQ " FORMAT, __VA_ARGS__)
+
+#define EVQM_syslog(LEVEL, FORMAT)			\
+	EDBGLOG (LEVEL) syslog(LEVEL, "IO " FORMAT)
 
-#define EVM_syslog(LEVEL, FORMAT) \
-	EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d]" FORMAT, IO->ID, CCID)
+#define EV_syslog(LEVEL, FORMAT, ...)					\
+	EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID, __VA_ARGS__)
 
-#define EVNC_syslog(LEVEL, FORMAT, ...) \
-	EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID, __VA_ARGS__)
+#define EVM_syslog(LEVEL, FORMAT)					\
+	EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID)
+
+#define EVNC_syslog(LEVEL, FORMAT, ...)					\
+	EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld] " FORMAT, IO->ID, __VA_ARGS__)
 
 #define EVNCM_syslog(LEVEL, FORMAT) EDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]" FORMAT, IO->ID)
 
 
 #define CDBGLOG() if (DebugCAres != 0)
+#define CEDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugCAres != 0))
 #define EV_DNS_LOG_START(a)							\
-	CDBGLOG () syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %p FD %d", IO->ID, CCID, &IO->a, IO->a.fd); \
-	EV_backtrace(IO);
+	CDBGLOG () {syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %s %p FD %d", IO->ID, CCID, __FUNCTION__, &IO->a, IO->a.fd); \
+		    EV_backtrace(IO);}
 
 #define EV_DNS_LOG_STOP(a)							\
-	CDBGLOG () syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %p FD %d", IO->ID, CCID, &IO->a, IO->a.fd); \
-	EV_backtrace(IO);
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %s %p FD %d", IO->ID, CCID, __FUNCTION__, &IO->a, IO->a.fd); \
+		     EV_backtrace(IO);}
 
 #define EV_DNS_LOG_INIT(a)							\
-	CDBGLOG () syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p FD %d", IO->ID, CCID, &IO->a, IO->a.fd); \
-	EV_backtrace(IO);
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %s %p FD %d", IO->ID, CCID, __FUNCTION__, &IO->a, IO->a.fd); \
+		     EV_backtrace(IO);}
 
 #define EV_DNS_LOGT_START(a)							\
-	CDBGLOG () syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %p", IO->ID, CCID, &IO->a); \
-	EV_backtrace(IO);
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] + Starting " #a " %s %p", IO->ID, CCID, __FUNCTION__, &IO->a); \
+		     EV_backtrace(IO);}
 
 #define EV_DNS_LOGT_STOP(a)							\
-	CDBGLOG () syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %p", IO->ID, CCID, &IO->a); \
-	EV_backtrace(IO);
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] - Stopping " #a " %s %p", IO->ID, CCID, __FUNCTION__, &IO->a); \
+		     EV_backtrace(IO); }
 
 #define EV_DNS_LOGT_INIT(a)							\
-	CDBGLOG () syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p", IO->ID, CCID, &IO->a); \
-	EV_backtrace(IO);
+	CDBGLOG () { syslog(LOG_DEBUG, "IO[%ld]CC[%d] * Init " #a " %p", IO->ID, CCID, &IO->a); \
+		     EV_backtrace(IO);}
+
+#define EV_DNS_syslog(LEVEL, FORMAT, ...)				\
+	CEDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID, __VA_ARGS__)
 
+#define EVM_DNS_syslog(LEVEL, FORMAT)					\
+	CEDBGLOG (LEVEL) syslog(LEVEL, "IO[%ld]CC[%d] " FORMAT, IO->ID, CCID)
 
 void FreeAsyncIOContents(AsyncIO *IO);
 
 eNextState NextDBOperation(AsyncIO *IO, IO_CallBack CB);
 eNextState QueueDBOperation(AsyncIO *IO, IO_CallBack CB);
+void StopDBWatchers(AsyncIO *IO);
 eNextState QueueEventContext(AsyncIO *IO, IO_CallBack CB);
 eNextState QueueCurlContext(AsyncIO *IO);
 
@@ -254,7 +263,7 @@ void QueryCbDone(AsyncIO *IO);
 
 void StopClient(AsyncIO *IO);
 
-void StopClientWatchers(AsyncIO *IO);
+void StopClientWatchers(AsyncIO *IO, int CloseFD);
 
 void SetNextTimeout(AsyncIO *IO, double timeout);
 
@@ -264,7 +273,7 @@ void SetNextTimeout(AsyncIO *IO, double timeout);
 	do { \
 		sta = curl_easy_setopt(chnd, (CURLOPT_##s), (v));	\
 		if (sta)  {						\
-			syslog(LOG_ERR,				\
+			EVQ_syslog(LOG_ERR,				\
 			       "error setting option " #s		\
 			       " on curl handle: %s",			\
 			       curl_easy_strerror(sta));		\
@@ -290,6 +299,9 @@ int InitcURLIOStruct(AsyncIO *IO,
 		     IO_CallBack Terminate,
 		     IO_CallBack DBTerminate,
 		     IO_CallBack ShutdownAbort);
+void KillAsyncIOContext(AsyncIO *IO);
+void StopCurlWatchers(AsyncIO *IO);
+
 
 eNextState ReAttachIO(AsyncIO *IO,
 		      void *pData,