diff options
Diffstat (limited to 'src/charon/queues/jobs')
| -rw-r--r-- | src/charon/queues/jobs/acquire_job.c | 10 | ||||
| -rw-r--r-- | src/charon/queues/jobs/delete_child_sa_job.c | 10 | ||||
| -rw-r--r-- | src/charon/queues/jobs/delete_ike_sa_job.c | 11 | ||||
| -rw-r--r-- | src/charon/queues/jobs/incoming_packet_job.c | 32 | ||||
| -rw-r--r-- | src/charon/queues/jobs/initiate_job.c | 9 | ||||
| -rw-r--r-- | src/charon/queues/jobs/job.c | 28 | ||||
| -rw-r--r-- | src/charon/queues/jobs/job.h | 4 | ||||
| -rw-r--r-- | src/charon/queues/jobs/rekey_child_sa_job.c | 10 | ||||
| -rw-r--r-- | src/charon/queues/jobs/rekey_ike_sa_job.c | 9 | ||||
| -rw-r--r-- | src/charon/queues/jobs/retransmit_request_job.c | 9 | ||||
| -rw-r--r-- | src/charon/queues/jobs/route_job.c | 12 | ||||
| -rw-r--r-- | src/charon/queues/jobs/send_dpd_job.c | 6 | ||||
| -rw-r--r-- | src/charon/queues/jobs/send_keepalive_job.c | 6 |
13 files changed, 39 insertions, 117 deletions
diff --git a/src/charon/queues/jobs/acquire_job.c b/src/charon/queues/jobs/acquire_job.c index 89eccef4a..a5dd43d1c 100644 --- a/src/charon/queues/jobs/acquire_job.c +++ b/src/charon/queues/jobs/acquire_job.c @@ -40,11 +40,6 @@ struct private_acquire_job_t { * reqid of the child to rekey */ u_int32_t reqid; - - /** - * Logger ref - */ - logger_t *logger; }; /** @@ -66,8 +61,8 @@ static status_t execute(private_acquire_job_t *this) this->reqid); if (ike_sa == NULL) { - this->logger->log(this->logger, ERROR|LEVEL1, - "CHILD_SA not found for acquiring"); + DBG2(SIG_DBG_JOB, "CHILD_SA with reqid %d not found for acquiring", + this->reqid); return DESTROY_ME; } ike_sa->acquire(ike_sa, this->reqid); @@ -98,7 +93,6 @@ acquire_job_t *acquire_job_create(u_int32_t reqid) /* private variables */ this->reqid = reqid; - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &(this->public); } diff --git a/src/charon/queues/jobs/delete_child_sa_job.c b/src/charon/queues/jobs/delete_child_sa_job.c index 45fc452fc..bd25788dc 100644 --- a/src/charon/queues/jobs/delete_child_sa_job.c +++ b/src/charon/queues/jobs/delete_child_sa_job.c @@ -51,11 +51,6 @@ struct private_delete_child_sa_job_t { * inbound SPI of the CHILD_SA */ u_int32_t spi; - - /** - * Logger ref - */ - logger_t *logger; }; /** @@ -77,8 +72,8 @@ static status_t execute(private_delete_child_sa_job_t *this) this->reqid); if (ike_sa == NULL) { - this->logger->log(this->logger, ERROR|LEVEL1, - "CHILD_SA not found for delete"); + DBG1(SIG_DBG_JOB, "CHILD_SA with reqid %d not found for delete", + this->reqid); return DESTROY_ME; } ike_sa->delete_child_sa(ike_sa, this->protocol, this->spi); @@ -113,7 +108,6 @@ delete_child_sa_job_t *delete_child_sa_job_create(u_int32_t reqid, this->reqid = reqid; this->protocol = protocol; this->spi = spi; - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &(this->public); } diff --git a/src/charon/queues/jobs/delete_ike_sa_job.c b/src/charon/queues/jobs/delete_ike_sa_job.c index e2a861757..d8b907f98 100644 --- a/src/charon/queues/jobs/delete_ike_sa_job.c +++ b/src/charon/queues/jobs/delete_ike_sa_job.c @@ -45,11 +45,6 @@ struct private_delete_ike_sa_job_t { * Should the IKE_SA be deleted if it is in ESTABLISHED state? */ bool delete_if_established; - - /** - * logger ref - */ - logger_t *logger; }; /** @@ -72,7 +67,7 @@ static status_t execute(private_delete_ike_sa_job_t *this) if (charon->ike_sa_manager->delete(charon->ike_sa_manager, this->ike_sa_id) != SUCCESS) { - this->logger->log(this->logger, ERROR|LEVEL1, "IKE SA didn't exist anymore"); + DBG2(SIG_DBG_JOB, "IKE SA didn't exist anymore"); } return DESTROY_ME; } @@ -96,8 +91,7 @@ static status_t execute(private_delete_ike_sa_job_t *this) default: { /* IKE_SA is half open and gets destroyed */ - this->logger->log(this->logger, AUDIT, - "deleting half open IKE_SA after timeout"); + DBG1(SIG_DBG_JOB, "deleting half open IKE_SA after timeout"); charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager, ike_sa); return DESTROY_ME; } @@ -130,7 +124,6 @@ delete_ike_sa_job_t *delete_ike_sa_job_create(ike_sa_id_t *ike_sa_id, /* private variables */ this->ike_sa_id = ike_sa_id->clone(ike_sa_id); this->delete_if_established = delete_if_established; - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &(this->public); } diff --git a/src/charon/queues/jobs/incoming_packet_job.c b/src/charon/queues/jobs/incoming_packet_job.c index 4feff15a6..c09571e2b 100644 --- a/src/charon/queues/jobs/incoming_packet_job.c +++ b/src/charon/queues/jobs/incoming_packet_job.c @@ -41,11 +41,6 @@ struct private_incoming_packet_job_t { * Assigned packet */ packet_t *packet; - - /** - * logger - */ - logger_t *logger; }; /** @@ -92,8 +87,7 @@ static void send_notify_response(private_incoming_packet_job_t *this, response->destroy(response); return; } - this->logger->log(this->logger, CONTROL, "sending %s notify", - mapping_find(notify_type_m, type)); + DBG1(SIG_DBG_NET, "sending %N notify", notify_type_names, type); charon->send_queue->add(charon->send_queue, packet); response->destroy(response); return; @@ -113,13 +107,12 @@ static status_t execute(private_incoming_packet_job_t *this) message = message_create_from_packet(this->packet->clone(this->packet)); src = message->get_source(message); dst = message->get_destination(message); - this->logger->log(this->logger, CONTROL, - "received packet: from %#H to %#H", src, dst); + DBG1(SIG_DBG_NET, "received packet: from %#H to %#H", src, dst); status = message->parse_header(message); if (status != SUCCESS) { - this->logger->log(this->logger, ERROR, "received message with invalid IKE header, ignored"); + DBG1(SIG_DBG_NET, "received message with invalid IKE header, ignored"); message->destroy(message); return DESTROY_ME; } @@ -127,10 +120,10 @@ static status_t execute(private_incoming_packet_job_t *this) if ((message->get_major_version(message) != IKE_MAJOR_VERSION) || (message->get_minor_version(message) != IKE_MINOR_VERSION)) { - this->logger->log(this->logger, ERROR, - "received a packet with IKE version %d.%d, not supported", - message->get_major_version(message), - message->get_minor_version(message)); + DBG1(SIG_DBG_NET, + "received a packet with IKE version %d.%d, not supported", + message->get_major_version(message), + message->get_minor_version(message)); if ((message->get_exchange_type(message) == IKE_SA_INIT) && (message->get_request(message))) { send_notify_response(this, message, INVALID_MAJOR_VERSION); @@ -145,14 +138,12 @@ static status_t execute(private_incoming_packet_job_t *this) ike_sa = charon->ike_sa_manager->checkout(charon->ike_sa_manager, ike_sa_id); if (ike_sa == NULL) { - this->logger->log(this->logger, ERROR, - "received packet with SPIs %llx:%llx, but no such IKE_SA", - ike_sa_id->get_initiator_spi(ike_sa_id), - ike_sa_id->get_responder_spi(ike_sa_id)); + DBG1(SIG_DBG_NET, "received packet for IKE_SA: %J, but no such IKE_SA", + ike_sa_id); if (message->get_request(message)) { - /* TODO: send notify if we have NULL crypters, - * see todo in send_notify_response + /* TODO: send notify if we have NULL crypters, + * see todo in send_notify_response send_notify_response(this, message, INVALID_IKE_SPI); */ } ike_sa_id->destroy(ike_sa_id); @@ -207,7 +198,6 @@ incoming_packet_job_t *incoming_packet_job_create(packet_t *packet) /* private variables */ this->packet = packet; - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &(this->public); } diff --git a/src/charon/queues/jobs/initiate_job.c b/src/charon/queues/jobs/initiate_job.c index 00c4ef32e..9d8edd980 100644 --- a/src/charon/queues/jobs/initiate_job.c +++ b/src/charon/queues/jobs/initiate_job.c @@ -48,11 +48,6 @@ struct private_initiate_job_t { * associated policy to initiate */ policy_t *policy; - - /** - * logger - */ - logger_t *logger; }; /** @@ -80,8 +75,7 @@ static status_t execute(private_initiate_job_t *this) this->policy->get_ref(this->policy); if (ike_sa->initiate(ike_sa, this->connection, this->policy) != SUCCESS) { - this->logger->log(this->logger, ERROR, - "initiation failed, going to delete IKE_SA"); + DBG1(SIG_DBG_JOB, "initiation failed, going to delete IKE_SA"); charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager, ike_sa); return DESTROY_ME; } @@ -115,7 +109,6 @@ initiate_job_t *initiate_job_create(connection_t *connection, policy_t *policy) /* private variables */ this->connection = connection; this->policy = policy; - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &this->public; } diff --git a/src/charon/queues/jobs/job.c b/src/charon/queues/jobs/job.c index fe9127a75..d88843d7c 100644 --- a/src/charon/queues/jobs/job.c +++ b/src/charon/queues/jobs/job.c @@ -24,18 +24,16 @@ #include "job.h" - -mapping_t job_type_m[] = { - {INCOMING_PACKET, "INCOMING_PACKET"}, - {RETRANSMIT_REQUEST, "RETRANSMIT_REQUEST"}, - {INITIATE, "INITIATE"}, - {ROUTE, "ROUTE"}, - {ACQUIRE, "ACQUIRE"}, - {DELETE_IKE_SA, "DELETE_IKE_SA"}, - {DELETE_CHILD_SA, "DELETE_CHILD_SA"}, - {REKEY_CHILD_SA, "REKEY_CHILD_SA"}, - {REKEY_IKE_SA, "REKEY_IKE_SA"}, - {SEND_KEEPALIVE, "SEND_KEEPALIVE"}, - {SEND_DPD, "SEND_DPD"}, - {MAPPING_END, NULL} -}; +ENUM(job_type_names, INCOMING_PACKET, SEND_DPD, + "INCOMING_PACKET", + "RETRANSMIT_REQUEST", + "INITIATE", + "ROUTE", + "ACQUIRE", + "DELETE_IKE_SA", + "DELETE_CHILD_SA", + "REKEY_CHILD_SA", + "REKEY_IKE_SA", + "SEND_KEEPALIVE", + "SEND_DPD", +); diff --git a/src/charon/queues/jobs/job.h b/src/charon/queues/jobs/job.h index 879b9ab12..523c416ec 100644 --- a/src/charon/queues/jobs/job.h +++ b/src/charon/queues/jobs/job.h @@ -115,11 +115,11 @@ enum job_type_t { }; /** - * string mappings for job_type_t + * enum name for job_type_t * * @ingroup jobs */ -extern mapping_t job_type_m[]; +extern enum_name_t *job_type_names; typedef struct job_t job_t; diff --git a/src/charon/queues/jobs/rekey_child_sa_job.c b/src/charon/queues/jobs/rekey_child_sa_job.c index e75d1911c..c0b1da0cf 100644 --- a/src/charon/queues/jobs/rekey_child_sa_job.c +++ b/src/charon/queues/jobs/rekey_child_sa_job.c @@ -50,11 +50,6 @@ struct private_rekey_child_sa_job_t { * inbound SPI of the CHILD_SA */ u_int32_t spi; - - /** - * Logger ref - */ - logger_t *logger; }; /** @@ -76,8 +71,8 @@ static status_t execute(private_rekey_child_sa_job_t *this) this->reqid); if (ike_sa == NULL) { - this->logger->log(this->logger, ERROR|LEVEL1, - "CHILD_SA not found for rekeying"); + DBG2(SIG_DBG_JOB, "CHILD_SA with reqid %d not found for rekeying", + this->reqid); return DESTROY_ME; } ike_sa->rekey_child_sa(ike_sa, this->protocol, this->spi); @@ -112,7 +107,6 @@ rekey_child_sa_job_t *rekey_child_sa_job_create(u_int32_t reqid, this->reqid = reqid; this->protocol = protocol; this->spi = spi; - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &(this->public); } diff --git a/src/charon/queues/jobs/rekey_ike_sa_job.c b/src/charon/queues/jobs/rekey_ike_sa_job.c index f163af50d..f16581546 100644 --- a/src/charon/queues/jobs/rekey_ike_sa_job.c +++ b/src/charon/queues/jobs/rekey_ike_sa_job.c @@ -40,11 +40,6 @@ struct private_rekey_ike_sa_job_t { * ID of the IKE_SA to rekey */ ike_sa_id_t *ike_sa_id; - - /** - * Logger ref - */ - logger_t *logger; }; /** @@ -66,8 +61,7 @@ static status_t execute(private_rekey_ike_sa_job_t *this) this->ike_sa_id); if (ike_sa == NULL) { - this->logger->log(this->logger, ERROR, - "IKE_SA to rekey not found"); + DBG2(SIG_DBG_JOB, "IKE_SA %J to rekey not found", this->ike_sa_id); return DESTROY_ME; } ike_sa->rekey(ike_sa); @@ -99,7 +93,6 @@ rekey_ike_sa_job_t *rekey_ike_sa_job_create(ike_sa_id_t *ike_sa_id) /* private variables */ this->ike_sa_id = ike_sa_id->clone(ike_sa_id); - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &(this->public); } diff --git a/src/charon/queues/jobs/retransmit_request_job.c b/src/charon/queues/jobs/retransmit_request_job.c index 494897e41..222e80875 100644 --- a/src/charon/queues/jobs/retransmit_request_job.c +++ b/src/charon/queues/jobs/retransmit_request_job.c @@ -45,11 +45,6 @@ struct private_retransmit_request_job_t { * ID of the IKE_SA which the message belongs to. */ ike_sa_id_t *ike_sa_id; - - /** - * Logger reference - */ - logger_t *logger; }; /** @@ -70,8 +65,7 @@ static status_t execute(private_retransmit_request_job_t *this) ike_sa = charon->ike_sa_manager->checkout(charon->ike_sa_manager, this->ike_sa_id); if (ike_sa == NULL) { - this->logger->log(this->logger, ERROR|LEVEL1, - "IKE SA could not be checked out. Already deleted?"); + DBG2(SIG_DBG_JOB, "IKE SA could not be checked out. Already deleted?"); return DESTROY_ME; } @@ -111,7 +105,6 @@ retransmit_request_job_t *retransmit_request_job_create(u_int32_t message_id,ike /* private variables */ this->message_id = message_id; this->ike_sa_id = ike_sa_id->clone(ike_sa_id); - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &(this->public); } diff --git a/src/charon/queues/jobs/route_job.c b/src/charon/queues/jobs/route_job.c index b60f117d7..a195a3ed1 100644 --- a/src/charon/queues/jobs/route_job.c +++ b/src/charon/queues/jobs/route_job.c @@ -52,11 +52,6 @@ struct private_route_job_t { * route or unroute? */ bool route; - - /** - * logger - */ - logger_t *logger; }; /** @@ -83,16 +78,14 @@ static status_t execute(private_route_job_t *this) { if (ike_sa->route(ike_sa, this->connection, this->policy) != SUCCESS) { - this->logger->log(this->logger, ERROR, - "routing failed"); + DBG1(SIG_DBG_JOB, "routing failed"); } } else { if (ike_sa->unroute(ike_sa, this->policy) == DESTROY_ME) { - this->logger->log(this->logger, ERROR, - "removing IKE_SA, as last routed CHILD_SA unrouted"); + DBG1(SIG_DBG_JOB, "removing IKE_SA, as last routed CHILD_SA unrouted"); charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager, ike_sa); return DESTROY_ME; } @@ -127,7 +120,6 @@ route_job_t *route_job_create(connection_t *connection, policy_t *policy, bool r this->connection = connection; this->policy = policy; this->route = route; - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &this->public; } diff --git a/src/charon/queues/jobs/send_dpd_job.c b/src/charon/queues/jobs/send_dpd_job.c index b36593b88..7294d78d5 100644 --- a/src/charon/queues/jobs/send_dpd_job.c +++ b/src/charon/queues/jobs/send_dpd_job.c @@ -44,11 +44,6 @@ struct private_send_dpd_job_t { * ID of the IKE_SA which the message belongs to. */ ike_sa_id_t *ike_sa_id; - - /** - * Logger reference. - */ - logger_t *logger; }; /** @@ -110,7 +105,6 @@ send_dpd_job_t *send_dpd_job_create(ike_sa_id_t *ike_sa_id) /* private variables */ this->ike_sa_id = ike_sa_id->clone(ike_sa_id); - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &(this->public); } diff --git a/src/charon/queues/jobs/send_keepalive_job.c b/src/charon/queues/jobs/send_keepalive_job.c index 0a305faed..1c1cb288e 100644 --- a/src/charon/queues/jobs/send_keepalive_job.c +++ b/src/charon/queues/jobs/send_keepalive_job.c @@ -44,11 +44,6 @@ struct private_send_keepalive_job_t { * ID of the IKE_SA which the message belongs to. */ ike_sa_id_t *ike_sa_id; - - /** - * Logger reference. - */ - logger_t *logger; }; /** @@ -103,7 +98,6 @@ send_keepalive_job_t *send_keepalive_job_create(ike_sa_id_t *ike_sa_id) /* private variables */ this->ike_sa_id = ike_sa_id->clone(ike_sa_id); - this->logger = logger_manager->get_logger(logger_manager, WORKER); return &(this->public); } |