X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fevent_client.c;h=27e8a8146ff9641a651982c06aaed0ddab5ac215;hp=d87d6697f8bfc0ea79489cea15be4617bb87cd02;hb=5268c0a9bf8202336b9e3e8b86f45d9d010f2811;hpb=88ce429160c3a4309df55bfa3abdf31154cbe2db

diff --git a/citadel/event_client.c b/citadel/event_client.c
index d87d6697f..27e8a8146 100644
--- a/citadel/event_client.c
+++ b/citadel/event_client.c
@@ -259,11 +259,11 @@ void ShutDownCLient(AsyncIO *IO)
 	ev_cleanup_stop(event_base, &IO->abort_by_shutdown);
 	StopClientWatchers(IO);
 
-	if (IO->DNSChannel != NULL) {
-		ares_destroy(IO->DNSChannel);
-		ev_io_stop(event_base, &IO->dns_recv_event);
-		ev_io_stop(event_base, &IO->dns_send_event);
-		IO->DNSChannel = NULL;
+	if (IO->DNS.Channel != NULL) {
+		ares_destroy(IO->DNS.Channel);
+		ev_io_stop(event_base, &IO->DNS.recv_event);
+		ev_io_stop(event_base, &IO->DNS.send_event);
+		IO->DNS.Channel = NULL;
 	}
 	assert(IO->Terminate);
 	IO->Terminate(IO);
@@ -683,12 +683,12 @@ IO_postdns_callback(struct ev_loop *loop, ev_idle *watcher, int revents)
 	AsyncIO *IO = watcher->data;
 	EV_syslog(LOG_DEBUG, "event: %s\n", __FUNCTION__);
 	become_session(IO->CitContext);
-	assert(IO->DNSFail);
-	assert(IO->DNSQuery->PostDNS);
-	switch (IO->DNSQuery->PostDNS(IO))
+	assert(IO->DNS.Fail);
+	assert(IO->DNS.Query->PostDNS);
+	switch (IO->DNS.Query->PostDNS(IO))
 	{
 	case eAbort:
-		switch (IO->DNSFail(IO)) {
+		switch (IO->DNS.Fail(IO)) {
 		case eAbort:
 			ShutDownCLient(IO);
 		default: