wok-next diff 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 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/net-snmp/stuff/patches/net-snmp-5.7.3-perl-5.24.patch Wed Jun 24 13:53:45 2020 +0100 1.3 @@ -0,0 +1,2599 @@ 1.4 +From 477b4307ef12ddce3b6a9205e0bdddbfb2e0e9b6 Mon Sep 17 00:00:00 2001 1.5 +From: Bart Van Assche <bvanassche@acm.org> 1.6 +Date: Sat, 20 Feb 2016 18:58:18 -0800 1.7 +Subject: [PATCH] Remove U64 typedef 1.8 + 1.9 +The U64 typedef conflicts with a typedef in a Perl header file. Hence 1.10 +remove the U64 typedef from the Net-SNMP header files. This patch does 1.11 +not modify the Net-SNMP ABI. 1.12 +--- 1.13 + agent/mibgroup/if-mib/ifXTable/ifXTable.c | 16 +- 1.14 + agent/mibgroup/if-mib/ifXTable/ifXTable.h | 48 +- 1.15 + .../mibgroup/if-mib/ifXTable/ifXTable_interface.c | 32 +- 1.16 + .../ip-mib/data_access/systemstats_common.c | 2 +- 1.17 + .../ipIfStatsTable/ipIfStatsTable_data_get.c | 28 +- 1.18 + .../ipIfStatsTable/ipIfStatsTable_data_get.h | 28 +- 1.19 + .../ipIfStatsTable/ipIfStatsTable_interface.c | 56 +- 1.20 + .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | 28 +- 1.21 + .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | 921 ++------------------- 1.22 + .../ipSystemStatsTable_interface.c | 56 +- 1.23 + include/net-snmp/data_access/ipstats.h | 42 +- 1.24 + include/net-snmp/library/int64.h | 34 +- 1.25 + snmplib/int64.c | 38 +- 1.26 + snmplib/read_config.c | 6 +- 1.27 + testing/fulltests/unit-tests/T015int64_clib.c | 10 +- 1.28 + 15 files changed, 274 insertions(+), 1071 deletions(-) 1.29 + 1.30 +diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.c b/agent/mibgroup/if-mib/ifXTable/ifXTable.c 1.31 +index bb3e736..0c952ba 100644 1.32 +--- a/agent/mibgroup/if-mib/ifXTable/ifXTable.c 1.33 ++++ b/agent/mibgroup/if-mib/ifXTable/ifXTable.c 1.34 +@@ -722,7 +722,7 @@ The total number of octets received on the interface, 1.35 + */ 1.36 + int 1.37 + ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.38 +- U64 * ifHCInOctets_val_ptr) 1.39 ++ struct counter64 *ifHCInOctets_val_ptr) 1.40 + { 1.41 + /** we should have a non-NULL pointer */ 1.42 + netsnmp_assert(NULL != ifHCInOctets_val_ptr); 1.43 +@@ -779,7 +779,7 @@ The number of packets, delivered by this sub-layer to a 1.44 + */ 1.45 + int 1.46 + ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.47 +- U64 * ifHCInUcastPkts_val_ptr) 1.48 ++ struct counter64 *ifHCInUcastPkts_val_ptr) 1.49 + { 1.50 + /** we should have a non-NULL pointer */ 1.51 + netsnmp_assert(NULL != ifHCInUcastPkts_val_ptr); 1.52 +@@ -838,7 +838,7 @@ The number of packets, delivered by this sub-layer to a 1.53 + */ 1.54 + int 1.55 + ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.56 +- U64 * ifHCInMulticastPkts_val_ptr) 1.57 ++ struct counter64 *ifHCInMulticastPkts_val_ptr) 1.58 + { 1.59 + /** we should have a non-NULL pointer */ 1.60 + netsnmp_assert(NULL != ifHCInMulticastPkts_val_ptr); 1.61 +@@ -897,7 +897,7 @@ The number of packets, delivered by this sub-layer to a 1.62 + */ 1.63 + int 1.64 + ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.65 +- U64 * ifHCInBroadcastPkts_val_ptr) 1.66 ++ struct counter64 *ifHCInBroadcastPkts_val_ptr) 1.67 + { 1.68 + /** we should have a non-NULL pointer */ 1.69 + netsnmp_assert(NULL != ifHCInBroadcastPkts_val_ptr); 1.70 +@@ -955,7 +955,7 @@ The total number of octets transmitted out of the 1.71 + */ 1.72 + int 1.73 + ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.74 +- U64 * ifHCOutOctets_val_ptr) 1.75 ++ struct counter64 *ifHCOutOctets_val_ptr) 1.76 + { 1.77 + /** we should have a non-NULL pointer */ 1.78 + netsnmp_assert(NULL != ifHCOutOctets_val_ptr); 1.79 +@@ -1013,7 +1013,7 @@ The total number of packets that higher-level protocols 1.80 + */ 1.81 + int 1.82 + ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.83 +- U64 * ifHCOutUcastPkts_val_ptr) 1.84 ++ struct counter64 *ifHCOutUcastPkts_val_ptr) 1.85 + { 1.86 + /** we should have a non-NULL pointer */ 1.87 + netsnmp_assert(NULL != ifHCOutUcastPkts_val_ptr); 1.88 +@@ -1074,7 +1074,7 @@ The total number of packets that higher-level protocols 1.89 + */ 1.90 + int 1.91 + ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.92 +- U64 * ifHCOutMulticastPkts_val_ptr) 1.93 ++ struct counter64 *ifHCOutMulticastPkts_val_ptr) 1.94 + { 1.95 + /** we should have a non-NULL pointer */ 1.96 + netsnmp_assert(NULL != ifHCOutMulticastPkts_val_ptr); 1.97 +@@ -1134,7 +1134,7 @@ The total number of packets that higher-level protocols 1.98 + */ 1.99 + int 1.100 + ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.101 +- U64 * ifHCOutBroadcastPkts_val_ptr) 1.102 ++ struct counter64 *ifHCOutBroadcastPkts_val_ptr) 1.103 + { 1.104 + /** we should have a non-NULL pointer */ 1.105 + netsnmp_assert(NULL != ifHCOutBroadcastPkts_val_ptr); 1.106 +diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.h b/agent/mibgroup/if-mib/ifXTable/ifXTable.h 1.107 +index ba22f97..925af13 100644 1.108 +--- a/agent/mibgroup/if-mib/ifXTable/ifXTable.h 1.109 ++++ b/agent/mibgroup/if-mib/ifXTable/ifXTable.h 1.110 +@@ -143,28 +143,28 @@ config_require(if-mib/ifXTable/ifXTable_data_access) 1.111 + u_long * 1.112 + ifOutBroadcastPkts_val_ptr); 1.113 + int ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.114 +- U64 * ifHCInOctets_val_ptr); 1.115 ++ struct counter64 *ifHCInOctets_val_ptr); 1.116 + int ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.117 +- U64 * ifHCInUcastPkts_val_ptr); 1.118 ++ struct counter64 *ifHCInUcastPkts_val_ptr); 1.119 + int ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * 1.120 + rowreq_ctx, 1.121 +- U64 * 1.122 ++ struct counter64 * 1.123 + ifHCInMulticastPkts_val_ptr); 1.124 + int ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * 1.125 + rowreq_ctx, 1.126 +- U64 * 1.127 ++ struct counter64 * 1.128 + ifHCInBroadcastPkts_val_ptr); 1.129 + int ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.130 +- U64 * ifHCOutOctets_val_ptr); 1.131 ++ struct counter64 *ifHCOutOctets_val_ptr); 1.132 + int ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 1.133 +- U64 * ifHCOutUcastPkts_val_ptr); 1.134 ++ struct counter64 *ifHCOutUcastPkts_val_ptr); 1.135 + int ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * 1.136 + rowreq_ctx, 1.137 +- U64 * 1.138 ++ struct counter64 * 1.139 + ifHCOutMulticastPkts_val_ptr); 1.140 + int ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * 1.141 + rowreq_ctx, 1.142 +- U64 * 1.143 ++ struct counter64 * 1.144 + ifHCOutBroadcastPkts_val_ptr); 1.145 + int ifLinkUpDownTrapEnable_get(ifXTable_rowreq_ctx * 1.146 + rowreq_ctx, 1.147 +@@ -284,86 +284,86 @@ config_require(if-mib/ifXTable/ifXTable_data_access) 1.148 + 1.149 + int ifHCInOctets_check_value(ifXTable_rowreq_ctx * 1.150 + rowreq_ctx, 1.151 +- U64 ifHCInOctets_val); 1.152 ++ struct counter64 ifHCInOctets_val); 1.153 + int ifHCInOctets_undo_setup(ifXTable_rowreq_ctx * 1.154 + rowreq_ctx); 1.155 + int ifHCInOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, 1.156 +- U64 ifHCInOctets_val); 1.157 ++ struct counter64 ifHCInOctets_val); 1.158 + int ifHCInOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); 1.159 + 1.160 + int ifHCInUcastPkts_check_value(ifXTable_rowreq_ctx * 1.161 + rowreq_ctx, 1.162 +- U64 ifHCInUcastPkts_val); 1.163 ++ struct counter64 ifHCInUcastPkts_val); 1.164 + int ifHCInUcastPkts_undo_setup(ifXTable_rowreq_ctx * 1.165 + rowreq_ctx); 1.166 + int ifHCInUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, 1.167 +- U64 ifHCInUcastPkts_val); 1.168 ++ struct counter64 ifHCInUcastPkts_val); 1.169 + int ifHCInUcastPkts_undo(ifXTable_rowreq_ctx * rowreq_ctx); 1.170 + 1.171 + int ifHCInMulticastPkts_check_value(ifXTable_rowreq_ctx * 1.172 + rowreq_ctx, 1.173 +- U64 1.174 ++ struct counter64 1.175 + ifHCInMulticastPkts_val); 1.176 + int ifHCInMulticastPkts_undo_setup(ifXTable_rowreq_ctx * 1.177 + rowreq_ctx); 1.178 + int ifHCInMulticastPkts_set(ifXTable_rowreq_ctx * 1.179 + rowreq_ctx, 1.180 +- U64 ifHCInMulticastPkts_val); 1.181 ++ struct counter64 ifHCInMulticastPkts_val); 1.182 + int ifHCInMulticastPkts_undo(ifXTable_rowreq_ctx * 1.183 + rowreq_ctx); 1.184 + 1.185 + int ifHCInBroadcastPkts_check_value(ifXTable_rowreq_ctx * 1.186 + rowreq_ctx, 1.187 +- U64 1.188 ++ struct counter64 1.189 + ifHCInBroadcastPkts_val); 1.190 + int ifHCInBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * 1.191 + rowreq_ctx); 1.192 + int ifHCInBroadcastPkts_set(ifXTable_rowreq_ctx * 1.193 + rowreq_ctx, 1.194 +- U64 ifHCInBroadcastPkts_val); 1.195 ++ struct counter64 ifHCInBroadcastPkts_val); 1.196 + int ifHCInBroadcastPkts_undo(ifXTable_rowreq_ctx * 1.197 + rowreq_ctx); 1.198 + 1.199 + int ifHCOutOctets_check_value(ifXTable_rowreq_ctx * 1.200 + rowreq_ctx, 1.201 +- U64 ifHCOutOctets_val); 1.202 ++ struct counter64 ifHCOutOctets_val); 1.203 + int ifHCOutOctets_undo_setup(ifXTable_rowreq_ctx * 1.204 + rowreq_ctx); 1.205 + int ifHCOutOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, 1.206 +- U64 ifHCOutOctets_val); 1.207 ++ struct counter64 ifHCOutOctets_val); 1.208 + int ifHCOutOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); 1.209 + 1.210 + int ifHCOutUcastPkts_check_value(ifXTable_rowreq_ctx * 1.211 + rowreq_ctx, 1.212 +- U64 ifHCOutUcastPkts_val); 1.213 ++ struct counter64 ifHCOutUcastPkts_val); 1.214 + int ifHCOutUcastPkts_undo_setup(ifXTable_rowreq_ctx * 1.215 + rowreq_ctx); 1.216 + int ifHCOutUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, 1.217 +- U64 ifHCOutUcastPkts_val); 1.218 ++ struct counter64 ifHCOutUcastPkts_val); 1.219 + int ifHCOutUcastPkts_undo(ifXTable_rowreq_ctx * 1.220 + rowreq_ctx); 1.221 + 1.222 + int ifHCOutMulticastPkts_check_value(ifXTable_rowreq_ctx * 1.223 + rowreq_ctx, 1.224 +- U64 1.225 ++ struct counter64 1.226 + ifHCOutMulticastPkts_val); 1.227 + int ifHCOutMulticastPkts_undo_setup(ifXTable_rowreq_ctx * 1.228 + rowreq_ctx); 1.229 + int ifHCOutMulticastPkts_set(ifXTable_rowreq_ctx * 1.230 + rowreq_ctx, 1.231 +- U64 ifHCOutMulticastPkts_val); 1.232 ++ struct counter64 ifHCOutMulticastPkts_val); 1.233 + int ifHCOutMulticastPkts_undo(ifXTable_rowreq_ctx * 1.234 + rowreq_ctx); 1.235 + 1.236 + int ifHCOutBroadcastPkts_check_value(ifXTable_rowreq_ctx * 1.237 + rowreq_ctx, 1.238 +- U64 1.239 ++ struct counter64 1.240 + ifHCOutBroadcastPkts_val); 1.241 + int ifHCOutBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * 1.242 + rowreq_ctx); 1.243 + int ifHCOutBroadcastPkts_set(ifXTable_rowreq_ctx * 1.244 + rowreq_ctx, 1.245 +- U64 ifHCOutBroadcastPkts_val); 1.246 ++ struct counter64 ifHCOutBroadcastPkts_val); 1.247 + int ifHCOutBroadcastPkts_undo(ifXTable_rowreq_ctx * 1.248 + rowreq_ctx); 1.249 + 1.250 +diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c b/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c 1.251 +index 23b50d0..e561842 100644 1.252 +--- a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c 1.253 ++++ b/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c 1.254 +@@ -729,72 +729,72 @@ _ifXTable_get_column(ifXTable_rowreq_ctx * rowreq_ctx, 1.255 + * ifHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.256 + */ 1.257 + case COLUMN_IFHCINOCTETS: 1.258 +- var->val_len = sizeof(U64); 1.259 ++ var->val_len = sizeof(struct counter64); 1.260 + var->type = ASN_COUNTER64; 1.261 +- rc = ifHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); 1.262 ++ rc = ifHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.263 + break; 1.264 + 1.265 + /* 1.266 + * ifHCInUcastPkts(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.267 + */ 1.268 + case COLUMN_IFHCINUCASTPKTS: 1.269 +- var->val_len = sizeof(U64); 1.270 ++ var->val_len = sizeof(struct counter64); 1.271 + var->type = ASN_COUNTER64; 1.272 +- rc = ifHCInUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); 1.273 ++ rc = ifHCInUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.274 + break; 1.275 + 1.276 + /* 1.277 + * ifHCInMulticastPkts(8)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.278 + */ 1.279 + case COLUMN_IFHCINMULTICASTPKTS: 1.280 +- var->val_len = sizeof(U64); 1.281 ++ var->val_len = sizeof(struct counter64); 1.282 + var->type = ASN_COUNTER64; 1.283 +- rc = ifHCInMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); 1.284 ++ rc = ifHCInMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.285 + break; 1.286 + 1.287 + /* 1.288 + * ifHCInBroadcastPkts(9)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.289 + */ 1.290 + case COLUMN_IFHCINBROADCASTPKTS: 1.291 +- var->val_len = sizeof(U64); 1.292 ++ var->val_len = sizeof(struct counter64); 1.293 + var->type = ASN_COUNTER64; 1.294 +- rc = ifHCInBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); 1.295 ++ rc = ifHCInBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.296 + break; 1.297 + 1.298 + /* 1.299 + * ifHCOutOctets(10)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.300 + */ 1.301 + case COLUMN_IFHCOUTOCTETS: 1.302 +- var->val_len = sizeof(U64); 1.303 ++ var->val_len = sizeof(struct counter64); 1.304 + var->type = ASN_COUNTER64; 1.305 +- rc = ifHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); 1.306 ++ rc = ifHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.307 + break; 1.308 + 1.309 + /* 1.310 + * ifHCOutUcastPkts(11)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.311 + */ 1.312 + case COLUMN_IFHCOUTUCASTPKTS: 1.313 +- var->val_len = sizeof(U64); 1.314 ++ var->val_len = sizeof(struct counter64); 1.315 + var->type = ASN_COUNTER64; 1.316 +- rc = ifHCOutUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); 1.317 ++ rc = ifHCOutUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.318 + break; 1.319 + 1.320 + /* 1.321 + * ifHCOutMulticastPkts(12)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.322 + */ 1.323 + case COLUMN_IFHCOUTMULTICASTPKTS: 1.324 +- var->val_len = sizeof(U64); 1.325 ++ var->val_len = sizeof(struct counter64); 1.326 + var->type = ASN_COUNTER64; 1.327 +- rc = ifHCOutMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); 1.328 ++ rc = ifHCOutMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.329 + break; 1.330 + 1.331 + /* 1.332 + * ifHCOutBroadcastPkts(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.333 + */ 1.334 + case COLUMN_IFHCOUTBROADCASTPKTS: 1.335 +- var->val_len = sizeof(U64); 1.336 ++ var->val_len = sizeof(struct counter64); 1.337 + var->type = ASN_COUNTER64; 1.338 +- rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); 1.339 ++ rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.340 + break; 1.341 + 1.342 + /* 1.343 +diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_common.c b/agent/mibgroup/ip-mib/data_access/systemstats_common.c 1.344 +index 29109bd..7434b3a 100644 1.345 +--- a/agent/mibgroup/ip-mib/data_access/systemstats_common.c 1.346 ++++ b/agent/mibgroup/ip-mib/data_access/systemstats_common.c 1.347 +@@ -264,7 +264,7 @@ _calculate_entries(netsnmp_systemstats_entry * entry) 1.348 + && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTFRAGCREATES] 1.349 + && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTDISCARDS]) { 1.350 + 1.351 +- U64 tmp, tmp2, tmp3; 1.352 ++ struct counter64 tmp, tmp2, tmp3; 1.353 + tmp = entry->stats.HCOutRequests; 1.354 + u64Incr(&tmp, &entry->stats.HCOutForwDatagrams); 1.355 + u64Incr(&tmp, &entry->stats.HCOutFragCreates); 1.356 +diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c 1.357 +index db673dc..fec36b2 100644 1.358 +--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c 1.359 ++++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c 1.360 +@@ -270,7 +270,7 @@ The total number of input IP datagrams received, including 1.361 + */ 1.362 + int 1.363 + ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.364 +- U64 * ipIfStatsHCInReceives_val_ptr) 1.365 ++ struct counter64 *ipIfStatsHCInReceives_val_ptr) 1.366 + { 1.367 + /** we should have a non-NULL pointer */ 1.368 + netsnmp_assert(NULL != ipIfStatsHCInReceives_val_ptr); 1.369 +@@ -395,7 +395,7 @@ The total number of octets received in input IP datagrams, 1.370 + */ 1.371 + int 1.372 + ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.373 +- U64 * ipIfStatsHCInOctets_val_ptr) 1.374 ++ struct counter64 *ipIfStatsHCInOctets_val_ptr) 1.375 + { 1.376 + /** we should have a non-NULL pointer */ 1.377 + netsnmp_assert(NULL != ipIfStatsHCInOctets_val_ptr); 1.378 +@@ -862,7 +862,7 @@ The number of input datagrams for which this entity was not 1.379 + */ 1.380 + int 1.381 + ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.382 +- U64 * ipIfStatsHCInForwDatagrams_val_ptr) 1.383 ++ struct counter64 *ipIfStatsHCInForwDatagrams_val_ptr) 1.384 + { 1.385 + /** we should have a non-NULL pointer */ 1.386 + netsnmp_assert(NULL != ipIfStatsHCInForwDatagrams_val_ptr); 1.387 +@@ -1267,7 +1267,7 @@ The total number of datagrams successfully delivered to IP 1.388 + */ 1.389 + int 1.390 + ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.391 +- U64 * ipIfStatsHCInDelivers_val_ptr) 1.392 ++ struct counter64 *ipIfStatsHCInDelivers_val_ptr) 1.393 + { 1.394 + /** we should have a non-NULL pointer */ 1.395 + netsnmp_assert(NULL != ipIfStatsHCInDelivers_val_ptr); 1.396 +@@ -1396,7 +1396,7 @@ The total number of IP datagrams that local IP user- 1.397 + */ 1.398 + int 1.399 + ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.400 +- U64 * ipIfStatsHCOutRequests_val_ptr) 1.401 ++ struct counter64 *ipIfStatsHCOutRequests_val_ptr) 1.402 + { 1.403 + /** we should have a non-NULL pointer */ 1.404 + netsnmp_assert(NULL != ipIfStatsHCOutRequests_val_ptr); 1.405 +@@ -1532,7 +1532,7 @@ The number of datagrams for which this entity was not their 1.406 + */ 1.407 + int 1.408 + ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.409 +- U64 * ipIfStatsHCOutForwDatagrams_val_ptr) 1.410 ++ struct counter64 *ipIfStatsHCOutForwDatagrams_val_ptr) 1.411 + { 1.412 + /** we should have a non-NULL pointer */ 1.413 + netsnmp_assert(NULL != ipIfStatsHCOutForwDatagrams_val_ptr); 1.414 +@@ -1999,7 +1999,7 @@ The total number of IP datagrams that this entity supplied 1.415 + */ 1.416 + int 1.417 + ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.418 +- U64 * ipIfStatsHCOutTransmits_val_ptr) 1.419 ++ struct counter64 *ipIfStatsHCOutTransmits_val_ptr) 1.420 + { 1.421 + /** we should have a non-NULL pointer */ 1.422 + netsnmp_assert(NULL != ipIfStatsHCOutTransmits_val_ptr); 1.423 +@@ -2123,7 +2123,7 @@ The total number of octets in IP datagrams delivered to the 1.424 + */ 1.425 + int 1.426 + ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.427 +- U64 * ipIfStatsHCOutOctets_val_ptr) 1.428 ++ struct counter64 *ipIfStatsHCOutOctets_val_ptr) 1.429 + { 1.430 + /** we should have a non-NULL pointer */ 1.431 + netsnmp_assert(NULL != ipIfStatsHCOutOctets_val_ptr); 1.432 +@@ -2245,7 +2245,7 @@ The number of IP multicast datagrams received. This object 1.433 + */ 1.434 + int 1.435 + ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.436 +- U64 * ipIfStatsHCInMcastPkts_val_ptr) 1.437 ++ struct counter64 *ipIfStatsHCInMcastPkts_val_ptr) 1.438 + { 1.439 + /** we should have a non-NULL pointer */ 1.440 + netsnmp_assert(NULL != ipIfStatsHCInMcastPkts_val_ptr); 1.441 +@@ -2372,7 +2372,7 @@ The total number of octets received in IP multicast 1.442 + */ 1.443 + int 1.444 + ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.445 +- U64 * ipIfStatsHCInMcastOctets_val_ptr) 1.446 ++ struct counter64 *ipIfStatsHCInMcastOctets_val_ptr) 1.447 + { 1.448 + /** we should have a non-NULL pointer */ 1.449 + netsnmp_assert(NULL != ipIfStatsHCInMcastOctets_val_ptr); 1.450 +@@ -2497,7 +2497,7 @@ The number of IP multicast datagrams transmitted. This 1.451 + */ 1.452 + int 1.453 + ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.454 +- U64 * ipIfStatsHCOutMcastPkts_val_ptr) 1.455 ++ struct counter64 *ipIfStatsHCOutMcastPkts_val_ptr) 1.456 + { 1.457 + /** we should have a non-NULL pointer */ 1.458 + netsnmp_assert(NULL != ipIfStatsHCOutMcastPkts_val_ptr); 1.459 +@@ -2621,7 +2621,7 @@ The total number of octets transmitted in IP multicast 1.460 + */ 1.461 + int 1.462 + ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.463 +- U64 * ipIfStatsHCOutMcastOctets_val_ptr) 1.464 ++ struct counter64 *ipIfStatsHCOutMcastOctets_val_ptr) 1.465 + { 1.466 + /** we should have a non-NULL pointer */ 1.467 + netsnmp_assert(NULL != ipIfStatsHCOutMcastOctets_val_ptr); 1.468 +@@ -2743,7 +2743,7 @@ The number of IP broadcast datagrams received. This object 1.469 + */ 1.470 + int 1.471 + ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.472 +- U64 * ipIfStatsHCInBcastPkts_val_ptr) 1.473 ++ struct counter64 *ipIfStatsHCInBcastPkts_val_ptr) 1.474 + { 1.475 + /** we should have a non-NULL pointer */ 1.476 + netsnmp_assert(NULL != ipIfStatsHCInBcastPkts_val_ptr); 1.477 +@@ -2865,7 +2865,7 @@ The number of IP broadcast datagrams transmitted. This 1.478 + */ 1.479 + int 1.480 + ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.481 +- U64 * ipIfStatsHCOutBcastPkts_val_ptr) 1.482 ++ struct counter64 *ipIfStatsHCOutBcastPkts_val_ptr) 1.483 + { 1.484 + /** we should have a non-NULL pointer */ 1.485 + netsnmp_assert(NULL != ipIfStatsHCOutBcastPkts_val_ptr); 1.486 +diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h 1.487 +index 0cc7e47..ad5d8a0 100644 1.488 +--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h 1.489 ++++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h 1.490 +@@ -50,7 +50,7 @@ extern "C" { 1.491 + ipIfStatsInReceives_val_ptr); 1.492 + int ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * 1.493 + rowreq_ctx, 1.494 +- U64 * 1.495 ++ struct counter64 * 1.496 + ipIfStatsHCInReceives_val_ptr); 1.497 + int ipIfStatsInOctets_get(ipIfStatsTable_rowreq_ctx * 1.498 + rowreq_ctx, 1.499 +@@ -58,7 +58,7 @@ extern "C" { 1.500 + ipIfStatsInOctets_val_ptr); 1.501 + int ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * 1.502 + rowreq_ctx, 1.503 +- U64 * 1.504 ++ struct counter64 * 1.505 + ipIfStatsHCInOctets_val_ptr); 1.506 + int ipIfStatsInHdrErrors_get(ipIfStatsTable_rowreq_ctx * 1.507 + rowreq_ctx, 1.508 +@@ -87,7 +87,7 @@ extern "C" { 1.509 + int 1.510 + ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * 1.511 + rowreq_ctx, 1.512 +- U64 * 1.513 ++ struct counter64 * 1.514 + ipIfStatsHCInForwDatagrams_val_ptr); 1.515 + int ipIfStatsReasmReqds_get(ipIfStatsTable_rowreq_ctx * 1.516 + rowreq_ctx, 1.517 +@@ -111,7 +111,7 @@ extern "C" { 1.518 + ipIfStatsInDelivers_val_ptr); 1.519 + int ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * 1.520 + rowreq_ctx, 1.521 +- U64 * 1.522 ++ struct counter64 * 1.523 + ipIfStatsHCInDelivers_val_ptr); 1.524 + int ipIfStatsOutRequests_get(ipIfStatsTable_rowreq_ctx * 1.525 + rowreq_ctx, 1.526 +@@ -119,7 +119,7 @@ extern "C" { 1.527 + ipIfStatsOutRequests_val_ptr); 1.528 + int ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * 1.529 + rowreq_ctx, 1.530 +- U64 * 1.531 ++ struct counter64 * 1.532 + ipIfStatsHCOutRequests_val_ptr); 1.533 + int ipIfStatsOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx 1.534 + * rowreq_ctx, 1.535 +@@ -128,7 +128,7 @@ extern "C" { 1.536 + int 1.537 + ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * 1.538 + rowreq_ctx, 1.539 +- U64 * 1.540 ++ struct counter64 * 1.541 + ipIfStatsHCOutForwDatagrams_val_ptr); 1.542 + int ipIfStatsOutDiscards_get(ipIfStatsTable_rowreq_ctx * 1.543 + rowreq_ctx, 1.544 +@@ -156,7 +156,7 @@ extern "C" { 1.545 + ipIfStatsOutTransmits_val_ptr); 1.546 + int ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * 1.547 + rowreq_ctx, 1.548 +- U64 * 1.549 ++ struct counter64 * 1.550 + ipIfStatsHCOutTransmits_val_ptr); 1.551 + int ipIfStatsOutOctets_get(ipIfStatsTable_rowreq_ctx * 1.552 + rowreq_ctx, 1.553 +@@ -164,7 +164,7 @@ extern "C" { 1.554 + ipIfStatsOutOctets_val_ptr); 1.555 + int ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * 1.556 + rowreq_ctx, 1.557 +- U64 * 1.558 ++ struct counter64 * 1.559 + ipIfStatsHCOutOctets_val_ptr); 1.560 + int ipIfStatsInMcastPkts_get(ipIfStatsTable_rowreq_ctx * 1.561 + rowreq_ctx, 1.562 +@@ -172,7 +172,7 @@ extern "C" { 1.563 + ipIfStatsInMcastPkts_val_ptr); 1.564 + int ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * 1.565 + rowreq_ctx, 1.566 +- U64 * 1.567 ++ struct counter64 * 1.568 + ipIfStatsHCInMcastPkts_val_ptr); 1.569 + int ipIfStatsInMcastOctets_get(ipIfStatsTable_rowreq_ctx * 1.570 + rowreq_ctx, 1.571 +@@ -180,7 +180,7 @@ extern "C" { 1.572 + ipIfStatsInMcastOctets_val_ptr); 1.573 + int ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx 1.574 + * rowreq_ctx, 1.575 +- U64 * 1.576 ++ struct counter64 * 1.577 + ipIfStatsHCInMcastOctets_val_ptr); 1.578 + int ipIfStatsOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * 1.579 + rowreq_ctx, 1.580 +@@ -188,7 +188,7 @@ extern "C" { 1.581 + ipIfStatsOutMcastPkts_val_ptr); 1.582 + int ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * 1.583 + rowreq_ctx, 1.584 +- U64 * 1.585 ++ struct counter64 * 1.586 + ipIfStatsHCOutMcastPkts_val_ptr); 1.587 + int ipIfStatsOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * 1.588 + rowreq_ctx, 1.589 +@@ -196,7 +196,7 @@ extern "C" { 1.590 + ipIfStatsOutMcastOctets_val_ptr); 1.591 + int ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx 1.592 + * rowreq_ctx, 1.593 +- U64 * 1.594 ++ struct counter64 * 1.595 + ipIfStatsHCOutMcastOctets_val_ptr); 1.596 + int ipIfStatsInBcastPkts_get(ipIfStatsTable_rowreq_ctx * 1.597 + rowreq_ctx, 1.598 +@@ -204,7 +204,7 @@ extern "C" { 1.599 + ipIfStatsInBcastPkts_val_ptr); 1.600 + int ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * 1.601 + rowreq_ctx, 1.602 +- U64 * 1.603 ++ struct counter64 * 1.604 + ipIfStatsHCInBcastPkts_val_ptr); 1.605 + int ipIfStatsOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * 1.606 + rowreq_ctx, 1.607 +@@ -212,7 +212,7 @@ extern "C" { 1.608 + ipIfStatsOutBcastPkts_val_ptr); 1.609 + int ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * 1.610 + rowreq_ctx, 1.611 +- U64 * 1.612 ++ struct counter64 * 1.613 + ipIfStatsHCOutBcastPkts_val_ptr); 1.614 + int 1.615 + ipIfStatsDiscontinuityTime_get(ipIfStatsTable_rowreq_ctx * 1.616 +diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c 1.617 +index 559d1c1..4955a8b 100644 1.618 +--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c 1.619 ++++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c 1.620 +@@ -722,10 +722,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.621 + * ipIfStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.622 + */ 1.623 + case COLUMN_IPIFSTATSHCINRECEIVES: 1.624 +- var->val_len = sizeof(U64); 1.625 ++ var->val_len = sizeof(struct counter64); 1.626 + var->type = ASN_COUNTER64; 1.627 + rc = ipIfStatsHCInReceives_get(rowreq_ctx, 1.628 +- (U64 *) var->val.string); 1.629 ++ (struct counter64 *) var->val.string); 1.630 + break; 1.631 + 1.632 + /* 1.633 +@@ -741,9 +741,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.634 + * ipIfStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.635 + */ 1.636 + case COLUMN_IPIFSTATSHCINOCTETS: 1.637 +- var->val_len = sizeof(U64); 1.638 ++ var->val_len = sizeof(struct counter64); 1.639 + var->type = ASN_COUNTER64; 1.640 +- rc = ipIfStatsHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); 1.641 ++ rc = ipIfStatsHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.642 + break; 1.643 + 1.644 + /* 1.645 +@@ -810,10 +810,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.646 + * ipIfStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.647 + */ 1.648 + case COLUMN_IPIFSTATSHCINFORWDATAGRAMS: 1.649 +- var->val_len = sizeof(U64); 1.650 ++ var->val_len = sizeof(struct counter64); 1.651 + var->type = ASN_COUNTER64; 1.652 + rc = ipIfStatsHCInForwDatagrams_get(rowreq_ctx, 1.653 +- (U64 *) var->val.string); 1.654 ++ (struct counter64 *) var->val.string); 1.655 + break; 1.656 + 1.657 + /* 1.658 +@@ -869,10 +869,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.659 + * ipIfStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.660 + */ 1.661 + case COLUMN_IPIFSTATSHCINDELIVERS: 1.662 +- var->val_len = sizeof(U64); 1.663 ++ var->val_len = sizeof(struct counter64); 1.664 + var->type = ASN_COUNTER64; 1.665 + rc = ipIfStatsHCInDelivers_get(rowreq_ctx, 1.666 +- (U64 *) var->val.string); 1.667 ++ (struct counter64 *) var->val.string); 1.668 + break; 1.669 + 1.670 + /* 1.671 +@@ -889,10 +889,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.672 + * ipIfStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.673 + */ 1.674 + case COLUMN_IPIFSTATSHCOUTREQUESTS: 1.675 +- var->val_len = sizeof(U64); 1.676 ++ var->val_len = sizeof(struct counter64); 1.677 + var->type = ASN_COUNTER64; 1.678 + rc = ipIfStatsHCOutRequests_get(rowreq_ctx, 1.679 +- (U64 *) var->val.string); 1.680 ++ (struct counter64 *) var->val.string); 1.681 + break; 1.682 + 1.683 + /* 1.684 +@@ -909,10 +909,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.685 + * ipIfStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.686 + */ 1.687 + case COLUMN_IPIFSTATSHCOUTFORWDATAGRAMS: 1.688 +- var->val_len = sizeof(U64); 1.689 ++ var->val_len = sizeof(struct counter64); 1.690 + var->type = ASN_COUNTER64; 1.691 + rc = ipIfStatsHCOutForwDatagrams_get(rowreq_ctx, 1.692 +- (U64 *) var->val.string); 1.693 ++ (struct counter64 *) var->val.string); 1.694 + break; 1.695 + 1.696 + /* 1.697 +@@ -979,10 +979,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.698 + * ipIfStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.699 + */ 1.700 + case COLUMN_IPIFSTATSHCOUTTRANSMITS: 1.701 +- var->val_len = sizeof(U64); 1.702 ++ var->val_len = sizeof(struct counter64); 1.703 + var->type = ASN_COUNTER64; 1.704 + rc = ipIfStatsHCOutTransmits_get(rowreq_ctx, 1.705 +- (U64 *) var->val.string); 1.706 ++ (struct counter64 *) var->val.string); 1.707 + break; 1.708 + 1.709 + /* 1.710 +@@ -999,9 +999,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.711 + * ipIfStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.712 + */ 1.713 + case COLUMN_IPIFSTATSHCOUTOCTETS: 1.714 +- var->val_len = sizeof(U64); 1.715 ++ var->val_len = sizeof(struct counter64); 1.716 + var->type = ASN_COUNTER64; 1.717 +- rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); 1.718 ++ rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); 1.719 + break; 1.720 + 1.721 + /* 1.722 +@@ -1018,10 +1018,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.723 + * ipIfStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.724 + */ 1.725 + case COLUMN_IPIFSTATSHCINMCASTPKTS: 1.726 +- var->val_len = sizeof(U64); 1.727 ++ var->val_len = sizeof(struct counter64); 1.728 + var->type = ASN_COUNTER64; 1.729 + rc = ipIfStatsHCInMcastPkts_get(rowreq_ctx, 1.730 +- (U64 *) var->val.string); 1.731 ++ (struct counter64 *) var->val.string); 1.732 + break; 1.733 + 1.734 + /* 1.735 +@@ -1038,10 +1038,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.736 + * ipIfStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.737 + */ 1.738 + case COLUMN_IPIFSTATSHCINMCASTOCTETS: 1.739 +- var->val_len = sizeof(U64); 1.740 ++ var->val_len = sizeof(struct counter64); 1.741 + var->type = ASN_COUNTER64; 1.742 + rc = ipIfStatsHCInMcastOctets_get(rowreq_ctx, 1.743 +- (U64 *) var->val.string); 1.744 ++ (struct counter64 *) var->val.string); 1.745 + break; 1.746 + 1.747 + /* 1.748 +@@ -1058,10 +1058,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.749 + * ipIfStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.750 + */ 1.751 + case COLUMN_IPIFSTATSHCOUTMCASTPKTS: 1.752 +- var->val_len = sizeof(U64); 1.753 ++ var->val_len = sizeof(struct counter64); 1.754 + var->type = ASN_COUNTER64; 1.755 + rc = ipIfStatsHCOutMcastPkts_get(rowreq_ctx, 1.756 +- (U64 *) var->val.string); 1.757 ++ (struct counter64 *) var->val.string); 1.758 + break; 1.759 + 1.760 + /* 1.761 +@@ -1078,10 +1078,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.762 + * ipIfStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.763 + */ 1.764 + case COLUMN_IPIFSTATSHCOUTMCASTOCTETS: 1.765 +- var->val_len = sizeof(U64); 1.766 ++ var->val_len = sizeof(struct counter64); 1.767 + var->type = ASN_COUNTER64; 1.768 + rc = ipIfStatsHCOutMcastOctets_get(rowreq_ctx, 1.769 +- (U64 *) var->val.string); 1.770 ++ (struct counter64 *) var->val.string); 1.771 + break; 1.772 + 1.773 + /* 1.774 +@@ -1098,10 +1098,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.775 + * ipIfStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.776 + */ 1.777 + case COLUMN_IPIFSTATSHCINBCASTPKTS: 1.778 +- var->val_len = sizeof(U64); 1.779 ++ var->val_len = sizeof(struct counter64); 1.780 + var->type = ASN_COUNTER64; 1.781 + rc = ipIfStatsHCInBcastPkts_get(rowreq_ctx, 1.782 +- (U64 *) var->val.string); 1.783 ++ (struct counter64 *) var->val.string); 1.784 + break; 1.785 + 1.786 + /* 1.787 +@@ -1118,10 +1118,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 1.788 + * ipIfStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.789 + */ 1.790 + case COLUMN_IPIFSTATSHCOUTBCASTPKTS: 1.791 +- var->val_len = sizeof(U64); 1.792 ++ var->val_len = sizeof(struct counter64); 1.793 + var->type = ASN_COUNTER64; 1.794 + rc = ipIfStatsHCOutBcastPkts_get(rowreq_ctx, 1.795 +- (U64 *) var->val.string); 1.796 ++ (struct counter64 *) var->val.string); 1.797 + break; 1.798 + 1.799 + /* 1.800 +diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c 1.801 +index 10587e2..5a9323f 100644 1.802 +--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c 1.803 ++++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c 1.804 +@@ -452,7 +452,7 @@ The total number of input IP datagrams received, including 1.805 + */ 1.806 + int 1.807 + ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.808 +- U64 * ipSystemStatsHCInReceives_val_ptr) 1.809 ++ struct counter64 *ipSystemStatsHCInReceives_val_ptr) 1.810 + { 1.811 + /** we should have a non-NULL pointer */ 1.812 + netsnmp_assert(NULL != ipSystemStatsHCInReceives_val_ptr); 1.813 +@@ -579,7 +579,7 @@ The total number of octets received in input IP datagrams, 1.814 + */ 1.815 + int 1.816 + ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.817 +- U64 * ipSystemStatsHCInOctets_val_ptr) 1.818 ++ struct counter64 *ipSystemStatsHCInOctets_val_ptr) 1.819 + { 1.820 + /** we should have a non-NULL pointer */ 1.821 + netsnmp_assert(NULL != ipSystemStatsHCInOctets_val_ptr); 1.822 +@@ -1058,7 +1058,7 @@ The number of input datagrams for which this entity was not 1.823 + int 1.824 + ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.825 + rowreq_ctx, 1.826 +- U64 * 1.827 ++ struct counter64 * 1.828 + ipSystemStatsHCInForwDatagrams_val_ptr) 1.829 + { 1.830 + /** we should have a non-NULL pointer */ 1.831 +@@ -1474,7 +1474,7 @@ The total number of datagrams successfully delivered to IP 1.832 + */ 1.833 + int 1.834 + ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.835 +- U64 * ipSystemStatsHCInDelivers_val_ptr) 1.836 ++ struct counter64 *ipSystemStatsHCInDelivers_val_ptr) 1.837 + { 1.838 + /** we should have a non-NULL pointer */ 1.839 + netsnmp_assert(NULL != ipSystemStatsHCInDelivers_val_ptr); 1.840 +@@ -1602,7 +1602,7 @@ The total number of IP datagrams which local IP user- 1.841 + */ 1.842 + int 1.843 + ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.844 +- U64 * ipSystemStatsHCOutRequests_val_ptr) 1.845 ++ struct counter64 *ipSystemStatsHCOutRequests_val_ptr) 1.846 + { 1.847 + /** we should have a non-NULL pointer */ 1.848 + netsnmp_assert(NULL != ipSystemStatsHCOutRequests_val_ptr); 1.849 +@@ -1809,7 +1809,7 @@ The number of datagrams for which this entity was not their 1.850 + int 1.851 + ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.852 + rowreq_ctx, 1.853 +- U64 * 1.854 ++ struct counter64 * 1.855 + ipSystemStatsHCOutForwDatagrams_val_ptr) 1.856 + { 1.857 + /** we should have a non-NULL pointer */ 1.858 +@@ -2288,7 +2288,7 @@ The total number of IP datagrams that this entity supplied 1.859 + */ 1.860 + int 1.861 + ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.862 +- U64 * ipSystemStatsHCOutTransmits_val_ptr) 1.863 ++ struct counter64 *ipSystemStatsHCOutTransmits_val_ptr) 1.864 + { 1.865 + /** we should have a non-NULL pointer */ 1.866 + netsnmp_assert(NULL != ipSystemStatsHCOutTransmits_val_ptr); 1.867 +@@ -2415,7 +2415,7 @@ The total number of octets in IP datagrams delivered to the 1.868 + */ 1.869 + int 1.870 + ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.871 +- U64 * ipSystemStatsHCOutOctets_val_ptr) 1.872 ++ struct counter64 *ipSystemStatsHCOutOctets_val_ptr) 1.873 + { 1.874 + /** we should have a non-NULL pointer */ 1.875 + netsnmp_assert(NULL != ipSystemStatsHCOutOctets_val_ptr); 1.876 +@@ -2539,7 +2539,7 @@ The number of IP multicast datagrams received. This object 1.877 + */ 1.878 + int 1.879 + ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.880 +- U64 * ipSystemStatsHCInMcastPkts_val_ptr) 1.881 ++ struct counter64 *ipSystemStatsHCInMcastPkts_val_ptr) 1.882 + { 1.883 + /** we should have a non-NULL pointer */ 1.884 + netsnmp_assert(NULL != ipSystemStatsHCInMcastPkts_val_ptr); 1.885 +@@ -2665,7 +2665,7 @@ The total number of octets received in IP multicast 1.886 + int 1.887 + ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.888 + rowreq_ctx, 1.889 +- U64 * 1.890 ++ struct counter64 * 1.891 + ipSystemStatsHCInMcastOctets_val_ptr) 1.892 + { 1.893 + /** we should have a non-NULL pointer */ 1.894 +@@ -2790,7 +2790,7 @@ The number of IP multicast datagrams transmitted. This 1.895 + */ 1.896 + int 1.897 + ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.898 +- U64 * ipSystemStatsHCOutMcastPkts_val_ptr) 1.899 ++ struct counter64 *ipSystemStatsHCOutMcastPkts_val_ptr) 1.900 + { 1.901 + /** we should have a non-NULL pointer */ 1.902 + netsnmp_assert(NULL != ipSystemStatsHCOutMcastPkts_val_ptr); 1.903 +@@ -2921,7 +2921,7 @@ The total number of octets transmitted in IP multicast 1.904 + int 1.905 + ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.906 + rowreq_ctx, 1.907 +- U64 * 1.908 ++ struct counter64 * 1.909 + ipSystemStatsHCOutMcastOctets_val_ptr) 1.910 + { 1.911 + /** we should have a non-NULL pointer */ 1.912 +@@ -3046,7 +3046,7 @@ The number of IP broadcast datagrams received. This object 1.913 + */ 1.914 + int 1.915 + ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.916 +- U64 * ipSystemStatsHCInBcastPkts_val_ptr) 1.917 ++ struct counter64 *ipSystemStatsHCInBcastPkts_val_ptr) 1.918 + { 1.919 + /** we should have a non-NULL pointer */ 1.920 + netsnmp_assert(NULL != ipSystemStatsHCInBcastPkts_val_ptr); 1.921 +@@ -3170,7 +3170,7 @@ The number of IP broadcast datagrams transmitted. This 1.922 + */ 1.923 + int 1.924 + ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.925 +- U64 * ipSystemStatsHCOutBcastPkts_val_ptr) 1.926 ++ struct counter64 *ipSystemStatsHCOutBcastPkts_val_ptr) 1.927 + { 1.928 + /** we should have a non-NULL pointer */ 1.929 + netsnmp_assert(NULL != ipSystemStatsHCOutBcastPkts_val_ptr); 1.930 +diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h 1.931 +index ca1e1f3..5c3823e 100644 1.932 +--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h 1.933 ++++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h 1.934 +@@ -144,93 +144,22 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) 1.935 + ********************************************************************* 1.936 + * function prototypes 1.937 + */ 1.938 +- int 1.939 +- 1.940 +- 1.941 +- 1.942 +- 1.943 +- 1.944 +- 1.945 +- 1.946 +- 1.947 +- 1.948 +- 1.949 +- 1.950 +- 1.951 +- 1.952 +- 1.953 +- 1.954 +- ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * 1.955 ++ int ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * 1.956 + user_context); 1.957 +- int 1.958 +- 1.959 +- 1.960 +- 1.961 +- 1.962 +- 1.963 +- 1.964 +- 1.965 +- 1.966 +- 1.967 +- 1.968 +- 1.969 +- 1.970 +- 1.971 +- 1.972 +- 1.973 +- ipSystemStatsTable_post_request(ipSystemStatsTable_registration * 1.974 ++ int ipSystemStatsTable_post_request(ipSystemStatsTable_registration * 1.975 + user_context, int rc); 1.976 + 1.977 +- int 1.978 +- 1.979 +- 1.980 +- 1.981 +- 1.982 +- 1.983 +- 1.984 +- 1.985 +- 1.986 +- 1.987 +- 1.988 +- 1.989 +- 1.990 +- 1.991 +- 1.992 +- 1.993 +- ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * 1.994 ++ int ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * 1.995 + rowreq_ctx, 1.996 + void *user_init_ctx); 1.997 + void 1.998 +- 1.999 +- 1.1000 +- 1.1001 +- 1.1002 +- 1.1003 +- 1.1004 +- 1.1005 +- 1.1006 +- 1.1007 +- 1.1008 +- 1.1009 +- 1.1010 +- 1.1011 +- 1.1012 +- 1.1013 + ipSystemStatsTable_rowreq_ctx_cleanup(ipSystemStatsTable_rowreq_ctx 1.1014 + * rowreq_ctx); 1.1015 + 1.1016 + ipSystemStatsTable_data *ipSystemStatsTable_allocate_data(void); 1.1017 + void ipSystemStatsTable_release_data(ipSystemStatsTable_data 1.1018 + * data); 1.1019 +- 1.1020 +- 1.1021 +- 1.1022 +- 1.1023 +- 1.1024 +- 1.1025 +- 1.1026 +- 1.1027 +- ipSystemStatsTable_rowreq_ctx 1.1028 ++ ipSystemStatsTable_rowreq_ctx 1.1029 + * ipSystemStatsTable_row_find_by_mib_index 1.1030 + (ipSystemStatsTable_mib_index * mib_idx); 1.1031 + 1.1032 +@@ -265,226 +194,50 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) 1.1033 + * indexes 1.1034 + */ 1.1035 + 1.1036 +- int 1.1037 +- 1.1038 +- 1.1039 +- 1.1040 +- 1.1041 +- 1.1042 +- 1.1043 +- 1.1044 +- 1.1045 +- 1.1046 +- 1.1047 +- 1.1048 +- 1.1049 +- 1.1050 +- 1.1051 +- 1.1052 +- ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * 1.1053 ++ int ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * 1.1054 + rowreq_ctx, 1.1055 + u_long * 1.1056 + ipSystemStatsInReceives_val_ptr); 1.1057 +- int 1.1058 +- 1.1059 +- 1.1060 +- 1.1061 +- 1.1062 +- 1.1063 +- 1.1064 +- 1.1065 +- 1.1066 +- 1.1067 +- 1.1068 +- 1.1069 +- 1.1070 +- 1.1071 +- 1.1072 +- 1.1073 +- ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * 1.1074 ++ int ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * 1.1075 + rowreq_ctx, 1.1076 +- U64 * 1.1077 ++ struct counter64 * 1.1078 + ipSystemStatsHCInReceives_val_ptr); 1.1079 + int ipSystemStatsInOctets_get(ipSystemStatsTable_rowreq_ctx 1.1080 + * rowreq_ctx, 1.1081 + u_long * 1.1082 + ipSystemStatsInOctets_val_ptr); 1.1083 +- int 1.1084 +- 1.1085 +- 1.1086 +- 1.1087 +- 1.1088 +- 1.1089 +- 1.1090 +- 1.1091 +- 1.1092 +- 1.1093 +- 1.1094 +- 1.1095 +- 1.1096 +- 1.1097 +- 1.1098 +- 1.1099 +- ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1100 ++ int ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1101 + rowreq_ctx, 1.1102 +- U64 * ipSystemStatsHCInOctets_val_ptr); 1.1103 +- int 1.1104 +- 1.1105 +- 1.1106 +- 1.1107 +- 1.1108 +- 1.1109 +- 1.1110 +- 1.1111 +- 1.1112 +- 1.1113 +- 1.1114 +- 1.1115 +- 1.1116 +- 1.1117 +- 1.1118 +- 1.1119 +- ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * 1.1120 ++ struct counter64 *ipSystemStatsHCInOctets_val_ptr); 1.1121 ++ int ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * 1.1122 + rowreq_ctx, 1.1123 + u_long * 1.1124 + ipSystemStatsInHdrErrors_val_ptr); 1.1125 +- int 1.1126 +- 1.1127 +- 1.1128 +- 1.1129 +- 1.1130 +- 1.1131 +- 1.1132 +- 1.1133 +- 1.1134 +- 1.1135 +- 1.1136 +- 1.1137 +- 1.1138 +- 1.1139 +- 1.1140 +- 1.1141 +- ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * 1.1142 ++ int ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * 1.1143 + rowreq_ctx, 1.1144 + u_long * 1.1145 + ipSystemStatsInNoRoutes_val_ptr); 1.1146 +- int 1.1147 +- 1.1148 +- 1.1149 +- 1.1150 +- 1.1151 +- 1.1152 +- 1.1153 +- 1.1154 +- 1.1155 +- 1.1156 +- 1.1157 +- 1.1158 +- 1.1159 +- 1.1160 +- 1.1161 +- 1.1162 +- ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * 1.1163 ++ int ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * 1.1164 + rowreq_ctx, 1.1165 + u_long * 1.1166 + ipSystemStatsInAddrErrors_val_ptr); 1.1167 +- int 1.1168 +- 1.1169 +- 1.1170 +- 1.1171 +- 1.1172 +- 1.1173 +- 1.1174 +- 1.1175 +- 1.1176 +- 1.1177 +- 1.1178 +- 1.1179 +- 1.1180 +- 1.1181 +- 1.1182 +- 1.1183 +- ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * 1.1184 ++ int ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * 1.1185 + rowreq_ctx, 1.1186 + u_long * 1.1187 + ipSystemStatsInUnknownProtos_val_ptr); 1.1188 +- int 1.1189 +- 1.1190 +- 1.1191 +- 1.1192 +- 1.1193 +- 1.1194 +- 1.1195 +- 1.1196 +- 1.1197 +- 1.1198 +- 1.1199 +- 1.1200 +- 1.1201 +- 1.1202 +- 1.1203 +- 1.1204 +- ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1205 ++ int ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1206 + rowreq_ctx, 1.1207 + u_long * 1.1208 + ipSystemStatsInTruncatedPkts_val_ptr); 1.1209 +- int 1.1210 +- 1.1211 +- 1.1212 +- 1.1213 +- 1.1214 +- 1.1215 +- 1.1216 +- 1.1217 +- 1.1218 +- 1.1219 +- 1.1220 +- 1.1221 +- 1.1222 +- 1.1223 +- 1.1224 +- 1.1225 +- ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.1226 ++ int ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.1227 + rowreq_ctx, 1.1228 + u_long * 1.1229 + ipSystemStatsInForwDatagrams_val_ptr); 1.1230 +- int 1.1231 +- 1.1232 +- 1.1233 +- 1.1234 +- 1.1235 +- 1.1236 +- 1.1237 +- 1.1238 +- 1.1239 +- 1.1240 +- 1.1241 +- 1.1242 +- 1.1243 +- 1.1244 +- 1.1245 +- 1.1246 +- ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.1247 ++ int ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.1248 + rowreq_ctx, 1.1249 +- U64 * 1.1250 ++ struct counter64 * 1.1251 + ipSystemStatsHCInForwDatagrams_val_ptr); 1.1252 +- int 1.1253 +- 1.1254 +- 1.1255 +- 1.1256 +- 1.1257 +- 1.1258 +- 1.1259 +- 1.1260 +- 1.1261 +- 1.1262 +- 1.1263 +- 1.1264 +- 1.1265 +- 1.1266 +- 1.1267 +- 1.1268 +- ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * 1.1269 ++ int ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * 1.1270 + rowreq_ctx, 1.1271 + u_long * 1.1272 + ipSystemStatsReasmReqds_val_ptr); 1.1273 +@@ -492,690 +245,142 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) 1.1274 + * rowreq_ctx, 1.1275 + u_long * 1.1276 + ipSystemStatsReasmOKs_val_ptr); 1.1277 +- int 1.1278 +- 1.1279 +- 1.1280 +- 1.1281 +- 1.1282 +- 1.1283 +- 1.1284 +- 1.1285 +- 1.1286 +- 1.1287 +- 1.1288 +- 1.1289 +- 1.1290 +- 1.1291 +- 1.1292 +- 1.1293 +- ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * 1.1294 ++ int ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * 1.1295 + rowreq_ctx, 1.1296 + u_long * 1.1297 + ipSystemStatsReasmFails_val_ptr); 1.1298 +- int 1.1299 +- 1.1300 +- 1.1301 +- 1.1302 +- 1.1303 +- 1.1304 +- 1.1305 +- 1.1306 +- 1.1307 +- 1.1308 +- 1.1309 +- 1.1310 +- 1.1311 +- 1.1312 +- 1.1313 +- 1.1314 +- ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * 1.1315 ++ int ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * 1.1316 + rowreq_ctx, 1.1317 + u_long * 1.1318 + ipSystemStatsInDiscards_val_ptr); 1.1319 +- int 1.1320 +- 1.1321 +- 1.1322 +- 1.1323 +- 1.1324 +- 1.1325 +- 1.1326 +- 1.1327 +- 1.1328 +- 1.1329 +- 1.1330 +- 1.1331 +- 1.1332 +- 1.1333 +- 1.1334 +- 1.1335 +- ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * 1.1336 ++ int ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * 1.1337 + rowreq_ctx, 1.1338 + u_long * 1.1339 + ipSystemStatsInDelivers_val_ptr); 1.1340 +- int 1.1341 +- 1.1342 +- 1.1343 +- 1.1344 +- 1.1345 +- 1.1346 +- 1.1347 +- 1.1348 +- 1.1349 +- 1.1350 +- 1.1351 +- 1.1352 +- 1.1353 +- 1.1354 +- 1.1355 +- 1.1356 +- ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * 1.1357 ++ int ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * 1.1358 + rowreq_ctx, 1.1359 +- U64 * 1.1360 ++ struct counter64 * 1.1361 + ipSystemStatsHCInDelivers_val_ptr); 1.1362 +- int 1.1363 +- 1.1364 +- 1.1365 +- 1.1366 +- 1.1367 +- 1.1368 +- 1.1369 +- 1.1370 +- 1.1371 +- 1.1372 +- 1.1373 +- 1.1374 +- 1.1375 +- 1.1376 +- 1.1377 +- 1.1378 +- ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * 1.1379 ++ int ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * 1.1380 + rowreq_ctx, 1.1381 + u_long * 1.1382 + ipSystemStatsOutRequests_val_ptr); 1.1383 +- int 1.1384 +- 1.1385 +- 1.1386 +- 1.1387 +- 1.1388 +- 1.1389 +- 1.1390 +- 1.1391 +- 1.1392 +- 1.1393 +- 1.1394 +- 1.1395 +- 1.1396 +- 1.1397 +- 1.1398 +- 1.1399 +- ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * 1.1400 ++ int ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * 1.1401 + rowreq_ctx, 1.1402 +- U64 * 1.1403 ++ struct counter64 * 1.1404 + ipSystemStatsHCOutRequests_val_ptr); 1.1405 +- int 1.1406 +- 1.1407 +- 1.1408 +- 1.1409 +- 1.1410 +- 1.1411 +- 1.1412 +- 1.1413 +- 1.1414 +- 1.1415 +- 1.1416 +- 1.1417 +- 1.1418 +- 1.1419 +- 1.1420 +- 1.1421 +- ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * 1.1422 ++ int ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * 1.1423 + rowreq_ctx, 1.1424 + u_long * 1.1425 + ipSystemStatsOutNoRoutes_val_ptr); 1.1426 +- int 1.1427 +- 1.1428 +- 1.1429 +- 1.1430 +- 1.1431 +- 1.1432 +- 1.1433 +- 1.1434 +- 1.1435 +- 1.1436 +- 1.1437 +- 1.1438 +- 1.1439 +- 1.1440 +- 1.1441 +- 1.1442 +- ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.1443 ++ int ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.1444 + rowreq_ctx, 1.1445 + u_long * 1.1446 + ipSystemStatsOutForwDatagrams_val_ptr); 1.1447 +- int 1.1448 +- 1.1449 +- 1.1450 +- 1.1451 +- 1.1452 +- 1.1453 +- 1.1454 +- 1.1455 +- 1.1456 +- 1.1457 +- 1.1458 +- 1.1459 +- 1.1460 +- 1.1461 +- 1.1462 +- 1.1463 +- ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.1464 ++ int ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 1.1465 + rowreq_ctx, 1.1466 +- U64 * 1.1467 ++ struct counter64 * 1.1468 + ipSystemStatsHCOutForwDatagrams_val_ptr); 1.1469 +- int 1.1470 +- 1.1471 +- 1.1472 +- 1.1473 +- 1.1474 +- 1.1475 +- 1.1476 +- 1.1477 +- 1.1478 +- 1.1479 +- 1.1480 +- 1.1481 +- 1.1482 +- 1.1483 +- 1.1484 +- 1.1485 +- ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * 1.1486 ++ int ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * 1.1487 + rowreq_ctx, 1.1488 + u_long * 1.1489 + ipSystemStatsOutDiscards_val_ptr); 1.1490 +- int 1.1491 +- 1.1492 +- 1.1493 +- 1.1494 +- 1.1495 +- 1.1496 +- 1.1497 +- 1.1498 +- 1.1499 +- 1.1500 +- 1.1501 +- 1.1502 +- 1.1503 +- 1.1504 +- 1.1505 +- 1.1506 +- ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * 1.1507 ++ int ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * 1.1508 + rowreq_ctx, 1.1509 + u_long * 1.1510 + ipSystemStatsOutFragReqds_val_ptr); 1.1511 +- int 1.1512 +- 1.1513 +- 1.1514 +- 1.1515 +- 1.1516 +- 1.1517 +- 1.1518 +- 1.1519 +- 1.1520 +- 1.1521 +- 1.1522 +- 1.1523 +- 1.1524 +- 1.1525 +- 1.1526 +- 1.1527 +- ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * 1.1528 ++ int ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * 1.1529 + rowreq_ctx, 1.1530 + u_long * 1.1531 + ipSystemStatsOutFragOKs_val_ptr); 1.1532 +- int 1.1533 +- 1.1534 +- 1.1535 +- 1.1536 +- 1.1537 +- 1.1538 +- 1.1539 +- 1.1540 +- 1.1541 +- 1.1542 +- 1.1543 +- 1.1544 +- 1.1545 +- 1.1546 +- 1.1547 +- 1.1548 +- ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * 1.1549 ++ int ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * 1.1550 + rowreq_ctx, 1.1551 + u_long * 1.1552 + ipSystemStatsOutFragFails_val_ptr); 1.1553 +- int 1.1554 +- 1.1555 +- 1.1556 +- 1.1557 +- 1.1558 +- 1.1559 +- 1.1560 +- 1.1561 +- 1.1562 +- 1.1563 +- 1.1564 +- 1.1565 +- 1.1566 +- 1.1567 +- 1.1568 +- 1.1569 +- ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * 1.1570 ++ int ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * 1.1571 + rowreq_ctx, 1.1572 + u_long * 1.1573 + ipSystemStatsOutFragCreates_val_ptr); 1.1574 +- int 1.1575 +- 1.1576 +- 1.1577 +- 1.1578 +- 1.1579 +- 1.1580 +- 1.1581 +- 1.1582 +- 1.1583 +- 1.1584 +- 1.1585 +- 1.1586 +- 1.1587 +- 1.1588 +- 1.1589 +- 1.1590 +- ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * 1.1591 ++ int ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * 1.1592 + rowreq_ctx, 1.1593 + u_long * 1.1594 + ipSystemStatsOutTransmits_val_ptr); 1.1595 +- int 1.1596 +- 1.1597 +- 1.1598 +- 1.1599 +- 1.1600 +- 1.1601 +- 1.1602 +- 1.1603 +- 1.1604 +- 1.1605 +- 1.1606 +- 1.1607 +- 1.1608 +- 1.1609 +- 1.1610 +- 1.1611 +- ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * 1.1612 ++ int ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * 1.1613 + rowreq_ctx, 1.1614 +- U64 * 1.1615 ++ struct counter64 * 1.1616 + ipSystemStatsHCOutTransmits_val_ptr); 1.1617 +- int 1.1618 +- 1.1619 +- 1.1620 +- 1.1621 +- 1.1622 +- 1.1623 +- 1.1624 +- 1.1625 +- 1.1626 +- 1.1627 +- 1.1628 +- 1.1629 +- 1.1630 +- 1.1631 +- 1.1632 +- 1.1633 +- ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1634 ++ int ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1635 + rowreq_ctx, 1.1636 + u_long * 1.1637 + ipSystemStatsOutOctets_val_ptr); 1.1638 +- int 1.1639 +- 1.1640 +- 1.1641 +- 1.1642 +- 1.1643 +- 1.1644 +- 1.1645 +- 1.1646 +- 1.1647 +- 1.1648 +- 1.1649 +- 1.1650 +- 1.1651 +- 1.1652 +- 1.1653 +- 1.1654 +- ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1655 ++ int ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1656 + rowreq_ctx, 1.1657 +- U64 * 1.1658 ++ struct counter64 * 1.1659 + ipSystemStatsHCOutOctets_val_ptr); 1.1660 +- int 1.1661 +- 1.1662 +- 1.1663 +- 1.1664 +- 1.1665 +- 1.1666 +- 1.1667 +- 1.1668 +- 1.1669 +- 1.1670 +- 1.1671 +- 1.1672 +- 1.1673 +- 1.1674 +- 1.1675 +- 1.1676 +- ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1677 ++ int ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1678 + rowreq_ctx, 1.1679 + u_long * 1.1680 + ipSystemStatsInMcastPkts_val_ptr); 1.1681 +- int 1.1682 +- 1.1683 +- 1.1684 +- 1.1685 +- 1.1686 +- 1.1687 +- 1.1688 +- 1.1689 +- 1.1690 +- 1.1691 +- 1.1692 +- 1.1693 +- 1.1694 +- 1.1695 +- 1.1696 +- 1.1697 +- ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1698 ++ int ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1699 + rowreq_ctx, 1.1700 +- U64 * 1.1701 ++ struct counter64 * 1.1702 + ipSystemStatsHCInMcastPkts_val_ptr); 1.1703 +- int 1.1704 +- 1.1705 +- 1.1706 +- 1.1707 +- 1.1708 +- 1.1709 +- 1.1710 +- 1.1711 +- 1.1712 +- 1.1713 +- 1.1714 +- 1.1715 +- 1.1716 +- 1.1717 +- 1.1718 +- 1.1719 +- ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1720 ++ int ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1721 + rowreq_ctx, 1.1722 + u_long * 1.1723 + ipSystemStatsInMcastOctets_val_ptr); 1.1724 +- int 1.1725 +- 1.1726 +- 1.1727 +- 1.1728 +- 1.1729 +- 1.1730 +- 1.1731 +- 1.1732 +- 1.1733 +- 1.1734 +- 1.1735 +- 1.1736 +- 1.1737 +- 1.1738 +- 1.1739 +- 1.1740 +- ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1741 ++ int ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1742 + rowreq_ctx, 1.1743 +- U64 * 1.1744 ++ struct counter64 * 1.1745 + ipSystemStatsHCInMcastOctets_val_ptr); 1.1746 +- int 1.1747 +- 1.1748 +- 1.1749 +- 1.1750 +- 1.1751 +- 1.1752 +- 1.1753 +- 1.1754 +- 1.1755 +- 1.1756 +- 1.1757 +- 1.1758 +- 1.1759 +- 1.1760 +- 1.1761 +- 1.1762 +- ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1763 ++ int ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1764 + rowreq_ctx, 1.1765 + u_long * 1.1766 + ipSystemStatsOutMcastPkts_val_ptr); 1.1767 +- int 1.1768 +- 1.1769 +- 1.1770 +- 1.1771 +- 1.1772 +- 1.1773 +- 1.1774 +- 1.1775 +- 1.1776 +- 1.1777 +- 1.1778 +- 1.1779 +- 1.1780 +- 1.1781 +- 1.1782 +- 1.1783 +- ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1784 ++ int ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1785 + rowreq_ctx, 1.1786 +- U64 * 1.1787 ++ struct counter64 * 1.1788 + ipSystemStatsHCOutMcastPkts_val_ptr); 1.1789 +- int 1.1790 +- 1.1791 +- 1.1792 +- 1.1793 +- 1.1794 +- 1.1795 +- 1.1796 +- 1.1797 +- 1.1798 +- 1.1799 +- 1.1800 +- 1.1801 +- 1.1802 +- 1.1803 +- 1.1804 +- 1.1805 +- ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1806 ++ int ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1807 + rowreq_ctx, 1.1808 + u_long * 1.1809 + ipSystemStatsOutMcastOctets_val_ptr); 1.1810 +- int 1.1811 +- 1.1812 +- 1.1813 +- 1.1814 +- 1.1815 +- 1.1816 +- 1.1817 +- 1.1818 +- 1.1819 +- 1.1820 +- 1.1821 +- 1.1822 +- 1.1823 +- 1.1824 +- 1.1825 +- 1.1826 +- ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1827 ++ int ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 1.1828 + rowreq_ctx, 1.1829 +- U64 * 1.1830 ++ struct counter64 * 1.1831 + ipSystemStatsHCOutMcastOctets_val_ptr); 1.1832 +- int 1.1833 +- 1.1834 +- 1.1835 +- 1.1836 +- 1.1837 +- 1.1838 +- 1.1839 +- 1.1840 +- 1.1841 +- 1.1842 +- 1.1843 +- 1.1844 +- 1.1845 +- 1.1846 +- 1.1847 +- 1.1848 +- ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1849 ++ int ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1850 + rowreq_ctx, 1.1851 + u_long * 1.1852 + ipSystemStatsInBcastPkts_val_ptr); 1.1853 +- int 1.1854 +- 1.1855 +- 1.1856 +- 1.1857 +- 1.1858 +- 1.1859 +- 1.1860 +- 1.1861 +- 1.1862 +- 1.1863 +- 1.1864 +- 1.1865 +- 1.1866 +- 1.1867 +- 1.1868 +- 1.1869 +- ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1870 ++ int ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1871 + rowreq_ctx, 1.1872 +- U64 * 1.1873 ++ struct counter64 * 1.1874 + ipSystemStatsHCInBcastPkts_val_ptr); 1.1875 +- int 1.1876 +- 1.1877 +- 1.1878 +- 1.1879 +- 1.1880 +- 1.1881 +- 1.1882 +- 1.1883 +- 1.1884 +- 1.1885 +- 1.1886 +- 1.1887 +- 1.1888 +- 1.1889 +- 1.1890 +- 1.1891 +- ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1892 ++ int ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1893 + rowreq_ctx, 1.1894 + u_long * 1.1895 + ipSystemStatsOutBcastPkts_val_ptr); 1.1896 +- int 1.1897 +- 1.1898 +- 1.1899 +- 1.1900 +- 1.1901 +- 1.1902 +- 1.1903 +- 1.1904 +- 1.1905 +- 1.1906 +- 1.1907 +- 1.1908 +- 1.1909 +- 1.1910 +- 1.1911 +- 1.1912 +- ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1913 ++ int ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 1.1914 + rowreq_ctx, 1.1915 +- U64 * 1.1916 ++ struct counter64 * 1.1917 + ipSystemStatsHCOutBcastPkts_val_ptr); 1.1918 +- int 1.1919 +- 1.1920 +- 1.1921 +- 1.1922 +- 1.1923 +- 1.1924 +- 1.1925 +- 1.1926 +- 1.1927 +- 1.1928 +- 1.1929 +- 1.1930 +- 1.1931 +- 1.1932 +- 1.1933 +- 1.1934 +- ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * 1.1935 ++ int ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * 1.1936 + rowreq_ctx, 1.1937 + u_long * 1.1938 + ipSystemStatsDiscontinuityTime_val_ptr); 1.1939 +- int 1.1940 +- 1.1941 +- 1.1942 +- 1.1943 +- 1.1944 +- 1.1945 +- 1.1946 +- 1.1947 +- 1.1948 +- 1.1949 +- 1.1950 +- 1.1951 +- 1.1952 +- 1.1953 +- 1.1954 +- 1.1955 +- ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * 1.1956 ++ int ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * 1.1957 + rowreq_ctx, 1.1958 + u_long * 1.1959 + ipSystemStatsRefreshRate_val_ptr); 1.1960 +- 1.1961 +- 1.1962 +- int 1.1963 +- 1.1964 +- 1.1965 +- 1.1966 +- 1.1967 +- 1.1968 +- 1.1969 +- 1.1970 +- 1.1971 +- 1.1972 +- 1.1973 +- 1.1974 +- 1.1975 +- 1.1976 +- 1.1977 +- 1.1978 +- ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index 1.1979 ++ int ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index 1.1980 + * tbl_idx, 1.1981 + u_long 1.1982 + ipSystemStatsIPVersion_val); 1.1983 +- int 1.1984 +- 1.1985 +- 1.1986 +- 1.1987 +- 1.1988 +- 1.1989 +- 1.1990 +- 1.1991 +- 1.1992 +- 1.1993 +- 1.1994 +- 1.1995 +- 1.1996 +- 1.1997 +- 1.1998 +- 1.1999 +- ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * 1.2000 ++ int ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * 1.2001 + rowreq_ctx, 1.2002 + u_long ipSystemStatsIPVersion_val); 1.2003 + 1.2004 +- 1.2005 +- 1.2006 + /* 1.2007 + ********************************************************************* 1.2008 + * SET function declarations 1.2009 +diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c 1.2010 +index e1ca2cb..09c061f 100644 1.2011 +--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c 1.2012 ++++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c 1.2013 +@@ -674,10 +674,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2014 + * ipSystemStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2015 + */ 1.2016 + case COLUMN_IPSYSTEMSTATSHCINRECEIVES: 1.2017 +- var->val_len = sizeof(U64); 1.2018 ++ var->val_len = sizeof(struct counter64); 1.2019 + var->type = ASN_COUNTER64; 1.2020 + rc = ipSystemStatsHCInReceives_get(rowreq_ctx, 1.2021 +- (U64 *) var->val.string); 1.2022 ++ (struct counter64 *) var->val.string); 1.2023 + break; 1.2024 + 1.2025 + /* 1.2026 +@@ -694,10 +694,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2027 + * ipSystemStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2028 + */ 1.2029 + case COLUMN_IPSYSTEMSTATSHCINOCTETS: 1.2030 +- var->val_len = sizeof(U64); 1.2031 ++ var->val_len = sizeof(struct counter64); 1.2032 + var->type = ASN_COUNTER64; 1.2033 + rc = ipSystemStatsHCInOctets_get(rowreq_ctx, 1.2034 +- (U64 *) var->val.string); 1.2035 ++ (struct counter64 *) var->val.string); 1.2036 + break; 1.2037 + 1.2038 + /* 1.2039 +@@ -764,10 +764,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2040 + * ipSystemStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2041 + */ 1.2042 + case COLUMN_IPSYSTEMSTATSHCINFORWDATAGRAMS: 1.2043 +- var->val_len = sizeof(U64); 1.2044 ++ var->val_len = sizeof(struct counter64); 1.2045 + var->type = ASN_COUNTER64; 1.2046 + rc = ipSystemStatsHCInForwDatagrams_get(rowreq_ctx, 1.2047 +- (U64 *) var->val.string); 1.2048 ++ (struct counter64 *) var->val.string); 1.2049 + break; 1.2050 + 1.2051 + /* 1.2052 +@@ -824,10 +824,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2053 + * ipSystemStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2054 + */ 1.2055 + case COLUMN_IPSYSTEMSTATSHCINDELIVERS: 1.2056 +- var->val_len = sizeof(U64); 1.2057 ++ var->val_len = sizeof(struct counter64); 1.2058 + var->type = ASN_COUNTER64; 1.2059 + rc = ipSystemStatsHCInDelivers_get(rowreq_ctx, 1.2060 +- (U64 *) var->val.string); 1.2061 ++ (struct counter64 *) var->val.string); 1.2062 + break; 1.2063 + 1.2064 + /* 1.2065 +@@ -844,10 +844,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2066 + * ipSystemStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2067 + */ 1.2068 + case COLUMN_IPSYSTEMSTATSHCOUTREQUESTS: 1.2069 +- var->val_len = sizeof(U64); 1.2070 ++ var->val_len = sizeof(struct counter64); 1.2071 + var->type = ASN_COUNTER64; 1.2072 + rc = ipSystemStatsHCOutRequests_get(rowreq_ctx, 1.2073 +- (U64 *) var->val.string); 1.2074 ++ (struct counter64 *) var->val.string); 1.2075 + break; 1.2076 + 1.2077 + /* 1.2078 +@@ -874,10 +874,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2079 + * ipSystemStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2080 + */ 1.2081 + case COLUMN_IPSYSTEMSTATSHCOUTFORWDATAGRAMS: 1.2082 +- var->val_len = sizeof(U64); 1.2083 ++ var->val_len = sizeof(struct counter64); 1.2084 + var->type = ASN_COUNTER64; 1.2085 + rc = ipSystemStatsHCOutForwDatagrams_get(rowreq_ctx, 1.2086 +- (U64 *) var->val.string); 1.2087 ++ (struct counter64 *) var->val.string); 1.2088 + break; 1.2089 + 1.2090 + /* 1.2091 +@@ -944,10 +944,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2092 + * ipSystemStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2093 + */ 1.2094 + case COLUMN_IPSYSTEMSTATSHCOUTTRANSMITS: 1.2095 +- var->val_len = sizeof(U64); 1.2096 ++ var->val_len = sizeof(struct counter64); 1.2097 + var->type = ASN_COUNTER64; 1.2098 + rc = ipSystemStatsHCOutTransmits_get(rowreq_ctx, 1.2099 +- (U64 *) var->val.string); 1.2100 ++ (struct counter64 *) var->val.string); 1.2101 + break; 1.2102 + 1.2103 + /* 1.2104 +@@ -964,10 +964,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2105 + * ipSystemStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2106 + */ 1.2107 + case COLUMN_IPSYSTEMSTATSHCOUTOCTETS: 1.2108 +- var->val_len = sizeof(U64); 1.2109 ++ var->val_len = sizeof(struct counter64); 1.2110 + var->type = ASN_COUNTER64; 1.2111 + rc = ipSystemStatsHCOutOctets_get(rowreq_ctx, 1.2112 +- (U64 *) var->val.string); 1.2113 ++ (struct counter64 *) var->val.string); 1.2114 + break; 1.2115 + 1.2116 + /* 1.2117 +@@ -984,10 +984,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2118 + * ipSystemStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2119 + */ 1.2120 + case COLUMN_IPSYSTEMSTATSHCINMCASTPKTS: 1.2121 +- var->val_len = sizeof(U64); 1.2122 ++ var->val_len = sizeof(struct counter64); 1.2123 + var->type = ASN_COUNTER64; 1.2124 + rc = ipSystemStatsHCInMcastPkts_get(rowreq_ctx, 1.2125 +- (U64 *) var->val.string); 1.2126 ++ (struct counter64 *) var->val.string); 1.2127 + break; 1.2128 + 1.2129 + /* 1.2130 +@@ -1004,10 +1004,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2131 + * ipSystemStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2132 + */ 1.2133 + case COLUMN_IPSYSTEMSTATSHCINMCASTOCTETS: 1.2134 +- var->val_len = sizeof(U64); 1.2135 ++ var->val_len = sizeof(struct counter64); 1.2136 + var->type = ASN_COUNTER64; 1.2137 + rc = ipSystemStatsHCInMcastOctets_get(rowreq_ctx, 1.2138 +- (U64 *) var->val.string); 1.2139 ++ (struct counter64 *) var->val.string); 1.2140 + break; 1.2141 + 1.2142 + /* 1.2143 +@@ -1024,10 +1024,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2144 + * ipSystemStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2145 + */ 1.2146 + case COLUMN_IPSYSTEMSTATSHCOUTMCASTPKTS: 1.2147 +- var->val_len = sizeof(U64); 1.2148 ++ var->val_len = sizeof(struct counter64); 1.2149 + var->type = ASN_COUNTER64; 1.2150 + rc = ipSystemStatsHCOutMcastPkts_get(rowreq_ctx, 1.2151 +- (U64 *) var->val.string); 1.2152 ++ (struct counter64 *) var->val.string); 1.2153 + break; 1.2154 + 1.2155 + /* 1.2156 +@@ -1044,10 +1044,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2157 + * ipSystemStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2158 + */ 1.2159 + case COLUMN_IPSYSTEMSTATSHCOUTMCASTOCTETS: 1.2160 +- var->val_len = sizeof(U64); 1.2161 ++ var->val_len = sizeof(struct counter64); 1.2162 + var->type = ASN_COUNTER64; 1.2163 + rc = ipSystemStatsHCOutMcastOctets_get(rowreq_ctx, 1.2164 +- (U64 *) var->val.string); 1.2165 ++ (struct counter64 *) var->val.string); 1.2166 + break; 1.2167 + 1.2168 + /* 1.2169 +@@ -1064,10 +1064,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2170 + * ipSystemStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2171 + */ 1.2172 + case COLUMN_IPSYSTEMSTATSHCINBCASTPKTS: 1.2173 +- var->val_len = sizeof(U64); 1.2174 ++ var->val_len = sizeof(struct counter64); 1.2175 + var->type = ASN_COUNTER64; 1.2176 + rc = ipSystemStatsHCInBcastPkts_get(rowreq_ctx, 1.2177 +- (U64 *) var->val.string); 1.2178 ++ (struct counter64 *) var->val.string); 1.2179 + break; 1.2180 + 1.2181 + /* 1.2182 +@@ -1084,10 +1084,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 1.2183 + * ipSystemStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 1.2184 + */ 1.2185 + case COLUMN_IPSYSTEMSTATSHCOUTBCASTPKTS: 1.2186 +- var->val_len = sizeof(U64); 1.2187 ++ var->val_len = sizeof(struct counter64); 1.2188 + var->type = ASN_COUNTER64; 1.2189 + rc = ipSystemStatsHCOutBcastPkts_get(rowreq_ctx, 1.2190 +- (U64 *) var->val.string); 1.2191 ++ (struct counter64 *) var->val.string); 1.2192 + break; 1.2193 + 1.2194 + /* 1.2195 +diff --git a/include/net-snmp/data_access/ipstats.h b/include/net-snmp/data_access/ipstats.h 1.2196 +index f782459..f0df46b 100644 1.2197 +--- a/include/net-snmp/data_access/ipstats.h 1.2198 ++++ b/include/net-snmp/data_access/ipstats.h 1.2199 +@@ -58,45 +58,45 @@ typedef struct netsnmp_ipstats_s { 1.2200 + * other columns, when underlying OS does not provide them. 1.2201 + * Always fill at least 32 bits, the table is periodically polled -> 32 bit 1.2202 + * overflow shall be detected and 64 bit value should be computed automatically. */ 1.2203 +- U64 HCInReceives; 1.2204 +- U64 HCInOctets; 1.2205 ++ struct counter64 HCInReceives; 1.2206 ++ struct counter64 HCInOctets; 1.2207 + u_long InHdrErrors; 1.2208 +- U64 HCInNoRoutes; 1.2209 ++ struct counter64 HCInNoRoutes; 1.2210 + u_long InAddrErrors; 1.2211 + u_long InUnknownProtos; 1.2212 + u_long InTruncatedPkts; 1.2213 + 1.2214 + /* optional, can be computed from HCInNoRoutes and HCOutForwDatagrams */ 1.2215 +- U64 HCInForwDatagrams; 1.2216 ++ struct counter64 HCInForwDatagrams; 1.2217 + 1.2218 + u_long ReasmReqds; 1.2219 + u_long ReasmOKs; 1.2220 + u_long ReasmFails; 1.2221 + u_long InDiscards; 1.2222 +- U64 HCInDelivers; 1.2223 +- U64 HCOutRequests; 1.2224 +- U64 HCOutNoRoutes; 1.2225 +- U64 HCOutForwDatagrams; 1.2226 +- U64 HCOutDiscards; 1.2227 ++ struct counter64 HCInDelivers; 1.2228 ++ struct counter64 HCOutRequests; 1.2229 ++ struct counter64 HCOutNoRoutes; 1.2230 ++ struct counter64 HCOutForwDatagrams; 1.2231 ++ struct counter64 HCOutDiscards; 1.2232 + 1.2233 + /* optional, can be computed from HCOutFragOKs + HCOutFragFails*/ 1.2234 +- U64 HCOutFragReqds; 1.2235 +- U64 HCOutFragOKs; 1.2236 +- U64 HCOutFragFails; 1.2237 +- U64 HCOutFragCreates; 1.2238 ++ struct counter64 HCOutFragReqds; 1.2239 ++ struct counter64 HCOutFragOKs; 1.2240 ++ struct counter64 HCOutFragFails; 1.2241 ++ struct counter64 HCOutFragCreates; 1.2242 + 1.2243 + /* optional, can be computed from 1.2244 + * HCOutRequests +HCOutForwDatagrams + HCOutFragCreates 1.2245 + * - HCOutFragReqds - HCOutNoRoutes - HCOutDiscards */ 1.2246 +- U64 HCOutTransmits; 1.2247 ++ struct counter64 HCOutTransmits; 1.2248 + 1.2249 +- U64 HCOutOctets; 1.2250 +- U64 HCInMcastPkts; 1.2251 +- U64 HCInMcastOctets; 1.2252 +- U64 HCOutMcastPkts; 1.2253 +- U64 HCOutMcastOctets; 1.2254 +- U64 HCInBcastPkts; 1.2255 +- U64 HCOutBcastPkts; 1.2256 ++ struct counter64 HCOutOctets; 1.2257 ++ struct counter64 HCInMcastPkts; 1.2258 ++ struct counter64 HCInMcastOctets; 1.2259 ++ struct counter64 HCOutMcastPkts; 1.2260 ++ struct counter64 HCOutMcastOctets; 1.2261 ++ struct counter64 HCInBcastPkts; 1.2262 ++ struct counter64 HCOutBcastPkts; 1.2263 + 1.2264 + /* Array of available columns.*/ 1.2265 + int columnAvail[IPSYSTEMSTATSTABLE_LAST+1]; 1.2266 +diff --git a/include/net-snmp/library/int64.h b/include/net-snmp/library/int64.h 1.2267 +index 9c7c894..3a85213 100644 1.2268 +--- a/include/net-snmp/library/int64.h 1.2269 ++++ b/include/net-snmp/library/int64.h 1.2270 +@@ -5,31 +5,29 @@ 1.2271 + extern "C" { 1.2272 + #endif 1.2273 + 1.2274 +- typedef struct counter64 U64; 1.2275 +- 1.2276 + #define I64CHARSZ 21 1.2277 + 1.2278 +- void divBy10(U64, U64 *, unsigned int *); 1.2279 +- void multBy10(U64, U64 *); 1.2280 +- void incrByU16(U64 *, unsigned int); 1.2281 +- void incrByU32(U64 *, unsigned int); 1.2282 ++ void divBy10(struct counter64, struct counter64 *, unsigned int *); 1.2283 ++ void multBy10(struct counter64, struct counter64 *); 1.2284 ++ void incrByU16(struct counter64 *, unsigned int); 1.2285 ++ void incrByU32(struct counter64 *, unsigned int); 1.2286 + NETSNMP_IMPORT 1.2287 +- void zeroU64(U64 *); 1.2288 +- int isZeroU64(const U64 *); 1.2289 ++ void zeroU64(struct counter64 *); 1.2290 ++ int isZeroU64(const struct counter64 *); 1.2291 + NETSNMP_IMPORT 1.2292 +- void printU64(char *, const U64 *); 1.2293 ++ void printU64(char *, const struct counter64 *); 1.2294 + NETSNMP_IMPORT 1.2295 +- void printI64(char *, const U64 *); 1.2296 +- int read64(U64 *, const char *); 1.2297 ++ void printI64(char *, const struct counter64 *); 1.2298 ++ int read64(struct counter64 *, const char *); 1.2299 + NETSNMP_IMPORT 1.2300 +- void u64Subtract(const U64 * pu64one, const U64 * pu64two, 1.2301 +- U64 * pu64out); 1.2302 +- void u64Incr(U64 * pu64out, const U64 * pu64one); 1.2303 +- void u64UpdateCounter(U64 * pu64out, const U64 * pu64one, 1.2304 +- const U64 * pu64two); 1.2305 +- void u64Copy(U64 * pu64one, const U64 * pu64two); 1.2306 ++ void u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, 1.2307 ++ struct counter64 *pu64out); 1.2308 ++ void u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one); 1.2309 ++ void u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, 1.2310 ++ const struct counter64 *pu64two); 1.2311 ++ void u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two); 1.2312 + 1.2313 +- int netsnmp_c64_check_for_32bit_wrap(U64 *old_val, U64 *new_val, 1.2314 ++ int netsnmp_c64_check_for_32bit_wrap(struct counter64 *old_val, struct counter64 *new_val, 1.2315 + int adjust); 1.2316 + NETSNMP_IMPORT 1.2317 + int netsnmp_c64_check32_and_update(struct counter64 *prev_val, 1.2318 +diff --git a/snmplib/int64.c b/snmplib/int64.c 1.2319 +index 51f1f32..951f813 100644 1.2320 +--- a/snmplib/int64.c 1.2321 ++++ b/snmplib/int64.c 1.2322 +@@ -33,7 +33,7 @@ 1.2323 + * @param[out] puR Remainder. 1.2324 + */ 1.2325 + void 1.2326 +-divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) 1.2327 ++divBy10(struct counter64 u64, struct counter64 *pu64Q, unsigned int *puR) 1.2328 + { 1.2329 + unsigned long ulT; 1.2330 + unsigned long ulQ; 1.2331 +@@ -83,7 +83,7 @@ divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) 1.2332 + * @param[out] pu64P Product. 1.2333 + */ 1.2334 + void 1.2335 +-multBy10(U64 u64, U64 * pu64P) 1.2336 ++multBy10(struct counter64 u64, struct counter64 *pu64P) 1.2337 + { 1.2338 + unsigned long ulT; 1.2339 + unsigned long ulP; 1.2340 +@@ -130,7 +130,7 @@ multBy10(U64 u64, U64 * pu64P) 1.2341 + * 1.2342 + */ 1.2343 + void 1.2344 +-incrByU16(U64 * pu64, unsigned int u16) 1.2345 ++incrByU16(struct counter64 *pu64, unsigned int u16) 1.2346 + { 1.2347 + incrByU32(pu64, u16); 1.2348 + } 1.2349 +@@ -143,7 +143,7 @@ incrByU16(U64 * pu64, unsigned int u16) 1.2350 + * 1.2351 + */ 1.2352 + void 1.2353 +-incrByU32(U64 * pu64, unsigned int u32) 1.2354 ++incrByU32(struct counter64 *pu64, unsigned int u32) 1.2355 + { 1.2356 + uint32_t tmp; 1.2357 + 1.2358 +@@ -161,7 +161,7 @@ incrByU32(U64 * pu64, unsigned int u32) 1.2359 + * @param[out] pu64out pu64one - pu64two. 1.2360 + */ 1.2361 + void 1.2362 +-u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) 1.2363 ++u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, struct counter64 *pu64out) 1.2364 + { 1.2365 + int carry; 1.2366 + 1.2367 +@@ -177,7 +177,7 @@ u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) 1.2368 + * @param[in,out] pu64out pu64out += pu64one. 1.2369 + */ 1.2370 + void 1.2371 +-u64Incr(U64 * pu64out, const U64 * pu64one) 1.2372 ++u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one) 1.2373 + { 1.2374 + pu64out->high = (uint32_t)(pu64out->high + pu64one->high); 1.2375 + incrByU32(pu64out, pu64one->low); 1.2376 +@@ -191,9 +191,9 @@ u64Incr(U64 * pu64out, const U64 * pu64one) 1.2377 + * @param[out] pu64out pu64out += (pu64one - pu64two) 1.2378 + */ 1.2379 + void 1.2380 +-u64UpdateCounter(U64 * pu64out, const U64 * pu64one, const U64 * pu64two) 1.2381 ++u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, const struct counter64 *pu64two) 1.2382 + { 1.2383 +- U64 tmp; 1.2384 ++ struct counter64 tmp; 1.2385 + 1.2386 + u64Subtract(pu64one, pu64two, &tmp); 1.2387 + u64Incr(pu64out, &tmp); 1.2388 +@@ -208,7 +208,7 @@ netsnmp_feature_child_of(u64copy, netsnmp_unused) 1.2389 + * @param[out] pu64one Where to store the copy - *pu64one = *pu64two. 1.2390 + */ 1.2391 + void 1.2392 +-u64Copy(U64 * pu64one, const U64 * pu64two) 1.2393 ++u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two) 1.2394 + { 1.2395 + *pu64one = *pu64two; 1.2396 + } 1.2397 +@@ -220,7 +220,7 @@ u64Copy(U64 * pu64one, const U64 * pu64two) 1.2398 + * @param[in] pu64 Number to be zeroed. 1.2399 + */ 1.2400 + void 1.2401 +-zeroU64(U64 * pu64) 1.2402 ++zeroU64(struct counter64 *pu64) 1.2403 + { 1.2404 + pu64->low = 0; 1.2405 + pu64->high = 0; 1.2406 +@@ -232,7 +232,7 @@ zeroU64(U64 * pu64) 1.2407 + * @param[in] pu64 Number to be checked. 1.2408 + */ 1.2409 + int 1.2410 +-isZeroU64(const U64 * pu64) 1.2411 ++isZeroU64(const struct counter64 *pu64) 1.2412 + { 1.2413 + return pu64->low == 0 && pu64->high == 0; 1.2414 + } 1.2415 +@@ -390,10 +390,10 @@ netsnmp_c64_check32_and_update(struct counter64 *prev_val, struct counter64 *new 1.2416 + /** Convert an unsigned 64-bit number to ASCII. */ 1.2417 + void 1.2418 + printU64(char *buf, /* char [I64CHARSZ+1]; */ 1.2419 +- const U64 * pu64) 1.2420 ++ const struct counter64 *pu64) 1.2421 + { 1.2422 +- U64 u64a; 1.2423 +- U64 u64b; 1.2424 ++ struct counter64 u64a; 1.2425 ++ struct counter64 u64b; 1.2426 + 1.2427 + char aRes[I64CHARSZ + 1]; 1.2428 + unsigned int u; 1.2429 +@@ -414,9 +414,9 @@ printU64(char *buf, /* char [I64CHARSZ+1]; */ 1.2430 + /** Convert a signed 64-bit number to ASCII. */ 1.2431 + void 1.2432 + printI64(char *buf, /* char [I64CHARSZ+1]; */ 1.2433 +- const U64 * pu64) 1.2434 ++ const struct counter64 *pu64) 1.2435 + { 1.2436 +- U64 u64a; 1.2437 ++ struct counter64 u64a; 1.2438 + 1.2439 + if (pu64->high & 0x80000000) { 1.2440 + u64a.high = (uint32_t) ~pu64->high; 1.2441 +@@ -429,11 +429,11 @@ printI64(char *buf, /* char [I64CHARSZ+1]; */ 1.2442 + } 1.2443 + } 1.2444 + 1.2445 +-/** Convert a signed 64-bit integer from ASCII to U64. */ 1.2446 ++/** Convert a signed 64-bit integer from ASCII to struct counter64. */ 1.2447 + int 1.2448 +-read64(U64 * i64, const char *str) 1.2449 ++read64(struct counter64 *i64, const char *str) 1.2450 + { 1.2451 +- U64 i64p; 1.2452 ++ struct counter64 i64p; 1.2453 + unsigned int u; 1.2454 + int sign = 0; 1.2455 + int ok = 0; 1.2456 +diff --git a/snmplib/read_config.c b/snmplib/read_config.c 1.2457 +index e159c27..ab5b6a3 100644 1.2458 +--- a/snmplib/read_config.c 1.2459 ++++ b/snmplib/read_config.c 1.2460 +@@ -2279,10 +2279,10 @@ read_config_read_memory(int type, char *readfrom, 1.2461 + return readfrom; 1.2462 + 1.2463 + case ASN_COUNTER64: 1.2464 +- if (*len < sizeof(U64)) 1.2465 ++ if (*len < sizeof(struct counter64)) 1.2466 + return NULL; 1.2467 +- *len = sizeof(U64); 1.2468 +- read64((U64 *) dataptr, readfrom); 1.2469 ++ *len = sizeof(struct counter64); 1.2470 ++ read64((struct counter64 *) dataptr, readfrom); 1.2471 + readfrom = skip_token(readfrom); 1.2472 + return readfrom; 1.2473 + } 1.2474 +diff --git a/testing/fulltests/unit-tests/T015int64_clib.c b/testing/fulltests/unit-tests/T015int64_clib.c 1.2475 +index 5f5f4b6..66f66b7 100644 1.2476 +--- a/testing/fulltests/unit-tests/T015int64_clib.c 1.2477 ++++ b/testing/fulltests/unit-tests/T015int64_clib.c 1.2478 +@@ -1,4 +1,4 @@ 1.2479 +-/* HEADER Testing 64-bit integer operations (U64). */ 1.2480 ++/* HEADER Testing 64-bit integer operations (struct counter64). */ 1.2481 + 1.2482 + int i, j; 1.2483 + char buf[22]; 1.2484 +@@ -15,7 +15,7 @@ static const int64_t intval[] = { 1.2485 + }; 1.2486 + 1.2487 + for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 1.2488 +- U64 a, b; 1.2489 ++ struct counter64 a, b; 1.2490 + a.low = (uint32_t)intval[i]; 1.2491 + a.high = (uint32_t)(intval[i] >> 32); 1.2492 + printI64(buf, &a); 1.2493 +@@ -27,7 +27,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 1.2494 + 1.2495 + for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 1.2496 + for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { 1.2497 +- U64 a, b; 1.2498 ++ struct counter64 a, b; 1.2499 + uint64_t d; 1.2500 + a.low = (uint32_t)intval[i]; 1.2501 + a.high = (uint32_t)(intval[i] >> 32); 1.2502 +@@ -43,7 +43,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 1.2503 + 1.2504 + for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 1.2505 + for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { 1.2506 +- U64 a, b, c; 1.2507 ++ struct counter64 a, b, c; 1.2508 + uint64_t d; 1.2509 + a.low = (uint32_t)intval[i]; 1.2510 + a.high = (uint32_t)(intval[i] >> 32); 1.2511 +@@ -58,7 +58,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 1.2512 + } 1.2513 + 1.2514 + { 1.2515 +- U64 old_val, new_val; 1.2516 ++ struct counter64 old_val, new_val; 1.2517 + old_val.low = 7; 1.2518 + old_val.high = 0; 1.2519 + new_val = old_val; 1.2520 +-- 1.2521 +2.8.2 1.2522 + 1.2523 +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 1.2524 +--- net-snmp-5.7.3.orig/perl/agent/default_store/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2525 ++++ net-snmp-5.7.3/perl/agent/default_store/Makefile.PL 2016-05-11 00:02:32.571453072 +0200 1.2526 +@@ -1,3 +1,4 @@ 1.2527 ++package agent_default_store; 1.2528 + use ExtUtils::MakeMaker; 1.2529 + require 5; 1.2530 + use Config; 1.2531 +diff -puNr net-snmp-5.7.3.orig/perl/agent/Makefile.PL net-snmp-5.7.3/perl/agent/Makefile.PL 1.2532 +--- net-snmp-5.7.3.orig/perl/agent/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2533 ++++ net-snmp-5.7.3/perl/agent/Makefile.PL 2016-05-11 00:02:32.571453072 +0200 1.2534 +@@ -1,3 +1,4 @@ 1.2535 ++package agent; 1.2536 + use ExtUtils::MakeMaker; 1.2537 + require 5; 1.2538 + use Config; 1.2539 +diff -puNr net-snmp-5.7.3.orig/perl/agent/Support/Makefile.PL net-snmp-5.7.3/perl/agent/Support/Makefile.PL 1.2540 +--- net-snmp-5.7.3.orig/perl/agent/Support/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2541 ++++ net-snmp-5.7.3/perl/agent/Support/Makefile.PL 2016-05-11 00:02:32.571453072 +0200 1.2542 +@@ -1,3 +1,4 @@ 1.2543 ++package agent_Support; 1.2544 + use ExtUtils::MakeMaker; 1.2545 + require 5; 1.2546 + use Config; 1.2547 +diff -puNr net-snmp-5.7.3.orig/perl/AnyData_SNMP/Makefile.PL net-snmp-5.7.3/perl/AnyData_SNMP/Makefile.PL 1.2548 +--- net-snmp-5.7.3.orig/perl/AnyData_SNMP/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2549 ++++ net-snmp-5.7.3/perl/AnyData_SNMP/Makefile.PL 2016-05-11 00:02:32.570453079 +0200 1.2550 +@@ -1,3 +1,4 @@ 1.2551 ++package AnyData_SNMP; 1.2552 + use ExtUtils::MakeMaker; 1.2553 + # See lib/ExtUtils/MakeMaker.pm for details of how to influence 1.2554 + # the contents of the Makefile that is written. 1.2555 +diff -puNr net-snmp-5.7.3.orig/perl/ASN/Makefile.PL net-snmp-5.7.3/perl/ASN/Makefile.PL 1.2556 +--- net-snmp-5.7.3.orig/perl/ASN/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2557 ++++ net-snmp-5.7.3/perl/ASN/Makefile.PL 2016-05-11 00:02:32.551453196 +0200 1.2558 +@@ -1,3 +1,4 @@ 1.2559 ++package ASN; 1.2560 + use ExtUtils::MakeMaker; 1.2561 + require 5; 1.2562 + use Config; 1.2563 +diff -puNr net-snmp-5.7.3.orig/perl/default_store/Makefile.PL net-snmp-5.7.3/perl/default_store/Makefile.PL 1.2564 +--- net-snmp-5.7.3.orig/perl/default_store/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2565 ++++ net-snmp-5.7.3/perl/default_store/Makefile.PL 2016-05-11 00:02:32.572453066 +0200 1.2566 +@@ -1,3 +1,4 @@ 1.2567 ++package default_store; 1.2568 + use ExtUtils::MakeMaker; 1.2569 + require 5; 1.2570 + use Config; 1.2571 +diff -puNr net-snmp-5.7.3.orig/perl/manager/Makefile.PL net-snmp-5.7.3/perl/manager/Makefile.PL 1.2572 +--- net-snmp-5.7.3.orig/perl/manager/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2573 ++++ net-snmp-5.7.3/perl/manager/Makefile.PL 2016-05-11 00:02:32.572453066 +0200 1.2574 +@@ -1,3 +1,4 @@ 1.2575 ++package manager; 1.2576 + use ExtUtils::MakeMaker; 1.2577 + # See lib/ExtUtils/MakeMaker.pm for details of how to influence 1.2578 + # the contents of the Makefile that is written. 1.2579 +diff -puNr net-snmp-5.7.3.orig/perl/OID/Makefile.PL net-snmp-5.7.3/perl/OID/Makefile.PL 1.2580 +--- net-snmp-5.7.3.orig/perl/OID/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2581 ++++ net-snmp-5.7.3/perl/OID/Makefile.PL 2016-05-11 00:02:32.570453079 +0200 1.2582 +@@ -1,3 +1,4 @@ 1.2583 ++package OID; 1.2584 + # See lib/ExtUtils/MakeMaker.pm for details of how to influence 1.2585 + # the contents of the Makefile that is written. 1.2586 + 1.2587 +diff -puNr net-snmp-5.7.3.orig/perl/SNMP/Makefile.PL net-snmp-5.7.3/perl/SNMP/Makefile.PL 1.2588 +--- net-snmp-5.7.3.orig/perl/SNMP/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2589 ++++ net-snmp-5.7.3/perl/SNMP/Makefile.PL 2016-05-11 00:02:32.570453079 +0200 1.2590 +@@ -1,3 +1,4 @@ 1.2591 ++package SNMP; 1.2592 + use ExtUtils::MakeMaker; 1.2593 + require 5; 1.2594 + use Config; 1.2595 +diff -puNr net-snmp-5.7.3.orig/perl/TrapReceiver/Makefile.PL net-snmp-5.7.3/perl/TrapReceiver/Makefile.PL 1.2596 +--- net-snmp-5.7.3.orig/perl/TrapReceiver/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 1.2597 ++++ net-snmp-5.7.3/perl/TrapReceiver/Makefile.PL 2016-05-11 00:02:32.571453072 +0200 1.2598 +@@ -1,3 +1,4 @@ 1.2599 ++package TrapReceiver; 1.2600 + use ExtUtils::MakeMaker; 1.2601 + require 5; 1.2602 + use Config;