From: Yoshitaka Aharen <aharen@jprs.co.jp>
Date: Wed, 26 Dec 2012 08:46:01 +0000 (+0900)
Subject: [2157] renamed af to ipversion
X-Git-Tag: bind10-1.1.0beta1-release~85^2~5^2~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3eb8564cd9f9dc2b05b25da7d837a742acb7a860;p=thirdparty%2Fkea.git

[2157] renamed af to ipversion
---

diff --git a/src/bin/auth/tests/statistics_unittest.cc.pre b/src/bin/auth/tests/statistics_unittest.cc.pre
index 129c20a116..04a3df801a 100644
--- a/src/bin/auth/tests/statistics_unittest.cc.pre
+++ b/src/bin/auth/tests/statistics_unittest.cc.pre
@@ -163,15 +163,15 @@ TEST_F(CountersTest, incrementProtocolType) {
     std::map<std::string, int> expect;
 
     // Test these patterns:
-    //      af     protocol
+    //      ipversion   protocol
     //     -----------------
-    //      ipv4   udp
-    //      ipv6   udp
-    //      ipv4   tcp
-    //      ipv6   tcp
+    //      ipv4        udp
+    //      ipv6        udp
+    //      ipv4        tcp
+    //      ipv6        tcp
     int count_v4 = 0, count_v6 = 0, count_udp = 0, count_tcp = 0;
     for (int i = 0; i < 4; ++i) {
-        const enum MessageAttributes::IPVersion af = (i & 1) != 0 ?
+        const enum MessageAttributes::IPVersion ipversion = (i & 1) != 0 ?
             MessageAttributes::IP_VERSION_IPV4 :
             MessageAttributes::IP_VERSION_IPV6;
         const enum MessageAttributes::TransportProtocol proto = (i & 2) != 0 ?
@@ -179,7 +179,7 @@ TEST_F(CountersTest, incrementProtocolType) {
             MessageAttributes::TRANSPORT_TCP;
 
         buildSkeletonMessage(msgattrs);
-        msgattrs.setRequestIPVersion(af);
+        msgattrs.setRequestIPVersion(ipversion);
         msgattrs.setRequestTransportProtocol(proto);
 
         response.setRcode(Rcode::REFUSED());
@@ -189,7 +189,7 @@ TEST_F(CountersTest, incrementProtocolType) {
 
         counters.inc(msgattrs, response, true);
 
-        if (af == MessageAttributes::IP_VERSION_IPV4) {
+        if (ipversion == MessageAttributes::IP_VERSION_IPV4) {
             ++count_v4;
         } else {
             ++count_v6;