Merge pull request #13097 from AbhishekNR/mroute

[mirror_frr.git] / babeld / babel_filter.c

diff --git a/babeld/babel_filter.c b/babeld/babel_filter.c
index 28ba8e16a23793d77527c68c99b5741df2ef75b4..053493274dcf175fc3a6097f6726ec381cad2488 100644 (file)
--- a/babeld/babel_filter.c
+++ b/babeld/babel_filter.c
@@ -1,23 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -44,39 +27,34 @@ babel_filter(int output, const unsigned char *prefix, unsigned short plen,
     struct prefix_list *plist;
     int distribute;
     struct babel *babel;
+    afi_t family;
 
     p.family = v4mapped(prefix) ? AF_INET : AF_INET6;
     p.prefixlen = v4mapped(prefix) ? plen - 96 : plen;
     if (p.family == AF_INET) {
         uchar_to_inaddr(&p.u.prefix4, prefix);
         distribute = output ? DISTRIBUTE_V4_OUT : DISTRIBUTE_V4_IN;
+        family = AFI_IP;
     } else {
         uchar_to_in6addr(&p.u.prefix6, prefix);
         distribute = output ? DISTRIBUTE_V6_OUT : DISTRIBUTE_V6_IN;
+        family = AFI_IP6;
     }
 
     if (babel_ifp != NULL && babel_ifp->list[distribute]) {
         if (access_list_apply (babel_ifp->list[distribute], &p)
             == FILTER_DENY) {
             debugf(BABEL_DEBUG_FILTER,
-                   "%s/%d filtered by distribute %s",
-                   p.family == AF_INET ?
-                   inet_ntoa(p.u.prefix4) :
-                   inet6_ntoa (p.u.prefix6),
-                   p.prefixlen,
-                   output ? "out" : "in");
+                   "%pFX filtered by distribute %s",
+                   &p, output ? "out" : "in");
             return INFINITY;
        }
     }
     if (babel_ifp != NULL && babel_ifp->prefix[distribute]) {
         if (prefix_list_apply (babel_ifp->prefix[distribute], &p)
             == PREFIX_DENY) {
-            debugf(BABEL_DEBUG_FILTER, "%s/%d filtered by distribute %s",
-                   p.family == AF_INET ?
-                   inet_ntoa(p.u.prefix4) :
-                   inet6_ntoa (p.u.prefix6),
-                   p.prefixlen,
-                   output ? "out" : "in");
+            debugf(BABEL_DEBUG_FILTER, "%pFX filtered by distribute %s",
+                   &p, output ? "out" : "in");
             return INFINITY;
        }
     }
@@ -87,30 +65,22 @@ babel_filter(int output, const unsigned char *prefix, unsigned short plen,
         dist = distribute_lookup (babel->distribute_ctx, NULL);
     if (dist) {
         if (dist->list[distribute]) {
-            alist = access_list_lookup (p.family, dist->list[distribute]);
+            alist = access_list_lookup (family, dist->list[distribute]);
 
             if (alist) {
                 if (access_list_apply (alist, &p) == FILTER_DENY) {
-                    debugf(BABEL_DEBUG_FILTER,"%s/%d filtered by distribute %s",
-                           p.family == AF_INET ?
-                           inet_ntoa(p.u.prefix4) :
-                           inet6_ntoa (p.u.prefix6),
-                           p.prefixlen,
-                           output ? "out" : "in");
+                    debugf(BABEL_DEBUG_FILTER,"%pFX filtered by distribute %s",
+                           &p, output ? "out" : "in");
                     return INFINITY;
                }
            }
        }
         if (dist->prefix[distribute]) {
-            plist = prefix_list_lookup (p.family, dist->prefix[distribute]);
+            plist = prefix_list_lookup (family, dist->prefix[distribute]);
             if (plist) {
                 if (prefix_list_apply (plist, &p) == PREFIX_DENY) {
-                    debugf(BABEL_DEBUG_FILTER,"%s/%d filtered by distribute %s",
-                           p.family == AF_INET ?
-                           inet_ntoa(p.u.prefix4) :
-                           inet6_ntoa (p.u.prefix6),
-                           p.prefixlen,
-                           output ? "out" : "in");
+                    debugf(BABEL_DEBUG_FILTER,"%pFX filtered by distribute %s",
+                           &p, output ? "out" : "in");
                     return INFINITY;
                }
            }