diff options
7 files changed, 180 insertions, 198 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 index b05eea56f..b14b76128 100644 --- 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 | |||
@@ -11,13 +11,13 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> | |||
11 | snmplib/transports/snmpUDPIPv6Domain.c | 21 +++++++++++++++++++++ | 11 | snmplib/transports/snmpUDPIPv6Domain.c | 21 +++++++++++++++++++++ |
12 | 1 file changed, 21 insertions(+) | 12 | 1 file changed, 21 insertions(+) |
13 | 13 | ||
14 | diff --git a/snmplib/transports/snmpUDPIPv6Domain.c b/snmplib/transports/snmpUDPIPv6Domain.c | 14 | Index: net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c |
15 | index 55e3610..aca69ae 100644 | 15 | =================================================================== |
16 | --- a/snmplib/transports/snmpUDPIPv6Domain.c | 16 | --- net-snmp-5.7.3.orig/snmplib/transports/snmpUDPIPv6Domain.c |
17 | +++ b/snmplib/transports/snmpUDPIPv6Domain.c | 17 | +++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c |
18 | @@ -256,6 +256,27 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) | 18 | @@ -286,6 +286,27 @@ netsnmp_udp6_transport(struct sockaddr_i |
19 | t->data = NULL; | 19 | return NULL; |
20 | t->data_length = 0; | 20 | #endif /* NETSNMP_NO_LISTEN_SUPPORT */ |
21 | } else { | 21 | } else { |
22 | + char *client_socket = NULL; | 22 | + char *client_socket = NULL; |
23 | + /* | 23 | + /* |
@@ -43,6 +43,3 @@ index 55e3610..aca69ae 100644 | |||
43 | /* | 43 | /* |
44 | * This is a client session. Save the address in the | 44 | * This is a client session. Save the address in the |
45 | * transport-specific data pointer for later use by netsnmp_udp6_send. | 45 | * transport-specific data pointer for later use by netsnmp_udp6_send. |
46 | -- | ||
47 | 2.9.3 | ||
48 | |||
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 index 209a93c63..7314ab16a 100644 --- 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 | |||
@@ -32,11 +32,11 @@ not modify the Net-SNMP ABI. | |||
32 | testing/fulltests/unit-tests/T015int64_clib.c | 10 +- | 32 | testing/fulltests/unit-tests/T015int64_clib.c | 10 +- |
33 | 15 files changed, 274 insertions(+), 1071 deletions(-) | 33 | 15 files changed, 274 insertions(+), 1071 deletions(-) |
34 | 34 | ||
35 | diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.c b/agent/mibgroup/if-mib/ifXTable/ifXTable.c | 35 | Index: net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.c |
36 | index bb3e736..0c952ba 100644 | 36 | =================================================================== |
37 | --- a/agent/mibgroup/if-mib/ifXTable/ifXTable.c | 37 | --- net-snmp-5.7.3.orig/agent/mibgroup/if-mib/ifXTable/ifXTable.c |
38 | +++ b/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 the interface, | 39 | @@ -722,7 +722,7 @@ The total number of octets received on t |
40 | */ | 40 | */ |
41 | int | 41 | int |
42 | ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, | 42 | ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, |
@@ -45,7 +45,7 @@ index bb3e736..0c952ba 100644 | |||
45 | { | 45 | { |
46 | /** we should have a non-NULL pointer */ | 46 | /** we should have a non-NULL pointer */ |
47 | netsnmp_assert(NULL != ifHCInOctets_val_ptr); | 47 | netsnmp_assert(NULL != ifHCInOctets_val_ptr); |
48 | @@ -779,7 +779,7 @@ The number of packets, delivered by this sub-layer to a | 48 | @@ -779,7 +779,7 @@ The number of packets, delivered by this |
49 | */ | 49 | */ |
50 | int | 50 | int |
51 | ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | 51 | ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
@@ -54,7 +54,7 @@ index bb3e736..0c952ba 100644 | |||
54 | { | 54 | { |
55 | /** we should have a non-NULL pointer */ | 55 | /** we should have a non-NULL pointer */ |
56 | netsnmp_assert(NULL != ifHCInUcastPkts_val_ptr); | 56 | netsnmp_assert(NULL != ifHCInUcastPkts_val_ptr); |
57 | @@ -838,7 +838,7 @@ The number of packets, delivered by this sub-layer to a | 57 | @@ -838,7 +838,7 @@ The number of packets, delivered by this |
58 | */ | 58 | */ |
59 | int | 59 | int |
60 | ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | 60 | ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
@@ -63,7 +63,7 @@ index bb3e736..0c952ba 100644 | |||
63 | { | 63 | { |
64 | /** we should have a non-NULL pointer */ | 64 | /** we should have a non-NULL pointer */ |
65 | netsnmp_assert(NULL != ifHCInMulticastPkts_val_ptr); | 65 | netsnmp_assert(NULL != ifHCInMulticastPkts_val_ptr); |
66 | @@ -897,7 +897,7 @@ The number of packets, delivered by this sub-layer to a | 66 | @@ -897,7 +897,7 @@ The number of packets, delivered by this |
67 | */ | 67 | */ |
68 | int | 68 | int |
69 | ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | 69 | ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
@@ -72,7 +72,7 @@ index bb3e736..0c952ba 100644 | |||
72 | { | 72 | { |
73 | /** we should have a non-NULL pointer */ | 73 | /** we should have a non-NULL pointer */ |
74 | netsnmp_assert(NULL != ifHCInBroadcastPkts_val_ptr); | 74 | netsnmp_assert(NULL != ifHCInBroadcastPkts_val_ptr); |
75 | @@ -955,7 +955,7 @@ The total number of octets transmitted out of the | 75 | @@ -955,7 +955,7 @@ The total number of octets transmitted o |
76 | */ | 76 | */ |
77 | int | 77 | int |
78 | ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, | 78 | ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, |
@@ -81,7 +81,7 @@ index bb3e736..0c952ba 100644 | |||
81 | { | 81 | { |
82 | /** we should have a non-NULL pointer */ | 82 | /** we should have a non-NULL pointer */ |
83 | netsnmp_assert(NULL != ifHCOutOctets_val_ptr); | 83 | netsnmp_assert(NULL != ifHCOutOctets_val_ptr); |
84 | @@ -1013,7 +1013,7 @@ The total number of packets that higher-level protocols | 84 | @@ -1013,7 +1013,7 @@ The total number of packets that higher- |
85 | */ | 85 | */ |
86 | int | 86 | int |
87 | ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | 87 | ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
@@ -90,7 +90,7 @@ index bb3e736..0c952ba 100644 | |||
90 | { | 90 | { |
91 | /** we should have a non-NULL pointer */ | 91 | /** we should have a non-NULL pointer */ |
92 | netsnmp_assert(NULL != ifHCOutUcastPkts_val_ptr); | 92 | netsnmp_assert(NULL != ifHCOutUcastPkts_val_ptr); |
93 | @@ -1074,7 +1074,7 @@ The total number of packets that higher-level protocols | 93 | @@ -1074,7 +1074,7 @@ The total number of packets that higher- |
94 | */ | 94 | */ |
95 | int | 95 | int |
96 | ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | 96 | ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
@@ -99,7 +99,7 @@ index bb3e736..0c952ba 100644 | |||
99 | { | 99 | { |
100 | /** we should have a non-NULL pointer */ | 100 | /** we should have a non-NULL pointer */ |
101 | netsnmp_assert(NULL != ifHCOutMulticastPkts_val_ptr); | 101 | netsnmp_assert(NULL != ifHCOutMulticastPkts_val_ptr); |
102 | @@ -1134,7 +1134,7 @@ The total number of packets that higher-level protocols | 102 | @@ -1134,7 +1134,7 @@ The total number of packets that higher- |
103 | */ | 103 | */ |
104 | int | 104 | int |
105 | ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, | 105 | ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
@@ -108,11 +108,11 @@ index bb3e736..0c952ba 100644 | |||
108 | { | 108 | { |
109 | /** we should have a non-NULL pointer */ | 109 | /** we should have a non-NULL pointer */ |
110 | netsnmp_assert(NULL != ifHCOutBroadcastPkts_val_ptr); | 110 | netsnmp_assert(NULL != ifHCOutBroadcastPkts_val_ptr); |
111 | diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.h b/agent/mibgroup/if-mib/ifXTable/ifXTable.h | 111 | Index: net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable.h |
112 | index ba22f97..925af13 100644 | 112 | =================================================================== |
113 | --- a/agent/mibgroup/if-mib/ifXTable/ifXTable.h | 113 | --- net-snmp-5.7.3.orig/agent/mibgroup/if-mib/ifXTable/ifXTable.h |
114 | +++ b/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_data_access) | 115 | @@ -143,28 +143,28 @@ config_require(if-mib/ifXTable/ifXTable_ |
116 | u_long * | 116 | u_long * |
117 | ifOutBroadcastPkts_val_ptr); | 117 | ifOutBroadcastPkts_val_ptr); |
118 | int ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, | 118 | int ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, |
@@ -149,7 +149,7 @@ index ba22f97..925af13 100644 | |||
149 | ifHCOutBroadcastPkts_val_ptr); | 149 | ifHCOutBroadcastPkts_val_ptr); |
150 | int ifLinkUpDownTrapEnable_get(ifXTable_rowreq_ctx * | 150 | int ifLinkUpDownTrapEnable_get(ifXTable_rowreq_ctx * |
151 | rowreq_ctx, | 151 | rowreq_ctx, |
152 | @@ -284,86 +284,86 @@ config_require(if-mib/ifXTable/ifXTable_data_access) | 152 | @@ -284,86 +284,86 @@ config_require(if-mib/ifXTable/ifXTable_ |
153 | 153 | ||
154 | int ifHCInOctets_check_value(ifXTable_rowreq_ctx * | 154 | int ifHCInOctets_check_value(ifXTable_rowreq_ctx * |
155 | rowreq_ctx, | 155 | rowreq_ctx, |
@@ -252,11 +252,11 @@ index ba22f97..925af13 100644 | |||
252 | int ifHCOutBroadcastPkts_undo(ifXTable_rowreq_ctx * | 252 | int ifHCOutBroadcastPkts_undo(ifXTable_rowreq_ctx * |
253 | rowreq_ctx); | 253 | rowreq_ctx); |
254 | 254 | ||
255 | diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c b/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c | 255 | Index: net-snmp-5.7.3/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c |
256 | index 23b50d0..e561842 100644 | 256 | =================================================================== |
257 | --- a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c | 257 | --- net-snmp-5.7.3.orig/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c |
258 | +++ b/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 * rowreq_ctx, | 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 | 260 | * ifHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
261 | */ | 261 | */ |
262 | case COLUMN_IFHCINOCTETS: | 262 | case COLUMN_IFHCINOCTETS: |
@@ -345,11 +345,11 @@ index 23b50d0..e561842 100644 | |||
345 | break; | 345 | break; |
346 | 346 | ||
347 | /* | 347 | /* |
348 | diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_common.c b/agent/mibgroup/ip-mib/data_access/systemstats_common.c | 348 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/data_access/systemstats_common.c |
349 | index 29109bd..7434b3a 100644 | 349 | =================================================================== |
350 | --- a/agent/mibgroup/ip-mib/data_access/systemstats_common.c | 350 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/data_access/systemstats_common.c |
351 | +++ b/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_entry * entry) | 352 | @@ -264,7 +264,7 @@ _calculate_entries(netsnmp_systemstats_e |
353 | && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTFRAGCREATES] | 353 | && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTFRAGCREATES] |
354 | && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTDISCARDS]) { | 354 | && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTDISCARDS]) { |
355 | 355 | ||
@@ -358,11 +358,11 @@ index 29109bd..7434b3a 100644 | |||
358 | tmp = entry->stats.HCOutRequests; | 358 | tmp = entry->stats.HCOutRequests; |
359 | u64Incr(&tmp, &entry->stats.HCOutForwDatagrams); | 359 | u64Incr(&tmp, &entry->stats.HCOutForwDatagrams); |
360 | u64Incr(&tmp, &entry->stats.HCOutFragCreates); | 360 | u64Incr(&tmp, &entry->stats.HCOutFragCreates); |
361 | diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c | 361 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c |
362 | index db673dc..fec36b2 100644 | 362 | =================================================================== |
363 | --- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c | 363 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c |
364 | +++ b/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 received, including | 365 | @@ -270,7 +270,7 @@ The total number of input IP datagrams r |
366 | */ | 366 | */ |
367 | int | 367 | int |
368 | ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 368 | ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -371,7 +371,7 @@ index db673dc..fec36b2 100644 | |||
371 | { | 371 | { |
372 | /** we should have a non-NULL pointer */ | 372 | /** we should have a non-NULL pointer */ |
373 | netsnmp_assert(NULL != ipIfStatsHCInReceives_val_ptr); | 373 | netsnmp_assert(NULL != ipIfStatsHCInReceives_val_ptr); |
374 | @@ -395,7 +395,7 @@ The total number of octets received in input IP datagrams, | 374 | @@ -395,7 +395,7 @@ The total number of octets received in i |
375 | */ | 375 | */ |
376 | int | 376 | int |
377 | ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 377 | ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -380,7 +380,7 @@ index db673dc..fec36b2 100644 | |||
380 | { | 380 | { |
381 | /** we should have a non-NULL pointer */ | 381 | /** we should have a non-NULL pointer */ |
382 | netsnmp_assert(NULL != ipIfStatsHCInOctets_val_ptr); | 382 | netsnmp_assert(NULL != ipIfStatsHCInOctets_val_ptr); |
383 | @@ -862,7 +862,7 @@ The number of input datagrams for which this entity was not | 383 | @@ -862,7 +862,7 @@ The number of input datagrams for which |
384 | */ | 384 | */ |
385 | int | 385 | int |
386 | ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 386 | ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -389,7 +389,7 @@ index db673dc..fec36b2 100644 | |||
389 | { | 389 | { |
390 | /** we should have a non-NULL pointer */ | 390 | /** we should have a non-NULL pointer */ |
391 | netsnmp_assert(NULL != ipIfStatsHCInForwDatagrams_val_ptr); | 391 | netsnmp_assert(NULL != ipIfStatsHCInForwDatagrams_val_ptr); |
392 | @@ -1267,7 +1267,7 @@ The total number of datagrams successfully delivered to IP | 392 | @@ -1267,7 +1267,7 @@ The total number of datagrams successful |
393 | */ | 393 | */ |
394 | int | 394 | int |
395 | ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 395 | ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -398,7 +398,7 @@ index db673dc..fec36b2 100644 | |||
398 | { | 398 | { |
399 | /** we should have a non-NULL pointer */ | 399 | /** we should have a non-NULL pointer */ |
400 | netsnmp_assert(NULL != ipIfStatsHCInDelivers_val_ptr); | 400 | netsnmp_assert(NULL != ipIfStatsHCInDelivers_val_ptr); |
401 | @@ -1396,7 +1396,7 @@ The total number of IP datagrams that local IP user- | 401 | @@ -1396,7 +1396,7 @@ The total number of IP datagrams that lo |
402 | */ | 402 | */ |
403 | int | 403 | int |
404 | ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 404 | ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -407,7 +407,7 @@ index db673dc..fec36b2 100644 | |||
407 | { | 407 | { |
408 | /** we should have a non-NULL pointer */ | 408 | /** we should have a non-NULL pointer */ |
409 | netsnmp_assert(NULL != ipIfStatsHCOutRequests_val_ptr); | 409 | netsnmp_assert(NULL != ipIfStatsHCOutRequests_val_ptr); |
410 | @@ -1532,7 +1532,7 @@ The number of datagrams for which this entity was not their | 410 | @@ -1532,7 +1532,7 @@ The number of datagrams for which this e |
411 | */ | 411 | */ |
412 | int | 412 | int |
413 | ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 413 | ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -416,7 +416,7 @@ index db673dc..fec36b2 100644 | |||
416 | { | 416 | { |
417 | /** we should have a non-NULL pointer */ | 417 | /** we should have a non-NULL pointer */ |
418 | netsnmp_assert(NULL != ipIfStatsHCOutForwDatagrams_val_ptr); | 418 | netsnmp_assert(NULL != ipIfStatsHCOutForwDatagrams_val_ptr); |
419 | @@ -1999,7 +1999,7 @@ The total number of IP datagrams that this entity supplied | 419 | @@ -1999,7 +1999,7 @@ The total number of IP datagrams that th |
420 | */ | 420 | */ |
421 | int | 421 | int |
422 | ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 422 | ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -425,7 +425,7 @@ index db673dc..fec36b2 100644 | |||
425 | { | 425 | { |
426 | /** we should have a non-NULL pointer */ | 426 | /** we should have a non-NULL pointer */ |
427 | netsnmp_assert(NULL != ipIfStatsHCOutTransmits_val_ptr); | 427 | netsnmp_assert(NULL != ipIfStatsHCOutTransmits_val_ptr); |
428 | @@ -2123,7 +2123,7 @@ The total number of octets in IP datagrams delivered to the | 428 | @@ -2123,7 +2123,7 @@ The total number of octets in IP datagra |
429 | */ | 429 | */ |
430 | int | 430 | int |
431 | ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 431 | ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -434,7 +434,7 @@ index db673dc..fec36b2 100644 | |||
434 | { | 434 | { |
435 | /** we should have a non-NULL pointer */ | 435 | /** we should have a non-NULL pointer */ |
436 | netsnmp_assert(NULL != ipIfStatsHCOutOctets_val_ptr); | 436 | netsnmp_assert(NULL != ipIfStatsHCOutOctets_val_ptr); |
437 | @@ -2245,7 +2245,7 @@ The number of IP multicast datagrams received. This object | 437 | @@ -2245,7 +2245,7 @@ The number of IP multicast datagrams rec |
438 | */ | 438 | */ |
439 | int | 439 | int |
440 | ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 440 | ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -443,7 +443,7 @@ index db673dc..fec36b2 100644 | |||
443 | { | 443 | { |
444 | /** we should have a non-NULL pointer */ | 444 | /** we should have a non-NULL pointer */ |
445 | netsnmp_assert(NULL != ipIfStatsHCInMcastPkts_val_ptr); | 445 | netsnmp_assert(NULL != ipIfStatsHCInMcastPkts_val_ptr); |
446 | @@ -2372,7 +2372,7 @@ The total number of octets received in IP multicast | 446 | @@ -2372,7 +2372,7 @@ The total number of octets received in I |
447 | */ | 447 | */ |
448 | int | 448 | int |
449 | ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 449 | ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -452,7 +452,7 @@ index db673dc..fec36b2 100644 | |||
452 | { | 452 | { |
453 | /** we should have a non-NULL pointer */ | 453 | /** we should have a non-NULL pointer */ |
454 | netsnmp_assert(NULL != ipIfStatsHCInMcastOctets_val_ptr); | 454 | netsnmp_assert(NULL != ipIfStatsHCInMcastOctets_val_ptr); |
455 | @@ -2497,7 +2497,7 @@ The number of IP multicast datagrams transmitted. This | 455 | @@ -2497,7 +2497,7 @@ The number of IP multicast datagrams tra |
456 | */ | 456 | */ |
457 | int | 457 | int |
458 | ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 458 | ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -461,7 +461,7 @@ index db673dc..fec36b2 100644 | |||
461 | { | 461 | { |
462 | /** we should have a non-NULL pointer */ | 462 | /** we should have a non-NULL pointer */ |
463 | netsnmp_assert(NULL != ipIfStatsHCOutMcastPkts_val_ptr); | 463 | netsnmp_assert(NULL != ipIfStatsHCOutMcastPkts_val_ptr); |
464 | @@ -2621,7 +2621,7 @@ The total number of octets transmitted in IP multicast | 464 | @@ -2621,7 +2621,7 @@ The total number of octets transmitted i |
465 | */ | 465 | */ |
466 | int | 466 | int |
467 | ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 467 | ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -470,7 +470,7 @@ index db673dc..fec36b2 100644 | |||
470 | { | 470 | { |
471 | /** we should have a non-NULL pointer */ | 471 | /** we should have a non-NULL pointer */ |
472 | netsnmp_assert(NULL != ipIfStatsHCOutMcastOctets_val_ptr); | 472 | netsnmp_assert(NULL != ipIfStatsHCOutMcastOctets_val_ptr); |
473 | @@ -2743,7 +2743,7 @@ The number of IP broadcast datagrams received. This object | 473 | @@ -2743,7 +2743,7 @@ The number of IP broadcast datagrams rec |
474 | */ | 474 | */ |
475 | int | 475 | int |
476 | ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 476 | ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -479,7 +479,7 @@ index db673dc..fec36b2 100644 | |||
479 | { | 479 | { |
480 | /** we should have a non-NULL pointer */ | 480 | /** we should have a non-NULL pointer */ |
481 | netsnmp_assert(NULL != ipIfStatsHCInBcastPkts_val_ptr); | 481 | netsnmp_assert(NULL != ipIfStatsHCInBcastPkts_val_ptr); |
482 | @@ -2865,7 +2865,7 @@ The number of IP broadcast datagrams transmitted. This | 482 | @@ -2865,7 +2865,7 @@ The number of IP broadcast datagrams tra |
483 | */ | 483 | */ |
484 | int | 484 | int |
485 | ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 485 | ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -488,10 +488,10 @@ index db673dc..fec36b2 100644 | |||
488 | { | 488 | { |
489 | /** we should have a non-NULL pointer */ | 489 | /** we should have a non-NULL pointer */ |
490 | netsnmp_assert(NULL != ipIfStatsHCOutBcastPkts_val_ptr); | 490 | netsnmp_assert(NULL != ipIfStatsHCOutBcastPkts_val_ptr); |
491 | diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h | 491 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h |
492 | index 0cc7e47..ad5d8a0 100644 | 492 | =================================================================== |
493 | --- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h | 493 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h |
494 | +++ b/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" { | 495 | @@ -50,7 +50,7 @@ extern "C" { |
496 | ipIfStatsInReceives_val_ptr); | 496 | ipIfStatsInReceives_val_ptr); |
497 | int ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * | 497 | int ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * |
@@ -618,11 +618,11 @@ index 0cc7e47..ad5d8a0 100644 | |||
618 | ipIfStatsHCOutBcastPkts_val_ptr); | 618 | ipIfStatsHCOutBcastPkts_val_ptr); |
619 | int | 619 | int |
620 | ipIfStatsDiscontinuityTime_get(ipIfStatsTable_rowreq_ctx * | 620 | ipIfStatsDiscontinuityTime_get(ipIfStatsTable_rowreq_ctx * |
621 | diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c | 621 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c |
622 | index 559d1c1..4955a8b 100644 | 622 | =================================================================== |
623 | --- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c | 623 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c |
624 | +++ b/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(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 625 | @@ -722,10 +722,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
626 | * ipIfStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 626 | * ipIfStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
627 | */ | 627 | */ |
628 | case COLUMN_IPIFSTATSHCINRECEIVES: | 628 | case COLUMN_IPIFSTATSHCINRECEIVES: |
@@ -635,7 +635,7 @@ index 559d1c1..4955a8b 100644 | |||
635 | break; | 635 | break; |
636 | 636 | ||
637 | /* | 637 | /* |
638 | @@ -741,9 +741,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 638 | @@ -741,9 +741,9 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
639 | * ipIfStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 639 | * ipIfStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
640 | */ | 640 | */ |
641 | case COLUMN_IPIFSTATSHCINOCTETS: | 641 | case COLUMN_IPIFSTATSHCINOCTETS: |
@@ -647,7 +647,7 @@ index 559d1c1..4955a8b 100644 | |||
647 | break; | 647 | break; |
648 | 648 | ||
649 | /* | 649 | /* |
650 | @@ -810,10 +810,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 650 | @@ -810,10 +810,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
651 | * ipIfStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 651 | * ipIfStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
652 | */ | 652 | */ |
653 | case COLUMN_IPIFSTATSHCINFORWDATAGRAMS: | 653 | case COLUMN_IPIFSTATSHCINFORWDATAGRAMS: |
@@ -660,7 +660,7 @@ index 559d1c1..4955a8b 100644 | |||
660 | break; | 660 | break; |
661 | 661 | ||
662 | /* | 662 | /* |
663 | @@ -869,10 +869,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 663 | @@ -869,10 +869,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
664 | * ipIfStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 664 | * ipIfStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
665 | */ | 665 | */ |
666 | case COLUMN_IPIFSTATSHCINDELIVERS: | 666 | case COLUMN_IPIFSTATSHCINDELIVERS: |
@@ -673,7 +673,7 @@ index 559d1c1..4955a8b 100644 | |||
673 | break; | 673 | break; |
674 | 674 | ||
675 | /* | 675 | /* |
676 | @@ -889,10 +889,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 676 | @@ -889,10 +889,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
677 | * ipIfStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 677 | * ipIfStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
678 | */ | 678 | */ |
679 | case COLUMN_IPIFSTATSHCOUTREQUESTS: | 679 | case COLUMN_IPIFSTATSHCOUTREQUESTS: |
@@ -686,7 +686,7 @@ index 559d1c1..4955a8b 100644 | |||
686 | break; | 686 | break; |
687 | 687 | ||
688 | /* | 688 | /* |
689 | @@ -909,10 +909,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 689 | @@ -909,10 +909,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
690 | * ipIfStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 690 | * ipIfStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
691 | */ | 691 | */ |
692 | case COLUMN_IPIFSTATSHCOUTFORWDATAGRAMS: | 692 | case COLUMN_IPIFSTATSHCOUTFORWDATAGRAMS: |
@@ -699,7 +699,7 @@ index 559d1c1..4955a8b 100644 | |||
699 | break; | 699 | break; |
700 | 700 | ||
701 | /* | 701 | /* |
702 | @@ -979,10 +979,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 702 | @@ -979,10 +979,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
703 | * ipIfStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 703 | * ipIfStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
704 | */ | 704 | */ |
705 | case COLUMN_IPIFSTATSHCOUTTRANSMITS: | 705 | case COLUMN_IPIFSTATSHCOUTTRANSMITS: |
@@ -712,7 +712,7 @@ index 559d1c1..4955a8b 100644 | |||
712 | break; | 712 | break; |
713 | 713 | ||
714 | /* | 714 | /* |
715 | @@ -999,9 +999,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 715 | @@ -999,9 +999,9 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
716 | * ipIfStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 716 | * ipIfStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
717 | */ | 717 | */ |
718 | case COLUMN_IPIFSTATSHCOUTOCTETS: | 718 | case COLUMN_IPIFSTATSHCOUTOCTETS: |
@@ -724,7 +724,7 @@ index 559d1c1..4955a8b 100644 | |||
724 | break; | 724 | break; |
725 | 725 | ||
726 | /* | 726 | /* |
727 | @@ -1018,10 +1018,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 727 | @@ -1018,10 +1018,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
728 | * ipIfStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 728 | * ipIfStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
729 | */ | 729 | */ |
730 | case COLUMN_IPIFSTATSHCINMCASTPKTS: | 730 | case COLUMN_IPIFSTATSHCINMCASTPKTS: |
@@ -737,7 +737,7 @@ index 559d1c1..4955a8b 100644 | |||
737 | break; | 737 | break; |
738 | 738 | ||
739 | /* | 739 | /* |
740 | @@ -1038,10 +1038,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 740 | @@ -1038,10 +1038,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
741 | * ipIfStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 741 | * ipIfStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
742 | */ | 742 | */ |
743 | case COLUMN_IPIFSTATSHCINMCASTOCTETS: | 743 | case COLUMN_IPIFSTATSHCINMCASTOCTETS: |
@@ -750,7 +750,7 @@ index 559d1c1..4955a8b 100644 | |||
750 | break; | 750 | break; |
751 | 751 | ||
752 | /* | 752 | /* |
753 | @@ -1058,10 +1058,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 753 | @@ -1058,10 +1058,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
754 | * ipIfStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 754 | * ipIfStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
755 | */ | 755 | */ |
756 | case COLUMN_IPIFSTATSHCOUTMCASTPKTS: | 756 | case COLUMN_IPIFSTATSHCOUTMCASTPKTS: |
@@ -763,7 +763,7 @@ index 559d1c1..4955a8b 100644 | |||
763 | break; | 763 | break; |
764 | 764 | ||
765 | /* | 765 | /* |
766 | @@ -1078,10 +1078,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 766 | @@ -1078,10 +1078,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
767 | * ipIfStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 767 | * ipIfStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
768 | */ | 768 | */ |
769 | case COLUMN_IPIFSTATSHCOUTMCASTOCTETS: | 769 | case COLUMN_IPIFSTATSHCOUTMCASTOCTETS: |
@@ -776,7 +776,7 @@ index 559d1c1..4955a8b 100644 | |||
776 | break; | 776 | break; |
777 | 777 | ||
778 | /* | 778 | /* |
779 | @@ -1098,10 +1098,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 779 | @@ -1098,10 +1098,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
780 | * ipIfStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 780 | * ipIfStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
781 | */ | 781 | */ |
782 | case COLUMN_IPIFSTATSHCINBCASTPKTS: | 782 | case COLUMN_IPIFSTATSHCINBCASTPKTS: |
@@ -789,7 +789,7 @@ index 559d1c1..4955a8b 100644 | |||
789 | break; | 789 | break; |
790 | 790 | ||
791 | /* | 791 | /* |
792 | @@ -1118,10 +1118,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, | 792 | @@ -1118,10 +1118,10 @@ _ipIfStatsTable_get_column(ipIfStatsTabl |
793 | * ipIfStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 793 | * ipIfStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
794 | */ | 794 | */ |
795 | case COLUMN_IPIFSTATSHCOUTBCASTPKTS: | 795 | case COLUMN_IPIFSTATSHCOUTBCASTPKTS: |
@@ -802,11 +802,11 @@ index 559d1c1..4955a8b 100644 | |||
802 | break; | 802 | break; |
803 | 803 | ||
804 | /* | 804 | /* |
805 | diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | 805 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c |
806 | index 10587e2..5a9323f 100644 | 806 | =================================================================== |
807 | --- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | 807 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c |
808 | +++ b/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 received, including | 809 | @@ -452,7 +452,7 @@ The total number of input IP datagrams r |
810 | */ | 810 | */ |
811 | int | 811 | int |
812 | ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 812 | ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -815,7 +815,7 @@ index 10587e2..5a9323f 100644 | |||
815 | { | 815 | { |
816 | /** we should have a non-NULL pointer */ | 816 | /** we should have a non-NULL pointer */ |
817 | netsnmp_assert(NULL != ipSystemStatsHCInReceives_val_ptr); | 817 | netsnmp_assert(NULL != ipSystemStatsHCInReceives_val_ptr); |
818 | @@ -579,7 +579,7 @@ The total number of octets received in input IP datagrams, | 818 | @@ -579,7 +579,7 @@ The total number of octets received in i |
819 | */ | 819 | */ |
820 | int | 820 | int |
821 | ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 821 | ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -824,7 +824,7 @@ index 10587e2..5a9323f 100644 | |||
824 | { | 824 | { |
825 | /** we should have a non-NULL pointer */ | 825 | /** we should have a non-NULL pointer */ |
826 | netsnmp_assert(NULL != ipSystemStatsHCInOctets_val_ptr); | 826 | netsnmp_assert(NULL != ipSystemStatsHCInOctets_val_ptr); |
827 | @@ -1058,7 +1058,7 @@ The number of input datagrams for which this entity was not | 827 | @@ -1058,7 +1058,7 @@ The number of input datagrams for which |
828 | int | 828 | int |
829 | ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | 829 | ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
830 | rowreq_ctx, | 830 | rowreq_ctx, |
@@ -833,7 +833,7 @@ index 10587e2..5a9323f 100644 | |||
833 | ipSystemStatsHCInForwDatagrams_val_ptr) | 833 | ipSystemStatsHCInForwDatagrams_val_ptr) |
834 | { | 834 | { |
835 | /** we should have a non-NULL pointer */ | 835 | /** we should have a non-NULL pointer */ |
836 | @@ -1474,7 +1474,7 @@ The total number of datagrams successfully delivered to IP | 836 | @@ -1474,7 +1474,7 @@ The total number of datagrams successful |
837 | */ | 837 | */ |
838 | int | 838 | int |
839 | ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 839 | ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -842,7 +842,7 @@ index 10587e2..5a9323f 100644 | |||
842 | { | 842 | { |
843 | /** we should have a non-NULL pointer */ | 843 | /** we should have a non-NULL pointer */ |
844 | netsnmp_assert(NULL != ipSystemStatsHCInDelivers_val_ptr); | 844 | netsnmp_assert(NULL != ipSystemStatsHCInDelivers_val_ptr); |
845 | @@ -1602,7 +1602,7 @@ The total number of IP datagrams which local IP user- | 845 | @@ -1602,7 +1602,7 @@ The total number of IP datagrams which l |
846 | */ | 846 | */ |
847 | int | 847 | int |
848 | ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 848 | ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -851,7 +851,7 @@ index 10587e2..5a9323f 100644 | |||
851 | { | 851 | { |
852 | /** we should have a non-NULL pointer */ | 852 | /** we should have a non-NULL pointer */ |
853 | netsnmp_assert(NULL != ipSystemStatsHCOutRequests_val_ptr); | 853 | netsnmp_assert(NULL != ipSystemStatsHCOutRequests_val_ptr); |
854 | @@ -1809,7 +1809,7 @@ The number of datagrams for which this entity was not their | 854 | @@ -1809,7 +1809,7 @@ The number of datagrams for which this e |
855 | int | 855 | int |
856 | ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * | 856 | ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
857 | rowreq_ctx, | 857 | rowreq_ctx, |
@@ -860,7 +860,7 @@ index 10587e2..5a9323f 100644 | |||
860 | ipSystemStatsHCOutForwDatagrams_val_ptr) | 860 | ipSystemStatsHCOutForwDatagrams_val_ptr) |
861 | { | 861 | { |
862 | /** we should have a non-NULL pointer */ | 862 | /** we should have a non-NULL pointer */ |
863 | @@ -2288,7 +2288,7 @@ The total number of IP datagrams that this entity supplied | 863 | @@ -2288,7 +2288,7 @@ The total number of IP datagrams that th |
864 | */ | 864 | */ |
865 | int | 865 | int |
866 | ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 866 | ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -869,7 +869,7 @@ index 10587e2..5a9323f 100644 | |||
869 | { | 869 | { |
870 | /** we should have a non-NULL pointer */ | 870 | /** we should have a non-NULL pointer */ |
871 | netsnmp_assert(NULL != ipSystemStatsHCOutTransmits_val_ptr); | 871 | netsnmp_assert(NULL != ipSystemStatsHCOutTransmits_val_ptr); |
872 | @@ -2415,7 +2415,7 @@ The total number of octets in IP datagrams delivered to the | 872 | @@ -2415,7 +2415,7 @@ The total number of octets in IP datagra |
873 | */ | 873 | */ |
874 | int | 874 | int |
875 | ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 875 | ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -878,7 +878,7 @@ index 10587e2..5a9323f 100644 | |||
878 | { | 878 | { |
879 | /** we should have a non-NULL pointer */ | 879 | /** we should have a non-NULL pointer */ |
880 | netsnmp_assert(NULL != ipSystemStatsHCOutOctets_val_ptr); | 880 | netsnmp_assert(NULL != ipSystemStatsHCOutOctets_val_ptr); |
881 | @@ -2539,7 +2539,7 @@ The number of IP multicast datagrams received. This object | 881 | @@ -2539,7 +2539,7 @@ The number of IP multicast datagrams rec |
882 | */ | 882 | */ |
883 | int | 883 | int |
884 | ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 884 | ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -887,7 +887,7 @@ index 10587e2..5a9323f 100644 | |||
887 | { | 887 | { |
888 | /** we should have a non-NULL pointer */ | 888 | /** we should have a non-NULL pointer */ |
889 | netsnmp_assert(NULL != ipSystemStatsHCInMcastPkts_val_ptr); | 889 | netsnmp_assert(NULL != ipSystemStatsHCInMcastPkts_val_ptr); |
890 | @@ -2665,7 +2665,7 @@ The total number of octets received in IP multicast | 890 | @@ -2665,7 +2665,7 @@ The total number of octets received in I |
891 | int | 891 | int |
892 | ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | 892 | ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
893 | rowreq_ctx, | 893 | rowreq_ctx, |
@@ -896,7 +896,7 @@ index 10587e2..5a9323f 100644 | |||
896 | ipSystemStatsHCInMcastOctets_val_ptr) | 896 | ipSystemStatsHCInMcastOctets_val_ptr) |
897 | { | 897 | { |
898 | /** we should have a non-NULL pointer */ | 898 | /** we should have a non-NULL pointer */ |
899 | @@ -2790,7 +2790,7 @@ The number of IP multicast datagrams transmitted. This | 899 | @@ -2790,7 +2790,7 @@ The number of IP multicast datagrams tra |
900 | */ | 900 | */ |
901 | int | 901 | int |
902 | ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 902 | ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -905,7 +905,7 @@ index 10587e2..5a9323f 100644 | |||
905 | { | 905 | { |
906 | /** we should have a non-NULL pointer */ | 906 | /** we should have a non-NULL pointer */ |
907 | netsnmp_assert(NULL != ipSystemStatsHCOutMcastPkts_val_ptr); | 907 | netsnmp_assert(NULL != ipSystemStatsHCOutMcastPkts_val_ptr); |
908 | @@ -2921,7 +2921,7 @@ The total number of octets transmitted in IP multicast | 908 | @@ -2921,7 +2921,7 @@ The total number of octets transmitted i |
909 | int | 909 | int |
910 | ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * | 910 | ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
911 | rowreq_ctx, | 911 | rowreq_ctx, |
@@ -914,7 +914,7 @@ index 10587e2..5a9323f 100644 | |||
914 | ipSystemStatsHCOutMcastOctets_val_ptr) | 914 | ipSystemStatsHCOutMcastOctets_val_ptr) |
915 | { | 915 | { |
916 | /** we should have a non-NULL pointer */ | 916 | /** we should have a non-NULL pointer */ |
917 | @@ -3046,7 +3046,7 @@ The number of IP broadcast datagrams received. This object | 917 | @@ -3046,7 +3046,7 @@ The number of IP broadcast datagrams rec |
918 | */ | 918 | */ |
919 | int | 919 | int |
920 | ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 920 | ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -923,7 +923,7 @@ index 10587e2..5a9323f 100644 | |||
923 | { | 923 | { |
924 | /** we should have a non-NULL pointer */ | 924 | /** we should have a non-NULL pointer */ |
925 | netsnmp_assert(NULL != ipSystemStatsHCInBcastPkts_val_ptr); | 925 | netsnmp_assert(NULL != ipSystemStatsHCInBcastPkts_val_ptr); |
926 | @@ -3170,7 +3170,7 @@ The number of IP broadcast datagrams transmitted. This | 926 | @@ -3170,7 +3170,7 @@ The number of IP broadcast datagrams tra |
927 | */ | 927 | */ |
928 | int | 928 | int |
929 | ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 929 | ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
@@ -932,11 +932,11 @@ index 10587e2..5a9323f 100644 | |||
932 | { | 932 | { |
933 | /** we should have a non-NULL pointer */ | 933 | /** we should have a non-NULL pointer */ |
934 | netsnmp_assert(NULL != ipSystemStatsHCOutBcastPkts_val_ptr); | 934 | netsnmp_assert(NULL != ipSystemStatsHCOutBcastPkts_val_ptr); |
935 | diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | 935 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h |
936 | index ca1e1f3..5c3823e 100644 | 936 | =================================================================== |
937 | --- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | 937 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h |
938 | +++ b/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/ipSystemStatsTable_data_access) | 939 | @@ -144,93 +144,22 @@ config_require(ip-mib/ipSystemStatsTable |
940 | ********************************************************************* | 940 | ********************************************************************* |
941 | * function prototypes | 941 | * function prototypes |
942 | */ | 942 | */ |
@@ -1034,7 +1034,7 @@ index ca1e1f3..5c3823e 100644 | |||
1034 | * ipSystemStatsTable_row_find_by_mib_index | 1034 | * ipSystemStatsTable_row_find_by_mib_index |
1035 | (ipSystemStatsTable_mib_index * mib_idx); | 1035 | (ipSystemStatsTable_mib_index * mib_idx); |
1036 | 1036 | ||
1037 | @@ -265,226 +194,50 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) | 1037 | @@ -265,226 +194,50 @@ config_require(ip-mib/ipSystemStatsTable |
1038 | * indexes | 1038 | * indexes |
1039 | */ | 1039 | */ |
1040 | 1040 | ||
@@ -1275,7 +1275,7 @@ index ca1e1f3..5c3823e 100644 | |||
1275 | rowreq_ctx, | 1275 | rowreq_ctx, |
1276 | u_long * | 1276 | u_long * |
1277 | ipSystemStatsReasmReqds_val_ptr); | 1277 | ipSystemStatsReasmReqds_val_ptr); |
1278 | @@ -492,690 +245,142 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) | 1278 | @@ -492,690 +245,142 @@ config_require(ip-mib/ipSystemStatsTable |
1279 | * rowreq_ctx, | 1279 | * rowreq_ctx, |
1280 | u_long * | 1280 | u_long * |
1281 | ipSystemStatsReasmOKs_val_ptr); | 1281 | ipSystemStatsReasmOKs_val_ptr); |
@@ -2011,11 +2011,11 @@ index ca1e1f3..5c3823e 100644 | |||
2011 | /* | 2011 | /* |
2012 | ********************************************************************* | 2012 | ********************************************************************* |
2013 | * SET function declarations | 2013 | * SET function declarations |
2014 | diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c | 2014 | Index: net-snmp-5.7.3/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c |
2015 | index e1ca2cb..09c061f 100644 | 2015 | =================================================================== |
2016 | --- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c | 2016 | --- net-snmp-5.7.3.orig/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c |
2017 | +++ b/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(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2018 | @@ -674,10 +674,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2019 | * ipSystemStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2019 | * ipSystemStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2020 | */ | 2020 | */ |
2021 | case COLUMN_IPSYSTEMSTATSHCINRECEIVES: | 2021 | case COLUMN_IPSYSTEMSTATSHCINRECEIVES: |
@@ -2028,7 +2028,7 @@ index e1ca2cb..09c061f 100644 | |||
2028 | break; | 2028 | break; |
2029 | 2029 | ||
2030 | /* | 2030 | /* |
2031 | @@ -694,10 +694,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2031 | @@ -694,10 +694,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2032 | * ipSystemStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2032 | * ipSystemStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2033 | */ | 2033 | */ |
2034 | case COLUMN_IPSYSTEMSTATSHCINOCTETS: | 2034 | case COLUMN_IPSYSTEMSTATSHCINOCTETS: |
@@ -2041,7 +2041,7 @@ index e1ca2cb..09c061f 100644 | |||
2041 | break; | 2041 | break; |
2042 | 2042 | ||
2043 | /* | 2043 | /* |
2044 | @@ -764,10 +764,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2044 | @@ -764,10 +764,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2045 | * ipSystemStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2045 | * ipSystemStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2046 | */ | 2046 | */ |
2047 | case COLUMN_IPSYSTEMSTATSHCINFORWDATAGRAMS: | 2047 | case COLUMN_IPSYSTEMSTATSHCINFORWDATAGRAMS: |
@@ -2054,7 +2054,7 @@ index e1ca2cb..09c061f 100644 | |||
2054 | break; | 2054 | break; |
2055 | 2055 | ||
2056 | /* | 2056 | /* |
2057 | @@ -824,10 +824,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2057 | @@ -824,10 +824,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2058 | * ipSystemStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2058 | * ipSystemStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2059 | */ | 2059 | */ |
2060 | case COLUMN_IPSYSTEMSTATSHCINDELIVERS: | 2060 | case COLUMN_IPSYSTEMSTATSHCINDELIVERS: |
@@ -2067,7 +2067,7 @@ index e1ca2cb..09c061f 100644 | |||
2067 | break; | 2067 | break; |
2068 | 2068 | ||
2069 | /* | 2069 | /* |
2070 | @@ -844,10 +844,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2070 | @@ -844,10 +844,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2071 | * ipSystemStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2071 | * ipSystemStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2072 | */ | 2072 | */ |
2073 | case COLUMN_IPSYSTEMSTATSHCOUTREQUESTS: | 2073 | case COLUMN_IPSYSTEMSTATSHCOUTREQUESTS: |
@@ -2080,7 +2080,7 @@ index e1ca2cb..09c061f 100644 | |||
2080 | break; | 2080 | break; |
2081 | 2081 | ||
2082 | /* | 2082 | /* |
2083 | @@ -874,10 +874,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2083 | @@ -874,10 +874,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2084 | * ipSystemStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2084 | * ipSystemStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2085 | */ | 2085 | */ |
2086 | case COLUMN_IPSYSTEMSTATSHCOUTFORWDATAGRAMS: | 2086 | case COLUMN_IPSYSTEMSTATSHCOUTFORWDATAGRAMS: |
@@ -2093,7 +2093,7 @@ index e1ca2cb..09c061f 100644 | |||
2093 | break; | 2093 | break; |
2094 | 2094 | ||
2095 | /* | 2095 | /* |
2096 | @@ -944,10 +944,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2096 | @@ -944,10 +944,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2097 | * ipSystemStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2097 | * ipSystemStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2098 | */ | 2098 | */ |
2099 | case COLUMN_IPSYSTEMSTATSHCOUTTRANSMITS: | 2099 | case COLUMN_IPSYSTEMSTATSHCOUTTRANSMITS: |
@@ -2106,7 +2106,7 @@ index e1ca2cb..09c061f 100644 | |||
2106 | break; | 2106 | break; |
2107 | 2107 | ||
2108 | /* | 2108 | /* |
2109 | @@ -964,10 +964,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2109 | @@ -964,10 +964,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2110 | * ipSystemStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2110 | * ipSystemStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2111 | */ | 2111 | */ |
2112 | case COLUMN_IPSYSTEMSTATSHCOUTOCTETS: | 2112 | case COLUMN_IPSYSTEMSTATSHCOUTOCTETS: |
@@ -2119,7 +2119,7 @@ index e1ca2cb..09c061f 100644 | |||
2119 | break; | 2119 | break; |
2120 | 2120 | ||
2121 | /* | 2121 | /* |
2122 | @@ -984,10 +984,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2122 | @@ -984,10 +984,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2123 | * ipSystemStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2123 | * ipSystemStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2124 | */ | 2124 | */ |
2125 | case COLUMN_IPSYSTEMSTATSHCINMCASTPKTS: | 2125 | case COLUMN_IPSYSTEMSTATSHCINMCASTPKTS: |
@@ -2132,7 +2132,7 @@ index e1ca2cb..09c061f 100644 | |||
2132 | break; | 2132 | break; |
2133 | 2133 | ||
2134 | /* | 2134 | /* |
2135 | @@ -1004,10 +1004,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2135 | @@ -1004,10 +1004,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2136 | * ipSystemStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2136 | * ipSystemStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2137 | */ | 2137 | */ |
2138 | case COLUMN_IPSYSTEMSTATSHCINMCASTOCTETS: | 2138 | case COLUMN_IPSYSTEMSTATSHCINMCASTOCTETS: |
@@ -2145,7 +2145,7 @@ index e1ca2cb..09c061f 100644 | |||
2145 | break; | 2145 | break; |
2146 | 2146 | ||
2147 | /* | 2147 | /* |
2148 | @@ -1024,10 +1024,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2148 | @@ -1024,10 +1024,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2149 | * ipSystemStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2149 | * ipSystemStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2150 | */ | 2150 | */ |
2151 | case COLUMN_IPSYSTEMSTATSHCOUTMCASTPKTS: | 2151 | case COLUMN_IPSYSTEMSTATSHCOUTMCASTPKTS: |
@@ -2158,7 +2158,7 @@ index e1ca2cb..09c061f 100644 | |||
2158 | break; | 2158 | break; |
2159 | 2159 | ||
2160 | /* | 2160 | /* |
2161 | @@ -1044,10 +1044,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2161 | @@ -1044,10 +1044,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2162 | * ipSystemStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2162 | * ipSystemStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2163 | */ | 2163 | */ |
2164 | case COLUMN_IPSYSTEMSTATSHCOUTMCASTOCTETS: | 2164 | case COLUMN_IPSYSTEMSTATSHCOUTMCASTOCTETS: |
@@ -2171,7 +2171,7 @@ index e1ca2cb..09c061f 100644 | |||
2171 | break; | 2171 | break; |
2172 | 2172 | ||
2173 | /* | 2173 | /* |
2174 | @@ -1064,10 +1064,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2174 | @@ -1064,10 +1064,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2175 | * ipSystemStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2175 | * ipSystemStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2176 | */ | 2176 | */ |
2177 | case COLUMN_IPSYSTEMSTATSHCINBCASTPKTS: | 2177 | case COLUMN_IPSYSTEMSTATSHCINBCASTPKTS: |
@@ -2184,7 +2184,7 @@ index e1ca2cb..09c061f 100644 | |||
2184 | break; | 2184 | break; |
2185 | 2185 | ||
2186 | /* | 2186 | /* |
2187 | @@ -1084,10 +1084,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, | 2187 | @@ -1084,10 +1084,10 @@ _ipSystemStatsTable_get_column(ipSystemS |
2188 | * ipSystemStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h | 2188 | * ipSystemStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
2189 | */ | 2189 | */ |
2190 | case COLUMN_IPSYSTEMSTATSHCOUTBCASTPKTS: | 2190 | case COLUMN_IPSYSTEMSTATSHCOUTBCASTPKTS: |
@@ -2197,10 +2197,10 @@ index e1ca2cb..09c061f 100644 | |||
2197 | break; | 2197 | break; |
2198 | 2198 | ||
2199 | /* | 2199 | /* |
2200 | diff --git a/include/net-snmp/data_access/ipstats.h b/include/net-snmp/data_access/ipstats.h | 2200 | Index: net-snmp-5.7.3/include/net-snmp/data_access/ipstats.h |
2201 | index f782459..f0df46b 100644 | 2201 | =================================================================== |
2202 | --- a/include/net-snmp/data_access/ipstats.h | 2202 | --- net-snmp-5.7.3.orig/include/net-snmp/data_access/ipstats.h |
2203 | +++ b/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 { | 2204 | @@ -58,45 +58,45 @@ typedef struct netsnmp_ipstats_s { |
2205 | * other columns, when underlying OS does not provide them. | 2205 | * other columns, when underlying OS does not provide them. |
2206 | * Always fill at least 32 bits, the table is periodically polled -> 32 bit | 2206 | * Always fill at least 32 bits, the table is periodically polled -> 32 bit |
@@ -2268,10 +2268,10 @@ index f782459..f0df46b 100644 | |||
2268 | 2268 | ||
2269 | /* Array of available columns.*/ | 2269 | /* Array of available columns.*/ |
2270 | int columnAvail[IPSYSTEMSTATSTABLE_LAST+1]; | 2270 | int columnAvail[IPSYSTEMSTATSTABLE_LAST+1]; |
2271 | diff --git a/include/net-snmp/library/int64.h b/include/net-snmp/library/int64.h | 2271 | Index: net-snmp-5.7.3/include/net-snmp/library/int64.h |
2272 | index 9c7c894..3a85213 100644 | 2272 | =================================================================== |
2273 | --- a/include/net-snmp/library/int64.h | 2273 | --- net-snmp-5.7.3.orig/include/net-snmp/library/int64.h |
2274 | +++ b/include/net-snmp/library/int64.h | 2274 | +++ net-snmp-5.7.3/include/net-snmp/library/int64.h |
2275 | @@ -5,31 +5,29 @@ | 2275 | @@ -5,31 +5,29 @@ |
2276 | extern "C" { | 2276 | extern "C" { |
2277 | #endif | 2277 | #endif |
@@ -2320,10 +2320,10 @@ index 9c7c894..3a85213 100644 | |||
2320 | int adjust); | 2320 | int adjust); |
2321 | NETSNMP_IMPORT | 2321 | NETSNMP_IMPORT |
2322 | int netsnmp_c64_check32_and_update(struct counter64 *prev_val, | 2322 | int netsnmp_c64_check32_and_update(struct counter64 *prev_val, |
2323 | diff --git a/snmplib/int64.c b/snmplib/int64.c | 2323 | Index: net-snmp-5.7.3/snmplib/int64.c |
2324 | index 51f1f32..951f813 100644 | 2324 | =================================================================== |
2325 | --- a/snmplib/int64.c | 2325 | --- net-snmp-5.7.3.orig/snmplib/int64.c |
2326 | +++ b/snmplib/int64.c | 2326 | +++ net-snmp-5.7.3/snmplib/int64.c |
2327 | @@ -33,7 +33,7 @@ | 2327 | @@ -33,7 +33,7 @@ |
2328 | * @param[out] puR Remainder. | 2328 | * @param[out] puR Remainder. |
2329 | */ | 2329 | */ |
@@ -2333,7 +2333,7 @@ index 51f1f32..951f813 100644 | |||
2333 | { | 2333 | { |
2334 | unsigned long ulT; | 2334 | unsigned long ulT; |
2335 | unsigned long ulQ; | 2335 | unsigned long ulQ; |
2336 | @@ -83,7 +83,7 @@ divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) | 2336 | @@ -83,7 +83,7 @@ divBy10(U64 u64, U64 * pu64Q, unsigned i |
2337 | * @param[out] pu64P Product. | 2337 | * @param[out] pu64P Product. |
2338 | */ | 2338 | */ |
2339 | void | 2339 | void |
@@ -2369,7 +2369,7 @@ index 51f1f32..951f813 100644 | |||
2369 | { | 2369 | { |
2370 | int carry; | 2370 | int carry; |
2371 | 2371 | ||
2372 | @@ -177,7 +177,7 @@ u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) | 2372 | @@ -177,7 +177,7 @@ u64Subtract(const U64 * pu64one, const U |
2373 | * @param[in,out] pu64out pu64out += pu64one. | 2373 | * @param[in,out] pu64out pu64out += pu64one. |
2374 | */ | 2374 | */ |
2375 | void | 2375 | void |
@@ -2378,7 +2378,7 @@ index 51f1f32..951f813 100644 | |||
2378 | { | 2378 | { |
2379 | pu64out->high = (uint32_t)(pu64out->high + pu64one->high); | 2379 | pu64out->high = (uint32_t)(pu64out->high + pu64one->high); |
2380 | incrByU32(pu64out, pu64one->low); | 2380 | incrByU32(pu64out, pu64one->low); |
2381 | @@ -191,9 +191,9 @@ u64Incr(U64 * pu64out, const U64 * pu64one) | 2381 | @@ -191,9 +191,9 @@ u64Incr(U64 * pu64out, const U64 * pu64o |
2382 | * @param[out] pu64out pu64out += (pu64one - pu64two) | 2382 | * @param[out] pu64out pu64out += (pu64one - pu64two) |
2383 | */ | 2383 | */ |
2384 | void | 2384 | void |
@@ -2390,7 +2390,7 @@ index 51f1f32..951f813 100644 | |||
2390 | 2390 | ||
2391 | u64Subtract(pu64one, pu64two, &tmp); | 2391 | u64Subtract(pu64one, pu64two, &tmp); |
2392 | u64Incr(pu64out, &tmp); | 2392 | u64Incr(pu64out, &tmp); |
2393 | @@ -208,7 +208,7 @@ netsnmp_feature_child_of(u64copy, netsnmp_unused) | 2393 | @@ -208,7 +208,7 @@ netsnmp_feature_child_of(u64copy, netsnm |
2394 | * @param[out] pu64one Where to store the copy - *pu64one = *pu64two. | 2394 | * @param[out] pu64one Where to store the copy - *pu64one = *pu64two. |
2395 | */ | 2395 | */ |
2396 | void | 2396 | void |
@@ -2399,7 +2399,7 @@ index 51f1f32..951f813 100644 | |||
2399 | { | 2399 | { |
2400 | *pu64one = *pu64two; | 2400 | *pu64one = *pu64two; |
2401 | } | 2401 | } |
2402 | @@ -220,7 +220,7 @@ u64Copy(U64 * pu64one, const U64 * pu64two) | 2402 | @@ -220,7 +220,7 @@ u64Copy(U64 * pu64one, const U64 * pu64t |
2403 | * @param[in] pu64 Number to be zeroed. | 2403 | * @param[in] pu64 Number to be zeroed. |
2404 | */ | 2404 | */ |
2405 | void | 2405 | void |
@@ -2417,7 +2417,7 @@ index 51f1f32..951f813 100644 | |||
2417 | { | 2417 | { |
2418 | return pu64->low == 0 && pu64->high == 0; | 2418 | return pu64->low == 0 && pu64->high == 0; |
2419 | } | 2419 | } |
2420 | @@ -390,10 +390,10 @@ netsnmp_c64_check32_and_update(struct counter64 *prev_val, struct counter64 *new | 2420 | @@ -390,10 +390,10 @@ netsnmp_c64_check32_and_update(struct co |
2421 | /** Convert an unsigned 64-bit number to ASCII. */ | 2421 | /** Convert an unsigned 64-bit number to ASCII. */ |
2422 | void | 2422 | void |
2423 | printU64(char *buf, /* char [I64CHARSZ+1]; */ | 2423 | printU64(char *buf, /* char [I64CHARSZ+1]; */ |
@@ -2431,7 +2431,7 @@ index 51f1f32..951f813 100644 | |||
2431 | 2431 | ||
2432 | char aRes[I64CHARSZ + 1]; | 2432 | char aRes[I64CHARSZ + 1]; |
2433 | unsigned int u; | 2433 | unsigned int u; |
2434 | @@ -414,9 +414,9 @@ printU64(char *buf, /* char [I64CHARSZ+1]; */ | 2434 | @@ -414,9 +414,9 @@ printU64(char *buf, /* char [I64CHARSZ+1 |
2435 | /** Convert a signed 64-bit number to ASCII. */ | 2435 | /** Convert a signed 64-bit number to ASCII. */ |
2436 | void | 2436 | void |
2437 | printI64(char *buf, /* char [I64CHARSZ+1]; */ | 2437 | printI64(char *buf, /* char [I64CHARSZ+1]; */ |
@@ -2443,7 +2443,7 @@ index 51f1f32..951f813 100644 | |||
2443 | 2443 | ||
2444 | if (pu64->high & 0x80000000) { | 2444 | if (pu64->high & 0x80000000) { |
2445 | u64a.high = (uint32_t) ~pu64->high; | 2445 | u64a.high = (uint32_t) ~pu64->high; |
2446 | @@ -429,11 +429,11 @@ printI64(char *buf, /* char [I64CHARSZ+1]; */ | 2446 | @@ -429,11 +429,11 @@ printI64(char *buf, /* char [I64CHARSZ+1 |
2447 | } | 2447 | } |
2448 | } | 2448 | } |
2449 | 2449 | ||
@@ -2458,11 +2458,11 @@ index 51f1f32..951f813 100644 | |||
2458 | unsigned int u; | 2458 | unsigned int u; |
2459 | int sign = 0; | 2459 | int sign = 0; |
2460 | int ok = 0; | 2460 | int ok = 0; |
2461 | diff --git a/snmplib/read_config.c b/snmplib/read_config.c | 2461 | Index: net-snmp-5.7.3/snmplib/read_config.c |
2462 | index e159c27..ab5b6a3 100644 | 2462 | =================================================================== |
2463 | --- a/snmplib/read_config.c | 2463 | --- net-snmp-5.7.3.orig/snmplib/read_config.c |
2464 | +++ b/snmplib/read_config.c | 2464 | +++ net-snmp-5.7.3/snmplib/read_config.c |
2465 | @@ -2279,10 +2279,10 @@ read_config_read_memory(int type, char *readfrom, | 2465 | @@ -2270,10 +2270,10 @@ read_config_read_memory(int type, char * |
2466 | return readfrom; | 2466 | return readfrom; |
2467 | 2467 | ||
2468 | case ASN_COUNTER64: | 2468 | case ASN_COUNTER64: |
@@ -2476,10 +2476,10 @@ index e159c27..ab5b6a3 100644 | |||
2476 | readfrom = skip_token(readfrom); | 2476 | readfrom = skip_token(readfrom); |
2477 | return readfrom; | 2477 | return readfrom; |
2478 | } | 2478 | } |
2479 | diff --git a/testing/fulltests/unit-tests/T015int64_clib.c b/testing/fulltests/unit-tests/T015int64_clib.c | 2479 | Index: net-snmp-5.7.3/testing/fulltests/unit-tests/T015int64_clib.c |
2480 | index 5f5f4b6..66f66b7 100644 | 2480 | =================================================================== |
2481 | --- a/testing/fulltests/unit-tests/T015int64_clib.c | 2481 | --- net-snmp-5.7.3.orig/testing/fulltests/unit-tests/T015int64_clib.c |
2482 | +++ b/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 @@ | 2483 | @@ -1,4 +1,4 @@ |
2484 | -/* HEADER Testing 64-bit integer operations (U64). */ | 2484 | -/* HEADER Testing 64-bit integer operations (U64). */ |
2485 | +/* HEADER Testing 64-bit integer operations (struct counter64). */ | 2485 | +/* HEADER Testing 64-bit integer operations (struct counter64). */ |
@@ -2495,7 +2495,7 @@ index 5f5f4b6..66f66b7 100644 | |||
2495 | a.low = (uint32_t)intval[i]; | 2495 | a.low = (uint32_t)intval[i]; |
2496 | a.high = (uint32_t)(intval[i] >> 32); | 2496 | a.high = (uint32_t)(intval[i] >> 32); |
2497 | printI64(buf, &a); | 2497 | printI64(buf, &a); |
2498 | @@ -27,7 +27,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { | 2498 | @@ -27,7 +27,7 @@ for (i = 0; i < sizeof(intval)/sizeof(in |
2499 | 2499 | ||
2500 | for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { | 2500 | for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { |
2501 | for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { | 2501 | for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { |
@@ -2504,7 +2504,7 @@ index 5f5f4b6..66f66b7 100644 | |||
2504 | uint64_t d; | 2504 | uint64_t d; |
2505 | a.low = (uint32_t)intval[i]; | 2505 | a.low = (uint32_t)intval[i]; |
2506 | a.high = (uint32_t)(intval[i] >> 32); | 2506 | a.high = (uint32_t)(intval[i] >> 32); |
2507 | @@ -43,7 +43,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { | 2507 | @@ -43,7 +43,7 @@ for (i = 0; i < sizeof(intval)/sizeof(in |
2508 | 2508 | ||
2509 | for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { | 2509 | for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { |
2510 | for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { | 2510 | for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { |
@@ -2513,7 +2513,7 @@ index 5f5f4b6..66f66b7 100644 | |||
2513 | uint64_t d; | 2513 | uint64_t d; |
2514 | a.low = (uint32_t)intval[i]; | 2514 | a.low = (uint32_t)intval[i]; |
2515 | a.high = (uint32_t)(intval[i] >> 32); | 2515 | a.high = (uint32_t)(intval[i] >> 32); |
2516 | @@ -58,7 +58,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { | 2516 | @@ -58,7 +58,7 @@ for (i = 0; i < sizeof(intval)/sizeof(in |
2517 | } | 2517 | } |
2518 | 2518 | ||
2519 | { | 2519 | { |
@@ -2522,6 +2522,3 @@ index 5f5f4b6..66f66b7 100644 | |||
2522 | old_val.low = 7; | 2522 | old_val.low = 7; |
2523 | old_val.high = 0; | 2523 | old_val.high = 0; |
2524 | new_val = old_val; | 2524 | new_val = old_val; |
2525 | -- | ||
2526 | 2.7.4 | ||
2527 | |||
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 c6401fed3..44359bebe 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 | |||
@@ -17,11 +17,11 @@ Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | |||
17 | configure.d/config_os_headers | 4 ++-- | 17 | configure.d/config_os_headers | 4 ++-- |
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | 18 | 1 file changed, 2 insertions(+), 2 deletions(-) |
19 | 19 | ||
20 | diff --git a/configure.d/config_os_headers b/configure.d/config_os_headers | 20 | Index: net-snmp-5.7.3/configure.d/config_os_headers |
21 | index 708aa09..0df32ca 100644 | 21 | =================================================================== |
22 | --- a/configure.d/config_os_headers | 22 | --- net-snmp-5.7.3.orig/configure.d/config_os_headers |
23 | +++ b/configure.d/config_os_headers | 23 | +++ net-snmp-5.7.3/configure.d/config_os_headers |
24 | @@ -482,8 +482,8 @@ then | 24 | @@ -484,8 +484,8 @@ then |
25 | unset ac_cv_header_pkg_h | 25 | unset ac_cv_header_pkg_h |
26 | netsnmp_save_CPPFLAGS="$CPPFLAGS" | 26 | netsnmp_save_CPPFLAGS="$CPPFLAGS" |
27 | netsnmp_save_LDFLAGS="$LDFLAGS" | 27 | netsnmp_save_LDFLAGS="$LDFLAGS" |
@@ -32,6 +32,3 @@ index 708aa09..0df32ca 100644 | |||
32 | AC_CHECK_HEADERS(pkg.h, | 32 | AC_CHECK_HEADERS(pkg.h, |
33 | NETSNMP_SEARCH_LIBS(pkg_init, pkg, | 33 | NETSNMP_SEARCH_LIBS(pkg_init, pkg, |
34 | AC_DEFINE(HAVE_LIBPKG, 1, [define if you have BSD pkg-ng]))) | 34 | AC_DEFINE(HAVE_LIBPKG, 1, [define if you have BSD pkg-ng]))) |
35 | -- | ||
36 | 1.8.4.2 | ||
37 | |||
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 index 6255f7ced..527aa39f2 100644 --- 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 | |||
@@ -12,11 +12,11 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> | |||
12 | snmplib/transports/snmpUDPIPv6Domain.c | 1 + | 12 | snmplib/transports/snmpUDPIPv6Domain.c | 1 + |
13 | 1 file changed, 1 insertion(+) | 13 | 1 file changed, 1 insertion(+) |
14 | 14 | ||
15 | diff --git a/snmplib/transports/snmpUDPIPv6Domain.c b/snmplib/transports/snmpUDPIPv6Domain.c | 15 | Index: net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c |
16 | index 029b164..11c39bb 100644 | 16 | =================================================================== |
17 | --- a/snmplib/transports/snmpUDPIPv6Domain.c | 17 | --- net-snmp-5.7.3.orig/snmplib/transports/snmpUDPIPv6Domain.c |
18 | +++ b/snmplib/transports/snmpUDPIPv6Domain.c | 18 | +++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c |
19 | @@ -285,6 +285,7 @@ netsnmp_udp6_transport(struct sockaddr_in6 *addr, int local) | 19 | @@ -305,6 +305,7 @@ netsnmp_udp6_transport(struct sockaddr_i |
20 | errno, strerror(errno))); | 20 | errno, strerror(errno))); |
21 | netsnmp_socketbase_close(t); | 21 | netsnmp_socketbase_close(t); |
22 | netsnmp_transport_free(t); | 22 | netsnmp_transport_free(t); |
@@ -24,6 +24,3 @@ index 029b164..11c39bb 100644 | |||
24 | } | 24 | } |
25 | } | 25 | } |
26 | /* | 26 | /* |
27 | -- | ||
28 | 2.9.3 | ||
29 | |||
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 a360c3a12..d29be3395 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 | |||
@@ -10,11 +10,11 @@ Upstream-Status: Inappropriate [cross compile specific] | |||
10 | 10 | ||
11 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | 11 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> |
12 | --- | 12 | --- |
13 | diff --git a/Makefile.top b/Makefile.top | 13 | Index: net-snmp-5.7.3/Makefile.top |
14 | index 862fb94..ed7dcfc 100644 | 14 | =================================================================== |
15 | --- a/Makefile.top | 15 | --- net-snmp-5.7.3.orig/Makefile.top |
16 | +++ b/Makefile.top | 16 | +++ net-snmp-5.7.3/Makefile.top |
17 | @@ -86,7 +86,7 @@ LIBREVISION = 2 | 17 | @@ -87,7 +87,7 @@ LIBREVISION = 3 |
18 | LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o | 18 | LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o |
19 | LIB_EXTENSION = la | 19 | LIB_EXTENSION = la |
20 | LIB_VERSION = | 20 | LIB_VERSION = |
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 efe803876..fbd274bba 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 | |||
@@ -12,11 +12,11 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> | |||
12 | snmplib/snmpv3.c | 4 ++-- | 12 | snmplib/snmpv3.c | 4 ++-- |
13 | 2 files changed, 3 insertions(+), 2 deletions(-) | 13 | 2 files changed, 3 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/agent/snmpd.c b/agent/snmpd.c | 15 | Index: net-snmp-5.7.3/agent/snmpd.c |
16 | index 056048a..12a7ea1 100644 | 16 | =================================================================== |
17 | --- a/agent/snmpd.c | 17 | --- net-snmp-5.7.3.orig/agent/snmpd.c |
18 | +++ b/agent/snmpd.c | 18 | +++ net-snmp-5.7.3/agent/snmpd.c |
19 | @@ -1246,6 +1246,7 @@ receive(void) | 19 | @@ -1253,6 +1253,7 @@ receive(void) |
20 | snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", | 20 | snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", |
21 | netsnmp_get_version()); | 21 | netsnmp_get_version()); |
22 | update_config(); | 22 | update_config(); |
@@ -24,11 +24,11 @@ index 056048a..12a7ea1 100644 | |||
24 | send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); | 24 | send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); |
25 | #if HAVE_SIGHOLD | 25 | #if HAVE_SIGHOLD |
26 | sigrelse(SIGHUP); | 26 | sigrelse(SIGHUP); |
27 | diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c | 27 | Index: net-snmp-5.7.3/snmplib/snmpv3.c |
28 | index 435cafd..6ad8208 100644 | 28 | =================================================================== |
29 | --- a/snmplib/snmpv3.c | 29 | --- net-snmp-5.7.3.orig/snmplib/snmpv3.c |
30 | +++ b/snmplib/snmpv3.c | 30 | +++ net-snmp-5.7.3/snmplib/snmpv3.c |
31 | @@ -984,9 +984,9 @@ init_snmpv3_post_config(int majorid, int minorid, void *serverarg, | 31 | @@ -984,9 +984,9 @@ init_snmpv3_post_config(int majorid, int |
32 | /* | 32 | /* |
33 | * if our engineID has changed at all, the boots record must be set to 1 | 33 | * if our engineID has changed at all, the boots record must be set to 1 |
34 | */ | 34 | */ |
@@ -40,6 +40,3 @@ index 435cafd..6ad8208 100644 | |||
40 | engineBoots = 1; | 40 | engineBoots = 1; |
41 | } | 41 | } |
42 | 42 | ||
43 | -- | ||
44 | 1.9.1 | ||
45 | |||
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 9fb19b3e0..8f8336a49 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 | |||
@@ -10,11 +10,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
10 | testing/RUNTESTS | 4 ++++ | 10 | testing/RUNTESTS | 4 ++++ |
11 | 1 files changed, 4 insertions(+), 0 deletions(-) | 11 | 1 files changed, 4 insertions(+), 0 deletions(-) |
12 | 12 | ||
13 | diff --git a/testing/RUNTESTS b/testing/RUNTESTS | 13 | Index: net-snmp-5.7.3/testing/RUNTESTS |
14 | index e11c969..fb90f76 100755 | 14 | =================================================================== |
15 | --- a/testing/RUNTESTS | 15 | --- net-snmp-5.7.3.orig/testing/RUNTESTS |
16 | +++ b/testing/RUNTESTS | 16 | +++ net-snmp-5.7.3/testing/RUNTESTS |
17 | @@ -25,13 +25,17 @@ failed_count=0 | 17 | @@ -29,13 +29,17 @@ failed_count=0 |
18 | rm -f failed_tests | 18 | rm -f failed_tests |
19 | for i in "${srcdir}"/testing/fulltests/default/T*$1*; do | 19 | for i in "${srcdir}"/testing/fulltests/default/T*$1*; do |
20 | echo "RUNNING $i" | 20 | echo "RUNNING $i" |
@@ -32,6 +32,3 @@ index e11c969..fb90f76 100755 | |||
32 | done | 32 | done |
33 | 33 | ||
34 | if [ -f failed_tests ]; then | 34 | if [ -f failed_tests ]; then |
35 | -- | ||
36 | 1.7.1 | ||
37 | |||