diff options
| author | Bernhard Schmidt <berni@debian.org> | 2017-12-30 22:21:14 +0100 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2017-12-30 22:21:14 +0100 |
| commit | 166ec510cb88cc1213ba6f441ffb372836fbddd3 (patch) | |
| tree | 8a8160ebeff4eaa8924367dbca91ff89fccbbb2d /src/openvpn/mroute.c | |
| parent | 1e5f64f1519f3e43bdd34e2975c9c97840779592 (diff) | |
| parent | 75286879ecd00a15e21cb9126643fef0316bd47f (diff) | |
Merge tag 'debian/2.4.4-2' into stretch-backports
openvpn Debian release 2.4.4-2
Diffstat (limited to 'src/openvpn/mroute.c')
| -rw-r--r-- | src/openvpn/mroute.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c index 7b46a6a..74ee360 100644 --- a/src/openvpn/mroute.c +++ b/src/openvpn/mroute.c @@ -159,9 +159,8 @@ mroute_extract_addr_arp(struct mroute_addr *src, #endif /* ifdef ENABLE_PF */ unsigned int -mroute_extract_addr_ipv4(struct mroute_addr *src, - struct mroute_addr *dest, - const struct buffer *buf) +mroute_extract_addr_ip(struct mroute_addr *src, struct mroute_addr *dest, + const struct buffer *buf) { unsigned int ret = 0; if (BLEN(buf) >= 1) @@ -267,7 +266,7 @@ mroute_extract_addr_ether(struct mroute_addr *src, switch (ntohs(eth->proto)) { case OPENVPN_ETH_P_IPV4: - ret |= (mroute_extract_addr_ipv4(esrc, edest, &b) << MROUTE_SEC_SHIFT); + ret |= (mroute_extract_addr_ip(esrc, edest, &b) << MROUTE_SEC_SHIFT); break; case OPENVPN_ETH_P_ARP: |