global: Normalize isIpv4 to isIPv4

diff --git a/pdns/calidns.cc b/pdns/calidns.cc
index c4584c1c465cac447185c0f06f2eade452c3b2b8..39796e5f715ba3a63f8f00290b1bb2d4add0cd7a 100644 (file)
--- a/pdns/calidns.cc
+++ b/pdns/calidns.cc
@@ -335,7 +335,7 @@ try
       ecsRange = Netmask(g_vm["ecs"].as<string>());
       if (!ecsRange.empty()) {
 
-        if (!ecsRange.isIpv4()) {
+        if (!ecsRange.isIPv4()) {
           cerr<<"Only IPv4 ranges are supported for ECS at the moment!"<<endl;
           return EXIT_FAILURE;
         }

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 980770ff7ec121e239ded506fe92efd7867456e5..01f64311bfce38813974f6095e9ff1c6fb33ceeb 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -273,7 +273,7 @@ void DNSPacket::wrapup()
   {
     // this is an upper bound
     optsize += EDNS_OPTION_CODE_SIZE + EDNS_OPTION_LENGTH_SIZE + 2 + 1 + 1; // code+len+family+src len+scope len
-    optsize += d_eso.source.isIpv4() ? 4 : 16;
+    optsize += d_eso.source.isIPv4() ? 4 : 16;
   }
 
   if (d_trc.d_algoName.countLabels())

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index 32cd32f77c8b8d2006ccc7e553c46b13491d5f6a..7b171efec995eccd1f7c5360aaa149c91e46105a 100644 (file)
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -475,7 +475,7 @@ public:
   const ComboAddress getMaskedNetwork() const
   {
     ComboAddress result(d_network);
-    if(isIpv4()) {
+    if(isIPv4()) {
       result.sin4.sin_addr.s_addr = htonl(ntohl(result.sin4.sin_addr.s_addr) & d_mask);
     }
     else if(isIPv6()) {
@@ -503,7 +503,7 @@ public:
   {
     return d_network.sin6.sin6_family == AF_INET6;
   }
-  bool isIpv4() const
+  bool isIPv4() const
   {
     return d_network.sin4.sin_family == AF_INET;
   }

diff --git a/pdns/lua-base4.cc b/pdns/lua-base4.cc
index e6bdd9842c4129710e13cadb93b18c82deb2b2ef..793e0de40ce3d9523e4e3e9ab2fb273a3709a028 100644 (file)
--- a/pdns/lua-base4.cc
+++ b/pdns/lua-base4.cc
@@ -165,7 +165,8 @@ void BaseLua4::prepareContext() {
   d_lw->writeFunction("newNetmask", [](const string& s) { return Netmask(s); });
   d_lw->registerFunction<ComboAddress(Netmask::*)()>("getNetwork", [](const Netmask& nm) { return nm.getNetwork(); } ); // const reference makes this necessary
   d_lw->registerFunction<ComboAddress(Netmask::*)()>("getMaskedNetwork", [](const Netmask& nm) { return nm.getMaskedNetwork(); } );
-  d_lw->registerFunction("isIpv4", &Netmask::isIpv4);
+  d_lw->registerFunction("isIpv4", &Netmask::isIPv4);
+  d_lw->registerFunction("isIPv4", &Netmask::isIPv4);
   d_lw->registerFunction("isIpv6", &Netmask::isIPv6);
   d_lw->registerFunction("isIPv6", &Netmask::isIPv6);
   d_lw->registerFunction("getBits", &Netmask::getBits);

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 7cdc320494c58dd069d9759b70c2f61783720313..52cadda8c13034cb86daba7fe9bd9a93ec7ddac9 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -817,7 +817,7 @@ static void protobufLogQuery(uint8_t maskV4, uint8_t maskV6, const boost::uuids:
   const ComboAddress& requestor = requestorNM.getMaskedNetwork();
   RecProtoBufMessage message(DNSProtoBufMessage::Query, uniqueId, &requestor, &local, qname, qtype, qclass, id, tcp, len);
   message.setServerIdentity(SyncRes::s_serverID);
-  message.setEDNSSubnet(ednssubnet, ednssubnet.isIpv4() ? maskV4 : maskV6);
+  message.setEDNSSubnet(ednssubnet, ednssubnet.isIPv4() ? maskV4 : maskV6);
   message.setRequestorId(requestorId);
   message.setDeviceId(deviceId);
   message.setDeviceName(deviceName);
@@ -1187,7 +1187,7 @@ static void startDoResolve(void *p)
       const ComboAddress& requestor = requestorNM.getMaskedNetwork();
       pbMessage = RecProtoBufMessage(RecProtoBufMessage::Response, dc->d_uuid, &requestor, &dc->d_destination, dc->d_mdp.d_qname, dc->d_mdp.d_qtype, dc->d_mdp.d_qclass, dc->d_mdp.d_header.id, dc->d_tcp, 0);
       pbMessage->setServerIdentity(SyncRes::s_serverID);
-      pbMessage->setEDNSSubnet(dc->d_ednssubnet.source, dc->d_ednssubnet.source.isIpv4() ? luaconfsLocal->protobufMaskV4 : luaconfsLocal->protobufMaskV6);
+      pbMessage->setEDNSSubnet(dc->d_ednssubnet.source, dc->d_ednssubnet.source.isIPv4() ? luaconfsLocal->protobufMaskV4 : luaconfsLocal->protobufMaskV6);
     }
 #endif /* HAVE_PROTOBUF */
 
@@ -2383,7 +2383,7 @@ static string* doProcessUDPQuestion(const std::string& question, const ComboAddr
         Netmask requestorNM(source, source.sin4.sin_family == AF_INET ? luaconfsLocal->protobufMaskV4 : luaconfsLocal->protobufMaskV6);
         const ComboAddress& requestor = requestorNM.getMaskedNetwork();
         pbMessage->update(uniqueId, &requestor, &destination, false, dh->id);
-        pbMessage->setEDNSSubnet(ednssubnet.source, ednssubnet.source.isIpv4() ? luaconfsLocal->protobufMaskV4 : luaconfsLocal->protobufMaskV6);
+        pbMessage->setEDNSSubnet(ednssubnet.source, ednssubnet.source.isIPv4() ? luaconfsLocal->protobufMaskV4 : luaconfsLocal->protobufMaskV6);
         if (g_useKernelTimestamp && tv.tv_sec) {
           pbMessage->setQueryTime(tv.tv_sec, tv.tv_usec);
         }

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 457fabdf650f3fda8d3dc33ae719ecf3b5de27c2..527bb3abd79751d138920b957e106016c16ab13b 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -2784,7 +2784,7 @@ RCode::rcodes_ SyncRes::updateCacheFromRecords(unsigned int depth, LWResult& lwr
       if (i->first.place == DNSResourceRecord::ANSWER && ednsmask) {
         // If ednsmask is relevant, we do not want to cache if the scope prefix length is large and TTL is small
         if (SyncRes::s_ecscachelimitttl > 0) {
-          bool manyMaskBits = (ednsmask->isIpv4() && ednsmask->getBits() > SyncRes::s_ecsipv4cachelimit) ||
+          bool manyMaskBits = (ednsmask->isIPv4() && ednsmask->getBits() > SyncRes::s_ecsipv4cachelimit) ||
             (ednsmask->isIPv6() && ednsmask->getBits() > SyncRes::s_ecsipv6cachelimit);
 
           if (manyMaskBits) {
@@ -3141,7 +3141,7 @@ bool SyncRes::doResolveAtThisIP(const std::string& prefix, const DNSName& qname,
       s_ecsresponses++;
       LOG(prefix<<qname<<": Received EDNS Client Subnet Mask "<<ednsmask->toString()<<" on response"<<endl);
       if (ednsmask->getBits() > 0) {
-        if (ednsmask->isIpv4()) {
+        if (ednsmask->isIPv4()) {
           ++SyncRes::s_ecsResponsesBySubnetSize4.at(ednsmask->getBits()-1);
         }
         else {
@@ -3556,7 +3556,7 @@ void SyncRes::setQuerySource(const ComboAddress& requestor, boost::optional<cons
 
   if (incomingECS && incomingECS->source.getBits() > 0) {
     d_cacheRemote = incomingECS->source.getMaskedNetwork();
-    uint8_t bits = std::min(incomingECS->source.getBits(), (incomingECS->source.isIpv4() ? s_ecsipv4limit : s_ecsipv6limit));
+    uint8_t bits = std::min(incomingECS->source.getBits(), (incomingECS->source.isIPv4() ? s_ecsipv4limit : s_ecsipv6limit));
     ComboAddress trunc = incomingECS->source.getNetwork();
     trunc.truncate(bits);
     d_outgoingECSNetwork = boost::optional<Netmask>(Netmask(trunc, bits));

diff --git a/pdns/test-iputils_hh.cc b/pdns/test-iputils_hh.cc
index 97b5ccb48ee8e4ac648b39912f1cffb5b655ac33..ac7288646a13bfccfd9f6b3c89eb6d50b8089e0f 100644 (file)
--- a/pdns/test-iputils_hh.cc
+++ b/pdns/test-iputils_hh.cc
@@ -177,14 +177,14 @@ BOOST_AUTO_TEST_CASE(test_Netmask) {
   BOOST_CHECK(nm.getBits() == 24);
   BOOST_CHECK(nm.match(local));
   BOOST_CHECK(!nm.match(remote));
-  BOOST_CHECK(nm.isIpv4());
+  BOOST_CHECK(nm.isIPv4());
   BOOST_CHECK(!nm.isIPv6());
 
   Netmask nm6("fe80::92fb:a6ff:fe4a:51da/64");
   BOOST_CHECK(nm6.getBits() == 64);
   BOOST_CHECK(nm6.match("fe80::92fb:a6ff:fe4a:51db"));
   BOOST_CHECK(!nm6.match("fe81::92fb:a6ff:fe4a:51db"));
-  BOOST_CHECK(!nm6.isIpv4());
+  BOOST_CHECK(!nm6.isIPv4());
   BOOST_CHECK(nm6.isIPv6());
 
   Netmask nmp("130.161.252.29/32");