two small fixes

diff --git a/src/charon/processing/jobs/initiate_mediation_job.c b/src/charon/processing/jobs/initiate_mediation_job.c
index 99da4d1ed5501056040a10c99c6d116456666e0e..37994206989eb3c9314d1b3af57b4c6375671162 100644 (file)
--- a/src/charon/processing/jobs/initiate_mediation_job.c
+++ b/src/charon/processing/jobs/initiate_mediation_job.c
@@ -115,8 +115,8 @@ static void initiate(private_initiate_mediation_job_t *this)
                 * we do not check the status, but NEED_MORE would be returned on success
                 * because the registered callback returns FALSE then
                 * this->mediation_sa_id is set in the callback */
-               charon->interfaces->initiate(charon->interfaces,
-                               mediation_cfg, NULL, (interface_manager_cb_t)initiate_callback, this);
+               charon->controller->initiate(charon->controller,
+                               mediation_cfg, NULL, (controller_cb_t)initiate_callback, this);
                if (!this->mediation_sa_id)
                {
                        DBG1(DBG_JOB, "initiating mediation connection '%s' failed",

diff --git a/src/charon/sa/connect_manager.c b/src/charon/sa/connect_manager.c
index a913a0735c31e797cb95142703d823080acb269f..fa5be96ec57474377d0d514c064ccdec4b2d97ce 100644 (file)
--- a/src/charon/sa/connect_manager.c
+++ b/src/charon/sa/connect_manager.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Tobias Brunner
+ * Copyright (C) 2007-2008 Tobias Brunner
  * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -1512,7 +1512,7 @@ connect_manager_t *connect_manager_create()
        this->public.process_check = (void(*)(connect_manager_t*,message_t*))process_check;
        
        this->hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1);
-       if (hasher == NULL)
+       if (this->hasher == NULL)
        {
                DBG1(DBG_IKE, "unable to create connect manager, SHA1 not supported");
                free(this);

diff --git a/src/charon/sa/tasks/ike_p2p.c b/src/charon/sa/tasks/ike_p2p.c
index ce3a3fd00a33dc7913ae81f672cacb0772d6891d..5a9ae00a4812fb1650bf30bd0a61741b7e1d302a 100644 (file)
--- a/src/charon/sa/tasks/ike_p2p.c
+++ b/src/charon/sa/tasks/ike_p2p.c
@@ -318,7 +318,7 @@ static status_t build_i(private_ike_p2p_t *this, message_t *message)
                        }
                        else
                        {
-                               /* FIXME: should we make that configurable */
+                               /* FIXME: should we make that configurable? */
                                message->add_notify(message, FALSE, P2P_CALLBACK, chunk_empty);
                        }
                        

diff --git a/src/libstrongswan/utils/linked_list.c b/src/libstrongswan/utils/linked_list.c
index 16913b934771971e875dac4217e944144a6cbe5e..ee46b2b8c7e894670ddaee7dc98364cc50333773 100644 (file)
--- a/src/libstrongswan/utils/linked_list.c
+++ b/src/libstrongswan/utils/linked_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Tobias Brunner
+ * Copyright (C) 2007-2008 Tobias Brunner
  * Copyright (C) 2005-2006 Martin Willi
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil

diff --git a/src/libstrongswan/utils/linked_list.h b/src/libstrongswan/utils/linked_list.h
index 3d7133f9da51ba6cfc02e405840b9f56e368ff34..07d759628c38d6f3e1108bf9d256f18fc3edfba4 100644 (file)
--- a/src/libstrongswan/utils/linked_list.h
+++ b/src/libstrongswan/utils/linked_list.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Tobias Brunner
+ * Copyright (C) 2007-2008 Tobias Brunner
  * Copyright (C) 2005-2006 Martin Willi
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil