denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libipsec: Remove unused src/dst_ts parameters from ipsec_sa_mgr_t.add_sa()

Browse Source
This commit is contained in:
Martin Willi
2015-02-20 13:34:47 +01:00
parent 6ad787ca54
commit fd9417607c
6 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
+1 -2
View 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, return ipsec->sas->add_sa(ipsec->sas, src, dst, spi, protocol, reqid, mark,
tfc, lifetime, enc_alg, enc_key, int_alg, int_key, tfc, lifetime, enc_alg, enc_key, int_alg, int_key,
mode, ipcomp, cpi, initiator, encap, esn, inbound, mode, ipcomp, cpi, initiator, encap, esn, inbound);
src_ts, dst_ts);
} }
METHOD(kernel_ipsec_t, update_sa, status_t, METHOD(kernel_ipsec_t, update_sa, status_t,
src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c
+1 -2
View 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, return ipsec->sas->add_sa(ipsec->sas, src, dst, spi, protocol, reqid, mark,
tfc, lifetime, enc_alg, enc_key, int_alg, int_key, tfc, lifetime, enc_alg, enc_key, int_alg, int_key,
mode, ipcomp, cpi, initiator, encap, esn, inbound, mode, ipcomp, cpi, initiator, encap, esn, inbound);
src_ts, dst_ts);
} }
METHOD(kernel_ipsec_t, update_sa, status_t, METHOD(kernel_ipsec_t, update_sa, status_t,
src/libipsec/ipsec_sa.c
+1 -2
View 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, 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, 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 int_alg, chunk_t int_key, ipsec_mode_t mode,
u_int16_t ipcomp, u_int16_t cpi, bool encap, bool esn, bool inbound, u_int16_t ipcomp, u_int16_t cpi, bool encap, bool esn, bool inbound)
traffic_selector_t *src_ts, traffic_selector_t *dst_ts)
{ {
private_ipsec_sa_t *this; private_ipsec_sa_t *this;
src/libipsec/ipsec_sa.h
+1 -5
View File
@@ -197,8 +197,6 @@ struct ipsec_sa_t {
* @param encap enable UDP encapsulation (must be TRUE) * @param encap enable UDP encapsulation (must be TRUE)
* @param esn Extended Sequence Numbers (currently not supported) * @param esn Extended Sequence Numbers (currently not supported)
* @param inbound TRUE if this is an inbound SA, FALSE otherwise * @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 * @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, 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 enc_alg, chunk_t enc_key,
u_int16_t int_alg, chunk_t int_key, u_int16_t int_alg, chunk_t int_key,
ipsec_mode_t mode, u_int16_t ipcomp, u_int16_t cpi, ipsec_mode_t mode, u_int16_t ipcomp, u_int16_t cpi,
bool encap, bool esn, bool inbound, bool encap, bool esn, bool inbound);
traffic_selector_t *src_ts,
traffic_selector_t *dst_ts);
#endif /** IPSEC_SA_H_ @}*/ #endif /** IPSEC_SA_H_ @}*/
src/libipsec/ipsec_sa_mgr.c
+2 -3
View 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, 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, 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 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, u_int16_t cpi, bool initiator, bool encap, bool esn, bool inbound)
traffic_selector_t *src_ts, traffic_selector_t *dst_ts)
{ {
ipsec_sa_entry_t *entry; ipsec_sa_entry_t *entry;
ipsec_sa_t *sa_new; 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, sa_new = ipsec_sa_create(spi, src, dst, protocol, reqid, mark, tfc,
lifetime, enc_alg, enc_key, int_alg, int_key, mode, 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) if (!sa_new)
{ {
DBG1(DBG_ESP, "failed to create SAD entry"); DBG1(DBG_ESP, "failed to create SAD entry");
src/libipsec/ipsec_sa_mgr.h
+1 -4
View File
@@ -73,8 +73,6 @@ struct ipsec_sa_mgr_t {
* @param encap enable UDP encapsulation (must be TRUE) * @param encap enable UDP encapsulation (must be TRUE)
* @param esn Extended Sequence Numbers (currently not supported) * @param esn Extended Sequence Numbers (currently not supported)
* @param inbound TRUE if this is an inbound SA, FALSE otherwise * @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 * @return SUCCESS if operation completed
*/ */
status_t (*add_sa)(ipsec_sa_mgr_t *this, host_t *src, host_t *dst, 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, 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, chunk_t int_key, ipsec_mode_t mode, u_int16_t ipcomp,
u_int16_t cpi, bool initiator, bool encap, bool esn, u_int16_t cpi, bool initiator, bool encap, bool esn,
bool inbound, traffic_selector_t *src_ts, bool inbound);
traffic_selector_t *dst_ts);
/** /**
* Update the hosts on an installed SA. * Update the hosts on an installed SA.