Browse code
net-snmp patches for perl update
Change-Id: I79bd8d949914cb2958b658ca31b3082f17f9ee40
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2279
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>
Priyesh Padmavilasom authored on 2017/04/05 09:43:26Showing 3 changed files
- SPECS/net-snmp/net-snmp-fix-perl-module-compilation.patch
- SPECS/net-snmp/net-snmp-remove-u64-typedef.patch
- SPECS/net-snmp/net-snmp.spec
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,149 @@ |
| 0 |
+From: Bart Van Assche <bvanassche@acm.org> |
|
| 1 |
+Date: Sun, 24 Jul 2016 18:58:18 -0800 |
|
| 2 |
+Subject: Fix Perl module compilation |
|
| 3 |
+ |
|
| 4 |
+Avoid that building the Net-SNMP Perl modules fails as follows: |
|
| 5 |
+ERROR from evaluation of /sources/net-snmp-5.7.3/perl/ASN/Makefile.PL:Bizarre |
|
| 6 |
+copy of HASH in list assignment at /usr/lib/perl5/site_perl/5.24.0/Carp.pm line 229. |
|
| 7 |
+--- a/perl/ASN/Makefile.PL |
|
| 8 |
+@@ -7,9 +7,7 @@ |
|
| 9 |
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence |
|
| 10 |
+ # the contents of the Makefile that is written. |
|
| 11 |
+ |
|
| 12 |
+-%MakeParams = InitMakeParams(); |
|
| 13 |
+- |
|
| 14 |
+-WriteMakefile(%MakeParams); |
|
| 15 |
++WriteMakefile(InitMakeParams()); |
|
| 16 |
+ |
|
| 17 |
+ Check_Version(); |
|
| 18 |
+ |
|
| 19 |
+--- a/perl/Makefile.PL |
|
| 20 |
+@@ -3,9 +3,7 @@ |
|
| 21 |
+ use Getopt::Long; |
|
| 22 |
+ require 5; |
|
| 23 |
+ |
|
| 24 |
+-%MakeParams = InitMakeParams(); |
|
| 25 |
+- |
|
| 26 |
+-WriteMakefile(%MakeParams); |
|
| 27 |
++WriteMakefile(InitMakeParams()); |
|
| 28 |
+ |
|
| 29 |
+ sub InitMakeParams {
|
|
| 30 |
+ $nsconfig="net-snmp-config"; # in path by default |
|
| 31 |
+--- a/perl/OID/Makefile.PL |
|
| 32 |
+@@ -6,11 +6,8 @@ |
|
| 33 |
+ use Config; |
|
| 34 |
+ use Getopt::Long; |
|
| 35 |
+ my $lib_version; |
|
| 36 |
+-my %MakeParams = (); |
|
| 37 |
+- |
|
| 38 |
+-%MakeParams = InitMakeParams(); |
|
| 39 |
+- |
|
| 40 |
+-WriteMakefile(%MakeParams); |
|
| 41 |
++ |
|
| 42 |
++WriteMakefile(InitMakeParams()); |
|
| 43 |
+ |
|
| 44 |
+ Check_Version(); |
|
| 45 |
+ |
|
| 46 |
+--- a/perl/SNMP/Makefile.PL |
|
| 47 |
+@@ -3,15 +3,12 @@ |
|
| 48 |
+ use Config; |
|
| 49 |
+ use Getopt::Long; |
|
| 50 |
+ my $lib_version; |
|
| 51 |
+-my %MakeParams = (); |
|
| 52 |
+ my $opts; |
|
| 53 |
+ |
|
| 54 |
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence |
|
| 55 |
+ # the contents of the Makefile that is written. |
|
| 56 |
+ |
|
| 57 |
+-%MakeParams = InitMakeParams(); |
|
| 58 |
+- |
|
| 59 |
+-WriteMakefile(%MakeParams); |
|
| 60 |
++WriteMakefile(InitMakeParams()); |
|
| 61 |
+ |
|
| 62 |
+ Check_Version(); |
|
| 63 |
+ |
|
| 64 |
+--- a/perl/TrapReceiver/Makefile.PL |
|
| 65 |
+@@ -3,11 +3,8 @@ |
|
| 66 |
+ use Config; |
|
| 67 |
+ use Getopt::Long; |
|
| 68 |
+ my $lib_version; |
|
| 69 |
+-my %MakeParams = (); |
|
| 70 |
+- |
|
| 71 |
+-%MakeParams = InitMakeParams(); |
|
| 72 |
+- |
|
| 73 |
+-WriteMakefile(%MakeParams); |
|
| 74 |
++ |
|
| 75 |
++WriteMakefile(InitMakeParams()); |
|
| 76 |
+ |
|
| 77 |
+ Check_Version(); |
|
| 78 |
+ |
|
| 79 |
+--- a/perl/agent/Makefile.PL |
|
| 80 |
+@@ -3,11 +3,8 @@ |
|
| 81 |
+ use Config; |
|
| 82 |
+ use Getopt::Long; |
|
| 83 |
+ my $lib_version; |
|
| 84 |
+-my %MakeParams = (); |
|
| 85 |
+- |
|
| 86 |
+-%MakeParams = InitMakeParams(); |
|
| 87 |
+- |
|
| 88 |
+-WriteMakefile(%MakeParams); |
|
| 89 |
++ |
|
| 90 |
++WriteMakefile(InitMakeParams()); |
|
| 91 |
+ |
|
| 92 |
+ Check_Version(); |
|
| 93 |
+ |
|
| 94 |
+--- a/perl/agent/Support/Makefile.PL |
|
| 95 |
+@@ -3,14 +3,11 @@ |
|
| 96 |
+ use Config; |
|
| 97 |
+ use Getopt::Long; |
|
| 98 |
+ my $lib_version; |
|
| 99 |
+-my %MakeParams = (); |
|
| 100 |
+ |
|
| 101 |
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence |
|
| 102 |
+ # the contents of the Makefile that is written. |
|
| 103 |
+ |
|
| 104 |
+-%MakeParams = InitMakeParams(); |
|
| 105 |
+- |
|
| 106 |
+-WriteMakefile(%MakeParams); |
|
| 107 |
++WriteMakefile(InitMakeParams()); |
|
| 108 |
+ |
|
| 109 |
+ Check_Version(); |
|
| 110 |
+ |
|
| 111 |
+--- a/perl/agent/default_store/Makefile.PL |
|
| 112 |
+@@ -3,11 +3,8 @@ |
|
| 113 |
+ use Config; |
|
| 114 |
+ use Getopt::Long; |
|
| 115 |
+ my $lib_version; |
|
| 116 |
+-my %MakeParams = (); |
|
| 117 |
+- |
|
| 118 |
+-%MakeParams = InitMakeParams(); |
|
| 119 |
+- |
|
| 120 |
+-WriteMakefile(%MakeParams); |
|
| 121 |
++ |
|
| 122 |
++WriteMakefile(InitMakeParams()); |
|
| 123 |
+ |
|
| 124 |
+ Check_Version(); |
|
| 125 |
+ |
|
| 126 |
+--- a/perl/default_store/Makefile.PL |
|
| 127 |
+@@ -3,11 +3,8 @@ |
|
| 128 |
+ use Config; |
|
| 129 |
+ use Getopt::Long; |
|
| 130 |
+ my $lib_version; |
|
| 131 |
+-my %MakeParams = (); |
|
| 132 |
+ |
|
| 133 |
+-%MakeParams = InitMakeParams(); |
|
| 134 |
+- |
|
| 135 |
+-WriteMakefile(%MakeParams); |
|
| 136 |
++WriteMakefile(InitMakeParams()); |
|
| 137 |
+ |
|
| 138 |
+ |
|
| 139 |
+ sub InitMakeParams {
|
| 0 | 140 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,2477 @@ |
| 0 |
+From: Bart Van Assche <bvanassche@acm.org> |
|
| 1 |
+Date: Sat, 20 Feb 2016 18:58:18 -0800 |
|
| 2 |
+Subject: [PATCH] Remove U64 typedef |
|
| 3 |
+ |
|
| 4 |
+The U64 typedef conflicts with a typedef in a Perl header file. Hence |
|
| 5 |
+remove the U64 typedef from the Net-SNMP header files. This patch does |
|
| 6 |
+not modify the Net-SNMP ABI. |
|
| 7 |
+--- a/agent/mibgroup/if-mib/ifXTable/ifXTable.c |
|
| 8 |
+@@ -722,7 +722,7 @@ |
|
| 9 |
+ */ |
|
| 10 |
+ int |
|
| 11 |
+ ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 12 |
+- U64 * ifHCInOctets_val_ptr) |
|
| 13 |
++ struct counter64 *ifHCInOctets_val_ptr) |
|
| 14 |
+ {
|
|
| 15 |
+ /** we should have a non-NULL pointer */ |
|
| 16 |
+ netsnmp_assert(NULL != ifHCInOctets_val_ptr); |
|
| 17 |
+@@ -779,7 +779,7 @@ |
|
| 18 |
+ */ |
|
| 19 |
+ int |
|
| 20 |
+ ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 21 |
+- U64 * ifHCInUcastPkts_val_ptr) |
|
| 22 |
++ struct counter64 *ifHCInUcastPkts_val_ptr) |
|
| 23 |
+ {
|
|
| 24 |
+ /** we should have a non-NULL pointer */ |
|
| 25 |
+ netsnmp_assert(NULL != ifHCInUcastPkts_val_ptr); |
|
| 26 |
+@@ -838,7 +838,7 @@ |
|
| 27 |
+ */ |
|
| 28 |
+ int |
|
| 29 |
+ ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 30 |
+- U64 * ifHCInMulticastPkts_val_ptr) |
|
| 31 |
++ struct counter64 *ifHCInMulticastPkts_val_ptr) |
|
| 32 |
+ {
|
|
| 33 |
+ /** we should have a non-NULL pointer */ |
|
| 34 |
+ netsnmp_assert(NULL != ifHCInMulticastPkts_val_ptr); |
|
| 35 |
+@@ -897,7 +897,7 @@ |
|
| 36 |
+ */ |
|
| 37 |
+ int |
|
| 38 |
+ ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 39 |
+- U64 * ifHCInBroadcastPkts_val_ptr) |
|
| 40 |
++ struct counter64 *ifHCInBroadcastPkts_val_ptr) |
|
| 41 |
+ {
|
|
| 42 |
+ /** we should have a non-NULL pointer */ |
|
| 43 |
+ netsnmp_assert(NULL != ifHCInBroadcastPkts_val_ptr); |
|
| 44 |
+@@ -955,7 +955,7 @@ |
|
| 45 |
+ */ |
|
| 46 |
+ int |
|
| 47 |
+ ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 48 |
+- U64 * ifHCOutOctets_val_ptr) |
|
| 49 |
++ struct counter64 *ifHCOutOctets_val_ptr) |
|
| 50 |
+ {
|
|
| 51 |
+ /** we should have a non-NULL pointer */ |
|
| 52 |
+ netsnmp_assert(NULL != ifHCOutOctets_val_ptr); |
|
| 53 |
+@@ -1013,7 +1013,7 @@ |
|
| 54 |
+ */ |
|
| 55 |
+ int |
|
| 56 |
+ ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 57 |
+- U64 * ifHCOutUcastPkts_val_ptr) |
|
| 58 |
++ struct counter64 *ifHCOutUcastPkts_val_ptr) |
|
| 59 |
+ {
|
|
| 60 |
+ /** we should have a non-NULL pointer */ |
|
| 61 |
+ netsnmp_assert(NULL != ifHCOutUcastPkts_val_ptr); |
|
| 62 |
+@@ -1074,7 +1074,7 @@ |
|
| 63 |
+ */ |
|
| 64 |
+ int |
|
| 65 |
+ ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 66 |
+- U64 * ifHCOutMulticastPkts_val_ptr) |
|
| 67 |
++ struct counter64 *ifHCOutMulticastPkts_val_ptr) |
|
| 68 |
+ {
|
|
| 69 |
+ /** we should have a non-NULL pointer */ |
|
| 70 |
+ netsnmp_assert(NULL != ifHCOutMulticastPkts_val_ptr); |
|
| 71 |
+@@ -1134,7 +1134,7 @@ |
|
| 72 |
+ */ |
|
| 73 |
+ int |
|
| 74 |
+ ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 75 |
+- U64 * ifHCOutBroadcastPkts_val_ptr) |
|
| 76 |
++ struct counter64 *ifHCOutBroadcastPkts_val_ptr) |
|
| 77 |
+ {
|
|
| 78 |
+ /** we should have a non-NULL pointer */ |
|
| 79 |
+ netsnmp_assert(NULL != ifHCOutBroadcastPkts_val_ptr); |
|
| 80 |
+--- a/agent/mibgroup/if-mib/ifXTable/ifXTable.h |
|
| 81 |
+@@ -143,28 +143,28 @@ |
|
| 82 |
+ u_long * |
|
| 83 |
+ ifOutBroadcastPkts_val_ptr); |
|
| 84 |
+ int ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 85 |
+- U64 * ifHCInOctets_val_ptr); |
|
| 86 |
++ struct counter64 *ifHCInOctets_val_ptr); |
|
| 87 |
+ int ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 88 |
+- U64 * ifHCInUcastPkts_val_ptr); |
|
| 89 |
++ struct counter64 *ifHCInUcastPkts_val_ptr); |
|
| 90 |
+ int ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * |
|
| 91 |
+ rowreq_ctx, |
|
| 92 |
+- U64 * |
|
| 93 |
++ struct counter64 * |
|
| 94 |
+ ifHCInMulticastPkts_val_ptr); |
|
| 95 |
+ int ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * |
|
| 96 |
+ rowreq_ctx, |
|
| 97 |
+- U64 * |
|
| 98 |
++ struct counter64 * |
|
| 99 |
+ ifHCInBroadcastPkts_val_ptr); |
|
| 100 |
+ int ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 101 |
+- U64 * ifHCOutOctets_val_ptr); |
|
| 102 |
++ struct counter64 *ifHCOutOctets_val_ptr); |
|
| 103 |
+ int ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 104 |
+- U64 * ifHCOutUcastPkts_val_ptr); |
|
| 105 |
++ struct counter64 *ifHCOutUcastPkts_val_ptr); |
|
| 106 |
+ int ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * |
|
| 107 |
+ rowreq_ctx, |
|
| 108 |
+- U64 * |
|
| 109 |
++ struct counter64 * |
|
| 110 |
+ ifHCOutMulticastPkts_val_ptr); |
|
| 111 |
+ int ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * |
|
| 112 |
+ rowreq_ctx, |
|
| 113 |
+- U64 * |
|
| 114 |
++ struct counter64 * |
|
| 115 |
+ ifHCOutBroadcastPkts_val_ptr); |
|
| 116 |
+ int ifLinkUpDownTrapEnable_get(ifXTable_rowreq_ctx * |
|
| 117 |
+ rowreq_ctx, |
|
| 118 |
+@@ -284,86 +284,86 @@ |
|
| 119 |
+ |
|
| 120 |
+ int ifHCInOctets_check_value(ifXTable_rowreq_ctx * |
|
| 121 |
+ rowreq_ctx, |
|
| 122 |
+- U64 ifHCInOctets_val); |
|
| 123 |
++ struct counter64 ifHCInOctets_val); |
|
| 124 |
+ int ifHCInOctets_undo_setup(ifXTable_rowreq_ctx * |
|
| 125 |
+ rowreq_ctx); |
|
| 126 |
+ int ifHCInOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 127 |
+- U64 ifHCInOctets_val); |
|
| 128 |
++ struct counter64 ifHCInOctets_val); |
|
| 129 |
+ int ifHCInOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); |
|
| 130 |
+ |
|
| 131 |
+ int ifHCInUcastPkts_check_value(ifXTable_rowreq_ctx * |
|
| 132 |
+ rowreq_ctx, |
|
| 133 |
+- U64 ifHCInUcastPkts_val); |
|
| 134 |
++ struct counter64 ifHCInUcastPkts_val); |
|
| 135 |
+ int ifHCInUcastPkts_undo_setup(ifXTable_rowreq_ctx * |
|
| 136 |
+ rowreq_ctx); |
|
| 137 |
+ int ifHCInUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 138 |
+- U64 ifHCInUcastPkts_val); |
|
| 139 |
++ struct counter64 ifHCInUcastPkts_val); |
|
| 140 |
+ int ifHCInUcastPkts_undo(ifXTable_rowreq_ctx * rowreq_ctx); |
|
| 141 |
+ |
|
| 142 |
+ int ifHCInMulticastPkts_check_value(ifXTable_rowreq_ctx * |
|
| 143 |
+ rowreq_ctx, |
|
| 144 |
+- U64 |
|
| 145 |
++ struct counter64 |
|
| 146 |
+ ifHCInMulticastPkts_val); |
|
| 147 |
+ int ifHCInMulticastPkts_undo_setup(ifXTable_rowreq_ctx * |
|
| 148 |
+ rowreq_ctx); |
|
| 149 |
+ int ifHCInMulticastPkts_set(ifXTable_rowreq_ctx * |
|
| 150 |
+ rowreq_ctx, |
|
| 151 |
+- U64 ifHCInMulticastPkts_val); |
|
| 152 |
++ struct counter64 ifHCInMulticastPkts_val); |
|
| 153 |
+ int ifHCInMulticastPkts_undo(ifXTable_rowreq_ctx * |
|
| 154 |
+ rowreq_ctx); |
|
| 155 |
+ |
|
| 156 |
+ int ifHCInBroadcastPkts_check_value(ifXTable_rowreq_ctx * |
|
| 157 |
+ rowreq_ctx, |
|
| 158 |
+- U64 |
|
| 159 |
++ struct counter64 |
|
| 160 |
+ ifHCInBroadcastPkts_val); |
|
| 161 |
+ int ifHCInBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * |
|
| 162 |
+ rowreq_ctx); |
|
| 163 |
+ int ifHCInBroadcastPkts_set(ifXTable_rowreq_ctx * |
|
| 164 |
+ rowreq_ctx, |
|
| 165 |
+- U64 ifHCInBroadcastPkts_val); |
|
| 166 |
++ struct counter64 ifHCInBroadcastPkts_val); |
|
| 167 |
+ int ifHCInBroadcastPkts_undo(ifXTable_rowreq_ctx * |
|
| 168 |
+ rowreq_ctx); |
|
| 169 |
+ |
|
| 170 |
+ int ifHCOutOctets_check_value(ifXTable_rowreq_ctx * |
|
| 171 |
+ rowreq_ctx, |
|
| 172 |
+- U64 ifHCOutOctets_val); |
|
| 173 |
++ struct counter64 ifHCOutOctets_val); |
|
| 174 |
+ int ifHCOutOctets_undo_setup(ifXTable_rowreq_ctx * |
|
| 175 |
+ rowreq_ctx); |
|
| 176 |
+ int ifHCOutOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 177 |
+- U64 ifHCOutOctets_val); |
|
| 178 |
++ struct counter64 ifHCOutOctets_val); |
|
| 179 |
+ int ifHCOutOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); |
|
| 180 |
+ |
|
| 181 |
+ int ifHCOutUcastPkts_check_value(ifXTable_rowreq_ctx * |
|
| 182 |
+ rowreq_ctx, |
|
| 183 |
+- U64 ifHCOutUcastPkts_val); |
|
| 184 |
++ struct counter64 ifHCOutUcastPkts_val); |
|
| 185 |
+ int ifHCOutUcastPkts_undo_setup(ifXTable_rowreq_ctx * |
|
| 186 |
+ rowreq_ctx); |
|
| 187 |
+ int ifHCOutUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, |
|
| 188 |
+- U64 ifHCOutUcastPkts_val); |
|
| 189 |
++ struct counter64 ifHCOutUcastPkts_val); |
|
| 190 |
+ int ifHCOutUcastPkts_undo(ifXTable_rowreq_ctx * |
|
| 191 |
+ rowreq_ctx); |
|
| 192 |
+ |
|
| 193 |
+ int ifHCOutMulticastPkts_check_value(ifXTable_rowreq_ctx * |
|
| 194 |
+ rowreq_ctx, |
|
| 195 |
+- U64 |
|
| 196 |
++ struct counter64 |
|
| 197 |
+ ifHCOutMulticastPkts_val); |
|
| 198 |
+ int ifHCOutMulticastPkts_undo_setup(ifXTable_rowreq_ctx * |
|
| 199 |
+ rowreq_ctx); |
|
| 200 |
+ int ifHCOutMulticastPkts_set(ifXTable_rowreq_ctx * |
|
| 201 |
+ rowreq_ctx, |
|
| 202 |
+- U64 ifHCOutMulticastPkts_val); |
|
| 203 |
++ struct counter64 ifHCOutMulticastPkts_val); |
|
| 204 |
+ int ifHCOutMulticastPkts_undo(ifXTable_rowreq_ctx * |
|
| 205 |
+ rowreq_ctx); |
|
| 206 |
+ |
|
| 207 |
+ int ifHCOutBroadcastPkts_check_value(ifXTable_rowreq_ctx * |
|
| 208 |
+ rowreq_ctx, |
|
| 209 |
+- U64 |
|
| 210 |
++ struct counter64 |
|
| 211 |
+ ifHCOutBroadcastPkts_val); |
|
| 212 |
+ int ifHCOutBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * |
|
| 213 |
+ rowreq_ctx); |
|
| 214 |
+ int ifHCOutBroadcastPkts_set(ifXTable_rowreq_ctx * |
|
| 215 |
+ rowreq_ctx, |
|
| 216 |
+- U64 ifHCOutBroadcastPkts_val); |
|
| 217 |
++ struct counter64 ifHCOutBroadcastPkts_val); |
|
| 218 |
+ int ifHCOutBroadcastPkts_undo(ifXTable_rowreq_ctx * |
|
| 219 |
+ rowreq_ctx); |
|
| 220 |
+ |
|
| 221 |
+--- a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c |
|
| 222 |
+@@ -729,72 +729,72 @@ |
|
| 223 |
+ * ifHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 224 |
+ */ |
|
| 225 |
+ case COLUMN_IFHCINOCTETS: |
|
| 226 |
+- var->val_len = sizeof(U64); |
|
| 227 |
++ var->val_len = sizeof(struct counter64); |
|
| 228 |
+ var->type = ASN_COUNTER64; |
|
| 229 |
+- rc = ifHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 230 |
++ rc = ifHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 231 |
+ break; |
|
| 232 |
+ |
|
| 233 |
+ /* |
|
| 234 |
+ * ifHCInUcastPkts(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 235 |
+ */ |
|
| 236 |
+ case COLUMN_IFHCINUCASTPKTS: |
|
| 237 |
+- var->val_len = sizeof(U64); |
|
| 238 |
++ var->val_len = sizeof(struct counter64); |
|
| 239 |
+ var->type = ASN_COUNTER64; |
|
| 240 |
+- rc = ifHCInUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 241 |
++ rc = ifHCInUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 242 |
+ break; |
|
| 243 |
+ |
|
| 244 |
+ /* |
|
| 245 |
+ * ifHCInMulticastPkts(8)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 246 |
+ */ |
|
| 247 |
+ case COLUMN_IFHCINMULTICASTPKTS: |
|
| 248 |
+- var->val_len = sizeof(U64); |
|
| 249 |
++ var->val_len = sizeof(struct counter64); |
|
| 250 |
+ var->type = ASN_COUNTER64; |
|
| 251 |
+- rc = ifHCInMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 252 |
++ rc = ifHCInMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 253 |
+ break; |
|
| 254 |
+ |
|
| 255 |
+ /* |
|
| 256 |
+ * ifHCInBroadcastPkts(9)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 257 |
+ */ |
|
| 258 |
+ case COLUMN_IFHCINBROADCASTPKTS: |
|
| 259 |
+- var->val_len = sizeof(U64); |
|
| 260 |
++ var->val_len = sizeof(struct counter64); |
|
| 261 |
+ var->type = ASN_COUNTER64; |
|
| 262 |
+- rc = ifHCInBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 263 |
++ rc = ifHCInBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 264 |
+ break; |
|
| 265 |
+ |
|
| 266 |
+ /* |
|
| 267 |
+ * ifHCOutOctets(10)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 268 |
+ */ |
|
| 269 |
+ case COLUMN_IFHCOUTOCTETS: |
|
| 270 |
+- var->val_len = sizeof(U64); |
|
| 271 |
++ var->val_len = sizeof(struct counter64); |
|
| 272 |
+ var->type = ASN_COUNTER64; |
|
| 273 |
+- rc = ifHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 274 |
++ rc = ifHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 275 |
+ break; |
|
| 276 |
+ |
|
| 277 |
+ /* |
|
| 278 |
+ * ifHCOutUcastPkts(11)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 279 |
+ */ |
|
| 280 |
+ case COLUMN_IFHCOUTUCASTPKTS: |
|
| 281 |
+- var->val_len = sizeof(U64); |
|
| 282 |
++ var->val_len = sizeof(struct counter64); |
|
| 283 |
+ var->type = ASN_COUNTER64; |
|
| 284 |
+- rc = ifHCOutUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 285 |
++ rc = ifHCOutUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 286 |
+ break; |
|
| 287 |
+ |
|
| 288 |
+ /* |
|
| 289 |
+ * ifHCOutMulticastPkts(12)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 290 |
+ */ |
|
| 291 |
+ case COLUMN_IFHCOUTMULTICASTPKTS: |
|
| 292 |
+- var->val_len = sizeof(U64); |
|
| 293 |
++ var->val_len = sizeof(struct counter64); |
|
| 294 |
+ var->type = ASN_COUNTER64; |
|
| 295 |
+- rc = ifHCOutMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 296 |
++ rc = ifHCOutMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 297 |
+ break; |
|
| 298 |
+ |
|
| 299 |
+ /* |
|
| 300 |
+ * ifHCOutBroadcastPkts(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 301 |
+ */ |
|
| 302 |
+ case COLUMN_IFHCOUTBROADCASTPKTS: |
|
| 303 |
+- var->val_len = sizeof(U64); |
|
| 304 |
++ var->val_len = sizeof(struct counter64); |
|
| 305 |
+ var->type = ASN_COUNTER64; |
|
| 306 |
+- rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 307 |
++ rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 308 |
+ break; |
|
| 309 |
+ |
|
| 310 |
+ /* |
|
| 311 |
+--- a/agent/mibgroup/ip-mib/data_access/systemstats_common.c |
|
| 312 |
+@@ -264,7 +264,7 @@ |
|
| 313 |
+ && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTFRAGCREATES] |
|
| 314 |
+ && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTDISCARDS]) {
|
|
| 315 |
+ |
|
| 316 |
+- U64 tmp, tmp2, tmp3; |
|
| 317 |
++ struct counter64 tmp, tmp2, tmp3; |
|
| 318 |
+ tmp = entry->stats.HCOutRequests; |
|
| 319 |
+ u64Incr(&tmp, &entry->stats.HCOutForwDatagrams); |
|
| 320 |
+ u64Incr(&tmp, &entry->stats.HCOutFragCreates); |
|
| 321 |
+--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c |
|
| 322 |
+@@ -270,7 +270,7 @@ |
|
| 323 |
+ */ |
|
| 324 |
+ int |
|
| 325 |
+ ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 326 |
+- U64 * ipIfStatsHCInReceives_val_ptr) |
|
| 327 |
++ struct counter64 *ipIfStatsHCInReceives_val_ptr) |
|
| 328 |
+ {
|
|
| 329 |
+ /** we should have a non-NULL pointer */ |
|
| 330 |
+ netsnmp_assert(NULL != ipIfStatsHCInReceives_val_ptr); |
|
| 331 |
+@@ -395,7 +395,7 @@ |
|
| 332 |
+ */ |
|
| 333 |
+ int |
|
| 334 |
+ ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 335 |
+- U64 * ipIfStatsHCInOctets_val_ptr) |
|
| 336 |
++ struct counter64 *ipIfStatsHCInOctets_val_ptr) |
|
| 337 |
+ {
|
|
| 338 |
+ /** we should have a non-NULL pointer */ |
|
| 339 |
+ netsnmp_assert(NULL != ipIfStatsHCInOctets_val_ptr); |
|
| 340 |
+@@ -862,7 +862,7 @@ |
|
| 341 |
+ */ |
|
| 342 |
+ int |
|
| 343 |
+ ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 344 |
+- U64 * ipIfStatsHCInForwDatagrams_val_ptr) |
|
| 345 |
++ struct counter64 *ipIfStatsHCInForwDatagrams_val_ptr) |
|
| 346 |
+ {
|
|
| 347 |
+ /** we should have a non-NULL pointer */ |
|
| 348 |
+ netsnmp_assert(NULL != ipIfStatsHCInForwDatagrams_val_ptr); |
|
| 349 |
+@@ -1267,7 +1267,7 @@ |
|
| 350 |
+ */ |
|
| 351 |
+ int |
|
| 352 |
+ ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 353 |
+- U64 * ipIfStatsHCInDelivers_val_ptr) |
|
| 354 |
++ struct counter64 *ipIfStatsHCInDelivers_val_ptr) |
|
| 355 |
+ {
|
|
| 356 |
+ /** we should have a non-NULL pointer */ |
|
| 357 |
+ netsnmp_assert(NULL != ipIfStatsHCInDelivers_val_ptr); |
|
| 358 |
+@@ -1396,7 +1396,7 @@ |
|
| 359 |
+ */ |
|
| 360 |
+ int |
|
| 361 |
+ ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 362 |
+- U64 * ipIfStatsHCOutRequests_val_ptr) |
|
| 363 |
++ struct counter64 *ipIfStatsHCOutRequests_val_ptr) |
|
| 364 |
+ {
|
|
| 365 |
+ /** we should have a non-NULL pointer */ |
|
| 366 |
+ netsnmp_assert(NULL != ipIfStatsHCOutRequests_val_ptr); |
|
| 367 |
+@@ -1532,7 +1532,7 @@ |
|
| 368 |
+ */ |
|
| 369 |
+ int |
|
| 370 |
+ ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 371 |
+- U64 * ipIfStatsHCOutForwDatagrams_val_ptr) |
|
| 372 |
++ struct counter64 *ipIfStatsHCOutForwDatagrams_val_ptr) |
|
| 373 |
+ {
|
|
| 374 |
+ /** we should have a non-NULL pointer */ |
|
| 375 |
+ netsnmp_assert(NULL != ipIfStatsHCOutForwDatagrams_val_ptr); |
|
| 376 |
+@@ -1999,7 +1999,7 @@ |
|
| 377 |
+ */ |
|
| 378 |
+ int |
|
| 379 |
+ ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 380 |
+- U64 * ipIfStatsHCOutTransmits_val_ptr) |
|
| 381 |
++ struct counter64 *ipIfStatsHCOutTransmits_val_ptr) |
|
| 382 |
+ {
|
|
| 383 |
+ /** we should have a non-NULL pointer */ |
|
| 384 |
+ netsnmp_assert(NULL != ipIfStatsHCOutTransmits_val_ptr); |
|
| 385 |
+@@ -2123,7 +2123,7 @@ |
|
| 386 |
+ */ |
|
| 387 |
+ int |
|
| 388 |
+ ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 389 |
+- U64 * ipIfStatsHCOutOctets_val_ptr) |
|
| 390 |
++ struct counter64 *ipIfStatsHCOutOctets_val_ptr) |
|
| 391 |
+ {
|
|
| 392 |
+ /** we should have a non-NULL pointer */ |
|
| 393 |
+ netsnmp_assert(NULL != ipIfStatsHCOutOctets_val_ptr); |
|
| 394 |
+@@ -2245,7 +2245,7 @@ |
|
| 395 |
+ */ |
|
| 396 |
+ int |
|
| 397 |
+ ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 398 |
+- U64 * ipIfStatsHCInMcastPkts_val_ptr) |
|
| 399 |
++ struct counter64 *ipIfStatsHCInMcastPkts_val_ptr) |
|
| 400 |
+ {
|
|
| 401 |
+ /** we should have a non-NULL pointer */ |
|
| 402 |
+ netsnmp_assert(NULL != ipIfStatsHCInMcastPkts_val_ptr); |
|
| 403 |
+@@ -2372,7 +2372,7 @@ |
|
| 404 |
+ */ |
|
| 405 |
+ int |
|
| 406 |
+ ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 407 |
+- U64 * ipIfStatsHCInMcastOctets_val_ptr) |
|
| 408 |
++ struct counter64 *ipIfStatsHCInMcastOctets_val_ptr) |
|
| 409 |
+ {
|
|
| 410 |
+ /** we should have a non-NULL pointer */ |
|
| 411 |
+ netsnmp_assert(NULL != ipIfStatsHCInMcastOctets_val_ptr); |
|
| 412 |
+@@ -2497,7 +2497,7 @@ |
|
| 413 |
+ */ |
|
| 414 |
+ int |
|
| 415 |
+ ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 416 |
+- U64 * ipIfStatsHCOutMcastPkts_val_ptr) |
|
| 417 |
++ struct counter64 *ipIfStatsHCOutMcastPkts_val_ptr) |
|
| 418 |
+ {
|
|
| 419 |
+ /** we should have a non-NULL pointer */ |
|
| 420 |
+ netsnmp_assert(NULL != ipIfStatsHCOutMcastPkts_val_ptr); |
|
| 421 |
+@@ -2621,7 +2621,7 @@ |
|
| 422 |
+ */ |
|
| 423 |
+ int |
|
| 424 |
+ ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 425 |
+- U64 * ipIfStatsHCOutMcastOctets_val_ptr) |
|
| 426 |
++ struct counter64 *ipIfStatsHCOutMcastOctets_val_ptr) |
|
| 427 |
+ {
|
|
| 428 |
+ /** we should have a non-NULL pointer */ |
|
| 429 |
+ netsnmp_assert(NULL != ipIfStatsHCOutMcastOctets_val_ptr); |
|
| 430 |
+@@ -2743,7 +2743,7 @@ |
|
| 431 |
+ */ |
|
| 432 |
+ int |
|
| 433 |
+ ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 434 |
+- U64 * ipIfStatsHCInBcastPkts_val_ptr) |
|
| 435 |
++ struct counter64 *ipIfStatsHCInBcastPkts_val_ptr) |
|
| 436 |
+ {
|
|
| 437 |
+ /** we should have a non-NULL pointer */ |
|
| 438 |
+ netsnmp_assert(NULL != ipIfStatsHCInBcastPkts_val_ptr); |
|
| 439 |
+@@ -2865,7 +2865,7 @@ |
|
| 440 |
+ */ |
|
| 441 |
+ int |
|
| 442 |
+ ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 443 |
+- U64 * ipIfStatsHCOutBcastPkts_val_ptr) |
|
| 444 |
++ struct counter64 *ipIfStatsHCOutBcastPkts_val_ptr) |
|
| 445 |
+ {
|
|
| 446 |
+ /** we should have a non-NULL pointer */ |
|
| 447 |
+ netsnmp_assert(NULL != ipIfStatsHCOutBcastPkts_val_ptr); |
|
| 448 |
+--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h |
|
| 449 |
+@@ -50,7 +50,7 @@ |
|
| 450 |
+ ipIfStatsInReceives_val_ptr); |
|
| 451 |
+ int ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * |
|
| 452 |
+ rowreq_ctx, |
|
| 453 |
+- U64 * |
|
| 454 |
++ struct counter64 * |
|
| 455 |
+ ipIfStatsHCInReceives_val_ptr); |
|
| 456 |
+ int ipIfStatsInOctets_get(ipIfStatsTable_rowreq_ctx * |
|
| 457 |
+ rowreq_ctx, |
|
| 458 |
+@@ -58,7 +58,7 @@ |
|
| 459 |
+ ipIfStatsInOctets_val_ptr); |
|
| 460 |
+ int ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * |
|
| 461 |
+ rowreq_ctx, |
|
| 462 |
+- U64 * |
|
| 463 |
++ struct counter64 * |
|
| 464 |
+ ipIfStatsHCInOctets_val_ptr); |
|
| 465 |
+ int ipIfStatsInHdrErrors_get(ipIfStatsTable_rowreq_ctx * |
|
| 466 |
+ rowreq_ctx, |
|
| 467 |
+@@ -87,7 +87,7 @@ |
|
| 468 |
+ int |
|
| 469 |
+ ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * |
|
| 470 |
+ rowreq_ctx, |
|
| 471 |
+- U64 * |
|
| 472 |
++ struct counter64 * |
|
| 473 |
+ ipIfStatsHCInForwDatagrams_val_ptr); |
|
| 474 |
+ int ipIfStatsReasmReqds_get(ipIfStatsTable_rowreq_ctx * |
|
| 475 |
+ rowreq_ctx, |
|
| 476 |
+@@ -111,7 +111,7 @@ |
|
| 477 |
+ ipIfStatsInDelivers_val_ptr); |
|
| 478 |
+ int ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * |
|
| 479 |
+ rowreq_ctx, |
|
| 480 |
+- U64 * |
|
| 481 |
++ struct counter64 * |
|
| 482 |
+ ipIfStatsHCInDelivers_val_ptr); |
|
| 483 |
+ int ipIfStatsOutRequests_get(ipIfStatsTable_rowreq_ctx * |
|
| 484 |
+ rowreq_ctx, |
|
| 485 |
+@@ -119,7 +119,7 @@ |
|
| 486 |
+ ipIfStatsOutRequests_val_ptr); |
|
| 487 |
+ int ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * |
|
| 488 |
+ rowreq_ctx, |
|
| 489 |
+- U64 * |
|
| 490 |
++ struct counter64 * |
|
| 491 |
+ ipIfStatsHCOutRequests_val_ptr); |
|
| 492 |
+ int ipIfStatsOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx |
|
| 493 |
+ * rowreq_ctx, |
|
| 494 |
+@@ -128,7 +128,7 @@ |
|
| 495 |
+ int |
|
| 496 |
+ ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * |
|
| 497 |
+ rowreq_ctx, |
|
| 498 |
+- U64 * |
|
| 499 |
++ struct counter64 * |
|
| 500 |
+ ipIfStatsHCOutForwDatagrams_val_ptr); |
|
| 501 |
+ int ipIfStatsOutDiscards_get(ipIfStatsTable_rowreq_ctx * |
|
| 502 |
+ rowreq_ctx, |
|
| 503 |
+@@ -156,7 +156,7 @@ |
|
| 504 |
+ ipIfStatsOutTransmits_val_ptr); |
|
| 505 |
+ int ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * |
|
| 506 |
+ rowreq_ctx, |
|
| 507 |
+- U64 * |
|
| 508 |
++ struct counter64 * |
|
| 509 |
+ ipIfStatsHCOutTransmits_val_ptr); |
|
| 510 |
+ int ipIfStatsOutOctets_get(ipIfStatsTable_rowreq_ctx * |
|
| 511 |
+ rowreq_ctx, |
|
| 512 |
+@@ -164,7 +164,7 @@ |
|
| 513 |
+ ipIfStatsOutOctets_val_ptr); |
|
| 514 |
+ int ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * |
|
| 515 |
+ rowreq_ctx, |
|
| 516 |
+- U64 * |
|
| 517 |
++ struct counter64 * |
|
| 518 |
+ ipIfStatsHCOutOctets_val_ptr); |
|
| 519 |
+ int ipIfStatsInMcastPkts_get(ipIfStatsTable_rowreq_ctx * |
|
| 520 |
+ rowreq_ctx, |
|
| 521 |
+@@ -172,7 +172,7 @@ |
|
| 522 |
+ ipIfStatsInMcastPkts_val_ptr); |
|
| 523 |
+ int ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * |
|
| 524 |
+ rowreq_ctx, |
|
| 525 |
+- U64 * |
|
| 526 |
++ struct counter64 * |
|
| 527 |
+ ipIfStatsHCInMcastPkts_val_ptr); |
|
| 528 |
+ int ipIfStatsInMcastOctets_get(ipIfStatsTable_rowreq_ctx * |
|
| 529 |
+ rowreq_ctx, |
|
| 530 |
+@@ -180,7 +180,7 @@ |
|
| 531 |
+ ipIfStatsInMcastOctets_val_ptr); |
|
| 532 |
+ int ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx |
|
| 533 |
+ * rowreq_ctx, |
|
| 534 |
+- U64 * |
|
| 535 |
++ struct counter64 * |
|
| 536 |
+ ipIfStatsHCInMcastOctets_val_ptr); |
|
| 537 |
+ int ipIfStatsOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * |
|
| 538 |
+ rowreq_ctx, |
|
| 539 |
+@@ -188,7 +188,7 @@ |
|
| 540 |
+ ipIfStatsOutMcastPkts_val_ptr); |
|
| 541 |
+ int ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * |
|
| 542 |
+ rowreq_ctx, |
|
| 543 |
+- U64 * |
|
| 544 |
++ struct counter64 * |
|
| 545 |
+ ipIfStatsHCOutMcastPkts_val_ptr); |
|
| 546 |
+ int ipIfStatsOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * |
|
| 547 |
+ rowreq_ctx, |
|
| 548 |
+@@ -196,7 +196,7 @@ |
|
| 549 |
+ ipIfStatsOutMcastOctets_val_ptr); |
|
| 550 |
+ int ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx |
|
| 551 |
+ * rowreq_ctx, |
|
| 552 |
+- U64 * |
|
| 553 |
++ struct counter64 * |
|
| 554 |
+ ipIfStatsHCOutMcastOctets_val_ptr); |
|
| 555 |
+ int ipIfStatsInBcastPkts_get(ipIfStatsTable_rowreq_ctx * |
|
| 556 |
+ rowreq_ctx, |
|
| 557 |
+@@ -204,7 +204,7 @@ |
|
| 558 |
+ ipIfStatsInBcastPkts_val_ptr); |
|
| 559 |
+ int ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * |
|
| 560 |
+ rowreq_ctx, |
|
| 561 |
+- U64 * |
|
| 562 |
++ struct counter64 * |
|
| 563 |
+ ipIfStatsHCInBcastPkts_val_ptr); |
|
| 564 |
+ int ipIfStatsOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * |
|
| 565 |
+ rowreq_ctx, |
|
| 566 |
+@@ -212,7 +212,7 @@ |
|
| 567 |
+ ipIfStatsOutBcastPkts_val_ptr); |
|
| 568 |
+ int ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * |
|
| 569 |
+ rowreq_ctx, |
|
| 570 |
+- U64 * |
|
| 571 |
++ struct counter64 * |
|
| 572 |
+ ipIfStatsHCOutBcastPkts_val_ptr); |
|
| 573 |
+ int |
|
| 574 |
+ ipIfStatsDiscontinuityTime_get(ipIfStatsTable_rowreq_ctx * |
|
| 575 |
+--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c |
|
| 576 |
+@@ -722,10 +722,10 @@ |
|
| 577 |
+ * ipIfStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 578 |
+ */ |
|
| 579 |
+ case COLUMN_IPIFSTATSHCINRECEIVES: |
|
| 580 |
+- var->val_len = sizeof(U64); |
|
| 581 |
++ var->val_len = sizeof(struct counter64); |
|
| 582 |
+ var->type = ASN_COUNTER64; |
|
| 583 |
+ rc = ipIfStatsHCInReceives_get(rowreq_ctx, |
|
| 584 |
+- (U64 *) var->val.string); |
|
| 585 |
++ (struct counter64 *) var->val.string); |
|
| 586 |
+ break; |
|
| 587 |
+ |
|
| 588 |
+ /* |
|
| 589 |
+@@ -741,9 +741,9 @@ |
|
| 590 |
+ * ipIfStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 591 |
+ */ |
|
| 592 |
+ case COLUMN_IPIFSTATSHCINOCTETS: |
|
| 593 |
+- var->val_len = sizeof(U64); |
|
| 594 |
++ var->val_len = sizeof(struct counter64); |
|
| 595 |
+ var->type = ASN_COUNTER64; |
|
| 596 |
+- rc = ipIfStatsHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 597 |
++ rc = ipIfStatsHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 598 |
+ break; |
|
| 599 |
+ |
|
| 600 |
+ /* |
|
| 601 |
+@@ -810,10 +810,10 @@ |
|
| 602 |
+ * ipIfStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 603 |
+ */ |
|
| 604 |
+ case COLUMN_IPIFSTATSHCINFORWDATAGRAMS: |
|
| 605 |
+- var->val_len = sizeof(U64); |
|
| 606 |
++ var->val_len = sizeof(struct counter64); |
|
| 607 |
+ var->type = ASN_COUNTER64; |
|
| 608 |
+ rc = ipIfStatsHCInForwDatagrams_get(rowreq_ctx, |
|
| 609 |
+- (U64 *) var->val.string); |
|
| 610 |
++ (struct counter64 *) var->val.string); |
|
| 611 |
+ break; |
|
| 612 |
+ |
|
| 613 |
+ /* |
|
| 614 |
+@@ -869,10 +869,10 @@ |
|
| 615 |
+ * ipIfStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 616 |
+ */ |
|
| 617 |
+ case COLUMN_IPIFSTATSHCINDELIVERS: |
|
| 618 |
+- var->val_len = sizeof(U64); |
|
| 619 |
++ var->val_len = sizeof(struct counter64); |
|
| 620 |
+ var->type = ASN_COUNTER64; |
|
| 621 |
+ rc = ipIfStatsHCInDelivers_get(rowreq_ctx, |
|
| 622 |
+- (U64 *) var->val.string); |
|
| 623 |
++ (struct counter64 *) var->val.string); |
|
| 624 |
+ break; |
|
| 625 |
+ |
|
| 626 |
+ /* |
|
| 627 |
+@@ -889,10 +889,10 @@ |
|
| 628 |
+ * ipIfStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 629 |
+ */ |
|
| 630 |
+ case COLUMN_IPIFSTATSHCOUTREQUESTS: |
|
| 631 |
+- var->val_len = sizeof(U64); |
|
| 632 |
++ var->val_len = sizeof(struct counter64); |
|
| 633 |
+ var->type = ASN_COUNTER64; |
|
| 634 |
+ rc = ipIfStatsHCOutRequests_get(rowreq_ctx, |
|
| 635 |
+- (U64 *) var->val.string); |
|
| 636 |
++ (struct counter64 *) var->val.string); |
|
| 637 |
+ break; |
|
| 638 |
+ |
|
| 639 |
+ /* |
|
| 640 |
+@@ -909,10 +909,10 @@ |
|
| 641 |
+ * ipIfStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 642 |
+ */ |
|
| 643 |
+ case COLUMN_IPIFSTATSHCOUTFORWDATAGRAMS: |
|
| 644 |
+- var->val_len = sizeof(U64); |
|
| 645 |
++ var->val_len = sizeof(struct counter64); |
|
| 646 |
+ var->type = ASN_COUNTER64; |
|
| 647 |
+ rc = ipIfStatsHCOutForwDatagrams_get(rowreq_ctx, |
|
| 648 |
+- (U64 *) var->val.string); |
|
| 649 |
++ (struct counter64 *) var->val.string); |
|
| 650 |
+ break; |
|
| 651 |
+ |
|
| 652 |
+ /* |
|
| 653 |
+@@ -979,10 +979,10 @@ |
|
| 654 |
+ * ipIfStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 655 |
+ */ |
|
| 656 |
+ case COLUMN_IPIFSTATSHCOUTTRANSMITS: |
|
| 657 |
+- var->val_len = sizeof(U64); |
|
| 658 |
++ var->val_len = sizeof(struct counter64); |
|
| 659 |
+ var->type = ASN_COUNTER64; |
|
| 660 |
+ rc = ipIfStatsHCOutTransmits_get(rowreq_ctx, |
|
| 661 |
+- (U64 *) var->val.string); |
|
| 662 |
++ (struct counter64 *) var->val.string); |
|
| 663 |
+ break; |
|
| 664 |
+ |
|
| 665 |
+ /* |
|
| 666 |
+@@ -999,9 +999,9 @@ |
|
| 667 |
+ * ipIfStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 668 |
+ */ |
|
| 669 |
+ case COLUMN_IPIFSTATSHCOUTOCTETS: |
|
| 670 |
+- var->val_len = sizeof(U64); |
|
| 671 |
++ var->val_len = sizeof(struct counter64); |
|
| 672 |
+ var->type = ASN_COUNTER64; |
|
| 673 |
+- rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); |
|
| 674 |
++ rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); |
|
| 675 |
+ break; |
|
| 676 |
+ |
|
| 677 |
+ /* |
|
| 678 |
+@@ -1018,10 +1018,10 @@ |
|
| 679 |
+ * ipIfStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 680 |
+ */ |
|
| 681 |
+ case COLUMN_IPIFSTATSHCINMCASTPKTS: |
|
| 682 |
+- var->val_len = sizeof(U64); |
|
| 683 |
++ var->val_len = sizeof(struct counter64); |
|
| 684 |
+ var->type = ASN_COUNTER64; |
|
| 685 |
+ rc = ipIfStatsHCInMcastPkts_get(rowreq_ctx, |
|
| 686 |
+- (U64 *) var->val.string); |
|
| 687 |
++ (struct counter64 *) var->val.string); |
|
| 688 |
+ break; |
|
| 689 |
+ |
|
| 690 |
+ /* |
|
| 691 |
+@@ -1038,10 +1038,10 @@ |
|
| 692 |
+ * ipIfStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 693 |
+ */ |
|
| 694 |
+ case COLUMN_IPIFSTATSHCINMCASTOCTETS: |
|
| 695 |
+- var->val_len = sizeof(U64); |
|
| 696 |
++ var->val_len = sizeof(struct counter64); |
|
| 697 |
+ var->type = ASN_COUNTER64; |
|
| 698 |
+ rc = ipIfStatsHCInMcastOctets_get(rowreq_ctx, |
|
| 699 |
+- (U64 *) var->val.string); |
|
| 700 |
++ (struct counter64 *) var->val.string); |
|
| 701 |
+ break; |
|
| 702 |
+ |
|
| 703 |
+ /* |
|
| 704 |
+@@ -1058,10 +1058,10 @@ |
|
| 705 |
+ * ipIfStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 706 |
+ */ |
|
| 707 |
+ case COLUMN_IPIFSTATSHCOUTMCASTPKTS: |
|
| 708 |
+- var->val_len = sizeof(U64); |
|
| 709 |
++ var->val_len = sizeof(struct counter64); |
|
| 710 |
+ var->type = ASN_COUNTER64; |
|
| 711 |
+ rc = ipIfStatsHCOutMcastPkts_get(rowreq_ctx, |
|
| 712 |
+- (U64 *) var->val.string); |
|
| 713 |
++ (struct counter64 *) var->val.string); |
|
| 714 |
+ break; |
|
| 715 |
+ |
|
| 716 |
+ /* |
|
| 717 |
+@@ -1078,10 +1078,10 @@ |
|
| 718 |
+ * ipIfStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 719 |
+ */ |
|
| 720 |
+ case COLUMN_IPIFSTATSHCOUTMCASTOCTETS: |
|
| 721 |
+- var->val_len = sizeof(U64); |
|
| 722 |
++ var->val_len = sizeof(struct counter64); |
|
| 723 |
+ var->type = ASN_COUNTER64; |
|
| 724 |
+ rc = ipIfStatsHCOutMcastOctets_get(rowreq_ctx, |
|
| 725 |
+- (U64 *) var->val.string); |
|
| 726 |
++ (struct counter64 *) var->val.string); |
|
| 727 |
+ break; |
|
| 728 |
+ |
|
| 729 |
+ /* |
|
| 730 |
+@@ -1098,10 +1098,10 @@ |
|
| 731 |
+ * ipIfStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 732 |
+ */ |
|
| 733 |
+ case COLUMN_IPIFSTATSHCINBCASTPKTS: |
|
| 734 |
+- var->val_len = sizeof(U64); |
|
| 735 |
++ var->val_len = sizeof(struct counter64); |
|
| 736 |
+ var->type = ASN_COUNTER64; |
|
| 737 |
+ rc = ipIfStatsHCInBcastPkts_get(rowreq_ctx, |
|
| 738 |
+- (U64 *) var->val.string); |
|
| 739 |
++ (struct counter64 *) var->val.string); |
|
| 740 |
+ break; |
|
| 741 |
+ |
|
| 742 |
+ /* |
|
| 743 |
+@@ -1118,10 +1118,10 @@ |
|
| 744 |
+ * ipIfStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 745 |
+ */ |
|
| 746 |
+ case COLUMN_IPIFSTATSHCOUTBCASTPKTS: |
|
| 747 |
+- var->val_len = sizeof(U64); |
|
| 748 |
++ var->val_len = sizeof(struct counter64); |
|
| 749 |
+ var->type = ASN_COUNTER64; |
|
| 750 |
+ rc = ipIfStatsHCOutBcastPkts_get(rowreq_ctx, |
|
| 751 |
+- (U64 *) var->val.string); |
|
| 752 |
++ (struct counter64 *) var->val.string); |
|
| 753 |
+ break; |
|
| 754 |
+ |
|
| 755 |
+ /* |
|
| 756 |
+--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c |
|
| 757 |
+@@ -452,7 +452,7 @@ |
|
| 758 |
+ */ |
|
| 759 |
+ int |
|
| 760 |
+ ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 761 |
+- U64 * ipSystemStatsHCInReceives_val_ptr) |
|
| 762 |
++ struct counter64 *ipSystemStatsHCInReceives_val_ptr) |
|
| 763 |
+ {
|
|
| 764 |
+ /** we should have a non-NULL pointer */ |
|
| 765 |
+ netsnmp_assert(NULL != ipSystemStatsHCInReceives_val_ptr); |
|
| 766 |
+@@ -579,7 +579,7 @@ |
|
| 767 |
+ */ |
|
| 768 |
+ int |
|
| 769 |
+ ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 770 |
+- U64 * ipSystemStatsHCInOctets_val_ptr) |
|
| 771 |
++ struct counter64 *ipSystemStatsHCInOctets_val_ptr) |
|
| 772 |
+ {
|
|
| 773 |
+ /** we should have a non-NULL pointer */ |
|
| 774 |
+ netsnmp_assert(NULL != ipSystemStatsHCInOctets_val_ptr); |
|
| 775 |
+@@ -1058,7 +1058,7 @@ |
|
| 776 |
+ int |
|
| 777 |
+ ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 778 |
+ rowreq_ctx, |
|
| 779 |
+- U64 * |
|
| 780 |
++ struct counter64 * |
|
| 781 |
+ ipSystemStatsHCInForwDatagrams_val_ptr) |
|
| 782 |
+ {
|
|
| 783 |
+ /** we should have a non-NULL pointer */ |
|
| 784 |
+@@ -1474,7 +1474,7 @@ |
|
| 785 |
+ */ |
|
| 786 |
+ int |
|
| 787 |
+ ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 788 |
+- U64 * ipSystemStatsHCInDelivers_val_ptr) |
|
| 789 |
++ struct counter64 *ipSystemStatsHCInDelivers_val_ptr) |
|
| 790 |
+ {
|
|
| 791 |
+ /** we should have a non-NULL pointer */ |
|
| 792 |
+ netsnmp_assert(NULL != ipSystemStatsHCInDelivers_val_ptr); |
|
| 793 |
+@@ -1602,7 +1602,7 @@ |
|
| 794 |
+ */ |
|
| 795 |
+ int |
|
| 796 |
+ ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 797 |
+- U64 * ipSystemStatsHCOutRequests_val_ptr) |
|
| 798 |
++ struct counter64 *ipSystemStatsHCOutRequests_val_ptr) |
|
| 799 |
+ {
|
|
| 800 |
+ /** we should have a non-NULL pointer */ |
|
| 801 |
+ netsnmp_assert(NULL != ipSystemStatsHCOutRequests_val_ptr); |
|
| 802 |
+@@ -1809,7 +1809,7 @@ |
|
| 803 |
+ int |
|
| 804 |
+ ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 805 |
+ rowreq_ctx, |
|
| 806 |
+- U64 * |
|
| 807 |
++ struct counter64 * |
|
| 808 |
+ ipSystemStatsHCOutForwDatagrams_val_ptr) |
|
| 809 |
+ {
|
|
| 810 |
+ /** we should have a non-NULL pointer */ |
|
| 811 |
+@@ -2288,7 +2288,7 @@ |
|
| 812 |
+ */ |
|
| 813 |
+ int |
|
| 814 |
+ ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 815 |
+- U64 * ipSystemStatsHCOutTransmits_val_ptr) |
|
| 816 |
++ struct counter64 *ipSystemStatsHCOutTransmits_val_ptr) |
|
| 817 |
+ {
|
|
| 818 |
+ /** we should have a non-NULL pointer */ |
|
| 819 |
+ netsnmp_assert(NULL != ipSystemStatsHCOutTransmits_val_ptr); |
|
| 820 |
+@@ -2415,7 +2415,7 @@ |
|
| 821 |
+ */ |
|
| 822 |
+ int |
|
| 823 |
+ ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 824 |
+- U64 * ipSystemStatsHCOutOctets_val_ptr) |
|
| 825 |
++ struct counter64 *ipSystemStatsHCOutOctets_val_ptr) |
|
| 826 |
+ {
|
|
| 827 |
+ /** we should have a non-NULL pointer */ |
|
| 828 |
+ netsnmp_assert(NULL != ipSystemStatsHCOutOctets_val_ptr); |
|
| 829 |
+@@ -2539,7 +2539,7 @@ |
|
| 830 |
+ */ |
|
| 831 |
+ int |
|
| 832 |
+ ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 833 |
+- U64 * ipSystemStatsHCInMcastPkts_val_ptr) |
|
| 834 |
++ struct counter64 *ipSystemStatsHCInMcastPkts_val_ptr) |
|
| 835 |
+ {
|
|
| 836 |
+ /** we should have a non-NULL pointer */ |
|
| 837 |
+ netsnmp_assert(NULL != ipSystemStatsHCInMcastPkts_val_ptr); |
|
| 838 |
+@@ -2665,7 +2665,7 @@ |
|
| 839 |
+ int |
|
| 840 |
+ ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 841 |
+ rowreq_ctx, |
|
| 842 |
+- U64 * |
|
| 843 |
++ struct counter64 * |
|
| 844 |
+ ipSystemStatsHCInMcastOctets_val_ptr) |
|
| 845 |
+ {
|
|
| 846 |
+ /** we should have a non-NULL pointer */ |
|
| 847 |
+@@ -2790,7 +2790,7 @@ |
|
| 848 |
+ */ |
|
| 849 |
+ int |
|
| 850 |
+ ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 851 |
+- U64 * ipSystemStatsHCOutMcastPkts_val_ptr) |
|
| 852 |
++ struct counter64 *ipSystemStatsHCOutMcastPkts_val_ptr) |
|
| 853 |
+ {
|
|
| 854 |
+ /** we should have a non-NULL pointer */ |
|
| 855 |
+ netsnmp_assert(NULL != ipSystemStatsHCOutMcastPkts_val_ptr); |
|
| 856 |
+@@ -2921,7 +2921,7 @@ |
|
| 857 |
+ int |
|
| 858 |
+ ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 859 |
+ rowreq_ctx, |
|
| 860 |
+- U64 * |
|
| 861 |
++ struct counter64 * |
|
| 862 |
+ ipSystemStatsHCOutMcastOctets_val_ptr) |
|
| 863 |
+ {
|
|
| 864 |
+ /** we should have a non-NULL pointer */ |
|
| 865 |
+@@ -3046,7 +3046,7 @@ |
|
| 866 |
+ */ |
|
| 867 |
+ int |
|
| 868 |
+ ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 869 |
+- U64 * ipSystemStatsHCInBcastPkts_val_ptr) |
|
| 870 |
++ struct counter64 *ipSystemStatsHCInBcastPkts_val_ptr) |
|
| 871 |
+ {
|
|
| 872 |
+ /** we should have a non-NULL pointer */ |
|
| 873 |
+ netsnmp_assert(NULL != ipSystemStatsHCInBcastPkts_val_ptr); |
|
| 874 |
+@@ -3170,7 +3170,7 @@ |
|
| 875 |
+ */ |
|
| 876 |
+ int |
|
| 877 |
+ ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, |
|
| 878 |
+- U64 * ipSystemStatsHCOutBcastPkts_val_ptr) |
|
| 879 |
++ struct counter64 *ipSystemStatsHCOutBcastPkts_val_ptr) |
|
| 880 |
+ {
|
|
| 881 |
+ /** we should have a non-NULL pointer */ |
|
| 882 |
+ netsnmp_assert(NULL != ipSystemStatsHCOutBcastPkts_val_ptr); |
|
| 883 |
+--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h |
|
| 884 |
+@@ -144,93 +144,22 @@ |
|
| 885 |
+ ********************************************************************* |
|
| 886 |
+ * function prototypes |
|
| 887 |
+ */ |
|
| 888 |
+- int |
|
| 889 |
+- |
|
| 890 |
+- |
|
| 891 |
+- |
|
| 892 |
+- |
|
| 893 |
+- |
|
| 894 |
+- |
|
| 895 |
+- |
|
| 896 |
+- |
|
| 897 |
+- |
|
| 898 |
+- |
|
| 899 |
+- |
|
| 900 |
+- |
|
| 901 |
+- |
|
| 902 |
+- |
|
| 903 |
+- |
|
| 904 |
+- ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * |
|
| 905 |
++ int ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * |
|
| 906 |
+ user_context); |
|
| 907 |
+- int |
|
| 908 |
+- |
|
| 909 |
+- |
|
| 910 |
+- |
|
| 911 |
+- |
|
| 912 |
+- |
|
| 913 |
+- |
|
| 914 |
+- |
|
| 915 |
+- |
|
| 916 |
+- |
|
| 917 |
+- |
|
| 918 |
+- |
|
| 919 |
+- |
|
| 920 |
+- |
|
| 921 |
+- |
|
| 922 |
+- |
|
| 923 |
+- ipSystemStatsTable_post_request(ipSystemStatsTable_registration * |
|
| 924 |
++ int ipSystemStatsTable_post_request(ipSystemStatsTable_registration * |
|
| 925 |
+ user_context, int rc); |
|
| 926 |
+ |
|
| 927 |
+- int |
|
| 928 |
+- |
|
| 929 |
+- |
|
| 930 |
+- |
|
| 931 |
+- |
|
| 932 |
+- |
|
| 933 |
+- |
|
| 934 |
+- |
|
| 935 |
+- |
|
| 936 |
+- |
|
| 937 |
+- |
|
| 938 |
+- |
|
| 939 |
+- |
|
| 940 |
+- |
|
| 941 |
+- |
|
| 942 |
+- |
|
| 943 |
+- ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * |
|
| 944 |
++ int ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * |
|
| 945 |
+ rowreq_ctx, |
|
| 946 |
+ void *user_init_ctx); |
|
| 947 |
+ void |
|
| 948 |
+- |
|
| 949 |
+- |
|
| 950 |
+- |
|
| 951 |
+- |
|
| 952 |
+- |
|
| 953 |
+- |
|
| 954 |
+- |
|
| 955 |
+- |
|
| 956 |
+- |
|
| 957 |
+- |
|
| 958 |
+- |
|
| 959 |
+- |
|
| 960 |
+- |
|
| 961 |
+- |
|
| 962 |
+- |
|
| 963 |
+ ipSystemStatsTable_rowreq_ctx_cleanup(ipSystemStatsTable_rowreq_ctx |
|
| 964 |
+ * rowreq_ctx); |
|
| 965 |
+ |
|
| 966 |
+ ipSystemStatsTable_data *ipSystemStatsTable_allocate_data(void); |
|
| 967 |
+ void ipSystemStatsTable_release_data(ipSystemStatsTable_data |
|
| 968 |
+ * data); |
|
| 969 |
+- |
|
| 970 |
+- |
|
| 971 |
+- |
|
| 972 |
+- |
|
| 973 |
+- |
|
| 974 |
+- |
|
| 975 |
+- |
|
| 976 |
+- |
|
| 977 |
+- ipSystemStatsTable_rowreq_ctx |
|
| 978 |
++ ipSystemStatsTable_rowreq_ctx |
|
| 979 |
+ * ipSystemStatsTable_row_find_by_mib_index |
|
| 980 |
+ (ipSystemStatsTable_mib_index * mib_idx); |
|
| 981 |
+ |
|
| 982 |
+@@ -265,226 +194,50 @@ |
|
| 983 |
+ * indexes |
|
| 984 |
+ */ |
|
| 985 |
+ |
|
| 986 |
+- int |
|
| 987 |
+- |
|
| 988 |
+- |
|
| 989 |
+- |
|
| 990 |
+- |
|
| 991 |
+- |
|
| 992 |
+- |
|
| 993 |
+- |
|
| 994 |
+- |
|
| 995 |
+- |
|
| 996 |
+- |
|
| 997 |
+- |
|
| 998 |
+- |
|
| 999 |
+- |
|
| 1000 |
+- |
|
| 1001 |
+- |
|
| 1002 |
+- ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1003 |
++ int ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1004 |
+ rowreq_ctx, |
|
| 1005 |
+ u_long * |
|
| 1006 |
+ ipSystemStatsInReceives_val_ptr); |
|
| 1007 |
+- int |
|
| 1008 |
+- |
|
| 1009 |
+- |
|
| 1010 |
+- |
|
| 1011 |
+- |
|
| 1012 |
+- |
|
| 1013 |
+- |
|
| 1014 |
+- |
|
| 1015 |
+- |
|
| 1016 |
+- |
|
| 1017 |
+- |
|
| 1018 |
+- |
|
| 1019 |
+- |
|
| 1020 |
+- |
|
| 1021 |
+- |
|
| 1022 |
+- |
|
| 1023 |
+- ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1024 |
+- rowreq_ctx, |
|
| 1025 |
+- U64 * |
|
| 1026 |
++ int ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1027 |
++ rowreq_ctx, |
|
| 1028 |
++ struct counter64 * |
|
| 1029 |
+ ipSystemStatsHCInReceives_val_ptr); |
|
| 1030 |
+ int ipSystemStatsInOctets_get(ipSystemStatsTable_rowreq_ctx |
|
| 1031 |
+ * rowreq_ctx, |
|
| 1032 |
+ u_long * |
|
| 1033 |
+ ipSystemStatsInOctets_val_ptr); |
|
| 1034 |
+- int |
|
| 1035 |
+- |
|
| 1036 |
+- |
|
| 1037 |
+- |
|
| 1038 |
+- |
|
| 1039 |
+- |
|
| 1040 |
+- |
|
| 1041 |
+- |
|
| 1042 |
+- |
|
| 1043 |
+- |
|
| 1044 |
+- |
|
| 1045 |
+- |
|
| 1046 |
+- |
|
| 1047 |
+- |
|
| 1048 |
+- |
|
| 1049 |
+- |
|
| 1050 |
+- ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1051 |
+- rowreq_ctx, |
|
| 1052 |
+- U64 * ipSystemStatsHCInOctets_val_ptr); |
|
| 1053 |
+- int |
|
| 1054 |
+- |
|
| 1055 |
+- |
|
| 1056 |
+- |
|
| 1057 |
+- |
|
| 1058 |
+- |
|
| 1059 |
+- |
|
| 1060 |
+- |
|
| 1061 |
+- |
|
| 1062 |
+- |
|
| 1063 |
+- |
|
| 1064 |
+- |
|
| 1065 |
+- |
|
| 1066 |
+- |
|
| 1067 |
+- |
|
| 1068 |
+- |
|
| 1069 |
+- ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1070 |
++ int ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1071 |
++ rowreq_ctx, |
|
| 1072 |
++ struct counter64 *ipSystemStatsHCInOctets_val_ptr); |
|
| 1073 |
++ int ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1074 |
+ rowreq_ctx, |
|
| 1075 |
+ u_long * |
|
| 1076 |
+ ipSystemStatsInHdrErrors_val_ptr); |
|
| 1077 |
+- int |
|
| 1078 |
+- |
|
| 1079 |
+- |
|
| 1080 |
+- |
|
| 1081 |
+- |
|
| 1082 |
+- |
|
| 1083 |
+- |
|
| 1084 |
+- |
|
| 1085 |
+- |
|
| 1086 |
+- |
|
| 1087 |
+- |
|
| 1088 |
+- |
|
| 1089 |
+- |
|
| 1090 |
+- |
|
| 1091 |
+- |
|
| 1092 |
+- |
|
| 1093 |
+- ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1094 |
++ int ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1095 |
+ rowreq_ctx, |
|
| 1096 |
+ u_long * |
|
| 1097 |
+ ipSystemStatsInNoRoutes_val_ptr); |
|
| 1098 |
+- int |
|
| 1099 |
+- |
|
| 1100 |
+- |
|
| 1101 |
+- |
|
| 1102 |
+- |
|
| 1103 |
+- |
|
| 1104 |
+- |
|
| 1105 |
+- |
|
| 1106 |
+- |
|
| 1107 |
+- |
|
| 1108 |
+- |
|
| 1109 |
+- |
|
| 1110 |
+- |
|
| 1111 |
+- |
|
| 1112 |
+- |
|
| 1113 |
+- |
|
| 1114 |
+- ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1115 |
++ int ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1116 |
+ rowreq_ctx, |
|
| 1117 |
+ u_long * |
|
| 1118 |
+ ipSystemStatsInAddrErrors_val_ptr); |
|
| 1119 |
+- int |
|
| 1120 |
+- |
|
| 1121 |
+- |
|
| 1122 |
+- |
|
| 1123 |
+- |
|
| 1124 |
+- |
|
| 1125 |
+- |
|
| 1126 |
+- |
|
| 1127 |
+- |
|
| 1128 |
+- |
|
| 1129 |
+- |
|
| 1130 |
+- |
|
| 1131 |
+- |
|
| 1132 |
+- |
|
| 1133 |
+- |
|
| 1134 |
+- |
|
| 1135 |
+- ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1136 |
++ int ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1137 |
+ rowreq_ctx, |
|
| 1138 |
+ u_long * |
|
| 1139 |
+ ipSystemStatsInUnknownProtos_val_ptr); |
|
| 1140 |
+- int |
|
| 1141 |
+- |
|
| 1142 |
+- |
|
| 1143 |
+- |
|
| 1144 |
+- |
|
| 1145 |
+- |
|
| 1146 |
+- |
|
| 1147 |
+- |
|
| 1148 |
+- |
|
| 1149 |
+- |
|
| 1150 |
+- |
|
| 1151 |
+- |
|
| 1152 |
+- |
|
| 1153 |
+- |
|
| 1154 |
+- |
|
| 1155 |
+- |
|
| 1156 |
+- ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1157 |
++ int ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1158 |
+ rowreq_ctx, |
|
| 1159 |
+ u_long * |
|
| 1160 |
+ ipSystemStatsInTruncatedPkts_val_ptr); |
|
| 1161 |
+- int |
|
| 1162 |
+- |
|
| 1163 |
+- |
|
| 1164 |
+- |
|
| 1165 |
+- |
|
| 1166 |
+- |
|
| 1167 |
+- |
|
| 1168 |
+- |
|
| 1169 |
+- |
|
| 1170 |
+- |
|
| 1171 |
+- |
|
| 1172 |
+- |
|
| 1173 |
+- |
|
| 1174 |
+- |
|
| 1175 |
+- |
|
| 1176 |
+- |
|
| 1177 |
+- ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1178 |
++ int ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1179 |
+ rowreq_ctx, |
|
| 1180 |
+ u_long * |
|
| 1181 |
+ ipSystemStatsInForwDatagrams_val_ptr); |
|
| 1182 |
+- int |
|
| 1183 |
+- |
|
| 1184 |
+- |
|
| 1185 |
+- |
|
| 1186 |
+- |
|
| 1187 |
+- |
|
| 1188 |
+- |
|
| 1189 |
+- |
|
| 1190 |
+- |
|
| 1191 |
+- |
|
| 1192 |
+- |
|
| 1193 |
+- |
|
| 1194 |
+- |
|
| 1195 |
+- |
|
| 1196 |
+- |
|
| 1197 |
+- |
|
| 1198 |
+- ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1199 |
++ int ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1200 |
+ rowreq_ctx, |
|
| 1201 |
+- U64 * |
|
| 1202 |
++ struct counter64 * |
|
| 1203 |
+ ipSystemStatsHCInForwDatagrams_val_ptr); |
|
| 1204 |
+- int |
|
| 1205 |
+- |
|
| 1206 |
+- |
|
| 1207 |
+- |
|
| 1208 |
+- |
|
| 1209 |
+- |
|
| 1210 |
+- |
|
| 1211 |
+- |
|
| 1212 |
+- |
|
| 1213 |
+- |
|
| 1214 |
+- |
|
| 1215 |
+- |
|
| 1216 |
+- |
|
| 1217 |
+- |
|
| 1218 |
+- |
|
| 1219 |
+- |
|
| 1220 |
+- ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1221 |
++ int ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1222 |
+ rowreq_ctx, |
|
| 1223 |
+ u_long * |
|
| 1224 |
+ ipSystemStatsReasmReqds_val_ptr); |
|
| 1225 |
+@@ -492,689 +245,141 @@ |
|
| 1226 |
+ * rowreq_ctx, |
|
| 1227 |
+ u_long * |
|
| 1228 |
+ ipSystemStatsReasmOKs_val_ptr); |
|
| 1229 |
+- int |
|
| 1230 |
+- |
|
| 1231 |
+- |
|
| 1232 |
+- |
|
| 1233 |
+- |
|
| 1234 |
+- |
|
| 1235 |
+- |
|
| 1236 |
+- |
|
| 1237 |
+- |
|
| 1238 |
+- |
|
| 1239 |
+- |
|
| 1240 |
+- |
|
| 1241 |
+- |
|
| 1242 |
+- |
|
| 1243 |
+- |
|
| 1244 |
+- |
|
| 1245 |
+- ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1246 |
++ int ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1247 |
+ rowreq_ctx, |
|
| 1248 |
+ u_long * |
|
| 1249 |
+ ipSystemStatsReasmFails_val_ptr); |
|
| 1250 |
+- int |
|
| 1251 |
+- |
|
| 1252 |
+- |
|
| 1253 |
+- |
|
| 1254 |
+- |
|
| 1255 |
+- |
|
| 1256 |
+- |
|
| 1257 |
+- |
|
| 1258 |
+- |
|
| 1259 |
+- |
|
| 1260 |
+- |
|
| 1261 |
+- |
|
| 1262 |
+- |
|
| 1263 |
+- |
|
| 1264 |
+- |
|
| 1265 |
+- |
|
| 1266 |
+- ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1267 |
++ int ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1268 |
+ rowreq_ctx, |
|
| 1269 |
+ u_long * |
|
| 1270 |
+ ipSystemStatsInDiscards_val_ptr); |
|
| 1271 |
+- int |
|
| 1272 |
+- |
|
| 1273 |
+- |
|
| 1274 |
+- |
|
| 1275 |
+- |
|
| 1276 |
+- |
|
| 1277 |
+- |
|
| 1278 |
+- |
|
| 1279 |
+- |
|
| 1280 |
+- |
|
| 1281 |
+- |
|
| 1282 |
+- |
|
| 1283 |
+- |
|
| 1284 |
+- |
|
| 1285 |
+- |
|
| 1286 |
+- |
|
| 1287 |
+- ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1288 |
++ int ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1289 |
+ rowreq_ctx, |
|
| 1290 |
+ u_long * |
|
| 1291 |
+ ipSystemStatsInDelivers_val_ptr); |
|
| 1292 |
+- int |
|
| 1293 |
+- |
|
| 1294 |
+- |
|
| 1295 |
+- |
|
| 1296 |
+- |
|
| 1297 |
+- |
|
| 1298 |
+- |
|
| 1299 |
+- |
|
| 1300 |
+- |
|
| 1301 |
+- |
|
| 1302 |
+- |
|
| 1303 |
+- |
|
| 1304 |
+- |
|
| 1305 |
+- |
|
| 1306 |
+- |
|
| 1307 |
+- |
|
| 1308 |
+- ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1309 |
+- rowreq_ctx, |
|
| 1310 |
+- U64 * |
|
| 1311 |
++ int ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1312 |
++ rowreq_ctx, |
|
| 1313 |
++ struct counter64 * |
|
| 1314 |
+ ipSystemStatsHCInDelivers_val_ptr); |
|
| 1315 |
+- int |
|
| 1316 |
+- |
|
| 1317 |
+- |
|
| 1318 |
+- |
|
| 1319 |
+- |
|
| 1320 |
+- |
|
| 1321 |
+- |
|
| 1322 |
+- |
|
| 1323 |
+- |
|
| 1324 |
+- |
|
| 1325 |
+- |
|
| 1326 |
+- |
|
| 1327 |
+- |
|
| 1328 |
+- |
|
| 1329 |
+- |
|
| 1330 |
+- |
|
| 1331 |
+- ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1332 |
++ int ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1333 |
+ rowreq_ctx, |
|
| 1334 |
+ u_long * |
|
| 1335 |
+ ipSystemStatsOutRequests_val_ptr); |
|
| 1336 |
+- int |
|
| 1337 |
+- |
|
| 1338 |
+- |
|
| 1339 |
+- |
|
| 1340 |
+- |
|
| 1341 |
+- |
|
| 1342 |
+- |
|
| 1343 |
+- |
|
| 1344 |
+- |
|
| 1345 |
+- |
|
| 1346 |
+- |
|
| 1347 |
+- |
|
| 1348 |
+- |
|
| 1349 |
+- |
|
| 1350 |
+- |
|
| 1351 |
+- |
|
| 1352 |
+- ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1353 |
++ int ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1354 |
+ rowreq_ctx, |
|
| 1355 |
+- U64 * |
|
| 1356 |
++ struct counter64 * |
|
| 1357 |
+ ipSystemStatsHCOutRequests_val_ptr); |
|
| 1358 |
+- int |
|
| 1359 |
+- |
|
| 1360 |
+- |
|
| 1361 |
+- |
|
| 1362 |
+- |
|
| 1363 |
+- |
|
| 1364 |
+- |
|
| 1365 |
+- |
|
| 1366 |
+- |
|
| 1367 |
+- |
|
| 1368 |
+- |
|
| 1369 |
+- |
|
| 1370 |
+- |
|
| 1371 |
+- |
|
| 1372 |
+- |
|
| 1373 |
+- |
|
| 1374 |
+- ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1375 |
++ int ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1376 |
+ rowreq_ctx, |
|
| 1377 |
+ u_long * |
|
| 1378 |
+ ipSystemStatsOutNoRoutes_val_ptr); |
|
| 1379 |
+- int |
|
| 1380 |
+- |
|
| 1381 |
+- |
|
| 1382 |
+- |
|
| 1383 |
+- |
|
| 1384 |
+- |
|
| 1385 |
+- |
|
| 1386 |
+- |
|
| 1387 |
+- |
|
| 1388 |
+- |
|
| 1389 |
+- |
|
| 1390 |
+- |
|
| 1391 |
+- |
|
| 1392 |
+- |
|
| 1393 |
+- |
|
| 1394 |
+- |
|
| 1395 |
+- ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1396 |
++ int ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1397 |
+ rowreq_ctx, |
|
| 1398 |
+ u_long * |
|
| 1399 |
+ ipSystemStatsOutForwDatagrams_val_ptr); |
|
| 1400 |
+- int |
|
| 1401 |
+- |
|
| 1402 |
+- |
|
| 1403 |
+- |
|
| 1404 |
+- |
|
| 1405 |
+- |
|
| 1406 |
+- |
|
| 1407 |
+- |
|
| 1408 |
+- |
|
| 1409 |
+- |
|
| 1410 |
+- |
|
| 1411 |
+- |
|
| 1412 |
+- |
|
| 1413 |
+- |
|
| 1414 |
+- |
|
| 1415 |
+- |
|
| 1416 |
+- ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1417 |
++ int ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1418 |
+ rowreq_ctx, |
|
| 1419 |
+- U64 * |
|
| 1420 |
++ struct counter64 * |
|
| 1421 |
+ ipSystemStatsHCOutForwDatagrams_val_ptr); |
|
| 1422 |
+- int |
|
| 1423 |
+- |
|
| 1424 |
+- |
|
| 1425 |
+- |
|
| 1426 |
+- |
|
| 1427 |
+- |
|
| 1428 |
+- |
|
| 1429 |
+- |
|
| 1430 |
+- |
|
| 1431 |
+- |
|
| 1432 |
+- |
|
| 1433 |
+- |
|
| 1434 |
+- |
|
| 1435 |
+- |
|
| 1436 |
+- |
|
| 1437 |
+- |
|
| 1438 |
+- ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1439 |
++ int ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1440 |
+ rowreq_ctx, |
|
| 1441 |
+ u_long * |
|
| 1442 |
+ ipSystemStatsOutDiscards_val_ptr); |
|
| 1443 |
+- int |
|
| 1444 |
+- |
|
| 1445 |
+- |
|
| 1446 |
+- |
|
| 1447 |
+- |
|
| 1448 |
+- |
|
| 1449 |
+- |
|
| 1450 |
+- |
|
| 1451 |
+- |
|
| 1452 |
+- |
|
| 1453 |
+- |
|
| 1454 |
+- |
|
| 1455 |
+- |
|
| 1456 |
+- |
|
| 1457 |
+- |
|
| 1458 |
+- |
|
| 1459 |
+- ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1460 |
++ int ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1461 |
+ rowreq_ctx, |
|
| 1462 |
+ u_long * |
|
| 1463 |
+ ipSystemStatsOutFragReqds_val_ptr); |
|
| 1464 |
+- int |
|
| 1465 |
+- |
|
| 1466 |
+- |
|
| 1467 |
+- |
|
| 1468 |
+- |
|
| 1469 |
+- |
|
| 1470 |
+- |
|
| 1471 |
+- |
|
| 1472 |
+- |
|
| 1473 |
+- |
|
| 1474 |
+- |
|
| 1475 |
+- |
|
| 1476 |
+- |
|
| 1477 |
+- |
|
| 1478 |
+- |
|
| 1479 |
+- |
|
| 1480 |
+- ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1481 |
++ int ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1482 |
+ rowreq_ctx, |
|
| 1483 |
+ u_long * |
|
| 1484 |
+ ipSystemStatsOutFragOKs_val_ptr); |
|
| 1485 |
+- int |
|
| 1486 |
+- |
|
| 1487 |
+- |
|
| 1488 |
+- |
|
| 1489 |
+- |
|
| 1490 |
+- |
|
| 1491 |
+- |
|
| 1492 |
+- |
|
| 1493 |
+- |
|
| 1494 |
+- |
|
| 1495 |
+- |
|
| 1496 |
+- |
|
| 1497 |
+- |
|
| 1498 |
+- |
|
| 1499 |
+- |
|
| 1500 |
+- |
|
| 1501 |
+- ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1502 |
++ int ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1503 |
+ rowreq_ctx, |
|
| 1504 |
+ u_long * |
|
| 1505 |
+ ipSystemStatsOutFragFails_val_ptr); |
|
| 1506 |
+- int |
|
| 1507 |
+- |
|
| 1508 |
+- |
|
| 1509 |
+- |
|
| 1510 |
+- |
|
| 1511 |
+- |
|
| 1512 |
+- |
|
| 1513 |
+- |
|
| 1514 |
+- |
|
| 1515 |
+- |
|
| 1516 |
+- |
|
| 1517 |
+- |
|
| 1518 |
+- |
|
| 1519 |
+- |
|
| 1520 |
+- |
|
| 1521 |
+- |
|
| 1522 |
+- ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1523 |
++ int ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1524 |
+ rowreq_ctx, |
|
| 1525 |
+ u_long * |
|
| 1526 |
+ ipSystemStatsOutFragCreates_val_ptr); |
|
| 1527 |
+- int |
|
| 1528 |
+- |
|
| 1529 |
+- |
|
| 1530 |
+- |
|
| 1531 |
+- |
|
| 1532 |
+- |
|
| 1533 |
+- |
|
| 1534 |
+- |
|
| 1535 |
+- |
|
| 1536 |
+- |
|
| 1537 |
+- |
|
| 1538 |
+- |
|
| 1539 |
+- |
|
| 1540 |
+- |
|
| 1541 |
+- |
|
| 1542 |
+- |
|
| 1543 |
+- ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1544 |
++ int ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1545 |
+ rowreq_ctx, |
|
| 1546 |
+ u_long * |
|
| 1547 |
+ ipSystemStatsOutTransmits_val_ptr); |
|
| 1548 |
+- int |
|
| 1549 |
+- |
|
| 1550 |
+- |
|
| 1551 |
+- |
|
| 1552 |
+- |
|
| 1553 |
+- |
|
| 1554 |
+- |
|
| 1555 |
+- |
|
| 1556 |
+- |
|
| 1557 |
+- |
|
| 1558 |
+- |
|
| 1559 |
+- |
|
| 1560 |
+- |
|
| 1561 |
+- |
|
| 1562 |
+- |
|
| 1563 |
+- |
|
| 1564 |
+- ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1565 |
++ int ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1566 |
+ rowreq_ctx, |
|
| 1567 |
+- U64 * |
|
| 1568 |
++ struct counter64 * |
|
| 1569 |
+ ipSystemStatsHCOutTransmits_val_ptr); |
|
| 1570 |
+- int |
|
| 1571 |
+- |
|
| 1572 |
+- |
|
| 1573 |
+- |
|
| 1574 |
+- |
|
| 1575 |
+- |
|
| 1576 |
+- |
|
| 1577 |
+- |
|
| 1578 |
+- |
|
| 1579 |
+- |
|
| 1580 |
+- |
|
| 1581 |
+- |
|
| 1582 |
+- |
|
| 1583 |
+- |
|
| 1584 |
+- |
|
| 1585 |
+- |
|
| 1586 |
+- ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1587 |
++ int ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1588 |
+ rowreq_ctx, |
|
| 1589 |
+ u_long * |
|
| 1590 |
+ ipSystemStatsOutOctets_val_ptr); |
|
| 1591 |
+- int |
|
| 1592 |
+- |
|
| 1593 |
+- |
|
| 1594 |
+- |
|
| 1595 |
+- |
|
| 1596 |
+- |
|
| 1597 |
+- |
|
| 1598 |
+- |
|
| 1599 |
+- |
|
| 1600 |
+- |
|
| 1601 |
+- |
|
| 1602 |
+- |
|
| 1603 |
+- |
|
| 1604 |
+- |
|
| 1605 |
+- |
|
| 1606 |
+- |
|
| 1607 |
+- ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1608 |
+- rowreq_ctx, |
|
| 1609 |
+- U64 * |
|
| 1610 |
++ int ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1611 |
++ rowreq_ctx, |
|
| 1612 |
++ struct counter64 * |
|
| 1613 |
+ ipSystemStatsHCOutOctets_val_ptr); |
|
| 1614 |
+- int |
|
| 1615 |
+- |
|
| 1616 |
+- |
|
| 1617 |
+- |
|
| 1618 |
+- |
|
| 1619 |
+- |
|
| 1620 |
+- |
|
| 1621 |
+- |
|
| 1622 |
+- |
|
| 1623 |
+- |
|
| 1624 |
+- |
|
| 1625 |
+- |
|
| 1626 |
+- |
|
| 1627 |
+- |
|
| 1628 |
+- |
|
| 1629 |
+- |
|
| 1630 |
+- ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1631 |
++ int ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1632 |
+ rowreq_ctx, |
|
| 1633 |
+ u_long * |
|
| 1634 |
+ ipSystemStatsInMcastPkts_val_ptr); |
|
| 1635 |
+- int |
|
| 1636 |
+- |
|
| 1637 |
+- |
|
| 1638 |
+- |
|
| 1639 |
+- |
|
| 1640 |
+- |
|
| 1641 |
+- |
|
| 1642 |
+- |
|
| 1643 |
+- |
|
| 1644 |
+- |
|
| 1645 |
+- |
|
| 1646 |
+- |
|
| 1647 |
+- |
|
| 1648 |
+- |
|
| 1649 |
+- |
|
| 1650 |
+- |
|
| 1651 |
+- ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1652 |
++ int ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1653 |
+ rowreq_ctx, |
|
| 1654 |
+- U64 * |
|
| 1655 |
++ struct counter64 * |
|
| 1656 |
+ ipSystemStatsHCInMcastPkts_val_ptr); |
|
| 1657 |
+- int |
|
| 1658 |
+- |
|
| 1659 |
+- |
|
| 1660 |
+- |
|
| 1661 |
+- |
|
| 1662 |
+- |
|
| 1663 |
+- |
|
| 1664 |
+- |
|
| 1665 |
+- |
|
| 1666 |
+- |
|
| 1667 |
+- |
|
| 1668 |
+- |
|
| 1669 |
+- |
|
| 1670 |
+- |
|
| 1671 |
+- |
|
| 1672 |
+- |
|
| 1673 |
+- ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1674 |
++ int ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1675 |
+ rowreq_ctx, |
|
| 1676 |
+ u_long * |
|
| 1677 |
+ ipSystemStatsInMcastOctets_val_ptr); |
|
| 1678 |
+- int |
|
| 1679 |
+- |
|
| 1680 |
+- |
|
| 1681 |
+- |
|
| 1682 |
+- |
|
| 1683 |
+- |
|
| 1684 |
+- |
|
| 1685 |
+- |
|
| 1686 |
+- |
|
| 1687 |
+- |
|
| 1688 |
+- |
|
| 1689 |
+- |
|
| 1690 |
+- |
|
| 1691 |
+- |
|
| 1692 |
+- |
|
| 1693 |
+- |
|
| 1694 |
+- ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1695 |
++ int ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1696 |
+ rowreq_ctx, |
|
| 1697 |
+- U64 * |
|
| 1698 |
++ struct counter64 * |
|
| 1699 |
+ ipSystemStatsHCInMcastOctets_val_ptr); |
|
| 1700 |
+- int |
|
| 1701 |
+- |
|
| 1702 |
+- |
|
| 1703 |
+- |
|
| 1704 |
+- |
|
| 1705 |
+- |
|
| 1706 |
+- |
|
| 1707 |
+- |
|
| 1708 |
+- |
|
| 1709 |
+- |
|
| 1710 |
+- |
|
| 1711 |
+- |
|
| 1712 |
+- |
|
| 1713 |
+- |
|
| 1714 |
+- |
|
| 1715 |
+- |
|
| 1716 |
+- ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1717 |
++ int ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1718 |
+ rowreq_ctx, |
|
| 1719 |
+ u_long * |
|
| 1720 |
+ ipSystemStatsOutMcastPkts_val_ptr); |
|
| 1721 |
+- int |
|
| 1722 |
+- |
|
| 1723 |
+- |
|
| 1724 |
+- |
|
| 1725 |
+- |
|
| 1726 |
+- |
|
| 1727 |
+- |
|
| 1728 |
+- |
|
| 1729 |
+- |
|
| 1730 |
+- |
|
| 1731 |
+- |
|
| 1732 |
+- |
|
| 1733 |
+- |
|
| 1734 |
+- |
|
| 1735 |
+- |
|
| 1736 |
+- |
|
| 1737 |
+- ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1738 |
++ int ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1739 |
+ rowreq_ctx, |
|
| 1740 |
+- U64 * |
|
| 1741 |
++ struct counter64 * |
|
| 1742 |
+ ipSystemStatsHCOutMcastPkts_val_ptr); |
|
| 1743 |
+- int |
|
| 1744 |
+- |
|
| 1745 |
+- |
|
| 1746 |
+- |
|
| 1747 |
+- |
|
| 1748 |
+- |
|
| 1749 |
+- |
|
| 1750 |
+- |
|
| 1751 |
+- |
|
| 1752 |
+- |
|
| 1753 |
+- |
|
| 1754 |
+- |
|
| 1755 |
+- |
|
| 1756 |
+- |
|
| 1757 |
+- |
|
| 1758 |
+- |
|
| 1759 |
+- ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1760 |
++ int ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1761 |
+ rowreq_ctx, |
|
| 1762 |
+ u_long * |
|
| 1763 |
+ ipSystemStatsOutMcastOctets_val_ptr); |
|
| 1764 |
+- int |
|
| 1765 |
+- |
|
| 1766 |
+- |
|
| 1767 |
+- |
|
| 1768 |
+- |
|
| 1769 |
+- |
|
| 1770 |
+- |
|
| 1771 |
+- |
|
| 1772 |
+- |
|
| 1773 |
+- |
|
| 1774 |
+- |
|
| 1775 |
+- |
|
| 1776 |
+- |
|
| 1777 |
+- |
|
| 1778 |
+- |
|
| 1779 |
+- |
|
| 1780 |
+- ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1781 |
++ int ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1782 |
+ rowreq_ctx, |
|
| 1783 |
+- U64 * |
|
| 1784 |
++ struct counter64 * |
|
| 1785 |
+ ipSystemStatsHCOutMcastOctets_val_ptr); |
|
| 1786 |
+- int |
|
| 1787 |
+- |
|
| 1788 |
+- |
|
| 1789 |
+- |
|
| 1790 |
+- |
|
| 1791 |
+- |
|
| 1792 |
+- |
|
| 1793 |
+- |
|
| 1794 |
+- |
|
| 1795 |
+- |
|
| 1796 |
+- |
|
| 1797 |
+- |
|
| 1798 |
+- |
|
| 1799 |
+- |
|
| 1800 |
+- |
|
| 1801 |
+- |
|
| 1802 |
+- ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1803 |
++ int ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1804 |
+ rowreq_ctx, |
|
| 1805 |
+ u_long * |
|
| 1806 |
+ ipSystemStatsInBcastPkts_val_ptr); |
|
| 1807 |
+- int |
|
| 1808 |
+- |
|
| 1809 |
+- |
|
| 1810 |
+- |
|
| 1811 |
+- |
|
| 1812 |
+- |
|
| 1813 |
+- |
|
| 1814 |
+- |
|
| 1815 |
+- |
|
| 1816 |
+- |
|
| 1817 |
+- |
|
| 1818 |
+- |
|
| 1819 |
+- |
|
| 1820 |
+- |
|
| 1821 |
+- |
|
| 1822 |
+- |
|
| 1823 |
+- ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1824 |
++ int ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1825 |
+ rowreq_ctx, |
|
| 1826 |
+- U64 * |
|
| 1827 |
++ struct counter64 * |
|
| 1828 |
+ ipSystemStatsHCInBcastPkts_val_ptr); |
|
| 1829 |
+- int |
|
| 1830 |
+- |
|
| 1831 |
+- |
|
| 1832 |
+- |
|
| 1833 |
+- |
|
| 1834 |
+- |
|
| 1835 |
+- |
|
| 1836 |
+- |
|
| 1837 |
+- |
|
| 1838 |
+- |
|
| 1839 |
+- |
|
| 1840 |
+- |
|
| 1841 |
+- |
|
| 1842 |
+- |
|
| 1843 |
+- |
|
| 1844 |
+- |
|
| 1845 |
+- ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1846 |
++ int ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1847 |
+ rowreq_ctx, |
|
| 1848 |
+ u_long * |
|
| 1849 |
+ ipSystemStatsOutBcastPkts_val_ptr); |
|
| 1850 |
+- int |
|
| 1851 |
+- |
|
| 1852 |
+- |
|
| 1853 |
+- |
|
| 1854 |
+- |
|
| 1855 |
+- |
|
| 1856 |
+- |
|
| 1857 |
+- |
|
| 1858 |
+- |
|
| 1859 |
+- |
|
| 1860 |
+- |
|
| 1861 |
+- |
|
| 1862 |
+- |
|
| 1863 |
+- |
|
| 1864 |
+- |
|
| 1865 |
+- |
|
| 1866 |
+- ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1867 |
++ int ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1868 |
+ rowreq_ctx, |
|
| 1869 |
+- U64 * |
|
| 1870 |
++ struct counter64 * |
|
| 1871 |
+ ipSystemStatsHCOutBcastPkts_val_ptr); |
|
| 1872 |
+- int |
|
| 1873 |
+- |
|
| 1874 |
+- |
|
| 1875 |
+- |
|
| 1876 |
+- |
|
| 1877 |
+- |
|
| 1878 |
+- |
|
| 1879 |
+- |
|
| 1880 |
+- |
|
| 1881 |
+- |
|
| 1882 |
+- |
|
| 1883 |
+- |
|
| 1884 |
+- |
|
| 1885 |
+- |
|
| 1886 |
+- |
|
| 1887 |
+- |
|
| 1888 |
+- ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1889 |
++ int ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1890 |
+ rowreq_ctx, |
|
| 1891 |
+ u_long * |
|
| 1892 |
+ ipSystemStatsDiscontinuityTime_val_ptr); |
|
| 1893 |
+- int |
|
| 1894 |
+- |
|
| 1895 |
+- |
|
| 1896 |
+- |
|
| 1897 |
+- |
|
| 1898 |
+- |
|
| 1899 |
+- |
|
| 1900 |
+- |
|
| 1901 |
+- |
|
| 1902 |
+- |
|
| 1903 |
+- |
|
| 1904 |
+- |
|
| 1905 |
+- |
|
| 1906 |
+- |
|
| 1907 |
+- |
|
| 1908 |
+- |
|
| 1909 |
+- ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1910 |
++ int ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * |
|
| 1911 |
+ rowreq_ctx, |
|
| 1912 |
+ u_long * |
|
| 1913 |
+ ipSystemStatsRefreshRate_val_ptr); |
|
| 1914 |
+- |
|
| 1915 |
+- |
|
| 1916 |
+- int |
|
| 1917 |
+- |
|
| 1918 |
+- |
|
| 1919 |
+- |
|
| 1920 |
+- |
|
| 1921 |
+- |
|
| 1922 |
+- |
|
| 1923 |
+- |
|
| 1924 |
+- |
|
| 1925 |
+- |
|
| 1926 |
+- |
|
| 1927 |
+- |
|
| 1928 |
+- |
|
| 1929 |
+- |
|
| 1930 |
+- |
|
| 1931 |
+- |
|
| 1932 |
+- ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index |
|
| 1933 |
++ int ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index |
|
| 1934 |
+ * tbl_idx, |
|
| 1935 |
+ u_long |
|
| 1936 |
+ ipSystemStatsIPVersion_val); |
|
| 1937 |
+- int |
|
| 1938 |
+- |
|
| 1939 |
+- |
|
| 1940 |
+- |
|
| 1941 |
+- |
|
| 1942 |
+- |
|
| 1943 |
+- |
|
| 1944 |
+- |
|
| 1945 |
+- |
|
| 1946 |
+- |
|
| 1947 |
+- |
|
| 1948 |
+- |
|
| 1949 |
+- |
|
| 1950 |
+- |
|
| 1951 |
+- |
|
| 1952 |
+- |
|
| 1953 |
+- ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * |
|
| 1954 |
++ int ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * |
|
| 1955 |
+ rowreq_ctx, |
|
| 1956 |
+ u_long ipSystemStatsIPVersion_val); |
|
| 1957 |
+- |
|
| 1958 |
+- |
|
| 1959 |
+ |
|
| 1960 |
+ /* |
|
| 1961 |
+ ********************************************************************* |
|
| 1962 |
+--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c |
|
| 1963 |
+@@ -674,10 +674,10 @@ |
|
| 1964 |
+ * ipSystemStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 1965 |
+ */ |
|
| 1966 |
+ case COLUMN_IPSYSTEMSTATSHCINRECEIVES: |
|
| 1967 |
+- var->val_len = sizeof(U64); |
|
| 1968 |
++ var->val_len = sizeof(struct counter64); |
|
| 1969 |
+ var->type = ASN_COUNTER64; |
|
| 1970 |
+ rc = ipSystemStatsHCInReceives_get(rowreq_ctx, |
|
| 1971 |
+- (U64 *) var->val.string); |
|
| 1972 |
++ (struct counter64 *) var->val.string); |
|
| 1973 |
+ break; |
|
| 1974 |
+ |
|
| 1975 |
+ /* |
|
| 1976 |
+@@ -694,10 +694,10 @@ |
|
| 1977 |
+ * ipSystemStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 1978 |
+ */ |
|
| 1979 |
+ case COLUMN_IPSYSTEMSTATSHCINOCTETS: |
|
| 1980 |
+- var->val_len = sizeof(U64); |
|
| 1981 |
++ var->val_len = sizeof(struct counter64); |
|
| 1982 |
+ var->type = ASN_COUNTER64; |
|
| 1983 |
+ rc = ipSystemStatsHCInOctets_get(rowreq_ctx, |
|
| 1984 |
+- (U64 *) var->val.string); |
|
| 1985 |
++ (struct counter64 *) var->val.string); |
|
| 1986 |
+ break; |
|
| 1987 |
+ |
|
| 1988 |
+ /* |
|
| 1989 |
+@@ -764,10 +764,10 @@ |
|
| 1990 |
+ * ipSystemStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 1991 |
+ */ |
|
| 1992 |
+ case COLUMN_IPSYSTEMSTATSHCINFORWDATAGRAMS: |
|
| 1993 |
+- var->val_len = sizeof(U64); |
|
| 1994 |
++ var->val_len = sizeof(struct counter64); |
|
| 1995 |
+ var->type = ASN_COUNTER64; |
|
| 1996 |
+ rc = ipSystemStatsHCInForwDatagrams_get(rowreq_ctx, |
|
| 1997 |
+- (U64 *) var->val.string); |
|
| 1998 |
++ (struct counter64 *) var->val.string); |
|
| 1999 |
+ break; |
|
| 2000 |
+ |
|
| 2001 |
+ /* |
|
| 2002 |
+@@ -824,10 +824,10 @@ |
|
| 2003 |
+ * ipSystemStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2004 |
+ */ |
|
| 2005 |
+ case COLUMN_IPSYSTEMSTATSHCINDELIVERS: |
|
| 2006 |
+- var->val_len = sizeof(U64); |
|
| 2007 |
++ var->val_len = sizeof(struct counter64); |
|
| 2008 |
+ var->type = ASN_COUNTER64; |
|
| 2009 |
+ rc = ipSystemStatsHCInDelivers_get(rowreq_ctx, |
|
| 2010 |
+- (U64 *) var->val.string); |
|
| 2011 |
++ (struct counter64 *) var->val.string); |
|
| 2012 |
+ break; |
|
| 2013 |
+ |
|
| 2014 |
+ /* |
|
| 2015 |
+@@ -844,10 +844,10 @@ |
|
| 2016 |
+ * ipSystemStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2017 |
+ */ |
|
| 2018 |
+ case COLUMN_IPSYSTEMSTATSHCOUTREQUESTS: |
|
| 2019 |
+- var->val_len = sizeof(U64); |
|
| 2020 |
++ var->val_len = sizeof(struct counter64); |
|
| 2021 |
+ var->type = ASN_COUNTER64; |
|
| 2022 |
+ rc = ipSystemStatsHCOutRequests_get(rowreq_ctx, |
|
| 2023 |
+- (U64 *) var->val.string); |
|
| 2024 |
++ (struct counter64 *) var->val.string); |
|
| 2025 |
+ break; |
|
| 2026 |
+ |
|
| 2027 |
+ /* |
|
| 2028 |
+@@ -874,10 +874,10 @@ |
|
| 2029 |
+ * ipSystemStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2030 |
+ */ |
|
| 2031 |
+ case COLUMN_IPSYSTEMSTATSHCOUTFORWDATAGRAMS: |
|
| 2032 |
+- var->val_len = sizeof(U64); |
|
| 2033 |
++ var->val_len = sizeof(struct counter64); |
|
| 2034 |
+ var->type = ASN_COUNTER64; |
|
| 2035 |
+ rc = ipSystemStatsHCOutForwDatagrams_get(rowreq_ctx, |
|
| 2036 |
+- (U64 *) var->val.string); |
|
| 2037 |
++ (struct counter64 *) var->val.string); |
|
| 2038 |
+ break; |
|
| 2039 |
+ |
|
| 2040 |
+ /* |
|
| 2041 |
+@@ -944,10 +944,10 @@ |
|
| 2042 |
+ * ipSystemStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2043 |
+ */ |
|
| 2044 |
+ case COLUMN_IPSYSTEMSTATSHCOUTTRANSMITS: |
|
| 2045 |
+- var->val_len = sizeof(U64); |
|
| 2046 |
++ var->val_len = sizeof(struct counter64); |
|
| 2047 |
+ var->type = ASN_COUNTER64; |
|
| 2048 |
+ rc = ipSystemStatsHCOutTransmits_get(rowreq_ctx, |
|
| 2049 |
+- (U64 *) var->val.string); |
|
| 2050 |
++ (struct counter64 *) var->val.string); |
|
| 2051 |
+ break; |
|
| 2052 |
+ |
|
| 2053 |
+ /* |
|
| 2054 |
+@@ -964,10 +964,10 @@ |
|
| 2055 |
+ * ipSystemStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2056 |
+ */ |
|
| 2057 |
+ case COLUMN_IPSYSTEMSTATSHCOUTOCTETS: |
|
| 2058 |
+- var->val_len = sizeof(U64); |
|
| 2059 |
++ var->val_len = sizeof(struct counter64); |
|
| 2060 |
+ var->type = ASN_COUNTER64; |
|
| 2061 |
+ rc = ipSystemStatsHCOutOctets_get(rowreq_ctx, |
|
| 2062 |
+- (U64 *) var->val.string); |
|
| 2063 |
++ (struct counter64 *) var->val.string); |
|
| 2064 |
+ break; |
|
| 2065 |
+ |
|
| 2066 |
+ /* |
|
| 2067 |
+@@ -984,10 +984,10 @@ |
|
| 2068 |
+ * ipSystemStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2069 |
+ */ |
|
| 2070 |
+ case COLUMN_IPSYSTEMSTATSHCINMCASTPKTS: |
|
| 2071 |
+- var->val_len = sizeof(U64); |
|
| 2072 |
++ var->val_len = sizeof(struct counter64); |
|
| 2073 |
+ var->type = ASN_COUNTER64; |
|
| 2074 |
+ rc = ipSystemStatsHCInMcastPkts_get(rowreq_ctx, |
|
| 2075 |
+- (U64 *) var->val.string); |
|
| 2076 |
++ (struct counter64 *) var->val.string); |
|
| 2077 |
+ break; |
|
| 2078 |
+ |
|
| 2079 |
+ /* |
|
| 2080 |
+@@ -1004,10 +1004,10 @@ |
|
| 2081 |
+ * ipSystemStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2082 |
+ */ |
|
| 2083 |
+ case COLUMN_IPSYSTEMSTATSHCINMCASTOCTETS: |
|
| 2084 |
+- var->val_len = sizeof(U64); |
|
| 2085 |
++ var->val_len = sizeof(struct counter64); |
|
| 2086 |
+ var->type = ASN_COUNTER64; |
|
| 2087 |
+ rc = ipSystemStatsHCInMcastOctets_get(rowreq_ctx, |
|
| 2088 |
+- (U64 *) var->val.string); |
|
| 2089 |
++ (struct counter64 *) var->val.string); |
|
| 2090 |
+ break; |
|
| 2091 |
+ |
|
| 2092 |
+ /* |
|
| 2093 |
+@@ -1024,10 +1024,10 @@ |
|
| 2094 |
+ * ipSystemStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2095 |
+ */ |
|
| 2096 |
+ case COLUMN_IPSYSTEMSTATSHCOUTMCASTPKTS: |
|
| 2097 |
+- var->val_len = sizeof(U64); |
|
| 2098 |
++ var->val_len = sizeof(struct counter64); |
|
| 2099 |
+ var->type = ASN_COUNTER64; |
|
| 2100 |
+ rc = ipSystemStatsHCOutMcastPkts_get(rowreq_ctx, |
|
| 2101 |
+- (U64 *) var->val.string); |
|
| 2102 |
++ (struct counter64 *) var->val.string); |
|
| 2103 |
+ break; |
|
| 2104 |
+ |
|
| 2105 |
+ /* |
|
| 2106 |
+@@ -1044,10 +1044,10 @@ |
|
| 2107 |
+ * ipSystemStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2108 |
+ */ |
|
| 2109 |
+ case COLUMN_IPSYSTEMSTATSHCOUTMCASTOCTETS: |
|
| 2110 |
+- var->val_len = sizeof(U64); |
|
| 2111 |
++ var->val_len = sizeof(struct counter64); |
|
| 2112 |
+ var->type = ASN_COUNTER64; |
|
| 2113 |
+ rc = ipSystemStatsHCOutMcastOctets_get(rowreq_ctx, |
|
| 2114 |
+- (U64 *) var->val.string); |
|
| 2115 |
++ (struct counter64 *) var->val.string); |
|
| 2116 |
+ break; |
|
| 2117 |
+ |
|
| 2118 |
+ /* |
|
| 2119 |
+@@ -1064,10 +1064,10 @@ |
|
| 2120 |
+ * ipSystemStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2121 |
+ */ |
|
| 2122 |
+ case COLUMN_IPSYSTEMSTATSHCINBCASTPKTS: |
|
| 2123 |
+- var->val_len = sizeof(U64); |
|
| 2124 |
++ var->val_len = sizeof(struct counter64); |
|
| 2125 |
+ var->type = ASN_COUNTER64; |
|
| 2126 |
+ rc = ipSystemStatsHCInBcastPkts_get(rowreq_ctx, |
|
| 2127 |
+- (U64 *) var->val.string); |
|
| 2128 |
++ (struct counter64 *) var->val.string); |
|
| 2129 |
+ break; |
|
| 2130 |
+ |
|
| 2131 |
+ /* |
|
| 2132 |
+@@ -1084,10 +1084,10 @@ |
|
| 2133 |
+ * ipSystemStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h |
|
| 2134 |
+ */ |
|
| 2135 |
+ case COLUMN_IPSYSTEMSTATSHCOUTBCASTPKTS: |
|
| 2136 |
+- var->val_len = sizeof(U64); |
|
| 2137 |
++ var->val_len = sizeof(struct counter64); |
|
| 2138 |
+ var->type = ASN_COUNTER64; |
|
| 2139 |
+ rc = ipSystemStatsHCOutBcastPkts_get(rowreq_ctx, |
|
| 2140 |
+- (U64 *) var->val.string); |
|
| 2141 |
++ (struct counter64 *) var->val.string); |
|
| 2142 |
+ break; |
|
| 2143 |
+ |
|
| 2144 |
+ /* |
|
| 2145 |
+include/net-snmp/data_access/ipstats.h Diff Switch to side-by-side view |
|
| 2146 |
+--- a/include/net-snmp/data_access/ipstats.h |
|
| 2147 |
+@@ -58,45 +58,45 @@ |
|
| 2148 |
+ * other columns, when underlying OS does not provide them. |
|
| 2149 |
+ * Always fill at least 32 bits, the table is periodically polled -> 32 bit |
|
| 2150 |
+ * overflow shall be detected and 64 bit value should be computed automatically. */ |
|
| 2151 |
+- U64 HCInReceives; |
|
| 2152 |
+- U64 HCInOctets; |
|
| 2153 |
++ struct counter64 HCInReceives; |
|
| 2154 |
++ struct counter64 HCInOctets; |
|
| 2155 |
+ u_long InHdrErrors; |
|
| 2156 |
+- U64 HCInNoRoutes; |
|
| 2157 |
++ struct counter64 HCInNoRoutes; |
|
| 2158 |
+ u_long InAddrErrors; |
|
| 2159 |
+ u_long InUnknownProtos; |
|
| 2160 |
+ u_long InTruncatedPkts; |
|
| 2161 |
+ |
|
| 2162 |
+ /* optional, can be computed from HCInNoRoutes and HCOutForwDatagrams */ |
|
| 2163 |
+- U64 HCInForwDatagrams; |
|
| 2164 |
++ struct counter64 HCInForwDatagrams; |
|
| 2165 |
+ |
|
| 2166 |
+ u_long ReasmReqds; |
|
| 2167 |
+ u_long ReasmOKs; |
|
| 2168 |
+ u_long ReasmFails; |
|
| 2169 |
+ u_long InDiscards; |
|
| 2170 |
+- U64 HCInDelivers; |
|
| 2171 |
+- U64 HCOutRequests; |
|
| 2172 |
+- U64 HCOutNoRoutes; |
|
| 2173 |
+- U64 HCOutForwDatagrams; |
|
| 2174 |
+- U64 HCOutDiscards; |
|
| 2175 |
++ struct counter64 HCInDelivers; |
|
| 2176 |
++ struct counter64 HCOutRequests; |
|
| 2177 |
++ struct counter64 HCOutNoRoutes; |
|
| 2178 |
++ struct counter64 HCOutForwDatagrams; |
|
| 2179 |
++ struct counter64 HCOutDiscards; |
|
| 2180 |
+ |
|
| 2181 |
+ /* optional, can be computed from HCOutFragOKs + HCOutFragFails*/ |
|
| 2182 |
+- U64 HCOutFragReqds; |
|
| 2183 |
+- U64 HCOutFragOKs; |
|
| 2184 |
+- U64 HCOutFragFails; |
|
| 2185 |
+- U64 HCOutFragCreates; |
|
| 2186 |
++ struct counter64 HCOutFragReqds; |
|
| 2187 |
++ struct counter64 HCOutFragOKs; |
|
| 2188 |
++ struct counter64 HCOutFragFails; |
|
| 2189 |
++ struct counter64 HCOutFragCreates; |
|
| 2190 |
+ |
|
| 2191 |
+ /* optional, can be computed from |
|
| 2192 |
+ * HCOutRequests +HCOutForwDatagrams + HCOutFragCreates |
|
| 2193 |
+ * - HCOutFragReqds - HCOutNoRoutes - HCOutDiscards */ |
|
| 2194 |
+- U64 HCOutTransmits; |
|
| 2195 |
++ struct counter64 HCOutTransmits; |
|
| 2196 |
+ |
|
| 2197 |
+- U64 HCOutOctets; |
|
| 2198 |
+- U64 HCInMcastPkts; |
|
| 2199 |
+- U64 HCInMcastOctets; |
|
| 2200 |
+- U64 HCOutMcastPkts; |
|
| 2201 |
+- U64 HCOutMcastOctets; |
|
| 2202 |
+- U64 HCInBcastPkts; |
|
| 2203 |
+- U64 HCOutBcastPkts; |
|
| 2204 |
++ struct counter64 HCOutOctets; |
|
| 2205 |
++ struct counter64 HCInMcastPkts; |
|
| 2206 |
++ struct counter64 HCInMcastOctets; |
|
| 2207 |
++ struct counter64 HCOutMcastPkts; |
|
| 2208 |
++ struct counter64 HCOutMcastOctets; |
|
| 2209 |
++ struct counter64 HCInBcastPkts; |
|
| 2210 |
++ struct counter64 HCOutBcastPkts; |
|
| 2211 |
+ |
|
| 2212 |
+ /* Array of available columns.*/ |
|
| 2213 |
+ int columnAvail[IPSYSTEMSTATSTABLE_LAST+1]; |
|
| 2214 |
+include/net-snmp/library/int64.h Diff Switch to side-by-side view |
|
| 2215 |
+--- a/include/net-snmp/library/int64.h |
|
| 2216 |
+@@ -5,31 +5,29 @@ |
|
| 2217 |
+ extern "C" {
|
|
| 2218 |
+ #endif |
|
| 2219 |
+ |
|
| 2220 |
+- typedef struct counter64 U64; |
|
| 2221 |
+- |
|
| 2222 |
+ #define I64CHARSZ 21 |
|
| 2223 |
+ |
|
| 2224 |
+- void divBy10(U64, U64 *, unsigned int *); |
|
| 2225 |
+- void multBy10(U64, U64 *); |
|
| 2226 |
+- void incrByU16(U64 *, unsigned int); |
|
| 2227 |
+- void incrByU32(U64 *, unsigned int); |
|
| 2228 |
++ void divBy10(struct counter64, struct counter64 *, unsigned int *); |
|
| 2229 |
++ void multBy10(struct counter64, struct counter64 *); |
|
| 2230 |
++ void incrByU16(struct counter64 *, unsigned int); |
|
| 2231 |
++ void incrByU32(struct counter64 *, unsigned int); |
|
| 2232 |
+ NETSNMP_IMPORT |
|
| 2233 |
+- void zeroU64(U64 *); |
|
| 2234 |
+- int isZeroU64(const U64 *); |
|
| 2235 |
++ void zeroU64(struct counter64 *); |
|
| 2236 |
++ int isZeroU64(const struct counter64 *); |
|
| 2237 |
+ NETSNMP_IMPORT |
|
| 2238 |
+- void printU64(char *, const U64 *); |
|
| 2239 |
++ void printU64(char *, const struct counter64 *); |
|
| 2240 |
+ NETSNMP_IMPORT |
|
| 2241 |
+- void printI64(char *, const U64 *); |
|
| 2242 |
+- int read64(U64 *, const char *); |
|
| 2243 |
++ void printI64(char *, const struct counter64 *); |
|
| 2244 |
++ int read64(struct counter64 *, const char *); |
|
| 2245 |
+ NETSNMP_IMPORT |
|
| 2246 |
+- void u64Subtract(const U64 * pu64one, const U64 * pu64two, |
|
| 2247 |
+- U64 * pu64out); |
|
| 2248 |
+- void u64Incr(U64 * pu64out, const U64 * pu64one); |
|
| 2249 |
+- void u64UpdateCounter(U64 * pu64out, const U64 * pu64one, |
|
| 2250 |
+- const U64 * pu64two); |
|
| 2251 |
+- void u64Copy(U64 * pu64one, const U64 * pu64two); |
|
| 2252 |
++ void u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, |
|
| 2253 |
++ struct counter64 *pu64out); |
|
| 2254 |
++ void u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one); |
|
| 2255 |
++ void u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, |
|
| 2256 |
++ const struct counter64 *pu64two); |
|
| 2257 |
++ void u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two); |
|
| 2258 |
+ |
|
| 2259 |
+- int netsnmp_c64_check_for_32bit_wrap(U64 *old_val, U64 *new_val, |
|
| 2260 |
++ int netsnmp_c64_check_for_32bit_wrap(struct counter64 *old_val, struct counter64 *new_val, |
|
| 2261 |
+ int adjust); |
|
| 2262 |
+ NETSNMP_IMPORT |
|
| 2263 |
+ int netsnmp_c64_check32_and_update(struct counter64 *prev_val, |
|
| 2264 |
+snmplib/int64.c Diff Switch to side-by-side view |
|
| 2265 |
+--- a/snmplib/int64.c |
|
| 2266 |
+@@ -33,7 +33,7 @@ |
|
| 2267 |
+ * @param[out] puR Remainder. |
|
| 2268 |
+ */ |
|
| 2269 |
+ void |
|
| 2270 |
+-divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) |
|
| 2271 |
++divBy10(struct counter64 u64, struct counter64 *pu64Q, unsigned int *puR) |
|
| 2272 |
+ {
|
|
| 2273 |
+ unsigned long ulT; |
|
| 2274 |
+ unsigned long ulQ; |
|
| 2275 |
+@@ -83,7 +83,7 @@ |
|
| 2276 |
+ * @param[out] pu64P Product. |
|
| 2277 |
+ */ |
|
| 2278 |
+ void |
|
| 2279 |
+-multBy10(U64 u64, U64 * pu64P) |
|
| 2280 |
++multBy10(struct counter64 u64, struct counter64 *pu64P) |
|
| 2281 |
+ {
|
|
| 2282 |
+ unsigned long ulT; |
|
| 2283 |
+ unsigned long ulP; |
|
| 2284 |
+@@ -130,7 +130,7 @@ |
|
| 2285 |
+ * |
|
| 2286 |
+ */ |
|
| 2287 |
+ void |
|
| 2288 |
+-incrByU16(U64 * pu64, unsigned int u16) |
|
| 2289 |
++incrByU16(struct counter64 *pu64, unsigned int u16) |
|
| 2290 |
+ {
|
|
| 2291 |
+ incrByU32(pu64, u16); |
|
| 2292 |
+ } |
|
| 2293 |
+@@ -143,7 +143,7 @@ |
|
| 2294 |
+ * |
|
| 2295 |
+ */ |
|
| 2296 |
+ void |
|
| 2297 |
+-incrByU32(U64 * pu64, unsigned int u32) |
|
| 2298 |
++incrByU32(struct counter64 *pu64, unsigned int u32) |
|
| 2299 |
+ {
|
|
| 2300 |
+ uint32_t tmp; |
|
| 2301 |
+ |
|
| 2302 |
+@@ -161,7 +161,7 @@ |
|
| 2303 |
+ * @param[out] pu64out pu64one - pu64two. |
|
| 2304 |
+ */ |
|
| 2305 |
+ void |
|
| 2306 |
+-u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) |
|
| 2307 |
++u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, struct counter64 *pu64out) |
|
| 2308 |
+ {
|
|
| 2309 |
+ int carry; |
|
| 2310 |
+ |
|
| 2311 |
+@@ -177,7 +177,7 @@ |
|
| 2312 |
+ * @param[in,out] pu64out pu64out += pu64one. |
|
| 2313 |
+ */ |
|
| 2314 |
+ void |
|
| 2315 |
+-u64Incr(U64 * pu64out, const U64 * pu64one) |
|
| 2316 |
++u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one) |
|
| 2317 |
+ {
|
|
| 2318 |
+ pu64out->high = (uint32_t)(pu64out->high + pu64one->high); |
|
| 2319 |
+ incrByU32(pu64out, pu64one->low); |
|
| 2320 |
+@@ -191,9 +191,9 @@ |
|
| 2321 |
+ * @param[out] pu64out pu64out += (pu64one - pu64two) |
|
| 2322 |
+ */ |
|
| 2323 |
+ void |
|
| 2324 |
+-u64UpdateCounter(U64 * pu64out, const U64 * pu64one, const U64 * pu64two) |
|
| 2325 |
+-{
|
|
| 2326 |
+- U64 tmp; |
|
| 2327 |
++u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, const struct counter64 *pu64two) |
|
| 2328 |
++{
|
|
| 2329 |
++ struct counter64 tmp; |
|
| 2330 |
+ |
|
| 2331 |
+ u64Subtract(pu64one, pu64two, &tmp); |
|
| 2332 |
+ u64Incr(pu64out, &tmp); |
|
| 2333 |
+@@ -208,7 +208,7 @@ |
|
| 2334 |
+ * @param[out] pu64one Where to store the copy - *pu64one = *pu64two. |
|
| 2335 |
+ */ |
|
| 2336 |
+ void |
|
| 2337 |
+-u64Copy(U64 * pu64one, const U64 * pu64two) |
|
| 2338 |
++u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two) |
|
| 2339 |
+ {
|
|
| 2340 |
+ *pu64one = *pu64two; |
|
| 2341 |
+ } |
|
| 2342 |
+@@ -220,7 +220,7 @@ |
|
| 2343 |
+ * @param[in] pu64 Number to be zeroed. |
|
| 2344 |
+ */ |
|
| 2345 |
+ void |
|
| 2346 |
+-zeroU64(U64 * pu64) |
|
| 2347 |
++zeroU64(struct counter64 *pu64) |
|
| 2348 |
+ {
|
|
| 2349 |
+ pu64->low = 0; |
|
| 2350 |
+ pu64->high = 0; |
|
| 2351 |
+@@ -232,7 +232,7 @@ |
|
| 2352 |
+ * @param[in] pu64 Number to be checked. |
|
| 2353 |
+ */ |
|
| 2354 |
+ int |
|
| 2355 |
+-isZeroU64(const U64 * pu64) |
|
| 2356 |
++isZeroU64(const struct counter64 *pu64) |
|
| 2357 |
+ {
|
|
| 2358 |
+ return pu64->low == 0 && pu64->high == 0; |
|
| 2359 |
+ } |
|
| 2360 |
+@@ -390,10 +390,10 @@ |
|
| 2361 |
+ /** Convert an unsigned 64-bit number to ASCII. */ |
|
| 2362 |
+ void |
|
| 2363 |
+ printU64(char *buf, /* char [I64CHARSZ+1]; */ |
|
| 2364 |
+- const U64 * pu64) |
|
| 2365 |
+-{
|
|
| 2366 |
+- U64 u64a; |
|
| 2367 |
+- U64 u64b; |
|
| 2368 |
++ const struct counter64 *pu64) |
|
| 2369 |
++{
|
|
| 2370 |
++ struct counter64 u64a; |
|
| 2371 |
++ struct counter64 u64b; |
|
| 2372 |
+ |
|
| 2373 |
+ char aRes[I64CHARSZ + 1]; |
|
| 2374 |
+ unsigned int u; |
|
| 2375 |
+@@ -414,9 +414,9 @@ |
|
| 2376 |
+ /** Convert a signed 64-bit number to ASCII. */ |
|
| 2377 |
+ void |
|
| 2378 |
+ printI64(char *buf, /* char [I64CHARSZ+1]; */ |
|
| 2379 |
+- const U64 * pu64) |
|
| 2380 |
+-{
|
|
| 2381 |
+- U64 u64a; |
|
| 2382 |
++ const struct counter64 *pu64) |
|
| 2383 |
++{
|
|
| 2384 |
++ struct counter64 u64a; |
|
| 2385 |
+ |
|
| 2386 |
+ if (pu64->high & 0x80000000) {
|
|
| 2387 |
+ u64a.high = (uint32_t) ~pu64->high; |
|
| 2388 |
+@@ -429,11 +429,11 @@ |
|
| 2389 |
+ } |
|
| 2390 |
+ } |
|
| 2391 |
+ |
|
| 2392 |
+-/** Convert a signed 64-bit integer from ASCII to U64. */ |
|
| 2393 |
++/** Convert a signed 64-bit integer from ASCII to struct counter64. */ |
|
| 2394 |
+ int |
|
| 2395 |
+-read64(U64 * i64, const char *str) |
|
| 2396 |
+-{
|
|
| 2397 |
+- U64 i64p; |
|
| 2398 |
++read64(struct counter64 *i64, const char *str) |
|
| 2399 |
++{
|
|
| 2400 |
++ struct counter64 i64p; |
|
| 2401 |
+ unsigned int u; |
|
| 2402 |
+ int sign = 0; |
|
| 2403 |
+ int ok = 0; |
|
| 2404 |
+--- a/snmplib/read_config.c |
|
| 2405 |
+@@ -2279,10 +2279,10 @@ |
|
| 2406 |
+ return readfrom; |
|
| 2407 |
+ |
|
| 2408 |
+ case ASN_COUNTER64: |
|
| 2409 |
+- if (*len < sizeof(U64)) |
|
| 2410 |
++ if (*len < sizeof(struct counter64)) |
|
| 2411 |
+ return NULL; |
|
| 2412 |
+- *len = sizeof(U64); |
|
| 2413 |
+- read64((U64 *) dataptr, readfrom); |
|
| 2414 |
++ *len = sizeof(struct counter64); |
|
| 2415 |
++ read64((struct counter64 *) dataptr, readfrom); |
|
| 2416 |
+ readfrom = skip_token(readfrom); |
|
| 2417 |
+ return readfrom; |
|
| 2418 |
+ } |
|
| 2419 |
+--- a/testing/fulltests/unit-tests/T015int64_clib.c |
|
| 2420 |
+@@ -1,4 +1,4 @@ |
|
| 2421 |
+-/* HEADER Testing 64-bit integer operations (U64). */ |
|
| 2422 |
++/* HEADER Testing 64-bit integer operations (struct counter64). */ |
|
| 2423 |
+ |
|
| 2424 |
+ int i, j; |
|
| 2425 |
+ char buf[22]; |
|
| 2426 |
+@@ -15,7 +15,7 @@ |
|
| 2427 |
+ }; |
|
| 2428 |
+ |
|
| 2429 |
+ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) {
|
|
| 2430 |
+- U64 a, b; |
|
| 2431 |
++ struct counter64 a, b; |
|
| 2432 |
+ a.low = (uint32_t)intval[i]; |
|
| 2433 |
+ a.high = (uint32_t)(intval[i] >> 32); |
|
| 2434 |
+ printI64(buf, &a); |
|
| 2435 |
+@@ -27,7 +27,7 @@ |
|
| 2436 |
+ |
|
| 2437 |
+ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) {
|
|
| 2438 |
+ for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) {
|
|
| 2439 |
+- U64 a, b; |
|
| 2440 |
++ struct counter64 a, b; |
|
| 2441 |
+ uint64_t d; |
|
| 2442 |
+ a.low = (uint32_t)intval[i]; |
|
| 2443 |
+ a.high = (uint32_t)(intval[i] >> 32); |
|
| 2444 |
+@@ -43,7 +43,7 @@ |
|
| 2445 |
+ |
|
| 2446 |
+ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) {
|
|
| 2447 |
+ for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) {
|
|
| 2448 |
+- U64 a, b, c; |
|
| 2449 |
++ struct counter64 a, b, c; |
|
| 2450 |
+ uint64_t d; |
|
| 2451 |
+ a.low = (uint32_t)intval[i]; |
|
| 2452 |
+ a.high = (uint32_t)(intval[i] >> 32); |
|
| 2453 |
+@@ -58,7 +58,7 @@ |
|
| 2454 |
+ } |
|
| 2455 |
+ |
|
| 2456 |
+ {
|
|
| 2457 |
+- U64 old_val, new_val; |
|
| 2458 |
++ struct counter64 old_val, new_val; |
|
| 2459 |
+ old_val.low = 7; |
|
| 2460 |
+ old_val.high = 0; |
|
| 2461 |
+ new_val = old_val; |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. |
| 3 | 3 |
Name: net-snmp |
| 4 | 4 |
Version: 5.7.3 |
| 5 |
-Release: 5%{?dist}
|
|
| 5 |
+Release: 6%{?dist}
|
|
| 6 | 6 |
License: BSD (like) |
| 7 | 7 |
URL: http://net-snmp.sourceforge.net/ |
| 8 | 8 |
Group: Productivity/Networking/Other |
| ... | ... |
@@ -11,6 +11,8 @@ Distribution: Photon |
| 11 | 11 |
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.gz
|
| 12 | 12 |
%define sha1 net-snmp=97dc25077257680815de44e34128d365c76bd839 |
| 13 | 13 |
Patch1: net-snmp-5.7.2-systemd.patch |
| 14 |
+Patch2: net-snmp-remove-u64-typedef.patch |
|
| 15 |
+Patch3: net-snmp-fix-perl-module-compilation.patch |
|
| 14 | 16 |
BuildRequires: openssl-devel perl systemd |
| 15 | 17 |
Requires: perl systemd |
| 16 | 18 |
%description |
| ... | ... |
@@ -27,6 +29,8 @@ The net-snmp-devel package contains headers and libraries for building SNMP appl |
| 27 | 27 |
%prep |
| 28 | 28 |
%setup -q |
| 29 | 29 |
%patch1 -p1 |
| 30 |
+%patch2 -p1 |
|
| 31 |
+%patch3 -p1 |
|
| 30 | 32 |
|
| 31 | 33 |
%build |
| 32 | 34 |
./configure --prefix=%{_prefix} \
|
| ... | ... |
@@ -115,6 +119,8 @@ rm -rf %{buildroot}/*
|
| 115 | 115 |
%exclude /usr/lib/perl5/5.22.1/x86_64-linux-thread-multi/perllocal.pod |
| 116 | 116 |
|
| 117 | 117 |
%changelog |
| 118 |
+* Tue Apr 04 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.7.3-6 |
|
| 119 |
+- Patch to remove U64 typedef |
|
| 118 | 120 |
* Mon Oct 04 2016 ChangLee <changLee@vmware.com> 5.7.3-5 |
| 119 | 121 |
- Modified %check |
| 120 | 122 |
* Thu May 26 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 5.7.3-4 |