diff options
Diffstat (limited to 'src/libstrongswan/selectors/traffic_selector.c')
| -rw-r--r-- | src/libstrongswan/selectors/traffic_selector.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/libstrongswan/selectors/traffic_selector.c b/src/libstrongswan/selectors/traffic_selector.c index f675f51f1..32da194ef 100644 --- a/src/libstrongswan/selectors/traffic_selector.c +++ b/src/libstrongswan/selectors/traffic_selector.c @@ -393,23 +393,15 @@ static bool equals(private_traffic_selector_t *this, private_traffic_selector_t switch (this->type) { case TS_IPV4_ADDR_RANGE: -<<<<<<< HEAD - if (memeq(this->from4, other->from4, sizeof(this->from4))) -======= if (memeq(this->from4, other->from4, sizeof(this->from4)) && memeq(this->to4, other->to4, sizeof(this->to4))) ->>>>>>> upstream/4.5.1 { return TRUE; } break; case TS_IPV6_ADDR_RANGE: -<<<<<<< HEAD - if (memeq(this->from6, other->from6, sizeof(this->from6))) -======= if (memeq(this->from6, other->from6, sizeof(this->from6)) && memeq(this->to6, other->to6, sizeof(this->to6))) ->>>>>>> upstream/4.5.1 { return TRUE; } |