[packages/quagga] upstream patch to fix incorrect usage of net-snmp api

[atler]

commit f8995f7df552b85d403ff14feb65a346b6f4ec1a
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Feb 3 13:52:08 2025 +0100

    upstream patch to fix incorrect usage of net-snmp api

 quagga.spec    |  10 +++--
 snmp-api.patch | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+), 4 deletions(-)
---
diff --git a/quagga.spec b/quagga.spec
index e4f653f..c03ecf9 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -37,6 +37,7 @@ Patch0:		%{name}-info.patch
 Patch1:		%{name}-proc.patch
 Patch2:		%{name}-vtysh-pam.patch
 Patch3:		%{name}-readline.patch
+Patch4:		snmp-api.patch
 URL:		http://www.quagga.net/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -212,10 +213,11 @@ Statyczne wersje bibliotek quagga.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
 
 %build
 %{__libtoolize}
diff --git a/snmp-api.patch b/snmp-api.patch
new file mode 100644
index 0000000..a064d9c
--- /dev/null
+++ b/snmp-api.patch
@@ -0,0 +1,120 @@
+From d689d1a0c69726330d69b2dd412fdb8dcb23394b Mon Sep 17 00:00:00 2001
+From: David Lamparter <equinox at opensourcerouting.org>
+Date: Tue, 3 Mar 2015 13:54:30 +0100
+Subject: [PATCH] bgpd: fix SNMP write support
+
+This code - dating back to the initial import in 2002 - probably never
+worked.  Calling asn_parse_int seems to always have been wrong, and in
+the meantime, there no longer is a "struct variable *" argument for
+write_method.  If anyone tried to use it, it'd probably have crashed.
+(I didn't try.)
+
+Fix this up so it actually works.  It's the only place in Quagga where a
+SNMP write is actually supported, so it's an odd one out anyway, but
+heh.
+
+Signed-off-by: David Lamparter <equinox at opensourcerouting.org>
+---
+ bgpd/bgp_snmp.c | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
+index 79aaa03a6..0f4aeec8b 100644
+--- a/bgpd/bgp_snmp.c
++++ b/bgpd/bgp_snmp.c
+@@ -337,38 +337,42 @@ bgp_peer_lookup_next (struct in_addr *src)
+   return NULL;
+ }
+ 
++/* 1.3.6.1.2.1.15.3.1.x  = 10 */
++#define PEERTAB_NAMELEN 10
++
+ static struct peer *
+ bgpPeerTable_lookup (struct variable *v, oid name[], size_t *length, 
+ 		     struct in_addr *addr, int exact)
+ {
+   struct peer *peer = NULL;
++  size_t namelen = v ? v->namelen : PEERTAB_NAMELEN;
+   int len;
+ 
+   if (exact)
+     {
+       /* Check the length. */
+-      if (*length - v->namelen != sizeof (struct in_addr))
++      if (*length - namelen != sizeof (struct in_addr))
+ 	return NULL;
+ 
+-      oid2in_addr (name + v->namelen, IN_ADDR_SIZE, addr);
++      oid2in_addr (name + namelen, IN_ADDR_SIZE, addr);
+ 
+       peer = peer_lookup_addr_ipv4 (addr);
+       return peer;
+     }
+   else
+     {
+-      len = *length - v->namelen;
++      len = *length - namelen;
+       if (len > 4) len = 4;
+       
+-      oid2in_addr (name + v->namelen, len, addr);
++      oid2in_addr (name + namelen, len, addr);
+       
+       peer = bgp_peer_lookup_next (addr);
+ 
+       if (peer == NULL)
+ 	return NULL;
+ 
+-      oid_copy_addr (name + v->namelen, addr, sizeof (struct in_addr));
+-      *length = sizeof (struct in_addr) + v->namelen;
++      oid_copy_addr (name + namelen, addr, sizeof (struct in_addr));
++      *length = sizeof (struct in_addr) + namelen;
+ 
+       return peer;
+     }
+@@ -379,14 +383,12 @@ bgpPeerTable_lookup (struct variable *v, oid name[], size_t *length,
+ static int
+ write_bgpPeerTable (int action, u_char *var_val,
+ 		    u_char var_val_type, size_t var_val_len,
+-		    u_char *statP, oid *name, size_t length,
+-		    struct variable *v)
++		    u_char *statP, oid *name, size_t length)
+ {
+   struct in_addr addr;
+   struct peer *peer;
+   long intval;
+-  size_t bigsize = SNMP_MAX_LEN;
+-  
++
+   if (var_val_type != ASN_INTEGER) 
+     {
+       return SNMP_ERR_WRONGTYPE;
+@@ -396,21 +398,21 @@ write_bgpPeerTable (int action, u_char *var_val,
+       return SNMP_ERR_WRONGLENGTH;
+     }
+ 
+-  if (! asn_parse_int(var_val, &bigsize, &var_val_type,
+-                      &intval, sizeof(long)))
+-    {
+-      return SNMP_ERR_WRONGENCODING;
+-    }
++  intval = *(long *)var_val;
+ 
+   memset (&addr, 0, sizeof (struct in_addr));
+ 
+-  peer = bgpPeerTable_lookup (v, name, &length, &addr, 1);
++  peer = bgpPeerTable_lookup (NULL, name, &length, &addr, 1);
+   if (! peer)
+     return SNMP_ERR_NOSUCHNAME;
+ 
+-  printf ("val: %ld\n", intval);
++  if (action != SNMP_MSG_INTERNAL_SET_COMMIT)
++    return SNMP_ERR_NOERROR;
+ 
+-  switch (v->magic)
++  zlog_info ("%s: SNMP write .%ld = %ld",
++             peer->host, (long)name[PEERTAB_NAMELEN - 1], intval);
++
++  switch (name[PEERTAB_NAMELEN - 1])
+     {
+     case BGPPEERADMINSTATUS:
+ #define BGP_PeerAdmin_stop  1
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/quagga.git/commitdiff/5054f7dcd678bb75c4e38ab2ec85c2057c112eaf