nice names for high query types.

git-svn-id: file:///svn/unbound/trunk@1249 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/contrib/unbound_munin_ b/contrib/unbound_munin_
index 41e2b7563da50273486616c393538d8bbfe8db1e..34a2179d649fdee0efc010f9a80fa82218cb11b0 100755 (executable)
--- a/contrib/unbound_munin_
+++ b/contrib/unbound_munin_
@@ -294,7 +294,7 @@ if test "$1" = "config" ; then
                p_config "num.query.flags.CD" "CD (check disabled) flag"
                p_config "num.query.edns.present" "EDNS OPT present"
                p_config "num.query.edns.DO" "DO (DNSSEC OK) flag"
-               echo "graph_info This graphs plots the flags inside incoming queries. For example, if QR, AA, TC, RA, Z flags are set, this query is junk. RD, AD, CD and DO are legitimately set by some software."
+               echo "graph_info This graphs plots the flags inside incoming queries. For example, if QR, AA, TC, RA, Z flags are set, the query can be rejected. RD, AD, CD and DO are legitimately set by some software."
                ;;
        esac
 

diff --git a/daemon/remote.c b/daemon/remote.c
index 3c9ac1f19218c00c224cc922736bd88de5815dbd..a84244c7659e783f7b23fcf99cf158e1d897b639 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -671,6 +671,16 @@ print_ext(SSL* ssl, struct stats_info* s)
                desc = ldns_rr_descript((uint16_t)i);
                if(desc && desc->_name) {
                        snprintf(nm, sizeof(nm), "%s", desc->_name);
+               } else if (i == LDNS_RR_TYPE_IXFR) {
+                       snprintf(nm, sizeof(nm), "IXFR");
+               } else if (i == LDNS_RR_TYPE_AXFR) {
+                       snprintf(nm, sizeof(nm), "AXFR");
+               } else if (i == LDNS_RR_TYPE_MAILA) {
+                       snprintf(nm, sizeof(nm), "MAILA");
+               } else if (i == LDNS_RR_TYPE_MAILB) {
+                       snprintf(nm, sizeof(nm), "MAILB");
+               } else if (i == LDNS_RR_TYPE_ANY) {
+                       snprintf(nm, sizeof(nm), "ANY");
                } else {
                        snprintf(nm, sizeof(nm), "TYPE%d", i);
                }