diff options
author | Changqing Li <changqing.li@windriver.com> | 2018-08-09 13:16:46 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-08-11 20:16:53 -0700 |
commit | 03bd2580219ddfc86e33af455a8c90e9c0e1dfe2 (patch) | |
tree | 301958ff4d4dc444dd0d3c3d96b2e5546cf7106d /meta-networking/recipes-protocols | |
parent | 576515a07ce788f5f5c380932cb01ff84776f229 (diff) | |
download | meta-openembedded-03bd2580219ddfc86e33af455a8c90e9c0e1dfe2.tar.gz |
net-snmp: upgrade 5.7.3 -> 5.8
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-protocols')
19 files changed, 67 insertions, 3305 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch deleted file mode 100644 index b14b76128..000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From a92628a163ebf1ea62220684736300461c003875 Mon Sep 17 00:00:00 2001 | ||
2 | From: Niels Baggesen <nba@users.sourceforge.net> | ||
3 | Date: Mon, 26 Jan 2015 20:26:06 +0100 | ||
4 | Subject: [PATCH] BUG#a2584: Fix snmptrap to use clientaddr from snmp.conf. | ||
5 | Thanks to rizwan | ||
6 | |||
7 | Upstream-Status: backport | ||
8 | |||
9 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | ||
10 | --- | ||
11 | snmplib/transports/snmpUDPIPv6Domain.c | 21 +++++++++++++++++++++ | ||
12 | 1 file changed, 21 insertions(+) | ||
13 | |||
14 | Index: net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c | ||
15 | =================================================================== | ||
16 | --- net-snmp-5.7.3.orig/snmplib/transports/snmpUDPIPv6Domain.c | ||
17 | +++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c | ||
18 | @@ -286,6 +286,27 @@ netsnmp_udp6_transport(struct sockaddr_i | ||
19 | return NULL; | ||
20 | #endif /* NETSNMP_NO_LISTEN_SUPPORT */ | ||
21 | } else { | ||
22 | + char *client_socket = NULL; | ||
23 | + /* | ||
24 | + * This is a client session. If we've been given a | ||
25 | + * client address to send from, then bind to that. | ||
26 | + * Otherwise the send will use "something sensible". | ||
27 | + */ | ||
28 | + | ||
29 | + client_socket = netsnmp_ds_get_string(NETSNMP_DS_LIBRARY_ID, | ||
30 | + NETSNMP_DS_LIB_CLIENT_ADDR); | ||
31 | + if (client_socket) { | ||
32 | + struct sockaddr_in6 client_addr; | ||
33 | + netsnmp_sockaddr_in6_2(&client_addr, client_socket, NULL); | ||
34 | + rc = bind(t->sock, (struct sockaddr *)&client_addr, | ||
35 | + sizeof(struct sockaddr_in6)); | ||
36 | + if ( rc != 0 ) { | ||
37 | + DEBUGMSGTL(("netsnmp_udp6", "failed to bind for clientaddr: %d %s\n", | ||
38 | + errno, strerror(errno))); | ||
39 | + netsnmp_socketbase_close(t); | ||
40 | + netsnmp_transport_free(t); | ||
41 | + } | ||
42 | + } | ||
43 | /* | ||
44 | * This is a client session. Save the address in the | ||
45 | * transport-specific data pointer for later use by netsnmp_udp6_send. | ||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch deleted file mode 100644 index 7314ab16a..000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch +++ /dev/null | |||
@@ -1,2524 +0,0 @@ | |||
1 | net-snmp: remove U64 typedef | ||
2 | |||
3 | From git://git.code.sf.net/p/net-snmp/code | ||
4 | |||
5 | Upstream-Status: Backport (unmodified) | ||
6 | |||
7 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
8 | |||
9 | From 477b4307ef12ddce3b6a9205e0bdddbfb2e0e9b6 Mon Sep 17 00:00:00 2001 | ||
10 | From: Bart Van Assche <bvanassche@acm.org> | ||
11 | Date: Sat, 20 Feb 2016 18:58:18 -0800 | ||
12 | Subject: [PATCH 1/1] Remove U64 typedef | ||
13 | |||
14 | The U64 typedef conflicts with a typedef in a Perl header file. Hence | ||
15 | remove the U64 typedef from the Net-SNMP header files. This patch does | ||
16 | not modify the Net-SNMP ABI. | ||
17 | --- | ||
18 | agent/mibgroup/if-mib/ifXTable/ifXTable.c | 16 +- | ||
19 | agent/mibgroup/if-mib/ifXTable/ifXTable.h | 48 +- | ||
20 | .../mibgroup/if-mib/ifXTable/ifXTable_interface.c | 32 +- | ||
21 | .../ip-mib/data_access/systemstats_common.c | 2 +- | ||
22 | .../ipIfStatsTable/ipIfStatsTable_data_get.c | 28 +- | ||
23 | .../ipIfStatsTable/ipIfStatsTable_data_get.h | 28 +- | ||
24 | .../ipIfStatsTable/ipIfStatsTable_interface.c | 56 +- | ||
25 | .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | 28 +- | ||
26 | .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | 921 ++------------------- | ||
27 | .../ipSystemStatsTable_interface.c | 56 +- | ||
28 | include/net-snmp/data_access/ipstats.h | 42 +- | ||
29 | include/net-snmp/library/int64.h | 34 +- | ||
30 | snmplib/int64.c | 38 +- | ||
31 | snmplib/read_config.c | 6 +- | ||
32 | testing/fulltests/unit-tests/T015int64_clib.c | 10 +- | ||
33 | 15 files changed, 274 insertions(+), 1071 deletions(-) | ||
34 | |||
35 | Index: net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.c | ||
36 | =================================================================== | ||
37 | --- net-snmp-5.7.3.orig/agent/mibgroup/if-mib/ifXTable/ifXTable.c | ||
38 | +++ net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.c | ||
39 | @@ -722,7 +722,7 @@ The total number of octets received on t | ||
40 | */ | ||
41 | int | ||
42 | ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
43 | - U64 * ifHCInOctets_val_ptr) | ||
44 | + struct counter64 *ifHCInOctets_val_ptr) | ||
45 | { | ||
46 | /** we should have a non-NULL pointer */ | ||
47 | netsnmp_assert(NULL != ifHCInOctets_val_ptr); | ||
48 | @@ -779,7 +779,7 @@ The number of packets, delivered by this | ||
49 | */ | ||
50 | int | ||
51 | ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
52 | - U64 * ifHCInUcastPkts_val_ptr) | ||
53 | + struct counter64 *ifHCInUcastPkts_val_ptr) | ||
54 | { | ||
55 | /** we should have a non-NULL pointer */ | ||
56 | netsnmp_assert(NULL != ifHCInUcastPkts_val_ptr); | ||
57 | @@ -838,7 +838,7 @@ The number of packets, delivered by this | ||
58 | */ | ||
59 | int | ||
60 | ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
61 | - U64 * ifHCInMulticastPkts_val_ptr) | ||
62 | + struct counter64 *ifHCInMulticastPkts_val_ptr) | ||
63 | { | ||
64 | /** we should have a non-NULL pointer */ | ||
65 | netsnmp_assert(NULL != ifHCInMulticastPkts_val_ptr); | ||
66 | @@ -897,7 +897,7 @@ The number of packets, delivered by this | ||
67 | */ | ||
68 | int | ||
69 | ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
70 | - U64 * ifHCInBroadcastPkts_val_ptr) | ||
71 | + struct counter64 *ifHCInBroadcastPkts_val_ptr) | ||
72 | { | ||
73 | /** we should have a non-NULL pointer */ | ||
74 | netsnmp_assert(NULL != ifHCInBroadcastPkts_val_ptr); | ||
75 | @@ -955,7 +955,7 @@ The total number of octets transmitted o | ||
76 | */ | ||
77 | int | ||
78 | ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
79 | - U64 * ifHCOutOctets_val_ptr) | ||
80 | + struct counter64 *ifHCOutOctets_val_ptr) | ||
81 | { | ||
82 | /** we should have a non-NULL pointer */ | ||
83 | netsnmp_assert(NULL != ifHCOutOctets_val_ptr); | ||
84 | @@ -1013,7 +1013,7 @@ The total number of packets that higher- | ||
85 | */ | ||
86 | int | ||
87 | ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
88 | - U64 * ifHCOutUcastPkts_val_ptr) | ||
89 | + struct counter64 *ifHCOutUcastPkts_val_ptr) | ||
90 | { | ||
91 | /** we should have a non-NULL pointer */ | ||
92 | netsnmp_assert(NULL != ifHCOutUcastPkts_val_ptr); | ||
93 | @@ -1074,7 +1074,7 @@ The total number of packets that higher- | ||
94 | */ | ||
95 | int | ||
96 | ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
97 | - U64 * ifHCOutMulticastPkts_val_ptr) | ||
98 | + struct counter64 *ifHCOutMulticastPkts_val_ptr) | ||
99 | { | ||
100 | /** we should have a non-NULL pointer */ | ||
101 | netsnmp_assert(NULL != ifHCOutMulticastPkts_val_ptr); | ||
102 | @@ -1134,7 +1134,7 @@ The total number of packets that higher- | ||
103 | */ | ||
104 | int | ||
105 | ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
106 | - U64 * ifHCOutBroadcastPkts_val_ptr) | ||
107 | + struct counter64 *ifHCOutBroadcastPkts_val_ptr) | ||
108 | { | ||
109 | /** we should have a non-NULL pointer */ | ||
110 | netsnmp_assert(NULL != ifHCOutBroadcastPkts_val_ptr); | ||
111 | Index: net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.h | ||
112 | =================================================================== | ||
113 | --- net-snmp-5.7.3.orig/agent/mibgroup/if-mib/ifXTable/ifXTable.h | ||
114 | +++ net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.h | ||
115 | @@ -143,28 +143,28 @@ config_require(if-mib/ifXTable/ifXTable_ | ||
116 | u_long * | ||
117 | ifOutBroadcastPkts_val_ptr); | ||
118 | int ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
119 | - U64 * ifHCInOctets_val_ptr); | ||
120 | + struct counter64 *ifHCInOctets_val_ptr); | ||
121 | int ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
122 | - U64 * ifHCInUcastPkts_val_ptr); | ||
123 | + struct counter64 *ifHCInUcastPkts_val_ptr); | ||
124 | int ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * | ||
125 | rowreq_ctx, | ||
126 | - U64 * | ||
127 | + struct counter64 * | ||
128 | ifHCInMulticastPkts_val_ptr); | ||
129 | int ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * | ||
130 | rowreq_ctx, | ||
131 | - U64 * | ||
132 | + struct counter64 * | ||
133 | ifHCInBroadcastPkts_val_ptr); | ||
134 | int ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
135 | - U64 * ifHCOutOctets_val_ptr); | ||
136 | + struct counter64 *ifHCOutOctets_val_ptr); | ||
137 | int ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | ||
138 | - U64 * ifHCOutUcastPkts_val_ptr); | ||
139 | + struct counter64 *ifHCOutUcastPkts_val_ptr); | ||
140 | int ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * | ||
141 | rowreq_ctx, | ||
142 | - U64 * | ||
143 | + struct counter64 * | ||
144 | ifHCOutMulticastPkts_val_ptr); | ||
145 | int ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * | ||
146 | rowreq_ctx, | ||
147 | - U64 * | ||
148 | + struct counter64 * | ||
149 | ifHCOutBroadcastPkts_val_ptr); | ||
150 | int ifLinkUpDownTrapEnable_get(ifXTable_rowreq_ctx * | ||
151 | rowreq_ctx, | ||
152 | @@ -284,86 +284,86 @@ config_require(if-mib/ifXTable/ifXTable_ | ||
153 | |||
154 | int ifHCInOctets_check_value(ifXTable_rowreq_ctx * | ||
155 | rowreq_ctx, | ||
156 | - U64 ifHCInOctets_val); | ||
157 | + struct counter64 ifHCInOctets_val); | ||
158 | int ifHCInOctets_undo_setup(ifXTable_rowreq_ctx * | ||
159 | rowreq_ctx); | ||
160 | int ifHCInOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, | ||
161 | - U64 ifHCInOctets_val); | ||
162 | + struct counter64 ifHCInOctets_val); | ||
163 | int ifHCInOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); | ||
164 | |||
165 | int ifHCInUcastPkts_check_value(ifXTable_rowreq_ctx * | ||
166 | rowreq_ctx, | ||
167 | - U64 ifHCInUcastPkts_val); | ||
168 | + struct counter64 ifHCInUcastPkts_val); | ||
169 | int ifHCInUcastPkts_undo_setup(ifXTable_rowreq_ctx * | ||
170 | rowreq_ctx); | ||
171 | int ifHCInUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, | ||
172 | - U64 ifHCInUcastPkts_val); | ||
173 | + struct counter64 ifHCInUcastPkts_val); | ||
174 | int ifHCInUcastPkts_undo(ifXTable_rowreq_ctx * rowreq_ctx); | ||
175 | |||
176 | int ifHCInMulticastPkts_check_value(ifXTable_rowreq_ctx * | ||
177 | rowreq_ctx, | ||
178 | - U64 | ||
179 | + struct counter64 | ||
180 | ifHCInMulticastPkts_val); | ||
181 | int ifHCInMulticastPkts_undo_setup(ifXTable_rowreq_ctx * | ||
182 | rowreq_ctx); | ||
183 | int ifHCInMulticastPkts_set(ifXTable_rowreq_ctx * | ||
184 | rowreq_ctx, | ||
185 | - U64 ifHCInMulticastPkts_val); | ||
186 | + struct counter64 ifHCInMulticastPkts_val); | ||
187 | int ifHCInMulticastPkts_undo(ifXTable_rowreq_ctx * | ||
188 | rowreq_ctx); | ||
189 | |||
190 | int ifHCInBroadcastPkts_check_value(ifXTable_rowreq_ctx * | ||
191 | rowreq_ctx, | ||
192 | - U64 | ||
193 | + struct counter64 | ||
194 | ifHCInBroadcastPkts_val); | ||
195 | int ifHCInBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * | ||
196 | rowreq_ctx); | ||
197 | int ifHCInBroadcastPkts_set(ifXTable_rowreq_ctx * | ||
198 | rowreq_ctx, | ||
199 | - U64 ifHCInBroadcastPkts_val); | ||
200 | + struct counter64 ifHCInBroadcastPkts_val); | ||
201 | int ifHCInBroadcastPkts_undo(ifXTable_rowreq_ctx * | ||
202 | rowreq_ctx); | ||
203 | |||
204 | int ifHCOutOctets_check_value(ifXTable_rowreq_ctx * | ||
205 | rowreq_ctx, | ||
206 | - U64 ifHCOutOctets_val); | ||
207 | + struct counter64 ifHCOutOctets_val); | ||
208 | int ifHCOutOctets_undo_setup(ifXTable_rowreq_ctx * | ||
209 | rowreq_ctx); | ||
210 | int ifHCOutOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, | ||
211 | - U64 ifHCOutOctets_val); | ||
212 | + struct counter64 ifHCOutOctets_val); | ||
213 | int ifHCOutOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); | ||
214 | |||
215 | int ifHCOutUcastPkts_check_value(ifXTable_rowreq_ctx * | ||
216 | rowreq_ctx, | ||
217 | - U64 ifHCOutUcastPkts_val); | ||
218 | + struct counter64 ifHCOutUcastPkts_val); | ||
219 | int ifHCOutUcastPkts_undo_setup(ifXTable_rowreq_ctx * | ||
220 | rowreq_ctx); | ||
221 | int ifHCOutUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, | ||
222 | - U64 ifHCOutUcastPkts_val); | ||
223 | + struct counter64 ifHCOutUcastPkts_val); | ||
224 | int ifHCOutUcastPkts_undo(ifXTable_rowreq_ctx * | ||
225 | rowreq_ctx); | ||
226 | |||
227 | int ifHCOutMulticastPkts_check_value(ifXTable_rowreq_ctx * | ||
228 | rowreq_ctx, | ||
229 | - U64 | ||
230 | + struct counter64 | ||
231 | ifHCOutMulticastPkts_val); | ||
232 | int ifHCOutMulticastPkts_undo_setup(ifXTable_rowreq_ctx * | ||
233 | rowreq_ctx); | ||
234 | int ifHCOutMulticastPkts_set(ifXTable_rowreq_ctx * | ||
235 | rowreq_ctx, | ||
236 | - U64 ifHCOutMulticastPkts_val); | ||
237 | + struct counter64 ifHCOutMulticastPkts_val); | ||
238 | int ifHCOutMulticastPkts_undo(ifXTable_rowreq_ctx * | ||
239 | rowreq_ctx); | ||
240 | |||
241 | int ifHCOutBroadcastPkts_check_value(ifXTable_rowreq_ctx * | ||
242 | rowreq_ctx, | ||
243 | - U64 | ||
244 | + struct counter64 | ||
245 | ifHCOutBroadcastPkts_val); | ||
246 | int ifHCOutBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * | ||
247 | rowreq_ctx); | ||
248 | int ifHCOutBroadcastPkts_set(ifXTable_rowreq_ctx * | ||
249 | rowreq_ctx, | ||
250 | - U64 ifHCOutBroadcastPkts_val); | ||
251 | + struct counter64 ifHCOutBroadcastPkts_val); | ||
252 | int ifHCOutBroadcastPkts_undo(ifXTable_rowreq_ctx * | ||
253 | rowreq_ctx); | ||
254 | |||
255 | Index: net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c | ||
256 | =================================================================== | ||
257 | --- net-snmp-5.7.3.orig/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c | ||
258 | +++ net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c | ||
259 | @@ -729,72 +729,72 @@ _ifXTable_get_column(ifXTable_rowreq_ctx | ||
260 | * ifHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
261 | */ | ||
262 | case COLUMN_IFHCINOCTETS: | ||
263 | - var->val_len = sizeof(U64); | ||
264 | + var->val_len = sizeof(struct counter64); | ||
265 | var->type = ASN_COUNTER64; | ||
266 | - rc = ifHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); | ||
267 | + rc = ifHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
268 | break; | ||
269 | |||
270 | /* | ||
271 | * ifHCInUcastPkts(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
272 | */ | ||
273 | case COLUMN_IFHCINUCASTPKTS: | ||
274 | - var->val_len = sizeof(U64); | ||
275 | + var->val_len = sizeof(struct counter64); | ||
276 | var->type = ASN_COUNTER64; | ||
277 | - rc = ifHCInUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); | ||
278 | + rc = ifHCInUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
279 | break; | ||
280 | |||
281 | /* | ||
282 | * ifHCInMulticastPkts(8)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
283 | */ | ||
284 | case COLUMN_IFHCINMULTICASTPKTS: | ||
285 | - var->val_len = sizeof(U64); | ||
286 | + var->val_len = sizeof(struct counter64); | ||
287 | var->type = ASN_COUNTER64; | ||
288 | - rc = ifHCInMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); | ||
289 | + rc = ifHCInMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
290 | break; | ||
291 | |||
292 | /* | ||
293 | * ifHCInBroadcastPkts(9)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
294 | */ | ||
295 | case COLUMN_IFHCINBROADCASTPKTS: | ||
296 | - var->val_len = sizeof(U64); | ||
297 | + var->val_len = sizeof(struct counter64); | ||
298 | var->type = ASN_COUNTER64; | ||
299 | - rc = ifHCInBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); | ||
300 | + rc = ifHCInBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
301 | break; | ||
302 | |||
303 | /* | ||
304 | * ifHCOutOctets(10)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
305 | */ | ||
306 | case COLUMN_IFHCOUTOCTETS: | ||
307 | - var->val_len = sizeof(U64); | ||
308 | + var->val_len = sizeof(struct counter64); | ||
309 | var->type = ASN_COUNTER64; | ||
310 | - rc = ifHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); | ||
311 | + rc = ifHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
312 | break; | ||
313 | |||
314 | /* | ||
315 | * ifHCOutUcastPkts(11)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
316 | */ | ||
317 | case COLUMN_IFHCOUTUCASTPKTS: | ||
318 | - var->val_len = sizeof(U64); | ||
319 | + var->val_len = sizeof(struct counter64); | ||
320 | var->type = ASN_COUNTER64; | ||
321 | - rc = ifHCOutUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); | ||
322 | + rc = ifHCOutUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
323 | break; | ||
324 | |||
325 | /* | ||
326 | * ifHCOutMulticastPkts(12)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
327 | */ | ||
328 | case COLUMN_IFHCOUTMULTICASTPKTS: | ||
329 | - var->val_len = sizeof(U64); | ||
330 | + var->val_len = sizeof(struct counter64); | ||
331 | var->type = ASN_COUNTER64; | ||
332 | - rc = ifHCOutMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); | ||
333 | + rc = ifHCOutMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
334 | break; | ||
335 | |||
336 | /* | ||
337 | * ifHCOutBroadcastPkts(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
338 | */ | ||
339 | case COLUMN_IFHCOUTBROADCASTPKTS: | ||
340 | - var->val_len = sizeof(U64); | ||
341 | + var->val_len = sizeof(struct counter64); | ||
342 | var->type = ASN_COUNTER64; | ||
343 | - rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); | ||
344 | + rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
345 | break; | ||
346 | |||
347 | /* | ||
348 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/data_access/systemstats_common.c | ||
349 | =================================================================== | ||
350 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/data_access/systemstats_common.c | ||
351 | +++ net-snmp-5.7.3/agent/mibgroup/ip-mib/data_access/systemstats_common.c | ||
352 | @@ -264,7 +264,7 @@ _calculate_entries(netsnmp_systemstats_e | ||
353 | && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTFRAGCREATES] | ||
354 | && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTDISCARDS]) { | ||
355 | |||
356 | - U64 tmp, tmp2, tmp3; | ||
357 | + struct counter64 tmp, tmp2, tmp3; | ||
358 | tmp = entry->stats.HCOutRequests; | ||
359 | u64Incr(&tmp, &entry->stats.HCOutForwDatagrams); | ||
360 | u64Incr(&tmp, &entry->stats.HCOutFragCreates); | ||
361 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c | ||
362 | =================================================================== | ||
363 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c | ||
364 | +++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c | ||
365 | @@ -270,7 +270,7 @@ The total number of input IP datagrams r | ||
366 | */ | ||
367 | int | ||
368 | ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
369 | - U64 * ipIfStatsHCInReceives_val_ptr) | ||
370 | + struct counter64 *ipIfStatsHCInReceives_val_ptr) | ||
371 | { | ||
372 | /** we should have a non-NULL pointer */ | ||
373 | netsnmp_assert(NULL != ipIfStatsHCInReceives_val_ptr); | ||
374 | @@ -395,7 +395,7 @@ The total number of octets received in i | ||
375 | */ | ||
376 | int | ||
377 | ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
378 | - U64 * ipIfStatsHCInOctets_val_ptr) | ||
379 | + struct counter64 *ipIfStatsHCInOctets_val_ptr) | ||
380 | { | ||
381 | /** we should have a non-NULL pointer */ | ||
382 | netsnmp_assert(NULL != ipIfStatsHCInOctets_val_ptr); | ||
383 | @@ -862,7 +862,7 @@ The number of input datagrams for which | ||
384 | */ | ||
385 | int | ||
386 | ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
387 | - U64 * ipIfStatsHCInForwDatagrams_val_ptr) | ||
388 | + struct counter64 *ipIfStatsHCInForwDatagrams_val_ptr) | ||
389 | { | ||
390 | /** we should have a non-NULL pointer */ | ||
391 | netsnmp_assert(NULL != ipIfStatsHCInForwDatagrams_val_ptr); | ||
392 | @@ -1267,7 +1267,7 @@ The total number of datagrams successful | ||
393 | */ | ||
394 | int | ||
395 | ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
396 | - U64 * ipIfStatsHCInDelivers_val_ptr) | ||
397 | + struct counter64 *ipIfStatsHCInDelivers_val_ptr) | ||
398 | { | ||
399 | /** we should have a non-NULL pointer */ | ||
400 | netsnmp_assert(NULL != ipIfStatsHCInDelivers_val_ptr); | ||
401 | @@ -1396,7 +1396,7 @@ The total number of IP datagrams that lo | ||
402 | */ | ||
403 | int | ||
404 | ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
405 | - U64 * ipIfStatsHCOutRequests_val_ptr) | ||
406 | + struct counter64 *ipIfStatsHCOutRequests_val_ptr) | ||
407 | { | ||
408 | /** we should have a non-NULL pointer */ | ||
409 | netsnmp_assert(NULL != ipIfStatsHCOutRequests_val_ptr); | ||
410 | @@ -1532,7 +1532,7 @@ The number of datagrams for which this e | ||
411 | */ | ||
412 | int | ||
413 | ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
414 | - U64 * ipIfStatsHCOutForwDatagrams_val_ptr) | ||
415 | + struct counter64 *ipIfStatsHCOutForwDatagrams_val_ptr) | ||
416 | { | ||
417 | /** we should have a non-NULL pointer */ | ||
418 | netsnmp_assert(NULL != ipIfStatsHCOutForwDatagrams_val_ptr); | ||
419 | @@ -1999,7 +1999,7 @@ The total number of IP datagrams that th | ||
420 | */ | ||
421 | int | ||
422 | ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
423 | - U64 * ipIfStatsHCOutTransmits_val_ptr) | ||
424 | + struct counter64 *ipIfStatsHCOutTransmits_val_ptr) | ||
425 | { | ||
426 | /** we should have a non-NULL pointer */ | ||
427 | netsnmp_assert(NULL != ipIfStatsHCOutTransmits_val_ptr); | ||
428 | @@ -2123,7 +2123,7 @@ The total number of octets in IP datagra | ||
429 | */ | ||
430 | int | ||
431 | ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
432 | - U64 * ipIfStatsHCOutOctets_val_ptr) | ||
433 | + struct counter64 *ipIfStatsHCOutOctets_val_ptr) | ||
434 | { | ||
435 | /** we should have a non-NULL pointer */ | ||
436 | netsnmp_assert(NULL != ipIfStatsHCOutOctets_val_ptr); | ||
437 | @@ -2245,7 +2245,7 @@ The number of IP multicast datagrams rec | ||
438 | */ | ||
439 | int | ||
440 | ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
441 | - U64 * ipIfStatsHCInMcastPkts_val_ptr) | ||
442 | + struct counter64 *ipIfStatsHCInMcastPkts_val_ptr) | ||
443 | { | ||
444 | /** we should have a non-NULL pointer */ | ||
445 | netsnmp_assert(NULL != ipIfStatsHCInMcastPkts_val_ptr); | ||
446 | @@ -2372,7 +2372,7 @@ The total number of octets received in I | ||
447 | */ | ||
448 | int | ||
449 | ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
450 | - U64 * ipIfStatsHCInMcastOctets_val_ptr) | ||
451 | + struct counter64 *ipIfStatsHCInMcastOctets_val_ptr) | ||
452 | { | ||
453 | /** we should have a non-NULL pointer */ | ||
454 | netsnmp_assert(NULL != ipIfStatsHCInMcastOctets_val_ptr); | ||
455 | @@ -2497,7 +2497,7 @@ The number of IP multicast datagrams tra | ||
456 | */ | ||
457 | int | ||
458 | ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
459 | - U64 * ipIfStatsHCOutMcastPkts_val_ptr) | ||
460 | + struct counter64 *ipIfStatsHCOutMcastPkts_val_ptr) | ||
461 | { | ||
462 | /** we should have a non-NULL pointer */ | ||
463 | netsnmp_assert(NULL != ipIfStatsHCOutMcastPkts_val_ptr); | ||
464 | @@ -2621,7 +2621,7 @@ The total number of octets transmitted i | ||
465 | */ | ||
466 | int | ||
467 | ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
468 | - U64 * ipIfStatsHCOutMcastOctets_val_ptr) | ||
469 | + struct counter64 *ipIfStatsHCOutMcastOctets_val_ptr) | ||
470 | { | ||
471 | /** we should have a non-NULL pointer */ | ||
472 | netsnmp_assert(NULL != ipIfStatsHCOutMcastOctets_val_ptr); | ||
473 | @@ -2743,7 +2743,7 @@ The number of IP broadcast datagrams rec | ||
474 | */ | ||
475 | int | ||
476 | ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
477 | - U64 * ipIfStatsHCInBcastPkts_val_ptr) | ||
478 | + struct counter64 *ipIfStatsHCInBcastPkts_val_ptr) | ||
479 | { | ||
480 | /** we should have a non-NULL pointer */ | ||
481 | netsnmp_assert(NULL != ipIfStatsHCInBcastPkts_val_ptr); | ||
482 | @@ -2865,7 +2865,7 @@ The number of IP broadcast datagrams tra | ||
483 | */ | ||
484 | int | ||
485 | ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | ||
486 | - U64 * ipIfStatsHCOutBcastPkts_val_ptr) | ||
487 | + struct counter64 *ipIfStatsHCOutBcastPkts_val_ptr) | ||
488 | { | ||
489 | /** we should have a non-NULL pointer */ | ||
490 | netsnmp_assert(NULL != ipIfStatsHCOutBcastPkts_val_ptr); | ||
491 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h | ||
492 | =================================================================== | ||
493 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h | ||
494 | +++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h | ||
495 | @@ -50,7 +50,7 @@ extern "C" { | ||
496 | ipIfStatsInReceives_val_ptr); | ||
497 | int ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * | ||
498 | rowreq_ctx, | ||
499 | - U64 * | ||
500 | + struct counter64 * | ||
501 | ipIfStatsHCInReceives_val_ptr); | ||
502 | int ipIfStatsInOctets_get(ipIfStatsTable_rowreq_ctx * | ||
503 | rowreq_ctx, | ||
504 | @@ -58,7 +58,7 @@ extern "C" { | ||
505 | ipIfStatsInOctets_val_ptr); | ||
506 | int ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * | ||
507 | rowreq_ctx, | ||
508 | - U64 * | ||
509 | + struct counter64 * | ||
510 | ipIfStatsHCInOctets_val_ptr); | ||
511 | int ipIfStatsInHdrErrors_get(ipIfStatsTable_rowreq_ctx * | ||
512 | rowreq_ctx, | ||
513 | @@ -87,7 +87,7 @@ extern "C" { | ||
514 | int | ||
515 | ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * | ||
516 | rowreq_ctx, | ||
517 | - U64 * | ||
518 | + struct counter64 * | ||
519 | ipIfStatsHCInForwDatagrams_val_ptr); | ||
520 | int ipIfStatsReasmReqds_get(ipIfStatsTable_rowreq_ctx * | ||
521 | rowreq_ctx, | ||
522 | @@ -111,7 +111,7 @@ extern "C" { | ||
523 | ipIfStatsInDelivers_val_ptr); | ||
524 | int ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * | ||
525 | rowreq_ctx, | ||
526 | - U64 * | ||
527 | + struct counter64 * | ||
528 | ipIfStatsHCInDelivers_val_ptr); | ||
529 | int ipIfStatsOutRequests_get(ipIfStatsTable_rowreq_ctx * | ||
530 | rowreq_ctx, | ||
531 | @@ -119,7 +119,7 @@ extern "C" { | ||
532 | ipIfStatsOutRequests_val_ptr); | ||
533 | int ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * | ||
534 | rowreq_ctx, | ||
535 | - U64 * | ||
536 | + struct counter64 * | ||
537 | ipIfStatsHCOutRequests_val_ptr); | ||
538 | int ipIfStatsOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx | ||
539 | * rowreq_ctx, | ||
540 | @@ -128,7 +128,7 @@ extern "C" { | ||
541 | int | ||
542 | ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * | ||
543 | rowreq_ctx, | ||
544 | - U64 * | ||
545 | + struct counter64 * | ||
546 | ipIfStatsHCOutForwDatagrams_val_ptr); | ||
547 | int ipIfStatsOutDiscards_get(ipIfStatsTable_rowreq_ctx * | ||
548 | rowreq_ctx, | ||
549 | @@ -156,7 +156,7 @@ extern "C" { | ||
550 | ipIfStatsOutTransmits_val_ptr); | ||
551 | int ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * | ||
552 | rowreq_ctx, | ||
553 | - U64 * | ||
554 | + struct counter64 * | ||
555 | ipIfStatsHCOutTransmits_val_ptr); | ||
556 | int ipIfStatsOutOctets_get(ipIfStatsTable_rowreq_ctx * | ||
557 | rowreq_ctx, | ||
558 | @@ -164,7 +164,7 @@ extern "C" { | ||
559 | ipIfStatsOutOctets_val_ptr); | ||
560 | int ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * | ||
561 | rowreq_ctx, | ||
562 | - U64 * | ||
563 | + struct counter64 * | ||
564 | ipIfStatsHCOutOctets_val_ptr); | ||
565 | int ipIfStatsInMcastPkts_get(ipIfStatsTable_rowreq_ctx * | ||
566 | rowreq_ctx, | ||
567 | @@ -172,7 +172,7 @@ extern "C" { | ||
568 | ipIfStatsInMcastPkts_val_ptr); | ||
569 | int ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * | ||
570 | rowreq_ctx, | ||
571 | - U64 * | ||
572 | + struct counter64 * | ||
573 | ipIfStatsHCInMcastPkts_val_ptr); | ||
574 | int ipIfStatsInMcastOctets_get(ipIfStatsTable_rowreq_ctx * | ||
575 | rowreq_ctx, | ||
576 | @@ -180,7 +180,7 @@ extern "C" { | ||
577 | ipIfStatsInMcastOctets_val_ptr); | ||
578 | int ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx | ||
579 | * rowreq_ctx, | ||
580 | - U64 * | ||
581 | + struct counter64 * | ||
582 | ipIfStatsHCInMcastOctets_val_ptr); | ||
583 | int ipIfStatsOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * | ||
584 | rowreq_ctx, | ||
585 | @@ -188,7 +188,7 @@ extern "C" { | ||
586 | ipIfStatsOutMcastPkts_val_ptr); | ||
587 | int ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * | ||
588 | rowreq_ctx, | ||
589 | - U64 * | ||
590 | + struct counter64 * | ||
591 | ipIfStatsHCOutMcastPkts_val_ptr); | ||
592 | int ipIfStatsOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * | ||
593 | rowreq_ctx, | ||
594 | @@ -196,7 +196,7 @@ extern "C" { | ||
595 | ipIfStatsOutMcastOctets_val_ptr); | ||
596 | int ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx | ||
597 | * rowreq_ctx, | ||
598 | - U64 * | ||
599 | + struct counter64 * | ||
600 | ipIfStatsHCOutMcastOctets_val_ptr); | ||
601 | int ipIfStatsInBcastPkts_get(ipIfStatsTable_rowreq_ctx * | ||
602 | rowreq_ctx, | ||
603 | @@ -204,7 +204,7 @@ extern "C" { | ||
604 | ipIfStatsInBcastPkts_val_ptr); | ||
605 | int ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * | ||
606 | rowreq_ctx, | ||
607 | - U64 * | ||
608 | + struct counter64 * | ||
609 | ipIfStatsHCInBcastPkts_val_ptr); | ||
610 | int ipIfStatsOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * | ||
611 | rowreq_ctx, | ||
612 | @@ -212,7 +212,7 @@ extern "C" { | ||
613 | ipIfStatsOutBcastPkts_val_ptr); | ||
614 | int ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * | ||
615 | rowreq_ctx, | ||
616 | - U64 * | ||
617 | + struct counter64 * | ||
618 | ipIfStatsHCOutBcastPkts_val_ptr); | ||
619 | int | ||
620 | ipIfStatsDiscontinuityTime_get(ipIfStatsTable_rowreq_ctx * | ||
621 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c | ||
622 | =================================================================== | ||
623 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c | ||
624 | +++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c | ||
625 | @@ -722,10 +722,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
626 | * ipIfStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
627 | */ | ||
628 | case COLUMN_IPIFSTATSHCINRECEIVES: | ||
629 | - var->val_len = sizeof(U64); | ||
630 | + var->val_len = sizeof(struct counter64); | ||
631 | var->type = ASN_COUNTER64; | ||
632 | rc = ipIfStatsHCInReceives_get(rowreq_ctx, | ||
633 | - (U64 *) var->val.string); | ||
634 | + (struct counter64 *) var->val.string); | ||
635 | break; | ||
636 | |||
637 | /* | ||
638 | @@ -741,9 +741,9 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
639 | * ipIfStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
640 | */ | ||
641 | case COLUMN_IPIFSTATSHCINOCTETS: | ||
642 | - var->val_len = sizeof(U64); | ||
643 | + var->val_len = sizeof(struct counter64); | ||
644 | var->type = ASN_COUNTER64; | ||
645 | - rc = ipIfStatsHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); | ||
646 | + rc = ipIfStatsHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
647 | break; | ||
648 | |||
649 | /* | ||
650 | @@ -810,10 +810,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
651 | * ipIfStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
652 | */ | ||
653 | case COLUMN_IPIFSTATSHCINFORWDATAGRAMS: | ||
654 | - var->val_len = sizeof(U64); | ||
655 | + var->val_len = sizeof(struct counter64); | ||
656 | var->type = ASN_COUNTER64; | ||
657 | rc = ipIfStatsHCInForwDatagrams_get(rowreq_ctx, | ||
658 | - (U64 *) var->val.string); | ||
659 | + (struct counter64 *) var->val.string); | ||
660 | break; | ||
661 | |||
662 | /* | ||
663 | @@ -869,10 +869,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
664 | * ipIfStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
665 | */ | ||
666 | case COLUMN_IPIFSTATSHCINDELIVERS: | ||
667 | - var->val_len = sizeof(U64); | ||
668 | + var->val_len = sizeof(struct counter64); | ||
669 | var->type = ASN_COUNTER64; | ||
670 | rc = ipIfStatsHCInDelivers_get(rowreq_ctx, | ||
671 | - (U64 *) var->val.string); | ||
672 | + (struct counter64 *) var->val.string); | ||
673 | break; | ||
674 | |||
675 | /* | ||
676 | @@ -889,10 +889,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
677 | * ipIfStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
678 | */ | ||
679 | case COLUMN_IPIFSTATSHCOUTREQUESTS: | ||
680 | - var->val_len = sizeof(U64); | ||
681 | + var->val_len = sizeof(struct counter64); | ||
682 | var->type = ASN_COUNTER64; | ||
683 | rc = ipIfStatsHCOutRequests_get(rowreq_ctx, | ||
684 | - (U64 *) var->val.string); | ||
685 | + (struct counter64 *) var->val.string); | ||
686 | break; | ||
687 | |||
688 | /* | ||
689 | @@ -909,10 +909,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
690 | * ipIfStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
691 | */ | ||
692 | case COLUMN_IPIFSTATSHCOUTFORWDATAGRAMS: | ||
693 | - var->val_len = sizeof(U64); | ||
694 | + var->val_len = sizeof(struct counter64); | ||
695 | var->type = ASN_COUNTER64; | ||
696 | rc = ipIfStatsHCOutForwDatagrams_get(rowreq_ctx, | ||
697 | - (U64 *) var->val.string); | ||
698 | + (struct counter64 *) var->val.string); | ||
699 | break; | ||
700 | |||
701 | /* | ||
702 | @@ -979,10 +979,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
703 | * ipIfStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
704 | */ | ||
705 | case COLUMN_IPIFSTATSHCOUTTRANSMITS: | ||
706 | - var->val_len = sizeof(U64); | ||
707 | + var->val_len = sizeof(struct counter64); | ||
708 | var->type = ASN_COUNTER64; | ||
709 | rc = ipIfStatsHCOutTransmits_get(rowreq_ctx, | ||
710 | - (U64 *) var->val.string); | ||
711 | + (struct counter64 *) var->val.string); | ||
712 | break; | ||
713 | |||
714 | /* | ||
715 | @@ -999,9 +999,9 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
716 | * ipIfStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
717 | */ | ||
718 | case COLUMN_IPIFSTATSHCOUTOCTETS: | ||
719 | - var->val_len = sizeof(U64); | ||
720 | + var->val_len = sizeof(struct counter64); | ||
721 | var->type = ASN_COUNTER64; | ||
722 | - rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); | ||
723 | + rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); | ||
724 | break; | ||
725 | |||
726 | /* | ||
727 | @@ -1018,10 +1018,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
728 | * ipIfStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
729 | */ | ||
730 | case COLUMN_IPIFSTATSHCINMCASTPKTS: | ||
731 | - var->val_len = sizeof(U64); | ||
732 | + var->val_len = sizeof(struct counter64); | ||
733 | var->type = ASN_COUNTER64; | ||
734 | rc = ipIfStatsHCInMcastPkts_get(rowreq_ctx, | ||
735 | - (U64 *) var->val.string); | ||
736 | + (struct counter64 *) var->val.string); | ||
737 | break; | ||
738 | |||
739 | /* | ||
740 | @@ -1038,10 +1038,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
741 | * ipIfStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
742 | */ | ||
743 | case COLUMN_IPIFSTATSHCINMCASTOCTETS: | ||
744 | - var->val_len = sizeof(U64); | ||
745 | + var->val_len = sizeof(struct counter64); | ||
746 | var->type = ASN_COUNTER64; | ||
747 | rc = ipIfStatsHCInMcastOctets_get(rowreq_ctx, | ||
748 | - (U64 *) var->val.string); | ||
749 | + (struct counter64 *) var->val.string); | ||
750 | break; | ||
751 | |||
752 | /* | ||
753 | @@ -1058,10 +1058,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
754 | * ipIfStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
755 | */ | ||
756 | case COLUMN_IPIFSTATSHCOUTMCASTPKTS: | ||
757 | - var->val_len = sizeof(U64); | ||
758 | + var->val_len = sizeof(struct counter64); | ||
759 | var->type = ASN_COUNTER64; | ||
760 | rc = ipIfStatsHCOutMcastPkts_get(rowreq_ctx, | ||
761 | - (U64 *) var->val.string); | ||
762 | + (struct counter64 *) var->val.string); | ||
763 | break; | ||
764 | |||
765 | /* | ||
766 | @@ -1078,10 +1078,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
767 | * ipIfStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
768 | */ | ||
769 | case COLUMN_IPIFSTATSHCOUTMCASTOCTETS: | ||
770 | - var->val_len = sizeof(U64); | ||
771 | + var->val_len = sizeof(struct counter64); | ||
772 | var->type = ASN_COUNTER64; | ||
773 | rc = ipIfStatsHCOutMcastOctets_get(rowreq_ctx, | ||
774 | - (U64 *) var->val.string); | ||
775 | + (struct counter64 *) var->val.string); | ||
776 | break; | ||
777 | |||
778 | /* | ||
779 | @@ -1098,10 +1098,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
780 | * ipIfStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
781 | */ | ||
782 | case COLUMN_IPIFSTATSHCINBCASTPKTS: | ||
783 | - var->val_len = sizeof(U64); | ||
784 | + var->val_len = sizeof(struct counter64); | ||
785 | var->type = ASN_COUNTER64; | ||
786 | rc = ipIfStatsHCInBcastPkts_get(rowreq_ctx, | ||
787 | - (U64 *) var->val.string); | ||
788 | + (struct counter64 *) var->val.string); | ||
789 | break; | ||
790 | |||
791 | /* | ||
792 | @@ -1118,10 +1118,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl | ||
793 | * ipIfStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
794 | */ | ||
795 | case COLUMN_IPIFSTATSHCOUTBCASTPKTS: | ||
796 | - var->val_len = sizeof(U64); | ||
797 | + var->val_len = sizeof(struct counter64); | ||
798 | var->type = ASN_COUNTER64; | ||
799 | rc = ipIfStatsHCOutBcastPkts_get(rowreq_ctx, | ||
800 | - (U64 *) var->val.string); | ||
801 | + (struct counter64 *) var->val.string); | ||
802 | break; | ||
803 | |||
804 | /* | ||
805 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | ||
806 | =================================================================== | ||
807 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | ||
808 | +++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | ||
809 | @@ -452,7 +452,7 @@ The total number of input IP datagrams r | ||
810 | */ | ||
811 | int | ||
812 | ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
813 | - U64 * ipSystemStatsHCInReceives_val_ptr) | ||
814 | + struct counter64 *ipSystemStatsHCInReceives_val_ptr) | ||
815 | { | ||
816 | /** we should have a non-NULL pointer */ | ||
817 | netsnmp_assert(NULL != ipSystemStatsHCInReceives_val_ptr); | ||
818 | @@ -579,7 +579,7 @@ The total number of octets received in i | ||
819 | */ | ||
820 | int | ||
821 | ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
822 | - U64 * ipSystemStatsHCInOctets_val_ptr) | ||
823 | + struct counter64 *ipSystemStatsHCInOctets_val_ptr) | ||
824 | { | ||
825 | /** we should have a non-NULL pointer */ | ||
826 | netsnmp_assert(NULL != ipSystemStatsHCInOctets_val_ptr); | ||
827 | @@ -1058,7 +1058,7 @@ The number of input datagrams for which | ||
828 | int | ||
829 | ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
830 | rowreq_ctx, | ||
831 | - U64 * | ||
832 | + struct counter64 * | ||
833 | ipSystemStatsHCInForwDatagrams_val_ptr) | ||
834 | { | ||
835 | /** we should have a non-NULL pointer */ | ||
836 | @@ -1474,7 +1474,7 @@ The total number of datagrams successful | ||
837 | */ | ||
838 | int | ||
839 | ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
840 | - U64 * ipSystemStatsHCInDelivers_val_ptr) | ||
841 | + struct counter64 *ipSystemStatsHCInDelivers_val_ptr) | ||
842 | { | ||
843 | /** we should have a non-NULL pointer */ | ||
844 | netsnmp_assert(NULL != ipSystemStatsHCInDelivers_val_ptr); | ||
845 | @@ -1602,7 +1602,7 @@ The total number of IP datagrams which l | ||
846 | */ | ||
847 | int | ||
848 | ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
849 | - U64 * ipSystemStatsHCOutRequests_val_ptr) | ||
850 | + struct counter64 *ipSystemStatsHCOutRequests_val_ptr) | ||
851 | { | ||
852 | /** we should have a non-NULL pointer */ | ||
853 | netsnmp_assert(NULL != ipSystemStatsHCOutRequests_val_ptr); | ||
854 | @@ -1809,7 +1809,7 @@ The number of datagrams for which this e | ||
855 | int | ||
856 | ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
857 | rowreq_ctx, | ||
858 | - U64 * | ||
859 | + struct counter64 * | ||
860 | ipSystemStatsHCOutForwDatagrams_val_ptr) | ||
861 | { | ||
862 | /** we should have a non-NULL pointer */ | ||
863 | @@ -2288,7 +2288,7 @@ The total number of IP datagrams that th | ||
864 | */ | ||
865 | int | ||
866 | ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
867 | - U64 * ipSystemStatsHCOutTransmits_val_ptr) | ||
868 | + struct counter64 *ipSystemStatsHCOutTransmits_val_ptr) | ||
869 | { | ||
870 | /** we should have a non-NULL pointer */ | ||
871 | netsnmp_assert(NULL != ipSystemStatsHCOutTransmits_val_ptr); | ||
872 | @@ -2415,7 +2415,7 @@ The total number of octets in IP datagra | ||
873 | */ | ||
874 | int | ||
875 | ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
876 | - U64 * ipSystemStatsHCOutOctets_val_ptr) | ||
877 | + struct counter64 *ipSystemStatsHCOutOctets_val_ptr) | ||
878 | { | ||
879 | /** we should have a non-NULL pointer */ | ||
880 | netsnmp_assert(NULL != ipSystemStatsHCOutOctets_val_ptr); | ||
881 | @@ -2539,7 +2539,7 @@ The number of IP multicast datagrams rec | ||
882 | */ | ||
883 | int | ||
884 | ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
885 | - U64 * ipSystemStatsHCInMcastPkts_val_ptr) | ||
886 | + struct counter64 *ipSystemStatsHCInMcastPkts_val_ptr) | ||
887 | { | ||
888 | /** we should have a non-NULL pointer */ | ||
889 | netsnmp_assert(NULL != ipSystemStatsHCInMcastPkts_val_ptr); | ||
890 | @@ -2665,7 +2665,7 @@ The total number of octets received in I | ||
891 | int | ||
892 | ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
893 | rowreq_ctx, | ||
894 | - U64 * | ||
895 | + struct counter64 * | ||
896 | ipSystemStatsHCInMcastOctets_val_ptr) | ||
897 | { | ||
898 | /** we should have a non-NULL pointer */ | ||
899 | @@ -2790,7 +2790,7 @@ The number of IP multicast datagrams tra | ||
900 | */ | ||
901 | int | ||
902 | ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
903 | - U64 * ipSystemStatsHCOutMcastPkts_val_ptr) | ||
904 | + struct counter64 *ipSystemStatsHCOutMcastPkts_val_ptr) | ||
905 | { | ||
906 | /** we should have a non-NULL pointer */ | ||
907 | netsnmp_assert(NULL != ipSystemStatsHCOutMcastPkts_val_ptr); | ||
908 | @@ -2921,7 +2921,7 @@ The total number of octets transmitted i | ||
909 | int | ||
910 | ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
911 | rowreq_ctx, | ||
912 | - U64 * | ||
913 | + struct counter64 * | ||
914 | ipSystemStatsHCOutMcastOctets_val_ptr) | ||
915 | { | ||
916 | /** we should have a non-NULL pointer */ | ||
917 | @@ -3046,7 +3046,7 @@ The number of IP broadcast datagrams rec | ||
918 | */ | ||
919 | int | ||
920 | ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
921 | - U64 * ipSystemStatsHCInBcastPkts_val_ptr) | ||
922 | + struct counter64 *ipSystemStatsHCInBcastPkts_val_ptr) | ||
923 | { | ||
924 | /** we should have a non-NULL pointer */ | ||
925 | netsnmp_assert(NULL != ipSystemStatsHCInBcastPkts_val_ptr); | ||
926 | @@ -3170,7 +3170,7 @@ The number of IP broadcast datagrams tra | ||
927 | */ | ||
928 | int | ||
929 | ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | ||
930 | - U64 * ipSystemStatsHCOutBcastPkts_val_ptr) | ||
931 | + struct counter64 *ipSystemStatsHCOutBcastPkts_val_ptr) | ||
932 | { | ||
933 | /** we should have a non-NULL pointer */ | ||
934 | netsnmp_assert(NULL != ipSystemStatsHCOutBcastPkts_val_ptr); | ||
935 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | ||
936 | =================================================================== | ||
937 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | ||
938 | +++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | ||
939 | @@ -144,93 +144,22 @@ config_require(ip-mib/ipSystemStatsTable | ||
940 | ********************************************************************* | ||
941 | * function prototypes | ||
942 | */ | ||
943 | - int | ||
944 | - | ||
945 | - | ||
946 | - | ||
947 | - | ||
948 | - | ||
949 | - | ||
950 | - | ||
951 | - | ||
952 | - | ||
953 | - | ||
954 | - | ||
955 | - | ||
956 | - | ||
957 | - | ||
958 | - | ||
959 | - ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * | ||
960 | + int ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * | ||
961 | user_context); | ||
962 | - int | ||
963 | - | ||
964 | - | ||
965 | - | ||
966 | - | ||
967 | - | ||
968 | - | ||
969 | - | ||
970 | - | ||
971 | - | ||
972 | - | ||
973 | - | ||
974 | - | ||
975 | - | ||
976 | - | ||
977 | - | ||
978 | - ipSystemStatsTable_post_request(ipSystemStatsTable_registration * | ||
979 | + int ipSystemStatsTable_post_request(ipSystemStatsTable_registration * | ||
980 | user_context, int rc); | ||
981 | |||
982 | - int | ||
983 | - | ||
984 | - | ||
985 | - | ||
986 | - | ||
987 | - | ||
988 | - | ||
989 | - | ||
990 | - | ||
991 | - | ||
992 | - | ||
993 | - | ||
994 | - | ||
995 | - | ||
996 | - | ||
997 | - | ||
998 | - ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * | ||
999 | + int ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * | ||
1000 | rowreq_ctx, | ||
1001 | void *user_init_ctx); | ||
1002 | void | ||
1003 | - | ||
1004 | - | ||
1005 | - | ||
1006 | - | ||
1007 | - | ||
1008 | - | ||
1009 | - | ||
1010 | - | ||
1011 | - | ||
1012 | - | ||
1013 | - | ||
1014 | - | ||
1015 | - | ||
1016 | - | ||
1017 | - | ||
1018 | ipSystemStatsTable_rowreq_ctx_cleanup(ipSystemStatsTable_rowreq_ctx | ||
1019 | * rowreq_ctx); | ||
1020 | |||
1021 | ipSystemStatsTable_data *ipSystemStatsTable_allocate_data(void); | ||
1022 | void ipSystemStatsTable_release_data(ipSystemStatsTable_data | ||
1023 | * data); | ||
1024 | - | ||
1025 | - | ||
1026 | - | ||
1027 | - | ||
1028 | - | ||
1029 | - | ||
1030 | - | ||
1031 | - | ||
1032 | - ipSystemStatsTable_rowreq_ctx | ||
1033 | + ipSystemStatsTable_rowreq_ctx | ||
1034 | * ipSystemStatsTable_row_find_by_mib_index | ||
1035 | (ipSystemStatsTable_mib_index * mib_idx); | ||
1036 | |||
1037 | @@ -265,226 +194,50 @@ config_require(ip-mib/ipSystemStatsTable | ||
1038 | * indexes | ||
1039 | */ | ||
1040 | |||
1041 | - int | ||
1042 | - | ||
1043 | - | ||
1044 | - | ||
1045 | - | ||
1046 | - | ||
1047 | - | ||
1048 | - | ||
1049 | - | ||
1050 | - | ||
1051 | - | ||
1052 | - | ||
1053 | - | ||
1054 | - | ||
1055 | - | ||
1056 | - | ||
1057 | - ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * | ||
1058 | + int ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * | ||
1059 | rowreq_ctx, | ||
1060 | u_long * | ||
1061 | ipSystemStatsInReceives_val_ptr); | ||
1062 | - int | ||
1063 | - | ||
1064 | - | ||
1065 | - | ||
1066 | - | ||
1067 | - | ||
1068 | - | ||
1069 | - | ||
1070 | - | ||
1071 | - | ||
1072 | - | ||
1073 | - | ||
1074 | - | ||
1075 | - | ||
1076 | - | ||
1077 | - | ||
1078 | - ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * | ||
1079 | + int ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * | ||
1080 | rowreq_ctx, | ||
1081 | - U64 * | ||
1082 | + struct counter64 * | ||
1083 | ipSystemStatsHCInReceives_val_ptr); | ||
1084 | int ipSystemStatsInOctets_get(ipSystemStatsTable_rowreq_ctx | ||
1085 | * rowreq_ctx, | ||
1086 | u_long * | ||
1087 | ipSystemStatsInOctets_val_ptr); | ||
1088 | - int | ||
1089 | - | ||
1090 | - | ||
1091 | - | ||
1092 | - | ||
1093 | - | ||
1094 | - | ||
1095 | - | ||
1096 | - | ||
1097 | - | ||
1098 | - | ||
1099 | - | ||
1100 | - | ||
1101 | - | ||
1102 | - | ||
1103 | - | ||
1104 | - ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1105 | + int ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1106 | rowreq_ctx, | ||
1107 | - U64 * ipSystemStatsHCInOctets_val_ptr); | ||
1108 | - int | ||
1109 | - | ||
1110 | - | ||
1111 | - | ||
1112 | - | ||
1113 | - | ||
1114 | - | ||
1115 | - | ||
1116 | - | ||
1117 | - | ||
1118 | - | ||
1119 | - | ||
1120 | - | ||
1121 | - | ||
1122 | - | ||
1123 | - | ||
1124 | - ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * | ||
1125 | + struct counter64 *ipSystemStatsHCInOctets_val_ptr); | ||
1126 | + int ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * | ||
1127 | rowreq_ctx, | ||
1128 | u_long * | ||
1129 | ipSystemStatsInHdrErrors_val_ptr); | ||
1130 | - int | ||
1131 | - | ||
1132 | - | ||
1133 | - | ||
1134 | - | ||
1135 | - | ||
1136 | - | ||
1137 | - | ||
1138 | - | ||
1139 | - | ||
1140 | - | ||
1141 | - | ||
1142 | - | ||
1143 | - | ||
1144 | - | ||
1145 | - | ||
1146 | - ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * | ||
1147 | + int ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * | ||
1148 | rowreq_ctx, | ||
1149 | u_long * | ||
1150 | ipSystemStatsInNoRoutes_val_ptr); | ||
1151 | - int | ||
1152 | - | ||
1153 | - | ||
1154 | - | ||
1155 | - | ||
1156 | - | ||
1157 | - | ||
1158 | - | ||
1159 | - | ||
1160 | - | ||
1161 | - | ||
1162 | - | ||
1163 | - | ||
1164 | - | ||
1165 | - | ||
1166 | - | ||
1167 | - ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * | ||
1168 | + int ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * | ||
1169 | rowreq_ctx, | ||
1170 | u_long * | ||
1171 | ipSystemStatsInAddrErrors_val_ptr); | ||
1172 | - int | ||
1173 | - | ||
1174 | - | ||
1175 | - | ||
1176 | - | ||
1177 | - | ||
1178 | - | ||
1179 | - | ||
1180 | - | ||
1181 | - | ||
1182 | - | ||
1183 | - | ||
1184 | - | ||
1185 | - | ||
1186 | - | ||
1187 | - | ||
1188 | - ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * | ||
1189 | + int ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * | ||
1190 | rowreq_ctx, | ||
1191 | u_long * | ||
1192 | ipSystemStatsInUnknownProtos_val_ptr); | ||
1193 | - int | ||
1194 | - | ||
1195 | - | ||
1196 | - | ||
1197 | - | ||
1198 | - | ||
1199 | - | ||
1200 | - | ||
1201 | - | ||
1202 | - | ||
1203 | - | ||
1204 | - | ||
1205 | - | ||
1206 | - | ||
1207 | - | ||
1208 | - | ||
1209 | - ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1210 | + int ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1211 | rowreq_ctx, | ||
1212 | u_long * | ||
1213 | ipSystemStatsInTruncatedPkts_val_ptr); | ||
1214 | - int | ||
1215 | - | ||
1216 | - | ||
1217 | - | ||
1218 | - | ||
1219 | - | ||
1220 | - | ||
1221 | - | ||
1222 | - | ||
1223 | - | ||
1224 | - | ||
1225 | - | ||
1226 | - | ||
1227 | - | ||
1228 | - | ||
1229 | - | ||
1230 | - ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
1231 | + int ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
1232 | rowreq_ctx, | ||
1233 | u_long * | ||
1234 | ipSystemStatsInForwDatagrams_val_ptr); | ||
1235 | - int | ||
1236 | - | ||
1237 | - | ||
1238 | - | ||
1239 | - | ||
1240 | - | ||
1241 | - | ||
1242 | - | ||
1243 | - | ||
1244 | - | ||
1245 | - | ||
1246 | - | ||
1247 | - | ||
1248 | - | ||
1249 | - | ||
1250 | - | ||
1251 | - ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
1252 | + int ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
1253 | rowreq_ctx, | ||
1254 | - U64 * | ||
1255 | + struct counter64 * | ||
1256 | ipSystemStatsHCInForwDatagrams_val_ptr); | ||
1257 | - int | ||
1258 | - | ||
1259 | - | ||
1260 | - | ||
1261 | - | ||
1262 | - | ||
1263 | - | ||
1264 | - | ||
1265 | - | ||
1266 | - | ||
1267 | - | ||
1268 | - | ||
1269 | - | ||
1270 | - | ||
1271 | - | ||
1272 | - | ||
1273 | - ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * | ||
1274 | + int ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * | ||
1275 | rowreq_ctx, | ||
1276 | u_long * | ||
1277 | ipSystemStatsReasmReqds_val_ptr); | ||
1278 | @@ -492,690 +245,142 @@ config_require(ip-mib/ipSystemStatsTable | ||
1279 | * rowreq_ctx, | ||
1280 | u_long * | ||
1281 | ipSystemStatsReasmOKs_val_ptr); | ||
1282 | - int | ||
1283 | - | ||
1284 | - | ||
1285 | - | ||
1286 | - | ||
1287 | - | ||
1288 | - | ||
1289 | - | ||
1290 | - | ||
1291 | - | ||
1292 | - | ||
1293 | - | ||
1294 | - | ||
1295 | - | ||
1296 | - | ||
1297 | - | ||
1298 | - ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * | ||
1299 | + int ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * | ||
1300 | rowreq_ctx, | ||
1301 | u_long * | ||
1302 | ipSystemStatsReasmFails_val_ptr); | ||
1303 | - int | ||
1304 | - | ||
1305 | - | ||
1306 | - | ||
1307 | - | ||
1308 | - | ||
1309 | - | ||
1310 | - | ||
1311 | - | ||
1312 | - | ||
1313 | - | ||
1314 | - | ||
1315 | - | ||
1316 | - | ||
1317 | - | ||
1318 | - | ||
1319 | - ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * | ||
1320 | + int ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * | ||
1321 | rowreq_ctx, | ||
1322 | u_long * | ||
1323 | ipSystemStatsInDiscards_val_ptr); | ||
1324 | - int | ||
1325 | - | ||
1326 | - | ||
1327 | - | ||
1328 | - | ||
1329 | - | ||
1330 | - | ||
1331 | - | ||
1332 | - | ||
1333 | - | ||
1334 | - | ||
1335 | - | ||
1336 | - | ||
1337 | - | ||
1338 | - | ||
1339 | - | ||
1340 | - ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * | ||
1341 | + int ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * | ||
1342 | rowreq_ctx, | ||
1343 | u_long * | ||
1344 | ipSystemStatsInDelivers_val_ptr); | ||
1345 | - int | ||
1346 | - | ||
1347 | - | ||
1348 | - | ||
1349 | - | ||
1350 | - | ||
1351 | - | ||
1352 | - | ||
1353 | - | ||
1354 | - | ||
1355 | - | ||
1356 | - | ||
1357 | - | ||
1358 | - | ||
1359 | - | ||
1360 | - | ||
1361 | - ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * | ||
1362 | + int ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * | ||
1363 | rowreq_ctx, | ||
1364 | - U64 * | ||
1365 | + struct counter64 * | ||
1366 | ipSystemStatsHCInDelivers_val_ptr); | ||
1367 | - int | ||
1368 | - | ||
1369 | - | ||
1370 | - | ||
1371 | - | ||
1372 | - | ||
1373 | - | ||
1374 | - | ||
1375 | - | ||
1376 | - | ||
1377 | - | ||
1378 | - | ||
1379 | - | ||
1380 | - | ||
1381 | - | ||
1382 | - | ||
1383 | - ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * | ||
1384 | + int ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * | ||
1385 | rowreq_ctx, | ||
1386 | u_long * | ||
1387 | ipSystemStatsOutRequests_val_ptr); | ||
1388 | - int | ||
1389 | - | ||
1390 | - | ||
1391 | - | ||
1392 | - | ||
1393 | - | ||
1394 | - | ||
1395 | - | ||
1396 | - | ||
1397 | - | ||
1398 | - | ||
1399 | - | ||
1400 | - | ||
1401 | - | ||
1402 | - | ||
1403 | - | ||
1404 | - ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * | ||
1405 | + int ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * | ||
1406 | rowreq_ctx, | ||
1407 | - U64 * | ||
1408 | + struct counter64 * | ||
1409 | ipSystemStatsHCOutRequests_val_ptr); | ||
1410 | - int | ||
1411 | - | ||
1412 | - | ||
1413 | - | ||
1414 | - | ||
1415 | - | ||
1416 | - | ||
1417 | - | ||
1418 | - | ||
1419 | - | ||
1420 | - | ||
1421 | - | ||
1422 | - | ||
1423 | - | ||
1424 | - | ||
1425 | - | ||
1426 | - ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * | ||
1427 | + int ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * | ||
1428 | rowreq_ctx, | ||
1429 | u_long * | ||
1430 | ipSystemStatsOutNoRoutes_val_ptr); | ||
1431 | - int | ||
1432 | - | ||
1433 | - | ||
1434 | - | ||
1435 | - | ||
1436 | - | ||
1437 | - | ||
1438 | - | ||
1439 | - | ||
1440 | - | ||
1441 | - | ||
1442 | - | ||
1443 | - | ||
1444 | - | ||
1445 | - | ||
1446 | - | ||
1447 | - ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
1448 | + int ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
1449 | rowreq_ctx, | ||
1450 | u_long * | ||
1451 | ipSystemStatsOutForwDatagrams_val_ptr); | ||
1452 | - int | ||
1453 | - | ||
1454 | - | ||
1455 | - | ||
1456 | - | ||
1457 | - | ||
1458 | - | ||
1459 | - | ||
1460 | - | ||
1461 | - | ||
1462 | - | ||
1463 | - | ||
1464 | - | ||
1465 | - | ||
1466 | - | ||
1467 | - | ||
1468 | - ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
1469 | + int ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | ||
1470 | rowreq_ctx, | ||
1471 | - U64 * | ||
1472 | + struct counter64 * | ||
1473 | ipSystemStatsHCOutForwDatagrams_val_ptr); | ||
1474 | - int | ||
1475 | - | ||
1476 | - | ||
1477 | - | ||
1478 | - | ||
1479 | - | ||
1480 | - | ||
1481 | - | ||
1482 | - | ||
1483 | - | ||
1484 | - | ||
1485 | - | ||
1486 | - | ||
1487 | - | ||
1488 | - | ||
1489 | - | ||
1490 | - ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * | ||
1491 | + int ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * | ||
1492 | rowreq_ctx, | ||
1493 | u_long * | ||
1494 | ipSystemStatsOutDiscards_val_ptr); | ||
1495 | - int | ||
1496 | - | ||
1497 | - | ||
1498 | - | ||
1499 | - | ||
1500 | - | ||
1501 | - | ||
1502 | - | ||
1503 | - | ||
1504 | - | ||
1505 | - | ||
1506 | - | ||
1507 | - | ||
1508 | - | ||
1509 | - | ||
1510 | - | ||
1511 | - ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * | ||
1512 | + int ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * | ||
1513 | rowreq_ctx, | ||
1514 | u_long * | ||
1515 | ipSystemStatsOutFragReqds_val_ptr); | ||
1516 | - int | ||
1517 | - | ||
1518 | - | ||
1519 | - | ||
1520 | - | ||
1521 | - | ||
1522 | - | ||
1523 | - | ||
1524 | - | ||
1525 | - | ||
1526 | - | ||
1527 | - | ||
1528 | - | ||
1529 | - | ||
1530 | - | ||
1531 | - | ||
1532 | - ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * | ||
1533 | + int ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * | ||
1534 | rowreq_ctx, | ||
1535 | u_long * | ||
1536 | ipSystemStatsOutFragOKs_val_ptr); | ||
1537 | - int | ||
1538 | - | ||
1539 | - | ||
1540 | - | ||
1541 | - | ||
1542 | - | ||
1543 | - | ||
1544 | - | ||
1545 | - | ||
1546 | - | ||
1547 | - | ||
1548 | - | ||
1549 | - | ||
1550 | - | ||
1551 | - | ||
1552 | - | ||
1553 | - ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * | ||
1554 | + int ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * | ||
1555 | rowreq_ctx, | ||
1556 | u_long * | ||
1557 | ipSystemStatsOutFragFails_val_ptr); | ||
1558 | - int | ||
1559 | - | ||
1560 | - | ||
1561 | - | ||
1562 | - | ||
1563 | - | ||
1564 | - | ||
1565 | - | ||
1566 | - | ||
1567 | - | ||
1568 | - | ||
1569 | - | ||
1570 | - | ||
1571 | - | ||
1572 | - | ||
1573 | - | ||
1574 | - ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * | ||
1575 | + int ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * | ||
1576 | rowreq_ctx, | ||
1577 | u_long * | ||
1578 | ipSystemStatsOutFragCreates_val_ptr); | ||
1579 | - int | ||
1580 | - | ||
1581 | - | ||
1582 | - | ||
1583 | - | ||
1584 | - | ||
1585 | - | ||
1586 | - | ||
1587 | - | ||
1588 | - | ||
1589 | - | ||
1590 | - | ||
1591 | - | ||
1592 | - | ||
1593 | - | ||
1594 | - | ||
1595 | - ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * | ||
1596 | + int ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * | ||
1597 | rowreq_ctx, | ||
1598 | u_long * | ||
1599 | ipSystemStatsOutTransmits_val_ptr); | ||
1600 | - int | ||
1601 | - | ||
1602 | - | ||
1603 | - | ||
1604 | - | ||
1605 | - | ||
1606 | - | ||
1607 | - | ||
1608 | - | ||
1609 | - | ||
1610 | - | ||
1611 | - | ||
1612 | - | ||
1613 | - | ||
1614 | - | ||
1615 | - | ||
1616 | - ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * | ||
1617 | + int ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * | ||
1618 | rowreq_ctx, | ||
1619 | - U64 * | ||
1620 | + struct counter64 * | ||
1621 | ipSystemStatsHCOutTransmits_val_ptr); | ||
1622 | - int | ||
1623 | - | ||
1624 | - | ||
1625 | - | ||
1626 | - | ||
1627 | - | ||
1628 | - | ||
1629 | - | ||
1630 | - | ||
1631 | - | ||
1632 | - | ||
1633 | - | ||
1634 | - | ||
1635 | - | ||
1636 | - | ||
1637 | - | ||
1638 | - ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1639 | + int ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1640 | rowreq_ctx, | ||
1641 | u_long * | ||
1642 | ipSystemStatsOutOctets_val_ptr); | ||
1643 | - int | ||
1644 | - | ||
1645 | - | ||
1646 | - | ||
1647 | - | ||
1648 | - | ||
1649 | - | ||
1650 | - | ||
1651 | - | ||
1652 | - | ||
1653 | - | ||
1654 | - | ||
1655 | - | ||
1656 | - | ||
1657 | - | ||
1658 | - | ||
1659 | - ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1660 | + int ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1661 | rowreq_ctx, | ||
1662 | - U64 * | ||
1663 | + struct counter64 * | ||
1664 | ipSystemStatsHCOutOctets_val_ptr); | ||
1665 | - int | ||
1666 | - | ||
1667 | - | ||
1668 | - | ||
1669 | - | ||
1670 | - | ||
1671 | - | ||
1672 | - | ||
1673 | - | ||
1674 | - | ||
1675 | - | ||
1676 | - | ||
1677 | - | ||
1678 | - | ||
1679 | - | ||
1680 | - | ||
1681 | - ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1682 | + int ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1683 | rowreq_ctx, | ||
1684 | u_long * | ||
1685 | ipSystemStatsInMcastPkts_val_ptr); | ||
1686 | - int | ||
1687 | - | ||
1688 | - | ||
1689 | - | ||
1690 | - | ||
1691 | - | ||
1692 | - | ||
1693 | - | ||
1694 | - | ||
1695 | - | ||
1696 | - | ||
1697 | - | ||
1698 | - | ||
1699 | - | ||
1700 | - | ||
1701 | - | ||
1702 | - ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1703 | + int ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1704 | rowreq_ctx, | ||
1705 | - U64 * | ||
1706 | + struct counter64 * | ||
1707 | ipSystemStatsHCInMcastPkts_val_ptr); | ||
1708 | - int | ||
1709 | - | ||
1710 | - | ||
1711 | - | ||
1712 | - | ||
1713 | - | ||
1714 | - | ||
1715 | - | ||
1716 | - | ||
1717 | - | ||
1718 | - | ||
1719 | - | ||
1720 | - | ||
1721 | - | ||
1722 | - | ||
1723 | - | ||
1724 | - ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1725 | + int ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1726 | rowreq_ctx, | ||
1727 | u_long * | ||
1728 | ipSystemStatsInMcastOctets_val_ptr); | ||
1729 | - int | ||
1730 | - | ||
1731 | - | ||
1732 | - | ||
1733 | - | ||
1734 | - | ||
1735 | - | ||
1736 | - | ||
1737 | - | ||
1738 | - | ||
1739 | - | ||
1740 | - | ||
1741 | - | ||
1742 | - | ||
1743 | - | ||
1744 | - | ||
1745 | - ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1746 | + int ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1747 | rowreq_ctx, | ||
1748 | - U64 * | ||
1749 | + struct counter64 * | ||
1750 | ipSystemStatsHCInMcastOctets_val_ptr); | ||
1751 | - int | ||
1752 | - | ||
1753 | - | ||
1754 | - | ||
1755 | - | ||
1756 | - | ||
1757 | - | ||
1758 | - | ||
1759 | - | ||
1760 | - | ||
1761 | - | ||
1762 | - | ||
1763 | - | ||
1764 | - | ||
1765 | - | ||
1766 | - | ||
1767 | - ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1768 | + int ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1769 | rowreq_ctx, | ||
1770 | u_long * | ||
1771 | ipSystemStatsOutMcastPkts_val_ptr); | ||
1772 | - int | ||
1773 | - | ||
1774 | - | ||
1775 | - | ||
1776 | - | ||
1777 | - | ||
1778 | - | ||
1779 | - | ||
1780 | - | ||
1781 | - | ||
1782 | - | ||
1783 | - | ||
1784 | - | ||
1785 | - | ||
1786 | - | ||
1787 | - | ||
1788 | - ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1789 | + int ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1790 | rowreq_ctx, | ||
1791 | - U64 * | ||
1792 | + struct counter64 * | ||
1793 | ipSystemStatsHCOutMcastPkts_val_ptr); | ||
1794 | - int | ||
1795 | - | ||
1796 | - | ||
1797 | - | ||
1798 | - | ||
1799 | - | ||
1800 | - | ||
1801 | - | ||
1802 | - | ||
1803 | - | ||
1804 | - | ||
1805 | - | ||
1806 | - | ||
1807 | - | ||
1808 | - | ||
1809 | - | ||
1810 | - ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1811 | + int ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1812 | rowreq_ctx, | ||
1813 | u_long * | ||
1814 | ipSystemStatsOutMcastOctets_val_ptr); | ||
1815 | - int | ||
1816 | - | ||
1817 | - | ||
1818 | - | ||
1819 | - | ||
1820 | - | ||
1821 | - | ||
1822 | - | ||
1823 | - | ||
1824 | - | ||
1825 | - | ||
1826 | - | ||
1827 | - | ||
1828 | - | ||
1829 | - | ||
1830 | - | ||
1831 | - ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1832 | + int ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | ||
1833 | rowreq_ctx, | ||
1834 | - U64 * | ||
1835 | + struct counter64 * | ||
1836 | ipSystemStatsHCOutMcastOctets_val_ptr); | ||
1837 | - int | ||
1838 | - | ||
1839 | - | ||
1840 | - | ||
1841 | - | ||
1842 | - | ||
1843 | - | ||
1844 | - | ||
1845 | - | ||
1846 | - | ||
1847 | - | ||
1848 | - | ||
1849 | - | ||
1850 | - | ||
1851 | - | ||
1852 | - | ||
1853 | - ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1854 | + int ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1855 | rowreq_ctx, | ||
1856 | u_long * | ||
1857 | ipSystemStatsInBcastPkts_val_ptr); | ||
1858 | - int | ||
1859 | - | ||
1860 | - | ||
1861 | - | ||
1862 | - | ||
1863 | - | ||
1864 | - | ||
1865 | - | ||
1866 | - | ||
1867 | - | ||
1868 | - | ||
1869 | - | ||
1870 | - | ||
1871 | - | ||
1872 | - | ||
1873 | - | ||
1874 | - ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1875 | + int ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1876 | rowreq_ctx, | ||
1877 | - U64 * | ||
1878 | + struct counter64 * | ||
1879 | ipSystemStatsHCInBcastPkts_val_ptr); | ||
1880 | - int | ||
1881 | - | ||
1882 | - | ||
1883 | - | ||
1884 | - | ||
1885 | - | ||
1886 | - | ||
1887 | - | ||
1888 | - | ||
1889 | - | ||
1890 | - | ||
1891 | - | ||
1892 | - | ||
1893 | - | ||
1894 | - | ||
1895 | - | ||
1896 | - ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1897 | + int ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1898 | rowreq_ctx, | ||
1899 | u_long * | ||
1900 | ipSystemStatsOutBcastPkts_val_ptr); | ||
1901 | - int | ||
1902 | - | ||
1903 | - | ||
1904 | - | ||
1905 | - | ||
1906 | - | ||
1907 | - | ||
1908 | - | ||
1909 | - | ||
1910 | - | ||
1911 | - | ||
1912 | - | ||
1913 | - | ||
1914 | - | ||
1915 | - | ||
1916 | - | ||
1917 | - ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1918 | + int ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * | ||
1919 | rowreq_ctx, | ||
1920 | - U64 * | ||
1921 | + struct counter64 * | ||
1922 | ipSystemStatsHCOutBcastPkts_val_ptr); | ||
1923 | - int | ||
1924 | - | ||
1925 | - | ||
1926 | - | ||
1927 | - | ||
1928 | - | ||
1929 | - | ||
1930 | - | ||
1931 | - | ||
1932 | - | ||
1933 | - | ||
1934 | - | ||
1935 | - | ||
1936 | - | ||
1937 | - | ||
1938 | - | ||
1939 | - ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * | ||
1940 | + int ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * | ||
1941 | rowreq_ctx, | ||
1942 | u_long * | ||
1943 | ipSystemStatsDiscontinuityTime_val_ptr); | ||
1944 | - int | ||
1945 | - | ||
1946 | - | ||
1947 | - | ||
1948 | - | ||
1949 | - | ||
1950 | - | ||
1951 | - | ||
1952 | - | ||
1953 | - | ||
1954 | - | ||
1955 | - | ||
1956 | - | ||
1957 | - | ||
1958 | - | ||
1959 | - | ||
1960 | - ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * | ||
1961 | + int ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * | ||
1962 | rowreq_ctx, | ||
1963 | u_long * | ||
1964 | ipSystemStatsRefreshRate_val_ptr); | ||
1965 | - | ||
1966 | - | ||
1967 | - int | ||
1968 | - | ||
1969 | - | ||
1970 | - | ||
1971 | - | ||
1972 | - | ||
1973 | - | ||
1974 | - | ||
1975 | - | ||
1976 | - | ||
1977 | - | ||
1978 | - | ||
1979 | - | ||
1980 | - | ||
1981 | - | ||
1982 | - | ||
1983 | - ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index | ||
1984 | + int ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index | ||
1985 | * tbl_idx, | ||
1986 | u_long | ||
1987 | ipSystemStatsIPVersion_val); | ||
1988 | - int | ||
1989 | - | ||
1990 | - | ||
1991 | - | ||
1992 | - | ||
1993 | - | ||
1994 | - | ||
1995 | - | ||
1996 | - | ||
1997 | - | ||
1998 | - | ||
1999 | - | ||
2000 | - | ||
2001 | - | ||
2002 | - | ||
2003 | - | ||
2004 | - ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * | ||
2005 | + int ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * | ||
2006 | rowreq_ctx, | ||
2007 | u_long ipSystemStatsIPVersion_val); | ||
2008 | |||
2009 | - | ||
2010 | - | ||
2011 | /* | ||
2012 | ********************************************************************* | ||
2013 | * SET function declarations | ||
2014 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c | ||
2015 | =================================================================== | ||
2016 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c | ||
2017 | +++ net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c | ||
2018 | @@ -674,10 +674,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2019 | * ipSystemStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2020 | */ | ||
2021 | case COLUMN_IPSYSTEMSTATSHCINRECEIVES: | ||
2022 | - var->val_len = sizeof(U64); | ||
2023 | + var->val_len = sizeof(struct counter64); | ||
2024 | var->type = ASN_COUNTER64; | ||
2025 | rc = ipSystemStatsHCInReceives_get(rowreq_ctx, | ||
2026 | - (U64 *) var->val.string); | ||
2027 | + (struct counter64 *) var->val.string); | ||
2028 | break; | ||
2029 | |||
2030 | /* | ||
2031 | @@ -694,10 +694,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2032 | * ipSystemStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2033 | */ | ||
2034 | case COLUMN_IPSYSTEMSTATSHCINOCTETS: | ||
2035 | - var->val_len = sizeof(U64); | ||
2036 | + var->val_len = sizeof(struct counter64); | ||
2037 | var->type = ASN_COUNTER64; | ||
2038 | rc = ipSystemStatsHCInOctets_get(rowreq_ctx, | ||
2039 | - (U64 *) var->val.string); | ||
2040 | + (struct counter64 *) var->val.string); | ||
2041 | break; | ||
2042 | |||
2043 | /* | ||
2044 | @@ -764,10 +764,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2045 | * ipSystemStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2046 | */ | ||
2047 | case COLUMN_IPSYSTEMSTATSHCINFORWDATAGRAMS: | ||
2048 | - var->val_len = sizeof(U64); | ||
2049 | + var->val_len = sizeof(struct counter64); | ||
2050 | var->type = ASN_COUNTER64; | ||
2051 | rc = ipSystemStatsHCInForwDatagrams_get(rowreq_ctx, | ||
2052 | - (U64 *) var->val.string); | ||
2053 | + (struct counter64 *) var->val.string); | ||
2054 | break; | ||
2055 | |||
2056 | /* | ||
2057 | @@ -824,10 +824,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2058 | * ipSystemStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2059 | */ | ||
2060 | case COLUMN_IPSYSTEMSTATSHCINDELIVERS: | ||
2061 | - var->val_len = sizeof(U64); | ||
2062 | + var->val_len = sizeof(struct counter64); | ||
2063 | var->type = ASN_COUNTER64; | ||
2064 | rc = ipSystemStatsHCInDelivers_get(rowreq_ctx, | ||
2065 | - (U64 *) var->val.string); | ||
2066 | + (struct counter64 *) var->val.string); | ||
2067 | break; | ||
2068 | |||
2069 | /* | ||
2070 | @@ -844,10 +844,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2071 | * ipSystemStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2072 | */ | ||
2073 | case COLUMN_IPSYSTEMSTATSHCOUTREQUESTS: | ||
2074 | - var->val_len = sizeof(U64); | ||
2075 | + var->val_len = sizeof(struct counter64); | ||
2076 | var->type = ASN_COUNTER64; | ||
2077 | rc = ipSystemStatsHCOutRequests_get(rowreq_ctx, | ||
2078 | - (U64 *) var->val.string); | ||
2079 | + (struct counter64 *) var->val.string); | ||
2080 | break; | ||
2081 | |||
2082 | /* | ||
2083 | @@ -874,10 +874,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2084 | * ipSystemStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2085 | */ | ||
2086 | case COLUMN_IPSYSTEMSTATSHCOUTFORWDATAGRAMS: | ||
2087 | - var->val_len = sizeof(U64); | ||
2088 | + var->val_len = sizeof(struct counter64); | ||
2089 | var->type = ASN_COUNTER64; | ||
2090 | rc = ipSystemStatsHCOutForwDatagrams_get(rowreq_ctx, | ||
2091 | - (U64 *) var->val.string); | ||
2092 | + (struct counter64 *) var->val.string); | ||
2093 | break; | ||
2094 | |||
2095 | /* | ||
2096 | @@ -944,10 +944,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2097 | * ipSystemStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2098 | */ | ||
2099 | case COLUMN_IPSYSTEMSTATSHCOUTTRANSMITS: | ||
2100 | - var->val_len = sizeof(U64); | ||
2101 | + var->val_len = sizeof(struct counter64); | ||
2102 | var->type = ASN_COUNTER64; | ||
2103 | rc = ipSystemStatsHCOutTransmits_get(rowreq_ctx, | ||
2104 | - (U64 *) var->val.string); | ||
2105 | + (struct counter64 *) var->val.string); | ||
2106 | break; | ||
2107 | |||
2108 | /* | ||
2109 | @@ -964,10 +964,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2110 | * ipSystemStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2111 | */ | ||
2112 | case COLUMN_IPSYSTEMSTATSHCOUTOCTETS: | ||
2113 | - var->val_len = sizeof(U64); | ||
2114 | + var->val_len = sizeof(struct counter64); | ||
2115 | var->type = ASN_COUNTER64; | ||
2116 | rc = ipSystemStatsHCOutOctets_get(rowreq_ctx, | ||
2117 | - (U64 *) var->val.string); | ||
2118 | + (struct counter64 *) var->val.string); | ||
2119 | break; | ||
2120 | |||
2121 | /* | ||
2122 | @@ -984,10 +984,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2123 | * ipSystemStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2124 | */ | ||
2125 | case COLUMN_IPSYSTEMSTATSHCINMCASTPKTS: | ||
2126 | - var->val_len = sizeof(U64); | ||
2127 | + var->val_len = sizeof(struct counter64); | ||
2128 | var->type = ASN_COUNTER64; | ||
2129 | rc = ipSystemStatsHCInMcastPkts_get(rowreq_ctx, | ||
2130 | - (U64 *) var->val.string); | ||
2131 | + (struct counter64 *) var->val.string); | ||
2132 | break; | ||
2133 | |||
2134 | /* | ||
2135 | @@ -1004,10 +1004,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2136 | * ipSystemStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2137 | */ | ||
2138 | case COLUMN_IPSYSTEMSTATSHCINMCASTOCTETS: | ||
2139 | - var->val_len = sizeof(U64); | ||
2140 | + var->val_len = sizeof(struct counter64); | ||
2141 | var->type = ASN_COUNTER64; | ||
2142 | rc = ipSystemStatsHCInMcastOctets_get(rowreq_ctx, | ||
2143 | - (U64 *) var->val.string); | ||
2144 | + (struct counter64 *) var->val.string); | ||
2145 | break; | ||
2146 | |||
2147 | /* | ||
2148 | @@ -1024,10 +1024,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2149 | * ipSystemStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2150 | */ | ||
2151 | case COLUMN_IPSYSTEMSTATSHCOUTMCASTPKTS: | ||
2152 | - var->val_len = sizeof(U64); | ||
2153 | + var->val_len = sizeof(struct counter64); | ||
2154 | var->type = ASN_COUNTER64; | ||
2155 | rc = ipSystemStatsHCOutMcastPkts_get(rowreq_ctx, | ||
2156 | - (U64 *) var->val.string); | ||
2157 | + (struct counter64 *) var->val.string); | ||
2158 | break; | ||
2159 | |||
2160 | /* | ||
2161 | @@ -1044,10 +1044,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2162 | * ipSystemStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2163 | */ | ||
2164 | case COLUMN_IPSYSTEMSTATSHCOUTMCASTOCTETS: | ||
2165 | - var->val_len = sizeof(U64); | ||
2166 | + var->val_len = sizeof(struct counter64); | ||
2167 | var->type = ASN_COUNTER64; | ||
2168 | rc = ipSystemStatsHCOutMcastOctets_get(rowreq_ctx, | ||
2169 | - (U64 *) var->val.string); | ||
2170 | + (struct counter64 *) var->val.string); | ||
2171 | break; | ||
2172 | |||
2173 | /* | ||
2174 | @@ -1064,10 +1064,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2175 | * ipSystemStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2176 | */ | ||
2177 | case COLUMN_IPSYSTEMSTATSHCINBCASTPKTS: | ||
2178 | - var->val_len = sizeof(U64); | ||
2179 | + var->val_len = sizeof(struct counter64); | ||
2180 | var->type = ASN_COUNTER64; | ||
2181 | rc = ipSystemStatsHCInBcastPkts_get(rowreq_ctx, | ||
2182 | - (U64 *) var->val.string); | ||
2183 | + (struct counter64 *) var->val.string); | ||
2184 | break; | ||
2185 | |||
2186 | /* | ||
2187 | @@ -1084,10 +1084,10 @@ _ipSystemStatsTable_get_column(ipSystemS | ||
2188 | * ipSystemStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | ||
2189 | */ | ||
2190 | case COLUMN_IPSYSTEMSTATSHCOUTBCASTPKTS: | ||
2191 | - var->val_len = sizeof(U64); | ||
2192 | + var->val_len = sizeof(struct counter64); | ||
2193 | var->type = ASN_COUNTER64; | ||
2194 | rc = ipSystemStatsHCOutBcastPkts_get(rowreq_ctx, | ||
2195 | - (U64 *) var->val.string); | ||
2196 | + (struct counter64 *) var->val.string); | ||
2197 | break; | ||
2198 | |||
2199 | /* | ||
2200 | Index: net-snmp-5.7.3/include/net-snmp/data_access/ipstats.h | ||
2201 | =================================================================== | ||
2202 | --- net-snmp-5.7.3.orig/include/net-snmp/data_access/ipstats.h | ||
2203 | +++ net-snmp-5.7.3/include/net-snmp/data_access/ipstats.h | ||
2204 | @@ -58,45 +58,45 @@ typedef struct netsnmp_ipstats_s { | ||
2205 | * other columns, when underlying OS does not provide them. | ||
2206 | * Always fill at least 32 bits, the table is periodically polled -> 32 bit | ||
2207 | * overflow shall be detected and 64 bit value should be computed automatically. */ | ||
2208 | - U64 HCInReceives; | ||
2209 | - U64 HCInOctets; | ||
2210 | + struct counter64 HCInReceives; | ||
2211 | + struct counter64 HCInOctets; | ||
2212 | u_long InHdrErrors; | ||
2213 | - U64 HCInNoRoutes; | ||
2214 | + struct counter64 HCInNoRoutes; | ||
2215 | u_long InAddrErrors; | ||
2216 | u_long InUnknownProtos; | ||
2217 | u_long InTruncatedPkts; | ||
2218 | |||
2219 | /* optional, can be computed from HCInNoRoutes and HCOutForwDatagrams */ | ||
2220 | - U64 HCInForwDatagrams; | ||
2221 | + struct counter64 HCInForwDatagrams; | ||
2222 | |||
2223 | u_long ReasmReqds; | ||
2224 | u_long ReasmOKs; | ||
2225 | u_long ReasmFails; | ||
2226 | u_long InDiscards; | ||
2227 | - U64 HCInDelivers; | ||
2228 | - U64 HCOutRequests; | ||
2229 | - U64 HCOutNoRoutes; | ||
2230 | - U64 HCOutForwDatagrams; | ||
2231 | - U64 HCOutDiscards; | ||
2232 | + struct counter64 HCInDelivers; | ||
2233 | + struct counter64 HCOutRequests; | ||
2234 | + struct counter64 HCOutNoRoutes; | ||
2235 | + struct counter64 HCOutForwDatagrams; | ||
2236 | + struct counter64 HCOutDiscards; | ||
2237 | |||
2238 | /* optional, can be computed from HCOutFragOKs + HCOutFragFails*/ | ||
2239 | - U64 HCOutFragReqds; | ||
2240 | - U64 HCOutFragOKs; | ||
2241 | - U64 HCOutFragFails; | ||
2242 | - U64 HCOutFragCreates; | ||
2243 | + struct counter64 HCOutFragReqds; | ||
2244 | + struct counter64 HCOutFragOKs; | ||
2245 | + struct counter64 HCOutFragFails; | ||
2246 | + struct counter64 HCOutFragCreates; | ||
2247 | |||
2248 | /* optional, can be computed from | ||
2249 | * HCOutRequests +HCOutForwDatagrams + HCOutFragCreates | ||
2250 | * - HCOutFragReqds - HCOutNoRoutes - HCOutDiscards */ | ||
2251 | - U64 HCOutTransmits; | ||
2252 | + struct counter64 HCOutTransmits; | ||
2253 | |||
2254 | - U64 HCOutOctets; | ||
2255 | - U64 HCInMcastPkts; | ||
2256 | - U64 HCInMcastOctets; | ||
2257 | - U64 HCOutMcastPkts; | ||
2258 | - U64 HCOutMcastOctets; | ||
2259 | - U64 HCInBcastPkts; | ||
2260 | - U64 HCOutBcastPkts; | ||
2261 | + struct counter64 HCOutOctets; | ||
2262 | + struct counter64 HCInMcastPkts; | ||
2263 | + struct counter64 HCInMcastOctets; | ||
2264 | + struct counter64 HCOutMcastPkts; | ||
2265 | + struct counter64 HCOutMcastOctets; | ||
2266 | + struct counter64 HCInBcastPkts; | ||
2267 | + struct counter64 HCOutBcastPkts; | ||
2268 | |||
2269 | /* Array of available columns.*/ | ||
2270 | int columnAvail[IPSYSTEMSTATSTABLE_LAST+1]; | ||
2271 | Index: net-snmp-5.7.3/include/net-snmp/library/int64.h | ||
2272 | =================================================================== | ||
2273 | --- net-snmp-5.7.3.orig/include/net-snmp/library/int64.h | ||
2274 | +++ net-snmp-5.7.3/include/net-snmp/library/int64.h | ||
2275 | @@ -5,31 +5,29 @@ | ||
2276 | extern "C" { | ||
2277 | #endif | ||
2278 | |||
2279 | - typedef struct counter64 U64; | ||
2280 | - | ||
2281 | #define I64CHARSZ 21 | ||
2282 | |||
2283 | - void divBy10(U64, U64 *, unsigned int *); | ||
2284 | - void multBy10(U64, U64 *); | ||
2285 | - void incrByU16(U64 *, unsigned int); | ||
2286 | - void incrByU32(U64 *, unsigned int); | ||
2287 | + void divBy10(struct counter64, struct counter64 *, unsigned int *); | ||
2288 | + void multBy10(struct counter64, struct counter64 *); | ||
2289 | + void incrByU16(struct counter64 *, unsigned int); | ||
2290 | + void incrByU32(struct counter64 *, unsigned int); | ||
2291 | NETSNMP_IMPORT | ||
2292 | - void zeroU64(U64 *); | ||
2293 | - int isZeroU64(const U64 *); | ||
2294 | + void zeroU64(struct counter64 *); | ||
2295 | + int isZeroU64(const struct counter64 *); | ||
2296 | NETSNMP_IMPORT | ||
2297 | - void printU64(char *, const U64 *); | ||
2298 | + void printU64(char *, const struct counter64 *); | ||
2299 | NETSNMP_IMPORT | ||
2300 | - void printI64(char *, const U64 *); | ||
2301 | - int read64(U64 *, const char *); | ||
2302 | + void printI64(char *, const struct counter64 *); | ||
2303 | + int read64(struct counter64 *, const char *); | ||
2304 | NETSNMP_IMPORT | ||
2305 | - void u64Subtract(const U64 * pu64one, const U64 * pu64two, | ||
2306 | - U64 * pu64out); | ||
2307 | - void u64Incr(U64 * pu64out, const U64 * pu64one); | ||
2308 | - void u64UpdateCounter(U64 * pu64out, const U64 * pu64one, | ||
2309 | - const U64 * pu64two); | ||
2310 | - void u64Copy(U64 * pu64one, const U64 * pu64two); | ||
2311 | + void u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, | ||
2312 | + struct counter64 *pu64out); | ||
2313 | + void u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one); | ||
2314 | + void u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, | ||
2315 | + const struct counter64 *pu64two); | ||
2316 | + void u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two); | ||
2317 | |||
2318 | - int netsnmp_c64_check_for_32bit_wrap(U64 *old_val, U64 *new_val, | ||
2319 | + int netsnmp_c64_check_for_32bit_wrap(struct counter64 *old_val, struct counter64 *new_val, | ||
2320 | int adjust); | ||
2321 | NETSNMP_IMPORT | ||
2322 | int netsnmp_c64_check32_and_update(struct counter64 *prev_val, | ||
2323 | Index: net-snmp-5.7.3/snmplib/int64.c | ||
2324 | =================================================================== | ||
2325 | --- net-snmp-5.7.3.orig/snmplib/int64.c | ||
2326 | +++ net-snmp-5.7.3/snmplib/int64.c | ||
2327 | @@ -33,7 +33,7 @@ | ||
2328 | * @param[out] puR Remainder. | ||
2329 | */ | ||
2330 | void | ||
2331 | -divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) | ||
2332 | +divBy10(struct counter64 u64, struct counter64 *pu64Q, unsigned int *puR) | ||
2333 | { | ||
2334 | unsigned long ulT; | ||
2335 | unsigned long ulQ; | ||
2336 | @@ -83,7 +83,7 @@ divBy10(U64 u64, U64 * pu64Q, unsigned i | ||
2337 | * @param[out] pu64P Product. | ||
2338 | */ | ||
2339 | void | ||
2340 | -multBy10(U64 u64, U64 * pu64P) | ||
2341 | +multBy10(struct counter64 u64, struct counter64 *pu64P) | ||
2342 | { | ||
2343 | unsigned long ulT; | ||
2344 | unsigned long ulP; | ||
2345 | @@ -130,7 +130,7 @@ multBy10(U64 u64, U64 * pu64P) | ||
2346 | * | ||
2347 | */ | ||
2348 | void | ||
2349 | -incrByU16(U64 * pu64, unsigned int u16) | ||
2350 | +incrByU16(struct counter64 *pu64, unsigned int u16) | ||
2351 | { | ||
2352 | incrByU32(pu64, u16); | ||
2353 | } | ||
2354 | @@ -143,7 +143,7 @@ incrByU16(U64 * pu64, unsigned int u16) | ||
2355 | * | ||
2356 | */ | ||
2357 | void | ||
2358 | -incrByU32(U64 * pu64, unsigned int u32) | ||
2359 | +incrByU32(struct counter64 *pu64, unsigned int u32) | ||
2360 | { | ||
2361 | uint32_t tmp; | ||
2362 | |||
2363 | @@ -161,7 +161,7 @@ incrByU32(U64 * pu64, unsigned int u32) | ||
2364 | * @param[out] pu64out pu64one - pu64two. | ||
2365 | */ | ||
2366 | void | ||
2367 | -u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) | ||
2368 | +u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, struct counter64 *pu64out) | ||
2369 | { | ||
2370 | int carry; | ||
2371 | |||
2372 | @@ -177,7 +177,7 @@ u64Subtract(const U64 * pu64one, const U | ||
2373 | * @param[in,out] pu64out pu64out += pu64one. | ||
2374 | */ | ||
2375 | void | ||
2376 | -u64Incr(U64 * pu64out, const U64 * pu64one) | ||
2377 | +u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one) | ||
2378 | { | ||
2379 | pu64out->high = (uint32_t)(pu64out->high + pu64one->high); | ||
2380 | incrByU32(pu64out, pu64one->low); | ||
2381 | @@ -191,9 +191,9 @@ u64Incr(U64 * pu64out, const U64 * pu64o | ||
2382 | * @param[out] pu64out pu64out += (pu64one - pu64two) | ||
2383 | */ | ||
2384 | void | ||
2385 | -u64UpdateCounter(U64 * pu64out, const U64 * pu64one, const U64 * pu64two) | ||
2386 | +u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, const struct counter64 *pu64two) | ||
2387 | { | ||
2388 | - U64 tmp; | ||
2389 | + struct counter64 tmp; | ||
2390 | |||
2391 | u64Subtract(pu64one, pu64two, &tmp); | ||
2392 | u64Incr(pu64out, &tmp); | ||
2393 | @@ -208,7 +208,7 @@ netsnmp_feature_child_of(u64copy, netsnm | ||
2394 | * @param[out] pu64one Where to store the copy - *pu64one = *pu64two. | ||
2395 | */ | ||
2396 | void | ||
2397 | -u64Copy(U64 * pu64one, const U64 * pu64two) | ||
2398 | +u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two) | ||
2399 | { | ||
2400 | *pu64one = *pu64two; | ||
2401 | } | ||
2402 | @@ -220,7 +220,7 @@ u64Copy(U64 * pu64one, const U64 * pu64t | ||
2403 | * @param[in] pu64 Number to be zeroed. | ||
2404 | */ | ||
2405 | void | ||
2406 | -zeroU64(U64 * pu64) | ||
2407 | +zeroU64(struct counter64 *pu64) | ||
2408 | { | ||
2409 | pu64->low = 0; | ||
2410 | pu64->high = 0; | ||
2411 | @@ -232,7 +232,7 @@ zeroU64(U64 * pu64) | ||
2412 | * @param[in] pu64 Number to be checked. | ||
2413 | */ | ||
2414 | int | ||
2415 | -isZeroU64(const U64 * pu64) | ||
2416 | +isZeroU64(const struct counter64 *pu64) | ||
2417 | { | ||
2418 | return pu64->low == 0 && pu64->high == 0; | ||
2419 | } | ||
2420 | @@ -390,10 +390,10 @@ netsnmp_c64_check32_and_update(struct co | ||
2421 | /** Convert an unsigned 64-bit number to ASCII. */ | ||
2422 | void | ||
2423 | printU64(char *buf, /* char [I64CHARSZ+1]; */ | ||
2424 | - const U64 * pu64) | ||
2425 | + const struct counter64 *pu64) | ||
2426 | { | ||
2427 | - U64 u64a; | ||
2428 | - U64 u64b; | ||
2429 | + struct counter64 u64a; | ||
2430 | + struct counter64 u64b; | ||
2431 | |||
2432 | char aRes[I64CHARSZ + 1]; | ||
2433 | unsigned int u; | ||
2434 | @@ -414,9 +414,9 @@ printU64(char *buf, /* char [I64CHARSZ+1 | ||
2435 | /** Convert a signed 64-bit number to ASCII. */ | ||
2436 | void | ||
2437 | printI64(char *buf, /* char [I64CHARSZ+1]; */ | ||
2438 | - const U64 * pu64) | ||
2439 | + const struct counter64 *pu64) | ||
2440 | { | ||
2441 | - U64 u64a; | ||
2442 | + struct counter64 u64a; | ||
2443 | |||
2444 | if (pu64->high & 0x80000000) { | ||
2445 | u64a.high = (uint32_t) ~pu64->high; | ||
2446 | @@ -429,11 +429,11 @@ printI64(char *buf, /* char [I64CHARSZ+1 | ||
2447 | } | ||
2448 | } | ||
2449 | |||
2450 | -/** Convert a signed 64-bit integer from ASCII to U64. */ | ||
2451 | +/** Convert a signed 64-bit integer from ASCII to struct counter64. */ | ||
2452 | int | ||
2453 | -read64(U64 * i64, const char *str) | ||
2454 | +read64(struct counter64 *i64, const char *str) | ||
2455 | { | ||
2456 | - U64 i64p; | ||
2457 | + struct counter64 i64p; | ||
2458 | unsigned int u; | ||
2459 | int sign = 0; | ||
2460 | int ok = 0; | ||
2461 | Index: net-snmp-5.7.3/snmplib/read_config.c | ||
2462 | =================================================================== | ||
2463 | --- net-snmp-5.7.3.orig/snmplib/read_config.c | ||
2464 | +++ net-snmp-5.7.3/snmplib/read_config.c | ||
2465 | @@ -2270,10 +2270,10 @@ read_config_read_memory(int type, char * | ||
2466 | return readfrom; | ||
2467 | |||
2468 | case ASN_COUNTER64: | ||
2469 | - if (*len < sizeof(U64)) | ||
2470 | + if (*len < sizeof(struct counter64)) | ||
2471 | return NULL; | ||
2472 | - *len = sizeof(U64); | ||
2473 | - read64((U64 *) dataptr, readfrom); | ||
2474 | + *len = sizeof(struct counter64); | ||
2475 | + read64((struct counter64 *) dataptr, readfrom); | ||
2476 | readfrom = skip_token(readfrom); | ||
2477 | return readfrom; | ||
2478 | } | ||
2479 | Index: net-snmp-5.7.3/testing/fulltests/unit-tests/T015int64_clib.c | ||
2480 | =================================================================== | ||
2481 | --- net-snmp-5.7.3.orig/testing/fulltests/unit-tests/T015int64_clib.c | ||
2482 | +++ net-snmp-5.7.3/testing/fulltests/unit-tests/T015int64_clib.c | ||
2483 | @@ -1,4 +1,4 @@ | ||
2484 | -/* HEADER Testing 64-bit integer operations (U64). */ | ||
2485 | +/* HEADER Testing 64-bit integer operations (struct counter64). */ | ||
2486 | |||
2487 | int i, j; | ||
2488 | char buf[22]; | ||
2489 | @@ -15,7 +15,7 @@ static const int64_t intval[] = { | ||
2490 | }; | ||
2491 | |||
2492 | for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { | ||
2493 | - U64 a, b; | ||
2494 | + struct counter64 a, b; | ||
2495 | a.low = (uint32_t)intval[i]; | ||
2496 | a.high = (uint32_t)(intval[i] >> 32); | ||
2497 | printI64(buf, &a); | ||
2498 | @@ -27,7 +27,7 @@ for (i = 0; i < sizeof(intval)/sizeof(in | ||
2499 | |||
2500 | for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { | ||
2501 | for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { | ||
2502 | - U64 a, b; | ||
2503 | + struct counter64 a, b; | ||
2504 | uint64_t d; | ||
2505 | a.low = (uint32_t)intval[i]; | ||
2506 | a.high = (uint32_t)(intval[i] >> 32); | ||
2507 | @@ -43,7 +43,7 @@ for (i = 0; i < sizeof(intval)/sizeof(in | ||
2508 | |||
2509 | for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { | ||
2510 | for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { | ||
2511 | - U64 a, b, c; | ||
2512 | + struct counter64 a, b, c; | ||
2513 | uint64_t d; | ||
2514 | a.low = (uint32_t)intval[i]; | ||
2515 | a.high = (uint32_t)(intval[i] >> 32); | ||
2516 | @@ -58,7 +58,7 @@ for (i = 0; i < sizeof(intval)/sizeof(in | ||
2517 | } | ||
2518 | |||
2519 | { | ||
2520 | - U64 old_val, new_val; | ||
2521 | + struct counter64 old_val, new_val; | ||
2522 | old_val.low = 7; | ||
2523 | old_val.high = 0; | ||
2524 | new_val = old_val; | ||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch index 44359bebe..bfc55a08a 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 261a22096c79f8e6ef7b387514a74d208e4e5945 Mon Sep 17 00:00:00 2001 | 1 | From 7ae2ce8dbf1c54d4e2db4a5f49397a239baadc49 Mon Sep 17 00:00:00 2001 |
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
3 | Date: Fri, 21 Aug 2015 18:23:13 +0900 | 3 | Date: Fri, 21 Aug 2015 18:23:13 +0900 |
4 | Subject: [PATCH] config_os_headers: Error Fix | 4 | Subject: [PATCH] config_os_headers: Error Fix |
@@ -13,15 +13,16 @@ conftest.c:168:17: fatal error: pkg.h: No such file or directory | |||
13 | Upstream-Status: pending | 13 | Upstream-Status: pending |
14 | 14 | ||
15 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | 15 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
16 | |||
16 | --- | 17 | --- |
17 | configure.d/config_os_headers | 4 ++-- | 18 | configure.d/config_os_headers | 4 ++-- |
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
19 | 20 | ||
20 | Index: net-snmp-5.7.3/configure.d/config_os_headers | 21 | diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers |
21 | =================================================================== | 22 | index af99746..83b2e31 100644 |
22 | --- net-snmp-5.7.3.orig/configure.d/config_os_headers | 23 | --- a/configure.d/config_os_headers |
23 | +++ net-snmp-5.7.3/configure.d/config_os_headers | 24 | +++ b/configure.d/config_os_headers |
24 | @@ -484,8 +484,8 @@ then | 25 | @@ -489,8 +489,8 @@ then |
25 | unset ac_cv_header_pkg_h | 26 | unset ac_cv_header_pkg_h |
26 | netsnmp_save_CPPFLAGS="$CPPFLAGS" | 27 | netsnmp_save_CPPFLAGS="$CPPFLAGS" |
27 | netsnmp_save_LDFLAGS="$LDFLAGS" | 28 | netsnmp_save_LDFLAGS="$LDFLAGS" |
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch deleted file mode 100644 index 5866a95ed..000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From e24fcd140f3f6dd18fd836b197c6d4bb773e50e7 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org> | ||
3 | Date: Wed, 4 Nov 2015 16:49:30 +0100 | ||
4 | Subject: [PATCH] config_os_libs2: Error Fix | ||
5 | |||
6 | ERROR: This autoconf log indicates errors, it looked at host include | ||
7 | and/or library paths while determining system capabilities. | ||
8 | --- | ||
9 | configure.d/config_os_libs2 | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 | ||
13 | index 47491e2..e3647f9 100644 | ||
14 | --- a/configure.d/config_os_libs2 | ||
15 | +++ b/configure.d/config_os_libs2 | ||
16 | @@ -226,10 +226,10 @@ if test "x$with_nl" != "xno"; then | ||
17 | case $target_os in | ||
18 | linux*) # Check for libnl (linux) | ||
19 | netsnmp_save_CPPFLAGS="$CPPFLAGS" | ||
20 | - CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS" | ||
21 | + CPPFLAGS="$CPPFLAGS" | ||
22 | NETSNMP_SEARCH_LIBS(nl_connect, nl-3, | ||
23 | [AC_CHECK_HEADERS(netlink/netlink.h) | ||
24 | - EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"], | ||
25 | + EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES"], | ||
26 | [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS]) | ||
27 | if test "x$ac_cv_header_netlink_netlink_h" != xyes; then | ||
28 | NETSNMP_SEARCH_LIBS(nl_connect, nl, [ | ||
29 | -- | ||
30 | 2.5.0 | ||
31 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch deleted file mode 100644 index b87e9eec2..000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From c6304a3e4b8441ff0a6464c0f1f6c5229092fa32 Mon Sep 17 00:00:00 2001 | ||
2 | From: Niels Baggesen <nba@users.sourceforge.net> | ||
3 | Date: Wed, 24 May 2017 16:40:03 +0800 | ||
4 | Subject: [PATCH 1/4] configure: fix check for --enable-perl-cc-checks | ||
5 | |||
6 | This patch comes from git://git.code.sf.net/p/net-snmp/code, | ||
7 | the commit is 8f431d410b803603dc809d82e0893509615d9a11. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> | ||
12 | --- | ||
13 | configure.d/config_project_perl_python | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.d/config_project_perl_python b/configure.d/config_project_perl_python | ||
17 | index 23f8c7e..475c843 100644 | ||
18 | --- a/configure.d/config_project_perl_python | ||
19 | +++ b/configure.d/config_project_perl_python | ||
20 | @@ -84,7 +84,7 @@ if test "x$install_perl" != "xno" ; then | ||
21 | |||
22 | # What compiler was used to build the perl binary? | ||
23 | # | ||
24 | - if test "xenable_perl_cc_checks" != "xno" ; then | ||
25 | + if test "x$enable_perl_cc_checks" != "xno" ; then | ||
26 | AC_MSG_CHECKING([for Perl cc]) | ||
27 | changequote(, ) | ||
28 | PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'` | ||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch index 60ce80996..bf133b3e3 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch | |||
@@ -1,22 +1,23 @@ | |||
1 | From 7136d593ba96b64537069637c328bc65e1b66b2d Mon Sep 17 00:00:00 2001 | 1 | From 98c6edba4835b515d933542411d80879327eee16 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 22 Jul 2016 18:34:39 +0000 | 3 | Date: Fri, 22 Jul 2016 18:34:39 +0000 |
4 | Subject: [PATCH] get_pid_from_inode: Include limit.h | 4 | Subject: [PATCH] get_pid_from_inode: Include limit.h |
5 | 5 | ||
6 | PATH_MAX and NAME_MAX are required by this file | 6 | PATH_MAX and NAME_MAX are required by this file |
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
11 | 9 | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | --- | ||
12 | agent/mibgroup/util_funcs/get_pid_from_inode.c | 1 + | 13 | agent/mibgroup/util_funcs/get_pid_from_inode.c | 1 + |
13 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
14 | 15 | ||
15 | diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c | 16 | diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c |
16 | index 8e157ae..a494ec7 100644 | 17 | index aee907d..7abaec2 100644 |
17 | --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c | 18 | --- a/agent/mibgroup/util_funcs/get_pid_from_inode.c |
18 | +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c | 19 | +++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c |
19 | @@ -5,6 +5,7 @@ | 20 | @@ -6,6 +6,7 @@ |
20 | #include <net-snmp/output_api.h> | 21 | #include <net-snmp/output_api.h> |
21 | 22 | ||
22 | #include <ctype.h> | 23 | #include <ctype.h> |
@@ -24,6 +25,3 @@ index 8e157ae..a494ec7 100644 | |||
24 | #include <stdio.h> | 25 | #include <stdio.h> |
25 | #if HAVE_STDLIB_H | 26 | #if HAVE_STDLIB_H |
26 | #include <stdlib.h> | 27 | #include <stdlib.h> |
27 | -- | ||
28 | 1.8.3.1 | ||
29 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch deleted file mode 100644 index 527aa39f2..000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 1ee72102fbe722d232d74abc4660a8b134cec8d6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bart Van Assche <bvanassche@acm.org> | ||
3 | Date: Sat, 23 May 2015 07:32:53 +0200 | ||
4 | Subject: [PATCH] snmplib, UDPIPv6 transport: Add a missing return statement | ||
5 | |||
6 | Detected by Coverity. | ||
7 | |||
8 | Upstream-Status: backport | ||
9 | |||
10 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | ||
11 | --- | ||
12 | snmplib/transports/snmpUDPIPv6Domain.c | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | Index: net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c | ||
16 | =================================================================== | ||
17 | --- net-snmp-5.7.3.orig/snmplib/transports/snmpUDPIPv6Domain.c | ||
18 | +++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c | ||
19 | @@ -305,6 +305,7 @@ netsnmp_udp6_transport(struct sockaddr_i | ||
20 | errno, strerror(errno))); | ||
21 | netsnmp_socketbase_close(t); | ||
22 | netsnmp_transport_free(t); | ||
23 | + return NULL; | ||
24 | } | ||
25 | } | ||
26 | /* | ||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch index af242fafb..778b40188 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From d3027a227bc0f603a5b650d01f97ee1dec515be5 Mon Sep 17 00:00:00 2001 | 1 | From 89538a973119f1bf976b3a6df157ea940cf32eb5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 18 Sep 2015 00:28:45 -0400 | 3 | Date: Fri, 18 Sep 2015 00:28:45 -0400 |
4 | Subject: [PATCH] snmplib/keytools.c: Don't check for return from | 4 | Subject: [PATCH] snmplib/keytools.c: Don't check for return from |
5 | |||
5 | EVP_MD_CTX_init() | 6 | EVP_MD_CTX_init() |
6 | 7 | ||
7 | EVP_MD_CTX_init() API returns void, it fixes errors with new compilers | 8 | EVP_MD_CTX_init() API returns void, it fixes errors with new compilers |
@@ -9,16 +10,16 @@ EVP_MD_CTX_init() API returns void, it fixes errors with new compilers | |||
9 | snmplib/keytools.c: In function 'generate_Ku': error: invalid use of void expression | 10 | snmplib/keytools.c: In function 'generate_Ku': error: invalid use of void expression |
10 | 11 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
12 | --- | 14 | --- |
13 | Upstream-Status: Submitted [https://sourceforge.net/p/net-snmp/patches/1317/] | ||
14 | snmplib/keytools.c | 3 +-- | 15 | snmplib/keytools.c | 3 +-- |
15 | 1 file changed, 1 insertion(+), 2 deletions(-) | 16 | 1 file changed, 1 insertion(+), 2 deletions(-) |
16 | 17 | ||
17 | diff --git a/snmplib/keytools.c b/snmplib/keytools.c | 18 | diff --git a/snmplib/keytools.c b/snmplib/keytools.c |
18 | index 0ccb3a6..880fc14 100644 | 19 | index 2cf0240..50fd3ea 100644 |
19 | --- a/snmplib/keytools.c | 20 | --- a/snmplib/keytools.c |
20 | +++ b/snmplib/keytools.c | 21 | +++ b/snmplib/keytools.c |
21 | @@ -153,8 +153,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len, | 22 | @@ -186,8 +186,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len, |
22 | ctx = EVP_MD_CTX_create(); | 23 | ctx = EVP_MD_CTX_create(); |
23 | #else | 24 | #else |
24 | ctx = malloc(sizeof(*ctx)); | 25 | ctx = malloc(sizeof(*ctx)); |
@@ -26,8 +27,5 @@ index 0ccb3a6..880fc14 100644 | |||
26 | - return SNMPERR_GENERR; | 27 | - return SNMPERR_GENERR; |
27 | + EVP_MD_CTX_init(ctx); | 28 | + EVP_MD_CTX_init(ctx); |
28 | #endif | 29 | #endif |
29 | #ifndef NETSNMP_DISABLE_MD5 | 30 | if (!EVP_DigestInit(ctx, hashfn)) |
30 | if (ISTRANSFORM(hashtype, HMACMD5Auth)) { | 31 | return SNMPERR_GENERR; |
31 | -- | ||
32 | 2.5.2 | ||
33 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch index 999976d27..4782714d5 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 94e7e4969bc84c945dfea12d67a1e10f61973948 Mon Sep 17 00:00:00 2001 | 1 | From a3631df3d6743113e1cd63579925e15bcce85868 Mon Sep 17 00:00:00 2001 |
2 | From: Wenlin Kang <wenlin.kang@windriver.com> | 2 | From: Wenlin Kang <wenlin.kang@windriver.com> |
3 | Date: Wed, 24 May 2017 16:45:34 +0800 | 3 | Date: Wed, 24 May 2017 16:45:34 +0800 |
4 | Subject: [PATCH 2/4] configure: fix a cc check issue. | 4 | Subject: [PATCH 2/4] configure: fix a cc check issue. |
@@ -8,6 +8,7 @@ $myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);' | |||
8 | can't get corretly the cc's value. | 8 | can't get corretly the cc's value. |
9 | 9 | ||
10 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> | 10 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> |
11 | |||
11 | --- | 12 | --- |
12 | configure.d/config_project_perl_python | 2 +- | 13 | configure.d/config_project_perl_python | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -25,6 +26,3 @@ index 475c843..22d2ad3 100644 | |||
25 | changequote([, ]) | 26 | changequote([, ]) |
26 | if test "x$PERLCC" != "x" ; then | 27 | if test "x$PERLCC" != "x" ; then |
27 | AC_MSG_RESULT([$PERLCC]) | 28 | AC_MSG_RESULT([$PERLCC]) |
28 | -- | ||
29 | 1.9.1 | ||
30 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch deleted file mode 100644 index 7951234a4..000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch +++ /dev/null | |||
@@ -1,186 +0,0 @@ | |||
1 | From e57fc809ad6ae522670f3dc157aadde20d968ca7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bart Van Assche <bvanassche@acm.org> | ||
3 | Date: Wed, 24 May 2017 17:05:03 +0800 | ||
4 | Subject: [PATCH 3/4] CHANGES: BUG: 2712: Fix Perl module compilation | ||
5 | |||
6 | Avoid that building the Net-SNMP Perl modules fails as follows: | ||
7 | |||
8 | ERROR from evaluation of /sources/net-snmp-5.7.3/perl/ASN/Makefile.PL: Bizarre \ copy of HASH in list assignment at /usr/lib/perl5/site_perl/5.24.0/Carp.pm line\ 229. | ||
9 | |||
10 | See also https://sourceforge.net/p/net-snmp/bugs/2712/. | ||
11 | |||
12 | This patch comes from git://git.code.sf.net/p/net-snmp/code, | ||
13 | the commit is 4e793461e96a2b4fd81142ab312d074d5c8841fa. | ||
14 | |||
15 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> | ||
16 | --- | ||
17 | perl/ASN/Makefile.PL | 4 +--- | ||
18 | perl/Makefile.PL | 4 +--- | ||
19 | perl/OID/Makefile.PL | 5 +---- | ||
20 | perl/SNMP/Makefile.PL | 5 +---- | ||
21 | perl/TrapReceiver/Makefile.PL | 5 +---- | ||
22 | perl/agent/Makefile.PL | 5 +---- | ||
23 | perl/agent/Support/Makefile.PL | 5 +---- | ||
24 | perl/agent/default_store/Makefile.PL | 5 +---- | ||
25 | perl/default_store/Makefile.PL | 5 +---- | ||
26 | 9 files changed, 9 insertions(+), 34 deletions(-) | ||
27 | |||
28 | diff --git a/perl/ASN/Makefile.PL b/perl/ASN/Makefile.PL | ||
29 | index 4576781..c33d8ba 100644 | ||
30 | --- a/perl/ASN/Makefile.PL | ||
31 | +++ b/perl/ASN/Makefile.PL | ||
32 | @@ -7,9 +7,7 @@ my $lib_version; | ||
33 | # See lib/ExtUtils/MakeMaker.pm for details of how to influence | ||
34 | # the contents of the Makefile that is written. | ||
35 | |||
36 | -%MakeParams = InitMakeParams(); | ||
37 | - | ||
38 | -WriteMakefile(%MakeParams); | ||
39 | +WriteMakefile(InitMakeParams()); | ||
40 | |||
41 | Check_Version(); | ||
42 | |||
43 | diff --git a/perl/Makefile.PL b/perl/Makefile.PL | ||
44 | index 31fdc40..48aba2a 100644 | ||
45 | --- a/perl/Makefile.PL | ||
46 | +++ b/perl/Makefile.PL | ||
47 | @@ -3,9 +3,7 @@ use Config; | ||
48 | use Getopt::Long; | ||
49 | require 5; | ||
50 | |||
51 | -%MakeParams = InitMakeParams(); | ||
52 | - | ||
53 | -WriteMakefile(%MakeParams); | ||
54 | +WriteMakefile(InitMakeParams()); | ||
55 | |||
56 | sub InitMakeParams { | ||
57 | $nsconfig="net-snmp-config"; # in path by default | ||
58 | diff --git a/perl/OID/Makefile.PL b/perl/OID/Makefile.PL | ||
59 | index 6bb1616..2589985 100644 | ||
60 | --- a/perl/OID/Makefile.PL | ||
61 | +++ b/perl/OID/Makefile.PL | ||
62 | @@ -6,11 +6,8 @@ require 5; | ||
63 | use Config; | ||
64 | use Getopt::Long; | ||
65 | my $lib_version; | ||
66 | -my %MakeParams = (); | ||
67 | |||
68 | -%MakeParams = InitMakeParams(); | ||
69 | - | ||
70 | -WriteMakefile(%MakeParams); | ||
71 | +WriteMakefile(InitMakeParams()); | ||
72 | |||
73 | Check_Version(); | ||
74 | |||
75 | diff --git a/perl/SNMP/Makefile.PL b/perl/SNMP/Makefile.PL | ||
76 | index e617cb7..8aab9a9 100644 | ||
77 | --- a/perl/SNMP/Makefile.PL | ||
78 | +++ b/perl/SNMP/Makefile.PL | ||
79 | @@ -3,15 +3,12 @@ require 5; | ||
80 | use Config; | ||
81 | use Getopt::Long; | ||
82 | my $lib_version; | ||
83 | -my %MakeParams = (); | ||
84 | my $opts; | ||
85 | |||
86 | # See lib/ExtUtils/MakeMaker.pm for details of how to influence | ||
87 | # the contents of the Makefile that is written. | ||
88 | |||
89 | -%MakeParams = InitMakeParams(); | ||
90 | - | ||
91 | -WriteMakefile(%MakeParams); | ||
92 | +WriteMakefile(InitMakeParams()); | ||
93 | |||
94 | Check_Version(); | ||
95 | |||
96 | diff --git a/perl/TrapReceiver/Makefile.PL b/perl/TrapReceiver/Makefile.PL | ||
97 | index 874ee21..7e9e58e 100644 | ||
98 | --- a/perl/TrapReceiver/Makefile.PL | ||
99 | +++ b/perl/TrapReceiver/Makefile.PL | ||
100 | @@ -3,11 +3,8 @@ require 5; | ||
101 | use Config; | ||
102 | use Getopt::Long; | ||
103 | my $lib_version; | ||
104 | -my %MakeParams = (); | ||
105 | |||
106 | -%MakeParams = InitMakeParams(); | ||
107 | - | ||
108 | -WriteMakefile(%MakeParams); | ||
109 | +WriteMakefile(InitMakeParams()); | ||
110 | |||
111 | Check_Version(); | ||
112 | |||
113 | diff --git a/perl/agent/Makefile.PL b/perl/agent/Makefile.PL | ||
114 | index 4f7bee3..003c0d1 100644 | ||
115 | --- a/perl/agent/Makefile.PL | ||
116 | +++ b/perl/agent/Makefile.PL | ||
117 | @@ -3,11 +3,8 @@ require 5; | ||
118 | use Config; | ||
119 | use Getopt::Long; | ||
120 | my $lib_version; | ||
121 | -my %MakeParams = (); | ||
122 | |||
123 | -%MakeParams = InitMakeParams(); | ||
124 | - | ||
125 | -WriteMakefile(%MakeParams); | ||
126 | +WriteMakefile(InitMakeParams()); | ||
127 | |||
128 | Check_Version(); | ||
129 | |||
130 | diff --git a/perl/agent/Support/Makefile.PL b/perl/agent/Support/Makefile.PL | ||
131 | index 48815b6..2325e10 100644 | ||
132 | --- a/perl/agent/Support/Makefile.PL | ||
133 | +++ b/perl/agent/Support/Makefile.PL | ||
134 | @@ -3,14 +3,11 @@ require 5; | ||
135 | use Config; | ||
136 | use Getopt::Long; | ||
137 | my $lib_version; | ||
138 | -my %MakeParams = (); | ||
139 | |||
140 | # See lib/ExtUtils/MakeMaker.pm for details of how to influence | ||
141 | # the contents of the Makefile that is written. | ||
142 | |||
143 | -%MakeParams = InitMakeParams(); | ||
144 | - | ||
145 | -WriteMakefile(%MakeParams); | ||
146 | +WriteMakefile(InitMakeParams()); | ||
147 | |||
148 | Check_Version(); | ||
149 | |||
150 | diff --git a/perl/agent/default_store/Makefile.PL b/perl/agent/default_store/Makefile.PL | ||
151 | index ed6483a..31cfbee 100644 | ||
152 | --- a/perl/agent/default_store/Makefile.PL | ||
153 | +++ b/perl/agent/default_store/Makefile.PL | ||
154 | @@ -3,11 +3,8 @@ require 5; | ||
155 | use Config; | ||
156 | use Getopt::Long; | ||
157 | my $lib_version; | ||
158 | -my %MakeParams = (); | ||
159 | |||
160 | -%MakeParams = InitMakeParams(); | ||
161 | - | ||
162 | -WriteMakefile(%MakeParams); | ||
163 | +WriteMakefile(InitMakeParams()); | ||
164 | |||
165 | Check_Version(); | ||
166 | |||
167 | diff --git a/perl/default_store/Makefile.PL b/perl/default_store/Makefile.PL | ||
168 | index 7c671b8..01c8dd0 100644 | ||
169 | --- a/perl/default_store/Makefile.PL | ||
170 | +++ b/perl/default_store/Makefile.PL | ||
171 | @@ -3,11 +3,8 @@ require 5; | ||
172 | use Config; | ||
173 | use Getopt::Long; | ||
174 | my $lib_version; | ||
175 | -my %MakeParams = (); | ||
176 | |||
177 | -%MakeParams = InitMakeParams(); | ||
178 | - | ||
179 | -WriteMakefile(%MakeParams); | ||
180 | +WriteMakefile(InitMakeParams()); | ||
181 | |||
182 | |||
183 | sub InitMakeParams { | ||
184 | -- | ||
185 | 1.9.1 | ||
186 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch index 2b03f9e9a..a3d84b291 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4ad98ef125eb4e7d7a1a93146042002f78254d36 Mon Sep 17 00:00:00 2001 | 1 | From f3c5cd4df7ce8e5639c99b7b918e41fb89e969e3 Mon Sep 17 00:00:00 2001 |
2 | From: Wenlin Kang <wenlin.kang@windriver.com> | 2 | From: Wenlin Kang <wenlin.kang@windriver.com> |
3 | Date: Wed, 24 May 2017 17:10:20 +0800 | 3 | Date: Wed, 24 May 2017 17:10:20 +0800 |
4 | Subject: [PATCH 4/4] configure: fix incorrect variable | 4 | Subject: [PATCH 4/4] configure: fix incorrect variable |
@@ -8,15 +8,16 @@ For cross compile platform, this variable will not be correct, so fix it. | |||
8 | Upstream-Status: Inappropriate [cross compile specific] | 8 | Upstream-Status: Inappropriate [cross compile specific] |
9 | 9 | ||
10 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> | 10 | Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> |
11 | |||
11 | --- | 12 | --- |
12 | Makefile.in | 2 +- | 13 | Makefile.in | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/Makefile.in b/Makefile.in | 16 | diff --git a/Makefile.in b/Makefile.in |
16 | index cfcdf73..164df05 100644 | 17 | index 9dbdde1..5fdc760 100644 |
17 | --- a/Makefile.in | 18 | --- a/Makefile.in |
18 | +++ b/Makefile.in | 19 | +++ b/Makefile.in |
19 | @@ -171,7 +171,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt | 20 | @@ -173,7 +173,7 @@ OTHERCLEANTODOS=perlclean @PYTHONCLEANTARGS@ cleanfeatures perlcleanfeatures pyt |
20 | # | 21 | # |
21 | # override LD_RUN_PATH to avoid dependencies on the build directory | 22 | # override LD_RUN_PATH to avoid dependencies on the build directory |
22 | perlmodules: perlmakefiles subdirs | 23 | perlmodules: perlmakefiles subdirs |
@@ -25,6 +26,3 @@ index cfcdf73..164df05 100644 | |||
25 | if test $$? != 0 ; then \ | 26 | if test $$? != 0 ; then \ |
26 | exit 1 ; \ | 27 | exit 1 ; \ |
27 | fi | 28 | fi |
28 | -- | ||
29 | 1.9.1 | ||
30 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch deleted file mode 100644 index 6bd0f93c4..000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch +++ /dev/null | |||
@@ -1,131 +0,0 @@ | |||
1 | From 6b93e686bdb6a908d00595608646a05527a5326b Mon Sep 17 00:00:00 2001 | ||
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | ||
3 | Date: Fri, 21 Aug 2015 12:39:12 +0900 | ||
4 | Subject: [PATCH] the snmp_pdu_parse() function could leave incompletely parsed | ||
5 | varBind variables in the list of variables in case the parsing of the SNMP | ||
6 | PDU failed. If later processing tries to operate on the stale and | ||
7 | incompletely processed varBind (e.g. when printing the variables), this can | ||
8 | lead to e.g. crashes or, possibly, execution of arbitrary code | ||
9 | |||
10 | Upstream-Status: Backport [net-snmp] | ||
11 | |||
12 | Written-by: Robert Story | ||
13 | --- | ||
14 | snmplib/snmp_api.c | 53 ++++++++++++++++++++++++++++------------------------- | ||
15 | 1 file changed, 28 insertions(+), 25 deletions(-) | ||
16 | |||
17 | diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c | ||
18 | index 191debf..15a2d39 100644 | ||
19 | --- a/snmplib/snmp_api.c | ||
20 | +++ b/snmplib/snmp_api.c | ||
21 | @@ -4350,10 +4350,9 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) | ||
22 | u_char type; | ||
23 | u_char msg_type; | ||
24 | u_char *var_val; | ||
25 | - int badtype = 0; | ||
26 | size_t len; | ||
27 | size_t four; | ||
28 | - netsnmp_variable_list *vp = NULL; | ||
29 | + netsnmp_variable_list *vp = NULL, *vplast = NULL; | ||
30 | oid objid[MAX_OID_LEN]; | ||
31 | u_char *p; | ||
32 | |||
33 | @@ -4493,31 +4492,17 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) | ||
34 | (ASN_SEQUENCE | ASN_CONSTRUCTOR), | ||
35 | "varbinds"); | ||
36 | if (data == NULL) | ||
37 | - return -1; | ||
38 | + goto fail; | ||
39 | |||
40 | /* | ||
41 | * get each varBind sequence | ||
42 | */ | ||
43 | while ((int) *length > 0) { | ||
44 | - netsnmp_variable_list *vptemp; | ||
45 | - vptemp = (netsnmp_variable_list *) malloc(sizeof(*vptemp)); | ||
46 | - if (NULL == vptemp) { | ||
47 | - return -1; | ||
48 | - } | ||
49 | - if (NULL == vp) { | ||
50 | - pdu->variables = vptemp; | ||
51 | - } else { | ||
52 | - vp->next_variable = vptemp; | ||
53 | - } | ||
54 | - vp = vptemp; | ||
55 | + vp = SNMP_MALLOC_TYPEDEF(netsnmp_variable_list); | ||
56 | + if (NULL == vp) | ||
57 | + goto fail; | ||
58 | |||
59 | - vp->next_variable = NULL; | ||
60 | - vp->val.string = NULL; | ||
61 | vp->name_length = MAX_OID_LEN; | ||
62 | - vp->name = NULL; | ||
63 | - vp->index = 0; | ||
64 | - vp->data = NULL; | ||
65 | - vp->dataFreeHook = NULL; | ||
66 | DEBUGDUMPSECTION("recv", "VarBind"); | ||
67 | data = snmp_parse_var_op(data, objid, &vp->name_length, &vp->type, | ||
68 | &vp->val_len, &var_val, length); | ||
69 | @@ -4604,7 +4589,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) | ||
70 | vp->val.string = (u_char *) malloc(vp->val_len); | ||
71 | } | ||
72 | if (vp->val.string == NULL) { | ||
73 | - return -1; | ||
74 | + goto fail; | ||
75 | } | ||
76 | p = asn_parse_string(var_val, &len, &vp->type, vp->val.string, | ||
77 | &vp->val_len); | ||
78 | @@ -4619,7 +4604,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) | ||
79 | vp->val_len *= sizeof(oid); | ||
80 | vp->val.objid = (oid *) malloc(vp->val_len); | ||
81 | if (vp->val.objid == NULL) { | ||
82 | - return -1; | ||
83 | + goto fail; | ||
84 | } | ||
85 | memmove(vp->val.objid, objid, vp->val_len); | ||
86 | break; | ||
87 | @@ -4631,7 +4616,7 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) | ||
88 | case ASN_BIT_STR: | ||
89 | vp->val.bitstring = (u_char *) malloc(vp->val_len); | ||
90 | if (vp->val.bitstring == NULL) { | ||
91 | - return -1; | ||
92 | + goto fail; | ||
93 | } | ||
94 | p = asn_parse_bitstring(var_val, &len, &vp->type, | ||
95 | vp->val.bitstring, &vp->val_len); | ||
96 | @@ -4640,12 +4625,30 @@ snmp_pdu_parse(netsnmp_pdu *pdu, u_char * data, size_t * length) | ||
97 | break; | ||
98 | default: | ||
99 | snmp_log(LOG_ERR, "bad type returned (%x)\n", vp->type); | ||
100 | - badtype = -1; | ||
101 | + goto fail; | ||
102 | break; | ||
103 | } | ||
104 | DEBUGINDENTADD(-4); | ||
105 | + | ||
106 | + if (NULL == vplast) { | ||
107 | + pdu->variables = vp; | ||
108 | + } else { | ||
109 | + vplast->next_variable = vp; | ||
110 | + } | ||
111 | + vplast = vp; | ||
112 | + vp = NULL; | ||
113 | + | ||
114 | } | ||
115 | - return badtype; | ||
116 | + return 0; | ||
117 | + | ||
118 | + fail: | ||
119 | + DEBUGMSGTL(("recv", "error while parsing VarBindList\n")); | ||
120 | + /** if we were parsing a var, remove it from the pdu and free it */ | ||
121 | + if (vp) | ||
122 | + snmp_free_var(vp); | ||
123 | + | ||
124 | + return -1; | ||
125 | + | ||
126 | } | ||
127 | |||
128 | /* | ||
129 | -- | ||
130 | 1.8.4.2 | ||
131 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch index d29be3395..fc3ac2a4b 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 0becb4843a40910d5ec9aa11969d4905a22037cf Mon Sep 17 00:00:00 2001 | ||
2 | From: "Roy.Li" <rongqing.li@windriver.com> | ||
3 | Date: Fri, 16 Jan 2015 14:14:01 +0800 | ||
4 | Subject: [PATCH] net-snmp: fix "libtool --finish" | ||
5 | |||
1 | LIB_LDCONFIG_CMD failed since it is using a host dir $(libdir) | 6 | LIB_LDCONFIG_CMD failed since it is using a host dir $(libdir) |
2 | which is /usr/lib64 does not exist on host when compile 64bit | 7 | which is /usr/lib64 does not exist on host when compile 64bit |
3 | image. | 8 | image. |
@@ -9,12 +14,16 @@ rpm-postinst for each recipe while do_package, in package.bbclass. | |||
9 | Upstream-Status: Inappropriate [cross compile specific] | 14 | Upstream-Status: Inappropriate [cross compile specific] |
10 | 15 | ||
11 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | 16 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> |
17 | |||
12 | --- | 18 | --- |
13 | Index: net-snmp-5.7.3/Makefile.top | 19 | Makefile.top | 2 +- |
14 | =================================================================== | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | --- net-snmp-5.7.3.orig/Makefile.top | 21 | |
16 | +++ net-snmp-5.7.3/Makefile.top | 22 | diff --git a/Makefile.top b/Makefile.top |
17 | @@ -87,7 +87,7 @@ LIBREVISION = 3 | 23 | index 5d4f9bc..d0ed31c 100644 |
24 | --- a/Makefile.top | ||
25 | +++ b/Makefile.top | ||
26 | @@ -89,7 +89,7 @@ LIBREVISION = 0 | ||
18 | LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o | 27 | LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o |
19 | LIB_EXTENSION = la | 28 | LIB_EXTENSION = la |
20 | LIB_VERSION = | 29 | LIB_VERSION = |
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-openssl-build-errors.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-openssl-build-errors.patch deleted file mode 100644 index 5c6436c34..000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-openssl-build-errors.patch +++ /dev/null | |||
@@ -1,181 +0,0 @@ | |||
1 | net-snmp build fails on Debian 9 with OpenSSL 1.1.0 | ||
2 | |||
3 | With these changes, net-snmp builds with both | ||
4 | OpenSSL 1.0.x and 1.1.x. | ||
5 | |||
6 | Author: Sharmila Podury <sharmila.podury@brocade.com> | ||
7 | |||
8 | Index: net-snmp-5.7.3/apps/snmpusm.c | ||
9 | =================================================================== | ||
10 | --- net-snmp-5.7.3.orig/apps/snmpusm.c | ||
11 | +++ net-snmp-5.7.3/apps/snmpusm.c | ||
12 | @@ -125,6 +125,32 @@ char *usmUserPublic_val = NULL | ||
13 | int docreateandwait = 0; | ||
14 | |||
15 | |||
16 | +#if OPENSSL_VERSION_NUMBER < 0x10100000L | ||
17 | + | ||
18 | +#include <string.h> | ||
19 | +#include <openssl/engine.h> | ||
20 | + | ||
21 | +void DH_get0_pqg(const DH *dh, | ||
22 | + const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) | ||
23 | +{ | ||
24 | + if (p != NULL) | ||
25 | + *p = dh->p; | ||
26 | + if (q != NULL) | ||
27 | + *q = dh->q; | ||
28 | + if (g != NULL) | ||
29 | + *g = dh->g; | ||
30 | +} | ||
31 | + | ||
32 | +void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) | ||
33 | +{ | ||
34 | + if (pub_key != NULL) | ||
35 | + *pub_key = dh->pub_key; | ||
36 | + if (priv_key != NULL) | ||
37 | + *priv_key = dh->priv_key; | ||
38 | +} | ||
39 | + | ||
40 | +#endif | ||
41 | + | ||
42 | void | ||
43 | usage(void) | ||
44 | { | ||
45 | @@ -190,7 +216,7 @@ get_USM_DH_key(netsnmp_variable_list *va | ||
46 | oid *keyoid, size_t keyoid_len) { | ||
47 | u_char *dhkeychange; | ||
48 | DH *dh; | ||
49 | - BIGNUM *other_pub; | ||
50 | + BIGNUM *p, *g, *pub_key, *other_pub; | ||
51 | u_char *key; | ||
52 | size_t key_len; | ||
53 | |||
54 | @@ -205,25 +231,29 @@ get_USM_DH_key(netsnmp_variable_list *va | ||
55 | dh = d2i_DHparams(NULL, &cp, dhvar->val_len); | ||
56 | } | ||
57 | |||
58 | - if (!dh || !dh->g || !dh->p) { | ||
59 | + if (dh) | ||
60 | + DH_get0_pqg(dh, &p, NULL, &g); | ||
61 | + | ||
62 | + if (!dh || !g || !p) { | ||
63 | SNMP_FREE(dhkeychange); | ||
64 | return SNMPERR_GENERR; | ||
65 | } | ||
66 | |||
67 | - DH_generate_key(dh); | ||
68 | - if (!dh->pub_key) { | ||
69 | + if (!DH_generate_key(dh)) { | ||
70 | SNMP_FREE(dhkeychange); | ||
71 | return SNMPERR_GENERR; | ||
72 | } | ||
73 | |||
74 | - if (vars->val_len != (unsigned int)BN_num_bytes(dh->pub_key)) { | ||
75 | + DH_get0_key(dh, &pub_key, NULL); | ||
76 | + | ||
77 | + if (vars->val_len != (unsigned int)BN_num_bytes(pub_key)) { | ||
78 | SNMP_FREE(dhkeychange); | ||
79 | fprintf(stderr,"incorrect diffie-helman lengths (%lu != %d)\n", | ||
80 | - (unsigned long)vars->val_len, BN_num_bytes(dh->pub_key)); | ||
81 | + (unsigned long)vars->val_len, BN_num_bytes(pub_key)); | ||
82 | return SNMPERR_GENERR; | ||
83 | } | ||
84 | |||
85 | - BN_bn2bin(dh->pub_key, dhkeychange + vars->val_len); | ||
86 | + BN_bn2bin(pub_key, dhkeychange + vars->val_len); | ||
87 | |||
88 | key_len = DH_size(dh); | ||
89 | if (!key_len) { | ||
90 | Index: net-snmp-5.7.3/configure.d/config_os_libs2 | ||
91 | =================================================================== | ||
92 | --- net-snmp-5.7.3.orig/configure.d/config_os_libs2 | ||
93 | +++ net-snmp-5.7.3/configure.d/config_os_libs2 | ||
94 | @@ -293,10 +293,16 @@ if test "x$tryopenssl" != "xno" -a "x$tr | ||
95 | [Define to 1 if you have the `AES_cfb128_encrypt' function.])) | ||
96 | |||
97 | AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_create, | ||
98 | - AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [], | ||
99 | + AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [1], | ||
100 | [Define to 1 if you have the `EVP_MD_CTX_create' function.]) | ||
101 | - AC_DEFINE([HAVE_EVP_MD_CTX_DESTROY], [], | ||
102 | + AC_DEFINE([HAVE_EVP_MD_CTX_DESTROY], [1], | ||
103 | [Define to 1 if you have the `EVP_MD_CTX_destroy' function.])) | ||
104 | + | ||
105 | + AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_new, | ||
106 | + AC_DEFINE([HAVE_EVP_MD_CTX_NEW], [1], | ||
107 | + [Define to 1 if you have the `EVP_MD_CTX_new' function.]) | ||
108 | + AC_DEFINE([HAVE_EVP_MD_CTX_FREE], [1], | ||
109 | + [Define to 1 if you have the `EVP_MD_CTX_free' function.])) | ||
110 | fi | ||
111 | if echo " $transport_result_list " | $GREP "DTLS" > /dev/null; then | ||
112 | AC_CHECK_LIB(ssl, DTLSv1_method, | ||
113 | Index: net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in | ||
114 | =================================================================== | ||
115 | --- net-snmp-5.7.3.orig/include/net-snmp/net-snmp-config.h.in | ||
116 | +++ net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in | ||
117 | @@ -155,6 +155,12 @@ | ||
118 | /* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */ | ||
119 | #undef HAVE_EVP_MD_CTX_DESTROY | ||
120 | |||
121 | +/* Define to 1 if you have the `EVP_MD_CTX_free' function. */ | ||
122 | +#undef HAVE_EVP_MD_CTX_FREE | ||
123 | + | ||
124 | +/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ | ||
125 | +#undef HAVE_EVP_MD_CTX_NEW | ||
126 | + | ||
127 | /* Define if you have EVP_sha224/256 in openssl */ | ||
128 | #undef HAVE_EVP_SHA224 | ||
129 | |||
130 | Index: net-snmp-5.7.3/snmplib/keytools.c | ||
131 | =================================================================== | ||
132 | --- net-snmp-5.7.3.orig/snmplib/keytools.c | ||
133 | +++ net-snmp-5.7.3/snmplib/keytools.c | ||
134 | @@ -149,7 +149,9 @@ generate_Ku(const oid * hashtype, u_int | ||
135 | */ | ||
136 | #ifdef NETSNMP_USE_OPENSSL | ||
137 | |||
138 | -#ifdef HAVE_EVP_MD_CTX_CREATE | ||
139 | +#ifdef HAVE_EVP_MD_CTX_NEW | ||
140 | + ctx = EVP_MD_CTX_new(); | ||
141 | +#elif HAVE_EVP_MD_CTX_CREATE | ||
142 | ctx = EVP_MD_CTX_create(); | ||
143 | #else | ||
144 | ctx = malloc(sizeof(*ctx)); | ||
145 | @@ -258,7 +260,9 @@ generate_Ku(const oid * hashtype, u_int | ||
146 | memset(buf, 0, sizeof(buf)); | ||
147 | #ifdef NETSNMP_USE_OPENSSL | ||
148 | if (ctx) { | ||
149 | -#ifdef HAVE_EVP_MD_CTX_DESTROY | ||
150 | +#ifdef HAVE_EVP_MD_CTX_FREE | ||
151 | + EVP_MD_CTX_free(ctx); | ||
152 | +#elif HAVE_EVP_MD_CTX_DESTROY | ||
153 | EVP_MD_CTX_destroy(ctx); | ||
154 | #else | ||
155 | EVP_MD_CTX_cleanup(ctx); | ||
156 | Index: net-snmp-5.7.3/snmplib/scapi.c | ||
157 | =================================================================== | ||
158 | --- net-snmp-5.7.3.orig/snmplib/scapi.c | ||
159 | +++ net-snmp-5.7.3/snmplib/scapi.c | ||
160 | @@ -488,7 +488,9 @@ sc_hash(const oid * hashtype, size_t has | ||
161 | } | ||
162 | |||
163 | /** initialize the pointer */ | ||
164 | -#ifdef HAVE_EVP_MD_CTX_CREATE | ||
165 | +#ifdef HAVE_EVP_MD_CTX_NEW | ||
166 | + cptr = EVP_MD_CTX_new(); | ||
167 | +#elif HAVE_EVP_MD_CTX_CREATE | ||
168 | cptr = EVP_MD_CTX_create(); | ||
169 | #else | ||
170 | cptr = malloc(sizeof(*cptr)); | ||
171 | @@ -509,7 +511,9 @@ sc_hash(const oid * hashtype, size_t has | ||
172 | /** do the final pass */ | ||
173 | EVP_DigestFinal(cptr, MAC, &tmp_len); | ||
174 | *MAC_len = tmp_len; | ||
175 | -#ifdef HAVE_EVP_MD_CTX_DESTROY | ||
176 | +#ifdef HAVE_EVP_MD_CTX_FREE | ||
177 | + EVP_MD_CTX_free(cptr); | ||
178 | +#elif HAVE_EVP_MD_CTX_DESTROY | ||
179 | EVP_MD_CTX_destroy(cptr); | ||
180 | #else | ||
181 | #if !defined(OLD_DES) | ||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch index fbd274bba..5cbb60d8e 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e47c60dc7f649959f63e56bc62355de4bdfd73f4 Mon Sep 17 00:00:00 2001 | 1 | From d619cd9fc01f336ff0ff55b18f9112789eb4d84c Mon Sep 17 00:00:00 2001 |
2 | From: Marian Florea <marian.florea@windriver.com> | 2 | From: Marian Florea <marian.florea@windriver.com> |
3 | Date: Thu, 20 Jul 2017 16:55:24 +0800 | 3 | Date: Thu, 20 Jul 2017 16:55:24 +0800 |
4 | Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP | 4 | Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP |
@@ -7,16 +7,17 @@ Upstream-Status: Pending | |||
7 | 7 | ||
8 | Signed-off-by: Marian Florea <marian.florea@windriver.com> | 8 | Signed-off-by: Marian Florea <marian.florea@windriver.com> |
9 | Signed-off-by: Li Zhou <li.zhou@windriver.com> | 9 | Signed-off-by: Li Zhou <li.zhou@windriver.com> |
10 | |||
10 | --- | 11 | --- |
11 | agent/snmpd.c | 1 + | 12 | agent/snmpd.c | 1 + |
12 | snmplib/snmpv3.c | 4 ++-- | 13 | snmplib/snmpv3.c | 4 ++-- |
13 | 2 files changed, 3 insertions(+), 2 deletions(-) | 14 | 2 files changed, 3 insertions(+), 2 deletions(-) |
14 | 15 | ||
15 | Index: net-snmp-5.7.3/agent/snmpd.c | 16 | diff --git a/agent/snmpd.c b/agent/snmpd.c |
16 | =================================================================== | 17 | index 6566354..eb0d4b4 100644 |
17 | --- net-snmp-5.7.3.orig/agent/snmpd.c | 18 | --- a/agent/snmpd.c |
18 | +++ net-snmp-5.7.3/agent/snmpd.c | 19 | +++ b/agent/snmpd.c |
19 | @@ -1253,6 +1253,7 @@ receive(void) | 20 | @@ -1239,6 +1239,7 @@ receive(void) |
20 | snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", | 21 | snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", |
21 | netsnmp_get_version()); | 22 | netsnmp_get_version()); |
22 | update_config(); | 23 | update_config(); |
@@ -24,11 +25,11 @@ Index: net-snmp-5.7.3/agent/snmpd.c | |||
24 | send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); | 25 | send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); |
25 | #if HAVE_SIGHOLD | 26 | #if HAVE_SIGHOLD |
26 | sigrelse(SIGHUP); | 27 | sigrelse(SIGHUP); |
27 | Index: net-snmp-5.7.3/snmplib/snmpv3.c | 28 | diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c |
28 | =================================================================== | 29 | index 771ba3b..5de05e7 100644 |
29 | --- net-snmp-5.7.3.orig/snmplib/snmpv3.c | 30 | --- a/snmplib/snmpv3.c |
30 | +++ net-snmp-5.7.3/snmplib/snmpv3.c | 31 | +++ b/snmplib/snmpv3.c |
31 | @@ -984,9 +984,9 @@ init_snmpv3_post_config(int majorid, int | 32 | @@ -1060,9 +1060,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg, |
32 | /* | 33 | /* |
33 | * if our engineID has changed at all, the boots record must be set to 1 | 34 | * if our engineID has changed at all, the boots record must be set to 1 |
34 | */ | 35 | */ |
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch deleted file mode 100644 index 5eed893e1..000000000 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | Description: fix snmpd crash via AgentX connection | ||
2 | |||
3 | taken from Fedora, net-snmp-5.7-agentx-crash.patch | ||
4 | |||
5 | bz729738 - net-snmp dumps core in netsnmp_oid_find_prefix | ||
6 | bz1038011 - net-snmp: snmpd crashes/hangs when AgentX subagent times-out | ||
7 | |||
8 | commit f9304c83f76202db0e684269ca1af32e43cd9db4 | ||
9 | Author: Jan Safranek <jsafranek@users.sourceforge.net> | ||
10 | Date: Tue Feb 7 14:53:44 2012 +0100 | ||
11 | |||
12 | CHANGES: PATCH 1633670: fixed snmpd crashing when an AgentX subagent | ||
13 | disconnect in the middle of processing of a request. | ||
14 | |||
15 | I fixed also the memory leak reported in the tracker comments. | ||
16 | |||
17 | Upstream-Status: Backport | ||
18 | |||
19 | Signed-off-by: Zhu Yanjun <yanjun.zhu@windriver.com> | ||
20 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
21 | |||
22 | --- | ||
23 | agent/mibgroup/agentx/master.c | 5 +++++ | ||
24 | agent/mibgroup/agentx/master_admin.c | 9 +++++++-- | ||
25 | 2 files changed, 12 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/agent/mibgroup/agentx/master.c b/agent/mibgroup/agentx/master.c | ||
28 | index c42a42a..baeebaf 100644 | ||
29 | --- a/agent/mibgroup/agentx/master.c | ||
30 | +++ b/agent/mibgroup/agentx/master.c | ||
31 | @@ -219,6 +219,9 @@ agentx_got_response(int operation, | ||
32 | if (!cache) { | ||
33 | DEBUGMSGTL(("agentx/master", "response too late on session %8p\n", | ||
34 | session)); | ||
35 | + /* response is too late, free the cache */ | ||
36 | + if (magic) | ||
37 | + netsnmp_free_delegated_cache((netsnmp_delegated_cache*) magic); | ||
38 | return 0; | ||
39 | } | ||
40 | requests = cache->requests; | ||
41 | @@ -606,6 +609,8 @@ agentx_master_handler(netsnmp_mib_handler *handler, | ||
42 | result = snmp_async_send(ax_session, pdu, agentx_got_response, cb_data); | ||
43 | if (result == 0) { | ||
44 | snmp_free_pdu(pdu); | ||
45 | + if (cb_data) | ||
46 | + netsnmp_free_delegated_cache((netsnmp_delegated_cache*) cb_data); | ||
47 | } | ||
48 | |||
49 | return SNMP_ERR_NOERROR; | ||
50 | diff --git a/agent/mibgroup/agentx/master_admin.c b/agent/mibgroup/agentx/master_admin.c | ||
51 | index f16f392..b84b85e 100644 | ||
52 | --- a/agent/mibgroup/agentx/master_admin.c | ||
53 | +++ b/agent/mibgroup/agentx/master_admin.c | ||
54 | @@ -133,11 +133,16 @@ close_agentx_session(netsnmp_session * session, int sessid) | ||
55 | * requests, so that the delegated request will be completed and | ||
56 | * further requests can be processed | ||
57 | */ | ||
58 | - netsnmp_remove_delegated_requests_for_session(session); | ||
59 | + while (netsnmp_remove_delegated_requests_for_session(session)) { | ||
60 | + DEBUGMSGTL(("agentx/master", "Continue removing delegated reqests\n")); | ||
61 | + } | ||
62 | + | ||
63 | if (session->subsession != NULL) { | ||
64 | netsnmp_session *subsession = session->subsession; | ||
65 | for(; subsession; subsession = subsession->next) { | ||
66 | - netsnmp_remove_delegated_requests_for_session(subsession); | ||
67 | + while (netsnmp_remove_delegated_requests_for_session(subsession)) { | ||
68 | + DEBUGMSGTL(("agentx/master", "Continue removing delegated subsession reqests\n")); | ||
69 | + } | ||
70 | } | ||
71 | } | ||
72 | |||
73 | -- | ||
74 | 2.7.4 | ||
75 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch index 25eb9c96f..4cd8fd1e4 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 270e952f58a7e5ddeabe5a15e3ddaaadf40017d0 Mon Sep 17 00:00:00 2001 | 1 | From 068952c0e0cdda5a91250b91c5fcc9b85b43daab Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
3 | Date: Thu, 22 Jun 2017 10:25:08 +0800 | 3 | Date: Thu, 22 Jun 2017 10:25:08 +0800 |
4 | Subject: [PATCH] net-snmp: fix for --disable-des | 4 | Subject: [PATCH] net-snmp: fix for --disable-des |
@@ -9,15 +9,16 @@ the --disable-des works correctly. | |||
9 | Upstream-Status: Submitted [net-snmp-coders@lists.sourceforge.net] | 9 | Upstream-Status: Submitted [net-snmp-coders@lists.sourceforge.net] |
10 | 10 | ||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
12 | |||
12 | --- | 13 | --- |
13 | snmplib/scapi.c | 2 ++ | 14 | snmplib/scapi.c | 2 ++ |
14 | 1 file changed, 2 insertions(+) | 15 | 1 file changed, 2 insertions(+) |
15 | 16 | ||
16 | diff --git a/snmplib/scapi.c b/snmplib/scapi.c | 17 | diff --git a/snmplib/scapi.c b/snmplib/scapi.c |
17 | index 16ac829..271684b 100644 | 18 | index 8ad1d70..43caddf 100644 |
18 | --- a/snmplib/scapi.c | 19 | --- a/snmplib/scapi.c |
19 | +++ b/snmplib/scapi.c | 20 | +++ b/snmplib/scapi.c |
20 | @@ -79,7 +79,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support) | 21 | @@ -84,7 +84,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support) |
21 | #include <openssl/hmac.h> | 22 | #include <openssl/hmac.h> |
22 | #include <openssl/evp.h> | 23 | #include <openssl/evp.h> |
23 | #include <openssl/rand.h> | 24 | #include <openssl/rand.h> |
@@ -27,6 +28,3 @@ index 16ac829..271684b 100644 | |||
27 | #ifdef HAVE_AES | 28 | #ifdef HAVE_AES |
28 | #include <openssl/aes.h> | 29 | #include <openssl/aes.h> |
29 | #endif | 30 | #endif |
30 | -- | ||
31 | 2.11.0 | ||
32 | |||
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch index 8f8336a49..7cbaf0bc5 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4bb4024b395f19d36ab3569e2773ea80d8cc5261 Mon Sep 17 00:00:00 2001 | 1 | From 827fe3b0253aab33472828f40ad05934cc0261b8 Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
3 | Date: Wed, 14 Jan 2015 15:10:06 +0800 | 3 | Date: Wed, 14 Jan 2015 15:10:06 +0800 |
4 | Subject: [PATCH] testing: add the output format for ptest | 4 | Subject: [PATCH] testing: add the output format for ptest |
@@ -6,15 +6,16 @@ Subject: [PATCH] testing: add the output format for ptest | |||
6 | Upstream-Status: Inappropriate [OE specific] | 6 | Upstream-Status: Inappropriate [OE specific] |
7 | 7 | ||
8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
9 | |||
9 | --- | 10 | --- |
10 | testing/RUNTESTS | 4 ++++ | 11 | testing/RUNTESTS | 4 ++++ |
11 | 1 files changed, 4 insertions(+), 0 deletions(-) | 12 | 1 file changed, 4 insertions(+) |
12 | 13 | ||
13 | Index: net-snmp-5.7.3/testing/RUNTESTS | 14 | diff --git a/testing/RUNTESTS b/testing/RUNTESTS |
14 | =================================================================== | 15 | index 6715831..a2b6fb8 100755 |
15 | --- net-snmp-5.7.3.orig/testing/RUNTESTS | 16 | --- a/testing/RUNTESTS |
16 | +++ net-snmp-5.7.3/testing/RUNTESTS | 17 | +++ b/testing/RUNTESTS |
17 | @@ -29,13 +29,17 @@ failed_count=0 | 18 | @@ -17,13 +17,17 @@ failed_count=0 |
18 | rm -f failed_tests | 19 | rm -f failed_tests |
19 | for i in "${srcdir}"/testing/fulltests/default/T*$1*; do | 20 | for i in "${srcdir}"/testing/fulltests/default/T*$1*; do |
20 | echo "RUNNING $i" | 21 | echo "RUNNING $i" |
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb index 5c827bb86..413f033f8 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | |||
@@ -11,32 +11,22 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ | |||
11 | file://init \ | 11 | file://init \ |
12 | file://snmpd.conf \ | 12 | file://snmpd.conf \ |
13 | file://snmptrapd.conf \ | 13 | file://snmptrapd.conf \ |
14 | file://systemd-support.patch \ | ||
15 | file://snmpd.service \ | 14 | file://snmpd.service \ |
16 | file://snmptrapd.service \ | 15 | file://snmptrapd.service \ |
17 | file://net-snmp-add-knob-whether-nlist.h-are-checked.patch \ | 16 | file://net-snmp-add-knob-whether-nlist.h-are-checked.patch \ |
18 | file://fix-libtool-finish.patch \ | 17 | file://fix-libtool-finish.patch \ |
19 | file://net-snmp-testing-add-the-output-format-for-ptest.patch \ | 18 | file://net-snmp-testing-add-the-output-format-for-ptest.patch \ |
20 | file://run-ptest \ | 19 | file://run-ptest \ |
21 | file://dont-return-incompletely-parsed-varbinds.patch \ | ||
22 | file://0001-config_os_headers-Error-Fix.patch \ | 20 | file://0001-config_os_headers-Error-Fix.patch \ |
23 | file://0001-config_os_libs2-Error-Fix.patch \ | ||
24 | file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \ | 21 | file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \ |
25 | file://net-snmp-agentx-crash.patch \ | ||
26 | file://0001-get_pid_from_inode-Include-limit.h.patch \ | 22 | file://0001-get_pid_from_inode-Include-limit.h.patch \ |
27 | file://0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch \ | ||
28 | file://0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch \ | ||
29 | file://0001-configure-fix-check-for-enable-perl-cc-checks.patch \ | ||
30 | file://0002-configure-fix-a-cc-check-issue.patch \ | 23 | file://0002-configure-fix-a-cc-check-issue.patch \ |
31 | file://0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch \ | ||
32 | file://0004-configure-fix-incorrect-variable.patch \ | 24 | file://0004-configure-fix-incorrect-variable.patch \ |
33 | file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ | 25 | file://net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch \ |
34 | file://net-snmp-fix-for-disable-des.patch \ | 26 | file://net-snmp-fix-for-disable-des.patch \ |
35 | file://0001-Remove-U64-typedef.patch \ | ||
36 | file://fix-openssl-build-errors.patch \ | ||
37 | " | 27 | " |
38 | SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" | 28 | SRC_URI[md5sum] = "6aae5948df7efde626613d6a4b3cd9d4" |
39 | SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e" | 29 | SRC_URI[sha256sum] = "c6291385b8ed84f05890fe4197005daf7e7ee7b082c2e390fa114a9477a56042" |
40 | 30 | ||
41 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" | 31 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" |
42 | UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/" | 32 | UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/" |