From: Martin Willi <martin@revosec.ch>
Date: Mon, 27 Feb 2012 13:49:22 +0000 (+0100)
Subject: Removed libcharon dependencies from generic RADIUS protocol support
X-Git-Tag: 4.6.3~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=990fda9d881e502e2974fc9f6feb07cefce1aa6b;p=thirdparty%2Fstrongswan.git

Removed libcharon dependencies from generic RADIUS protocol support
---

diff --git a/src/libcharon/plugins/eap_radius/eap_radius.c b/src/libcharon/plugins/eap_radius/eap_radius.c
index d62bcd7d0b..f2b47e3f0d 100644
--- a/src/libcharon/plugins/eap_radius/eap_radius.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius.c
@@ -188,6 +188,10 @@ METHOD(eap_method_t, initiate, status_t,
 		}
 		response->destroy(response);
 	}
+	else
+	{
+		charon->bus->alert(charon->bus, ALERT_RADIUS_NOT_RESPONDING);
+	}
 	request->destroy(request);
 	return status;
 }
diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
index cd81cfc84f..25013f62d0 100644
--- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
@@ -134,6 +134,10 @@ static bool send_message(private_eap_radius_accounting_t *this,
 			ack = response->get_code(response) == RMC_ACCOUNTING_RESPONSE;
 			response->destroy(response);
 		}
+		else
+		{
+			charon->bus->alert(charon->bus, ALERT_RADIUS_NOT_RESPONDING);
+		}
 		client->destroy(client);
 	}
 	return ack;
diff --git a/src/libcharon/plugins/eap_radius/radius_client.c b/src/libcharon/plugins/eap_radius/radius_client.c
index 245308e594..1a67096cb3 100644
--- a/src/libcharon/plugins/eap_radius/radius_client.c
+++ b/src/libcharon/plugins/eap_radius/radius_client.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <daemon.h>
+#include <debug.h>
 #include <utils/host.h>
 #include <utils/linked_list.h>
 #include <threading/condvar.h>
@@ -116,7 +116,6 @@ METHOD(radius_client_t, request, radius_message_t*,
 		return res;
 	}
 	this->server->put_socket(this->server, socket, FALSE);
-	charon->bus->alert(charon->bus, ALERT_RADIUS_NOT_RESPONDING);
 	return NULL;
 }
 
diff --git a/src/libcharon/plugins/eap_radius/radius_message.c b/src/libcharon/plugins/eap_radius/radius_message.c
index 9d7bf3efae..ad8875423f 100644
--- a/src/libcharon/plugins/eap_radius/radius_message.c
+++ b/src/libcharon/plugins/eap_radius/radius_message.c
@@ -15,7 +15,7 @@
 
 #include "radius_message.h"
 
-#include <daemon.h>
+#include <debug.h>
 #include <crypto/hashers/hasher.h>
 
 typedef struct private_radius_message_t private_radius_message_t;