diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2014-07-11 07:23:31 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2014-07-11 07:23:31 +0200 |
| commit | 81c63b0eed39432878f78727f60a1e7499645199 (patch) | |
| tree | 82387d8fecd1c20788fd8bd784a9b0bde091fb6b /src/libipsec | |
| parent | c5ebfc7b9c16551fe825dc1d79c3f7e2f096f6c9 (diff) | |
| download | vyos-strongswan-81c63b0eed39432878f78727f60a1e7499645199.tar.gz vyos-strongswan-81c63b0eed39432878f78727f60a1e7499645199.zip | |
Imported Upstream version 5.2.0
Diffstat (limited to 'src/libipsec')
| -rw-r--r-- | src/libipsec/Makefile.in | 6 | ||||
| -rw-r--r-- | src/libipsec/esp_packet.c | 4 | ||||
| -rw-r--r-- | src/libipsec/ip_packet.c | 4 | ||||
| -rw-r--r-- | src/libipsec/ipsec_policy_mgr.c | 5 |
4 files changed, 13 insertions, 6 deletions
diff --git a/src/libipsec/Makefile.in b/src/libipsec/Makefile.in index f1a099e2f..31494edaf 100644 --- a/src/libipsec/Makefile.in +++ b/src/libipsec/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -303,6 +303,7 @@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OPENSSL_LIB = @OPENSSL_LIB@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -321,6 +322,7 @@ PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ PTHREADLIB = @PTHREADLIB@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ @@ -348,6 +350,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +aikgen_plugins = @aikgen_plugins@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -439,6 +442,7 @@ srcdir = @srcdir@ starter_plugins = @starter_plugins@ strongswan_conf = @strongswan_conf@ strongswan_options = @strongswan_options@ +swanctldir = @swanctldir@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ t_plugins = @t_plugins@ diff --git a/src/libipsec/esp_packet.c b/src/libipsec/esp_packet.c index ebe13ce77..822302280 100644 --- a/src/libipsec/esp_packet.c +++ b/src/libipsec/esp_packet.c @@ -115,7 +115,7 @@ METHOD(packet_t, skip_bytes, void, return this->packet->skip_bytes(this->packet, bytes); } -METHOD(packet_t, clone, packet_t*, +METHOD(packet_t, clone_, packet_t*, private_esp_packet_t *this) { private_esp_packet_t *pkt; @@ -414,7 +414,7 @@ static private_esp_packet_t *esp_packet_create_internal(packet_t *packet) .get_dscp = _get_dscp, .set_dscp = _set_dscp, .skip_bytes = _skip_bytes, - .clone = _clone, + .clone = _clone_, .destroy = _destroy, }, .get_source = _get_source, diff --git a/src/libipsec/ip_packet.c b/src/libipsec/ip_packet.c index ede9d100a..181cb88db 100644 --- a/src/libipsec/ip_packet.c +++ b/src/libipsec/ip_packet.c @@ -95,7 +95,7 @@ METHOD(ip_packet_t, get_next_header, u_int8_t, return this->next_header; } -METHOD(ip_packet_t, clone, ip_packet_t*, +METHOD(ip_packet_t, clone_, ip_packet_t*, private_ip_packet_t *this) { return ip_packet_create(chunk_clone(this->packet)); @@ -183,7 +183,7 @@ ip_packet_t *ip_packet_create(chunk_t packet) .get_destination = _get_destination, .get_next_header = _get_next_header, .get_encoding = _get_encoding, - .clone = _clone, + .clone = _clone_, .destroy = _destroy, }, .src = src, diff --git a/src/libipsec/ipsec_policy_mgr.c b/src/libipsec/ipsec_policy_mgr.c index 02dc59d65..e2eaba014 100644 --- a/src/libipsec/ipsec_policy_mgr.c +++ b/src/libipsec/ipsec_policy_mgr.c @@ -22,7 +22,7 @@ #include <collections/linked_list.h> /** Base priority for installed policies */ -#define PRIO_BASE 512 +#define PRIO_BASE 384 typedef struct private_ipsec_policy_mgr_t private_ipsec_policy_mgr_t; @@ -88,6 +88,9 @@ static u_int32_t calculate_priority(policy_priority_t policy_priority, priority <<= 1; /* fall-through */ case POLICY_PRIORITY_DEFAULT: + priority <<= 1; + /* fall-through */ + case POLICY_PRIORITY_PASS: break; } /* calculate priority based on selector size, small size = high prio */ |