Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net/quagga: fix multipath detection. (closes #8136)

Browse source 
git-svn-id: svn+ssh://svn.openwrt.org/openwrt@23654 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul 2010-10-27 10:34:32 +00:00
parent 8366cece9a
commit c561848329
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
patches/100-quagga_multipath_caching_policy.patch
View file

@ -18,7 +18,7 @@
+dnl ---------- +dnl ----------
+AC_MSG_CHECKING(for support of multipath alg. in netlink) +AC_MSG_CHECKING(for support of multipath alg. in netlink)
+ if grep RTA_MP_ALGO linux/rtnetlink.h >/dev/null 2>&1; then + if grep RTA_MP_ALGO linux/rtnetlink.h >/dev/null 2>&1; then
+ AC_DEFINE(HAVE_RT_MP_ALGO,,RTA_MP exist in rtnetlink) + AC_DEFINE(HAVE_LINUX_IP_MP_ALG_H,,RTA_MP exist in rtnetlink)
+ AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes)
+ else + else
+ AC_MSG_RESULT(no) + AC_MSG_RESULT(no)
@ -122,7 +122,7 @@
if (src) if (src)
addattr_l (&req.n, sizeof req, RTA_PREFSRC, &src->ipv4, bytelen); addattr_l (&req.n, sizeof req, RTA_PREFSRC, &src->ipv4, bytelen);
+#ifdef HAVE_RT_MP_ALGO +#ifdef HAVE_LINUX_IP_MP_ALG_H
+ if (zebrad.mpath != IP_MP_ALG_NONE) + if (zebrad.mpath != IP_MP_ALG_NONE)
+ { + {
+ if (IS_ZEBRA_DEBUG_KERNEL) + if (IS_ZEBRA_DEBUG_KERNEL)
@ -159,7 +159,7 @@
}; };
+#ifdef HAVE_RT_MP_ALGO +#ifdef HAVE_LINUX_IP_MP_ALG_H
+DEFUN (multipath_rr, +DEFUN (multipath_rr,
+ multipath_rr_cmd, + multipath_rr_cmd,
+ "multipath rr", + "multipath rr",
@ -242,7 +242,7 @@
+ 1 + 1
+}; +};
+ +
+#endif /* HAVE_RT_MP_ALGO */ +#endif /* HAVE_LINUX_IP_MP_ALG_H */
+ +
/* Initialisation of zebra and installation of commands. */ /* Initialisation of zebra and installation of commands. */
void void
@ -251,7 +251,7 @@
install_node (&table_node, config_write_table); install_node (&table_node, config_write_table);
install_node (&forwarding_node, config_write_forwarding); install_node (&forwarding_node, config_write_forwarding);
+#ifdef HAVE_RT_MP_ALGO +#ifdef HAVE_LINUX_IP_MP_ALG_H
+ install_node (&multipath_node, config_write_multipath); + install_node (&multipath_node, config_write_multipath);
+#endif +#endif
+ +
@ -262,14 +262,14 @@
install_element (VIEW_NODE, &show_table_cmd); install_element (VIEW_NODE, &show_table_cmd);
install_element (ENABLE_NODE, &show_table_cmd); install_element (ENABLE_NODE, &show_table_cmd);
install_element (CONFIG_NODE, &config_table_cmd); install_element (CONFIG_NODE, &config_table_cmd);
+#ifdef HAVE_RT_MP_ALGO +#ifdef HAVE_LINUX_IP_MP_ALG_H
+ install_element (CONFIG_NODE, &multipath_rr_cmd); + install_element (CONFIG_NODE, &multipath_rr_cmd);
+ install_element (CONFIG_NODE, &multipath_drr_cmd); + install_element (CONFIG_NODE, &multipath_drr_cmd);
+ install_element (CONFIG_NODE, &multipath_random_cmd); + install_element (CONFIG_NODE, &multipath_random_cmd);
+ install_element (CONFIG_NODE, &multipath_wrandom_cmd); + install_element (CONFIG_NODE, &multipath_wrandom_cmd);
+ install_element (CONFIG_NODE, &no_multipath_cmd); + install_element (CONFIG_NODE, &no_multipath_cmd);
+ install_element (ENABLE_NODE, &show_multipath_cmd); + install_element (ENABLE_NODE, &show_multipath_cmd);
+#endif /* HAVE_RT_MP_ALGO */ +#endif /* HAVE_LINUX_IP_MP_ALG_H */
#endif /* HAVE_NETLINK */ #endif /* HAVE_NETLINK */
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6