Fix for systems with RTF_LLDATA in place of RTF_LLINFO.

4 files changed, 79 insertions, 1 deletions

diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index af81dc8319e..284a6787c8a 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.87 2015/11/04 00:35:15 agc Exp $
+$NetBSD: distinfo,v 1.88 2016/04/29 19:47:21 adam Exp $
 
 SHA1 (net-snmp-5.7.3.tar.gz) = 97dc25077257680815de44e34128d365c76bd839
 RMD160 (net-snmp-5.7.3.tar.gz) = c5cf54d5723ee417e07f1f9fa3936aef505104a2
@@ -9,16 +9,19 @@ SHA1 (patch-af) = 4fb96b79f9126dedb8a132d44894ea23c9e8c101
 SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa
 SHA1 (patch-agent_mibgroup_agentx_master.c) = c2b3f145280e3fecc26a431ec914cf89d87a17f4
 SHA1 (patch-agent_mibgroup_agentx_master_admin.c) = 3c233c1e3113fbc9c1de34cb4cbacca9ef4a6fe2
+SHA1 (patch-agent_mibgroup_at.c) = 50842f54d98b3cf7bf7028ddbb582b84b7ae682f
 SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = 5f1cd89f938b60e57ae87c055a269d3848b6a23e
 SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = cee9722d9a3f956726a8760b900ed3a375afde3f
 SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = 928a5aa99e7893ee91dea3110db8098212e328fa
 SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = f983ae0d99d85ab1ac6dc7cf2d2c0415b6935258
+SHA1 (patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c) = cad87b474cdd469c7ba762ed8a47202c3c6f9240
 SHA1 (patch-agent_mibgroup_kernel__sunos5.c) = 3e345f92f42a47959716b0176096c6b0d91aa65a
 SHA1 (patch-agent_mibgroup_kernel__sunos5.h) = eb80eb5e55020014b1e5524fd572839aefdce5a5
 SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e
 SHA1 (patch-agent_mibgroup_mibII_ipv6.c) = d6a271145e6ba774cbc1e93caa14e3d22dc43075
 SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = f547f3fd08848803cbf7ce08a41ba463c4d02992
 SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 2eb5e5c05ecb23f69cbb0d38a31e14d5b5ddc6b7
+SHA1 (patch-agent_mibgroup_var__route.c) = 919348e62849367793e4abf7d608d9824eb8ff2d
 SHA1 (patch-agent_snmp__agent.c) = 2dbfea907d0e1881f5d55c5b270984fc3a562da9
 SHA1 (patch-ai) = 04c2a487bad8705c9725ef4a62016051d3898970
 SHA1 (patch-aj) = d110e996d0538d17251d39a5eed46df6944ba0fa
diff --git a/net/net-snmp/patches/patch-agent_mibgroup_at.c b/net/net-snmp/patches/patch-agent_mibgroup_at.c
new file mode 100644
index 00000000000..79e7f60f10f
--- /dev/null
+++ b/net/net-snmp/patches/patch-agent_mibgroup_at.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-agent_mibgroup_at.c,v 1.1 2016/04/29 19:47:21 adam Exp $
+
+Fix for systems with RTF_LLDATA in place of RTF_LLINFO.
+
+--- agent/mibgroup/mibII/at.c.orig	2016-04-29 19:32:13.000000000 +0000
++++ agent/mibgroup/mibII/at.c
+@@ -101,7 +101,7 @@
+ #include <net-snmp/data_access/interface.h>
+ 
+ #if defined(HAVE_SYS_SYSCTL_H) && !defined(NETSNMP_CAN_USE_SYSCTL)
+-# if defined(RTF_LLINFO) 
++# if defined(RTF_LLINFO) || defined(RTF_LLDATA)
+ #  define NETSNMP_CAN_USE_SYSCTL 1
+ # endif
+ #endif
+@@ -691,7 +691,9 @@ ARP_Scan_Init(void)
+     mib[2] = 0;
+     mib[3] = AF_INET;
+     mib[4] = NET_RT_FLAGS;
+-#if defined RTF_LLINFO
++#if defined RTF_LLDATA
++    mib[5] = RTF_LLDATA;
++#elif defined RTF_LLINFO
+     mib[5] = RTF_LLINFO;
+ #else
+     mib[5] = 0;
diff --git a/net/net-snmp/patches/patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c b/net/net-snmp/patches/patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c
new file mode 100644
index 00000000000..c7ed107e79b
--- /dev/null
+++ b/net/net-snmp/patches/patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c,v 1.1 2016/04/29 19:47:21 adam Exp $
+
+Fix for systems with RTF_LLDATA in place of RTF_LLINFO.
+
+--- agent/mibgroup/ip-mib/data_access/arp_sysctl.c.orig	2016-04-29 19:29:57.000000000 +0000
++++ agent/mibgroup/ip-mib/data_access/arp_sysctl.c
+@@ -129,7 +129,11 @@ _load_arp_table_from_sysctl(netsnmp_arp_
+     mib[2] = 0;
+     mib[3] = AF_INET;
+     mib[4] = NET_RT_FLAGS;
++#ifdef RTF_LLDATA
++    mib[5] = RTF_LLDATA;
++#else
+     mib[5] = RTF_LLINFO;
++#endif
+ 
+     err = 0;
+     buf = newbuf = NULL;
+@@ -236,7 +240,11 @@ _load_ndp_table_from_sysctl(netsnmp_arp_
+     mib[2] = 0;
+     mib[3] = AF_INET6;
+     mib[4] = NET_RT_FLAGS;
++#ifdef RTF_LLDATA
++    mib[5] = RTF_LLDATA;
++#else
+     mib[5] = RTF_LLINFO;
++#endif
+ 
+     err = 0;
+     buf = newbuf = NULL;
diff --git a/net/net-snmp/patches/patch-agent_mibgroup_var__route.c b/net/net-snmp/patches/patch-agent_mibgroup_var__route.c
new file mode 100644
index 00000000000..0442e026cae
--- /dev/null
+++ b/net/net-snmp/patches/patch-agent_mibgroup_var__route.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-agent_mibgroup_var__route.c,v 1.1 2016/04/29 19:47:21 adam Exp $
+
+Fix for systems with RTF_LLDATA in place of RTF_LLINFO.
+
+--- agent/mibgroup/mibII/var_route.c.orig	2016-04-29 19:35:23.000000000 +0000
++++ agent/mibgroup/mibII/var_route.c
+@@ -954,8 +954,12 @@ load_rtentries(struct radix_node *pt)
+         }
+ #if CHECK_RT_FLAGS
+         if (((rt.rt_flags & RTF_CLONING) != RTF_CLONING)
++#ifdef RTF_LLDATA
++            && ((rt.rt_flags & RTF_LLDATA) != RTF_LLDATA)) {
++#else
+             && ((rt.rt_flags & RTF_LLINFO) != RTF_LLINFO)) {
+ #endif
++#endif
+             /*
+              * check for space and malloc 
+              */