1. openvpn
  2. Commit 3b38c43b8d7aa22b3df12029ff43e0414891e48c
Browse code

rename mroute_extract_addr_ipv4 to mroute_extract_addr_ip

mroute_extract_addr_ipv4() is able to extract an IPv4 as well as an
IPv6. Remove the "v4" suffix from its name to make this behaviour more
explicit.

Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20170724143559.11503-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15129.html
Signed-off-by: David Sommerseth <davids@openvpn.net>

Antonio Quartulli authored on 2017/07/24 23:35:59
Showing 2 changed files
src/openvpn/mroute.c
History View file @ 3b38c43
... ... 
@@ -159,9 +159,8 @@ mroute_extract_addr_arp(struct mroute_addr *src,
159 159 
 #endif /* ifdef ENABLE_PF */
160 160
161 161 
 unsigned int
162 
-mroute_extract_addr_ipv4(struct mroute_addr *src,
163 
-                         struct mroute_addr *dest,
164 
-                         const struct buffer *buf)
162 
+mroute_extract_addr_ip(struct mroute_addr *src, struct mroute_addr *dest,
163 
+                       const struct buffer *buf)
165 164 
 {
166 165 
     unsigned int ret = 0;
167 166 
     if (BLEN(buf) >= 1)
... ... 
@@ -267,7 +266,7 @@ mroute_extract_addr_ether(struct mroute_addr *src,
267 267 
                 switch (ntohs(eth->proto))
268 268 
                 {
269 269 
                     case OPENVPN_ETH_P_IPV4:
270 
-                        ret |= (mroute_extract_addr_ipv4(esrc, edest, &b) << MROUTE_SEC_SHIFT);
270 
+                        ret |= (mroute_extract_addr_ip(esrc, edest, &b) << MROUTE_SEC_SHIFT);
271 271 
                         break;
272 272
273 273 
                     case OPENVPN_ETH_P_ARP:
src/openvpn/mroute.h
History View file @ 3b38c43
... ... 
@@ -181,9 +181,9 @@ mroute_extract_addr_from_packet(struct mroute_addr *src,
181 181 
                                 const struct buffer *buf,
182 182 
                                 int tunnel_type)
183 183 
 {
184 
-    unsigned int mroute_extract_addr_ipv4(struct mroute_addr *src,
185 
-                                          struct mroute_addr *dest,
186 
-                                          const struct buffer *buf);
184 
+    unsigned int mroute_extract_addr_ip(struct mroute_addr *src,
185 
+                                     struct mroute_addr *dest,
186 
+                                     const struct buffer *buf);
187 187
188 188 
     unsigned int mroute_extract_addr_ether(struct mroute_addr *src,
189 189 
                                            struct mroute_addr *dest,
... ... 
@@ -195,7 +195,7 @@ mroute_extract_addr_from_packet(struct mroute_addr *src,
195 195 
     verify_align_4(buf);
196 196 
     if (tunnel_type == DEV_TYPE_TUN)
197 197 
     {
198 
-        ret = mroute_extract_addr_ipv4(src, dest, buf);
198 
+        ret = mroute_extract_addr_ip(src, dest, buf);
199 199 
     }
200 200 
     else if (tunnel_type == DEV_TYPE_TAP)
201 201 
     {