two small fixes

This commit is contained in:
Tobias Brunner
2008-03-13 15:03:06 +00:00
parent e42db695e2
commit df3462ddbe
5 changed files with 7 additions and 7 deletions
@@ -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 * we do not check the status, but NEED_MORE would be returned on success
* because the registered callback returns FALSE then * because the registered callback returns FALSE then
* this->mediation_sa_id is set in the callback */ * this->mediation_sa_id is set in the callback */
charon->interfaces->initiate(charon->interfaces, charon->controller->initiate(charon->controller,
mediation_cfg, NULL, (interface_manager_cb_t)initiate_callback, this); mediation_cfg, NULL, (controller_cb_t)initiate_callback, this);
if (!this->mediation_sa_id) if (!this->mediation_sa_id)
{ {
DBG1(DBG_JOB, "initiating mediation connection '%s' failed", DBG1(DBG_JOB, "initiating mediation connection '%s' failed",
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2007 Tobias Brunner * Copyright (C) 2007-2008 Tobias Brunner
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
* *
* This program is free software; you can redistribute it and/or modify it * 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->public.process_check = (void(*)(connect_manager_t*,message_t*))process_check;
this->hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1); 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"); DBG1(DBG_IKE, "unable to create connect manager, SHA1 not supported");
free(this); free(this);
+1 -1
View File
@@ -318,7 +318,7 @@ static status_t build_i(private_ike_p2p_t *this, message_t *message)
} }
else else
{ {
/* FIXME: should we make that configurable */ /* FIXME: should we make that configurable? */
message->add_notify(message, FALSE, P2P_CALLBACK, chunk_empty); message->add_notify(message, FALSE, P2P_CALLBACK, chunk_empty);
} }
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2007 Tobias Brunner * Copyright (C) 2007-2008 Tobias Brunner
* Copyright (C) 2005-2006 Martin Willi * Copyright (C) 2005-2006 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil
+1 -1
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2007 Tobias Brunner * Copyright (C) 2007-2008 Tobias Brunner
* Copyright (C) 2005-2006 Martin Willi * Copyright (C) 2005-2006 Martin Willi
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
* Hochschule fuer Technik Rapperswil * Hochschule fuer Technik Rapperswil