Home Explore Help
Sign In
ableton-dir
/
openadk
forked from oss/openadk
1
0
Fork 0
Files
Tree: 2d7666cde2
Branches Tags
openadk
/
package
/
net-snmp
/
patches
/
patch-agent_mibgroup_mibII_tcpTable_c

patch-agent_mibgroup_mibII_tcpTable_c 1.9 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 
  1. --- net-snmp-5.7.2.orig/agent/mibgroup/mibII/tcpTable.c	2012-10-10 00:28:58.000000000 +0200
    2. 

  2. +++ net-snmp-5.7.2/agent/mibgroup/mibII/tcpTable.c	2014-01-01 17:12:30.000000000 +0100
    3. 

  3. @@ -34,6 +34,12 @@
    4. 

  4.  #include <netlink/netlink.h>
    5. 

  5.  #include <netlink/msg.h>
    6. 

  6.  #include <linux/inet_diag.h>
    7. 

  7. +
    8. 

  8. +/* libnl 2.0 compatibility code */
    9. 

  9. +#define nl_handle nl_sock
    10. 

  10. +#define nl_handle_alloc nl_socket_alloc
    11. 

  11. +#define nl_handle_alloc_cb nl_socket_alloc_cb
    12. 

  12. +#define nl_handle_destroy nl_socket_free
    13. 

  13.  #endif
    14. 

  14.  
    15. 

  15.  #include <net-snmp/net-snmp-includes.h>
    16. 

  16. @@ -579,8 +585,8 @@ tcpTable_load_netlink(void)
    17. 

  17.  	}
    18. 

  18.  
    19. 

  19.  	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
    20. 

  20. -		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror()));
    21. 

  21. -		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror());
    22. 

  22. +		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(1)));
    23. 

  23. +		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(1));
    24. 

  24.  		nl_handle_destroy(nl);
    25. 

  25.  		return -1;
    26. 

  26.  	}
    27. 

  27. @@ -594,8 +600,8 @@ tcpTable_load_netlink(void)
    28. 

  28.  	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
    29. 

  29.  
    30. 

  30.  	if (nl_send_auto_complete(nl, nm) < 0) {
    31. 

  31. -		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror()));
    32. 

  32. -		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror());
    33. 

  33. +		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(1)));
    34. 

  34. +		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(1));
    35. 

  35.  		nl_handle_destroy(nl);
    36. 

  36.  		return -1;
    37. 

  37.  	}
    38. 

  38. @@ -607,8 +613,8 @@ tcpTable_load_netlink(void)
    39. 

  39.  
    40. 

  40.  	while (running) {
    41. 

  41.  		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
    42. 

  42. -			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror()));
    43. 

  43. -			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror());
    44. 

  44. +			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(1)));
    45. 

  45. +			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(1));
    46. 

  46.  			nl_handle_destroy(nl);
    47. 

  47.  			return -1;
    48. 

  48.  		}
    49.