further mobike improvements, regarding to NAT-T
[strongswan.git] / src / charon / sa / child_sa.h
index 0118df4..b801dd0 100644 (file)
@@ -35,11 +35,6 @@ typedef struct child_sa_t child_sa_t;
 #include <config/child_cfg.h>
 
 /**
- * Where we should start with reqid enumeration
- */
-#define REQID_START 2000000000
-
-/**
  * @brief States of a CHILD_SA
  */
 enum child_sa_state_t {
@@ -207,9 +202,11 @@ struct child_sa_t {
         * @param this          calling object
         * @param me            the new local host
         * @param other         the new remote host
+        * @param                       TRUE to use UDP encapsulation for NAT traversal
         * @return                      SUCCESS or FAILED
         */
-       status_t (*update_hosts)(child_sa_t *this, host_t *me, host_t *other);
+       status_t (*update_hosts)(child_sa_t *this, host_t *me, host_t *other,
+                                                        bool encap);
        
        /**
         * @brief Install the policies using some traffic selectors.
@@ -295,13 +292,13 @@ struct child_sa_t {
  * @param other_id             id of remote peer
  * @param config               config to use for this CHILD_SA
  * @param reqid                        reqid of old CHILD_SA when rekeying, 0 otherwise
- * @param use_natt             TRUE if NAT traversal is used
+ * @param encap                        TRUE to enable UDP encapsulation (NAT traversal)
  * @return                             child_sa_t object
  * 
  * @ingroup sa
  */
 child_sa_t * child_sa_create(host_t *me, host_t *other,
                                                         identification_t *my_id, identification_t* other_id,
-                                                        child_cfg_t *config, u_int32_t reqid, bool use_natt);
+                                                        child_cfg_t *config, u_int32_t reqid, bool encap);
 
 #endif /*CHILD_SA_H_*/