CVS commit: pkgsrc/net/net-snmp

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/net-snmp
From: "matthew green" <mrg%netbsd.org@localhost>
Date: Sat, 14 Jan 2023 21:11:35 +0000

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sat Jan 14 21:11:35 UTC 2023

Modified Files:
        pkgsrc/net/net-snmp: distinfo
        pkgsrc/net/net-snmp/patches: patch-agent_mibgroup_mibII_tcpTable.c
            patch-agent_mibgroup_mibII_udpTable.c

Log Message:
handle merged inpcb code since 9.99.104:
  http://mail-index.netbsd.org/source-changes/2022/10/28/msg141800.html

this is part 2 of fixes for net-snmp, and should work now (though i'm not
sure how to test properly, but it builds on both pre-/post- merge.)


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/net/net-snmp/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/net-snmp/distinfo
diff -u pkgsrc/net/net-snmp/distinfo:1.101 pkgsrc/net/net-snmp/distinfo:1.102
--- pkgsrc/net/net-snmp/distinfo:1.101  Fri Jan 13 23:14:31 2023
+++ pkgsrc/net/net-snmp/distinfo        Sat Jan 14 21:11:35 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.101 2023/01/13 23:14:31 gutteridge Exp $
+$NetBSD: distinfo,v 1.102 2023/01/14 21:11:35 mrg Exp $
 
 BLAKE2s (net-snmp-5.9.3.tar.gz) = c5f3e30c73294c0f8b7db2a776a0a28e6f63ed1d55f32acb4328fbbb277cbe4a
 SHA512 (net-snmp-5.9.3.tar.gz) = a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
@@ -19,9 +19,9 @@ SHA1 (patch-agent_mibgroup_mibII_ip.c) =
 SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e
 SHA1 (patch-agent_mibgroup_mibII_ipv6.c) = f1e99ab8b5d5f31660112b85d863cc9ff90e0fdb
 SHA1 (patch-agent_mibgroup_mibII_tcp.c) = 92563fd6be6f27be5b348cdc8bc02061374026b0
-SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = acea4fdb55622df9ed0a45051412de278695c9da
+SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = 7996885e155e8283c41c842f1e5d92d27ea8d8ae
 SHA1 (patch-agent_mibgroup_mibII_udp.c) = d110e996d0538d17251d39a5eed46df6944ba0fa
-SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 7672f7df9c8f6540987895e784b85de1e7cebf5e
+SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 21505245b5c5f159e3eff616ffb639ae180d8362
 SHA1 (patch-agent_mibgroup_mibII_var__route.c) = 919348e62849367793e4abf7d608d9824eb8ff2d
 SHA1 (patch-agent_mibgroup_ucd-snmp_memory__netbsd1.c) = 7336d905bac315f344f93664e4118332f88fb6ee
 SHA1 (patch-agent_snmp__perl.c) = 893cf46624d4f26941b3911a64c752c110ba6ef8

Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c:1.2 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c:1.3
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c:1.2       Fri Jun 12 02:22:08 2020
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c   Sat Jan 14 21:11:35 2023
@@ -1,9 +1,51 @@
-$NetBSD: patch-agent_mibgroup_mibII_tcpTable.c,v 1.2 2020/06/12 02:22:08 sevan Exp $
+$NetBSD: patch-agent_mibgroup_mibII_tcpTable.c,v 1.3 2023/01/14 21:11:35 mrg Exp $
 
+handle list changes in 6.99.28
 
