wok-next annotate net-snmp/stuff/patches/net-snmp-5.7.3-perl-5.24.patch @ rev 21595

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