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

kernel-handler: Whitespace cleanups

Browse Source
This commit is contained in:
Martin Willi
2013-10-11 10:15:21 +02:00
parent f6037b5506
commit 44e6aa4fb7
1 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/kernel/kernel_handler.c
+27 -31
View File
@@ -35,7 +35,6 @@ struct private_kernel_handler_t {
* Public part of kernel_handler_t object. * Public part of kernel_handler_t object.
*/ */
kernel_handler_t public; kernel_handler_t public;
}; };
/** /**
@@ -58,18 +57,17 @@ METHOD(kernel_listener_t, acquire, bool,
private_kernel_handler_t *this, u_int32_t reqid, private_kernel_handler_t *this, u_int32_t reqid,
traffic_selector_t *src_ts, traffic_selector_t *dst_ts) traffic_selector_t *src_ts, traffic_selector_t *dst_ts)
{ {
job_t *job;
if (src_ts && dst_ts) if (src_ts && dst_ts)
{ {
DBG1(DBG_KNL, "creating acquire job for policy %R === %R " DBG1(DBG_KNL, "creating acquire job for policy %R === %R with "
"with reqid {%u}", src_ts, dst_ts, reqid); "reqid {%u}", src_ts, dst_ts, reqid);
} }
else else
{ {
DBG1(DBG_KNL, "creating acquire job for policy with reqid {%u}", reqid); DBG1(DBG_KNL, "creating acquire job for policy with reqid {%u}", reqid);
} }
job = (job_t*)acquire_job_create(reqid, src_ts, dst_ts); lib->processor->queue_job(lib->processor,
lib->processor->queue_job(lib->processor, job); (job_t*)acquire_job_create(reqid, src_ts, dst_ts));
return TRUE; return TRUE;
} }
@@ -77,20 +75,21 @@ METHOD(kernel_listener_t, expire, bool,
private_kernel_handler_t *this, u_int32_t reqid, u_int8_t protocol, private_kernel_handler_t *this, u_int32_t reqid, u_int8_t protocol,
u_int32_t spi, bool hard) u_int32_t spi, bool hard)
{ {
job_t *job;
protocol_id_t proto = proto_ip2ike(protocol); protocol_id_t proto = proto_ip2ike(protocol);
DBG1(DBG_KNL, "creating %s job for %N CHILD_SA with SPI %.8x "
"and reqid {%u}", hard ? "delete" : "rekey", DBG1(DBG_KNL, "creating %s job for %N CHILD_SA with SPI %.8x and reqid {%u}",
protocol_id_names, proto, ntohl(spi), reqid); hard ? "delete" : "rekey", protocol_id_names, proto, ntohl(spi), reqid);
if (hard) if (hard)
{ {
job = (job_t*)delete_child_sa_job_create(reqid, proto, spi, hard); lib->processor->queue_job(lib->processor,
(job_t*)delete_child_sa_job_create(reqid, proto, spi, hard));
} }
else else
{ {
job = (job_t*)rekey_child_sa_job_create(reqid, proto, spi); lib->processor->queue_job(lib->processor,
(job_t*)rekey_child_sa_job_create(reqid, proto, spi));
} }
lib->processor->queue_job(lib->processor, job);
return TRUE; return TRUE;
} }
@@ -98,11 +97,11 @@ METHOD(kernel_listener_t, mapping, bool,
private_kernel_handler_t *this, u_int32_t reqid, u_int32_t spi, private_kernel_handler_t *this, u_int32_t reqid, u_int32_t spi,
host_t *remote) host_t *remote)
{ {
job_t *job; DBG1(DBG_KNL, "NAT mappings of ESP CHILD_SA with SPI %.8x and reqid {%u} "
DBG1(DBG_KNL, "NAT mappings of ESP CHILD_SA with SPI %.8x and " "changed, queuing update job", ntohl(spi), reqid);
"reqid {%u} changed, queuing update job", ntohl(spi), reqid);
job = (job_t*)update_sa_job_create(reqid, remote); lib->processor->queue_job(lib->processor,
lib->processor->queue_job(lib->processor, job); (job_t*)update_sa_job_create(reqid, remote));
return TRUE; return TRUE;
} }
@@ -111,24 +110,22 @@ METHOD(kernel_listener_t, migrate, bool,
traffic_selector_t *src_ts, traffic_selector_t *dst_ts, traffic_selector_t *src_ts, traffic_selector_t *dst_ts,
policy_dir_t direction, host_t *local, host_t *remote) policy_dir_t direction, host_t *local, host_t *remote)
{ {
job_t *job; DBG1(DBG_KNL, "creating migrate job for policy %R === %R %N with reqid {%u}",
DBG1(DBG_KNL, "creating migrate job for policy %R === %R %N with " src_ts, dst_ts, policy_dir_names, direction, reqid, local);
"reqid {%u}", src_ts, dst_ts, policy_dir_names, direction,
reqid, local); lib->processor->queue_job(lib->processor,
job = (job_t*)migrate_job_create(reqid, src_ts, dst_ts, direction, local, (job_t*)migrate_job_create(reqid, src_ts, dst_ts,
remote); direction, local, remote));
lib->processor->queue_job(lib->processor, job);
return TRUE; return TRUE;
} }
METHOD(kernel_listener_t, roam, bool, METHOD(kernel_listener_t, roam, bool,
private_kernel_handler_t *this, bool address) private_kernel_handler_t *this, bool address)
{ {
job_t *job; DBG2(DBG_KNL, "creating roam job %s",
DBG2(DBG_KNL, "creating roam job %s", address ? "due to address/link change" address ? "due to address/link change" : "due to route change");
: "due to route change");
job = (job_t*)roam_job_create(address); lib->processor->queue_job(lib->processor, (job_t*)roam_job_create(address));
lib->processor->queue_job(lib->processor, job);
return TRUE; return TRUE;
} }
@@ -162,4 +159,3 @@ kernel_handler_t *kernel_handler_create()
return &this->public; return &this->public;
} }