diff options
Diffstat (limited to 'meta-networking/recipes-protocols/net-snmp/files/ifmib.patch')
-rw-r--r-- | meta-networking/recipes-protocols/net-snmp/files/ifmib.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/files/ifmib.patch b/meta-networking/recipes-protocols/net-snmp/files/ifmib.patch new file mode 100644 index 000000000..859c52c3e --- /dev/null +++ b/meta-networking/recipes-protocols/net-snmp/files/ifmib.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | Signed-off-by: Jack Mitchell <jack@embed.me.uk> | ||
2 | Upstream-Status: Pending | ||
3 | Bug-Report: http://sourceforge.net/p/net-snmp/bugs/2449/ | ||
4 | |||
5 | diff --git a/agent/mibgroup/if-mib/data_access/interface_linux.c b/agent/mibgroup/if-mib/data_access/interface_linux.c | ||
6 | index 3419811..d6eb91a 100644 | ||
7 | --- a/agent/mibgroup/if-mib/data_access/interface_linux.c | ||
8 | +++ b/agent/mibgroup/if-mib/data_access/interface_linux.c | ||
9 | @@ -18,7 +18,31 @@ netsnmp_feature_require(interface_ioctl_flags_set) | ||
10 | |||
11 | #ifdef HAVE_PCI_LOOKUP_NAME | ||
12 | #include <pci/pci.h> | ||
13 | +#include <setjmp.h> | ||
14 | static struct pci_access *pci_access; | ||
15 | + | ||
16 | +/* Avoid letting libpci call exit(1) when no PCI bus is available. */ | ||
17 | +static int do_longjmp =0; | ||
18 | +static jmp_buf err_buf; | ||
19 | +static void | ||
20 | +netsnmp_pci_error(char *msg, ...) | ||
21 | +{ | ||
22 | + va_list args; | ||
23 | + char *buf; | ||
24 | + int buflen; | ||
25 | + | ||
26 | + va_start(args, msg); | ||
27 | + buflen = strlen("pcilib: ")+strlen(msg)+2; | ||
28 | + buf = malloc(buflen); | ||
29 | + snprintf(buf, buflen, "pcilib: %s\n", msg); | ||
30 | + snmp_vlog(LOG_ERR, buf, args); | ||
31 | + free(buf); | ||
32 | + va_end(args); | ||
33 | + if (do_longjmp) | ||
34 | + longjmp(err_buf, 1); | ||
35 | + else | ||
36 | + exit(1); | ||
37 | +} | ||
38 | #endif | ||
39 | |||
40 | #ifdef HAVE_LINUX_ETHTOOL_H | ||
41 | @@ -147,10 +171,22 @@ netsnmp_arch_interface_init(void) | ||
42 | |||
43 | #ifdef HAVE_PCI_LOOKUP_NAME | ||
44 | pci_access = pci_alloc(); | ||
45 | - if (pci_access) | ||
46 | + if (!pci_access) { | ||
47 | + snmp_log(LOG_ERR, "pcilib: pci_alloc failed\n"); | ||
48 | + return; | ||
49 | + } | ||
50 | + | ||
51 | + pci_access->error = netsnmp_pci_error; | ||
52 | + | ||
53 | + do_longjmp = 1; | ||
54 | + if (setjmp(err_buf)) { | ||
55 | + pci_cleanup(pci_access); | ||
56 | + snmp_log(LOG_ERR, "pcilib: pci_init failed\n"); | ||
57 | + pci_access = NULL; | ||
58 | + } | ||
59 | + else if (pci_access) | ||
60 | pci_init(pci_access); | ||
61 | - else | ||
62 | - snmp_log(LOG_ERR, "Unable to create pci access method\n"); | ||
63 | + do_longjmp = 0; | ||
64 | #endif | ||
65 | } | ||
66 | |||