diff options
Diffstat (limited to 'src/charon/sa/tasks')
-rw-r--r-- | src/charon/sa/tasks/child_create.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/child_delete.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/child_rekey.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_auth.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_auth_lifetime.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_cert_post.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_cert_pre.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_config.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_delete.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_dpd.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_init.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_me.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_mobike.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_natd.c | 6 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_natd.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_reauth.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/ike_rekey.h | 4 | ||||
-rw-r--r-- | src/charon/sa/tasks/task.h | 4 |
18 files changed, 39 insertions, 35 deletions
diff --git a/src/charon/sa/tasks/child_create.h b/src/charon/sa/tasks/child_create.h index cee37121e..d01baa594 100644 --- a/src/charon/sa/tasks/child_create.h +++ b/src/charon/sa/tasks/child_create.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: child_create.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: child_create.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -77,4 +77,4 @@ struct child_create_t { */ child_create_t *child_create_create(ike_sa_t *ike_sa, child_cfg_t *config); -#endif /* CHILD_CREATE_H_ @} */ +#endif /** CHILD_CREATE_H_ @}*/ diff --git a/src/charon/sa/tasks/child_delete.h b/src/charon/sa/tasks/child_delete.h index c5ebec338..8886ff4a1 100644 --- a/src/charon/sa/tasks/child_delete.h +++ b/src/charon/sa/tasks/child_delete.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: child_delete.h 4730 2008-12-01 18:38:28Z martin $ + * $Id: child_delete.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -59,4 +59,4 @@ struct child_delete_t { child_delete_t *child_delete_create(ike_sa_t *ike_sa, protocol_id_t protocol, u_int32_t spi); -#endif /* CHILD_DELETE_H_ @} */ +#endif /** CHILD_DELETE_H_ @}*/ diff --git a/src/charon/sa/tasks/child_rekey.h b/src/charon/sa/tasks/child_rekey.h index 37b61a9ef..42fce0742 100644 --- a/src/charon/sa/tasks/child_rekey.h +++ b/src/charon/sa/tasks/child_rekey.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: child_rekey.h 4730 2008-12-01 18:38:28Z martin $ + * $Id: child_rekey.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -63,4 +63,4 @@ struct child_rekey_t { child_rekey_t *child_rekey_create(ike_sa_t *ike_sa, protocol_id_t protocol, u_int32_t spi); -#endif /* CHILD_REKEY_H_ @} */ +#endif /** CHILD_REKEY_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_auth.h b/src/charon/sa/tasks/ike_auth.h index 15f98f312..a4719ec24 100644 --- a/src/charon/sa/tasks/ike_auth.h +++ b/src/charon/sa/tasks/ike_auth.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_auth.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_auth.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -56,4 +56,4 @@ struct ike_auth_t { */ ike_auth_t *ike_auth_create(ike_sa_t *ike_sa, bool initiator); -#endif /* IKE_AUTH_H_ @} */ +#endif /** IKE_AUTH_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_auth_lifetime.h b/src/charon/sa/tasks/ike_auth_lifetime.h index 21a3bbfdc..46595e6ed 100644 --- a/src/charon/sa/tasks/ike_auth_lifetime.h +++ b/src/charon/sa/tasks/ike_auth_lifetime.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_auth_lifetime.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_auth_lifetime.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -52,4 +52,4 @@ struct ike_auth_lifetime_t { */ ike_auth_lifetime_t *ike_auth_lifetime_create(ike_sa_t *ike_sa, bool initiator); -#endif /* IKE_MOBIKE_H_ @} */ +#endif /** IKE_MOBIKE_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_cert_post.h b/src/charon/sa/tasks/ike_cert_post.h index 78b32d67a..ec9d172e1 100644 --- a/src/charon/sa/tasks/ike_cert_post.h +++ b/src/charon/sa/tasks/ike_cert_post.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_cert_post.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_cert_post.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -52,4 +52,4 @@ struct ike_cert_post_t { */ ike_cert_post_t *ike_cert_post_create(ike_sa_t *ike_sa, bool initiator); -#endif /* IKE_CERT_POST_H_ @} */ +#endif /** IKE_CERT_POST_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_cert_pre.h b/src/charon/sa/tasks/ike_cert_pre.h index d8793a8e2..d6d06b04f 100644 --- a/src/charon/sa/tasks/ike_cert_pre.h +++ b/src/charon/sa/tasks/ike_cert_pre.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_cert_pre.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_cert_pre.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -52,4 +52,4 @@ struct ike_cert_pre_t { */ ike_cert_pre_t *ike_cert_pre_create(ike_sa_t *ike_sa, bool initiator); -#endif /* IKE_CERT_PRE_H_ @} */ +#endif /** IKE_CERT_PRE_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_config.h b/src/charon/sa/tasks/ike_config.h index 23410a196..cc709f4d6 100644 --- a/src/charon/sa/tasks/ike_config.h +++ b/src/charon/sa/tasks/ike_config.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_config.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_config.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -50,4 +50,4 @@ struct ike_config_t { */ ike_config_t *ike_config_create(ike_sa_t *ike_sa, bool initiator); -#endif /* IKE_CONFIG_H_ @} */ +#endif /** IKE_CONFIG_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_delete.h b/src/charon/sa/tasks/ike_delete.h index 6d08d345d..ea4e9832b 100644 --- a/src/charon/sa/tasks/ike_delete.h +++ b/src/charon/sa/tasks/ike_delete.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_delete.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_delete.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -49,4 +49,4 @@ struct ike_delete_t { */ ike_delete_t *ike_delete_create(ike_sa_t *ike_sa, bool initiator); -#endif /* IKE_DELETE_H_ @} */ +#endif /** IKE_DELETE_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_dpd.h b/src/charon/sa/tasks/ike_dpd.h index 62b8a6a10..0eadd0db7 100644 --- a/src/charon/sa/tasks/ike_dpd.h +++ b/src/charon/sa/tasks/ike_dpd.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_dpd.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_dpd.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -50,4 +50,4 @@ struct ike_dpd_t { */ ike_dpd_t *ike_dpd_create(bool initiator); -#endif /* IKE_DPD_H_ @} */ +#endif /** IKE_DPD_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_init.h b/src/charon/sa/tasks/ike_init.h index 0e5a913fd..84f28a98d 100644 --- a/src/charon/sa/tasks/ike_init.h +++ b/src/charon/sa/tasks/ike_init.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_init.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_init.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -59,4 +59,4 @@ struct ike_init_t { */ ike_init_t *ike_init_create(ike_sa_t *ike_sa, bool initiator, ike_sa_t *old_sa); -#endif /* IKE_INIT_H_ @} */ +#endif /** IKE_INIT_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_me.h b/src/charon/sa/tasks/ike_me.h index c9a515c8f..3bef0a7f1 100644 --- a/src/charon/sa/tasks/ike_me.h +++ b/src/charon/sa/tasks/ike_me.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_me.h 3666 2008-03-26 18:40:19Z tobias $ + * $Id: ike_me.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -97,4 +97,4 @@ struct ike_me_t { */ ike_me_t *ike_me_create(ike_sa_t *ike_sa, bool initiator); -#endif /*IKE_ME_H_ @} */ +#endif /** IKE_ME_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_mobike.h b/src/charon/sa/tasks/ike_mobike.h index f8f094456..4a2006a80 100644 --- a/src/charon/sa/tasks/ike_mobike.h +++ b/src/charon/sa/tasks/ike_mobike.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_mobike.h 4368 2008-10-06 13:37:04Z martin $ + * $Id: ike_mobike.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -87,4 +87,4 @@ struct ike_mobike_t { */ ike_mobike_t *ike_mobike_create(ike_sa_t *ike_sa, bool initiator); -#endif /* IKE_MOBIKE_H_ @} */ +#endif /** IKE_MOBIKE_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_natd.c b/src/charon/sa/tasks/ike_natd.c index 9e62fcbdf..eb84c876f 100644 --- a/src/charon/sa/tasks/ike_natd.c +++ b/src/charon/sa/tasks/ike_natd.c @@ -13,7 +13,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_natd.c 4386 2008-10-08 08:23:46Z martin $ + * $Id: ike_natd.c 5029 2009-03-26 11:49:07Z martin $ */ #include "ike_natd.h" @@ -356,7 +356,11 @@ static status_t build_i(private_ike_natd_t *this, message_t *message) charon->kernel_interface, FALSE, FALSE); while (enumerator->enumerate(enumerator, (void**)&host)) { + /* apply port 500 to host, but work on a copy */ + host = host->clone(host); + host->set_port(host, IKEV2_UDP_PORT); notify = build_natd_payload(this, NAT_DETECTION_SOURCE_IP, host); + host->destroy(host); message->add_payload(message, (payload_t*)notify); } enumerator->destroy(enumerator); diff --git a/src/charon/sa/tasks/ike_natd.h b/src/charon/sa/tasks/ike_natd.h index 7e1e58bc0..155ae4b4c 100644 --- a/src/charon/sa/tasks/ike_natd.h +++ b/src/charon/sa/tasks/ike_natd.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_natd.h 4368 2008-10-06 13:37:04Z martin $ + * $Id: ike_natd.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -58,4 +58,4 @@ struct ike_natd_t { */ ike_natd_t *ike_natd_create(ike_sa_t *ike_sa, bool initiator); -#endif /* IKE_NATD_H_ @} */ +#endif /** IKE_NATD_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_reauth.h b/src/charon/sa/tasks/ike_reauth.h index 1076cc7cc..689550c92 100644 --- a/src/charon/sa/tasks/ike_reauth.h +++ b/src/charon/sa/tasks/ike_reauth.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_reauth.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_reauth.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -50,4 +50,4 @@ struct ike_reauth_t { */ ike_reauth_t *ike_reauth_create(ike_sa_t *ike_sa); -#endif /* IKE_REAUTH_H_ @} */ +#endif /** IKE_REAUTH_H_ @}*/ diff --git a/src/charon/sa/tasks/ike_rekey.h b/src/charon/sa/tasks/ike_rekey.h index 1bfde8a54..ab82789f3 100644 --- a/src/charon/sa/tasks/ike_rekey.h +++ b/src/charon/sa/tasks/ike_rekey.h @@ -12,7 +12,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: ike_rekey.h 3589 2008-03-13 14:14:44Z martin $ + * $Id: ike_rekey.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -60,4 +60,4 @@ struct ike_rekey_t { */ ike_rekey_t *ike_rekey_create(ike_sa_t *ike_sa, bool initiator); -#endif /* IKE_REKEY_H_ @} */ +#endif /** IKE_REKEY_H_ @}*/ diff --git a/src/charon/sa/tasks/task.h b/src/charon/sa/tasks/task.h index 26b4f214e..a5eb2caa3 100644 --- a/src/charon/sa/tasks/task.h +++ b/src/charon/sa/tasks/task.h @@ -13,7 +13,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: task.h 3666 2008-03-26 18:40:19Z tobias $ + * $Id: task.h 5003 2009-03-24 17:43:01Z martin $ */ /** @@ -145,4 +145,4 @@ struct task_t { void (*destroy) (task_t *this); }; -#endif /* TASK_H_ @} */ +#endif /** TASK_H_ @}*/ |