Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / babeld / babel_filter.c

diff --git a/babeld/babel_filter.c b/babeld/babel_filter.c
index 191a9f77eabde02a653e8dffb02f2e859948828e..28ba8e16a23793d77527c68c99b5741df2ef75b4 100644 (file)
--- a/babeld/babel_filter.c
+++ b/babeld/babel_filter.c
@@ -1,21 +1,4 @@
-/*  
- *  This file is free software: you may copy, redistribute and/or modify it  
- *  under the terms of the GNU General Public License as published by the  
- *  Free Software Foundation, either version 2 of the License, or (at your  
- *  option) any later version.  
- *  
- *  This file is distributed in the hope that it will be useful, but  
- *  WITHOUT ANY WARRANTY; without even the implied warranty of  
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU  
- *  General Public License for more details.  
- *  
- *  You should have received a copy of the GNU General Public License  
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.  
- *  
- * This file incorporates work covered by the following copyright and  
- * permission notice:  
- *  
-
+/*
 Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -37,6 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "babel_filter.h"
 #include "vty.h"
 #include "filter.h"
@@ -49,72 +36,81 @@ int
 babel_filter(int output, const unsigned char *prefix, unsigned short plen,
              unsigned int ifindex)
 {
-    struct interface *ifp = if_lookup_by_index(ifindex);
+    struct interface *ifp = if_lookup_by_index(ifindex, VRF_DEFAULT);
     babel_interface_nfo *babel_ifp = ifp ? babel_get_if_nfo(ifp) : NULL;
     struct prefix p;
-    struct distribute *dist;
+    struct distribute *dist = NULL;
     struct access_list *alist;
     struct prefix_list *plist;
-    int filter = output ? BABEL_FILTER_OUT : BABEL_FILTER_IN;
-    int distribute = output ? DISTRIBUTE_OUT : DISTRIBUTE_IN;
+    int distribute;
+    struct babel *babel;
 
     p.family = v4mapped(prefix) ? AF_INET : AF_INET6;
     p.prefixlen = v4mapped(prefix) ? plen - 96 : plen;
-    if (p.family == AF_INET)
+    if (p.family == AF_INET) {
         uchar_to_inaddr(&p.u.prefix4, prefix);
-    else
+        distribute = output ? DISTRIBUTE_V4_OUT : DISTRIBUTE_V4_IN;
+    } else {
         uchar_to_in6addr(&p.u.prefix6, prefix);
+        distribute = output ? DISTRIBUTE_V6_OUT : DISTRIBUTE_V6_IN;
+    }
 
-    if (babel_ifp != NULL && babel_ifp->list[filter]) {
-        if (access_list_apply (babel_ifp->list[filter], &p)
+    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 in",
+                   "%s/%d filtered by distribute %s",
                    p.family == AF_INET ?
                    inet_ntoa(p.u.prefix4) :
                    inet6_ntoa (p.u.prefix6),
-                   p.prefixlen);
+                   p.prefixlen,
+                   output ? "out" : "in");
             return INFINITY;
        }
     }
-    if (babel_ifp != NULL && babel_ifp->prefix[filter]) {
-        if (prefix_list_apply (babel_ifp->prefix[filter], &p)
+    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 in",
-                        p.family == AF_INET ?
-                        inet_ntoa(p.u.prefix4) :
-                        inet6_ntoa (p.u.prefix6),
-                        p.prefixlen);
+            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");
             return INFINITY;
        }
     }
 
     /* All interface filter check. */
-    dist = distribute_lookup (NULL);
+    babel = babel_lookup();
+    if (babel)
+        dist = distribute_lookup (babel->distribute_ctx, NULL);
     if (dist) {
         if (dist->list[distribute]) {
-            alist = access_list_lookup (AFI_IP6, dist->list[distribute]);
+            alist = access_list_lookup (p.family, dist->list[distribute]);
 
             if (alist) {
                 if (access_list_apply (alist, &p) == FILTER_DENY) {
-                    debugf(BABEL_DEBUG_FILTER, "%s/%d filtered by distribute in",
-                                p.family == AF_INET ?
-                                inet_ntoa(p.u.prefix4) :
-                                inet6_ntoa (p.u.prefix6),
-                                p.prefixlen);
+                    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");
                     return INFINITY;
                }
            }
        }
         if (dist->prefix[distribute]) {
-            plist = prefix_list_lookup (AFI_IP6, dist->prefix[distribute]);
+            plist = prefix_list_lookup (p.family, dist->prefix[distribute]);
             if (plist) {
                 if (prefix_list_apply (plist, &p) == PREFIX_DENY) {
-                    debugf(BABEL_DEBUG_FILTER, "%s/%d filtered by distribute in",
-                                p.family == AF_INET ?
-                                inet_ntoa(p.u.prefix4) :
-                                inet6_ntoa (p.u.prefix6),
-                                p.prefixlen);
+                    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");
                     return INFINITY;
                }
            }