Replace static functions with private functions

Replace 'inc_stats()' with 'dns__zone_stats_increment()'.

Replace 'get_request_transport_type()' with
'dns_zone_getrequesttransporttype()'.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index a75d79582d7d5e8b870b705d52595bdcdb169e88..fe565033bfc1948853688db21df40696919e019c 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -12686,9 +12686,11 @@ again:
                zone->xfrintime = isc_time_now();
 
                if (isc_sockaddr_pf(&curraddr) == PF_INET) {
-                       inc_stats(zone, dns_zonestatscounter_soaoutv4);
+                       dns__zone_stats_increment(
+                               zone, dns_zonestatscounter_soaoutv4);
                } else {
-                       inc_stats(zone, dns_zonestatscounter_soaoutv6);
+                       dns__zone_stats_increment(
+                               zone, dns_zonestatscounter_soaoutv6);
                }
        }
        cancel = false;
@@ -13416,9 +13418,11 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
         *  We only handle NOTIFY (SOA) at the present.
         */
        if (isc_sockaddr_pf(from) == PF_INET) {
-               inc_stats(zone, dns_zonestatscounter_notifyinv4);
+               dns__zone_stats_increment(zone,
+                                         dns_zonestatscounter_notifyinv4);
        } else {
-               inc_stats(zone, dns_zonestatscounter_notifyinv6);
+               dns__zone_stats_increment(zone,
+                                         dns_zonestatscounter_notifyinv6);
        }
        if (msg->counts[DNS_SECTION_QUESTION] == 0 ||
            dns_message_findname(msg, DNS_SECTION_QUESTION, &zone->origin,
@@ -13484,7 +13488,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
                UNLOCK_ZONE(zone);
                dns_zone_logc(zone, DNS_LOGCATEGORY_XFER_IN, ISC_LOG_INFO,
                              "refused notify from non-primary: %s", fromtext);
-               inc_stats(zone, dns_zonestatscounter_notifyrej);
+               dns__zone_stats_increment(zone, dns_zonestatscounter_notifyrej);
                return DNS_R_REFUSED;
        }
 
@@ -15473,7 +15477,8 @@ again:
                        }
                }
                DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NODELAY);
-               inc_stats(zone, dns_zonestatscounter_xfrsuccess);
+               dns__zone_stats_increment(zone,
+                                         dns_zonestatscounter_xfrsuccess);
                break;
 
        case DNS_R_BADIXFR:
@@ -15484,7 +15489,7 @@ again:
        case DNS_R_TOOMANYRECORDS:
        case DNS_R_VERIFYFAILURE:
                DNS_ZONE_JITTER_ADD(&now, zone->refresh, &zone->refreshtime);
-               inc_stats(zone, dns_zonestatscounter_xfrfail);
+               dns__zone_stats_increment(zone, dns_zonestatscounter_xfrfail);
                break;
 
        case ISC_R_SHUTTINGDOWN:
@@ -15504,7 +15509,7 @@ again:
                        DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_REFRESH);
                        again = true;
                }
-               inc_stats(zone, dns_zonestatscounter_xfrfail);
+               dns__zone_stats_increment(zone, dns_zonestatscounter_xfrfail);
                break;
        }
        dns__zone_settimer(zone, &now);

diff --git a/lib/dns/zonemgr.c b/lib/dns/zonemgr.c
index 91ba0dadef0501a2854c9e7e00d16bfa3820daf4..dd26f3346900c50dde8f4580639497dfbb3b869c 100644 (file)
--- a/lib/dns/zonemgr.c
+++ b/lib/dns/zonemgr.c
@@ -513,7 +513,6 @@ got_transfer_quota(void *arg) {
                }
        }
 
-       LOCK_ZONE(zone);
        if (xfrtype != dns_rdatatype_soa) {
                /*
                 * If 'xfrtype' is dns_rdatatype_soa, then the SOA query will be
@@ -522,8 +521,10 @@ got_transfer_quota(void *arg) {
                 * about the transport type used for that query, so that the
                 * information can be presented in the statistics channel.
                 */
-               soa_transport_type = get_request_transport_type(zone);
+               soa_transport_type = dns_zone_getrequesttransporttype(zone);
        }
+
+       LOCK_ZONE(zone);
        sourceaddr = zone->sourceaddr;
        UNLOCK_ZONE(zone);
 
@@ -561,15 +562,19 @@ got_transfer_quota(void *arg) {
        LOCK_ZONE(zone);
        if (xfrtype == dns_rdatatype_axfr) {
                if (isc_sockaddr_pf(&primaryaddr) == PF_INET) {
-                       inc_stats(zone, dns_zonestatscounter_axfrreqv4);
+                       dns__zone_stats_increment(
+                               zone, dns_zonestatscounter_axfrreqv4);
                } else {
-                       inc_stats(zone, dns_zonestatscounter_axfrreqv6);
+                       dns__zone_stats_increment(
+                               zone, dns_zonestatscounter_axfrreqv6);
                }
        } else if (xfrtype == dns_rdatatype_ixfr) {
                if (isc_sockaddr_pf(&primaryaddr) == PF_INET) {
-                       inc_stats(zone, dns_zonestatscounter_ixfrreqv4);
+                       dns__zone_stats_increment(
+                               zone, dns_zonestatscounter_ixfrreqv4);
                } else {
-                       inc_stats(zone, dns_zonestatscounter_ixfrreqv6);
+                       dns__zone_stats_increment(
+                               zone, dns_zonestatscounter_ixfrreqv6);
                }
        }
        UNLOCK_ZONE(zone);