remove nonfunctional DSCP implementation

DSCP has not been fully working since the network manager was
introduced in 9.16, and has been completely broken since 9.18.
This seems to have caused very few difficulties for anyone,
so we have now marked it as obsolete and removed the
implementation.

To ensure that old config files don't fail, the code to parse
dscp key-value pairs is still present, but a warning is logged
that the feature is obsolete and should not be used. Nothing is
done with configured values, and there is no longer any
range checking.

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 50ffdddd8bd8904cf24d2e6fe11c7550ba880c5a..c32a6cf14c8592a758b35f271c6a8c05712690b4 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -206,9 +206,6 @@ help(void) {
               "from ipv4only.arpa)\n"
               "                 +[no]dnssec         (Request DNSSEC records)\n"
               "                 +domain=###         (Set default domainname)\n"
-              "                 +[no]dscp[=###]     (Set the DSCP value to "
-              "### "
-              "[0..63])\n"
               "                 +[no]edns[=###]     (Set EDNS version) [0]\n"
               "                 +ednsflags=###      (Set EDNS flag bits)\n"
               "                 +[no]ednsnegotiation (Set EDNS version "
@@ -1392,20 +1389,10 @@ plus_option(char *option, bool is_batchfile, bool *need_clone,
                        strlcpy(domainopt, value, sizeof(domainopt));
                        break;
                case 's': /* dscp */
+                       /* obsolete */
                        FULLCHECK("dscp");
-                       if (!state) {
-                               lookup->dscp = -1;
-                               break;
-                       }
-                       if (value == NULL) {
-                               goto need_value;
-                       }
-                       result = parse_uint(&num, value, 0x3f, "DSCP");
-                       if (result != ISC_R_SUCCESS) {
-                               warn("Couldn't parse DSCP value");
-                               goto exit_or_usage;
-                       }
-                       lookup->dscp = num;
+                       fprintf(stderr, ";; +dscp option is obsolete "
+                                       "and has no effect");
                        break;
                default:
                        goto invalid_option;

diff --git a/bin/dig/dig.rst b/bin/dig/dig.rst
index a83f5b97b0f7cba3d2851ba6c7b57c63692efe9e..7eb2339f3fea7a04080b0cbdc65cee0cff485af7 100644 (file)
--- a/bin/dig/dig.rst
+++ b/bin/dig/dig.rst
@@ -349,9 +349,8 @@ abbreviation is unambiguous; for example, :option:`+cd` is equivalent to
 
 .. option:: +dscp=value
 
-   This option sets the DSCP code point to be used when sending the query. Valid DSCP
-   code points are in the range [0...63]. By default no code point is
-   explicitly set.
+   This option formerly set the DSCP value used when sending a query.
+   It is now obsolete, and has no effect.
 
 .. option:: +edns[=#], +noedns
 

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index a915fef731977853062a6c2498bf3313b3ca8feb..e07867143730edcd49c843ae6944bd76afcfbb42 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -622,7 +622,6 @@ make_empty_lookup(void) {
                .section_authority = true,
                .section_additional = true,
                .ednsneg = true,
-               .dscp = -1,
        };
 
        dns_fixedname_init(&looknew->fdomain);
@@ -797,7 +796,6 @@ clone_lookup(dig_lookup_t *lookold, bool servers) {
        looknew->tsigctx = NULL;
        looknew->need_search = lookold->need_search;
        looknew->done_as_is = lookold->done_as_is;
-       looknew->dscp = lookold->dscp;
        looknew->rrcomments = lookold->rrcomments;
        looknew->fuzzing = lookold->fuzzing;
        looknew->fuzztime = lookold->fuzztime;
@@ -3067,8 +3065,6 @@ start_tcp(dig_query_t *query) {
                                        local_timeout, NULL, NULL);
        }
 
-       /* XXX: set DSCP */
-
        return;
 
 failure_tls:

diff --git a/bin/dig/dighost.h b/bin/dig/dighost.h
index 966e7a1a2cbe5893e629da5b5a8acc762d2ec7ee..0b2ad0dc5dbe3cade1cdd2821ee689129f733b30 100644 (file)
--- a/bin/dig/dighost.h
+++ b/bin/dig/dighost.h
@@ -167,7 +167,6 @@ struct dig_lookup {
        char *cookie;
        dns_ednsopt_t *ednsopts;
        unsigned int ednsoptscnt;
-       isc_dscp_t dscp;
        unsigned int ednsflags;
        dns_opcode_t opcode;
        int rrcomments;

diff --git a/bin/named/config.c b/bin/named/config.c
index f75d862acf086f33463ad888f2c697b910b4ab91..bd45384a249c4275ce0901c2f68c4dcfd72727ae 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -597,7 +597,7 @@ isc_result_t
 named_config_getipandkeylist(const cfg_obj_t *config, const char *listtype,
                             const cfg_obj_t *list, isc_mem_t *mctx,
                             dns_ipkeylist_t *ipkl) {
-       uint32_t addrcount = 0, srccount = 0, dscpcount = 0;
+       uint32_t addrcount = 0, srccount = 0;
        uint32_t keycount = 0, tlscount = 0;
        uint32_t listcount = 0, l = 0, i = 0;
        uint32_t stackcount = 0, pushed = 0;
@@ -605,7 +605,6 @@ named_config_getipandkeylist(const cfg_obj_t *config, const char *listtype,
        const cfg_listelt_t *element;
        const cfg_obj_t *addrlist;
        const cfg_obj_t *portobj;
-       const cfg_obj_t *dscpobj;
        const cfg_obj_t *src4obj;
        const cfg_obj_t *src6obj;
        in_port_t port = (in_port_t)0;
@@ -613,23 +612,19 @@ named_config_getipandkeylist(const cfg_obj_t *config, const char *listtype,
        in_port_t def_tlsport;
        isc_sockaddr_t src4;
        isc_sockaddr_t src6;
-       isc_dscp_t dscp = -1;
        isc_sockaddr_t *addrs = NULL;
        isc_sockaddr_t *sources = NULL;
-       isc_dscp_t *dscps = NULL;
        dns_name_t **keys = NULL;
        dns_name_t **tlss = NULL;
        struct {
                const char *name;
                in_port_t port;
-               isc_dscp_t dscp;
                isc_sockaddr_t *src4s;
                isc_sockaddr_t *src6s;
        } *lists = NULL;
        struct {
                const cfg_listelt_t *element;
                in_port_t port;
-               isc_dscp_t dscp;
                isc_sockaddr_t src4;
                isc_sockaddr_t src6;
        } *stack = NULL;
@@ -639,7 +634,6 @@ named_config_getipandkeylist(const cfg_obj_t *config, const char *listtype,
        REQUIRE(ipkl->addrs == NULL);
        REQUIRE(ipkl->keys == NULL);
        REQUIRE(ipkl->tlss == NULL);
-       REQUIRE(ipkl->dscps == NULL);
        REQUIRE(ipkl->labels == NULL);
        REQUIRE(ipkl->allocated == 0);
 
@@ -656,15 +650,9 @@ named_config_getipandkeylist(const cfg_obj_t *config, const char *listtype,
                goto cleanup;
        }
 
-       result = named_config_getdscp(config, &dscp);
-       if (result != ISC_R_SUCCESS) {
-               goto cleanup;
-       }
-
 newlist:
        addrlist = cfg_tuple_get(list, "addresses");
        portobj = cfg_tuple_get(list, "port");
-       dscpobj = cfg_tuple_get(list, "dscp");
        src4obj = cfg_tuple_get(list, "source");
        src6obj = cfg_tuple_get(list, "source-v6");
 
@@ -679,17 +667,6 @@ newlist:
                port = (in_port_t)val;
        }
 
-       if (dscpobj != NULL && cfg_obj_isuint32(dscpobj)) {
-               if (cfg_obj_asuint32(dscpobj) > 63) {
-                       cfg_obj_log(dscpobj, named_g_lctx, ISC_LOG_ERROR,
-                                   "dscp value '%u' is out of range",
-                                   cfg_obj_asuint32(dscpobj));
-                       result = ISC_R_RANGE;
-                       goto cleanup;
-               }
-               dscp = (isc_dscp_t)cfg_obj_asuint32(dscpobj);
-       }
-
        if (src4obj != NULL && cfg_obj_issockaddr(src4obj)) {
                src4 = *cfg_obj_assockaddr(src4obj);
        } else {
@@ -756,7 +733,6 @@ resume:
                         */
                        stack[pushed].element = cfg_list_next(element);
                        stack[pushed].port = port;
-                       stack[pushed].dscp = dscp;
                        stack[pushed].src4 = src4;
                        stack[pushed].src6 = src6;
                        pushed++;
@@ -764,16 +740,11 @@ resume:
                }
 
                grow_array(mctx, addrs, i, addrcount);
-               grow_array(mctx, dscps, i, dscpcount);
                grow_array(mctx, keys, i, keycount);
                grow_array(mctx, tlss, i, tlscount);
                grow_array(mctx, sources, i, srccount);
 
                addrs[i] = *cfg_obj_assockaddr(addr);
-               dscps[i] = cfg_obj_getdscp(addr);
-               if (dscps[i] == -1) {
-                       dscps[i] = dscp;
-               }
 
                result = named_config_getname(mctx, key, &keys[i]);
                if (result != ISC_R_SUCCESS) {
@@ -825,14 +796,12 @@ resume:
                pushed--;
                element = stack[pushed].element;
                port = stack[pushed].port;
-               dscp = stack[pushed].dscp;
                src4 = stack[pushed].src4;
                src6 = stack[pushed].src6;
                goto resume;
        }
 
        shrink_array(mctx, addrs, i, addrcount);
-       shrink_array(mctx, dscps, i, dscpcount);
        shrink_array(mctx, keys, i, keycount);
        shrink_array(mctx, tlss, i, tlscount);
        shrink_array(mctx, sources, i, srccount);
@@ -844,14 +813,11 @@ resume:
                isc_mem_put(mctx, stack, stackcount * sizeof(stack[0]));
        }
 
-       INSIST(dscpcount == addrcount);
        INSIST(keycount == addrcount);
        INSIST(tlscount == addrcount);
        INSIST(srccount == addrcount);
-       INSIST(keycount == dscpcount);
 
        ipkl->addrs = addrs;
-       ipkl->dscps = dscps;
        ipkl->keys = keys;
        ipkl->tlss = tlss;
        ipkl->sources = sources;
@@ -864,9 +830,6 @@ cleanup:
        if (addrs != NULL) {
                isc_mem_put(mctx, addrs, addrcount * sizeof(addrs[0]));
        }
-       if (dscps != NULL) {
-               isc_mem_put(mctx, dscps, dscpcount * sizeof(dscps[0]));
-       }
        if (keys != NULL) {
                for (size_t j = 0; j < i; j++) {
                        if (keys[j] == NULL) {
@@ -932,32 +895,6 @@ named_config_getport(const cfg_obj_t *config, const char *type,
        return (ISC_R_SUCCESS);
 }
 
-isc_result_t
-named_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp) {
-       const cfg_obj_t *options = NULL;
-       const cfg_obj_t *dscpobj = NULL;
-       isc_result_t result;
-
-       (void)cfg_map_get(config, "options", &options);
-       if (options == NULL) {
-               return (ISC_R_SUCCESS);
-       }
-
-       result = cfg_map_get(options, "dscp", &dscpobj);
-       if (result != ISC_R_SUCCESS || dscpobj == NULL) {
-               *dscpp = -1;
-               return (ISC_R_SUCCESS);
-       }
-       if (cfg_obj_asuint32(dscpobj) >= 64) {
-               cfg_obj_log(dscpobj, named_g_lctx, ISC_LOG_ERROR,
-                           "dscp '%u' out of range",
-                           cfg_obj_asuint32(dscpobj));
-               return (ISC_R_RANGE);
-       }
-       *dscpp = (isc_dscp_t)cfg_obj_asuint32(dscpobj);
-       return (ISC_R_SUCCESS);
-}
-
 struct keyalgorithms {
        const char *str;
        enum {

diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h
index 509f3bd24c16a3770ee1e2610c29fe4b0601d90b..076a67f71f1b131c627cb5c0ceb02cf4c889588e 100644 (file)
--- a/bin/named/include/named/config.h
+++ b/bin/named/include/named/config.h
@@ -71,6 +71,3 @@ named_config_getkeyalgorithm(const char *str, const dns_name_t **name,
 isc_result_t
 named_config_getkeyalgorithm2(const char *str, const dns_name_t **name,
                              unsigned int *typep, uint16_t *digestbits);
-
-isc_result_t
-named_config_getdscp(const cfg_obj_t *config, isc_dscp_t *dscpp);

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 6d46f12589a5c17e338b22e755a07dfaa9fe84ca..1af0568e4d074b98318ed91ad97ccd91c50e2e6a 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -77,7 +77,6 @@ EXTERN in_port_t named_g_port        INIT(0);
 EXTERN in_port_t named_g_tlsport       INIT(0);
 EXTERN in_port_t named_g_httpsport     INIT(0);
 EXTERN in_port_t named_g_httpport      INIT(0);
-EXTERN isc_dscp_t named_g_dscp        INIT(-1);
 
 EXTERN in_port_t named_g_http_listener_clients INIT(0);
 EXTERN in_port_t named_g_http_streams_per_conn INIT(0);

diff --git a/bin/named/main.c b/bin/named/main.c
index 4cd6cf3ed91b4671e07d218d00cc8faf32151572..b71cf0f969b70bb489e4aba1907f7074453fe19b 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -110,7 +110,6 @@
 #define BACKTRACE_MAXFRAME 128
 #endif /* ifndef BACKTRACE_MAXFRAME */
 
-extern int isc_dscp_check_value;
 extern unsigned int dns_zone_mkey_hour;
 extern unsigned int dns_zone_mkey_day;
 extern unsigned int dns_zone_mkey_month;
@@ -716,13 +715,9 @@ parse_T_opt(char *option) {
        /*
         * force the server to behave (or misbehave) in
         * specified ways for testing purposes.
-        * dscp=x:     check that dscp values are as
-        *             expected and assert otherwise.
         */
        if (!strcmp(option, "dropedns")) {
                dropedns = true;
-       } else if (!strncmp(option, "dscp=", 5)) {
-               isc_dscp_check_value = atoi(option + 5);
        } else if (!strcmp(option, "ednsformerr")) {
                ednsformerr = true;
        } else if (!strcmp(option, "ednsnotimp")) {

diff --git a/bin/named/server.c b/bin/named/server.c
index 62a260ae5ba91c368dcce880728b551303c376bc..3be36685ae5c974fa4c39a5b2f5bd82bad5ee2e8 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1260,13 +1260,11 @@ cleanup:
  */
 static isc_result_t
 get_view_querysource_dispatch(const cfg_obj_t **maps, int af,
-                             dns_dispatch_t **dispatchp, isc_dscp_t *dscpp,
-                             bool is_firstview) {
+                             dns_dispatch_t **dispatchp, bool is_firstview) {
        isc_result_t result = ISC_R_FAILURE;
        dns_dispatch_t *disp = NULL;
        isc_sockaddr_t sa;
        const cfg_obj_t *obj = NULL;
-       isc_dscp_t dscp = -1;
 
        switch (af) {
        case AF_INET:
@@ -1284,11 +1282,6 @@ get_view_querysource_dispatch(const cfg_obj_t **maps, int af,
        sa = *(cfg_obj_assockaddr(obj));
        INSIST(isc_sockaddr_pf(&sa) == af);
 
-       dscp = cfg_obj_getdscp(obj);
-       if (dscp != -1 && dscpp != NULL) {
-               *dscpp = dscp;
-       }
-
        /*
         * If we don't support this address family, we're done!
         */
@@ -1591,10 +1584,6 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
                if (result != ISC_R_SUCCESS) {
                        goto cleanup;
                }
-               result = dns_peer_settransferdscp(peer, cfg_obj_getdscp(obj));
-               if (result != ISC_R_SUCCESS) {
-                       goto cleanup;
-               }
                named_add_reserved_dispatch(named_g_server,
                                            cfg_obj_assockaddr(obj));
        }
@@ -1611,10 +1600,6 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
                if (result != ISC_R_SUCCESS) {
                        goto cleanup;
                }
-               result = dns_peer_setnotifydscp(peer, cfg_obj_getdscp(obj));
-               if (result != ISC_R_SUCCESS) {
-                       goto cleanup;
-               }
                named_add_reserved_dispatch(named_g_server,
                                            cfg_obj_assockaddr(obj));
        }
@@ -1630,10 +1615,6 @@ configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) {
                if (result != ISC_R_SUCCESS) {
                        goto cleanup;
                }
-               result = dns_peer_setquerydscp(peer, cfg_obj_getdscp(obj));
-               if (result != ISC_R_SUCCESS) {
-                       goto cleanup;
-               }
                named_add_reserved_dispatch(named_g_server,
                                            cfg_obj_assockaddr(obj));
        }
@@ -4136,7 +4117,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
        dns_acl_t *clients = NULL, *mapped = NULL, *excluded = NULL;
        unsigned int query_timeout, ndisp;
        bool old_rpz_ok = false;
-       isc_dscp_t dscp4 = -1, dscp6 = -1;
        dns_dyndbctx_t *dctx = NULL;
        unsigned int resolver_param;
        dns_ntatable_t *ntatable = NULL;
@@ -4769,10 +4749,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
         * Resolver.
         */
        CHECK(get_view_querysource_dispatch(
-               maps, AF_INET, &dispatch4, &dscp4,
+               maps, AF_INET, &dispatch4,
                (ISC_LIST_PREV(view, link) == NULL)));
        CHECK(get_view_querysource_dispatch(
-               maps, AF_INET6, &dispatch6, &dscp6,
+               maps, AF_INET6, &dispatch6,
                (ISC_LIST_PREV(view, link) == NULL)));
        if (dispatch4 == NULL && dispatch6 == NULL) {
                UNEXPECTED_ERROR("unable to obtain either an IPv4 or"
@@ -4796,19 +4776,6 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
        }
        dns_resolver_setquerystats(view->resolver, resquerystats);
 
-       if (dscp4 == -1) {
-               dscp4 = named_g_dscp;
-       }
-       if (dscp6 == -1) {
-               dscp6 = named_g_dscp;
-       }
-       if (dscp4 != -1) {
-               dns_resolver_setquerydscp4(view->resolver, dscp4);
-       }
-       if (dscp6 != -1) {
-               dns_resolver_setquerydscp6(view->resolver, dscp6);
-       }
-
        /*
         * Set the ADB cache size to 1/8th of the max-cache-size or
         * MAX_ADB_SIZE_FOR_CACHESHARE when the cache is shared.
@@ -6250,15 +6217,14 @@ static isc_result_t
 configure_forward(const cfg_obj_t *config, dns_view_t *view,
                  const dns_name_t *origin, const cfg_obj_t *forwarders,
                  const cfg_obj_t *forwardtype) {
-       const cfg_obj_t *portobj, *dscpobj;
-       const cfg_obj_t *faddresses;
-       const cfg_listelt_t *element;
+       const cfg_obj_t *portobj = NULL;
+       const cfg_obj_t *faddresses = NULL;
+       const cfg_listelt_t *element = NULL;
        dns_fwdpolicy_t fwdpolicy = dns_fwdpolicy_none;
        dns_forwarderlist_t fwdlist;
-       dns_forwarder_t *fwd;
+       dns_forwarder_t *fwd = NULL;
        isc_result_t result;
        in_port_t port;
-       isc_dscp_t dscp = -1;
 
        ISC_LIST_INIT(fwdlist);
 
@@ -6281,24 +6247,6 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view,
                }
        }
 
-       /*
-        * DSCP value for forwarded requests.
-        */
-       dscp = named_g_dscp;
-       if (forwarders != NULL) {
-               dscpobj = cfg_tuple_get(forwarders, "dscp");
-               if (cfg_obj_isuint32(dscpobj)) {
-                       if (cfg_obj_asuint32(dscpobj) > 63) {
-                               cfg_obj_log(dscpobj, named_g_lctx,
-                                           ISC_LOG_ERROR,
-                                           "dscp value '%u' is out of range",
-                                           cfg_obj_asuint32(dscpobj));
-                               return (ISC_R_RANGE);
-                       }
-                       dscp = (isc_dscp_t)cfg_obj_asuint32(dscpobj);
-               }
-       }
-
        faddresses = NULL;
        if (forwarders != NULL) {
                faddresses = cfg_tuple_get(forwarders, "addresses");
@@ -6313,10 +6261,6 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view,
                if (isc_sockaddr_getport(&fwd->addr) == 0) {
                        isc_sockaddr_setport(&fwd->addr, port);
                }
-               fwd->dscp = cfg_obj_getdscp(forwarder);
-               if (fwd->dscp == -1) {
-                       fwd->dscp = dscp;
-               }
                ISC_LINK_INIT(fwd, link);
                ISC_LIST_APPEND(fwdlist, fwd, link);
        }
@@ -8888,17 +8832,6 @@ load_configuration(const char *filename, named_server_t *server,
                }
        }
 
-       /*
-        * Determining the default DSCP code point.
-        */
-       result = named_config_getdscp(config, &named_g_dscp);
-       if (result != ISC_R_SUCCESS) {
-               isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-                             NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, "dscp: %s",
-                             isc_result_totext(result));
-               goto cleanup_v6portset;
-       }
-
        /*
         * Find the listen queue depth.
         */
@@ -8957,7 +8890,7 @@ load_configuration(const char *filename, named_server_t *server,
                         * Not specified, use default.
                         */
                        result = ns_listenlist_default(named_g_mctx,
-                                                      listen_port, -1, true,
+                                                      listen_port, true,
                                                       AF_INET, &listenon);
                }
                if (result != ISC_R_SUCCESS) {
@@ -8991,7 +8924,7 @@ load_configuration(const char *filename, named_server_t *server,
                         * Not specified, use default.
                         */
                        result = ns_listenlist_default(named_g_mctx,
-                                                      listen_port, -1, true,
+                                                      listen_port, true,
                                                       AF_INET6, &listenon);
                }
                if (result != ISC_R_SUCCESS) {
@@ -11125,10 +11058,9 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config,
        isc_result_t result;
        const cfg_obj_t *ltup = NULL;
        const cfg_obj_t *tlsobj = NULL, *httpobj = NULL;
-       const cfg_obj_t *portobj = NULL, *dscpobj = NULL;
+       const cfg_obj_t *portobj = NULL;
        const cfg_obj_t *http_server = NULL;
        in_port_t port = 0;
-       isc_dscp_t dscp = -1;
        const char *key = NULL, *cert = NULL, *ca_file = NULL,
                   *dhparam_file = NULL, *ciphers = NULL;
        bool tls_prefer_server_ciphers = false,
@@ -11322,16 +11254,6 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config,
                port = (in_port_t)cfg_obj_asuint32(portobj);
        }
 
-       dscpobj = cfg_tuple_get(ltup, "dscp");
-       if (!cfg_obj_isuint32(dscpobj)) {
-               dscp = named_g_dscp;
-       } else {
-               if (cfg_obj_asuint32(dscpobj) > 63) {
-                       return (ISC_R_RANGE);
-               }
-               dscp = (isc_dscp_t)cfg_obj_asuint32(dscpobj);
-       }
-
 #ifdef HAVE_LIBNGHTTP2
        if (http) {
                CHECK(listenelt_http(http_server, family, do_tls, &tls_params,
@@ -11340,9 +11262,8 @@ listenelt_fromconfig(const cfg_obj_t *listener, const cfg_obj_t *config,
 #endif /* HAVE_LIBNGHTTP2 */
 
        if (!http) {
-               CHECK(ns_listenelt_create(mctx, port, dscp, NULL, family,
-                                         do_tls, &tls_params, tlsctx_cache,
-                                         &delt));
+               CHECK(ns_listenelt_create(mctx, port, NULL, family, do_tls,
+                                         &tls_params, tlsctx_cache, &delt));
        }
 
        result = cfg_acl_fromconfig2(cfg_tuple_get(listener, "acl"), config,
@@ -11428,9 +11349,9 @@ listenelt_http(const cfg_obj_t *http, const uint16_t family, bool tls,
 
        INSIST(i == len);
 
-       result = ns_listenelt_create_http(
-               mctx, port, named_g_dscp, NULL, family, tls, tls_params,
-               tlsctx_cache, endpoints, len, max_clients, max_streams, &delt);
+       result = ns_listenelt_create_http(mctx, port, NULL, family, tls,
+                                         tls_params, tlsctx_cache, endpoints,
+                                         len, max_clients, max_streams, &delt);
        if (result != ISC_R_SUCCESS) {
                goto error;
        }

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index a046f58ad0b45ef93335aba537ec5b0a1b8feab4..c5ad8aba112992726840b1f43759ae40517ac727 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -905,7 +905,6 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
        int seconds;
        dns_ttl_t maxttl = 0; /* unlimited */
        dns_zone_t *mayberaw = (raw != NULL) ? raw : zone;
-       isc_dscp_t dscp;
 
        i = 0;
        if (zconfig != NULL) {
@@ -1267,23 +1266,17 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
                        RETERR(named_config_getipandkeylist(config, "primaries",
                                                            obj, mctx, &ipkl));
                        dns_zone_setalsonotify(zone, ipkl.addrs, ipkl.sources,
-                                              ipkl.dscps, ipkl.keys, ipkl.tlss,
+                                              ipkl.keys, ipkl.tlss,
                                               ipkl.count);
                        dns_ipkeylist_clear(mctx, &ipkl);
                } else {
-                       dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL,
-                                              NULL, 0);
+                       dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL, 0);
                }
 
                obj = NULL;
                result = named_config_get(maps, "parental-source", &obj);
                INSIST(result == ISC_R_SUCCESS && obj != NULL);
                RETERR(dns_zone_setparentalsrc4(zone, cfg_obj_assockaddr(obj)));
-               dscp = cfg_obj_getdscp(obj);
-               if (dscp == -1) {
-                       dscp = named_g_dscp;
-               }
-               RETERR(dns_zone_setparentalsrc4dscp(zone, dscp));
                named_add_reserved_dispatch(named_g_server,
                                            cfg_obj_assockaddr(obj));
 
@@ -1291,11 +1284,6 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
                result = named_config_get(maps, "parental-source-v6", &obj);
                INSIST(result == ISC_R_SUCCESS && obj != NULL);
                RETERR(dns_zone_setparentalsrc6(zone, cfg_obj_assockaddr(obj)));
-               dscp = cfg_obj_getdscp(obj);
-               if (dscp == -1) {
-                       dscp = named_g_dscp;
-               }
-               RETERR(dns_zone_setparentalsrc6dscp(zone, dscp));
                named_add_reserved_dispatch(named_g_server,
                                            cfg_obj_assockaddr(obj));
 
@@ -1303,11 +1291,6 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
                result = named_config_get(maps, "notify-source", &obj);
                INSIST(result == ISC_R_SUCCESS && obj != NULL);
                RETERR(dns_zone_setnotifysrc4(zone, cfg_obj_assockaddr(obj)));
-               dscp = cfg_obj_getdscp(obj);
-               if (dscp == -1) {
-                       dscp = named_g_dscp;
-               }
-               RETERR(dns_zone_setnotifysrc4dscp(zone, dscp));
                named_add_reserved_dispatch(named_g_server,
                                            cfg_obj_assockaddr(obj));
 
@@ -1315,11 +1298,6 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
                result = named_config_get(maps, "notify-source-v6", &obj);
                INSIST(result == ISC_R_SUCCESS && obj != NULL);
                RETERR(dns_zone_setnotifysrc6(zone, cfg_obj_assockaddr(obj)));
-               dscp = cfg_obj_getdscp(obj);
-               if (dscp == -1) {
-                       dscp = named_g_dscp;
-               }
-               RETERR(dns_zone_setnotifysrc6dscp(zone, dscp));
                named_add_reserved_dispatch(named_g_server,
                                            cfg_obj_assockaddr(obj));
 
@@ -1943,11 +1921,6 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
                INSIST(result == ISC_R_SUCCESS && obj != NULL);
                RETERR(dns_zone_setxfrsource4(mayberaw,
                                              cfg_obj_assockaddr(obj)));
-               dscp = cfg_obj_getdscp(obj);
-               if (dscp == -1) {
-                       dscp = named_g_dscp;
-               }
-               RETERR(dns_zone_setxfrsource4dscp(mayberaw, dscp));
                named_add_reserved_dispatch(named_g_server,
                                            cfg_obj_assockaddr(obj));
 
@@ -1956,11 +1929,6 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
                INSIST(result == ISC_R_SUCCESS && obj != NULL);
                RETERR(dns_zone_setxfrsource6(mayberaw,
                                              cfg_obj_assockaddr(obj)));
-               dscp = cfg_obj_getdscp(obj);
-               if (dscp == -1) {
-                       dscp = named_g_dscp;
-               }
-               RETERR(dns_zone_setxfrsource6dscp(mayberaw, dscp));
                named_add_reserved_dispatch(named_g_server,
                                            cfg_obj_assockaddr(obj));
 

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 55c1ae343dd5b193b2521369b83e0b54ca1bd172..a67a651db6220c6f85f34569fc2e4a68a6234715 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -2633,7 +2633,7 @@ send_update(dns_name_t *zone, isc_sockaddr_t *primary) {
 
        result = dns_request_create(
                requestmgr, updatemsg, srcaddr, primary, req_transport,
-               req_tls_ctx_cache, -1, options, tsigkey, timeout, udp_timeout,
+               req_tls_ctx_cache, options, tsigkey, timeout, udp_timeout,
                udp_retries, global_task, update_completed, NULL, &request);
        check_result(result, "dns_request_create");
 
@@ -2752,11 +2752,11 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
                        srcaddr = localaddr4;
                }
 
-               result = dns_request_create(
-                       requestmgr, soaquery, srcaddr, addr, req_transport,
-                       req_tls_ctx_cache, -1, options, NULL, FIND_TIMEOUT * 20,
-                       FIND_TIMEOUT, 3, global_task, recvsoa, reqinfo,
-                       &request);
+               result = dns_request_create(requestmgr, soaquery, srcaddr, addr,
+                                           req_transport, req_tls_ctx_cache,
+                                           options, NULL, FIND_TIMEOUT * 20,
+                                           FIND_TIMEOUT, 3, global_task,
+                                           recvsoa, reqinfo, &request);
                check_result(result, "dns_request_create");
                requests++;
                return;
@@ -2983,8 +2983,8 @@ sendrequest(isc_sockaddr_t *destaddr, dns_message_t *msg,
        }
 
        result = dns_request_create(requestmgr, msg, srcaddr, destaddr,
-                                   req_transport, req_tls_ctx_cache, -1,
-                                   options, default_servers ? NULL : tsigkey,
+                                   req_transport, req_tls_ctx_cache, options,
+                                   default_servers ? NULL : tsigkey,
                                    FIND_TIMEOUT * 20, FIND_TIMEOUT, 3,
                                    global_task, recvsoa, reqinfo, request);
        check_result(result, "dns_request_create");
@@ -3190,10 +3190,10 @@ send_gssrequest(isc_sockaddr_t *destaddr, dns_message_t *msg,
                srcaddr = localaddr4;
        }
 
-       result = dns_request_create(
-               requestmgr, msg, srcaddr, destaddr, req_transport,
-               req_tls_ctx_cache, -1, options, tsigkey, FIND_TIMEOUT * 20,
-               FIND_TIMEOUT, 3, global_task, recvgss, reqinfo, request);
+       result = dns_request_create(requestmgr, msg, srcaddr, destaddr,
+                                   req_transport, req_tls_ctx_cache, options,
+                                   tsigkey, FIND_TIMEOUT * 20, FIND_TIMEOUT, 3,
+                                   global_task, recvgss, reqinfo, request);
        check_result(result, "dns_request_create");
        if (debugging) {
                show_message(stdout, msg, "Outgoing update query:");

diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 8ee1c7959107682c17ce8999e403eafaea124dcc..18f88346f4f0ec244aac7bb60b92b60271a04f68 100644 (file)
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -99,7 +99,6 @@ TESTS +=                      \
        dialup                  \
        dlzexternal             \
        dns64                   \
-       dscp                    \
        dsdigest                \
        dupsigs                 \
        dyndb                   \

diff --git a/bin/tests/system/checkconf/range.conf b/bin/tests/system/checkconf/range.conf
index 8fb8f028b14a8a740365d3e020f5f27420b46aba..c254f5c998cf0732ceb556cabb5a0bcd269cdc23 100644 (file)
--- a/bin/tests/system/checkconf/range.conf
+++ b/bin/tests/system/checkconf/range.conf
@@ -13,13 +13,4 @@
 
 options {
        port 999999;
-       dscp 222;
-       listen-on port 100 dscp 444 {
-               127.0.0.1/32;
-       };
-};
-
-zone "example" {
-       type primary;
-       file "example.db";
 };

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index f908d15cf3c37d2aa41cf35a6d0e378f2cf12046..e4e96d1739e81c8109772920ebc90081a42d7569 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -61,7 +61,6 @@ database
 digdelv
 dlz
 dns64
-dscp
 dsdigest
 ecdsa
 eddsa

diff --git a/bin/tests/system/cookie/ns1/named.conf.in b/bin/tests/system/cookie/ns1/named.conf.in
index e9c28c67547d6dc08342f562d550024b10444ba8..20ebca30c0f586ec3f2e7537d0e2132d39c702f0 100644 (file)
--- a/bin/tests/system/cookie/ns1/named.conf.in
+++ b/bin/tests/system/cookie/ns1/named.conf.in
@@ -30,9 +30,9 @@ controls {
 };
 
 options {
-       query-source address 10.53.0.1 dscp 1;
-       notify-source 10.53.0.1 dscp 2;
-       transfer-source 10.53.0.1 dscp 3;
+       query-source address 10.53.0.1;
+       notify-source 10.53.0.1;
+       transfer-source 10.53.0.1;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/cookie/ns2/named.conf.in b/bin/tests/system/cookie/ns2/named.conf.in
index ef081251b44e9e03e2ade0ba0cbb9c8b17b0b75e..cd74d8adca776489fe6fc6f68e8ad49ff341ecf8 100644 (file)
--- a/bin/tests/system/cookie/ns2/named.conf.in
+++ b/bin/tests/system/cookie/ns2/named.conf.in
@@ -12,9 +12,9 @@
  */
 
 options {
-       query-source address 10.53.0.2 dscp 1;
-       notify-source 10.53.0.2 dscp 2;
-       transfer-source 10.53.0.2 dscp 3;
+       query-source address 10.53.0.2;
+       notify-source 10.53.0.2;
+       transfer-source 10.53.0.2;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };

diff --git a/bin/tests/system/cookie/ns3/named.conf.in b/bin/tests/system/cookie/ns3/named.conf.in
index 038247454958a5a3de8d33155501fb718e97aebd..090d528ba31aabd0c7e1a7cd29f96e87352fafb5 100644 (file)
--- a/bin/tests/system/cookie/ns3/named.conf.in
+++ b/bin/tests/system/cookie/ns3/named.conf.in
@@ -21,9 +21,9 @@ controls {
 };
 
 options {
-       query-source address 10.53.0.3 dscp 1;
-       notify-source 10.53.0.3 dscp 2;
-       transfer-source 10.53.0.3 dscp 3;
+       query-source address 10.53.0.3;
+       notify-source 10.53.0.3;
+       transfer-source 10.53.0.3;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.3; };

diff --git a/bin/tests/system/cookie/ns7/named.conf.in b/bin/tests/system/cookie/ns7/named.conf.in
index c910880cb7a631b895db90dc6292d2df8d0b2272..3437eb65318e810b9e6f686637339b977aacaf87 100644 (file)
--- a/bin/tests/system/cookie/ns7/named.conf.in
+++ b/bin/tests/system/cookie/ns7/named.conf.in
@@ -12,9 +12,9 @@
  */
 
 options {
-       query-source address 10.53.0.7 dscp 1;
-       notify-source 10.53.0.7 dscp 2;
-       transfer-source 10.53.0.7 dscp 3;
+       query-source address 10.53.0.7;
+       notify-source 10.53.0.7;
+       transfer-source 10.53.0.7;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.7; };

diff --git a/bin/tests/system/digdelv/ns3/named.conf.in b/bin/tests/system/digdelv/ns3/named.conf.in
index a13747baf74db97543efa1288643a8dbf3bed051..66bb74891fb9c181cdb06ca22ed55bde1e32014b 100644 (file)
--- a/bin/tests/system/digdelv/ns3/named.conf.in
+++ b/bin/tests/system/digdelv/ns3/named.conf.in
@@ -12,7 +12,7 @@
  */
 
 options {
-       query-source address 10.53.0.3 dscp 1;
+       query-source address 10.53.0.3;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.3; };

diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index c630ae1e8ac244bd005b32764df88f370f2e3cf4..3debad3da83332230c5bc8b35352f372ce996425 100644 (file)
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -542,17 +542,6 @@ if [ -x "$DIG" ] ; then
   if [ $ret -ne 0 ]; then echo_i "failed"; fi
   status=$((status+ret))
 
-  n=$((n+1))
-  echo_i "checking dig +dscp ($n)"
-  ret=0
-  dig_with_opts @10.53.0.3 +dscp=32 a a.example > /dev/null 2>&1 || ret=1
-  dig_with_opts @10.53.0.3 +dscp=-1 a a.example > /dev/null 2>&1 && ret=1
-  dig_with_opts @10.53.0.3 +dscp=64 a a.example > /dev/null 2>&1 && ret=1
-  #TODO add a check to make sure dig is actually setting the dscp on the query
-  #we might have to add better logging to named for this
-  if [ $ret -ne 0 ]; then echo_i "failed"; fi
-  status=$((status+ret))
-
   n=$((n+1))
   echo_i "checking dig +ednsopt with option number ($n)"
   ret=0

diff --git a/bin/tests/system/dnssec/ns4/named1.conf.in b/bin/tests/system/dnssec/ns4/named1.conf.in
index 09a32921f1aaafc2be80c21946a1c9b947a183a3..280217e50b58799767724dea59de93022472951d 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named1.conf.in
+++ b/bin/tests/system/dnssec/ns4/named1.conf.in
@@ -14,9 +14,9 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4 dscp 1;
-       notify-source 10.53.0.4 dscp 2;
-       transfer-source 10.53.0.4 dscp 3;
+       query-source address 10.53.0.4;
+       notify-source 10.53.0.4;
+       transfer-source 10.53.0.4;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.4; };

diff --git a/bin/tests/system/dnssec/ns4/named2.conf.in b/bin/tests/system/dnssec/ns4/named2.conf.in
index 5742871a4f9bb0629f5a7e699b129f292ac8e00d..b01979bb526597afd3a7c173a12f58efe4f28488 100644 (file)
--- a/bin/tests/system/dnssec/ns4/named2.conf.in
+++ b/bin/tests/system/dnssec/ns4/named2.conf.in
@@ -14,10 +14,9 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4 dscp 4;
-       notify-source 10.53.0.4 dscp 5;
-       transfer-source 10.53.0.4 dscp 6;
-       dscp 16;
+       query-source address 10.53.0.4;
+       notify-source 10.53.0.4;
+       transfer-source 10.53.0.4;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.4; };

diff --git a/bin/tests/system/dscp/clean.sh b/bin/tests/system/dscp/clean.sh
deleted file mode 100644 (file)
index e52f7b6..0000000
--- a/bin/tests/system/dscp/clean.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-rm -f */root.bk
-rm -f dig.out.10.53.0.?
-rm -f */named.memstats
-rm -f */named.run
-rm -f */named.conf
-rm -f ns*/named.lock
-rm -f ns*/managed-keys.bind*

diff --git a/bin/tests/system/dscp/ns1/named.args b/bin/tests/system/dscp/ns1/named.args
deleted file mode 100644 (file)
index 2a3e86a..0000000
--- a/bin/tests/system/dscp/ns1/named.args
+++ /dev/null
@@ -1 +0,0 @@
--m record -c named.conf -d 99 -D dscp-ns1 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns1/named.conf.in b/bin/tests/system/dscp/ns1/named.conf.in
deleted file mode 100644 (file)
index e5c7971..0000000
--- a/bin/tests/system/dscp/ns1/named.conf.in
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       dscp 46;
-       query-source address 10.53.0.1;
-       notify-source 10.53.0.1;
-       transfer-source 10.53.0.1;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.1; };
-       listen-on-v6 { none; };
-       recursion no;
-       dnssec-validation no;
-       notify yes;
-};
-
-zone "." {
-       type primary;
-       file "root.db";
-};

diff --git a/bin/tests/system/dscp/ns1/root.db b/bin/tests/system/dscp/ns1/root.db
deleted file mode 100644 (file)
index 9d473e2..0000000
--- a/bin/tests/system/dscp/ns1/root.db
+++ /dev/null
@@ -1,19 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 3600
-.      SOA     ns1.nil-servers. marka.isc.org. 1 3600 1200 3600000 1200
-.      NS      ns1.nil-servers.
-.      NS      ns2.nil-servers.
-ns1.nil-servers. A 10.53.0.1
-ns2.nil-servers. A 10.53.0.2
-xxx.example.   A       10.53.0.1
-xxx.tld.       A       10.53.0.1

diff --git a/bin/tests/system/dscp/ns2/named.args b/bin/tests/system/dscp/ns2/named.args
deleted file mode 100644 (file)
index 7122b39..0000000
--- a/bin/tests/system/dscp/ns2/named.args
+++ /dev/null
@@ -1 +0,0 @@
--m record -c named.conf -d 99 -D dscp-ns2 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns2/named.conf.in b/bin/tests/system/dscp/ns2/named.conf.in
deleted file mode 100644 (file)
index ca835c8..0000000
--- a/bin/tests/system/dscp/ns2/named.conf.in
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       dscp 46;
-       query-source address 10.53.0.2;
-       notify-source 10.53.0.2;
-       transfer-source 10.53.0.2;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.2; };
-       listen-on-v6 { none; };
-       recursion no;
-       dnssec-validation no;
-       notify yes;
-};
-
-zone "." {
-       type secondary;
-       file "root.bk";
-       primaries { 10.53.0.1; };
-};

diff --git a/bin/tests/system/dscp/ns3/hint.db b/bin/tests/system/dscp/ns3/hint.db
deleted file mode 100644 (file)
index 875a407..0000000
--- a/bin/tests/system/dscp/ns3/hint.db
+++ /dev/null
@@ -1,16 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 3600
-. NS ns1.nil-servers.
-. NS ns2.nil-servers.
-ns1.nil-servers. A 10.53.0.1
-ns2.nil-servers. A 10.53.0.2

diff --git a/bin/tests/system/dscp/ns3/named.args b/bin/tests/system/dscp/ns3/named.args
deleted file mode 100644 (file)
index 60ae7f4..0000000
--- a/bin/tests/system/dscp/ns3/named.args
+++ /dev/null
@@ -1 +0,0 @@
--m record -c named.conf -d 99 -D dscp-ns3 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns3/named.conf.in b/bin/tests/system/dscp/ns3/named.conf.in
deleted file mode 100644 (file)
index 38d4985..0000000
--- a/bin/tests/system/dscp/ns3/named.conf.in
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       dscp 46;
-       query-source address 10.53.0.3;
-       notify-source 10.53.0.3;
-       transfer-source 10.53.0.3;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on { 10.53.0.3; };
-       listen-on-v6 { none; };
-       notify yes;
-       recursion yes;
-       dnssec-validation yes;
-};
-
-zone "." {
-       type hint;
-       file "hint.db";
-};

diff --git a/bin/tests/system/dscp/ns4/named.args b/bin/tests/system/dscp/ns4/named.args
deleted file mode 100644 (file)
index 8352455..0000000
--- a/bin/tests/system/dscp/ns4/named.args
+++ /dev/null
@@ -1 +0,0 @@
--m record -c named.conf -d 99 -D dscp-ns4 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns4/named.conf.in b/bin/tests/system/dscp/ns4/named.conf.in
deleted file mode 100644 (file)
index 8c8ca4f..0000000
--- a/bin/tests/system/dscp/ns4/named.conf.in
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       dscp 47;
-       query-source dscp 46 address 10.53.0.4;
-       notify-source 10.53.0.4 dscp 46;
-       transfer-source 10.53.0.4 dscp 46;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on dscp 46 { 10.53.0.4; };
-       listen-on-v6 { none; };
-       recursion no;
-       dnssec-validation no;
-       notify yes;
-};
-
-zone "." {
-       type primary;
-       file "root.db";
-};

diff --git a/bin/tests/system/dscp/ns4/root.db b/bin/tests/system/dscp/ns4/root.db
deleted file mode 100644 (file)
index cb3b395..0000000
--- a/bin/tests/system/dscp/ns4/root.db
+++ /dev/null
@@ -1,19 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 3600
-.      SOA     ns4.nil-servers. marka.isc.org. 1 3600 1200 3600000 1200
-.      NS      ns4.nil-servers.
-.      NS      ns5.nil-servers.
-ns4.nil-servers. A 10.53.0.4
-ns5.nil-servers. A 10.53.0.5
-xxx.example.   A       10.53.0.1
-xxx.tld.       A       10.53.0.1

diff --git a/bin/tests/system/dscp/ns5/named.args b/bin/tests/system/dscp/ns5/named.args
deleted file mode 100644 (file)
index 4f0c842..0000000
--- a/bin/tests/system/dscp/ns5/named.args
+++ /dev/null
@@ -1 +0,0 @@
--m record -c named.conf -d 99 -D dscp-ns5 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns5/named.conf.in b/bin/tests/system/dscp/ns5/named.conf.in
deleted file mode 100644 (file)
index 1858493..0000000
--- a/bin/tests/system/dscp/ns5/named.conf.in
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       dscp 47;
-       query-source dscp 46 address 10.53.0.5;
-       notify-source 10.53.0.5 dscp 46;
-       transfer-source 10.53.0.5 dscp 46;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on dscp 46 { 10.53.0.5; };
-       listen-on-v6 { none; };
-       recursion no;
-       dnssec-validation no;
-       notify yes;
-};
-
-zone "." {
-       type secondary;
-       file "root.bk";
-       primaries { 10.53.0.4; };
-};

diff --git a/bin/tests/system/dscp/ns6/hint.db b/bin/tests/system/dscp/ns6/hint.db
deleted file mode 100644 (file)
index c2c51f2..0000000
--- a/bin/tests/system/dscp/ns6/hint.db
+++ /dev/null
@@ -1,16 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-$TTL 3600
-. NS ns4.nil-servers.
-. NS ns5.nil-servers.
-ns4.nil-servers. A 10.53.0.4
-ns5.nil-servers. A 10.53.0.5

diff --git a/bin/tests/system/dscp/ns6/named.args b/bin/tests/system/dscp/ns6/named.args
deleted file mode 100644 (file)
index a5a278d..0000000
--- a/bin/tests/system/dscp/ns6/named.args
+++ /dev/null
@@ -1 +0,0 @@
--m record -c named.conf -d 99 -D dscp-ns6 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns6/named.conf.in b/bin/tests/system/dscp/ns6/named.conf.in
deleted file mode 100644 (file)
index 94c1b59..0000000
--- a/bin/tests/system/dscp/ns6/named.conf.in
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       dscp 47;
-       query-source dscp 46 address 10.53.0.6;
-       notify-source 10.53.0.6 dscp 46;
-       transfer-source 10.53.0.6 dscp 46;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on dscp 46 { 10.53.0.6; };
-       listen-on-v6 { none; };
-       notify yes;
-       recursion yes;
-       dnssec-validation yes;
-};
-
-zone "." {
-       type hint;
-       file "hint.db";
-};

diff --git a/bin/tests/system/dscp/ns7/named.args b/bin/tests/system/dscp/ns7/named.args
deleted file mode 100644 (file)
index 733a65e..0000000
--- a/bin/tests/system/dscp/ns7/named.args
+++ /dev/null
@@ -1 +0,0 @@
--m record -c named.conf -d 99 -D dscp-ns7 -X named.lock -g -U 4 -T maxcachesize=2097152 -T dscp=46

diff --git a/bin/tests/system/dscp/ns7/named.conf.in b/bin/tests/system/dscp/ns7/named.conf.in
deleted file mode 100644 (file)
index 3dc7010..0000000
--- a/bin/tests/system/dscp/ns7/named.conf.in
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-options {
-       dscp 47;
-       query-source dscp 46 address 10.53.0.7;
-       notify-source 10.53.0.7 dscp 47;
-       transfer-source 10.53.0.7 dscp 47;
-       port @PORT@;
-       pid-file "named.pid";
-       listen-on dscp 46 { 10.53.0.7; };
-       listen-on-v6 { none; };
-       recursion no;
-       dnssec-validation no;
-       notify yes;
-};
-
-zone "." {
-       type secondary;
-       file "root.bk";
-       transfer-source 10.53.0.7 dscp 46;
-       notify-source 10.53.0.7 dscp 46;
-       primaries { 10.53.0.4; };
-};

diff --git a/bin/tests/system/dscp/setup.sh b/bin/tests/system/dscp/setup.sh
deleted file mode 100644 (file)
index 6e3e0ad..0000000
--- a/bin/tests/system/dscp/setup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named.conf.in ns2/named.conf
-copy_setports ns3/named.conf.in ns3/named.conf
-copy_setports ns4/named.conf.in ns4/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-copy_setports ns6/named.conf.in ns6/named.conf
-copy_setports ns7/named.conf.in ns7/named.conf

diff --git a/bin/tests/system/dscp/tests.sh b/bin/tests/system/dscp/tests.sh
deleted file mode 100644 (file)
index 4b1f923..0000000
--- a/bin/tests/system/dscp/tests.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-. ../conf.sh
-
-DIGOPTS="+tcp +noadd +nosea +nostat +noquest -p ${PORT}"
-
-status=0
-
-#
-# 10.53.0.1 10.53.0.2 10.53.0.3 have a global dscp setting;
-# 10.53.0.4 10.53.0.5 10.53.0.6 have dscp set in option *-source clauses;
-# 10.53.0.7 has dscp set in zone *-source clauses;
-#
-for server in 10.53.0.1 10.53.0.2 10.53.0.3 10.53.0.4 10.53.0.5 \
-             10.53.0.6 10.53.0.7
-do
-       echo_i "testing root SOA lookup at $server"
-       for i in 0 1 2 3 4 5 6 7 8 9
-       do
-               ret=0
-               $DIG $DIGOPTS @$server soa . > dig.out.$server
-               grep "status: NOERROR" dig.out.$server > /dev/null || ret=1
-               test $ret = 0 && break
-               sleep 1
-       done
-       test $ret = 0 || { echo_i "failed"; status=`expr $status + $ret`; }
-done
-
-echo_i "exit status: $status"
-[ $status -eq 0 ] || exit 1

diff --git a/bin/tests/system/emptyzones/ns1/named1.conf.in b/bin/tests/system/emptyzones/ns1/named1.conf.in
index 582b4fa636c127d190b7f612e7a916c8688eb5e5..4275df44ce8eee7efa7c1f169448701881c531c3 100644 (file)
--- a/bin/tests/system/emptyzones/ns1/named1.conf.in
+++ b/bin/tests/system/emptyzones/ns1/named1.conf.in
@@ -21,9 +21,9 @@ controls {
 };
 
 options {
-       query-source address 10.53.0.1 dscp 1;
-       notify-source 10.53.0.1 dscp 2;
-       transfer-source 10.53.0.1 dscp 3;
+       query-source address 10.53.0.1;
+       notify-source 10.53.0.1;
+       transfer-source 10.53.0.1;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/emptyzones/ns1/named2.conf.in b/bin/tests/system/emptyzones/ns1/named2.conf.in
index 8d8f0ff1c75435267d24fd11666540b9b2b159fb..e330e336beeeb79a540534c365e10b991287ecdf 100644 (file)
--- a/bin/tests/system/emptyzones/ns1/named2.conf.in
+++ b/bin/tests/system/emptyzones/ns1/named2.conf.in
@@ -21,9 +21,9 @@ controls {
 };
 
 options {
-       query-source address 10.53.0.1 dscp 1;
-       notify-source 10.53.0.1 dscp 2;
-       transfer-source 10.53.0.1 dscp 3;
+       query-source address 10.53.0.1;
+       notify-source 10.53.0.1;
+       transfer-source 10.53.0.1;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in
index 30c2ff84da2e68f984ed0c3b544f3854e55c3394..bdab9e8621b1abda1c93b86fcd1350bf9d8df7e4 100644 (file)
--- a/bin/tests/system/nsupdate/ns1/named.conf.in
+++ b/bin/tests/system/nsupdate/ns1/named.conf.in
@@ -41,9 +41,9 @@ tls tls-expired {
 
 
 options {
-       query-source address 10.53.0.1 dscp 1;
-       notify-source 10.53.0.1 dscp 22;
-       transfer-source 10.53.0.1 dscp 3;
+       query-source address 10.53.0.1;
+       notify-source 10.53.0.1;
+       transfer-source 10.53.0.1;
        port @PORT@;
        tls-port @TLSPORT@;
        pid-file "named.pid";

diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in
index 356382a5838c17ee3ddbcd5a046a412103255820..0c6decfb579bf95bdefdd7dd0dfb29bd6772828d 100644 (file)
--- a/bin/tests/system/nsupdate/ns2/named.conf.in
+++ b/bin/tests/system/nsupdate/ns2/named.conf.in
@@ -12,9 +12,9 @@
  */
 
 options {
-       query-source address 10.53.0.2 dscp 4;
-       notify-source 10.53.0.2 dscp 5;
-       transfer-source 10.53.0.2 dscp 6;
+       query-source address 10.53.0.2;
+       notify-source 10.53.0.2;
+       transfer-source 10.53.0.2;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };

diff --git a/bin/tests/system/nsupdate/ns3/named.conf.in b/bin/tests/system/nsupdate/ns3/named.conf.in
index 223ad4d1e1defaa609484bc88cfeef68aeb027bd..ffc240c75dbcdc3b65e4e39d6fd59cc8696923f3 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/named.conf.in
+++ b/bin/tests/system/nsupdate/ns3/named.conf.in
@@ -14,9 +14,9 @@
 // NS3
 
 options {
-       query-source address 10.53.0.3 dscp 7;
-       notify-source 10.53.0.3 dscp 8;
-       transfer-source 10.53.0.3 dscp 9;
+       query-source address 10.53.0.3;
+       notify-source 10.53.0.3;
+       transfer-source 10.53.0.3;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.3; };

diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index 623f9748c2d01e779a8579a9f30434dafd97a8e6..27578fc75dcef294fb18fb43bc279d9bad7c4424 100644 (file)
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -169,10 +169,10 @@ sendquery(isc_task_t *task) {
        ISC_LIST_APPEND(qname->list, qrdataset, link);
        dns_message_addname(message, qname, DNS_SECTION_QUESTION);
 
-       result = dns_request_create(
-               requestmgr, message, have_src ? &srcaddr : NULL, &dstaddr, NULL,
-               NULL, -1, DNS_REQUESTOPT_TCP, NULL, TIMEOUT, 0, 0, task,
-               recvresponse, message, &request);
+       result = dns_request_create(requestmgr, message,
+                                   have_src ? &srcaddr : NULL, &dstaddr, NULL,
+                                   NULL, DNS_REQUESTOPT_TCP, NULL, TIMEOUT, 0,
+                                   0, task, recvresponse, message, &request);
        CHECK("dns_request_create", result);
 
        return (ISC_R_SUCCESS);

diff --git a/bin/tests/system/resolver/ns1/named.conf.in b/bin/tests/system/resolver/ns1/named.conf.in
index 7ca1cafd38eb8a6950f32c6c1012351141eb7628..f0f9571209893eb2ef78063455b24b88843434a1 100644 (file)
--- a/bin/tests/system/resolver/ns1/named.conf.in
+++ b/bin/tests/system/resolver/ns1/named.conf.in
@@ -12,9 +12,9 @@
  */
 
 options {
-       query-source address 10.53.0.1 dscp 1;
-       notify-source 10.53.0.1 dscp 2;
-       transfer-source 10.53.0.1 dscp 3;
+       query-source address 10.53.0.1;
+       notify-source 10.53.0.1;
+       transfer-source 10.53.0.1;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.1; };

diff --git a/bin/tests/system/resolver/ns4/named.conf.in b/bin/tests/system/resolver/ns4/named.conf.in
index 6a44110b04ef9a7d00993575533c08bd365f5b29..281c2ca0c8edcb362f6bc154ab4e4405a5be3f57 100644 (file)
--- a/bin/tests/system/resolver/ns4/named.conf.in
+++ b/bin/tests/system/resolver/ns4/named.conf.in
@@ -14,9 +14,9 @@
 // NS4
 
 options {
-       query-source address 10.53.0.4 dscp 4;
-       notify-source 10.53.0.4 dscp 5;
-       transfer-source 10.53.0.4 dscp 6;
+       query-source address 10.53.0.4;
+       notify-source 10.53.0.4;
+       transfer-source 10.53.0.4;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.4; };

diff --git a/bin/tests/system/resolver/ns5/named.conf.in b/bin/tests/system/resolver/ns5/named.conf.in
index c6344ad198421f21cf8cf9afb8d9f4012c8ec562..6ad4e6aaafbc42a742c37b7d71589415c67bce5a 100644 (file)
--- a/bin/tests/system/resolver/ns5/named.conf.in
+++ b/bin/tests/system/resolver/ns5/named.conf.in
@@ -14,9 +14,9 @@
 // NS5
 
 options {
-       query-source address 10.53.0.5 dscp 7;
-       notify-source 10.53.0.5 dscp 8;
-       transfer-source 10.53.0.5 dscp 9;
+       query-source address 10.53.0.5;
+       notify-source 10.53.0.5;
+       transfer-source 10.53.0.5;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.5; };

diff --git a/bin/tests/system/resolver/ns6/named.conf.in b/bin/tests/system/resolver/ns6/named.conf.in
index 2ebcdd7c91a87da89882f17bf2e3817db9396889..769b57706994763f3c53a4249eecceda34bd5718 100644 (file)
--- a/bin/tests/system/resolver/ns6/named.conf.in
+++ b/bin/tests/system/resolver/ns6/named.conf.in
@@ -14,9 +14,9 @@
 // NS6
 
 options {
-       query-source address 10.53.0.6 dscp 10;
-       notify-source 10.53.0.6 dscp 11;
-       transfer-source 10.53.0.6 dscp 12;
+       query-source address 10.53.0.6;
+       notify-source 10.53.0.6;
+       transfer-source 10.53.0.6;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.6; };

diff --git a/bin/tests/system/resolver/ns7/named1.conf.in b/bin/tests/system/resolver/ns7/named1.conf.in
index 5bb8c803bf9d9038bc5dd98f8dfd33e4400238d5..1d32ae9745269dd1b79543f53399b82d6f8d961f 100644 (file)
--- a/bin/tests/system/resolver/ns7/named1.conf.in
+++ b/bin/tests/system/resolver/ns7/named1.conf.in
@@ -14,9 +14,9 @@
 // NS7
 
 options {
-       query-source address 10.53.0.7 dscp 13;
-       notify-source 10.53.0.7 dscp 14;
-       transfer-source 10.53.0.7 dscp 15;
+       query-source address 10.53.0.7;
+       notify-source 10.53.0.7;
+       transfer-source 10.53.0.7;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.7; };

diff --git a/bin/tests/system/resolver/ns7/named2.conf.in b/bin/tests/system/resolver/ns7/named2.conf.in
index 5bb8c803bf9d9038bc5dd98f8dfd33e4400238d5..1d32ae9745269dd1b79543f53399b82d6f8d961f 100644 (file)
--- a/bin/tests/system/resolver/ns7/named2.conf.in
+++ b/bin/tests/system/resolver/ns7/named2.conf.in
@@ -14,9 +14,9 @@
 // NS7
 
 options {
-       query-source address 10.53.0.7 dscp 13;
-       notify-source 10.53.0.7 dscp 14;
-       transfer-source 10.53.0.7 dscp 15;
+       query-source address 10.53.0.7;
+       notify-source 10.53.0.7;
+       transfer-source 10.53.0.7;
        port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.7; };

diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index 255c29125ef0b7344f38e0cba9fd6e66d0c408fb..d3dcc9862de36d9b032d8d343f4b4ce53776576c 100644 (file)
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -179,7 +179,7 @@ sendquery(void *arg) {
        CHECK("dns_tkey_builddhquery", result);
 
        result = dns_request_create(requestmgr, query, NULL, &address, NULL,
-                                   NULL, -1, DNS_REQUESTOPT_TCP, initialkey,
+                                   NULL, DNS_REQUESTOPT_TCP, initialkey,
                                    TIMEOUT, 0, 0, task, recvquery, query,
                                    &request);
        CHECK("dns_request_create", result);

diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index 4bfdd0feaea65dda7523d39bc4b7683f33911040..771e8baec7e2dede8d4d38e6150af5a3fbf94341 100644 (file)
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -123,9 +123,8 @@ sendquery(void *arg) {
        CHECK("dns_tkey_builddeletequery", result);
 
        result = dns_request_create(requestmgr, query, NULL, &address, NULL,
-                                   NULL, -1, DNS_REQUESTOPT_TCP, tsigkey,
-                                   TIMEOUT, 0, 0, task, recvquery, query,
-                                   &request);
+                                   NULL, DNS_REQUESTOPT_TCP, tsigkey, TIMEOUT,
+                                   0, 0, task, recvquery, query, &request);
        CHECK("dns_request_create", result);
 }
 

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index b71e009fa5d88ec5c3d7f30db2c9e4edc7a937d4..f7928c3484f1acc7dfb9217a16a6097b2eafad8d 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -118,7 +118,6 @@ static isc_sockaddr_t srcaddr;
 static char *server = NULL;
 static isc_sockaddr_t dstaddr;
 static in_port_t port = 53;
-static isc_dscp_t dscp = -1;
 static unsigned char cookie_secret[33];
 static int onfly = 0;
 static char hexcookie[81];
@@ -755,7 +754,7 @@ sendquery(struct query *query) {
 
        result = dns_request_create(
                requestmgr, message, have_src ? &srcaddr : NULL, &dstaddr, NULL,
-               NULL, dscp, options, NULL, query->timeout, query->udptimeout,
+               NULL, options, NULL, query->timeout, query->udptimeout,
                query->udpretries, global_task, recvresponse, message,
                &request);
        CHECK("dns_request_create", result);
@@ -812,9 +811,6 @@ help(void) {
               "                 -p port             (specify port number)\n"
               "                 -m                  (enable memory usage "
               "debugging)\n"
-              "                 +[no]dscp[=###]     (Set the DSCP value to "
-              "### "
-              "[0..63])\n"
               "                 +[no]vc             (TCP mode)\n"
               "                 +[no]tcp            (TCP mode, alternate "
               "syntax)\n"
@@ -1319,18 +1315,10 @@ plus_option(char *option, struct query *query, bool global) {
                        query->dnssec = state;
                        break;
                case 's': /* dscp */
+                       /* obsolete */
                        FULLCHECK("dscp");
-                       GLOBAL();
-                       if (!state) {
-                               dscp = -1;
-                               break;
-                       }
-                       if (value == NULL) {
-                               goto need_value;
-                       }
-                       result = parse_uint(&num, value, 0x3f, "DSCP");
-                       CHECK("parse_uint(DSCP)", result);
-                       dscp = num;
+                       fprintf(stderr, ";; +dscp option is obsolete "
+                                       "and has no effect");
                        break;
                default:
                        goto invalid_option;

diff --git a/bin/tools/mdig.rst b/bin/tools/mdig.rst
index 27d34f31649d037dc9b1d30c824bba168c998332..33948d1475c6bfb5c0240c97fe7d7fa404b87965 100644 (file)
--- a/bin/tools/mdig.rst
+++ b/bin/tools/mdig.rst
@@ -161,11 +161,10 @@ The global query options are:
    they are replaced by the string "[omitted]"; in the DNSKEY case, the
    key ID is displayed as the replacement, e.g., ``[ key id = value ]``.
 
-.. option:: +dscp[=value]
+.. option:: +dscp=value
 
-   This option sets the DSCP code point to be used when sending the query. Valid DSCP
-   code points are in the range [0...63]. By default no code point is
-   explicitly set.
+   This option formerly set the DSCP value used when sending a query.
+   It is now obsolete, and has no effect.
 
 .. option:: +multiline, +nomultiline
 

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index a13d1fd94b474bbfda738efcc3828db2faf469fe..c229f15a613f0330bc6c8f6f3ac9e1cc0f4ef609 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -314,9 +314,6 @@ file documentation:
     ``domain_name``
         A quoted string which is used as a DNS name; for example: ``my.test.domain``.
 
-    ``dscp``
-        An :term:`integer` between 0 and 63, used to select a Differentiated Services Code Point (DSCP) value for use with outgoing traffic on operating systems that support DSCP.
-
     ``fixedpoint``
         A non-negative real number that can be specified to the nearest one-hundredth. Up to five digits can be specified before a decimal point, and up to two digits after, so the maximum value is 99999.99. Acceptable values might be further limited by the contexts in which they are used.
 
@@ -1604,11 +1601,11 @@ default is used.
 
 .. namedconf:statement:: dscp
    :tags: server, query
-   :short: Specifies the global Differentiated Services Code Point (DSCP) value to classify outgoing DNS traffic.
+   :short: Sets the Differentiated Services Code Point (DSCP) value (obsolete).
 
-   This is the global Differentiated Services Code Point (DSCP) value to
-   classify outgoing DNS traffic, on operating systems that support DSCP.
-   Valid values are 0 through 63. It is not configured by default.
+   This option used to set the global Differentiated Services Code Point
+   (DSCP) value to classify outgoing DNS traffic. It is now obsolete and
+   has no effect.
 
 .. namedconf:statement:: preferred-glue
    :tags: query
@@ -2895,8 +2892,8 @@ authoritative and does not have the answer in its cache.
 
    This specifies a list of IP addresses to which queries are forwarded. The
    default is the empty list (no forwarding). Each address in the list can be
-   associated with an optional port number and/or DSCP value, and a default port
-   number and DSCP value can be set for the entire list.
+   associated with an optional port number. A default port number can be set
+   for the entire list.
 
 Forwarding can also be configured on a per-domain basis, allowing for
 the global forwarding options to be overridden in a variety of ways.

diff --git a/doc/design/dscp b/doc/design/dscp
deleted file mode 100644 (file)
index 25afeca..0000000
--- a/doc/design/dscp
+++ /dev/null
@@ -1,143 +0,0 @@
-<!--
-Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-
-SPDX-License-Identifier: MPL-2.0
-
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0.  If a copy of the MPL was not distributed with this
-file, you can obtain one at https://mozilla.org/MPL/2.0/.
-
-See the COPYRIGHT file distributed with this work for additional
-information regarding copyright ownership.
--->
-
-       Differentiate Services Code Point Support
-
-Differentiate Services Code Point (DSCP) is implemented in IPv4 using the
-TOS octet and in IPv6 using the TCLASS octet.
-
-RFC 3542 defines the api to manipulate the TCLASS octet as part of
-the advanced socket API.  TCLASS is settable on both a socket and
-packet basis (setsockopt/sendmsg) and the sent value can be retrieved
-using recvmsg over UDP.  Retrieval is undefined for TCP.
-
-The Advanced socket API was not incorporated into the POSIX socket
-API for IPv6 and may not be completely implemented in any OS.
-
-For TOS setsockopt() supports setting of the field on a persocket
-basis.  TOS may also be set on a per packet basis on some OS using
-sendmsg.  If it is not supported the sendmsg call reports a error.
-Support can only be determined by attempted to send a packet with
-the option set.  Retrieval of the sent TOS value is retrievable on
-Linux.  This can be determined at compile time.
-
-DSCP values need to be compatible with TOS values as it is a re-use
-of the field.
-
-LIBISC:
-
-We will need to be able to probe for the level of DSCP support.  We
-need to know if we can set it at the socket level, packet level and
-if we can retrieve the DSCP value sent.  This needs to be done
-independently for IPv4 and IPv6.
-
-#define ISC_NET_DSCPRECVV4      0x01    /* Can receive sent DSCP value IPv4 */
-#define ISC_NET_DSCPRECVV6      0x02    /* Can receive sent DSCP value IPv6 */
-#define ISC_NET_DSCPSETV4       0x04    /* Can set DSCP on socket IPv4 */
-#define ISC_NET_DSCPSETV6       0x08    /* Can set DSCP on socket IPv6 */
-#define ISC_NET_DSCPPKTV4       0x10    /* Can set DSCP on per packet IPv4 */
-#define ISC_NET_DSCPPKTV6       0x20    /* Can set DSCP on per packet IPv6 */
-#define ISC_NET_DSCPALL         0x3f    /* All valid flags */
-
-unsigned int
-isc_net_probedscp(void);
-/*%<
- * Probe the level of DSCP support.
- */
-
-We also need to be able to set DSCP values on a per socket basis, per packet
-basis and to retrieve dscp values from received packet.
-
-Setting dscp on a per socket basis shall be done using isc_socket_dscp.
-
-void
-isc_socket_dscp(isc_socket_t *sock, unsigned int dscp);
-/*%<
- * Requires:
- *\li   'sock' is a valid socket.
- */
-/*@}*/
-
-isc_socketevent shall be extended to support the sending of and retrieval
-of DSCP values.  If ISC_SOCKEVENTATTR_DSCP is set then isc_socket_sendto2
-shall set the DSCP value.  isc_socket_recv shall set ISC_SOCKEVENTATTR_DSCP
-and the dscp element if the OS returns the value via recvmsg.
-
-#define ISC_SOCKEVENTATTR_DSCP                  0x00040000U /* public */
-
-struct isc_socketevent {
-        ISC_EVENT_COMMON(isc_socketevent_t);
-        isc_result_t            result;         /*%< OK, EOF, whatever else */
-        unsigned int            minimum;        /*%< minimum i/o for event */
-        unsigned int            n;              /*%< bytes read or written */
-        unsigned int            offset;         /*%< offset into buffer list */
-        isc_region_t            region;         /*%< for single-buffer i/o */
-        isc_bufferlist_t        bufferlist;     /*%< list of buffers */
-        isc_sockaddr_t          address;        /*%< source address */
-        isc_time_t              timestamp;      /*%< timestamp of packet recv */
-        struct in6_pktinfo      pktinfo;        /*%< ipv6 pktinfo */
-        uint32_t            attributes;     /*%< see below */
-        isc_eventdestructor_t   destroy;        /*%< original destructor */
-        unsigned int            dscp;           /*%< UDP dscp value */
-};
-
-A convenience function will be provided to allocate and initialize the structure.
-
-isc_socketevent_t *
-isc_socket_socketevent(isc_socket_t *sock0, isc_eventtype_t eventtype,
-                       isc_taskaction_t action, const void *arg)
-
-NAMED/LIBDNS:
-
-Named needs to be able to set the DSCP value of sent traffic.  We should
-be able to set DSCP for all TCP connections.
-
-For UDP we should have a default DSCP value for when we can't set this on
-a per packet basis with the ability to override for specific destinations.
-
-options/view/server;
-tcp-dscp <value>;
-udp-dscp <value>;
-
-http://bogpeople.com/networking/dscp.shtml list a set of TOS compatible
-values (below).
-
-DSCP Name      DS Field Value  IP Precedence
-                Binary Decimal
-CS0            000 000 0       0
-CS1            001 000 8       1
-AF11           001 010 10      1
-AF12           001 100 12      1
-AF13           001 110 14      1
-CS2            010 000 16      2
-AF21           010 010 18      2
-AF22           010 100 20      2
-AF23           010 110 22      2
-CS3            011 000 24      3
-AF31           011 010 26      3
-AF32           011 100 28      3
-AF33           011 110 30      3
-CS4            100 000 32      4
-AF41           100 010 34      4
-AF42           100 100 36      4
-AF43           100 110 38      4
-CS5            101 000 40      5
-EF             101 110 46      5
-CS6            110 000 48      6
-CS7            111 000 56      7
-
-CS     Class Selector (RFC 2474)
-AFxy   Assured Forwarding (x=class, y=drop precedence) (RFC2597)
-EF     Expedited Forwarding (RFC 3246)
-
-value should be one of these or a numeric 0..63.  The default value is 0.

diff --git a/doc/man/dig.1in b/doc/man/dig.1in
index b172dbab42f6b7399748c68803f8281bb9bcce8c..a0ad0ec541be548837b69de446c158510cfe0c90 100644 (file)
--- a/doc/man/dig.1in
+++ b/doc/man/dig.1in
@@ -403,9 +403,8 @@ given.
 .INDENT 0.0
 .TP
 .B +dscp=value
-This option sets the DSCP code point to be used when sending the query. Valid DSCP
-code points are in the range [0...63]. By default no code point is
-explicitly set.
+This option formerly set the DSCP value used when sending a query.
+It is now obsolete, and has no effect.
 .UNINDENT
 .INDENT 0.0
 .TP

diff --git a/doc/man/mdig.1in b/doc/man/mdig.1in
index 4208b5641fa5a56b7501e6c0839ce93a433983a5..4365a496e662896b4ec3860b879e0b357dfd4305 100644 (file)
--- a/doc/man/mdig.1in
+++ b/doc/man/mdig.1in
@@ -185,10 +185,9 @@ key ID is displayed as the replacement, e.g., \fB[ key id = value ]\fP\&.
 .UNINDENT
 .INDENT 0.0
 .TP
-.B +dscp[=value]
-This option sets the DSCP code point to be used when sending the query. Valid DSCP
-code points are in the range [0...63]. By default no code point is
-explicitly set.
+.B +dscp=value
+This option formerly set the DSCP value used when sending a query.
+It is now obsolete, and has no effect.
 .UNINDENT
 .INDENT 0.0
 .TP

diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index 375b06542ea4f4e21b53de4b83395f5a4f7e2f08..16ea9e48e75ccf2a27e148ab02f86b17bf05d621 100644 (file)
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -126,7 +126,7 @@ options {
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
-       also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also\-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        answer\-cookie <boolean>;
        attach\-cache <string>;
        auth\-nxdomain <boolean>;
@@ -136,7 +136,7 @@ options {
        avoid\-v6\-udp\-ports { <portrange>; ... };
        bindkeys\-file <quoted_string>;
        blackhole { <address_match_element>; ... };
-       catalog\-zones { zone <string> [ default\-primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [ zone\-directory <quoted_string> ] [ in\-memory <boolean> ] [ min\-update\-interval <duration> ]; ... };
+       catalog\-zones { zone <string> [ default\-primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [ zone\-directory <quoted_string> ] [ in\-memory <boolean> ] [ min\-update\-interval <duration> ]; ... };
        check\-dup\-records ( fail | warn | ignore );
        check\-integrity <boolean>;
        check\-mx ( fail | warn | ignore );
@@ -182,8 +182,8 @@ options {
        dnstap\-identity ( <quoted_string> | none | hostname ); // not configured
        dnstap\-output ( file | unix ) <quoted_string> [ size ( unlimited | <size> ) ] [ versions ( unlimited | <integer> ) ] [ suffix ( increment | timestamp ) ]; // not configured
        dnstap\-version ( <quoted_string> | none ); // not configured
-       dscp <integer>;
-       dual\-stack\-servers [ port <integer> ] { ( <quoted_string> [ port <integer> ] [ dscp <integer> ] | <ipv4_address> [ port <integer> ] [ dscp <integer> ] | <ipv6_address> [ port <integer> ] [ dscp <integer> ] ); ... };
+       dscp <integer>; // obsolete
+       dual\-stack\-servers [ port <integer> ] { ( <quoted_string> [ port <integer> ] | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ); ... };
        dump\-file <quoted_string>;
        edns\-udp\-size <integer>;
        empty\-contact <string>;
@@ -194,7 +194,7 @@ options {
        fetches\-per\-zone <integer> [ ( drop | fail ) ];
        flush\-zones\-on\-shutdown <boolean>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        fstrm\-set\-buffer\-hint <integer>; // not configured
        fstrm\-set\-flush\-timeout <integer>; // not configured
        fstrm\-set\-input\-queue\-size <integer>; // not configured
@@ -217,8 +217,8 @@ options {
        keep\-response\-order { <address_match_element>; ... }; // obsolete
        key\-directory <quoted_string>;
        lame\-ttl <duration>;
-       listen\-on [ port <integer> ] [ dscp <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
-       listen\-on\-v6 [ port <integer> ] [ dscp <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
+       listen\-on [ port <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
+       listen\-on\-v6 [ port <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
        lmdb\-mapsize <sizeval>;
        lock\-file ( <quoted_string> | none );
        managed\-keys\-directory <quoted_string>;
@@ -260,23 +260,23 @@ options {
        notify ( explicit | master\-only | primary\-only | <boolean> );
        notify\-delay <integer>;
        notify\-rate <integer>;
-       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        notify\-to\-soa <boolean>;
        nsec3\-test\-zone <boolean>; // test only
        nta\-lifetime <duration>;
        nta\-recheck <duration>;
        nxdomain\-redirect <string>;
-       parental\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       parental\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       parental\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       parental\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        pid\-file ( <quoted_string> | none );
        port <integer>;
        preferred\-glue <string>;
        prefetch <integer> [ <integer> ];
        provide\-ixfr <boolean>;
        qname\-minimization ( strict | relaxed | disabled | off );
-       query\-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
-       query\-source\-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
+       query\-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) );
+       query\-source\-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) );
        querylog <boolean>;
        rate\-limit {
                all\-per\-second <integer>;
@@ -350,8 +350,8 @@ options {
        tls\-port <integer>;
        transfer\-format ( many\-answers | one\-answer );
        transfer\-message\-size <integer>;
-       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        transfers\-in <integer>;
        transfers\-out <integer>;
        transfers\-per\-ns <integer>;
@@ -370,11 +370,11 @@ options {
        zone\-statistics ( full | terse | none | <boolean> );
 };
 
-parental\-agents <string> [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... }; // may occur multiple times
+parental\-agents <string> [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... }; // may occur multiple times
 
 plugin ( query ) <string> [ { <unspecified\-text> } ]; // may occur multiple times
 
-primaries <string> [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... }; // may occur multiple times
+primaries <string> [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... }; // may occur multiple times
 
 server <netprefix> {
        bogus <boolean>;
@@ -383,12 +383,12 @@ server <netprefix> {
        edns\-version <integer>;
        keys <server_key>;
        max\-udp\-size <integer>;
-       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        padding <integer>;
        provide\-ixfr <boolean>;
-       query\-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
-       query\-source\-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
+       query\-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) );
+       query\-source\-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) );
        request\-expire <boolean>;
        request\-ixfr <boolean>;
        request\-nsid <boolean>;
@@ -397,8 +397,8 @@ server <netprefix> {
        tcp\-keepalive <boolean>;
        tcp\-only <boolean>;
        transfer\-format ( many\-answers | one\-answer );
-       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        transfers <integer>;
 }; // may occur multiple times
 
@@ -434,11 +434,11 @@ view <string> [ <class> ] {
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
-       also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also\-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        attach\-cache <string>;
        auth\-nxdomain <boolean>;
        auto\-dnssec ( allow | maintain | off ); // deprecated
-       catalog\-zones { zone <string> [ default\-primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [ zone\-directory <quoted_string> ] [ in\-memory <boolean> ] [ min\-update\-interval <duration> ]; ... };
+       catalog\-zones { zone <string> [ default\-primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [ zone\-directory <quoted_string> ] [ in\-memory <boolean> ] [ min\-update\-interval <duration> ]; ... };
        check\-dup\-records ( fail | warn | ignore );
        check\-integrity <boolean>;
        check\-mx ( fail | warn | ignore );
@@ -482,7 +482,7 @@ view <string> [ <class> ] {
        dnssec\-update\-mode ( maintain | no\-resign );
        dnssec\-validation ( yes | no | auto );
        dnstap { ( all | auth | client | forwarder | resolver | update ) [ ( query | response ) ]; ... }; // not configured
-       dual\-stack\-servers [ port <integer> ] { ( <quoted_string> [ port <integer> ] [ dscp <integer> ] | <ipv4_address> [ port <integer> ] [ dscp <integer> ] | <ipv6_address> [ port <integer> ] [ dscp <integer> ] ); ... };
+       dual\-stack\-servers [ port <integer> ] { ( <quoted_string> [ port <integer> ] | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ); ... };
        dyndb <string> <quoted_string> { <unspecified\-text> }; // may occur multiple times
        edns\-udp\-size <integer>;
        empty\-contact <string>;
@@ -492,7 +492,7 @@ view <string> [ <class> ] {
        fetches\-per\-server <integer> [ ( drop | fail ) ];
        fetches\-per\-zone <integer> [ ( drop | fail ) ];
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        ipv4only\-contact <string>;
        ipv4only\-enable <boolean>;
        ipv4only\-server <string>;
@@ -541,22 +541,22 @@ view <string> [ <class> ] {
        nocookie\-udp\-size <integer>;
        notify ( explicit | master\-only | primary\-only | <boolean> );
        notify\-delay <integer>;
-       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        notify\-to\-soa <boolean>;
        nsec3\-test\-zone <boolean>; // test only
        nta\-lifetime <duration>;
        nta\-recheck <duration>;
        nxdomain\-redirect <string>;
-       parental\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       parental\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       parental\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       parental\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        plugin ( query ) <string> [ { <unspecified\-text> } ]; // may occur multiple times
        preferred\-glue <string>;
        prefetch <integer> [ <integer> ];
        provide\-ixfr <boolean>;
        qname\-minimization ( strict | relaxed | disabled | off );
-       query\-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
-       query\-source\-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
+       query\-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) );
+       query\-source\-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) );
        rate\-limit {
                all\-per\-second <integer>;
                errors\-per\-second <integer>;
@@ -596,12 +596,12 @@ view <string> [ <class> ] {
                edns\-version <integer>;
                keys <server_key>;
                max\-udp\-size <integer>;
-               notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-               notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+               notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+               notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
                padding <integer>;
                provide\-ixfr <boolean>;
-               query\-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
-               query\-source\-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
+               query\-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) );
+               query\-source\-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) );
                request\-expire <boolean>;
                request\-ixfr <boolean>;
                request\-nsid <boolean>;
@@ -610,8 +610,8 @@ view <string> [ <class> ] {
                tcp\-keepalive <boolean>;
                tcp\-only <boolean>;
                transfer\-format ( many\-answers | one\-answer );
-               transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-               transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+               transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+               transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
                transfers <integer>;
        }; // may occur multiple times
        servfail\-ttl <duration>;
@@ -628,8 +628,8 @@ view <string> [ <class> ] {
        suppress\-initial\-notify <boolean>; // obsolete
        synth\-from\-dnssec <boolean>;
        transfer\-format ( many\-answers | one\-answer );
-       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        trust\-anchor\-telemetry <boolean>; // experimental
        trust\-anchors { <string> ( static\-key | initial\-key | static\-ds | initial\-ds ) <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times
        trusted\-keys { <string> <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times, deprecated
@@ -660,7 +660,7 @@ zone <string> [ <class> ] {
        allow\-query\-on { <address_match_element>; ... };
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update { <address_match_element>; ... };
-       also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also\-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        auto\-dnssec ( allow | maintain | off ); // deprecated
        check\-dup\-records ( fail | warn | ignore );
        check\-integrity <boolean>;
@@ -683,7 +683,7 @@ zone <string> [ <class> ] {
        dnssec\-update\-mode ( maintain | no\-resign );
        file <quoted_string>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        inline\-signing <boolean>;
        ixfr\-from\-differences <boolean>;
        journal <quoted_string>;
@@ -698,13 +698,13 @@ zone <string> [ <class> ] {
        max\-zone\-ttl ( unlimited | <duration> ); // deprecated
        notify ( explicit | master\-only | primary\-only | <boolean> );
        notify\-delay <integer>;
-       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        notify\-to\-soa <boolean>;
        nsec3\-test\-zone <boolean>; // test only
-       parental\-agents [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
-       parental\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       parental\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       parental\-agents [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       parental\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       parental\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        serial\-update\-method ( date | increment | unixtime );
        sig\-signing\-nodes <integer>;
        sig\-signing\-signatures <integer>;
@@ -732,7 +732,7 @@ zone <string> [ <class> ] {
        allow\-query\-on { <address_match_element>; ... };
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
-       also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also\-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        auto\-dnssec ( allow | maintain | off ); // deprecated
        check\-names ( fail | warn | ignore );
        database <string>;
@@ -745,7 +745,7 @@ zone <string> [ <class> ] {
        dnssec\-update\-mode ( maintain | no\-resign );
        file <quoted_string>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        inline\-signing <boolean>;
        ixfr\-from\-differences <boolean>;
        journal <quoted_string>;
@@ -766,22 +766,22 @@ zone <string> [ <class> ] {
        multi\-master <boolean>;
        notify ( explicit | master\-only | primary\-only | <boolean> );
        notify\-delay <integer>;
-       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        notify\-to\-soa <boolean>;
        nsec3\-test\-zone <boolean>; // test only
-       parental\-agents [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
-       parental\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       parental\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       parental\-agents [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       parental\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       parental\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+       primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        request\-expire <boolean>;
        request\-ixfr <boolean>;
        sig\-signing\-nodes <integer>;
        sig\-signing\-signatures <integer>;
        sig\-signing\-type <integer>;
        sig\-validity\-interval <integer> [ <integer> ];
-       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        try\-tcp\-refresh <boolean>;
        update\-check\-ksk <boolean>;
        zero\-no\-soa\-ttl <boolean>;
@@ -804,7 +804,7 @@ zone <string> [ <class> ] {
        allow\-query\-on { <address_match_element>; ... };
        allow\-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow\-update\-forwarding { <address_match_element>; ... };
-       also\-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also\-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        check\-names ( fail | warn | ignore );
        database <string>;
        file <quoted_string>;
@@ -826,13 +826,13 @@ zone <string> [ <class> ] {
        multi\-master <boolean>;
        notify ( explicit | master\-only | primary\-only | <boolean> );
        notify\-delay <integer>;
-       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       notify\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+       primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        request\-expire <boolean>;
        request\-ixfr <boolean>;
-       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        try\-tcp\-refresh <boolean>;
        zero\-no\-soa\-ttl <boolean>;
        zone\-statistics ( full | terse | none | <boolean> );
@@ -851,7 +851,7 @@ zone <string> [ <class> ] {
        type forward;
        delegation\-only <boolean>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
 };
 
 .ft P
@@ -889,7 +889,7 @@ zone <string> [ <class> ] {
        masterfile\-style ( full | relative );
        max\-records <integer>;
        max\-zone\-ttl ( unlimited | <duration> ); // deprecated
-       primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        zone\-statistics ( full | terse | none | <boolean> );
 };
 
@@ -907,7 +907,7 @@ zone <string> [ <class> ] {
        allow\-query { <address_match_element>; ... };
        allow\-query\-on { <address_match_element>; ... };
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        max\-records <integer>;
        server\-addresses { ( <ipv4_address> | <ipv6_address> ); ... };
        server\-names { <string>; ... };
@@ -933,7 +933,7 @@ zone <string> [ <class> ] {
        dialup ( notify | notify\-passive | passive | refresh | <boolean> );
        file <quoted_string>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        masterfile\-format ( raw | text );
        masterfile\-style ( full | relative );
        max\-records <integer>;
@@ -944,9 +944,9 @@ zone <string> [ <class> ] {
        min\-refresh\-time <integer>;
        min\-retry\-time <integer>;
        multi\-master <boolean>;
-       primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
-       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote\-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       transfer\-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer\-source\-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        zone\-statistics ( full | terse | none | <boolean> );
 };
 

diff --git a/doc/misc/forward.zoneopt b/doc/misc/forward.zoneopt
index e694813a86cb0d19e9dd6fdbaef0b7953dd9534e..148b74c5844028fb6abe152ca2dd22f1005f40af 100644 (file)
--- a/doc/misc/forward.zoneopt
+++ b/doc/misc/forward.zoneopt
@@ -2,5 +2,5 @@ zone <string> [ <class> ] {
        type forward;
        delegation-only <boolean>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
 };

diff --git a/doc/misc/mirror.zoneopt b/doc/misc/mirror.zoneopt
index a0aeb46e8ef942549bdb8cbe0f865b5644f44d05..7102c2370699f4a7d47b8c56ebd17679166af66f 100644 (file)
--- a/doc/misc/mirror.zoneopt
+++ b/doc/misc/mirror.zoneopt
@@ -5,7 +5,7 @@ zone <string> [ <class> ] {
        allow-query-on { <address_match_element>; ... };
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        check-names ( fail | warn | ignore );
        database <string>;
        file <quoted_string>;
@@ -27,13 +27,13 @@ zone <string> [ <class> ] {
        multi-master <boolean>;
        notify ( explicit | master-only | primary-only | <boolean> );
        notify-delay <integer>;
-       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+       primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        request-expire <boolean>;
        request-ixfr <boolean>;
-       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        try-tcp-refresh <boolean>;
        zero-no-soa-ttl <boolean>;
        zone-statistics ( full | terse | none | <boolean> );

diff --git a/doc/misc/options b/doc/misc/options
index fb970713f37ca91c2c5ca713d10c712e89ac818a..ed8cdace5893c8bc2550b02d6653f60e7166fd5e 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -69,7 +69,7 @@ options {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        answer-cookie <boolean>;
        attach-cache <string>;
        auth-nxdomain <boolean>;
@@ -79,7 +79,7 @@ options {
        avoid-v6-udp-ports { <portrange>; ... };
        bindkeys-file <quoted_string>;
        blackhole { <address_match_element>; ... };
-       catalog-zones { zone <string> [ default-primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [ zone-directory <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval <duration> ]; ... };
+       catalog-zones { zone <string> [ default-primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [ zone-directory <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval <duration> ]; ... };
        check-dup-records ( fail | warn | ignore );
        check-integrity <boolean>;
        check-mx ( fail | warn | ignore );
@@ -125,8 +125,8 @@ options {
        dnstap-identity ( <quoted_string> | none | hostname ); // not configured
        dnstap-output ( file | unix ) <quoted_string> [ size ( unlimited | <size> ) ] [ versions ( unlimited | <integer> ) ] [ suffix ( increment | timestamp ) ]; // not configured
        dnstap-version ( <quoted_string> | none ); // not configured
-       dscp <integer>;
-       dual-stack-servers [ port <integer> ] { ( <quoted_string> [ port <integer> ] [ dscp <integer> ] | <ipv4_address> [ port <integer> ] [ dscp <integer> ] | <ipv6_address> [ port <integer> ] [ dscp <integer> ] ); ... };
+       dscp <integer>; // obsolete
+       dual-stack-servers [ port <integer> ] { ( <quoted_string> [ port <integer> ] | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ); ... };
        dump-file <quoted_string>;
        edns-udp-size <integer>;
        empty-contact <string>;
@@ -137,7 +137,7 @@ options {
        fetches-per-zone <integer> [ ( drop | fail ) ];
        flush-zones-on-shutdown <boolean>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        fstrm-set-buffer-hint <integer>; // not configured
        fstrm-set-flush-timeout <integer>; // not configured
        fstrm-set-input-queue-size <integer>; // not configured
@@ -160,8 +160,8 @@ options {
        keep-response-order { <address_match_element>; ... }; // obsolete
        key-directory <quoted_string>;
        lame-ttl <duration>;
-       listen-on [ port <integer> ] [ dscp <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
-       listen-on-v6 [ port <integer> ] [ dscp <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
+       listen-on [ port <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
+       listen-on-v6 [ port <integer> ] [ tls <string> ] [ http <string> ] { <address_match_element>; ... }; // may occur multiple times
        lmdb-mapsize <sizeval>;
        lock-file ( <quoted_string> | none );
        managed-keys-directory <quoted_string>;
@@ -203,23 +203,23 @@ options {
        notify ( explicit | master-only | primary-only | <boolean> );
        notify-delay <integer>;
        notify-rate <integer>;
-       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        notify-to-soa <boolean>;
        nsec3-test-zone <boolean>; // test only
        nta-lifetime <duration>;
        nta-recheck <duration>;
        nxdomain-redirect <string>;
-       parental-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       parental-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       parental-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       parental-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        pid-file ( <quoted_string> | none );
        port <integer>;
        preferred-glue <string>;
        prefetch <integer> [ <integer> ];
        provide-ixfr <boolean>;
        qname-minimization ( strict | relaxed | disabled | off );
-       query-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
-       query-source-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
+       query-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) );
+       query-source-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) );
        querylog <boolean>;
        rate-limit {
                all-per-second <integer>;
@@ -293,8 +293,8 @@ options {
        tls-port <integer>;
        transfer-format ( many-answers | one-answer );
        transfer-message-size <integer>;
-       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        transfers-in <integer>;
        transfers-out <integer>;
        transfers-per-ns <integer>;
@@ -313,11 +313,11 @@ options {
        zone-statistics ( full | terse | none | <boolean> );
 };
 
-parental-agents <string> [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... }; // may occur multiple times
+parental-agents <string> [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... }; // may occur multiple times
 
 plugin ( query ) <string> [ { <unspecified-text> } ]; // may occur multiple times
 
-primaries <string> [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... }; // may occur multiple times
+primaries <string> [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... }; // may occur multiple times
 
 server <netprefix> {
        bogus <boolean>;
@@ -326,12 +326,12 @@ server <netprefix> {
        edns-version <integer>;
        keys <server_key>;
        max-udp-size <integer>;
-       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        padding <integer>;
        provide-ixfr <boolean>;
-       query-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
-       query-source-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
+       query-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) );
+       query-source-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) );
        request-expire <boolean>;
        request-ixfr <boolean>;
        request-nsid <boolean>;
@@ -340,8 +340,8 @@ server <netprefix> {
        tcp-keepalive <boolean>;
        tcp-only <boolean>;
        transfer-format ( many-answers | one-answer );
-       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        transfers <integer>;
 }; // may occur multiple times
 
@@ -377,11 +377,11 @@ view <string> [ <class> ] {
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        attach-cache <string>;
        auth-nxdomain <boolean>;
        auto-dnssec ( allow | maintain | off ); // deprecated
-       catalog-zones { zone <string> [ default-primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [ zone-directory <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval <duration> ]; ... };
+       catalog-zones { zone <string> [ default-primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... } ] [ zone-directory <quoted_string> ] [ in-memory <boolean> ] [ min-update-interval <duration> ]; ... };
        check-dup-records ( fail | warn | ignore );
        check-integrity <boolean>;
        check-mx ( fail | warn | ignore );
@@ -425,7 +425,7 @@ view <string> [ <class> ] {
        dnssec-update-mode ( maintain | no-resign );
        dnssec-validation ( yes | no | auto );
        dnstap { ( all | auth | client | forwarder | resolver | update ) [ ( query | response ) ]; ... }; // not configured
-       dual-stack-servers [ port <integer> ] { ( <quoted_string> [ port <integer> ] [ dscp <integer> ] | <ipv4_address> [ port <integer> ] [ dscp <integer> ] | <ipv6_address> [ port <integer> ] [ dscp <integer> ] ); ... };
+       dual-stack-servers [ port <integer> ] { ( <quoted_string> [ port <integer> ] | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ); ... };
        dyndb <string> <quoted_string> { <unspecified-text> }; // may occur multiple times
        edns-udp-size <integer>;
        empty-contact <string>;
@@ -435,7 +435,7 @@ view <string> [ <class> ] {
        fetches-per-server <integer> [ ( drop | fail ) ];
        fetches-per-zone <integer> [ ( drop | fail ) ];
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        ipv4only-contact <string>;
        ipv4only-enable <boolean>;
        ipv4only-server <string>;
@@ -484,22 +484,22 @@ view <string> [ <class> ] {
        nocookie-udp-size <integer>;
        notify ( explicit | master-only | primary-only | <boolean> );
        notify-delay <integer>;
-       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        notify-to-soa <boolean>;
        nsec3-test-zone <boolean>; // test only
        nta-lifetime <duration>;
        nta-recheck <duration>;
        nxdomain-redirect <string>;
-       parental-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       parental-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       parental-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       parental-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        plugin ( query ) <string> [ { <unspecified-text> } ]; // may occur multiple times
        preferred-glue <string>;
        prefetch <integer> [ <integer> ];
        provide-ixfr <boolean>;
        qname-minimization ( strict | relaxed | disabled | off );
-       query-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
-       query-source-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
+       query-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) );
+       query-source-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) );
        rate-limit {
                all-per-second <integer>;
                errors-per-second <integer>;
@@ -539,12 +539,12 @@ view <string> [ <class> ] {
                edns-version <integer>;
                keys <server_key>;
                max-udp-size <integer>;
-               notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-               notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+               notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+               notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
                padding <integer>;
                provide-ixfr <boolean>;
-               query-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
-               query-source-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) ) [ dscp <integer> ];
+               query-source ( ( [ address ] ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv4_address> | * ) ] port ( <integer> | * ) ) );
+               query-source-v6 ( ( [ address ] ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ) | ( [ [ address ] ( <ipv6_address> | * ) ] port ( <integer> | * ) ) );
                request-expire <boolean>;
                request-ixfr <boolean>;
                request-nsid <boolean>;
@@ -553,8 +553,8 @@ view <string> [ <class> ] {
                tcp-keepalive <boolean>;
                tcp-only <boolean>;
                transfer-format ( many-answers | one-answer );
-               transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-               transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+               transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+               transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
                transfers <integer>;
        }; // may occur multiple times
        servfail-ttl <duration>;
@@ -571,8 +571,8 @@ view <string> [ <class> ] {
        suppress-initial-notify <boolean>; // obsolete
        synth-from-dnssec <boolean>;
        transfer-format ( many-answers | one-answer );
-       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        trust-anchor-telemetry <boolean>; // experimental
        trust-anchors { <string> ( static-key | initial-key | static-ds | initial-ds ) <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times
        trusted-keys { <string> <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times, deprecated

diff --git a/doc/misc/primary.zoneopt b/doc/misc/primary.zoneopt
index 5c78fc5b993d21a1ac0e0e4bc9b39752d24b5cb2..a0c028cf7b81d76d98091992b4b2f893a8f926ad 100644 (file)
--- a/doc/misc/primary.zoneopt
+++ b/doc/misc/primary.zoneopt
@@ -4,7 +4,7 @@ zone <string> [ <class> ] {
        allow-query-on { <address_match_element>; ... };
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        auto-dnssec ( allow | maintain | off ); // deprecated
        check-dup-records ( fail | warn | ignore );
        check-integrity <boolean>;
@@ -27,7 +27,7 @@ zone <string> [ <class> ] {
        dnssec-update-mode ( maintain | no-resign );
        file <quoted_string>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        inline-signing <boolean>;
        ixfr-from-differences <boolean>;
        journal <quoted_string>;
@@ -42,13 +42,13 @@ zone <string> [ <class> ] {
        max-zone-ttl ( unlimited | <duration> ); // deprecated
        notify ( explicit | master-only | primary-only | <boolean> );
        notify-delay <integer>;
-       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        notify-to-soa <boolean>;
        nsec3-test-zone <boolean>; // test only
-       parental-agents [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
-       parental-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       parental-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       parental-agents [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       parental-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       parental-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        serial-update-method ( date | increment | unixtime );
        sig-signing-nodes <integer>;
        sig-signing-signatures <integer>;

diff --git a/doc/misc/redirect.zoneopt b/doc/misc/redirect.zoneopt
index 5103121cefc0eb1d2458b998e34f97f29cac2d32..1db015a1f7de27ec113e9c25182ff816c713d702 100644 (file)
--- a/doc/misc/redirect.zoneopt
+++ b/doc/misc/redirect.zoneopt
@@ -8,6 +8,6 @@ zone <string> [ <class> ] {
        masterfile-style ( full | relative );
        max-records <integer>;
        max-zone-ttl ( unlimited | <duration> ); // deprecated
-       primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        zone-statistics ( full | terse | none | <boolean> );
 };

diff --git a/doc/misc/rndc.grammar b/doc/misc/rndc.grammar
index 716a21d9383d8dcfe2238cd0d882ee50c930b191..9d5604f98a088f409c613ef1eb22447c03bce5f7 100644 (file)
--- a/doc/misc/rndc.grammar
+++ b/doc/misc/rndc.grammar
@@ -12,7 +12,7 @@ options {
 };
 
 server <string> {
-       addresses { ( <quoted_string> [ port <integer> ] [ dscp <integer> ] | <ipv4_address> [ port <integer> ] [ dscp <integer> ] | <ipv6_address> [ port <integer> ] [ dscp <integer> ] ); ... };
+       addresses { ( <quoted_string> [ port <integer> ] | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ); ... };
        key <string>;
        port <integer>;
        source-address ( <ipv4_address> | * );

diff --git a/doc/misc/secondary.zoneopt b/doc/misc/secondary.zoneopt
index 7c265b37a528c423cabfa8bcdec4b873754b3ab7..05b3a5ed3037e176a3d49e6906c8debf7455fbb7 100644 (file)
--- a/doc/misc/secondary.zoneopt
+++ b/doc/misc/secondary.zoneopt
@@ -5,7 +5,7 @@ zone <string> [ <class> ] {
        allow-query-on { <address_match_element>; ... };
        allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };
        allow-update-forwarding { <address_match_element>; ... };
-       also-notify [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       also-notify [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        auto-dnssec ( allow | maintain | off ); // deprecated
        check-names ( fail | warn | ignore );
        database <string>;
@@ -18,7 +18,7 @@ zone <string> [ <class> ] {
        dnssec-update-mode ( maintain | no-resign );
        file <quoted_string>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        inline-signing <boolean>;
        ixfr-from-differences <boolean>;
        journal <quoted_string>;
@@ -39,22 +39,22 @@ zone <string> [ <class> ] {
        multi-master <boolean>;
        notify ( explicit | master-only | primary-only | <boolean> );
        notify-delay <integer>;
-       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       notify-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       notify-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        notify-to-soa <boolean>;
        nsec3-test-zone <boolean>; // test only
-       parental-agents [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
-       parental-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       parental-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       parental-agents [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       parental-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       parental-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
+       primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
        request-expire <boolean>;
        request-ixfr <boolean>;
        sig-signing-nodes <integer>;
        sig-signing-signatures <integer>;
        sig-signing-type <integer>;
        sig-validity-interval <integer> [ <integer> ];
-       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        try-tcp-refresh <boolean>;
        update-check-ksk <boolean>;
        zero-no-soa-ttl <boolean>;

diff --git a/doc/misc/static-stub.zoneopt b/doc/misc/static-stub.zoneopt
index f89d46248a43473e9a06b6d43d2500a54bc496b8..5357528e6fbe2bfed7da856a79391085a9cfb75f 100644 (file)
--- a/doc/misc/static-stub.zoneopt
+++ b/doc/misc/static-stub.zoneopt
@@ -3,7 +3,7 @@ zone <string> [ <class> ] {
        allow-query { <address_match_element>; ... };
        allow-query-on { <address_match_element>; ... };
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        max-records <integer>;
        server-addresses { ( <ipv4_address> | <ipv6_address> ); ... };
        server-names { <string>; ... };

diff --git a/doc/misc/stub.zoneopt b/doc/misc/stub.zoneopt
index 31a1df3ab7b2d543bf04e15d39e126a7dd2ba322..b2af973bf2eca78ae21c8eb415f404e346dee7ea 100644 (file)
--- a/doc/misc/stub.zoneopt
+++ b/doc/misc/stub.zoneopt
@@ -8,7 +8,7 @@ zone <string> [ <class> ] {
        dialup ( notify | notify-passive | passive | refresh | <boolean> );
        file <quoted_string>;
        forward ( first | only );
-       forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
+       forwarders [ port <integer> ]  { ( <ipv4_address> | <ipv6_address> ) [ port <integer> ]; ... };
        masterfile-format ( raw | text );
        masterfile-style ( full | relative );
        max-records <integer>;
@@ -19,8 +19,8 @@ zone <string> [ <class> ] {
        min-refresh-time <integer>;
        min-retry-time <integer>;
        multi-master <boolean>;
-       primaries [ port <integer> ] [ dscp <integer> ] [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
-       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
-       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] [ dscp <integer> ];
+       primaries [ port <integer> ]  [ source ( <ipv4_address> | * ) [ port ( <integer> | * ) ] ] [ source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ] ] { ( <remote-servers> | <ipv4_address> [ port <integer> ] | <ipv6_address> [ port <integer> ] ) [ key <string> ] [ tls <string> ]; ... };
+       transfer-source ( <ipv4_address> | * ) [ port ( <integer> | * ) ];
+       transfer-source-v6 ( <ipv6_address> | * ) [ port ( <integer> | * ) ];
        zone-statistics ( full | terse | none | <boolean> );
 };

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 5776b939668d10a6245a6629405beeb423cc2555..ec18d66f4e839ec93a0f3f033b007e432d2bf477 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -909,28 +909,6 @@ typedef enum {
        optlevel_zone
 } optlevel_t;
 
-static isc_result_t
-check_dscp(const cfg_obj_t *options, isc_log_t *logctx) {
-       isc_result_t result = ISC_R_SUCCESS;
-       const cfg_obj_t *obj = NULL;
-
-       /*
-        * Check that DSCP setting is within range
-        */
-       obj = NULL;
-       (void)cfg_map_get(options, "dscp", &obj);
-       if (obj != NULL) {
-               uint32_t dscp = cfg_obj_asuint32(obj);
-               if (dscp >= 64) {
-                       cfg_obj_log(obj, logctx, ISC_LOG_ERROR,
-                                   "'dscp' out of range (0-63)");
-                       result = ISC_R_FAILURE;
-               }
-       }
-
-       return (result);
-}
-
 static isc_result_t
 check_name(const char *str) {
        dns_fixedname_t fixed;
@@ -990,7 +968,7 @@ check_listener(const cfg_obj_t *listener, const cfg_obj_t *config,
        isc_result_t tresult, result = ISC_R_SUCCESS;
        const cfg_obj_t *ltup = NULL;
        const cfg_obj_t *tlsobj = NULL, *httpobj = NULL;
-       const cfg_obj_t *portobj = NULL, *dscpobj = NULL;
+       const cfg_obj_t *portobj = NULL;
        const cfg_obj_t *http_server = NULL;
        bool do_tls = false, no_tls = false;
        dns_acl_t *acl = NULL;
@@ -1056,16 +1034,6 @@ check_listener(const cfg_obj_t *listener, const cfg_obj_t *config,
                }
        }
 
-       dscpobj = cfg_tuple_get(ltup, "dscp");
-       if (cfg_obj_isuint32(dscpobj) && cfg_obj_asuint32(dscpobj) > 63) {
-               cfg_obj_log(dscpobj, logctx, ISC_LOG_ERROR,
-                           "dscp value '%u' is out of range",
-                           cfg_obj_asuint32(dscpobj));
-               if (result == ISC_R_SUCCESS) {
-                       result = ISC_R_RANGE;
-               }
-       }
-
        tresult = cfg_acl_fromconfig(cfg_tuple_get(listener, "acl"), config,
                                     logctx, actx, mctx, 0, &acl);
        if (result == ISC_R_SUCCESS) {
@@ -1596,11 +1564,6 @@ check_options(const cfg_obj_t *options, const cfg_obj_t *config,
                }
        }
 
-       tresult = check_dscp(options, logctx);
-       if (result == ISC_R_SUCCESS && tresult != ISC_R_SUCCESS) {
-               result = tresult;
-       }
-
        obj = NULL;
        (void)cfg_map_get(options, "nta-lifetime", &obj);
        if (obj != NULL) {

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index d0236076c085ca2bdfb085bf2d6c11190fe0f3ec..d5a17497fd2cb8538dac2f294c7e5e257267d739 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -1297,7 +1297,6 @@ new_adbaddrinfo(dns_adb_t *adb, dns_adbentry_t *entry, in_port_t port) {
        *ai = (dns_adbaddrinfo_t){
                .srtt = entry->srtt,
                .flags = entry->flags,
-               .dscp = -1,
                .publink = ISC_LINK_INITIALIZER,
                .sockaddr = entry->sockaddr,
                .entry = dns_adbentry_ref(entry),

diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index 56d4ed65bb475beb0202eeb18585f2e84e01555f..9e23176b10b36bd4aaa4c5d614cd8dd41ba37b93 100644 (file)
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -426,7 +426,6 @@ dns_catz_entry_cmp(const dns_catz_entry_t *ea, const dns_catz_entry_t *eb) {
                }
        }
 
-       /* xxxwpk TODO compare dscps! */
        return (true);
 }
 
@@ -1915,7 +1914,7 @@ cleanup:
  * We have to generate a text buffer with regular zone config:
  * zone "foo.bar" {
  *     type secondary;
- *     primaries [ dscp X ] { ip1 port port1; ip2 port port2; };
+ *     primaries { ip1 port port1; ip2 port port2; };
  * }
  */
 isc_result_t
@@ -1926,7 +1925,7 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
        isc_result_t result;
        uint32_t i;
        isc_netaddr_t netaddr;
-       char pbuf[sizeof("65535")]; /* used both for port number and DSCP */
+       char pbuf[sizeof("65535")]; /* used for port number */
        char zname[DNS_NAME_FORMATSIZE];
 
        REQUIRE(DNS_CATZ_ZONE_VALID(zone));
@@ -1943,20 +1942,6 @@ dns_catz_generate_zonecfg(dns_catz_zone_t *zone, dns_catz_entry_t *entry,
        dns_name_totext(&entry->name, true, buffer);
        isc_buffer_putstr(buffer, "\" { type secondary; primaries");
 
-       /*
-        * DSCP value has no default, but when it is specified, it is
-        * identical for all primaries and cannot be overridden for a
-        * specific primary IP, so use the DSCP value set for the first
-        * primary.
-        */
-       if (entry->opts.masters.count > 0 && entry->opts.masters.dscps[0] >= 0)
-       {
-               isc_buffer_putstr(buffer, " dscp ");
-               snprintf(pbuf, sizeof(pbuf), "%hd",
-                        entry->opts.masters.dscps[0]);
-               isc_buffer_putstr(buffer, pbuf);
-       }
-
        isc_buffer_putstr(buffer, " { ");
        for (i = 0; i < entry->opts.masters.count; i++) {
                /*

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 9d2b7732af0c1fbaa286058069fd66017da1f385..00ad70eb80604a7c7fb17988b8b9556502a38eaf 100644 (file)
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -1179,15 +1179,12 @@ dispatch_allocate(dns_dispatchmgr_t *mgr, isc_socktype_t type,
 
 isc_result_t
 dns_dispatch_createtcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr,
-                      const isc_sockaddr_t *destaddr, isc_dscp_t dscp,
-                      dns_dispatch_t **dispp) {
+                      const isc_sockaddr_t *destaddr, dns_dispatch_t **dispp) {
        dns_dispatch_t *disp = NULL;
 
        REQUIRE(VALID_DISPATCHMGR(mgr));
        REQUIRE(destaddr != NULL);
 
-       UNUSED(dscp);
-
        LOCK(&mgr->lock);
 
        dispatch_allocate(mgr, isc_socktype_tcp, &disp);
@@ -2199,28 +2196,13 @@ dns_dispatch_resume(dns_dispentry_t *resp, uint16_t timeout) {
 }
 
 void
-dns_dispatch_send(dns_dispentry_t *resp, isc_region_t *r, isc_dscp_t dscp) {
+dns_dispatch_send(dns_dispentry_t *resp, isc_region_t *r) {
        REQUIRE(VALID_RESPONSE(resp));
        REQUIRE(VALID_DISPATCH(resp->disp));
-       UNUSED(dscp);
 
        dns_dispatch_t *disp = resp->disp;
        isc_nmhandle_t *sendhandle = NULL;
 
-#if 0
-       /* XXX: no DSCP support */
-       if (dscp == -1) {
-               sendevent->attributes &= ~ISC_SOCKEVENTATTR_DSCP;
-               sendevent->dscp = 0;
-       } else {
-               sendevent->attributes |= ISC_SOCKEVENTATTR_DSCP;
-               sendevent->dscp = dscp;
-               if (tcp) {
-                       isc_socket_dscp(sock, dscp);
-               }
-       }
-#endif
-
        dispentry_log(resp, LVL(90), "sending");
        switch (disp->socktype) {
        case isc_socktype_udp:

diff --git a/lib/dns/forward.c b/lib/dns/forward.c
index 270dbd41edbf53cdfa86281ab80573f679008ae4..ea91fb25a92ca3d73bd8083dee899c422b8cf27d 100644 (file)
--- a/lib/dns/forward.c
+++ b/lib/dns/forward.c
@@ -127,7 +127,6 @@ dns_fwdtable_add(dns_fwdtable_t *fwdtable, const dns_name_t *name,
        {
                fwd = isc_mem_get(fwdtable->mctx, sizeof(dns_forwarder_t));
                fwd->addr = *sa;
-               fwd->dscp = -1;
                ISC_LINK_INIT(fwd, link);
                ISC_LIST_APPEND(forwarders->fwdrs, fwd, link);
        }

diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index 7cee32f3e409887c5f1e5be31c4a05e3c2bf247f..e5cdf4711ec32eb08b0cdb8b71ce12fdd2df8639 100644 (file)
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -206,7 +206,6 @@ struct dns_adbaddrinfo {
 
        isc_sockaddr_t sockaddr; /*%< [rw] */
        unsigned int   srtt;     /*%< [rw] microsecs */
-       isc_dscp_t     dscp;
 
        unsigned int    flags; /*%< [rw] */
        dns_adbentry_t *entry; /*%< private */

diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index c740c629697aea077391aeed2712cb91338e2331..2250d2afb2cc943cc6e19414cbf37f5ff8561155 100644 (file)
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -184,8 +184,7 @@ dns_dispatch_createudp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr,
 
 isc_result_t
 dns_dispatch_createtcp(dns_dispatchmgr_t *mgr, const isc_sockaddr_t *localaddr,
-                      const isc_sockaddr_t *destaddr, isc_dscp_t dscp,
-                      dns_dispatch_t **dispp);
+                      const isc_sockaddr_t *destaddr, dns_dispatch_t **dispp);
 /*%<
  * Create a new TCP dns_dispatch.
  *
@@ -234,7 +233,7 @@ dns_dispatch_connect(dns_dispentry_t *resp);
  */
 
 void
-dns_dispatch_send(dns_dispentry_t *resp, isc_region_t *r, isc_dscp_t dscp);
+dns_dispatch_send(dns_dispentry_t *resp, isc_region_t *r);
 /*%<
  * Send region 'r' using the socket in 'resp', then run the specified
  * callback.

diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h
index a82182670427340f90df5ef7cc6010b5a386dace..f43fce789d04c68ae5fb86b352c1afb84fffca2b 100644 (file)
--- a/lib/dns/include/dns/forward.h
+++ b/lib/dns/include/dns/forward.h
@@ -25,7 +25,6 @@ ISC_LANG_BEGINDECLS
 
 struct dns_forwarder {
        isc_sockaddr_t addr;
-       isc_dscp_t     dscp;
        ISC_LINK(dns_forwarder_t) link;
 };
 

diff --git a/lib/dns/include/dns/ipkeylist.h b/lib/dns/include/dns/ipkeylist.h
index e74f293fe83a9b6cb63e10d6b5b1bc91dd2259e7..4087b173810fca849a6e76c663fc059f5e853b4c 100644 (file)
--- a/lib/dns/include/dns/ipkeylist.h
+++ b/lib/dns/include/dns/ipkeylist.h
@@ -20,12 +20,11 @@
 #include <dns/types.h>
 
 /*%
- * A structure holding a list of addresses, dscps and keys.  Used to
- * store primaries for a secondary zone, created by parsing config options.
+ * A structure holding a list of addresses and keys.  Used to store
+ * primaries for a secondary zone, created by parsing config options.
  */
 struct dns_ipkeylist {
        isc_sockaddr_t *addrs;
-       isc_dscp_t     *dscps;
        isc_sockaddr_t *sources;
        dns_name_t    **keys;
        dns_name_t    **tlss;

diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 4037386140e175436c78a1ccfce8caa75e3a8ce4..d32d0076a8b3b84ae10bfc7341d0186dc5ab068b 100644 (file)
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -206,24 +206,6 @@ dns_peer_setquerysource(dns_peer_t *peer, const isc_sockaddr_t *query_source);
 isc_result_t
 dns_peer_getquerysource(dns_peer_t *peer, isc_sockaddr_t *query_source);
 
-isc_result_t
-dns_peer_setnotifydscp(dns_peer_t *peer, isc_dscp_t dscp);
-
-isc_result_t
-dns_peer_getnotifydscp(dns_peer_t *peer, isc_dscp_t *dscpp);
-
-isc_result_t
-dns_peer_settransferdscp(dns_peer_t *peer, isc_dscp_t dscp);
-
-isc_result_t
-dns_peer_gettransferdscp(dns_peer_t *peer, isc_dscp_t *dscpp);
-
-isc_result_t
-dns_peer_setquerydscp(dns_peer_t *peer, isc_dscp_t dscp);
-
-isc_result_t
-dns_peer_getquerydscp(dns_peer_t *peer, isc_dscp_t *dscpp);
-
 isc_result_t
 dns_peer_setednsversion(dns_peer_t *peer, uint8_t ednsversion);
 

diff --git a/lib/dns/include/dns/remote.h b/lib/dns/include/dns/remote.h
index 6af58bcebd6864f2fb8376dad2e5df7263d991df..7d3a6f1fd9d64119eaaf903d881bcd8219cb63d8 100644 (file)
--- a/lib/dns/include/dns/remote.h
+++ b/lib/dns/include/dns/remote.h
@@ -33,7 +33,6 @@ struct dns_remote {
        isc_mem_t      *mctx;
        isc_sockaddr_t *addresses;
        isc_sockaddr_t *sources;
-       isc_dscp_t     *dscps;
        dns_name_t    **keynames;
        dns_name_t    **tlsnames;
        bool           *ok;
@@ -89,15 +88,15 @@ dns_remote_tlsnames(dns_remote_t *remote);
 void
 dns_remote_init(dns_remote_t *remote, unsigned int count,
                const isc_sockaddr_t *addrs, const isc_sockaddr_t *srcs,
-               const isc_dscp_t *dscp, dns_name_t **keynames,
-               dns_name_t **tlsnames, bool mark, isc_mem_t *mctx);
+               dns_name_t **keynames, dns_name_t **tlsnames, bool mark,
+               isc_mem_t *mctx);
 
 /*%<
  *     Initialize a remote server. Set the provided addresses (addrs),
- *     source addresses (srcs), dscp's (dscp), key names (keynames) and
- *     tls names (tlsnames). Use the provided memory context (mctx) for
- *     allocations. If 'mark' is 'true', set up a list of boolean values to
- *     mark the server bad or good.
+ *     source addresses (srcs), key names (keynames) and tls names
+ *     (tlsnames). Use the provided memory context (mctx) for allocations.
+ *     If 'mark' is 'true', set up a list of boolean values to mark the
+ *     server bad or good.
  *
  *     Requires:
  *             'remote' is a valid remote structure.
@@ -119,7 +118,7 @@ bool
 dns_remote_equal(dns_remote_t *a, dns_remote_t *b);
 /*%<
  *     Compare two remote servers 'a' and 'b'. Check if the address
- *     count, the addresses, the dscps, the key names and the tls names are
+ *     count, the addresses, the key names and the tls names are
  *     the same. Return 'true' if so, 'false' otherwise.
  *
  *     Requires:
@@ -177,16 +176,6 @@ dns_remote_addr(dns_remote_t *remote, unsigned int i);
  *             'remote->addresses' is not NULL.
  */
 
-isc_dscp_t
-dns_remote_dscp(dns_remote_t *remote);
-/*%<
- *     Return the current dscp. Returns -1 if we have iterated over all
- *     addresses already, or if dscps are not used.
- *
- *     Requires:
- *             'remote' is a valid remote structure.
- */
-
 dns_name_t *
 dns_remote_keyname(dns_remote_t *remote);
 /*%<

diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h
index 29624c72fc2cd4969a400a4ba8a1c9250e8e4dd7..384b82c3160a26b47983101af470a12ede16b095 100644 (file)
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -132,11 +132,10 @@ isc_result_t
 dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
                   const isc_sockaddr_t *srcaddr,
                   const isc_sockaddr_t *destaddr, dns_transport_t *transport,
-                  isc_tlsctx_cache_t *tlsctx_cache, isc_dscp_t dscp,
-                  unsigned int options, dns_tsigkey_t *key,
-                  unsigned int timeout, unsigned int udptimeout,
-                  unsigned int udpretries, isc_task_t *task,
-                  isc_taskaction_t action, void *arg,
+                  isc_tlsctx_cache_t *tlsctx_cache, unsigned int options,
+                  dns_tsigkey_t *key, unsigned int timeout,
+                  unsigned int udptimeout, unsigned int udpretries,
+                  isc_task_t *task, isc_taskaction_t action, void *arg,
                   dns_request_t **requestp);
 /*%<
  * Create and send a request.
@@ -181,10 +180,10 @@ dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf,
                      const isc_sockaddr_t *srcaddr,
                      const isc_sockaddr_t *destaddr,
                      dns_transport_t      *transport,
-                     isc_tlsctx_cache_t *tlsctx_cache, isc_dscp_t dscp,
-                     unsigned int options, unsigned int timeout,
-                     unsigned int udptimeout, unsigned int udpretries,
-                     isc_task_t *task, isc_taskaction_t action, void *arg,
+                     isc_tlsctx_cache_t *tlsctx_cache, unsigned int options,
+                     unsigned int timeout, unsigned int udptimeout,
+                     unsigned int udpretries, isc_task_t *task,
+                     isc_taskaction_t action, void *arg,
                      dns_request_t **requestp);
 /*!<
  * \brief Create and send a request.

diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index b0c8845d1b1db8e8d1df9b3b86d6d5ec985c780e..ff8397dc947d2fc215b8b96df750e3e49166ff16 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -640,23 +640,6 @@ dns_resolver_printbadcache(dns_resolver_t *resolver, FILE *fp);
  * \li resolver to be valid.
  */
 
-void
-dns_resolver_setquerydscp4(dns_resolver_t *resolver, isc_dscp_t dscp);
-isc_dscp_t
-dns_resolver_getquerydscp4(dns_resolver_t *resolver);
-
-void
-dns_resolver_setquerydscp6(dns_resolver_t *resolver, isc_dscp_t dscp);
-isc_dscp_t
-dns_resolver_getquerydscp6(dns_resolver_t *resolver);
-/*%
- * Get and set the DSCP values for the resolver's IPv4 and IPV6 query
- * sources.
- *
- * Requires:
- * \li resolver to be valid.
- */
-
 void
 dns_resolver_setmaxdepth(dns_resolver_t *resolver, unsigned int maxdepth);
 unsigned int

diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h
index 7a8c41f22a4c6d83fc72ac3cf99970fe05db9ad9..70b601bb57828f85554fe078e88794174d1ec731 100644 (file)
--- a/lib/dns/include/dns/xfrin.h
+++ b/lib/dns/include/dns/xfrin.h
@@ -50,10 +50,9 @@ ISC_LANG_BEGINDECLS
 isc_result_t
 dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
                 const isc_sockaddr_t *primaryaddr,
-                const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp,
-                dns_tsigkey_t *tsigkey, dns_transport_t *transport,
-                isc_tlsctx_cache_t *tlsctx_cache, isc_mem_t *mctx,
-                isc_nm_t *netmgr, dns_xfrindone_t done,
+                const isc_sockaddr_t *sourceaddr, dns_tsigkey_t *tsigkey,
+                dns_transport_t *transport, isc_tlsctx_cache_t *tlsctx_cache,
+                isc_mem_t *mctx, isc_nm_t *netmgr, dns_xfrindone_t done,
                 dns_xfrin_ctx_t **xfrp);
 /*%<
  * Attempt to start an incoming zone transfer of 'zone'

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 5faf95f8be5720a2cf1639225d6ec8effc025fdd..c70446b85f6b025db30497ee621e3c7790bfcf18 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -677,9 +677,8 @@ dns_zone_setparentals(dns_zone_t *zone, isc_sockaddr_t *addresses,
 
 void
 dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *addresses,
-                      isc_sockaddr_t *sources, isc_dscp_t *dscps,
-                      dns_name_t **keynames, dns_name_t **tlsnames,
-                      uint32_t count);
+                      isc_sockaddr_t *sources, dns_name_t **keynames,
+                      dns_name_t **tlsnames, uint32_t count);
 /*%<
  *     Set the list of additional servers to be notified when
  *     a zone changes.  To clear the list use 'count = 0'.
@@ -825,27 +824,6 @@ dns_zone_getxfrsource4(dns_zone_t *zone);
  *\li  'zone' to be a valid zone.
  */
 
-isc_result_t
-dns_zone_setxfrsource4dscp(dns_zone_t *zone, isc_dscp_t dscp);
-/*%<
- * Set the DSCP value associated with the transfer source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- *
- * Returns:
- *\li  #ISC_R_SUCCESS
- */
-
-isc_dscp_t
-dns_zone_getxfrsource4dscp(dns_zone_t *zone);
-/*%/
- * Get the DSCP value associated with the transfer source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- */
-
 isc_result_t
 dns_zone_setxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *xfrsource);
 /*%<
@@ -869,27 +847,6 @@ dns_zone_getxfrsource6(dns_zone_t *zone);
  *\li  'zone' to be a valid zone.
  */
 
-isc_dscp_t
-dns_zone_getxfrsource6dscp(dns_zone_t *zone);
-/*%/
- * Get the DSCP value associated with the transfer source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- */
-
-isc_result_t
-dns_zone_setxfrsource6dscp(dns_zone_t *zone, isc_dscp_t dscp);
-/*%<
- * Set the DSCP value associated with the transfer source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- *
- * Returns:
- *\li  #ISC_R_SUCCESS
- */
-
 isc_result_t
 dns_zone_setparentalsrc4(dns_zone_t *zone, const isc_sockaddr_t *parentalsrc);
 /*%<
@@ -913,27 +870,6 @@ dns_zone_getparentalsrc4(dns_zone_t *zone);
  *\li  'zone' to be a valid zone.
  */
 
-isc_dscp_t
-dns_zone_getparentalsrc4dscp(dns_zone_t *zone);
-/*%/
- * Get the DSCP value associated with the IPv4 parental source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- */
-
-isc_result_t
-dns_zone_setparentalsrc4dscp(dns_zone_t *zone, isc_dscp_t dscp);
-/*%<
- * Set the DSCP value associated with the IPv4 parental source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- *
- * Returns:
- *\li  #ISC_R_SUCCESS
- */
-
 isc_result_t
 dns_zone_setparentalsrc6(dns_zone_t *zone, const isc_sockaddr_t *parentalsrc);
 /*%<
@@ -957,27 +893,6 @@ dns_zone_getparentalsrc6(dns_zone_t *zone);
  *\li  'zone' to be a valid zone.
  */
 
-isc_dscp_t
-dns_zone_getparentalsrc6dscp(dns_zone_t *zone);
-/*%/
- * Get the DSCP value associated with the IPv6 parental source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- */
-
-isc_result_t
-dns_zone_setparentalsrc6dscp(dns_zone_t *zone, isc_dscp_t dscp);
-/*%<
- * Set the DSCP value associated with the IPv6 parental source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- *
- * Returns:
- *\li  #ISC_R_SUCCESS
- */
-
 isc_result_t
 dns_zone_setnotifysrc4(dns_zone_t *zone, const isc_sockaddr_t *notifysrc);
 /*%<
@@ -1001,27 +916,6 @@ dns_zone_getnotifysrc4(dns_zone_t *zone);
  *\li  'zone' to be a valid zone.
  */
 
-isc_dscp_t
-dns_zone_getnotifysrc4dscp(dns_zone_t *zone);
-/*%/
- * Get the DSCP value associated with the IPv4 notify source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- */
-
-isc_result_t
-dns_zone_setnotifysrc4dscp(dns_zone_t *zone, isc_dscp_t dscp);
-/*%<
- * Set the DSCP value associated with the IPv4 notify source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- *
- * Returns:
- *\li  #ISC_R_SUCCESS
- */
-
 isc_result_t
 dns_zone_setnotifysrc6(dns_zone_t *zone, const isc_sockaddr_t *notifysrc);
 /*%<
@@ -1045,27 +939,6 @@ dns_zone_getnotifysrc6(dns_zone_t *zone);
  *\li  'zone' to be a valid zone.
  */
 
-isc_dscp_t
-dns_zone_getnotifysrc6dscp(dns_zone_t *zone);
-/*%/
- * Get the DSCP value associated with the IPv6 notify source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- */
-
-isc_result_t
-dns_zone_setnotifysrc6dscp(dns_zone_t *zone, isc_dscp_t dscp);
-/*%<
- * Set the DSCP value associated with the IPv6 notify source.
- *
- * Require:
- *\li  'zone' to be a valid zone.
- *
- * Returns:
- *\li  #ISC_R_SUCCESS
- */
-
 void
 dns_zone_setnotifyacl(dns_zone_t *zone, dns_acl_t *acl);
 /*%<

diff --git a/lib/dns/ipkeylist.c b/lib/dns/ipkeylist.c
index b12656b3189c179342e4b75e54d7a5ec1ad84cb8..068a90cc1fc7811ae31f502118a3f77e806aecd2 100644 (file)
--- a/lib/dns/ipkeylist.c
+++ b/lib/dns/ipkeylist.c
@@ -27,7 +27,6 @@ dns_ipkeylist_init(dns_ipkeylist_t *ipkl) {
        ipkl->allocated = 0;
        ipkl->addrs = NULL;
        ipkl->sources = NULL;
-       ipkl->dscps = NULL;
        ipkl->keys = NULL;
        ipkl->tlss = NULL;
        ipkl->labels = NULL;
@@ -53,11 +52,6 @@ dns_ipkeylist_clear(isc_mem_t *mctx, dns_ipkeylist_t *ipkl) {
                            ipkl->allocated * sizeof(isc_sockaddr_t));
        }
 
-       if (ipkl->dscps != NULL) {
-               isc_mem_put(mctx, ipkl->dscps,
-                           ipkl->allocated * sizeof(isc_dscp_t));
-       }
-
        if (ipkl->addrs != NULL) {
                isc_mem_put(mctx, ipkl->addrs,
                            ipkl->allocated * sizeof(isc_sockaddr_t));
@@ -134,11 +128,6 @@ dns_ipkeylist_copy(isc_mem_t *mctx, const dns_ipkeylist_t *src,
                        src->count * sizeof(isc_sockaddr_t));
        }
 
-       if (src->dscps != NULL) {
-               memmove(dst->dscps, src->dscps,
-                       src->count * sizeof(isc_dscp_t));
-       }
-
        if (src->keys != NULL) {
                for (i = 0; i < src->count; i++) {
                        if (src->keys[i] != NULL) {
@@ -186,7 +175,6 @@ isc_result_t
 dns_ipkeylist_resize(isc_mem_t *mctx, dns_ipkeylist_t *ipkl, unsigned int n) {
        isc_sockaddr_t *addrs = NULL;
        isc_sockaddr_t *sources = NULL;
-       isc_dscp_t *dscps = NULL;
        dns_name_t **keys = NULL;
        dns_name_t **tlss = NULL;
        dns_name_t **labels = NULL;
@@ -200,7 +188,6 @@ dns_ipkeylist_resize(isc_mem_t *mctx, dns_ipkeylist_t *ipkl, unsigned int n) {
 
        addrs = isc_mem_get(mctx, n * sizeof(isc_sockaddr_t));
        sources = isc_mem_get(mctx, n * sizeof(isc_sockaddr_t));
-       dscps = isc_mem_get(mctx, n * sizeof(isc_dscp_t));
        keys = isc_mem_get(mctx, n * sizeof(dns_name_t *));
        tlss = isc_mem_get(mctx, n * sizeof(dns_name_t *));
        labels = isc_mem_get(mctx, n * sizeof(dns_name_t *));
@@ -225,16 +212,6 @@ dns_ipkeylist_resize(isc_mem_t *mctx, dns_ipkeylist_t *ipkl, unsigned int n) {
        memset(&ipkl->sources[ipkl->allocated], 0,
               (n - ipkl->allocated) * sizeof(isc_sockaddr_t));
 
-       if (ipkl->dscps != NULL) {
-               memmove(dscps, ipkl->dscps,
-                       ipkl->allocated * sizeof(isc_dscp_t));
-               isc_mem_put(mctx, ipkl->dscps,
-                           ipkl->allocated * sizeof(isc_dscp_t));
-       }
-       ipkl->dscps = dscps;
-       memset(&ipkl->dscps[ipkl->allocated], 0,
-              (n - ipkl->allocated) * sizeof(isc_dscp_t));
-
        if (ipkl->keys) {
                memmove(keys, ipkl->keys,
                        ipkl->allocated * sizeof(dns_name_t *));
@@ -270,7 +247,6 @@ dns_ipkeylist_resize(isc_mem_t *mctx, dns_ipkeylist_t *ipkl, unsigned int n) {
 
        isc_mem_put(mctx, addrs, n * sizeof(isc_sockaddr_t));
        isc_mem_put(mctx, sources, n * sizeof(isc_sockaddr_t));
-       isc_mem_put(mctx, dscps, n * sizeof(isc_dscp_t));
        isc_mem_put(mctx, tlss, n * sizeof(dns_name_t *));
        isc_mem_put(mctx, keys, n * sizeof(dns_name_t *));
        isc_mem_put(mctx, labels, n * sizeof(dns_name_t *));

diff --git a/lib/dns/peer.c b/lib/dns/peer.c
index 3f2c4c0c2edaae71b514ba36816360c20c0051c1..c2f1d14dfae415adb7605c74d3e32df9c5930fa3 100644 (file)
--- a/lib/dns/peer.c
+++ b/lib/dns/peer.c
@@ -63,11 +63,8 @@ struct dns_peer {
        bool check_axfr_id;
        dns_name_t *key;
        isc_sockaddr_t *transfer_source;
-       isc_dscp_t transfer_dscp;
        isc_sockaddr_t *notify_source;
-       isc_dscp_t notify_dscp;
        isc_sockaddr_t *query_source;
-       isc_dscp_t query_dscp;
        uint16_t udpsize;    /* receive size */
        uint16_t maxudp;     /* transmit size */
        uint16_t padding;    /* pad block size */
@@ -91,15 +88,12 @@ struct dns_peer {
 #define SERVER_MAXUDP_BIT         7
 #define REQUEST_NSID_BIT          8
 #define SEND_COOKIE_BIT                   9
-#define NOTIFY_DSCP_BIT                   10
-#define TRANSFER_DSCP_BIT         11
-#define QUERY_DSCP_BIT            12
-#define REQUEST_EXPIRE_BIT        13
-#define EDNS_VERSION_BIT          14
-#define FORCE_TCP_BIT             15
-#define SERVER_PADDING_BIT        16
-#define REQUEST_TCP_KEEPALIVE_BIT  17
-#define REQUIRE_COOKIE_BIT        18
+#define REQUEST_EXPIRE_BIT        10
+#define EDNS_VERSION_BIT          11
+#define FORCE_TCP_BIT             12
+#define SERVER_PADDING_BIT        13
+#define REQUEST_TCP_KEEPALIVE_BIT  14
+#define REQUIRE_COOKIE_BIT        15
 
 static void
 peerlist_delete(dns_peerlist_t **list);
@@ -464,30 +458,6 @@ ACCESS_SOCKADDR(transfersource, transfer_source)
 
 ACCESS_OPTION_OVERWRITE(ednsversion, EDNS_VERSION_BIT, uint8_t, ednsversion)
 
-#define ACCESS_OPTION_OVERWRITEDSCP(name, macro, type, element)          \
-       isc_result_t dns_peer_get##name(dns_peer_t *peer, type *value) { \
-               REQUIRE(DNS_PEER_VALID(peer));                           \
-               REQUIRE(value != NULL);                                  \
-               if (DNS_BIT_CHECK(macro, &peer->bitflags)) {             \
-                       *value = peer->element;                          \
-                       return (ISC_R_SUCCESS);                          \
-               } else {                                                 \
-                       return (ISC_R_NOTFOUND);                         \
-               }                                                        \
-       }                                                                \
-       isc_result_t dns_peer_set##name(dns_peer_t *peer, type value) {  \
-               REQUIRE(DNS_PEER_VALID(peer));                           \
-               REQUIRE(value < 64);                                     \
-               peer->element = value;                                   \
-               DNS_BIT_SET(macro, &peer->bitflags);                     \
-               return (ISC_R_SUCCESS);                                  \
-       }
-ACCESS_OPTION_OVERWRITEDSCP(notifydscp, NOTIFY_DSCP_BIT, isc_dscp_t,
-                           notify_dscp)
-ACCESS_OPTION_OVERWRITEDSCP(querydscp, QUERY_DSCP_BIT, isc_dscp_t, query_dscp)
-ACCESS_OPTION_OVERWRITEDSCP(transferdscp, TRANSFER_DSCP_BIT, isc_dscp_t,
-                           transfer_dscp)
-
 isc_result_t
 dns_peer_getkey(dns_peer_t *peer, dns_name_t **retval) {
        REQUIRE(DNS_PEER_VALID(peer));

diff --git a/lib/dns/remote.c b/lib/dns/remote.c
index 4a7132284e91ba0aea651d8a658bce94a56fee9c..38175b0ae383d7f577939808079e8bf32e322575 100644 (file)
--- a/lib/dns/remote.c
+++ b/lib/dns/remote.c
@@ -58,8 +58,8 @@ dns_remote_tlsnames(dns_remote_t *remote) {
 void
 dns_remote_init(dns_remote_t *remote, unsigned int count,
                const isc_sockaddr_t *addrs, const isc_sockaddr_t *srcs,
-               const isc_dscp_t *dscp, dns_name_t **keynames,
-               dns_name_t **tlsnames, bool mark, isc_mem_t *mctx) {
+               dns_name_t **keynames, dns_name_t **tlsnames, bool mark,
+               isc_mem_t *mctx) {
        unsigned int i;
 
        REQUIRE(DNS_REMOTE_VALID(remote));
@@ -88,13 +88,6 @@ dns_remote_init(dns_remote_t *remote, unsigned int count,
                remote->sources = NULL;
        }
 
-       if (dscp != NULL) {
-               remote->dscps = isc_mem_get(mctx, count * sizeof(isc_dscp_t));
-               memmove(remote->dscps, dscp, count * sizeof(isc_dscp_t));
-       } else {
-               remote->dscps = NULL;
-       }
-
        if (keynames != NULL) {
                remote->keynames = isc_mem_get(mctx,
                                               count * sizeof(keynames[0]));
@@ -191,25 +184,6 @@ same_names(dns_name_t *const *oldlist, dns_name_t *const *newlist,
        return (true);
 }
 
-static bool
-same_dscp(isc_dscp_t *oldlist, isc_dscp_t *newlist, uint32_t count) {
-       unsigned int i;
-
-       if (oldlist == NULL && newlist == NULL) {
-               return (true);
-       }
-       if (oldlist == NULL || newlist == NULL) {
-               return (false);
-       }
-
-       for (i = 0; i < count; i++) {
-               if (oldlist[i] != newlist[i]) {
-                       return (false);
-               }
-       }
-       return (true);
-}
-
 void
 dns_remote_clear(dns_remote_t *remote) {
        unsigned int count;
@@ -241,11 +215,6 @@ dns_remote_clear(dns_remote_t *remote) {
                remote->sources = NULL;
        }
 
-       if (remote->dscps != NULL) {
-               isc_mem_put(mctx, remote->dscps, count * sizeof(isc_dscp_t));
-               remote->dscps = NULL;
-       }
-
        if (remote->keynames != NULL) {
                unsigned int i;
                for (i = 0; i < count; i++) {
@@ -293,10 +262,6 @@ dns_remote_equal(dns_remote_t *a, dns_remote_t *b) {
        if (!same_addrs(a->addresses, b->addresses, a->addrcnt)) {
                return (false);
        }
-       if (!same_dscp(a->dscps, b->dscps, a->addrcnt)) {
-               return (false);
-       }
-
        if (!same_names(a->keynames, b->keynames, a->addrcnt)) {
                return (false);
        }
@@ -347,20 +312,6 @@ dns_remote_sourceaddr(dns_remote_t *remote) {
        return (remote->sources[remote->curraddr]);
 }
 
-isc_dscp_t
-dns_remote_dscp(dns_remote_t *remote) {
-       REQUIRE(DNS_REMOTE_VALID(remote));
-
-       if (remote->dscps == NULL) {
-               return -1;
-       }
-       if (remote->curraddr >= remote->addrcnt) {
-               return -1;
-       }
-
-       return (remote->dscps[remote->curraddr]);
-}
-
 dns_name_t *
 dns_remote_keyname(dns_remote_t *remote) {
        REQUIRE(DNS_REMOTE_VALID(remote));

diff --git a/lib/dns/request.c b/lib/dns/request.c
index 24b3def175e0059ead262d5bd49b007afa8e0292..198fb4724661f3418c0129ed3c4cd3f2fce234f3 100644 (file)
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -84,7 +84,6 @@ struct dns_request {
        isc_sockaddr_t destaddr;
        unsigned int timeout;
        unsigned int udpcount;
-       isc_dscp_t dscp;
 };
 
 #define DNS_REQUEST_F_CONNECTING 0x0001
@@ -292,7 +291,7 @@ req_send(dns_request_t *request) {
 
        /* detached in req_senddone() */
        req_attach(request, &(dns_request_t *){ NULL });
-       dns_dispatch_send(request->dispentry, &r, request->dscp);
+       dns_dispatch_send(request->dispentry, &r);
 }
 
 static isc_result_t
@@ -300,7 +299,7 @@ new_request(isc_mem_t *mctx, dns_request_t **requestp) {
        dns_request_t *request = NULL;
 
        request = isc_mem_get(mctx, sizeof(*request));
-       *request = (dns_request_t){ .dscp = -1 };
+       *request = (dns_request_t){ 0 };
        ISC_LINK_INIT(request, link);
 
        isc_refcount_init(&request->references, 1);
@@ -339,7 +338,7 @@ isblackholed(dns_dispatchmgr_t *dispatchmgr, const isc_sockaddr_t *destaddr) {
 static isc_result_t
 tcp_dispatch(bool newtcp, dns_requestmgr_t *requestmgr,
             const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *destaddr,
-            isc_dscp_t dscp, dns_dispatch_t **dispatchp) {
+            dns_dispatch_t **dispatchp) {
        isc_result_t result;
 
        if (!newtcp) {
@@ -356,7 +355,7 @@ tcp_dispatch(bool newtcp, dns_requestmgr_t *requestmgr,
        }
 
        result = dns_dispatch_createtcp(requestmgr->dispatchmgr, srcaddr,
-                                       destaddr, dscp, dispatchp);
+                                       destaddr, dispatchp);
        return (result);
 }
 
@@ -392,12 +391,12 @@ udp_dispatch(dns_requestmgr_t *requestmgr, const isc_sockaddr_t *srcaddr,
 static isc_result_t
 get_dispatch(bool tcp, bool newtcp, dns_requestmgr_t *requestmgr,
             const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *destaddr,
-            isc_dscp_t dscp, dns_dispatch_t **dispatchp) {
+            dns_dispatch_t **dispatchp) {
        isc_result_t result;
 
        if (tcp) {
                result = tcp_dispatch(newtcp, requestmgr, srcaddr, destaddr,
-                                     dscp, dispatchp);
+                                     dispatchp);
        } else {
                result = udp_dispatch(requestmgr, srcaddr, destaddr, dispatchp);
        }
@@ -409,10 +408,10 @@ dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf,
                      const isc_sockaddr_t *srcaddr,
                      const isc_sockaddr_t *destaddr,
                      dns_transport_t *transport,
-                     isc_tlsctx_cache_t *tlsctx_cache, isc_dscp_t dscp,
-                     unsigned int options, unsigned int timeout,
-                     unsigned int udptimeout, unsigned int udpretries,
-                     isc_task_t *task, isc_taskaction_t action, void *arg,
+                     isc_tlsctx_cache_t *tlsctx_cache, unsigned int options,
+                     unsigned int timeout, unsigned int udptimeout,
+                     unsigned int udpretries, isc_task_t *task,
+                     isc_taskaction_t action, void *arg,
                      dns_request_t **requestp) {
        dns_request_t *request = NULL;
        isc_result_t result;
@@ -453,7 +452,6 @@ dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf,
        }
 
        request->udpcount = udpretries;
-       request->dscp = dscp;
 
        request->event = (dns_requestevent_t *)isc_event_allocate(
                mctx, task, DNS_EVENT_REQUESTDONE, action, arg,
@@ -493,7 +491,7 @@ dns_request_createraw(dns_requestmgr_t *requestmgr, isc_buffer_t *msgbuf,
 
 again:
 
-       result = get_dispatch(tcp, newtcp, requestmgr, srcaddr, destaddr, dscp,
+       result = get_dispatch(tcp, newtcp, requestmgr, srcaddr, destaddr,
                              &request->dispatch);
        if (result != ISC_R_SUCCESS) {
                goto detach;
@@ -567,11 +565,10 @@ isc_result_t
 dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
                   const isc_sockaddr_t *srcaddr,
                   const isc_sockaddr_t *destaddr, dns_transport_t *transport,
-                  isc_tlsctx_cache_t *tlsctx_cache, isc_dscp_t dscp,
-                  unsigned int options, dns_tsigkey_t *key,
-                  unsigned int timeout, unsigned int udptimeout,
-                  unsigned int udpretries, isc_task_t *task,
-                  isc_taskaction_t action, void *arg,
+                  isc_tlsctx_cache_t *tlsctx_cache, unsigned int options,
+                  dns_tsigkey_t *key, unsigned int timeout,
+                  unsigned int udptimeout, unsigned int udpretries,
+                  isc_task_t *task, isc_taskaction_t action, void *arg,
                   dns_request_t **requestp) {
        dns_request_t *request = NULL;
        isc_result_t result;
@@ -613,7 +610,6 @@ dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
        }
 
        request->udpcount = udpretries;
-       request->dscp = dscp;
 
        request->event = (dns_requestevent_t *)isc_event_allocate(
                mctx, task, DNS_EVENT_REQUESTDONE, action, arg,
@@ -649,7 +645,7 @@ dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
        req_attach(request, &(dns_request_t *){ NULL });
 
 again:
-       result = get_dispatch(tcp, false, requestmgr, srcaddr, destaddr, dscp,
+       result = get_dispatch(tcp, false, requestmgr, srcaddr, destaddr,
                              &request->dispatch);
        if (result != ISC_R_SUCCESS) {
                goto detach;

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index f5da36305aa4c4960cf193ec545b853ca54523cb..973337f2ac9f8ddc07c43264d7d7df825921fd72 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -259,7 +259,6 @@ typedef struct query {
        isc_buffer_t buffer;
        isc_buffer_t *tsig;
        dns_tsigkey_t *tsigkey;
-       isc_dscp_t dscp;
        int ednsversion;
        unsigned int options;
        unsigned int attributes;
@@ -552,8 +551,6 @@ struct dns_resolver {
        dns_dispatchmgr_t *dispatchmgr;
        dns_dispatchset_t *dispatches4;
        dns_dispatchset_t *dispatches6;
-       isc_dscp_t querydscp4;
-       isc_dscp_t querydscp6;
 
        isc_hashmap_t *fctxs;
        isc_mutex_t fctxs_lock;
@@ -2137,7 +2134,6 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
        isc_sockaddr_t addr;
        bool have_addr = false;
        unsigned int srtt;
-       isc_dscp_t dscp = -1;
 
        FCTXTRACE("query");
 
@@ -2172,7 +2168,6 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
 
        query = isc_mem_get(fctx->mctx, sizeof(*query));
        *query = (resquery_t){ .options = options,
-                              .dscp = addrinfo->dscp,
                               .addrinfo = addrinfo,
                               .dispatchmgr = res->dispatchmgr };
 
@@ -2208,10 +2203,6 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
                        if (result == ISC_R_SUCCESS) {
                                have_addr = true;
                        }
-                       result = dns_peer_getquerydscp(peer, &dscp);
-                       if (result == ISC_R_SUCCESS) {
-                               query->dscp = dscp;
-                       }
                        result = dns_peer_getforcetcp(peer, &usetcp);
                        if (result == ISC_R_SUCCESS && usetcp) {
                                query->options |= DNS_FETCHOPT_TCP;
@@ -2219,7 +2210,6 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
                }
        }
 
-       dscp = -1;
        if ((query->options & DNS_FETCHOPT_TCP) != 0) {
                int pf;
 
@@ -2229,12 +2219,10 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
                        case PF_INET:
                                result = dns_dispatch_getlocaladdress(
                                        res->dispatches4->dispatches[0], &addr);
-                               dscp = dns_resolver_getquerydscp4(fctx->res);
                                break;
                        case PF_INET6:
                                result = dns_dispatch_getlocaladdress(
                                        res->dispatches6->dispatches[0], &addr);
-                               dscp = dns_resolver_getquerydscp6(fctx->res);
                                break;
                        default:
                                result = ISC_R_NOTIMPLEMENTED;
@@ -2245,13 +2233,10 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
                        }
                }
                isc_sockaddr_setport(&addr, 0);
-               if (query->dscp == -1) {
-                       query->dscp = dscp;
-               }
 
                result = dns_dispatch_createtcp(res->dispatchmgr, &addr,
                                                &addrinfo->sockaddr,
-                                               query->dscp, &query->dispatch);
+                                               &query->dispatch);
                if (result != ISC_R_SUCCESS) {
                        goto cleanup_query;
                }
@@ -2259,17 +2244,6 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
                FCTXTRACE("connecting via TCP");
        } else {
                if (have_addr) {
-                       switch (isc_sockaddr_pf(&addr)) {
-                       case AF_INET:
-                               dscp = dns_resolver_getquerydscp4(fctx->res);
-                               break;
-                       case AF_INET6:
-                               dscp = dns_resolver_getquerydscp6(fctx->res);
-                               break;
-                       default:
-                               result = ISC_R_NOTIMPLEMENTED;
-                               goto cleanup_query;
-                       }
                        result = dns_dispatch_createudp(res->dispatchmgr, &addr,
                                                        &query->dispatch);
                        if (result != ISC_R_SUCCESS) {
@@ -2281,13 +2255,11 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
                                dns_dispatch_attach(
                                        dns_resolver_dispatchv4(res),
                                        &query->dispatch);
-                               dscp = dns_resolver_getquerydscp4(fctx->res);
                                break;
                        case PF_INET6:
                                dns_dispatch_attach(
                                        dns_resolver_dispatchv6(res),
                                        &query->dispatch);
-                               dscp = dns_resolver_getquerydscp6(fctx->res);
                                break;
                        default:
                                result = ISC_R_NOTIMPLEMENTED;
@@ -2295,9 +2267,6 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
                        }
                }
 
-               if (query->dscp == -1) {
-                       query->dscp = dscp;
-               }
                /*
                 * We should always have a valid dispatcher here.  If we
                 * don't support a protocol family, then its dispatcher
@@ -2914,7 +2883,7 @@ resquery_send(resquery_t *query) {
        isc_buffer_usedregion(&buffer, &r);
 
        resquery_ref(query);
-       dns_dispatch_send(query->dispentry, &r, query->dscp);
+       dns_dispatch_send(query->dispentry, &r);
 
        QTRACE("sent");
 
@@ -3710,7 +3679,6 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) {
                if (result == ISC_R_SUCCESS) {
                        dns_adbaddrinfo_t *cur;
                        ai->flags |= FCTX_ADDRINFO_FORWARDER;
-                       ai->dscp = fwd->dscp;
                        cur = ISC_LIST_HEAD(fctx->forwaddrs);
                        while (cur != NULL && cur->srtt < ai->srtt) {
                                cur = ISC_LIST_NEXT(cur, publink);
@@ -10163,8 +10131,6 @@ dns_resolver_create(dns_view_t *view, isc_loopmgr_t *loopmgr,
                .maxdepth = DEFAULT_RECURSION_DEPTH,
                .maxqueries = DEFAULT_MAX_QUERIES,
                .ntasks = isc_loopmgr_nloops(loopmgr),
-               .querydscp4 = -1,
-               .querydscp6 = -1,
                .alternates = ISC_LIST_INITIALIZER,
        };
 
@@ -11306,32 +11272,6 @@ dns_resolver_settimeout(dns_resolver_t *resolver, unsigned int timeout) {
        resolver->query_timeout = timeout;
 }
 
-void
-dns_resolver_setquerydscp4(dns_resolver_t *resolver, isc_dscp_t dscp) {
-       REQUIRE(VALID_RESOLVER(resolver));
-
-       resolver->querydscp4 = dscp;
-}
-
-isc_dscp_t
-dns_resolver_getquerydscp4(dns_resolver_t *resolver) {
-       REQUIRE(VALID_RESOLVER(resolver));
-       return (resolver->querydscp4);
-}
-
-void
-dns_resolver_setquerydscp6(dns_resolver_t *resolver, isc_dscp_t dscp) {
-       REQUIRE(VALID_RESOLVER(resolver));
-
-       resolver->querydscp6 = dscp;
-}
-
-isc_dscp_t
-dns_resolver_getquerydscp6(dns_resolver_t *resolver) {
-       REQUIRE(VALID_RESOLVER(resolver));
-       return (resolver->querydscp6);
-}
-
 void
 dns_resolver_setmaxdepth(dns_resolver_t *resolver, unsigned int maxdepth) {
        REQUIRE(VALID_RESOLVER(resolver));

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index ff1e524c0fd76bdab64abe6500cfb0fd896dec5f..b2ed51b8e41c8fd16595c4a3bfd07c61c5ef75a6 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -120,7 +120,6 @@ struct dns_xfrin_ctx {
         * may differ due to IXFR->AXFR fallback.
         */
        dns_rdatatype_t reqtype;
-       isc_dscp_t dscp;
 
        isc_sockaddr_t primaryaddr;
        isc_sockaddr_t sourceaddr;
@@ -200,9 +199,9 @@ static void
 xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_nm_t *netmgr,
             dns_name_t *zonename, dns_rdataclass_t rdclass,
             dns_rdatatype_t reqtype, const isc_sockaddr_t *primaryaddr,
-            const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp,
-            dns_tsigkey_t *tsigkey, dns_transport_t *transport,
-            isc_tlsctx_cache_t *tlsctx_cache, dns_xfrin_ctx_t **xfrp);
+            const isc_sockaddr_t *sourceaddr, dns_tsigkey_t *tsigkey,
+            dns_transport_t *transport, isc_tlsctx_cache_t *tlsctx_cache,
+            dns_xfrin_ctx_t **xfrp);
 
 static isc_result_t
 axfr_init(dns_xfrin_ctx_t *xfr);
@@ -695,10 +694,9 @@ failure:
 isc_result_t
 dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
                 const isc_sockaddr_t *primaryaddr,
-                const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp,
-                dns_tsigkey_t *tsigkey, dns_transport_t *transport,
-                isc_tlsctx_cache_t *tlsctx_cache, isc_mem_t *mctx,
-                isc_nm_t *netmgr, dns_xfrindone_t done,
+                const isc_sockaddr_t *sourceaddr, dns_tsigkey_t *tsigkey,
+                dns_transport_t *transport, isc_tlsctx_cache_t *tlsctx_cache,
+                isc_mem_t *mctx, isc_nm_t *netmgr, dns_xfrindone_t done,
                 dns_xfrin_ctx_t **xfrp) {
        dns_name_t *zonename = dns_zone_getorigin(zone);
        dns_xfrin_ctx_t *xfr = NULL;
@@ -716,7 +714,7 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
        }
 
        xfrin_create(mctx, zone, db, netmgr, zonename, dns_zone_getclass(zone),
-                    xfrtype, primaryaddr, sourceaddr, dscp, tsigkey, transport,
+                    xfrtype, primaryaddr, sourceaddr, tsigkey, transport,
                     tlsctx_cache, &xfr);
 
        if (db != NULL) {
@@ -864,9 +862,9 @@ static void
 xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_nm_t *netmgr,
             dns_name_t *zonename, dns_rdataclass_t rdclass,
             dns_rdatatype_t reqtype, const isc_sockaddr_t *primaryaddr,
-            const isc_sockaddr_t *sourceaddr, isc_dscp_t dscp,
-            dns_tsigkey_t *tsigkey, dns_transport_t *transport,
-            isc_tlsctx_cache_t *tlsctx_cache, dns_xfrin_ctx_t **xfrp) {
+            const isc_sockaddr_t *sourceaddr, dns_tsigkey_t *tsigkey,
+            dns_transport_t *transport, isc_tlsctx_cache_t *tlsctx_cache,
+            dns_xfrin_ctx_t **xfrp) {
        dns_xfrin_ctx_t *xfr = NULL;
 
        xfr = isc_mem_get(mctx, sizeof(*xfr));
@@ -874,7 +872,6 @@ xfrin_create(isc_mem_t *mctx, dns_zone_t *zone, dns_db_t *db, isc_nm_t *netmgr,
                                  .shutdown_result = ISC_R_UNSET,
                                  .rdclass = rdclass,
                                  .reqtype = reqtype,
-                                 .dscp = dscp,
                                  .id = (dns_messageid_t)isc_random16(),
                                  .maxrecords = dns_zone_getmaxrecords(zone),
                                  .primaryaddr = *primaryaddr,
@@ -1043,7 +1040,6 @@ xfrin_connect_done(isc_nmhandle_t *handle, isc_result_t result, void *cbarg) {
        xfr->handle = handle;
        sockaddr = isc_nmhandle_peeraddr(handle);
        isc_sockaddr_format(&sockaddr, sourcetext, sizeof(sourcetext));
-       /* TODO set DSCP */
 
        if (xfr->tsigkey != NULL && xfr->tsigkey->key != NULL) {
                dns_name_format(dst_key_name(xfr->tsigkey->key), signerbuf,

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index cd471738daba608bafa0c2b7d612de8843c64cfa..28aeb00e04723bbd1cb02e16fe3c92d3d3a6f71b 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -335,12 +335,6 @@ struct dns_zone {
        isc_sockaddr_t xfrsource4;
        isc_sockaddr_t xfrsource6;
        isc_sockaddr_t sourceaddr;
-       isc_dscp_t notifysrc4dscp;
-       isc_dscp_t notifysrc6dscp;
-       isc_dscp_t parentalsrc4dscp;
-       isc_dscp_t parentalsrc6dscp;
-       isc_dscp_t xfrsource4dscp;
-       isc_dscp_t xfrsource6dscp;
 
        dns_xfrin_ctx_t *xfr;       /* task locked */
        dns_tsigkey_t *tsigkey;     /* key used for xfr */
@@ -668,7 +662,6 @@ struct dns_notify {
        isc_sockaddr_t dst;
        dns_tsigkey_t *key;
        dns_transport_t *transport;
-       isc_dscp_t dscp;
        ISC_LINK(dns_notify_t) link;
        isc_event_t *event;
 };
@@ -689,7 +682,6 @@ struct dns_checkds {
        isc_sockaddr_t dst;
        dns_tsigkey_t *key;
        dns_transport_t *transport;
-       isc_dscp_t dscp;
        ISC_LINK(dns_checkds_t) link;
        isc_event_t *event;
 };
@@ -1070,7 +1062,6 @@ struct ssevent {
 struct stub_cb_args {
        dns_stub_t *stub;
        dns_tsigkey_t *tsig_key;
-       isc_dscp_t dscp;
        uint16_t udpsize;
        int timeout;
        bool reqnsid;
@@ -1118,12 +1109,6 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx, unsigned int tid) {
                .check_names = dns_severity_ignore,
                .idlein = DNS_DEFAULT_IDLEIN,
                .idleout = DNS_DEFAULT_IDLEOUT,
-               .notifysrc4dscp = -1,
-               .notifysrc6dscp = -1,
-               .parentalsrc4dscp = -1,
-               .parentalsrc6dscp = -1,
-               .xfrsource4dscp = -1,
-               .xfrsource6dscp = -1,
                .maxxfrin = MAX_XFER_TIME,
                .maxxfrout = MAX_XFER_TIME,
                .sigvalidityinterval = 30 * 24 * 3600,
@@ -1363,7 +1348,7 @@ zone_free(dns_zone_t *zone) {
 
        dns_zone_setparentals(zone, NULL, NULL, NULL, NULL, 0);
        dns_zone_setprimaries(zone, NULL, NULL, NULL, NULL, 0);
-       dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL, NULL, 0);
+       dns_zone_setalsonotify(zone, NULL, NULL, NULL, NULL, 0);
 
        zone->check_names = dns_severity_ignore;
        if (zone->update_acl != NULL) {
@@ -5995,23 +5980,6 @@ dns_zone_getxfrsource4(dns_zone_t *zone) {
        return (&zone->xfrsource4);
 }
 
-isc_result_t
-dns_zone_setxfrsource4dscp(dns_zone_t *zone, isc_dscp_t dscp) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-
-       LOCK_ZONE(zone);
-       zone->xfrsource4dscp = dscp;
-       UNLOCK_ZONE(zone);
-
-       return (ISC_R_SUCCESS);
-}
-
-isc_dscp_t
-dns_zone_getxfrsource4dscp(dns_zone_t *zone) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-       return (zone->xfrsource4dscp);
-}
-
 isc_result_t
 dns_zone_setxfrsource6(dns_zone_t *zone, const isc_sockaddr_t *xfrsource) {
        REQUIRE(DNS_ZONE_VALID(zone));
@@ -6029,23 +5997,6 @@ dns_zone_getxfrsource6(dns_zone_t *zone) {
        return (&zone->xfrsource6);
 }
 
-isc_dscp_t
-dns_zone_getxfrsource6dscp(dns_zone_t *zone) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-       return (zone->xfrsource6dscp);
-}
-
-isc_result_t
-dns_zone_setxfrsource6dscp(dns_zone_t *zone, isc_dscp_t dscp) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-
-       LOCK_ZONE(zone);
-       zone->xfrsource6dscp = dscp;
-       UNLOCK_ZONE(zone);
-
-       return (ISC_R_SUCCESS);
-}
-
 isc_result_t
 dns_zone_setparentalsrc4(dns_zone_t *zone, const isc_sockaddr_t *parentalsrc) {
        REQUIRE(DNS_ZONE_VALID(zone));
@@ -6063,23 +6014,6 @@ dns_zone_getparentalsrc4(dns_zone_t *zone) {
        return (&zone->parentalsrc4);
 }
 
-isc_result_t
-dns_zone_setparentalsrc4dscp(dns_zone_t *zone, isc_dscp_t dscp) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-
-       LOCK_ZONE(zone);
-       zone->parentalsrc4dscp = dscp;
-       UNLOCK_ZONE(zone);
-
-       return (ISC_R_SUCCESS);
-}
-
-isc_dscp_t
-dns_zone_getparentalsrc4dscp(dns_zone_t *zone) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-       return (zone->parentalsrc4dscp);
-}
-
 isc_result_t
 dns_zone_setparentalsrc6(dns_zone_t *zone, const isc_sockaddr_t *parentalsrc) {
        REQUIRE(DNS_ZONE_VALID(zone));
@@ -6097,23 +6031,6 @@ dns_zone_getparentalsrc6(dns_zone_t *zone) {
        return (&zone->parentalsrc6);
 }
 
-isc_result_t
-dns_zone_setparentalsrc6dscp(dns_zone_t *zone, isc_dscp_t dscp) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-
-       LOCK_ZONE(zone);
-       zone->parentalsrc6dscp = dscp;
-       UNLOCK_ZONE(zone);
-
-       return (ISC_R_SUCCESS);
-}
-
-isc_dscp_t
-dns_zone_getparentalsrc6dscp(dns_zone_t *zone) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-       return (zone->parentalsrc6dscp);
-}
-
 isc_result_t
 dns_zone_setnotifysrc4(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) {
        REQUIRE(DNS_ZONE_VALID(zone));
@@ -6131,23 +6048,6 @@ dns_zone_getnotifysrc4(dns_zone_t *zone) {
        return (&zone->notifysrc4);
 }
 
-isc_result_t
-dns_zone_setnotifysrc4dscp(dns_zone_t *zone, isc_dscp_t dscp) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-
-       LOCK_ZONE(zone);
-       zone->notifysrc4dscp = dscp;
-       UNLOCK_ZONE(zone);
-
-       return (ISC_R_SUCCESS);
-}
-
-isc_dscp_t
-dns_zone_getnotifysrc4dscp(dns_zone_t *zone) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-       return (zone->notifysrc4dscp);
-}
-
 isc_result_t
 dns_zone_setnotifysrc6(dns_zone_t *zone, const isc_sockaddr_t *notifysrc) {
        REQUIRE(DNS_ZONE_VALID(zone));
@@ -6165,28 +6065,10 @@ dns_zone_getnotifysrc6(dns_zone_t *zone) {
        return (&zone->notifysrc6);
 }
 
-isc_result_t
-dns_zone_setnotifysrc6dscp(dns_zone_t *zone, isc_dscp_t dscp) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-
-       LOCK_ZONE(zone);
-       zone->notifysrc6dscp = dscp;
-       UNLOCK_ZONE(zone);
-
-       return (ISC_R_SUCCESS);
-}
-
-isc_dscp_t
-dns_zone_getnotifysrc6dscp(dns_zone_t *zone) {
-       REQUIRE(DNS_ZONE_VALID(zone));
-       return (zone->notifysrc6dscp);
-}
-
 void
 dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *addresses,
-                      isc_sockaddr_t *sources, isc_dscp_t *dscps,
-                      dns_name_t **keynames, dns_name_t **tlsnames,
-                      uint32_t count) {
+                      isc_sockaddr_t *sources, dns_name_t **keynames,
+                      dns_name_t **tlsnames, uint32_t count) {
        dns_remote_t remote;
 
        REQUIRE(DNS_ZONE_VALID(zone));
@@ -6196,7 +6078,6 @@ dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *addresses,
        remote.magic = DNS_REMOTE_MAGIC;
        remote.addresses = addresses;
        remote.sources = sources;
-       remote.dscps = dscps;
        remote.keynames = keynames;
        remote.tlsnames = tlsnames;
        remote.addrcnt = count;
@@ -6217,8 +6098,8 @@ dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *addresses,
        /*
         * Now set up the notify address and key lists.
         */
-       dns_remote_init(&zone->notify, count, addresses, sources, dscps,
-                       keynames, tlsnames, true, zone->mctx);
+       dns_remote_init(&zone->notify, count, addresses, sources, keynames,
+                       tlsnames, true, zone->mctx);
 
 unlock:
        UNLOCK_ZONE(zone);
@@ -6237,7 +6118,6 @@ dns_zone_setprimaries(dns_zone_t *zone, isc_sockaddr_t *addresses,
        remote.magic = DNS_REMOTE_MAGIC;
        remote.addresses = addresses;
        remote.sources = sources;
-       remote.dscps = NULL;
        remote.keynames = keynames;
        remote.tlsnames = tlsnames;
        remote.addrcnt = count;
@@ -6268,8 +6148,8 @@ dns_zone_setprimaries(dns_zone_t *zone, isc_sockaddr_t *addresses,
        /*
         * Now set up the primaries and primary key lists.
         */
-       dns_remote_init(&zone->primaries, count, addresses, sources, NULL,
-                       keynames, tlsnames, true, zone->mctx);
+       dns_remote_init(&zone->primaries, count, addresses, sources, keynames,
+                       tlsnames, true, zone->mctx);
 
        DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NOPRIMARIES);
 
@@ -6290,7 +6170,6 @@ dns_zone_setparentals(dns_zone_t *zone, isc_sockaddr_t *addresses,
        remote.magic = DNS_REMOTE_MAGIC;
        remote.addresses = addresses;
        remote.sources = sources;
-       remote.dscps = NULL;
        remote.keynames = keynames;
        remote.tlsnames = tlsnames;
        remote.addrcnt = count;
@@ -6311,8 +6190,8 @@ dns_zone_setparentals(dns_zone_t *zone, isc_sockaddr_t *addresses,
        /*
         * Now set up the parentals and parental key lists.
         */
-       dns_remote_init(&zone->parentals, count, addresses, sources, NULL,
-                       keynames, tlsnames, true, zone->mctx);
+       dns_remote_init(&zone->parentals, count, addresses, sources, keynames,
+                       tlsnames, true, zone->mctx);
 
        dns_zone_log(zone, ISC_LOG_NOTICE, "checkds: set %u parentals", count);
 
@@ -12507,8 +12386,6 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
        isc_sockaddr_t src;
        unsigned int options, timeout;
        bool have_notifysource = false;
-       bool have_notifydscp = false;
-       isc_dscp_t dscp = -1;
 
        notify = event->ev_arg;
        REQUIRE(DNS_NOTIFY_VALID(notify));
@@ -12591,10 +12468,6 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
                        if (result == ISC_R_SUCCESS) {
                                have_notifysource = true;
                        }
-                       dns_peer_getnotifydscp(peer, &dscp);
-                       if (dscp != -1) {
-                               have_notifydscp = true;
-                       }
                        result = dns_peer_getforcetcp(peer, &usetcp);
                        if (result == ISC_R_SUCCESS && usetcp) {
                                options |= DNS_FETCHOPT_TCP;
@@ -12612,9 +12485,6 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
                                src = notify->zone->notifysrc4;
                        }
                }
-               if (!have_notifydscp) {
-                       dscp = notify->zone->notifysrc4dscp;
-               }
                break;
        case PF_INET6:
                if (!have_notifysource) {
@@ -12626,9 +12496,6 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
                                src = notify->zone->notifysrc6;
                        }
                }
-               if (!have_notifydscp) {
-                       dscp = notify->zone->notifysrc6dscp;
-               }
                break;
        default:
                result = ISC_R_NOTIMPLEMENTED;
@@ -12640,7 +12507,7 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
        }
        result = dns_request_create(
                notify->zone->view->requestmgr, message, &src, &notify->dst,
-               NULL, NULL, dscp, options, key, timeout * 3, timeout, 2,
+               NULL, NULL, options, key, timeout * 3, timeout, 2,
                notify->zone->task, notify_done, notify, &notify->request);
        if (result == ISC_R_SUCCESS) {
                if (isc_sockaddr_pf(&notify->dst) == AF_INET) {
@@ -13360,7 +13227,7 @@ stub_request_nameserver_address(struct stub_cb_args *args, bool ipv4,
        curraddr = dns_remote_curraddr(&zone->primaries);
        result = dns_request_create(
                zone->view->requestmgr, message, &zone->sourceaddr, &curraddr,
-               NULL, NULL, args->dscp, DNS_REQUESTOPT_TCP, args->tsig_key,
+               NULL, NULL, DNS_REQUESTOPT_TCP, args->tsig_key,
                args->timeout * 3, args->timeout, 2, zone->task,
                stub_glue_response_cb, request, &request->request);
 
@@ -14349,9 +14216,8 @@ soa_query(isc_task_t *task, isc_event_t *event) {
        uint32_t options;
        bool cancel = true;
        int timeout;
-       bool have_xfrsource, have_xfrdscp, reqnsid, reqexpire;
+       bool have_xfrsource = false, reqnsid, reqexpire;
        uint16_t udpsize = SEND_BUFFER_SIZE;
-       isc_dscp_t dscp = -1;
        isc_sockaddr_t curraddr, sourceaddr;
        bool do_queue_xfrin = false;
 
@@ -14429,7 +14295,6 @@ again:
 
        options = DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEVC) ? DNS_REQUESTOPT_TCP
                                                         : 0;
-       have_xfrsource = have_xfrdscp = false;
        reqnsid = zone->view->requestnsid;
        reqexpire = zone->requestexpire;
        if (zone->view->peers != NULL) {
@@ -14447,10 +14312,6 @@ again:
                        if (result == ISC_R_SUCCESS) {
                                have_xfrsource = true;
                        }
-                       (void)dns_peer_gettransferdscp(peer, &dscp);
-                       if (dscp != -1) {
-                               have_xfrdscp = true;
-                       }
                        udpsize = dns_view_getudpsize(zone->view);
                        (void)dns_peer_getudpsize(peer, &udpsize);
                        (void)dns_peer_getrequestnsid(peer, &reqnsid);
@@ -14473,9 +14334,6 @@ again:
                                zone->sourceaddr = zone->xfrsource4;
                        }
                }
-               if (!have_xfrdscp) {
-                       dscp = zone->xfrsource4dscp;
-               }
                break;
        case PF_INET6:
                if (!have_xfrsource) {
@@ -14487,9 +14345,6 @@ again:
                                zone->sourceaddr = zone->xfrsource6;
                        }
                }
-               if (!have_xfrdscp) {
-                       dscp = zone->xfrsource6dscp;
-               }
                break;
        default:
                result = ISC_R_NOTIMPLEMENTED;
@@ -14527,8 +14382,8 @@ again:
        }
        result = dns_request_create(
                zone->view->requestmgr, message, &zone->sourceaddr, &curraddr,
-               NULL, NULL, dscp, options, key, timeout * 3, timeout, 2,
-               zone->task, refresh_callback, zone, &zone->request);
+               NULL, NULL, options, key, timeout * 3, timeout, 2, zone->task,
+               refresh_callback, zone, &zone->request);
        if (result != ISC_R_SUCCESS) {
                zone_idetach(&dummy);
                zone_debuglog(zone, __func__, 1,
@@ -14596,10 +14451,9 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
        dns_tsigkey_t *key = NULL;
        dns_dbnode_t *node = NULL;
        int timeout;
-       bool have_xfrsource = false, have_xfrdscp = false;
+       bool have_xfrsource = false;
        bool reqnsid;
        uint16_t udpsize = SEND_BUFFER_SIZE;
-       isc_dscp_t dscp = -1;
        isc_sockaddr_t curraddr, sourceaddr;
        struct stub_cb_args *cb_args;
 
@@ -14734,10 +14588,6 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
                        if (result == ISC_R_SUCCESS) {
                                have_xfrsource = true;
                        }
-                       result = dns_peer_gettransferdscp(peer, &dscp);
-                       if (result == ISC_R_SUCCESS && dscp != -1) {
-                               have_xfrdscp = true;
-                       }
                        udpsize = dns_view_getudpsize(zone->view);
                        (void)dns_peer_getudpsize(peer, &udpsize);
                        (void)dns_peer_getrequestnsid(peer, &reqnsid);
@@ -14766,9 +14616,6 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
                                zone->sourceaddr = zone->xfrsource4;
                        }
                }
-               if (!have_xfrdscp) {
-                       dscp = zone->xfrsource4dscp;
-               }
                break;
        case PF_INET6:
                if (!have_xfrsource) {
@@ -14780,9 +14627,6 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
                                zone->sourceaddr = zone->xfrsource6;
                        }
                }
-               if (!have_xfrdscp) {
-                       dscp = zone->xfrsource6dscp;
-               }
                break;
        default:
                result = ISC_R_NOTIMPLEMENTED;
@@ -14801,15 +14645,14 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
        cb_args = isc_mem_get(zone->mctx, sizeof(*cb_args));
        cb_args->stub = stub;
        cb_args->tsig_key = key;
-       cb_args->dscp = dscp;
        cb_args->udpsize = udpsize;
        cb_args->timeout = timeout;
        cb_args->reqnsid = reqnsid;
 
        result = dns_request_create(
                zone->view->requestmgr, message, &zone->sourceaddr, &curraddr,
-               NULL, NULL, dscp, DNS_REQUESTOPT_TCP, key, timeout * 3, timeout,
-               2, zone->task, stub_callback, cb_args, &zone->request);
+               NULL, NULL, DNS_REQUESTOPT_TCP, key, timeout * 3, timeout, 2,
+               zone->task, stub_callback, cb_args, &zone->request);
        if (result != ISC_R_SUCCESS) {
                zone_debuglog(zone, __func__, 1,
                              "dns_request_create() failed: %s",
@@ -17840,7 +17683,6 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
        isc_sockaddr_t sourceaddr;
        isc_time_t now;
        const char *soa_before = "";
-       isc_dscp_t dscp = -1;
        bool loaded;
 
        UNUSED(task);
@@ -17970,24 +17812,8 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
                        isc_result_totext(result));
        }
 
-       dscp = dns_remote_dscp(&zone->primaries);
-
        LOCK_ZONE(zone);
        sourceaddr = zone->sourceaddr;
-       switch (isc_sockaddr_pf(&primaryaddr)) {
-       case PF_INET:
-               if (dscp == -1) {
-                       dscp = zone->xfrsource4dscp;
-               }
-               break;
-       case PF_INET6:
-               if (dscp == -1) {
-                       dscp = zone->xfrsource6dscp;
-               }
-               break;
-       default:
-               UNREACHABLE();
-       }
        UNLOCK_ZONE(zone);
        INSIST(isc_sockaddr_pf(&primaryaddr) == isc_sockaddr_pf(&sourceaddr));
 
@@ -17995,7 +17821,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
                dns_xfrin_detach(&zone->xfr);
        }
 
-       CHECK(dns_xfrin_create(zone, xfrtype, &primaryaddr, &sourceaddr, dscp,
+       CHECK(dns_xfrin_create(zone, xfrtype, &primaryaddr, &sourceaddr,
                               zone->tsigkey, zone->transport,
                               zone->zmgr->tlsctx_cache, zone->mctx,
                               zone->zmgr->netmgr, zone_xfrdone, &zone->xfr));
@@ -18059,7 +17885,6 @@ static isc_result_t
 sendtoprimary(dns_forward_t *forward) {
        isc_result_t result;
        isc_sockaddr_t src, any;
-       isc_dscp_t dscp = -1;
        dns_zone_t *zone = forward->zone;
        bool tls_transport_invalid = false;
 
@@ -18089,7 +17914,6 @@ sendtoprimary(dns_forward_t *forward) {
                if (isc_sockaddr_equal(&src, &any)) {
                        src = zone->xfrsource4;
                }
-               dscp = zone->xfrsource4dscp;
                break;
        case PF_INET6:
                isc_sockaddr_any6(&any);
@@ -18097,7 +17921,6 @@ sendtoprimary(dns_forward_t *forward) {
                if (isc_sockaddr_equal(&src, &any)) {
                        src = zone->xfrsource6;
                }
-               dscp = zone->xfrsource6dscp;
                break;
        default:
                result = ISC_R_NOTIMPLEMENTED;
@@ -18127,7 +17950,7 @@ sendtoprimary(dns_forward_t *forward) {
        result = dns_request_createraw(
                forward->zone->view->requestmgr, forward->msgbuf, &src,
                &forward->addr, forward->transport, zone->zmgr->tlsctx_cache,
-               dscp, forward->options, 15 /* XXX */, 0, 0, forward->zone->task,
+               forward->options, 15 /* XXX */, 0, 0, forward->zone->task,
                forward_callback, forward, &forward->request);
        if (result == ISC_R_SUCCESS) {
                if (!ISC_LINK_LINKED(forward, link)) {
@@ -20727,8 +20550,6 @@ checkds_send_toaddr(isc_task_t *task, isc_event_t *event) {
        isc_sockaddr_t src;
        unsigned int options, timeout;
        bool have_checkdssource = false;
-       bool have_checkdsdscp = false;
-       isc_dscp_t dscp = -1;
 
        checkds = event->ev_arg;
        REQUIRE(DNS_CHECKDS_VALID(checkds));
@@ -20810,10 +20631,6 @@ checkds_send_toaddr(isc_task_t *task, isc_event_t *event) {
                        if (result == ISC_R_SUCCESS) {
                                have_checkdssource = true;
                        }
-                       dns_peer_getquerydscp(peer, &dscp);
-                       if (dscp != -1) {
-                               have_checkdsdscp = true;
-                       }
                        result = dns_peer_getforcetcp(peer, &usetcp);
                        if (result == ISC_R_SUCCESS && usetcp) {
                                options |= DNS_FETCHOPT_TCP;
@@ -20831,9 +20648,6 @@ checkds_send_toaddr(isc_task_t *task, isc_event_t *event) {
                                src = checkds->zone->parentalsrc4;
                        }
                }
-               if (!have_checkdsdscp) {
-                       dscp = checkds->zone->parentalsrc4dscp;
-               }
                break;
        case PF_INET6:
                if (!have_checkdssource) {
@@ -20845,9 +20659,6 @@ checkds_send_toaddr(isc_task_t *task, isc_event_t *event) {
                                src = checkds->zone->parentalsrc6;
                        }
                }
-               if (!have_checkdsdscp) {
-                       dscp = checkds->zone->parentalsrc6dscp;
-               }
                break;
        default:
                result = ISC_R_NOTIMPLEMENTED;
@@ -20861,7 +20672,7 @@ checkds_send_toaddr(isc_task_t *task, isc_event_t *event) {
        options |= DNS_REQUESTOPT_TCP;
        result = dns_request_create(
                checkds->zone->view->requestmgr, message, &src, &checkds->dst,
-               NULL, NULL, dscp, options, key, timeout * 3, timeout, 2,
+               NULL, NULL, options, key, timeout * 3, timeout, 2,
                checkds->zone->task, checkds_done, checkds, &checkds->request);
        if (result != ISC_R_SUCCESS) {
                dns_zone_log(checkds->zone, ISC_LOG_DEBUG(3),

diff --git a/lib/isc/include/isc/net.h b/lib/isc/include/isc/net.h
index 48a8bd5b6f4cb7250f156055ef1a9685d60f86df..1a3ce63e050cf315c48c844af1b6801bef120001 100644 (file)
--- a/lib/isc/include/isc/net.h
+++ b/lib/isc/include/isc/net.h
@@ -272,20 +272,6 @@ isc_net_probeunix(void);
  * Returns whether UNIX domain sockets are supported.
  */
 
-#define ISC_NET_DSCPRECVV4 0x01 /* Can receive sent DSCP value IPv4 */
-#define ISC_NET_DSCPRECVV6 0x02 /* Can receive sent DSCP value IPv6 */
-#define ISC_NET_DSCPSETV4  0x04 /* Can set DSCP on socket IPv4 */
-#define ISC_NET_DSCPSETV6  0x08 /* Can set DSCP on socket IPv6 */
-#define ISC_NET_DSCPPKTV4  0x10 /* Can set DSCP on per packet IPv4 */
-#define ISC_NET_DSCPPKTV6  0x20 /* Can set DSCP on per packet IPv6 */
-#define ISC_NET_DSCPALL           0x3f /* All valid flags */
-
-unsigned int
-isc_net_probedscp(void);
-/*%<
- * Probe the level of DSCP support.
- */
-
 isc_result_t
 isc_net_getudpportrange(int af, in_port_t *low, in_port_t *high);
 /*%<

diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index cdbe4bc443981abceaa5dd1114c4e10411cc1a2f..72cdabd7cf79d2847a62128dd5e25504956d853b 100644 (file)
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -40,13 +40,12 @@ typedef struct isc_constregion         isc_constregion_t;     /*%< Const region */
 typedef struct isc_consttextregion isc_consttextregion_t; /*%< Const Text Region
                                                           */
 typedef struct isc_counter isc_counter_t;                /*%< Counter */
-typedef int16_t                   isc_dscp_t;         /*%< Diffserv code point */
-typedef struct isc_event   isc_event_t;               /*%< Event */
-typedef ISC_LIST(isc_event_t) isc_eventlist_t; /*%< Event List */
-typedef unsigned int    isc_eventtype_t;      /*%< Event Type */
-typedef uint32_t        isc_fsaccess_t;       /*%< FS Access */
-typedef struct isc_hash         isc_hash_t;           /*%< Hash */
-typedef struct isc_httpd isc_httpd_t;         /*%< HTTP client */
+typedef struct isc_event   isc_event_t;                          /*%< Event */
+typedef ISC_LIST(isc_event_t) isc_eventlist_t;           /*%< Event List */
+typedef unsigned int    isc_eventtype_t;                 /*%< Event Type */
+typedef uint32_t        isc_fsaccess_t;                  /*%< FS Access */
+typedef struct isc_hash         isc_hash_t;                      /*%< Hash */
+typedef struct isc_httpd isc_httpd_t;                    /*%< HTTP client */
 typedef void(isc_httpdfree_t)(isc_buffer_t *, void *); /*%< HTTP free function
                                                        */
 typedef struct isc_httpdmgr isc_httpdmgr_t;           /*%< HTTP manager */

diff --git a/lib/isc/net.c b/lib/isc/net.c
index 89a57551fec2e436f990aa7b1d21928d4a2d1452..4ac0450388588dfd308577ec57277fe81ad12e10 100644 (file)
--- a/lib/isc/net.c
+++ b/lib/isc/net.c
@@ -109,14 +109,12 @@ static isc_once_t once_ipv6pktinfo = ISC_ONCE_INIT;
 #endif /* ! ISC_CMSG_IP_TOS */
 
 static isc_once_t once = ISC_ONCE_INIT;
-static isc_once_t once_dscp = ISC_ONCE_INIT;
 
 static isc_result_t ipv4_result = ISC_R_NOTFOUND;
 static isc_result_t ipv6_result = ISC_R_NOTFOUND;
 static isc_result_t unix_result = ISC_R_NOTFOUND;
 static isc_result_t ipv6only_result = ISC_R_NOTFOUND;
 static isc_result_t ipv6pktinfo_result = ISC_R_NOTFOUND;
-static unsigned int dscp_result = 0;
 
 static isc_result_t
 try_proto(int domain) {
@@ -344,342 +342,6 @@ isc_net_probe_ipv6pktinfo(void) {
        return (ipv6pktinfo_result);
 }
 
-#if ISC_CMSG_IP_TOS || defined(IPV6_TCLASS)
-
-static socklen_t
-cmsg_len(socklen_t len) {
-#ifdef CMSG_LEN
-       return (CMSG_LEN(len));
-#else  /* ifdef CMSG_LEN */
-       socklen_t hdrlen;
-
-       /*
-        * Cast NULL so that any pointer arithmetic performed by CMSG_DATA
-        * is correct.
-        */
-       hdrlen = (socklen_t)CMSG_DATA(((struct cmsghdr *)NULL));
-       return (hdrlen + len);
-#endif /* ifdef CMSG_LEN */
-}
-
-static socklen_t
-cmsg_space(socklen_t len) {
-#ifdef CMSG_SPACE
-       return (CMSG_SPACE(len));
-#else  /* ifdef CMSG_SPACE */
-       struct msghdr msg;
-       struct cmsghdr *cmsgp;
-       /*
-        * XXX: The buffer length is an ad-hoc value, but should be enough
-        * in a practical sense.
-        */
-       char dummybuf[sizeof(struct cmsghdr) + 1024];
-
-       memset(&msg, 0, sizeof(msg));
-       msg.msg_control = dummybuf;
-       msg.msg_controllen = sizeof(dummybuf);
-
-       cmsgp = (struct cmsghdr *)dummybuf;
-       cmsgp->cmsg_len = cmsg_len(len);
-
-       cmsgp = CMSG_NXTHDR(&msg, cmsgp);
-       if (cmsgp != NULL) {
-               return ((char *)cmsgp - (char *)msg.msg_control);
-       } else {
-               return (0);
-       }
-#endif /* ifdef CMSG_SPACE */
-}
-
-/*
- * Make a fd non-blocking.
- */
-static isc_result_t
-make_nonblock(int fd) {
-       int ret;
-       int flags;
-
-#ifdef USE_FIONBIO_IOCTL
-       flags = 1;
-       ret = ioctl(fd, FIONBIO, (char *)&flags);
-#else  /* ifdef USE_FIONBIO_IOCTL */
-       flags = fcntl(fd, F_GETFL, 0);
-       flags |= O_NONBLOCK;
-       ret = fcntl(fd, F_SETFL, flags);
-#endif /* ifdef USE_FIONBIO_IOCTL */
-
-       if (ret == -1) {
-#ifdef USE_FIONBIO_IOCTL
-               UNEXPECTED_SYSERROR(errno, "ioctl(%d, FIONBIO, &on)", fd);
-#else
-               UNEXPECTED_SYSERROR(errno, "fcntl(%d, F_SETFL, %d)", fd, flags);
-#endif
-               return (ISC_R_UNEXPECTED);
-       }
-
-       return (ISC_R_SUCCESS);
-}
-
-static bool
-cmsgsend(int s, int level, int type, struct addrinfo *res) {
-       char strbuf[ISC_STRERRORSIZE];
-       struct sockaddr_storage ss;
-       socklen_t len = sizeof(ss);
-       struct msghdr msg;
-       union {
-               struct cmsghdr h;
-               unsigned char b[256];
-       } control;
-       struct cmsghdr *cmsgp;
-       int dscp = (46 << 2); /* Expedited forwarding. */
-       struct iovec iovec;
-       char buf[1] = { 0 };
-       isc_result_t result;
-
-       if (bind(s, res->ai_addr, res->ai_addrlen) < 0) {
-               strerror_r(errno, strbuf, sizeof(strbuf));
-               isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
-                             ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(10),
-                             "bind: %s", strbuf);
-               return (false);
-       }
-
-       if (getsockname(s, (struct sockaddr *)&ss, &len) < 0) {
-               strerror_r(errno, strbuf, sizeof(strbuf));
-               isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
-                             ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(10),
-                             "getsockname: %s", strbuf);
-               return (false);
-       }
-
-       iovec.iov_base = buf;
-       iovec.iov_len = sizeof(buf);
-
-       memset(&msg, 0, sizeof(msg));
-       msg.msg_name = (struct sockaddr *)&ss;
-       msg.msg_namelen = len;
-       msg.msg_iov = &iovec;
-       msg.msg_iovlen = 1;
-       msg.msg_control = (void *)&control;
-       msg.msg_controllen = 0;
-       msg.msg_flags = 0;
-
-       cmsgp = msg.msg_control;
-
-       switch (type) {
-#ifdef IP_TOS
-       case IP_TOS:
-               memset(cmsgp, 0, cmsg_space(sizeof(char)));
-               cmsgp->cmsg_level = level;
-               cmsgp->cmsg_type = type;
-               cmsgp->cmsg_len = cmsg_len(sizeof(char));
-               *(unsigned char *)CMSG_DATA(cmsgp) = dscp;
-               msg.msg_controllen += cmsg_space(sizeof(char));
-               break;
-#endif /* ifdef IP_TOS */
-#ifdef IPV6_TCLASS
-       case IPV6_TCLASS:
-               memset(cmsgp, 0, cmsg_space(sizeof(dscp)));
-               cmsgp->cmsg_level = level;
-               cmsgp->cmsg_type = type;
-               cmsgp->cmsg_len = cmsg_len(sizeof(dscp));
-               memmove(CMSG_DATA(cmsgp), &dscp, sizeof(dscp));
-               msg.msg_controllen += cmsg_space(sizeof(dscp));
-               break;
-#endif /* ifdef IPV6_TCLASS */
-       default:
-               UNREACHABLE();
-       }
-
-       if (sendmsg(s, &msg, 0) < 0) {
-               switch (errno) {
-#ifdef ENOPROTOOPT
-               case ENOPROTOOPT:
-#endif /* ifdef ENOPROTOOPT */
-#ifdef EOPNOTSUPP
-               case EOPNOTSUPP:
-#endif /* ifdef EOPNOTSUPP */
-               case EINVAL:
-               case EPERM:
-                       strerror_r(errno, strbuf, sizeof(strbuf));
-                       isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
-                                     ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(10),
-                                     "sendmsg: %s", strbuf);
-                       break;
-               default:
-                       UNEXPECTED_SYSERROR(
-                               errno, "probing sendmsg() with %s=%02x failed",
-                               (type == IP_TOS) ? "IP_TOS" : "IPV6_TCLASS",
-                               dscp);
-                       break;
-               }
-               return (false);
-       }
-
-       /*
-        * Make sure the message actually got sent.
-        */
-       result = make_nonblock(s);
-       RUNTIME_CHECK(result == ISC_R_SUCCESS);
-
-       iovec.iov_base = buf;
-       iovec.iov_len = sizeof(buf);
-
-       memset(&msg, 0, sizeof(msg));
-       msg.msg_name = (struct sockaddr *)&ss;
-       msg.msg_namelen = sizeof(ss);
-       msg.msg_iov = &iovec;
-       msg.msg_iovlen = 1;
-       msg.msg_control = NULL;
-       msg.msg_controllen = 0;
-       msg.msg_flags = 0;
-
-       if (recvmsg(s, &msg, 0) < 0) {
-               return (false);
-       }
-
-       return (true);
-}
-#endif /* if ISC_CMSG_IP_TOS || defined(IPV6_TCLASS) */
-
-static void
-try_dscp_v4(void) {
-#ifdef IP_TOS
-       char strbuf[ISC_STRERRORSIZE];
-       struct addrinfo hints, *res0;
-       int s, dscp = 0, n;
-#ifdef IP_RECVTOS
-       int on = 1;
-#endif /* IP_RECVTOS */
-
-       memset(&hints, 0, sizeof(hints));
-       hints.ai_family = AF_INET;
-       hints.ai_socktype = SOCK_DGRAM;
-       hints.ai_protocol = IPPROTO_UDP;
-#ifdef AI_NUMERICHOST
-       hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
-#else  /* ifdef AI_NUMERICHOST */
-       hints.ai_flags = AI_PASSIVE;
-#endif /* ifdef AI_NUMERICHOST */
-
-       n = getaddrinfo("127.0.0.1", NULL, &hints, &res0);
-       if (n != 0 || res0 == NULL) {
-               isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
-                             ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(10),
-                             "getaddrinfo(127.0.0.1): %s", gai_strerror(n));
-               return;
-       }
-
-       s = socket(res0->ai_family, res0->ai_socktype, res0->ai_protocol);
-       if (s == -1) {
-               strerror_r(errno, strbuf, sizeof(strbuf));
-               isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
-                             ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(10),
-                             "socket: %s", strbuf);
-               freeaddrinfo(res0);
-               return;
-       }
-
-       if (setsockopt(s, IPPROTO_IP, IP_TOS, &dscp, sizeof(dscp)) == 0) {
-               dscp_result |= ISC_NET_DSCPSETV4;
-       }
-
-#ifdef IP_RECVTOS
-       on = 1;
-       if (setsockopt(s, IPPROTO_IP, IP_RECVTOS, &on, sizeof(on)) == 0) {
-               dscp_result |= ISC_NET_DSCPRECVV4;
-       }
-#endif /* IP_RECVTOS */
-
-#if ISC_CMSG_IP_TOS
-       if (cmsgsend(s, IPPROTO_IP, IP_TOS, res0)) {
-               dscp_result |= ISC_NET_DSCPPKTV4;
-       }
-#endif /* ISC_CMSG_IP_TOS */
-
-       freeaddrinfo(res0);
-       close(s);
-
-#endif /* IP_TOS */
-}
-
-static void
-try_dscp_v6(void) {
-#ifdef IPV6_TCLASS
-       char strbuf[ISC_STRERRORSIZE];
-       struct addrinfo hints, *res0;
-       int s, dscp = 0, n;
-#if defined(IPV6_RECVTCLASS)
-       int on = 1;
-#endif /* IPV6_RECVTCLASS */
-
-       memset(&hints, 0, sizeof(hints));
-       hints.ai_family = AF_INET6;
-       hints.ai_socktype = SOCK_DGRAM;
-       hints.ai_protocol = IPPROTO_UDP;
-#ifdef AI_NUMERICHOST
-       hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
-#else  /* ifdef AI_NUMERICHOST */
-       hints.ai_flags = AI_PASSIVE;
-#endif /* ifdef AI_NUMERICHOST */
-
-       n = getaddrinfo("::1", NULL, &hints, &res0);
-       if (n != 0 || res0 == NULL) {
-               isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
-                             ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(10),
-                             "getaddrinfo(::1): %s", gai_strerror(n));
-               return;
-       }
-
-       s = socket(res0->ai_family, res0->ai_socktype, res0->ai_protocol);
-       if (s == -1) {
-               strerror_r(errno, strbuf, sizeof(strbuf));
-               isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
-                             ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(10),
-                             "socket: %s", strbuf);
-               freeaddrinfo(res0);
-               return;
-       }
-       if (setsockopt(s, IPPROTO_IPV6, IPV6_TCLASS, &dscp, sizeof(dscp)) == 0)
-       {
-               dscp_result |= ISC_NET_DSCPSETV6;
-       }
-
-#ifdef IPV6_RECVTCLASS
-       on = 1;
-       if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVTCLASS, &on, sizeof(on)) == 0)
-       {
-               dscp_result |= ISC_NET_DSCPRECVV6;
-       }
-#endif /* IPV6_RECVTCLASS */
-
-       if (cmsgsend(s, IPPROTO_IPV6, IPV6_TCLASS, res0)) {
-               dscp_result |= ISC_NET_DSCPPKTV6;
-       }
-
-       freeaddrinfo(res0);
-       close(s);
-
-#endif /* IPV6_TCLASS */
-}
-
-static void
-try_dscp(void) {
-       try_dscp_v4();
-       try_dscp_v6();
-}
-
-static void
-initialize_dscp(void) {
-       isc_once_do(&once_dscp, try_dscp);
-}
-
-unsigned int
-isc_net_probedscp(void) {
-       initialize_dscp();
-       return (dscp_result);
-}
-
 #if defined(USE_SYSCTL_PORTRANGE)
 #if defined(HAVE_SYSCTLBYNAME)
 static isc_result_t

diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c
index 68ab0bca1e3a849767d56d828b837d0e5cc0ec5f..9873635c6d324d4138c79ca358f974fdf59cd55f 100644 (file)
--- a/lib/isc/netmgr/netmgr.c
+++ b/lib/isc/netmgr/netmgr.c
@@ -123,13 +123,6 @@ static const isc_statscounter_t unixstatsindex[] = {
 };
 #endif /* if 0 */
 
-/*
- * Set by the -T dscp option on the command line. If set to a value
- * other than -1, we check to make sure DSCP values match it, and
- * assert if not. (Not currently in use.)
- */
-int isc_dscp_check_value = -1;
-
 static void
 nmsocket_maybe_destroy(isc_nmsocket_t *sock FLARG);
 static void

diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index 105ec2cd48ac73902a26b8b351138c8fc74300e2..c4f2d86362889538b9a290482024ff753275b394 100644 (file)
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -406,20 +406,6 @@ cfg_obj_assockaddr(const cfg_obj_t *obj);
  *      if necessary.
  */
 
-isc_dscp_t
-cfg_obj_getdscp(const cfg_obj_t *obj);
-/*%<
- * Returns the DSCP value of a configuration object representing a
- * socket address.
- *
- * Requires:
- * \li     'obj' points to a valid configuration object of a
- *         socket address type.
- *
- * Returns:
- * \li     DSCP value associated with a sockaddr, or -1.
- */
-
 bool
 cfg_obj_isnetprefix(const cfg_obj_t *obj);
 /*%<

diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 01d31fc3f122dbd386d36fea3fab87180f48a01a..447ba7117199015d06f09bff004d61b9bccd1290 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -179,7 +179,7 @@ struct cfg_obj {
                isc_sockaddr_t   sockaddr;
                struct {
                        isc_sockaddr_t sockaddr;
-                       isc_dscp_t     dscp;
+                       int32_t        dscp;
                } sockaddrdscp;
                cfg_netprefix_t   netprefix;
                isccfg_duration_t duration;
@@ -374,9 +374,6 @@ cfg_lookingat_netaddr(cfg_parser_t *pctx, unsigned int flags);
 isc_result_t
 cfg_parse_rawport(cfg_parser_t *pctx, unsigned int flags, in_port_t *port);
 
-isc_result_t
-cfg_parse_dscp(cfg_parser_t *pctx, isc_dscp_t *dscp);
-
 isc_result_t
 cfg_parse_sockaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret);
 

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index d411fcf8dbfd02df55c535d1f965cfc5febe0086..6178b81f4e7534006b61efa5c25a63ff2c2191df 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -163,7 +163,8 @@ static cfg_type_t cfg_type_tkey_dhkey = { "tkey-dhkey",        cfg_parse_tuple,
 
 static cfg_tuplefielddef_t listenon_tuple_fields[] = {
        { "port", &cfg_type_optional_port, 0 },
-       { "dscp", &cfg_type_uint32, 0 },
+       { "dscp", &cfg_type_uint32,
+         CFG_CLAUSEFLAG_OBSOLETE | CFG_CLAUSEFLAG_NODOC },
        { "tls", &cfg_type_astring, 0 },
 #if HAVE_LIBNGHTTP2
        { "http", &cfg_type_astring, 0 },
@@ -235,7 +236,7 @@ static cfg_type_t cfg_type_acl = { "acl",       cfg_parse_tuple,
 static cfg_tuplefielddef_t remotes_fields[] = {
        { "name", &cfg_type_astring, 0 },
        { "port", &cfg_type_optional_port, 0 },
-       { "dscp", &cfg_type_optional_dscp, 0 },
+       { "dscp", &cfg_type_optional_dscp, CFG_CLAUSEFLAG_OBSOLETE },
        { "source", &cfg_type_optional_sourceaddr4, 0 },
        { "source-v6", &cfg_type_optional_sourceaddr6, 0 },
        { "addresses", &cfg_type_bracketed_namesockaddrkeylist, 0 },
@@ -276,7 +277,7 @@ static cfg_type_t cfg_type_bracketed_namesockaddrkeylist = {
 
 static cfg_tuplefielddef_t namesockaddrkeylist_fields[] = {
        { "port", &cfg_type_optional_port, 0 },
-       { "dscp", &cfg_type_optional_dscp, 0 },
+       { "dscp", &cfg_type_optional_dscp, CFG_CLAUSEFLAG_OBSOLETE },
        { "source", &cfg_type_optional_sourceaddr4, 0 },
        { "source-v6", &cfg_type_optional_sourceaddr6, 0 },
        { "addresses", &cfg_type_bracketed_namesockaddrkeylist, 0 },
@@ -293,7 +294,7 @@ static cfg_type_t cfg_type_namesockaddrkeylist = {
  */
 static cfg_tuplefielddef_t portiplist_fields[] = {
        { "port", &cfg_type_optional_port, 0 },
-       { "dscp", &cfg_type_optional_dscp, 0 },
+       { "dscp", &cfg_type_optional_dscp, CFG_CLAUSEFLAG_OBSOLETE },
        { "addresses", &cfg_type_bracketed_dscpsockaddrlist, 0 },
        { NULL, NULL, 0 }
 };
@@ -795,8 +796,8 @@ static cfg_type_t cfg_type_rrsetorder = { "rrsetorder",
 static keyword_type_t dscp_kw = { "dscp", &cfg_type_uint32 };
 
 static cfg_type_t cfg_type_optional_dscp = {
-       "optional_dscp",       parse_optional_keyvalue, print_keyvalue,
-       doc_optional_keyvalue, &cfg_rep_uint32,         &dscp_kw
+       "optional_dscp", parse_optional_keyvalue, print_keyvalue,
+       cfg_doc_void,    &cfg_rep_uint32,         &dscp_kw
 };
 
 static keyword_type_t port_kw = { "port", &cfg_type_uint32 };
@@ -1240,7 +1241,7 @@ static cfg_clausedef_t options_clauses[] = {
        { "dnstap-version", &cfg_type_qstringornone,
          CFG_CLAUSEFLAG_NOTCONFIGURED },
 #endif /* ifdef HAVE_DNSTAP */
-       { "dscp", &cfg_type_uint32, 0 },
+       { "dscp", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
        { "dump-file", &cfg_type_qstring, 0 },
        { "fake-iquery", NULL, CFG_CLAUSEFLAG_ANCIENT },
        { "files", &cfg_type_size, CFG_CLAUSEFLAG_ANCIENT },
@@ -3177,11 +3178,11 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
        cfg_obj_t *obj = NULL;
        isc_netaddr_t netaddr;
        in_port_t port = 0;
-       isc_dscp_t dscp = -1;
        unsigned int have_address = 0;
        unsigned int have_port = 0;
        unsigned int have_dscp = 0;
        const unsigned int *flagp = type->of;
+       int dscp = -1;
 
        if ((*flagp & CFG_ADDR_V4OK) != 0) {
                isc_netaddr_any(&netaddr);
@@ -3210,8 +3211,13 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
                        } else if (strcasecmp(TOKEN_STRING(pctx), "dscp") == 0)
                        {
                                /* read "dscp" */
+                               cfg_parser_warning(pctx, 0,
+                                                  "'dscp' is obsolete and "
+                                                  "should be removed");
                                CHECK(cfg_gettoken(pctx, 0));
-                               CHECK(cfg_parse_dscp(pctx, &dscp));
+                               CHECK(cfg_parse_uint32(pctx, NULL, &obj));
+                               dscp = cfg_obj_asuint32(obj);
+                               cfg_obj_destroy(pctx, &obj);
                                have_dscp++;
                        } else if (have_port == 0 && have_dscp == 0 &&
                                   have_address == 0)
@@ -3219,8 +3225,8 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
                                return (cfg_parse_sockaddr(pctx, type, ret));
                        } else {
                                cfg_parser_error(pctx, CFG_LOG_NEAR,
-                                                "expected 'address', 'port', "
-                                                "or 'dscp'");
+                                                "expected 'address' "
+                                                "or 'port'");
                                return (ISC_R_UNEXPECTEDTOKEN);
                        }
                } else {
@@ -3285,8 +3291,7 @@ doc_querysource(cfg_printer_t *pctx, const cfg_type_t *type) {
        } else {
                UNREACHABLE();
        }
-       cfg_print_cstr(pctx, " | * ) ] port ( <integer> | * ) ) )"
-                            " [ dscp <integer> ]");
+       cfg_print_cstr(pctx, " | * ) ] port ( <integer> | * ) ) )");
 }
 
 static unsigned int sockaddr4wild_flags = CFG_ADDR_WILDOK | CFG_ADDR_V4OK |
@@ -3567,7 +3572,7 @@ static cfg_type_t cfg_type_logfile = { "log_file",     parse_logfile,
                                       print_logfile,  doc_logfile,
                                       &cfg_rep_tuple, logfile_fields };
 
-/*% An IPv4 address with optional dscp and port, "*" accepted as wildcard. */
+/*% An IPv4 address with optional port, "*" accepted as wildcard. */
 static cfg_type_t cfg_type_sockaddr4wild = {
        "sockaddr4wild",  cfg_parse_sockaddr, cfg_print_sockaddr,
        cfg_doc_sockaddr, &cfg_rep_sockaddr,  &sockaddr4wild_flags
@@ -3666,7 +3671,7 @@ cfg_type_t cfg_type_sessionkey = { "sessionkey",      cfg_parse_mapbody,
 static cfg_tuplefielddef_t nameport_fields[] = {
        { "name", &cfg_type_astring, 0 },
        { "port", &cfg_type_optional_port, 0 },
-       { "dscp", &cfg_type_optional_dscp, 0 },
+       { "dscp", &cfg_type_optional_dscp, CFG_CLAUSEFLAG_OBSOLETE },
        { NULL, NULL, 0 }
 };
 
@@ -3681,20 +3686,14 @@ doc_sockaddrnameport(cfg_printer_t *pctx, const cfg_type_t *type) {
        cfg_print_cstr(pctx, "<quoted_string>");
        cfg_print_cstr(pctx, " ");
        cfg_print_cstr(pctx, "[ port <integer> ]");
-       cfg_print_cstr(pctx, " ");
-       cfg_print_cstr(pctx, "[ dscp <integer> ]");
        cfg_print_cstr(pctx, " | ");
        cfg_print_cstr(pctx, "<ipv4_address>");
        cfg_print_cstr(pctx, " ");
        cfg_print_cstr(pctx, "[ port <integer> ]");
-       cfg_print_cstr(pctx, " ");
-       cfg_print_cstr(pctx, "[ dscp <integer> ]");
        cfg_print_cstr(pctx, " | ");
        cfg_print_cstr(pctx, "<ipv6_address>");
        cfg_print_cstr(pctx, " ");
        cfg_print_cstr(pctx, "[ port <integer> ]");
-       cfg_print_cstr(pctx, " ");
-       cfg_print_cstr(pctx, "[ dscp <integer> ]");
        cfg_print_cstr(pctx, " )");
 }
 

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 325396e4de812477e6ebb487fbcdc914e40a6e19..9ff1ed1522d872ec6a57a8b3443f8d1df42c6533 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -3019,29 +3019,6 @@ cfg_print_rawaddr(cfg_printer_t *pctx, const isc_netaddr_t *na) {
                        isc_buffer_usedlength(&buf));
 }
 
-isc_result_t
-cfg_parse_dscp(cfg_parser_t *pctx, isc_dscp_t *dscp) {
-       isc_result_t result;
-
-       REQUIRE(pctx != NULL);
-       REQUIRE(dscp != NULL);
-
-       CHECK(cfg_gettoken(pctx, ISC_LEXOPT_NUMBER | ISC_LEXOPT_CNUMBER));
-
-       if (pctx->token.type != isc_tokentype_number) {
-               cfg_parser_error(pctx, CFG_LOG_NEAR, "expected number");
-               return (ISC_R_UNEXPECTEDTOKEN);
-       }
-       if (pctx->token.value.as_ulong > 63U) {
-               cfg_parser_error(pctx, CFG_LOG_NEAR, "dscp out of range");
-               return (ISC_R_RANGE);
-       }
-       *dscp = (isc_dscp_t)(pctx->token.value.as_ulong);
-       return (ISC_R_SUCCESS);
-cleanup:
-       return (result);
-}
-
 /* netaddr */
 
 static unsigned int netaddr_flags = CFG_ADDR_V4OK | CFG_ADDR_V6OK;
@@ -3233,12 +3210,13 @@ parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, int flags,
        isc_result_t result;
        isc_netaddr_t netaddr;
        in_port_t port = 0;
-       isc_dscp_t dscp = -1;
        cfg_obj_t *obj = NULL;
        int have_port = 0, have_dscp = 0;
+       cfg_obj_t *dscp = NULL;
 
        CHECK(cfg_create_obj(pctx, type, &obj));
        CHECK(cfg_parse_rawaddr(pctx, flags, &netaddr));
+       obj->value.sockaddrdscp.dscp = -1;
        for (;;) {
                CHECK(cfg_peektoken(pctx, 0));
                if (pctx->token.type == isc_tokentype_string) {
@@ -3249,8 +3227,14 @@ parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, int flags,
                        } else if ((flags & CFG_ADDR_DSCPOK) != 0 &&
                                   strcasecmp(TOKEN_STRING(pctx), "dscp") == 0)
                        {
+                               cfg_parser_warning(pctx, 0,
+                                                  "'dscp' is obsolete and "
+                                                  "should be removed");
                                CHECK(cfg_gettoken(pctx, 0)); /* read "dscp" */
-                               CHECK(cfg_parse_dscp(pctx, &dscp));
+                               CHECK(cfg_parse_uint32(pctx, NULL, &dscp));
+                               obj->value.sockaddrdscp.dscp =
+                                       cfg_obj_asuint32(dscp);
+                               cfg_obj_destroy(pctx, &dscp);
                                ++have_dscp;
                        } else {
                                break;
@@ -3271,7 +3255,6 @@ parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, int flags,
                goto cleanup;
        }
        isc_sockaddr_fromnetaddr(&obj->value.sockaddr, &netaddr, port);
-       obj->value.sockaddrdscp.dscp = dscp;
        *ret = obj;
        return (ISC_R_SUCCESS);
 
@@ -3364,9 +3347,6 @@ cfg_doc_sockaddr(cfg_printer_t *pctx, const cfg_type_t *type) {
        } else {
                cfg_print_cstr(pctx, "[ port <integer> ]");
        }
-       if ((*flagp & CFG_ADDR_DSCPOK) != 0) {
-               cfg_print_cstr(pctx, " [ dscp <integer> ]");
-       }
 }
 
 bool
@@ -3381,12 +3361,6 @@ cfg_obj_assockaddr(const cfg_obj_t *obj) {
        return (&obj->value.sockaddr);
 }
 
-isc_dscp_t
-cfg_obj_getdscp(const cfg_obj_t *obj) {
-       REQUIRE(obj != NULL && obj->type->rep == &cfg_rep_sockaddr);
-       return (obj->value.sockaddrdscp.dscp);
-}
-
 isc_result_t
 cfg_gettoken(cfg_parser_t *pctx, int options) {
        isc_result_t result;

diff --git a/lib/ns/include/ns/interfacemgr.h b/lib/ns/include/ns/interfacemgr.h
index f926cce0968ecf94ac35b06ffb21c3f7b89190ae..4c248dec232fde50efd4dca9af74e749ed70bbec 100644 (file)
--- a/lib/ns/include/ns/interfacemgr.h
+++ b/lib/ns/include/ns/interfacemgr.h
@@ -82,7 +82,6 @@ struct ns_interface {
        isc_nmsocket_t    *http_listensocket;
        isc_nmsocket_t    *http_secure_listensocket;
        isc_quota_t       *http_quota;
-       isc_dscp_t         dscp;          /*%< "listen-on" DSCP value */
        isc_refcount_t     ntcpaccepting; /*%< Number of clients
                                           *   ready to accept new
                                           *   TCP connections on this

diff --git a/lib/ns/include/ns/listenlist.h b/lib/ns/include/ns/listenlist.h
index cbb099c23819535b8f8910f67106b768b0837861..5d0a19b285110053de49ac1a55ca39417b7b55d3 100644 (file)
--- a/lib/ns/include/ns/listenlist.h
+++ b/lib/ns/include/ns/listenlist.h
@@ -44,7 +44,6 @@ struct ns_listenelt {
        isc_mem_t          *mctx;
        in_port_t           port;
        bool                is_http;
-       isc_dscp_t          dscp; /* -1 = not set, 0..63 */
        dns_acl_t          *acl;
        isc_tlsctx_t       *sslctx;
        isc_tlsctx_cache_t *sslctx_cache;
@@ -80,8 +79,8 @@ typedef struct ns_listen_tls_params {
  ***/
 
 isc_result_t
-ns_listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp,
-                   dns_acl_t *acl, const uint16_t family, bool tls,
+ns_listenelt_create(isc_mem_t *mctx, in_port_t port, dns_acl_t *acl,
+                   const uint16_t family, bool tls,
                    const ns_listen_tls_params_t *tls_params,
                    isc_tlsctx_cache_t *tlsctx_cache, ns_listenelt_t **target);
 /*%<
@@ -94,8 +93,8 @@ ns_listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp,
  */
 
 isc_result_t
-ns_listenelt_create_http(isc_mem_t *mctx, in_port_t http_port, isc_dscp_t dscp,
-                        dns_acl_t *acl, const uint16_t family, bool tls,
+ns_listenelt_create_http(isc_mem_t *mctx, in_port_t http_port, dns_acl_t *acl,
+                        const uint16_t family, bool tls,
                         const ns_listen_tls_params_t *tls_params,
                         isc_tlsctx_cache_t *tlsctx_cache, char **endpoints,
                         size_t nendpoints, const uint32_t max_clients,
@@ -129,9 +128,8 @@ ns_listenlist_detach(ns_listenlist_t **listp);
  */
 
 isc_result_t
-ns_listenlist_default(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp,
-                     bool enabled, const uint16_t family,
-                     ns_listenlist_t **target);
+ns_listenlist_default(isc_mem_t *mctx, in_port_t port, bool enabled,
+                     const uint16_t family, ns_listenlist_t **target);
 /*%<
  * Create a listen-on list with default contents, matching
  * all addresses with port 'port' (if 'enabled' is true),

diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c
index d9ccdeced8d05e2667d9699f207af24e8194aa9d..d10f41c0c208d1b50b2bce1f3d878d9d229ac5fc 100644 (file)
--- a/lib/ns/interfacemgr.c
+++ b/lib/ns/interfacemgr.c
@@ -465,9 +465,7 @@ interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, const char *name,
        REQUIRE(NS_INTERFACEMGR_VALID(mgr));
 
        ifp = isc_mem_get(mgr->mctx, sizeof(*ifp));
-       *ifp = (ns_interface_t){ .generation = mgr->generation,
-                                .addr = *addr,
-                                .dscp = -1 };
+       *ifp = (ns_interface_t){ .generation = mgr->generation, .addr = *addr };
 
        strlcpy(ifp->name, name, sizeof(ifp->name));
 
@@ -525,13 +523,6 @@ ns_interface_listentcp(ns_interface_t *ifp) {
                              isc_result_totext(result));
        }
 
-#if 0
-       if (ifp->dscp != -1) {
-               isc_socket_dscp(ifp->tcpsocket,ifp->dscp);
-       }
-
-       (void)isc_socket_filter(ifp->tcpsocket,"dataready");
-#endif /* if 0 */
        return (result);
 }
 
@@ -679,7 +670,6 @@ interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, const char *name,
                REQUIRE(!LISTENING(ifp));
        }
 
-       ifp->dscp = elt->dscp;
        ifp->flags |= NS_INTERFACEFLAG_LISTENING;
 
        if (elt->is_http) {
@@ -1089,17 +1079,6 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) {
                        ifp = find_matching_interface(mgr, &listen_addr);
                        if (ifp != NULL) {
                                ifp->generation = mgr->generation;
-                               if (le->dscp != -1 && ifp->dscp == -1) {
-                                       ifp->dscp = le->dscp;
-                               } else if (le->dscp != ifp->dscp) {
-                                       isc_sockaddr_format(&listen_addr, sabuf,
-                                                           sizeof(sabuf));
-                                       isc_log_write(IFMGR_COMMON_LOGARGS,
-                                                     ISC_LOG_WARNING,
-                                                     "%s: conflicting DSCP "
-                                                     "values, using %d",
-                                                     sabuf, ifp->dscp);
-                               }
                                if (LISTENING(ifp)) {
                                        if (config) {
                                                update_listener_configuration(
@@ -1251,18 +1230,6 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) {
                        ifp = find_matching_interface(mgr, &listen_sockaddr);
                        if (ifp != NULL) {
                                ifp->generation = mgr->generation;
-                               if (le->dscp != -1 && ifp->dscp == -1) {
-                                       ifp->dscp = le->dscp;
-                               } else if (le->dscp != ifp->dscp) {
-                                       isc_sockaddr_format(&listen_sockaddr,
-                                                           sabuf,
-                                                           sizeof(sabuf));
-                                       isc_log_write(IFMGR_COMMON_LOGARGS,
-                                                     ISC_LOG_WARNING,
-                                                     "%s: conflicting DSCP "
-                                                     "values, using %d",
-                                                     sabuf, ifp->dscp);
-                               }
                                if (LISTENING(ifp)) {
                                        if (config) {
                                                update_listener_configuration(

diff --git a/lib/ns/listenlist.c b/lib/ns/listenlist.c
index d864ca97f17b949d6819dc8a430b4cd2f3796560..c0f9e5946a92e464d321f57317b1566cb6f63c0a 100644 (file)
--- a/lib/ns/listenlist.c
+++ b/lib/ns/listenlist.c
@@ -27,9 +27,9 @@ static void
 destroy(ns_listenlist_t *list);
 
 static isc_result_t
-listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp,
-                dns_acl_t *acl, const uint16_t family, const bool is_http,
-                bool tls, const ns_listen_tls_params_t *tls_params,
+listenelt_create(isc_mem_t *mctx, in_port_t port, dns_acl_t *acl,
+                const uint16_t family, const bool is_http, bool tls,
+                const ns_listen_tls_params_t *tls_params,
                 isc_tlsctx_cache_t *tlsctx_cache, ns_listenelt_t **target) {
        ns_listenelt_t *elt = NULL;
        isc_result_t result = ISC_R_SUCCESS;
@@ -174,7 +174,6 @@ listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp,
        ISC_LINK_INIT(elt, link);
        elt->port = port;
        elt->is_http = false;
-       elt->dscp = dscp;
        elt->acl = acl;
        elt->sslctx = sslctx;
        elt->sslctx_cache = NULL;
@@ -200,17 +199,17 @@ tls_error:
 }
 
 isc_result_t
-ns_listenelt_create(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp,
-                   dns_acl_t *acl, const uint16_t family, bool tls,
+ns_listenelt_create(isc_mem_t *mctx, in_port_t port, dns_acl_t *acl,
+                   const uint16_t family, bool tls,
                    const ns_listen_tls_params_t *tls_params,
                    isc_tlsctx_cache_t *tlsctx_cache, ns_listenelt_t **target) {
-       return listenelt_create(mctx, port, dscp, acl, family, false, tls,
-                               tls_params, tlsctx_cache, target);
+       return listenelt_create(mctx, port, acl, family, false, tls, tls_params,
+                               tlsctx_cache, target);
 }
 
 isc_result_t
-ns_listenelt_create_http(isc_mem_t *mctx, in_port_t http_port, isc_dscp_t dscp,
-                        dns_acl_t *acl, const uint16_t family, bool tls,
+ns_listenelt_create_http(isc_mem_t *mctx, in_port_t http_port, dns_acl_t *acl,
+                        const uint16_t family, bool tls,
                         const ns_listen_tls_params_t *tls_params,
                         isc_tlsctx_cache_t *tlsctx_cache, char **endpoints,
                         size_t nendpoints, const uint32_t max_clients,
@@ -221,7 +220,7 @@ ns_listenelt_create_http(isc_mem_t *mctx, in_port_t http_port, isc_dscp_t dscp,
        REQUIRE(endpoints != NULL && *endpoints != NULL);
        REQUIRE(nendpoints > 0);
 
-       result = listenelt_create(mctx, http_port, dscp, acl, family, true, tls,
+       result = listenelt_create(mctx, http_port, acl, family, true, tls,
                                  tls_params, tlsctx_cache, target);
        if (result == ISC_R_SUCCESS) {
                (*target)->is_http = true;
@@ -309,9 +308,8 @@ ns_listenlist_detach(ns_listenlist_t **listp) {
 }
 
 isc_result_t
-ns_listenlist_default(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp,
-                     bool enabled, const uint16_t family,
-                     ns_listenlist_t **target) {
+ns_listenlist_default(isc_mem_t *mctx, in_port_t port, bool enabled,
+                     const uint16_t family, ns_listenlist_t **target) {
        isc_result_t result;
        dns_acl_t *acl = NULL;
        ns_listenelt_t *elt = NULL;
@@ -327,8 +325,8 @@ ns_listenlist_default(isc_mem_t *mctx, in_port_t port, isc_dscp_t dscp,
                goto cleanup;
        }
 
-       result = ns_listenelt_create(mctx, port, dscp, acl, family, false, NULL,
-                                    NULL, &elt);
+       result = ns_listenelt_create(mctx, port, acl, family, false, NULL, NULL,
+                                    &elt);
        if (result != ISC_R_SUCCESS) {
                goto cleanup_acl;
        }

diff --git a/tests/dns/Makefile.am b/tests/dns/Makefile.am
index 25f593b3b309095e5d7e1a212fd9d71ceb895f68..d37caa5662f2f2b10393e8e8d5149548aa55cd4e 100644 (file)
--- a/tests/dns/Makefile.am
+++ b/tests/dns/Makefile.am
@@ -29,7 +29,6 @@ check_PROGRAMS =              \
        name_test               \
        nsec3_test              \
        nsec3param_test         \
-       peer_test               \
        private_test            \
        rbt_test                \
        rbtdb_test              \

diff --git a/tests/dns/dispatch_test.c b/tests/dns/dispatch_test.c
index ed046db9f13254f1b97d9e10cdd29bbe5ca073b6..e58ccb6acd68c7484f7d2f76ae0699e1ebdb36dd 100644 (file)
--- a/tests/dns/dispatch_test.c
+++ b/tests/dns/dispatch_test.c
@@ -413,7 +413,7 @@ connected(isc_result_t eresult, isc_region_t *region, void *cbarg) {
        UNUSED(eresult);
        UNUSED(region);
 
-       dns_dispatch_send(dispentry, r, -1);
+       dns_dispatch_send(dispentry, r);
 }
 
 static void
@@ -454,7 +454,7 @@ ISC_LOOP_TEST_IMPL(dispatch_timeout_tcp_connect) {
        assert_int_equal(result, ISC_R_SUCCESS);
 
        result = dns_dispatch_createtcp(dispatchmgr, &tcp_connect_addr,
-                                       &tcp_server_addr, -1, &dispatch);
+                                       &tcp_server_addr, &dispatch);
        assert_int_equal(result, ISC_R_SUCCESS);
        dns_dispatchmgr_detach(&dispatchmgr);
 
@@ -498,7 +498,7 @@ ISC_LOOP_TEST_IMPL(dispatch_timeout_tcp_response) {
        assert_int_equal(result, ISC_R_SUCCESS);
 
        result = dns_dispatch_createtcp(dispatchmgr, &tcp_connect_addr,
-                                       &tcp_server_addr, -1, &dispatch);
+                                       &tcp_server_addr, &dispatch);
        assert_int_equal(result, ISC_R_SUCCESS);
        dns_dispatchmgr_detach(&dispatchmgr);
 
@@ -532,7 +532,7 @@ ISC_LOOP_TEST_IMPL(dispatch_tcp_response) {
        assert_int_equal(result, ISC_R_SUCCESS);
 
        result = dns_dispatch_createtcp(dispatchmgr, &tcp_connect_addr,
-                                       &tcp_server_addr, -1, &dispatch);
+                                       &tcp_server_addr, &dispatch);
        assert_int_equal(result, ISC_R_SUCCESS);
        dns_dispatchmgr_detach(&dispatchmgr);
 
@@ -569,7 +569,7 @@ ISC_LOOP_TEST_IMPL(dispatch_tls_response) {
        assert_int_equal(result, ISC_R_SUCCESS);
 
        result = dns_dispatch_createtcp(dispatchmgr, &tls_connect_addr,
-                                       &tls_server_addr, -1, &dispatch);
+                                       &tls_server_addr, &dispatch);
        assert_int_equal(result, ISC_R_SUCCESS);
        dns_dispatchmgr_detach(&dispatchmgr);
 

diff --git a/tests/dns/peer_test.c b/tests/dns/peer_test.c
deleted file mode 100644 (file)
index 32ef932..0000000
--- a/tests/dns/peer_test.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#include <sched.h> /* IWYU pragma: keep */
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define UNIT_TESTING
-#include <cmocka.h>
-
-#include <isc/util.h>
-
-#include <dns/peer.h>
-
-#include <tests/dns.h>
-
-/* Test DSCP set/get functions */
-ISC_RUN_TEST_IMPL(dscp) {
-       isc_result_t result;
-       isc_netaddr_t netaddr;
-       struct in_addr ina;
-       dns_peer_t *peer = NULL;
-       isc_dscp_t dscp;
-
-       /*
-        * Create peer structure for the loopback address.
-        */
-       ina.s_addr = INADDR_LOOPBACK;
-       isc_netaddr_fromin(&netaddr, &ina);
-       result = dns_peer_new(mctx, &netaddr, &peer);
-       assert_int_equal(result, ISC_R_SUCCESS);
-
-       /*
-        * All should be not set on creation.
-        * 'dscp' should remain unchanged.
-        */
-       dscp = 100;
-       result = dns_peer_getquerydscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_NOTFOUND);
-       assert_int_equal(dscp, 100);
-
-       result = dns_peer_getnotifydscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_NOTFOUND);
-       assert_int_equal(dscp, 100);
-
-       result = dns_peer_gettransferdscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_NOTFOUND);
-       assert_int_equal(dscp, 100);
-
-       /*
-        * Test that setting query dscp does not affect the other
-        * dscp values.  'dscp' should remain unchanged until
-        * dns_peer_getquerydscp is called.
-        */
-       dscp = 100;
-       result = dns_peer_setquerydscp(peer, 1);
-       assert_int_equal(result, ISC_R_SUCCESS);
-
-       result = dns_peer_getnotifydscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_NOTFOUND);
-       assert_int_equal(dscp, 100);
-
-       result = dns_peer_gettransferdscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_NOTFOUND);
-       assert_int_equal(dscp, 100);
-
-       result = dns_peer_getquerydscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_SUCCESS);
-       assert_int_equal(dscp, 1);
-
-       /*
-        * Test that setting notify dscp does not affect the other
-        * dscp values.  'dscp' should remain unchanged until
-        * dns_peer_getquerydscp is called then should change again
-        * on dns_peer_getnotifydscp.
-        */
-       dscp = 100;
-       result = dns_peer_setnotifydscp(peer, 2);
-       assert_int_equal(result, ISC_R_SUCCESS);
-
-       result = dns_peer_gettransferdscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_NOTFOUND);
-       assert_int_equal(dscp, 100);
-
-       result = dns_peer_getquerydscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_SUCCESS);
-       assert_int_equal(dscp, 1);
-
-       result = dns_peer_getnotifydscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_SUCCESS);
-       assert_int_equal(dscp, 2);
-
-       /*
-        * Test that setting notify dscp does not affect the other
-        * dscp values.  Check that appropriate values are returned.
-        */
-       dscp = 100;
-       result = dns_peer_settransferdscp(peer, 3);
-       assert_int_equal(result, ISC_R_SUCCESS);
-
-       result = dns_peer_getquerydscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_SUCCESS);
-       assert_int_equal(dscp, 1);
-
-       result = dns_peer_getnotifydscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_SUCCESS);
-       assert_int_equal(dscp, 2);
-
-       result = dns_peer_gettransferdscp(peer, &dscp);
-       assert_int_equal(result, ISC_R_SUCCESS);
-       assert_int_equal(dscp, 3);
-
-       dns_peer_detach(&peer);
-}
-
-ISC_TEST_LIST_START
-
-ISC_TEST_ENTRY(dscp)
-
-ISC_TEST_LIST_END
-
-ISC_TEST_MAIN

diff --git a/tests/libtest/ns.c b/tests/libtest/ns.c
index 079d80b8d7c95932223f566b787efab75b4f9812..55603feb8ee27d7efffda3cdad55a6cd88df59ae 100644 (file)
--- a/tests/libtest/ns.c
+++ b/tests/libtest/ns.c
@@ -100,8 +100,7 @@ setup_server(void **state) {
                goto cleanup;
        }
 
-       result = ns_listenlist_default(mctx, port, -1, true, AF_INET,
-                                      &listenon);
+       result = ns_listenlist_default(mctx, port, true, AF_INET, &listenon);
        if (result != ISC_R_SUCCESS) {
                goto cleanup;
        }

diff --git a/tests/ns/listenlist_test.c b/tests/ns/listenlist_test.c
index a8cb8d37d5a9843a16d3894f834ffd6de6f4809e..322a98dcb1965eac4f95b7a1ae79b0a95d03f8c1 100644 (file)
--- a/tests/ns/listenlist_test.c
+++ b/tests/ns/listenlist_test.c
@@ -45,7 +45,7 @@ ISC_RUN_TEST_IMPL(ns_listenlist_default) {
 
        UNUSED(state);
 
-       result = ns_listenlist_default(mctx, port, -1, false, AF_INET, &list);
+       result = ns_listenlist_default(mctx, port, false, AF_INET, &list);
        assert_int_equal(result, ISC_R_SUCCESS);
        assert_non_null(list);
 
@@ -72,7 +72,7 @@ ISC_RUN_TEST_IMPL(ns_listenlist_default) {
 
        ns_listenlist_detach(&list);
 
-       result = ns_listenlist_default(mctx, port, -1, true, AF_INET, &list);
+       result = ns_listenlist_default(mctx, port, true, AF_INET, &list);
        assert_int_equal(result, ISC_R_SUCCESS);
 
        assert_false(ISC_LIST_EMPTY(list->elts));