---- agent/mibgroup/mibII/tcpTable.c.orig       2020-06-12 02:28:28.274144065 +0100
-+++ agent/mibgroup/mibII/tcpTable.c    2020-06-12 02:30:19.848438704 +0100
-@@ -1043,7 +1043,11 @@
+handle merged inpcb code since 9.99.104:
+  http://mail-index.netbsd.org/source-changes/2022/10/28/msg141800.html
+
+
+--- agent/mibgroup/mibII/tcpTable.c.orig       2022-07-13 14:14:14.000000000 -0700
++++ agent/mibgroup/mibII/tcpTable.c    2023-01-14 00:30:16.395356283 -0800
+@@ -123,20 +123,34 @@ struct netsnmp_inpcb_s {
+ #if __FreeBSD_version >= 1200026
+     struct xinpcb   pcb;
+ #else
++#if defined(__NetBSD__) && __NetBSD_Version__ >= 999010400
++    struct in4pcb    pcb;
++#else
+     struct inpcb    pcb;
+ #endif
++#endif
+     int             state;
+     netsnmp_inpcb  *inp_next;
+ };
+ #undef INP_NEXT_SYMBOL
+-#define INP_NEXT_SYMBOL               inp_next
+ #define       TCPTABLE_ENTRY_TYPE     netsnmp_inpcb 
+ #define       TCPTABLE_STATE          state 
++#define       TCPTABLE_IS_LINKED_LIST
++#if defined(__NetBSD__) && __NetBSD_Version__ >= 999010400
++#define INP_NEXT_SYMBOL               inp_next
++#define       TCPTABLE_LOCALADDRESS   pcb.in4p_ip.ip_src.s_addr 
++#define       TCPTABLE_LOCALPORT      pcb.in4p_pcb.inp_lport
++#define       TCPTABLE_REMOTEADDRESS  pcb.in4p_ip.ip_dst.s_addr 
++#define       TCPTABLE_REMOTEPORT     pcb.in4p_pcb.inp_fport
++#define       TCPTABLE_TCPCB          pcb.in4p_pcb.inp_ppcb
++#else
++#define INP_NEXT_SYMBOL               inp_next
+ #define       TCPTABLE_LOCALADDRESS   pcb.inp_laddr.s_addr 
+ #define       TCPTABLE_LOCALPORT      pcb.inp_lport
+ #define       TCPTABLE_REMOTEADDRESS  pcb.inp_faddr.s_addr 
+ #define       TCPTABLE_REMOTEPORT     pcb.inp_fport
+-#define       TCPTABLE_IS_LINKED_LIST
++#define       TCPTABLE_TCPCB          pcb.inp_ppcb
++#endif
+ 
+ #endif                          /* hpux11 */
+ 
+@@ -1057,18 +1071,22 @@ tcpTable_load(netsnmp_cache *cache, void
      /*
       *  Set up a linked list
       */
@@ -15,7 +57,20 @@ $NetBSD: patch-agent_mibgroup_mibII_tcpT
      while (entry) {
     
          nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb);
-@@ -1067,8 +1071,13 @@
+         if (!nnew)
+             break;
+-        if (!NETSNMP_KLOOKUP(entry, (char *)&(nnew->pcb), sizeof(struct inpcb))) {
++        if (!NETSNMP_KLOOKUP(entry, (char *)&(nnew->pcb), sizeof(nnew->pcb))) {
+             DEBUGMSGTL(("mibII/tcpTable:TcpTable_load", "klookup failed\n"));
+             break;
+         }
+ 
+-        if (!NETSNMP_KLOOKUP(nnew->pcb.inp_ppcb, (char *)&tcpcb, sizeof(struct tcpcb))) {
++        if (!NETSNMP_KLOOKUP(nnew->TCPTABLE_TCPCB, (char *)&tcpcb, sizeof(struct tcpcb))) {
+             DEBUGMSGTL(("mibII/tcpTable:TcpTable_load", "klookup failed\n"));
+             break;
+         }
+@@ -1081,8 +1099,13 @@ tcpTable_load(netsnmp_cache *cache, void
        nnew->inp_next = tcp_head;
        tcp_head   = nnew;
  

Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c:1.3 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c:1.4
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c:1.3       Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c   Sat Jan 14 21:11:35 2023
@@ -1,12 +1,37 @@
-$NetBSD: patch-agent_mibgroup_mibII_udpTable.c,v 1.3 2022/10/18 12:01:52 adam Exp $
+$NetBSD: patch-agent_mibgroup_mibII_udpTable.c,v 1.4 2023/01/14 21:11:35 mrg Exp $
 
---- agent/mibgroup/mibII/udpTable.c.orig       2020-06-12 01:53:58.092446674 +0100
-+++ agent/mibgroup/mibII/udpTable.c    2020-06-12 02:01:40.556941658 +0100
-@@ -426,7 +426,11 @@
+handle list changes in 6.99.28
+
+handle merged inpcb code since 9.99.104:
+  http://mail-index.netbsd.org/source-changes/2022/10/28/msg141800.html
+
+
+--- agent/mibgroup/mibII/udpTable.c.orig       2022-07-13 14:14:14.000000000 -0700
++++ agent/mibgroup/mibII/udpTable.c    2023-01-14 00:46:14.117378148 -0800
+@@ -109,10 +109,16 @@ struct netsnmp_inpcb_s {
+ #define       UDPTABLE_LOCALADDRESS   pcb.inp_laddr.s_addr 
+ #define       UDPTABLE_LOCALPORT      pcb.inp_lport
+ #else
++#if defined(__NetBSD__) && __NetBSD_Version__ >= 999010400
++#define       UDPTABLE_ENTRY_TYPE     struct in4pcb 
++#define       UDPTABLE_LOCALADDRESS   in4p_ip.ip_src.s_addr
++#define       UDPTABLE_LOCALPORT      in4p_pcb.inp_lport
++#else
+ #define       UDPTABLE_ENTRY_TYPE     struct inpcb 
+ #define       UDPTABLE_LOCALADDRESS   inp_laddr.s_addr 
+ #define       UDPTABLE_LOCALPORT      inp_lport
+ #endif
++#endif
+ #define       UDPTABLE_IS_LINKED_LIST
+ 
+ #endif                          /* hpux11 */
+@@ -430,7 +436,13 @@ udpTable_next_entry( void **loop_context
       * and update the loop context ready for the next one.
       */
      *data_context = (void*)entry;
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
++#if defined(__NetBSD__) && __NetBSD_Version__ >= 999010400
++    *loop_context = (void*)TAILQ_NEXT(entry, in4p_pcb.inp_queue);
++#elif defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
 +    *loop_context = (void*)TAILQ_NEXT(entry, inp_queue);
 +#else
      *loop_context = (void*)entry->INP_NEXT_SYMBOL;
@@ -14,11 +39,13 @@ $NetBSD: patch-agent_mibgroup_mibII_udpT
      return index;
  }
  
-@@ -436,7 +440,11 @@
+@@ -440,7 +452,13 @@ udpTable_free(netsnmp_cache *cache, void
      UDPTABLE_ENTRY_TYPE        *p;
      while (udp_head) {
          p = udp_head;
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
++#if defined(__NetBSD__) && __NetBSD_Version__ >= 999010400
++        udp_head = TAILQ_NEXT(udp_head, in4p_pcb.inp_queue);
++#elif defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
 +        udp_head = TAILQ_NEXT(udp_head, inp_queue);
 +#else
          udp_head = udp_head->INP_NEXT_SYMBOL;
@@ -26,7 +53,7 @@ $NetBSD: patch-agent_mibgroup_mibII_udpT
          free(p);
      }
  
-@@ -744,7 +752,11 @@
+@@ -752,7 +770,11 @@ udpTable_load(netsnmp_cache *cache, void
      /*
       *  Set up a linked list
       */
@@ -38,7 +65,7 @@ $NetBSD: patch-agent_mibgroup_mibII_udpT
      while (entry) {
     
          nnew = SNMP_MALLOC_TYPEDEF(struct inpcb);
-@@ -801,12 +813,22 @@
+@@ -809,12 +831,22 @@ udpTable_load(netsnmp_cache *cache, void
              break;
          }

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/gnustep-base
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/gnustep-base
Indexes:

Home | Main Index | Thread Index | Old Index