SOURCES: net-snmp-netlink.patch - cleanups and -Wall changes

[glen]

Author: glen                         Date: Thu Feb  5 18:47:50 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- cleanups and -Wall changes

---- Files affected:
SOURCES:
   net-snmp-netlink.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/net-snmp-netlink.patch
diff -u SOURCES/net-snmp-netlink.patch:1.4 SOURCES/net-snmp-netlink.patch:1.5
--- SOURCES/net-snmp-netlink.patch:1.4	Fri Jan 23 01:58:18 2009
+++ SOURCES/net-snmp-netlink.patch	Thu Feb  5 19:47:44 2009
@@ -46,33 +46,33 @@
  	$(RANLIB) $(MIBLIB)
  
  agentlib: $(AGENTLIB)
---- net-snmp-5.4.2.1/agent/mibgroup/mibII/tcpTable.c	2009-01-23 01:22:10.435006124 +0200
-+++ net-snmp-5.4.2.1-nl/agent/mibgroup/mibII/tcpTable.c	2009-01-23 02:28:12.726994792 +0200
-@@ -29,6 +29,12 @@
+--- net-snmp-5.4.2.1-nl/agent/mibgroup/mibII/tcpTable.c	2009-01-23 02:28:12.726994792 +0200
++++ net-snmp-5.4.2.1/agent/mibgroup/mibII/tcpTable.c	2009-02-05 20:46:32.738258556 +0200
+@@ -29,6 +29,13 @@
  #if HAVE_NETINET_TCP_VAR_H
  #include <netinet/tcp_var.h>
  #endif
 +#if HAVE_NETLINK_NETLINK_H
++#include <netlink/helpers.h>
 +#include <netlink/netlink.h>
-+#include <linux/inet_diag.h>
 +#include <sys/socket.h>
 +#include <sys/types.h>
++#include <linux/inet_diag.h>
 +#endif
  
  #include <net-snmp/net-snmp-includes.h>
  #include <net-snmp/agent/net-snmp-agent-includes.h>
-@@ -543,6 +549,95 @@
+@@ -543,6 +550,94 @@
  #else                           /* hpux11 */
  
  #ifdef linux
 +
 +// see <netinet/tcp.h>
-+#define TCP_ALL ((1 << TCP_CLOSING + 1) - 1)
++#define TCP_ALL ((1 << (TCP_CLOSING + 1)) - 1)
 +
 +static int
 +tcpTable_load_netlink()
 +{
-+	struct inpcb    pcb, *nnew;
 +	struct nl_handle nl;
 +
 +	memset(&nl, 0, sizeof(nl));
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/net-snmp-netlink.patch?r1=1.4&r2=1.5&f=u