denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up notification sending in IKEv1 task manager

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:18 +01:00
parent accf46129a
commit b47052694f
1 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/task_manager_v1.c
+11 -39
View File
@@ -528,9 +528,8 @@ static status_t build_response(private_task_manager_t *this, message_t *request)
* Send a notify in a separate INFORMATIONAL exchange back to the sender. * Send a notify in a separate INFORMATIONAL exchange back to the sender.
* The notify protocol_id is set to ISAKMP * The notify protocol_id is set to ISAKMP
*/ */
static void send_notify_response(private_task_manager_t *this, static void send_notify(private_task_manager_t *this, message_t *request,
message_t *request, notify_type_t type, notify_type_t type)
chunk_t data, task_t *task)
{ {
message_t *response; message_t *response;
packet_t *packet; packet_t *packet;
@@ -548,30 +547,9 @@ static void send_notify_response(private_task_manager_t *this,
response->set_request(response, TRUE); response->set_request(response, TRUE);
this->rng->get_bytes(this->rng, sizeof(mid), (void*)&mid); this->rng->get_bytes(this->rng, sizeof(mid), (void*)&mid);
response->set_message_id(response, mid); response->set_message_id(response, mid);
response->add_payload(response, (payload_t*)
if (task) notify_payload_create_from_protocol_and_type(NOTIFY_V1,
{ PROTO_IKE, type));
/* Let the task build the response */
if (task->build(task,response) != SUCCESS)
{
response->destroy(response);
return;
}
}
else
{
notify_payload_t *notify;
notify = notify_payload_create_from_protocol_and_type(NOTIFY_V1,
PROTO_IKE, type);
if (data.ptr)
{
notify->set_notification_data(notify, data);
}
response->add_payload(response, (payload_t*)notify);
}
me = this->ike_sa->get_my_host(this->ike_sa); me = this->ike_sa->get_my_host(this->ike_sa);
if (me->is_anyaddr(me)) if (me->is_anyaddr(me))
@@ -826,28 +804,23 @@ static status_t parse_message(private_task_manager_t *this, message_t *msg)
{ {
case NOT_SUPPORTED: case NOT_SUPPORTED:
DBG1(DBG_IKE, "unsupported exchange type"); DBG1(DBG_IKE, "unsupported exchange type");
send_notify_response(this, msg, send_notify(this, msg, INVALID_EXCHANGE_TYPE);
INVALID_EXCHANGE_TYPE, chunk_empty, NULL);
break; break;
case PARSE_ERROR: case PARSE_ERROR:
DBG1(DBG_IKE, "message parsing failed"); DBG1(DBG_IKE, "message parsing failed");
send_notify_response(this, msg, send_notify(this, msg, PAYLOAD_MALFORMED);
PAYLOAD_MALFORMED, chunk_empty, NULL);
break; break;
case VERIFY_ERROR: case VERIFY_ERROR:
DBG1(DBG_IKE, "message verification failed"); DBG1(DBG_IKE, "message verification failed");
send_notify_response(this, msg, send_notify(this, msg, PAYLOAD_MALFORMED);
PAYLOAD_MALFORMED, chunk_empty, NULL);
break; break;
case FAILED: case FAILED:
DBG1(DBG_IKE, "integrity check failed"); DBG1(DBG_IKE, "integrity check failed");
send_notify_response(this, msg, send_notify(this, msg, INVALID_HASH_INFORMATION);
INVALID_HASH_INFORMATION, chunk_empty, NULL);
break; break;
case INVALID_STATE: case INVALID_STATE:
DBG1(DBG_IKE, "found encrypted message, but no keys available"); DBG1(DBG_IKE, "found encrypted message, but no keys available");
send_notify_response(this, msg, send_notify(this, msg, PAYLOAD_MALFORMED);
PAYLOAD_MALFORMED, chunk_empty, NULL);
default: default:
break; break;
} }
@@ -925,8 +898,7 @@ METHOD(task_manager_t, process_message, status_t,
/* no config found for these hosts, destroy */ /* no config found for these hosts, destroy */
DBG1(DBG_IKE, "no IKE config found for %H...%H, sending %N", DBG1(DBG_IKE, "no IKE config found for %H...%H, sending %N",
me, other, notify_type_names, NO_PROPOSAL_CHOSEN); me, other, notify_type_names, NO_PROPOSAL_CHOSEN);
send_notify_response(this, msg, send_notify(this, msg, NO_PROPOSAL_CHOSEN);
NO_PROPOSAL_CHOSEN, chunk_empty, NULL);
return DESTROY_ME; return DESTROY_ME;
} }
this->ike_sa->set_ike_cfg(this->ike_sa, ike_cfg); this->ike_sa->set_ike_cfg(this->ike_sa, ike_cfg);