proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 05:27:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'remotes/jocke/ospf_neighbour'; commit 'remotes/jocke/snmp_crosscompile'

Browse Source
This commit is contained in:
Paul Jakma 2008-09-01 20:19:14 +01:00 committed by Paul Jakma
commit 5d7bdd0ed9
8 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_snmp.c
View File

@ -23,10 +23,12 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP #ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#endif #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h> #include <asn1.h>
#include <snmp.h> #include <snmp.h>
#include <snmp_impl.h> #include <snmp_impl.h>
#endif
#include "if.h" #include "if.h"
#include "log.h" #include "log.h"

26
configure.ac
View File

@ -206,6 +206,8 @@ AC_ARG_ENABLE(netlink,
[ --enable-netlink force to use Linux netlink interface]) [ --enable-netlink force to use Linux netlink interface])
AC_ARG_ENABLE(broken-aliases, AC_ARG_ENABLE(broken-aliases,
[ --enable-broken-aliases enable aliases as distinct interfaces for Linux 2.2.X]) [ --enable-broken-aliases enable aliases as distinct interfaces for Linux 2.2.X])
AC_ARG_WITH(crypto,
[ --without-crypto do not use libcrypto in SNMP])
AC_ARG_ENABLE(snmp, AC_ARG_ENABLE(snmp,
[ --enable-snmp enable SNMP support]) [ --enable-snmp enable SNMP support])
AC_ARG_WITH(libpam, AC_ARG_WITH(libpam,
@ -1254,29 +1256,19 @@ dnl ------------------
dnl check Net-SNMP library dnl check Net-SNMP library
dnl ------------------ dnl ------------------
if test "${enable_snmp}" = "yes"; then if test "${enable_snmp}" = "yes"; then
LIBS="${LIBS} -lcrypto" if test "$with_crypto" != "no"; then
LIBS="${LIBS} -lcrypto";
fi
AC_CHECK_LIB(netsnmp, asn_parse_int, AC_CHECK_LIB(netsnmp, asn_parse_int,
[AC_DEFINE(HAVE_NETSNMP,,Net SNMP) [AC_DEFINE(HAVE_NETSNMP,,Net SNMP)
AC_DEFINE(HAVE_SNMP,,SNMP) AC_DEFINE(HAVE_SNMP,,SNMP)
LIBS="${LIBS} -lnetsnmp"], LIBS="${LIBS} -lnetsnmp"],
[AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])]) [AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])])
for ac_snmp in /usr/include \ AC_CHECK_HEADER([net-snmp/net-snmp-config.h],
/usr/local/include \ [],
/dev/null; do [AC_MSG_ERROR([--enable-snmp given, but cannot find net-snmp-config.h])],
test -f "${ac_snmp}/net-snmp/library/asn1.h" && break QUAGGA_INCLUDES)
done
case ${ac_snmp} in
/dev/null)
AC_MSG_ERROR([--enable-snmp given, but can not find header])
;;
*)
SNMP_INCLUDES="-I${ac_snmp}/net-snmp"
SNMP_INCLUDES="${SNMP_INCLUDES} -I${ac_snmp}/net-snmp/library"
;;
esac
AC_SUBST(SNMP_INCLUDES) AC_SUBST(SNMP_INCLUDES)
fi fi

4
lib/smux.c
View File

@ -24,10 +24,12 @@
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP #ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#endif #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h> #include <asn1.h>
#include <snmp.h> #include <snmp.h>
#include <snmp_impl.h> #include <snmp_impl.h>
#endif
#include "log.h" #include "log.h"
#include "thread.h" #include "thread.h"

5
ospf6d/ospf6_snmp.c
View File

@ -25,11 +25,12 @@
#ifdef HAVE_NETSNMP #ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#endif /*HAVE_NETSNMP*/ #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h> #include <asn1.h>
#include <snmp.h> #include <snmp.h>
#include <snmp_impl.h> #include <snmp_impl.h>
#endif
#include "log.h" #include "log.h"
#include "vty.h" #include "vty.h"

4
ospfd/ospf_snmp.c
View File

@ -27,10 +27,12 @@
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP #ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#endif #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h> #include <asn1.h>
#include <snmp.h> #include <snmp.h>
#include <snmp_impl.h> #include <snmp_impl.h>
#endif
#include "if.h" #include "if.h"
#include "log.h" #include "log.h"

2
ospfd/ospf_vty.c
View File

@ -3093,7 +3093,7 @@ DEFUN (show_ip_ospf_neighbor_all,
"Neighbor list\n" "Neighbor list\n"
"include down status neighbor\n") "include down status neighbor\n")
{ {
struct ospf *ospf = vty->index; struct ospf *ospf = ospf_lookup ();
struct listnode *node; struct listnode *node;
struct ospf_interface *oi; struct ospf_interface *oi;

4
ripd/rip_snmp.c
View File

@ -24,10 +24,12 @@
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP #ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#endif #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h> #include <asn1.h>
#include <snmp.h> #include <snmp.h>
#include <snmp_impl.h> #include <snmp_impl.h>
#endif
#include "if.h" #include "if.h"
#include "log.h" #include "log.h"

4
zebra/zebra_snmp.c
View File

@ -24,10 +24,12 @@
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP #ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#endif #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h> #include <asn1.h>
#include <snmp.h> #include <snmp.h>
#include <snmp_impl.h> #include <snmp_impl.h>
#endif
#include "if.h" #include "if.h"
#include "log.h" #include "log.h"