Changeset 4611

Timestamp:

11/11/08 07:29:25 (2 months ago)

Author:

andreas

Message:

added the MIPv6 options use_proxy_mode and install_policy

Files:

• trunk/src/charon/config/child_cfg.c (modified) (6 diffs)
• trunk/src/charon/config/child_cfg.h (modified) (3 diffs)

trunk/src/charon/config/child_cfg.c

@@ -119 +119 @@
-     */
-    bool use_ipcomp;
+
+    /**
+     * set up IPsec transport SA in MIPv6 proxy mode
+     */
+    bool proxy_mode;
+
+    /**
+     * enable installation and removal of kernel IPsec policies
+     */
+    bool install_policy;
-};
-
@@ -340 +350 @@
- * Implementation of child_cfg_t.equal_traffic_selectors.
- */
- traffic_selector_t *ts)
-
-
-enumerator_t *enumerator
-other_
+
+
+
+linked_list_t *this_list
+this_ts, *
-    bool result;
-
-
-
-
+
+
+
+
-    {
-        return FALSE;
-    }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    return result;
-}
@@ -445 +459 @@
-{
-    return this->use_ipcomp;
+}
+
+/**
+ * Implementation of child_cfg_t.set_mipv6_options.
+ */
+static void set_mipv6_options(private_child_cfg_t *this, bool proxy_mode,
+                                                         bool install_policy)
+{
+    this->proxy_mode = proxy_mode;
+    this->install_policy = install_policy;
+}
+
+/**
+ * Implementation of child_cfg_t.use_proxy_mode.
+ */
+static bool use_proxy_mode(private_child_cfg_t *this)
+{
+    return this->proxy_mode;
+}
+
+/**
+ * Implementation of child_cfg_t.install_policy.
+ */
+static bool install_policy(private_child_cfg_t *this)
+{
+    return this->install_policy;
-}
-
@@ -488 +528 @@
-    this->public.add_traffic_selector = (void (*)(child_cfg_t*,bool,traffic_selector_t*))add_traffic_selector;
-    this->public.get_traffic_selectors = (linked_list_t*(*)(child_cfg_t*,bool,linked_list_t*,host_t*))get_traffic_selectors;
-traffic_selector
+linked_list_t*,host
-    this->public.add_proposal = (void (*) (child_cfg_t*,proposal_t*))add_proposal;
-    this->public.get_proposals = (linked_list_t* (*) (child_cfg_t*,bool))get_proposals;
@@ -499 +539 @@
-    this->public.get_lifetime = (u_int32_t (*) (child_cfg_t *,bool))get_lifetime;
-    this->public.get_dh_group = (diffie_hellman_group_t(*)(child_cfg_t*)) get_dh_group;
+    this->public.set_mipv6_options = (void (*) (child_cfg_t*,bool,bool))set_mipv6_options;
-    this->public.use_ipcomp = (bool (*) (child_cfg_t *))use_ipcomp;
+    this->public.use_proxy_mode = (bool (*) (child_cfg_t *))use_proxy_mode;
+    this->public.install_policy = (bool (*) (child_cfg_t *))install_policy;
-    this->public.get_ref = (child_cfg_t* (*) (child_cfg_t*))get_ref;
-    this->public.destroy = (void (*) (child_cfg_t*))destroy;
@@ -513 +556 @@
-    this->close_action = close_action;
-    this->use_ipcomp = ipcomp; 
+    this->proxy_mode = FALSE;
+    this->install_policy = TRUE; 
-    this->refcount = 1;
-    this->proposals = linked_list_create();

trunk/src/charon/config/child_cfg.h

@@ -155 +155 @@
-
-    /**
-the 
+
-     *
-     * @param local         TRUE for TS on local side, FALSE for remote
-
+
+
-     * @return              TRUE if TS are equal, FALSE otherwise
-     */ 
-    bool (*equal_traffic_selectors)(child_cfg_t *this, bool local,
-traffic_selector_t *ts
+linked_list_t *ts_list, host_t *host
-
-    /**
@@ -230 +231 @@
-     */
-    bool (*use_ipcomp)(child_cfg_t *this);
+
+    /**
+     * Sets two options needed for Mobile IPv6 interoperability
+     * 
+     * @proxy_mode          use IPsec transport proxy mode (default FALSE)
+     * @install_policy      install IPsec kernel policies (default TRUE)
+     */
+    void (*set_mipv6_options)(child_cfg_t *this, bool proxy_mod,
+                                                 bool install_policy);
+
+    /**
+     * Check whether IPsec transport SA should be set up in proxy mode
+     * 
+     * @return              TRUE, if proxy mode should be used
+     *                      FALSE, otherwise
+     */
+    bool (*use_proxy_mode)(child_cfg_t *this);
+    
+    /**
+     * Check whether IPsec policies should be installed in the kernel
+     * 
+     * @return              TRUE, if IPsec kernel policies should be installed
+     *                      FALSE, otherwise
+     */
+    bool (*install_policy)(child_cfg_t *this);
-    
-    /**
@@ -272 +298 @@
-                              u_int32_t rekeytime, u_int32_t jitter,
-                              char *updown, bool hostaccess, ipsec_mode_t mode,
-
-
+
-
-#endif /* CHILD_CFG_H_ @} */