libipsec: Remove unused src/dst_ts parameters from ipsec_sa_mgr_t.add_sa()
authorMartin Willi <martin@revosec.ch>
Wed, 15 Oct 2014 16:02:46 +0000 (18:02 +0200)
committerMartin Willi <martin@revosec.ch>
Fri, 20 Feb 2015 12:34:47 +0000 (13:34 +0100)
src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c
src/libipsec/ipsec_sa.c
src/libipsec/ipsec_sa.h
src/libipsec/ipsec_sa_mgr.c
src/libipsec/ipsec_sa_mgr.h

index d2a45da..4ed5a42 100644 (file)
@@ -71,8 +71,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
 {
        return ipsec->sas->add_sa(ipsec->sas, src, dst, spi, protocol, reqid, mark,
                                                          tfc, lifetime, enc_alg, enc_key, int_alg, int_key,
-                                                         mode, ipcomp, cpi, initiator, encap, esn, inbound,
-                                                         src_ts, dst_ts);
+                                                         mode, ipcomp, cpi, initiator, encap, esn, inbound);
 }
 
 METHOD(kernel_ipsec_t, update_sa, status_t,
index e277063..cb4aa90 100644 (file)
@@ -259,8 +259,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
 {
        return ipsec->sas->add_sa(ipsec->sas, src, dst, spi, protocol, reqid, mark,
                                                          tfc, lifetime, enc_alg, enc_key, int_alg, int_key,
-                                                         mode, ipcomp, cpi, initiator, encap, esn, inbound,
-                                                         src_ts, dst_ts);
+                                                         mode, ipcomp, cpi, initiator, encap, esn, inbound);
 }
 
 METHOD(kernel_ipsec_t, update_sa, status_t,
index 6ec8bd2..3d0bbe1 100644 (file)
@@ -275,8 +275,7 @@ ipsec_sa_t *ipsec_sa_create(u_int32_t spi, host_t *src, host_t *dst,
                u_int8_t protocol, u_int32_t reqid, mark_t mark, u_int32_t tfc,
                lifetime_cfg_t *lifetime, u_int16_t enc_alg, chunk_t enc_key,
                u_int16_t int_alg, chunk_t int_key, ipsec_mode_t mode,
-               u_int16_t ipcomp, u_int16_t cpi, bool encap, bool esn, bool inbound,
-               traffic_selector_t *src_ts,     traffic_selector_t *dst_ts)
+               u_int16_t ipcomp, u_int16_t cpi, bool encap, bool esn, bool inbound)
 {
        private_ipsec_sa_t *this;
 
index 5e69f18..8dad29a 100644 (file)
@@ -197,8 +197,6 @@ struct ipsec_sa_t {
  * @param encap                        enable UDP encapsulation (must be TRUE)
  * @param esn                  Extended Sequence Numbers (currently not supported)
  * @param inbound              TRUE if this is an inbound SA, FALSE otherwise
- * @param src_ts               source traffic selector
- * @param dst_ts               destination traffic selector
  * @return                             the IPsec SA, or NULL if the creation failed
  */
 ipsec_sa_t *ipsec_sa_create(u_int32_t spi, host_t *src, host_t *dst,
@@ -207,8 +205,6 @@ ipsec_sa_t *ipsec_sa_create(u_int32_t spi, host_t *src, host_t *dst,
                                                        u_int16_t enc_alg, chunk_t enc_key,
                                                        u_int16_t int_alg, chunk_t int_key,
                                                        ipsec_mode_t mode, u_int16_t ipcomp, u_int16_t cpi,
-                                                       bool encap, bool esn, bool inbound,
-                                                       traffic_selector_t *src_ts,
-                                                       traffic_selector_t *dst_ts);
+                                                       bool encap, bool esn, bool inbound);
 
 #endif /** IPSEC_SA_H_ @}*/
index d1850b0..3496fc7 100644 (file)
@@ -439,8 +439,7 @@ METHOD(ipsec_sa_mgr_t, add_sa, status_t,
        u_int8_t protocol, u_int32_t reqid,     mark_t mark, u_int32_t tfc,
        lifetime_cfg_t *lifetime, u_int16_t enc_alg, chunk_t enc_key,
        u_int16_t int_alg, chunk_t int_key, ipsec_mode_t mode, u_int16_t ipcomp,
-       u_int16_t cpi, bool initiator, bool encap, bool esn, bool inbound,
-       traffic_selector_t *src_ts, traffic_selector_t *dst_ts)
+       u_int16_t cpi, bool initiator, bool encap, bool esn, bool inbound)
 {
        ipsec_sa_entry_t *entry;
        ipsec_sa_t *sa_new;
@@ -454,7 +453,7 @@ METHOD(ipsec_sa_mgr_t, add_sa, status_t,
 
        sa_new = ipsec_sa_create(spi, src, dst, protocol, reqid, mark, tfc,
                                                         lifetime, enc_alg, enc_key, int_alg, int_key, mode,
-                                                        ipcomp, cpi, encap, esn, inbound, src_ts, dst_ts);
+                                                        ipcomp, cpi, encap, esn, inbound);
        if (!sa_new)
        {
                DBG1(DBG_ESP, "failed to create SAD entry");
index 3e6efaa..8d3f64f 100644 (file)
@@ -73,8 +73,6 @@ struct ipsec_sa_mgr_t {
         * @param encap                 enable UDP encapsulation (must be TRUE)
         * @param esn                   Extended Sequence Numbers (currently not supported)
         * @param inbound               TRUE if this is an inbound SA, FALSE otherwise
-        * @param src_ts                source traffic selector
-        * @param dst_ts                destination traffic selector
         * @return                              SUCCESS if operation completed
         */
        status_t (*add_sa)(ipsec_sa_mgr_t *this, host_t *src, host_t *dst,
@@ -83,8 +81,7 @@ struct ipsec_sa_mgr_t {
                                           u_int16_t enc_alg, chunk_t enc_key, u_int16_t int_alg,
                                           chunk_t int_key, ipsec_mode_t mode, u_int16_t ipcomp,
                                           u_int16_t cpi, bool initiator, bool encap, bool esn,
-                                          bool inbound, traffic_selector_t *src_ts,
-                                          traffic_selector_t *dst_ts);
+                                          bool inbound);
 
        /**
         * Update the hosts on an installed SA.