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 d62bcd7d0be04a00a674b5dda3366f21cd203c44..f2b47e3f0d44254e23ba1bd493bf09c5706898f3 100644 (file)
--- 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 cd81cfc84ff1357b59540619aba9eaba31bc3db1..25013f62d00b30e031d9743dbf857690682e7abd 100644 (file)
--- 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 245308e5948b824bcb450ed6d605621baf6fc284..1a67096cb39b89f59f3d60919eeb1d551eca85fc 100644 (file)
--- 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 9d7bf3efae3c757b2aa299ff8b2d9d8a5e83defc..ad8875423f87ea3568a2f437a1d8edefb5229d8d 100644 (file)
--- 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;