http://permalink.gmane.org/gmane.network.quagga.devel hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.network.quagga.devel/9404 <pre>Hi! Here are the appropriate followup patches to complete AgentX support with trap handling and documentation. I had to modify smux_trap() signature since I need the appropriate enterprise OID and I need a way to walk the MIB registry. There are two cleanup patches which removes unused bits in smux_trap() signature and trap_object struct. </pre> Vincent Bernat 2012-05-25T10:22:00 http://permalink.gmane.org/gmane.network.quagga.devel/9403 <pre>This element was not unused. --- bgpd/bgp_snmp.c | 4 ++-- lib/smux.h | 3 +-- ospfd/ospf_snmp.c | 32 ++++++++++++++++---------------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index a995ff6..73406d5 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c &lt; at &gt;&lt; at &gt; -833,8 +833,8 &lt; at &gt;&lt; at &gt; bgp4PathAttrTable (struct variable *v, oid name[], size_t *length, /* BGP Traps. */ struct trap_object bgpTrapList[] = { - {bgpPeerTable, 3, {3, 1, BGPPEERLASTERROR}}, - {bgpPeerTable, 3, {3, 1, BGPPEERSTATE}} + {3, {3, 1, BGPPEERLASTERROR}}, + {3, {3, 1, BGPPEERSTATE}} }; void diff --git a/lib/smux.h b/lib/smux.h index 78460e6..b7d5096 100644 --- a/lib/smux.h +++ b/lib/smux.h &lt; at &gt;&lt; at &gt; -47,8 +47,7 &lt; at &gt;&lt; at &gt; struct trap_object { - FindVarMethod *findVar; - int namelen; + int namelen; /* Negative if the object is not indexed */ oid name[MAX_OID_LEN]; }; diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c index 409153b..b2d5686 100644 --- a/ospfd/ospf_snmp.c ++</pre> Vincent Bernat 2012-05-25T10:22:02 http://permalink.gmane.org/gmane.network.quagga.devel/9402 <pre>--- doc/overview.texi | 5 ++- doc/snmp.texi | 89 +++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 83 insertions(+), 11 deletions(-) diff --git a/doc/overview.texi b/doc/overview.texi index 435834b..7acfc0e 100644 --- a/doc/overview.texi +++ b/doc/overview.texi &lt; at &gt;&lt; at &gt; -7,7 +7,7 &lt; at &gt;&lt; at &gt; provides TCP/IP based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+ (&lt; at &gt;pxref{Supported RFCs}). Quagga also supports special BGP Route Reflector and Route Server behavior. In addition to traditional IPv4 routing protocols, Quagga also -supports IPv6 routing protocols. With SNMP daemon which supports SMUX +supports IPv6 routing protocols. With SNMP daemon which supports SMUX and AgentX protocol, Quagga provides routing protocol MIBs (&lt; at &gt;pxref{SNMP Support}). Quagga uses an advanced software architecture to provide you with a high &lt; at &gt;&lt; at &gt; -238,6 +238,9 &lt; at &gt;&lt; at &gt; J. Chu, Editor. July 1994.} &lt; at &gt;cite{OSPF Version 2 Management Information Base. F. B</pre> Vincent Bernat 2012-05-25T10:22:04 http://permalink.gmane.org/gmane.network.quagga.devel/9401 <pre>smux_trap() signature has been changed to provide appropriate level information to send SNMPv2 notifications. This includes the addition of the enterprise OID to use (from which is derived the SNMP trap OID) and the MIB registry to locate the appropriate function for variable bindings provided by the trap. The SMUX implementation has been updated but ignore the provided enterprise OID. Instead, it still uses the SMUX peer OID to keep compatibility with previous versions of Quagga. The SMUX implementation also ignores the provided MIB registry since it uses smux_get() function to grab the appropriate values. This is not possible with the AgentX implementation since there is no such function provided by NetSNMP. --- bgpd/bgp_snmp.c | 9 ++++-- lib/agentx.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++- lib/smux.c | 9 +++++- lib/smux.h | 31 ++++++++++++++++++-- ospfd/ospf_snmp.c | 17 ++++++++--- 5 files changed, 137 insertions(+), 11 deletions(-) diff --git a/</pre> Vincent Bernat 2012-05-25T10:22:03 http://permalink.gmane.org/gmane.network.quagga.devel/9400 <pre>smux_trap() contains an argument whose use appears to be to set sysUpTime.0/timestamp field in SNMP trap. However, this value is not used in smux_trap(). Moreover, it is expected that this field is the value of sysUpTime.0 when the trap was sent and not any other time related to the trap. To avoid any confusion, we remove this field from the signature of the function. --- bgpd/bgp_snmp.c | 4 ++-- lib/agentx.c | 2 +- lib/smux.c | 2 +- lib/smux.h | 2 +- ospfd/ospf_snmp.c | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index f6b1056..a995ff6 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c &lt; at &gt;&lt; at &gt; -853,7 +853,7 &lt; at &gt;&lt; at &gt; bgpTrapEstablished (struct peer *peer) smux_trap (bgp_oid, sizeof bgp_oid / sizeof (oid), index, IN_ADDR_SIZE, bgpTrapList, sizeof bgpTrapList / sizeof (struct trap_object), - bm-&gt;start_time - bgp_clock (), BGPESTABLISHED); + BGPESTABLISHED); } void &lt; at &gt;&lt; at &gt; -872,7 +872,7 &lt; at &gt;&lt; at &gt; bg</pre> Vincent Bernat 2012-05-25T10:22:01 http://permalink.gmane.org/gmane.network.quagga.devel/9399 <pre>Hi. On Receiving Ack with ospfd, one more check is necessary. When a ls-update packet with non-MaxAge LSA has appeared, the LSA is registerred on retransmit list. and if the LSA is overwritten with MaxAge &amp; same-seqnum, LSA on retransmit list is also replaced with MaxAge one. when an neighbor slowly receives non-MaxAge LSA and send back an Ack, current ospfd detects this is "same instance" and delete the MaxAge LSA from retrans list. This causes LSDB inconsistency. melody(15:00:47):~/work/quagga-0.99.20.1/ospfd$ diff -U10 ospf_packet.c ospf_packet.2.c --- ospf_packet.c2012-05-25 15:00:41.000000000 +0900 +++ ospf_packet.2.c2012-05-25 15:00:26.000000000 +0900 &lt; at &gt;&lt; at &gt; -2077,21 +2077,22 &lt; at &gt;&lt; at &gt; if (lsa-&gt;data-&gt;type &lt; OSPF_MIN_LSA || lsa-&gt;data-&gt;type &gt;= OSPF_MAX_LSA) { lsa-&gt;data = NULL; ospf_lsa_discard (lsa); continue; } lsr = ospf_ls_retransmit_lookup (nbr, lsa); - if (lsr != NULL &amp;&amp; lsr-&gt;data-&gt;ls_seqnum == lsa-&gt;data-&gt;ls_seqnum) + if (lsr != NULL &amp;&amp; lsr-&gt;data-&gt;ls_seqnu</pre> KASHIMA Hiroaki 2012-05-25T06:15:49 http://permalink.gmane.org/gmane.network.quagga.devel/9398 <pre>OoO En ce début d'après-midi nuageux du jeudi 24 mai 2012, vers 14:33, Michael H Lambert &lt;lambert&lt; at &gt;psc.edu&gt; disait : configure.ac checks for net-snmp/net-snmp-config.h and issues an error if it is not usable. It also tries to link with libnetsnmp and issues an error if it is not available. But maybe FreeBSD SNMP implementation includes the compatibility bits for this. Dunno. The original configure.ac snippet is the following: dnl ------------------ dnl check Net-SNMP library dnl ------------------ if test "${enable_snmp}" = "yes"; then if test "$with_crypto" != "no"; then LIBS="${LIBS} -lcrypto"; fi AC_CHECK_LIB(netsnmp, asn_parse_int, [AC_DEFINE(HAVE_NETSNMP,,Net SNMP) AC_DEFINE(HAVE_SNMP,,SNMP) LIBS="${LIBS} -lnetsnmp"], [AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])]) AC_CHECK_HEADER([net-snmp/net-snmp-config.h], [], [AC_MSG_ERROR([--enable-snmp given, but cannot find net-snmp-config.h])], </pre> Vincent Bernat 2012-05-24T17:02:35 http://permalink.gmane.org/gmane.network.quagga.devel/9397 <pre> Can you (or somebody else who might have tried) state with certainty that, for example, /usr/include/bsnmp on FreeBSD does not work with quagga? Thanks, Michael </pre> Michael H Lambert 2012-05-24T12:33:55 http://permalink.gmane.org/gmane.network.quagga.devel/9395 <pre>Hi , I am trying to cross compile quagga 0.99.18 routing suite for octeon . After setting "ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" in configure my cross compilation was successful . But when I tried to run the zebra daemon on the octeon board I got a segmentation fault. please suggest a way to go about this issue. Also please provide a solution to get statically linked quagga daemons as the -static flag is ineffective. Thanks &amp; Regards, Harini Gopalakrishnan ________________________________ The contents of this e-mail and any attachment(s) may contain confidential or privileged information for the intended recipient(s). Unintended recipients are prohibited from taking action on the basis of information in this e-mail and using or disseminating the information, and must notify the sender and delete it from their system. L&amp;T Infotech will not accept responsibility or liability for the accuracy or completeness of, or the presence of any virus or disabling code in t</pre> Harini Gopalakrishnan 2012-05-24T09:53:58 http://permalink.gmane.org/gmane.network.quagga.devel/9394 <pre>Hi! Here is a serie of patches adding AgentX support to Quagga. The first patch is not related to AgentX support. It just fixes Quagge compilation when using a separate build directory. The second patch removes some cruft left from a migration from UCD-SNMP (I think). This is just a small cleanup. The third patch makes use of "net-snmp-config" in place of linking to -lnetsnmp. It removes explicit link to -lcrypto. If needed, this will be added by "net-snmp-config". "net-snmp-config" exists since at least NetSNMP 4.2. The fourth patch separates SMUX specific stuff from generic SNMP stuff. smux.h now only contains the interface to SMUX for the daemons. Everything else has been moved to smux.c. The idea is for another SNMP implementation to provide the appropriate smux_* functions. snmp.c is a new file containing oid_* functions (they are independant of the SNMP implementation). The last patch adds AgentX support by providing the appropriate smux_* functions. This patch does not modify daemons. Because Ne</pre> Vincent Bernat 2012-05-24T08:56:30 http://permalink.gmane.org/gmane.network.quagga.devel/9393 <pre>--enable-snmp will enable AgentX support in Quagga. SMUX is still here and can be enabled with --enable-snmp=smux. AgentX support can be enabled with "agentx" in configuration file. As for SMUX, this command is not understood by vtysh. It can be disabled with "no agentx", though there is no real use of this since this command cannot be used with vtysh. If "agentx" and "no agentx" command were added to vtysh, it would not be possible to disable agentx support after enabling it because NetSNMP does not expose the appropriate methods for this. The internals of AgentX are hidden by NetSNMP. Therefore, we don't have a file descriptor to add to the threading system. We do not have the timers to set either. Therefore, the event loop is modified to make use of snmp_select_info() from NetSNMP. Traps are not supported yet. --- configure.ac | 18 +++++++- lib/Makefile.am | 2 +- lib/agentx.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/smux.c | 2 +- lib/thread.c | 45 </pre> Vincent Bernat 2012-05-24T08:56:35 http://permalink.gmane.org/gmane.network.quagga.devel/9392 <pre>lib/snmp.c gets OID related helper functions that can be used with another SNMP interface. smux.h is cleaned of SMUX specific bits to only expose functions that may be used by an alternative implementation. We also do not redefine functions already present in NetSNMP. Just use the appropriate headers. --- lib/Makefile.am | 2 +- lib/smux.c | 123 ++++++++++++++++++------------------------------------- lib/smux.h | 81 ++---------------------------------- lib/snmp.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 161 deletions(-) create mode 100644 lib/snmp.c diff --git a/lib/Makefile.am b/lib/Makefile.am index d01cf72..73417ad 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am &lt; at &gt;&lt; at &gt; -11,7 +11,7 &lt; at &gt;&lt; at &gt; libzebra_la_SOURCES = \ checksum.c vector.c linklist.c vty.c command.c \ sockunion.c prefix.c thread.c if.c memory.c buffer.c table.c hash.c \ filter.c routemap.c distribute.c stream.c str.c log.c plist.c \ -zclient.c sockopt.c smux.c md5.c </pre> Vincent Bernat 2012-05-24T08:56:34 http://permalink.gmane.org/gmane.network.quagga.devel/9391 <pre>The correct method to link to NetSNMP is to use net-snmp-config (which is like pkg-config). Explicit link to libcrypto is also dropped (NetSNMP libs are linked to libcrypto, no need to link Quagga to it). Moreover, &lt; at &gt;SNMP_INCLUDES&lt; at &gt; is dropped because useless. Due to a bug in configure.ac, it was properly populated. --- babeld/Makefile.am | 2 +- bgpd/Makefile.am | 2 +- configure.ac | 35 +++++++++++++++++++---------------- lib/Makefile.am | 2 +- ospf6d/Makefile.am | 2 +- ospfd/Makefile.am | 2 +- ripd/Makefile.am | 2 +- ripngd/Makefile.am | 2 +- vtysh/extract.pl.in | 2 +- zebra/Makefile.am | 2 +- 10 files changed, 28 insertions(+), 25 deletions(-) diff --git a/babeld/Makefile.am b/babeld/Makefile.am index 81f6612..af1201a 100644 --- a/babeld/Makefile.am +++ b/babeld/Makefile.am &lt; at &gt;&lt; at &gt; -1,6 +1,6 &lt; at &gt;&lt; at &gt; ## Process this file with automake to produce Makefile.in. -INCLUDES = &lt; at &gt;INCLUDES&lt; at &gt; -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib &lt; at &gt;SNMP_INC</pre> Vincent Bernat 2012-05-24T08:56:33 http://permalink.gmane.org/gmane.network.quagga.devel/9390 <pre>NetSNMP is the only SNMP implementation for Quagga. We don't need two different symbols. --- bgpd/bgp_snmp.c | 6 ------ configure.ac | 3 +-- lib/smux.c | 6 ------ ospf6d/ospf6_snmp.c | 6 ------ ospfd/ospf_snmp.c | 6 ------ ripd/rip_snmp.c | 6 ------ zebra/zebra_snmp.c | 6 ------ 7 files changed, 1 insertion(+), 38 deletions(-) diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index 86cc087..f6b1056 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c &lt; at &gt;&lt; at &gt; -21,14 +21,8 &lt; at &gt;&lt; at &gt; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include &lt;zebra.h&gt; #ifdef HAVE_SNMP -#ifdef HAVE_NETSNMP #include &lt;net-snmp/net-snmp-config.h&gt; #include &lt;net-snmp/net-snmp-includes.h&gt; -#else -#include &lt;asn1.h&gt; -#include &lt;snmp.h&gt; -#include &lt;snmp_impl.h&gt; -#endif #include "if.h" #include "log.h" diff --git a/configure.ac b/configure.ac index 80f65b9..c3c651f 100755 --- a/configure.ac +++ b/configure.ac &lt; at &gt;&lt; at &gt; -1370,8 +1370,7 &lt; at &gt;&lt; at &gt; if test "${enable_snmp}" = "yes"; then </pre> Vincent Bernat 2012-05-24T08:56:32 http://permalink.gmane.org/gmane.network.quagga.devel/9389 <pre>Some .h files in lib/ are autogenerated. The search path should include the build directory and the source directory. They usually match but sometimes, they may be different. For example: $ mkdir build $ cd build $ ../configure $ make --- babeld/Makefile.am | 2 +- bgpd/Makefile.am | 2 +- guile/Makefile.am | 2 +- isisd/Makefile.am | 2 +- isisd/topology/Makefile.am | 2 +- lib/Makefile.am | 2 +- ospf6d/Makefile.am | 2 +- ospfclient/Makefile.am | 2 +- ospfd/Makefile.am | 2 +- ripd/Makefile.am | 2 +- ripngd/Makefile.am | 2 +- tests/Makefile.am | 2 +- vtysh/Makefile.am | 2 +- vtysh/extract.pl.in | 2 +- watchquagga/Makefile.am | 2 +- zebra/Makefile.am | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/babeld/Makefile.am b/babeld/Makefile.am index 8703de0..81f6612 100644 --- a/babeld/Makefile.am +++ b/bab</pre> Vincent Bernat 2012-05-24T08:56:31 http://permalink.gmane.org/gmane.network.quagga.devel/9388 <pre> Hm. It seems to me that Jorge's patch is more complete and fixes the same issue in a more consistent way in the proper place. Comments? If I don't hear anything I'll pick up Jorge's patch and consider Stephen's as superseded. -David </pre> David Lamparter 2012-05-22T23:16:29 http://permalink.gmane.org/gmane.network.quagga.devel/9387 <pre> Actually, that ends up being the idea of "bgpd: don't advertise routes with peer address as nexthop"; I'll go respin that using peer-&gt;nexthop as I've commented already. After reading RFC4271 5.1.3 I'm confident that's actually the correct thing to do. -David </pre> David Lamparter 2012-05-22T22:46:22 http://permalink.gmane.org/gmane.network.quagga.devel/9386 <pre>[...] Merged 22 of 25, Thanks! Not merged werre: -David </pre> David Lamparter 2012-05-22T22:34:00 http://permalink.gmane.org/gmane.network.quagga.devel/9385 <pre> I'll pick it up after rechecking the BGP remote ID thing. I think the check is actually 100% wrong and removing it was the correct fix in the first place, but I'll recheck. Dropping Jorge's 25/25 for now; remainder inbound on master. -David </pre> David Lamparter 2012-05-22T22:29:23 http://permalink.gmane.org/gmane.network.quagga.devel/9384 <pre>El 22/05/2012 20:52, David Lamparter escribió: Sure! That's why the series was a RFC one :-) </pre> Jorge Boncompte [DTI2] 2012-05-22T19:01:52 http://permalink.gmane.org/gmane.network.quagga.devel/9383 <pre> Changing this to 64 since the maximum function name length specified by ISO C99 is 63. Also makes the value less arbitrary ;) -David </pre> David Lamparter 2012-05-22T18:52:25 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.network.quagga.devel