upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 01:42:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[master] traffic size stats

Browse source 
4156.	[func]		Added statistics counters to track the sizes
			of incoming queries and outgoing responses in
			histogram buckets, as specified in RSSAC002.
			[RT #39049]
This commit is contained in:
Evan Hunt 2015-07-06 22:20:03 -07:00
parent 474b70711c
commit 70d987def5
20 changed files with 1747 additions and 349 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,3 +1,8 @@
4156. [func] Added statistics counters to track the sizes
of incoming queries and outgoing responses in
histogram buckets, as specified in RSSAC002.
[RT #39049]
4155. [func] Allow RPZ rewrite logging to be configured on a
per-zone basis using a newly introduced log clause in
the response-policy option. [RT #39754]

759
bin/named/bind9.xsl
View file

@ -15,12 +15,9 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id$ -->
<!-- %Id: bind9.xsl,v 1.21 2009/01/27 23:47:54 tbox Exp % -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
<xsl:output method="html" indent="yes" version="4.0"/>
<xsl:template match="statistics[@version=&quot;3.5&quot;]">
<xsl:template match="statistics[@version=&quot;3.6&quot;]">
<html>
<head>
<xsl:if test="system-property('xsl:vendor')!='Transformiix'">
@ -276,8 +273,9 @@
<a href="/xml/v3/server">Server</a>,
<a href="/xml/v3/zones">Zones</a>,
<a href="/xml/v3/net">Network</a>,
<a href="/xml/v3/tasks">Tasks</a> and
<a href="/xml/v3/mem">Memory</a></p>
<a href="/xml/v3/tasks">Tasks</a>,
<a href="/xml/v3/mem">Memory</a> and
<a href="/xml/v3/traffic">Traffic Size</a></p>
<hr/>
<h2>Server Status</h2>
<table class="info">
@ -596,336 +594,431 @@
</xsl:if>
</xsl:for-each>
<xsl:if test="server/counters[@type=&quot;sockstat&quot;]/counter[.&gt;0]">
<h2>Socket I/O Statistics</h2>
<table class="counters">
<xsl:for-each select="server/counters[@type=&quot;sockstat&quot;]/counter[.&gt;0]">
<xsl:variable name="css-class7">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class7}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
<xsl:if test="traffic/udp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0] or traffic/udp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0] or traffic/tcp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0] or traffic/tcp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]">
<h2>Traffic Size Statistics</h2>
</xsl:if>
<xsl:if test="views/view[zones/zone/counters[@type=&quot;qtype&quot;]/counter &gt;0]">
<h2>Received QTYPES per view/zone</h2>
<xsl:for-each select="views/view[zones/zone/counters[@type=&quot;qtype&quot;]/counter &gt;0]">
<h3>View <xsl:value-of select="@name"/></h3>
<xsl:variable name="thisview">
<xsl:value-of select="@name"/>
</xsl:variable>
<xsl:for-each select="zones/zone">
<xsl:if test="counters[@type=&quot;qtype&quot;]/counter[count(.) &gt; 0]">
<h4>Zone <xsl:value-of select="@name"/></h4>
<xsl:if test="system-property('xsl:vendor')!='Transformiix'">
<!-- Non Mozilla specific markup -->
<script type="text/javascript">
graphs.push({
'title': "Query types for zone <xsl:value-of select="@name"/>",
'target': 'chart_qtype_<xsl:value-of select="../../@name"/>_<xsl:value-of select="@name"/>',
'style': 'barchart',
'data': [['Type','Counter'],<xsl:for-each select="counters[@type=&quot;qtype&quot;]/counter[.&gt;0 and @name != &quot;QryAuthAns&quot;]">['<xsl:value-of select="@name"/>',<xsl:value-of select="."/>],</xsl:for-each>]
});
<xsl:if test="traffic/udp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0]">
<h4>UDP Requests Received</h4>
<table class="counters">
<xsl:for-each select="traffic/udp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0]">
<xsl:variable name="css-class7">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class7}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
</script>
<xsl:variable name="target">
<xsl:value-of select="@name"/>
</xsl:variable>
<div class="pie" id="chart_qtype_{$thisview}_{$target}">[no data to display]</div>
</xsl:if>
<table class="counters">
<xsl:for-each select="counters[@type=&quot;qtype&quot;]/counter">
<xsl:sort select="."/>
<xsl:variable name="css-class10">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class10}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</xsl:if>
<xsl:if test="views/view[zones/zone/counters[@type=&quot;rcode&quot;]/counter &gt;0]">
<h2>Response Codes per view/zone</h2>
<xsl:for-each select="views/view[zones/zone/counters[@type=&quot;rcode&quot;]/counter &gt;0]">
<h3>View <xsl:value-of select="@name"/></h3>
<xsl:variable name="thisview2">
<xsl:value-of select="@name"/>
</xsl:variable>
<xsl:for-each select="zones/zone">
<xsl:if test="counters[@type=&quot;rcode&quot;]/counter[. &gt; 0]">
<h4>Zone <xsl:value-of select="@name"/></h4>
<xsl:if test="system-property('xsl:vendor')!='Transformiix'">
<!-- Non Mozilla specific markup -->
<script type="text/javascript">
graphs.push({
'title': "Response codes for zone <xsl:value-of select="@name"/>",
'target': 'chart_rescode_<xsl:value-of select="../../@name"/>_<xsl:value-of select="@name"/>',
'style': 'barchart',
'data': [['Type','Counter'],<xsl:for-each select="counters[@type=&quot;rcode&quot;]/counter[.&gt;0 and @name != &quot;QryAuthAns&quot;]">['<xsl:value-of select="@name"/>',<xsl:value-of select="."/>],</xsl:for-each>]
});
<xsl:if test="traffic/udp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]">
<h4>UDP Responses Sent</h4>
<table class="counters">
<xsl:for-each select="traffic/udp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]">
<xsl:variable name="css-class7">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class7}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
</script>
<xsl:variable name="target">
<xsl:value-of select="@name"/>
</xsl:variable>
<div class="pie" id="chart_rescode_{$thisview2}_{$target}">[no data to display]</div>
</xsl:if>
<table class="counters">
<xsl:for-each select="counters[@type=&quot;rcode&quot;]/counter[.&gt;0 and @name != &quot;QryAuthAns&quot;]">
<xsl:sort select="."/>
<xsl:variable name="css-class11">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class11}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</xsl:if>
<xsl:if test="socketmgr/sockets/socket">
<h2>Network Status</h2>
<table class="netstat">
<tr>
<th>ID</th>
<th>Name</th>
<th>Type</th>
<th>References</th>
<th>LocalAddress</th>
<th>PeerAddress</th>
<th>State</th>
</tr>
<xsl:for-each select="socketmgr/sockets/socket">
<xsl:sort select="id"/>
<xsl:variable name="css-class12">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class12}">
<td>
<xsl:value-of select="id"/>
</td>
<td>
<xsl:value-of select="name"/>
</td>
<td>
<xsl:value-of select="type"/>
</td>
<td>
<xsl:value-of select="references"/>
</td>
<td>
<xsl:value-of select="local-address"/>
</td>
<td>
<xsl:value-of select="peer-address"/>
</td>
<td>
<xsl:for-each select="states">
<xsl:value-of select="."/>
</xsl:for-each>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
<xsl:if test="taskmgr/thread-model/type">
<h2>Task Manager Configuration</h2>
<table class="counters">
<tr>
<th class="even">Thread-Model</th>
<td>
<xsl:value-of select="taskmgr/thread-model/type"/>
</td>
</tr>
<tr class="odd">
<th>Worker Threads</th>
<td>
<xsl:value-of select="taskmgr/thread-model/worker-threads"/>
</td>
</tr>
<tr class="even">
<th>Default Quantum</th>
<td>
<xsl:value-of select="taskmgr/thread-model/default-quantum"/>
</td>
</tr>
<tr class="odd">
<th>Tasks Running</th>
<td>
<xsl:value-of select="taskmgr/thread-model/tasks-running"/>
</td>
</tr>
<tr class="even">
<th>Tasks Ready</th>
<td>
<xsl:value-of select="taskmgr/thread-model/tasks-ready"/>
</td>
</tr>
</table>
<br/>
</xsl:if>
<xsl:if test="taskmgr/tasks/task">
<h2>Tasks</h2>
<table class="tasks">
<tr>
<th>ID</th>
<th>Name</th>
<th>References</th>
<th>State</th>
<th>Quantum</th>
<th>Events</th>
</tr>
<xsl:for-each select="taskmgr/tasks/task">
<xsl:sort select="name"/>
<xsl:variable name="css-class14">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class14}">
<td>
<xsl:value-of select="id"/>
</td>
<td>
<xsl:value-of select="name"/>
</td>
<td>
<xsl:value-of select="references"/>
</td>
<td>
<xsl:value-of select="state"/>
</td>
<td>
<xsl:value-of select="quantum"/>
</td>
<td>
<xsl:value-of select="events"/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
<xsl:if test="memory/summary">
<h2>Memory Usage Summary</h2>
<table class="counters">
<xsl:for-each select="memory/summary/*">
<xsl:variable name="css-class13">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class13}">
<th>
<xsl:value-of select="name()"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
<xsl:if test="memory/contexts/context">
<h2>Memory Contexts</h2>
<table class="mctx">
<tr>
<th>ID</th>
<th>Name</th>
<th>References</th>
<th>TotalUse</th>
<th>InUse</th>
<th>MaxUse</th>
<th>BlockSize</th>
<th>Pools</th>
<th>HiWater</th>
<th>LoWater</th>
</tr>
<xsl:for-each select="memory/contexts/context">
<xsl:sort select="total" data-type="number" order="descending"/>
<xsl:variable name="css-class14">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class14}">
<td>
<xsl:value-of select="id"/>
</td>
<td>
<xsl:value-of select="name"/>
</td>
<td>
<xsl:value-of select="references"/>
</td>
<td>
<xsl:value-of select="total"/>
</td>
<td>
<xsl:value-of select="inuse"/>
</td>
<td>
<xsl:value-of select="maxinuse"/>
</td>
<td>
<xsl:value-of select="blocksize"/>
</td>
<td>
<xsl:value-of select="pools"/>
</td>
<td>
<xsl:value-of select="hiwater"/>
</td>
<td>
<xsl:value-of select="lowater"/>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
<hr/>
<p class="footer">Internet Systems Consortium Inc.<br/><a href="http://www.isc.org">http://www.isc.org</a></p>
<xsl:if test="traffic/tcp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0]">
<h4>TCP Requests Received</h4>
<table class="counters">
<xsl:for-each select="traffic/tcp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0]">
<xsl:variable name="css-class7">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class7}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
<xsl:if test="traffic/tcp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]">
<h4>TCP Responses Sent</h4>
<table class="counters">
<xsl:for-each select="traffic/tcp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]">
<xsl:variable name="css-class7">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class7}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
<xsl:if test="server/counters[@type=&quot;sockstat&quot;]/counter[.&gt;0]">
<h2>Socket I/O Statistics</h2>
<table class="counters">
<xsl:for-each select="server/counters[@type=&quot;sockstat&quot;]/counter[.&gt;0]">
<xsl:variable name="css-class7">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class7}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
<xsl:if test="views/view[zones/zone/counters[@type=&quot;qtype&quot;]/counter &gt;0]">
<h2>Received QTYPES per view/zone</h2>
<xsl:for-each select="views/view[zones/zone/counters[@type=&quot;qtype&quot;]/counter &gt;0]">
<h3>View <xsl:value-of select="@name"/></h3>
<xsl:variable name="thisview">
<xsl:value-of select="@name"/>
</xsl:variable>
<xsl:for-each select="zones/zone">
<xsl:if test="counters[@type=&quot;qtype&quot;]/counter[count(.) &gt; 0]">
<h4>Zone <xsl:value-of select="@name"/></h4>
<xsl:if test="system-property('xsl:vendor')!='Transformiix'">
<!-- Non Mozilla specific markup -->
<script type="text/javascript">
graphs.push({
'title': "Query types for zone <xsl:value-of select="@name"/>",
'target': 'chart_qtype_<xsl:value-of select="../../@name"/>_<xsl:value-of select="@name"/>',
'style': 'barchart',
'data': [['Type','Counter'],<xsl:for-each select="counters[@type=&quot;qtype&quot;]/counter[.&gt;0 and @name != &quot;QryAuthAns&quot;]">['<xsl:value-of select="@name"/>',<xsl:value-of select="."/>],</xsl:for-each>]
});
</script>
<xsl:variable name="target">
<xsl:value-of select="@name"/>
</xsl:variable>
<div class="pie" id="chart_qtype_{$thisview}_{$target}">[no data to display]</div>
</xsl:if>
<table class="counters">
<xsl:for-each select="counters[@type=&quot;qtype&quot;]/counter">
<xsl:sort select="."/>
<xsl:variable name="css-class10">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class10}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</xsl:if>
<xsl:if test="views/view[zones/zone/counters[@type=&quot;rcode&quot;]/counter &gt;0]">
<h2>Response Codes per view/zone</h2>
<xsl:for-each select="views/view[zones/zone/counters[@type=&quot;rcode&quot;]/counter &gt;0]">
<h3>View <xsl:value-of select="@name"/></h3>
<xsl:variable name="thisview2">
<xsl:value-of select="@name"/>
</xsl:variable>
<xsl:for-each select="zones/zone">
<xsl:if test="counters[@type=&quot;rcode&quot;]/counter[. &gt; 0]">
<h4>Zone <xsl:value-of select="@name"/></h4>
<xsl:if test="system-property('xsl:vendor')!='Transformiix'">
<!-- Non Mozilla specific markup -->
<script type="text/javascript">
graphs.push({
'title': "Response codes for zone <xsl:value-of select="@name"/>",
'target': 'chart_rescode_<xsl:value-of select="../../@name"/>_<xsl:value-of select="@name"/>',
'style': 'barchart',
'data': [['Type','Counter'],<xsl:for-each select="counters[@type=&quot;rcode&quot;]/counter[.&gt;0 and @name != &quot;QryAuthAns&quot;]">['<xsl:value-of select="@name"/>',<xsl:value-of select="."/>],</xsl:for-each>]
});
</script>
<xsl:variable name="target">
<xsl:value-of select="@name"/>
</xsl:variable>
<div class="pie" id="chart_rescode_{$thisview2}_{$target}">[no data to display]</div>
</xsl:if>
<table class="counters">
<xsl:for-each select="counters[@type=&quot;rcode&quot;]/counter[.&gt;0 and @name != &quot;QryAuthAns&quot;]">
<xsl:sort select="."/>
<xsl:variable name="css-class11">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class11}">
<th>
<xsl:value-of select="@name"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
</xsl:for-each>
</xsl:for-each>
</xsl:if>
<xsl:if test="socketmgr/sockets/socket">
<h2>Network Status</h2>
<table class="netstat">
<tr>
<th>ID</th>
<th>Name</th>
<th>Type</th>
<th>References</th>
<th>LocalAddress</th>
<th>PeerAddress</th>
<th>State</th>
</tr>
<xsl:for-each select="socketmgr/sockets/socket">
<xsl:sort select="id"/>
<xsl:variable name="css-class12">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class12}">
<td>
<xsl:value-of select="id"/>
</td>
<td>
<xsl:value-of select="name"/>
</td>
<td>
<xsl:value-of select="type"/>
</td>
<td>
<xsl:value-of select="references"/>
</td>
<td>
<xsl:value-of select="local-address"/>
</td>
<td>
<xsl:value-of select="peer-address"/>
</td>
<td>
<xsl:for-each select="states">
<xsl:value-of select="."/>
</xsl:for-each>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
<xsl:if test="taskmgr/thread-model/type">
<h2>Task Manager Configuration</h2>
<table class="counters">
<tr>
<th class="even">Thread-Model</th>
<td>
<xsl:value-of select="taskmgr/thread-model/type"/>
</td>
</tr>
<tr class="odd">
<th>Worker Threads</th>
<td>
<xsl:value-of select="taskmgr/thread-model/worker-threads"/>
</td>
</tr>
<tr class="even">
<th>Default Quantum</th>
<td>
<xsl:value-of select="taskmgr/thread-model/default-quantum"/>
</td>
</tr>
<tr class="odd">
<th>Tasks Running</th>
<td>
<xsl:value-of select="taskmgr/thread-model/tasks-running"/>
</td>
</tr>
<tr class="even">
<th>Tasks Ready</th>
<td>
<xsl:value-of select="taskmgr/thread-model/tasks-ready"/>
</td>
</tr>
</table>
<br/>
</xsl:if>
<xsl:if test="taskmgr/tasks/task">
<h2>Tasks</h2>
<table class="tasks">
<tr>
<th>ID</th>
<th>Name</th>
<th>References</th>
<th>State</th>
<th>Quantum</th>
<th>Events</th>
</tr>
<xsl:for-each select="taskmgr/tasks/task">
<xsl:sort select="name"/>
<xsl:variable name="css-class14">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class14}">
<td>
<xsl:value-of select="id"/>
</td>
<td>
<xsl:value-of select="name"/>
</td>
<td>
<xsl:value-of select="references"/>
</td>
<td>
<xsl:value-of select="state"/>
</td>
<td>
<xsl:value-of select="quantum"/>
</td>
<td>
<xsl:value-of select="events"/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
<xsl:if test="memory/summary">
<h2>Memory Usage Summary</h2>
<table class="counters">
<xsl:for-each select="memory/summary/*">
<xsl:variable name="css-class13">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class13}">
<th>
<xsl:value-of select="name()"/>
</th>
<td>
<xsl:value-of select="."/>
</td>
</tr>
</xsl:for-each>
</table>
<br/>
</xsl:if>
<xsl:if test="memory/contexts/context">
<h2>Memory Contexts</h2>
<table class="mctx">
<tr>
<th>ID</th>
<th>Name</th>
<th>References</th>
<th>TotalUse</th>
<th>InUse</th>
<th>MaxUse</th>
<th>BlockSize</th>
<th>Pools</th>
<th>HiWater</th>
<th>LoWater</th>
</tr>
<xsl:for-each select="memory/contexts/context">
<xsl:sort select="total" data-type="number" order="descending"/>
<xsl:variable name="css-class14">
<xsl:choose>
<xsl:when test="position() mod 2 = 0">even</xsl:when>
<xsl:otherwise>odd</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<tr class="{$css-class14}">
<td>
<xsl:value-of select="id"/>
</td>
<td>
<xsl:value-of select="name"/>
</td>
<td>
<xsl:value-of select="references"/>
</td>
<td>
<xsl:value-of select="total"/>
</td>
<td>
<xsl:value-of select="inuse"/>
</td>
<td>
<xsl:value-of select="maxinuse"/>
</td>
<td>
<xsl:value-of select="blocksize"/>
</td>
<td>
<xsl:value-of select="pools"/>
</td>
<td>
<xsl:value-of select="hiwater"/>
</td>
<td>
<xsl:value-of select="lowater"/>
</td>
</tr>
</xsl:for-each>
</table>
</xsl:if>
<hr/>
<p class="footer">Internet Systems Consortium Inc.<br/><a href="http://www.isc.org">http://www.isc.org</a></p>
</body>
</html>
</xsl:template>

107
bin/named/bind9.xsl.h
View file

@ -1,6 +1,6 @@
/*
* Generated by convertxsl.pl 1.14 2008/07/17 23:43:26 jinmei Exp
* From <!-- %Id: bind9.xsl 1.21 2009/01/27 23:47:54 tbox Exp %
* From unknown
*/
static char xslmsg[] =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@ -20,12 +20,9 @@ static char xslmsg[] =
" - PERFORMANCE OF THIS SOFTWARE.\n"
"-->\n"
"\n"
"<!-- $Id$ -->\n"
"\n"
"<!-- \045Id: bind9.xsl,v 1.21 2009/01/27 23:47:54 tbox Exp \045 -->\n"
"<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" xmlns=\"http://www.w3.org/1999/xhtml\" version=\"1.0\">\n"
" <xsl:output method=\"html\" indent=\"yes\" version=\"4.0\"/>\n"
" <xsl:template match=\"statistics[@version=&quot;3.5&quot;]\">\n"
" <xsl:template match=\"statistics[@version=&quot;3.6&quot;]\">\n"
" <html>\n"
" <head>\n"
" <xsl:if test=\"system-property('xsl:vendor')!='Transformiix'\">\n"
@ -281,8 +278,9 @@ static char xslmsg[] =
" <a href=\"/xml/v3/server\">Server</a>,\n"
" <a href=\"/xml/v3/zones\">Zones</a>,\n"
" <a href=\"/xml/v3/net\">Network</a>,\n"
" <a href=\"/xml/v3/tasks\">Tasks</a> and\n"
" <a href=\"/xml/v3/mem\">Memory</a></p>\n"
" <a href=\"/xml/v3/tasks\">Tasks</a>,\n"
" <a href=\"/xml/v3/mem\">Memory</a> and\n"
" <a href=\"/xml/v3/traffic\">Traffic Size</a></p>\n"
" <hr/>\n"
" <h2>Server Status</h2>\n"
" <table class=\"info\">\n"
@ -601,6 +599,101 @@ static char xslmsg[] =
" </xsl:if>\n"
" </xsl:for-each>\n"
"\n"
" <xsl:if test=\"traffic/udp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0] or traffic/udp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0] or traffic/tcp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0] or traffic/tcp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]\">\n"
" <h2>Traffic Size Statistics</h2>\n"
" </xsl:if>\n"
" <xsl:if test=\"traffic/udp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0]\">\n"
" <h4>UDP Requests Received</h4>\n"
" <table class=\"counters\">\n"
" <xsl:for-each select=\"traffic/udp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0]\">\n"
" <xsl:variable name=\"css-class7\">\n"
" <xsl:choose>\n"
" <xsl:when test=\"position() mod 2 = 0\">even</xsl:when>\n"
" <xsl:otherwise>odd</xsl:otherwise>\n"
" </xsl:choose>\n"
" </xsl:variable>\n"
" <tr class=\"{$css-class7}\">\n"
" <th>\n"
" <xsl:value-of select=\"@name\"/>\n"
" </th>\n"
" <td>\n"
" <xsl:value-of select=\".\"/>\n"
" </td>\n"
" </tr>\n"
" </xsl:for-each>\n"
" </table>\n"
" <br/>\n"
" </xsl:if>\n"
"\n"
" <xsl:if test=\"traffic/udp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]\">\n"
" <h4>UDP Responses Sent</h4>\n"
" <table class=\"counters\">\n"
" <xsl:for-each select=\"traffic/udp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]\">\n"
" <xsl:variable name=\"css-class7\">\n"
" <xsl:choose>\n"
" <xsl:when test=\"position() mod 2 = 0\">even</xsl:when>\n"
" <xsl:otherwise>odd</xsl:otherwise>\n"
" </xsl:choose>\n"
" </xsl:variable>\n"
" <tr class=\"{$css-class7}\">\n"
" <th>\n"
" <xsl:value-of select=\"@name\"/>\n"
" </th>\n"
" <td>\n"
" <xsl:value-of select=\".\"/>\n"
" </td>\n"
" </tr>\n"
" </xsl:for-each>\n"
" </table>\n"
" <br/>\n"
" </xsl:if>\n"
"\n"
" <xsl:if test=\"traffic/tcp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0]\">\n"
" <h4>TCP Requests Received</h4>\n"
" <table class=\"counters\">\n"
" <xsl:for-each select=\"traffic/tcp/counters[@type=&quot;request-size&quot;]/counter[.&gt;0]\">\n"
" <xsl:variable name=\"css-class7\">\n"
" <xsl:choose>\n"
" <xsl:when test=\"position() mod 2 = 0\">even</xsl:when>\n"
" <xsl:otherwise>odd</xsl:otherwise>\n"
" </xsl:choose>\n"
" </xsl:variable>\n"
" <tr class=\"{$css-class7}\">\n"
" <th>\n"
" <xsl:value-of select=\"@name\"/>\n"
" </th>\n"
" <td>\n"
" <xsl:value-of select=\".\"/>\n"
" </td>\n"
" </tr>\n"
" </xsl:for-each>\n"
" </table>\n"
" <br/>\n"
" </xsl:if>\n"
"\n"
" <xsl:if test=\"traffic/tcp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]\">\n"
" <h4>TCP Responses Sent</h4>\n"
" <table class=\"counters\">\n"
" <xsl:for-each select=\"traffic/tcp/counters[@type=&quot;response-size&quot;]/counter[.&gt;0]\">\n"
" <xsl:variable name=\"css-class7\">\n"
" <xsl:choose>\n"
" <xsl:when test=\"position() mod 2 = 0\">even</xsl:when>\n"
" <xsl:otherwise>odd</xsl:otherwise>\n"
" </xsl:choose>\n"
" </xsl:variable>\n"
" <tr class=\"{$css-class7}\">\n"
" <th>\n"
" <xsl:value-of select=\"@name\"/>\n"
" </th>\n"
" <td>\n"
" <xsl:value-of select=\".\"/>\n"
" </td>\n"
" </tr>\n"
" </xsl:for-each>\n"
" </table>\n"
" <br/>\n"
" </xsl:if>\n"
"\n"
" <xsl:if test=\"server/counters[@type=&quot;sockstat&quot;]/counter[.&gt;0]\">\n"
" <h2>Socket I/O Statistics</h2>\n"
" <table class=\"counters\">\n"

25
bin/named/client.c
View file

@ -982,6 +982,7 @@ client_send(ns_client_t *client) {
unsigned int render_opts;
unsigned int preferred_glue;
isc_boolean_t opt_included = ISC_FALSE;
size_t respsize;
REQUIRE(NS_CLIENT_VALID(client));
@ -1123,12 +1124,23 @@ client_send(ns_client_t *client) {
isc_buffer_usedregion(&buffer, &r);
isc_buffer_putuint16(&tcpbuffer, (isc_uint16_t) r.length);
isc_buffer_add(&tcpbuffer, r.length);
respsize = isc_buffer_usedlength(&tcpbuffer);
result = client_sendpkg(client, &tcpbuffer);
} else
isc_stats_increment(ns_g_server->tcpoutstats,
ISC_MIN(respsize / 16, 256));
} else {
respsize = isc_buffer_usedlength(&buffer);
result = client_sendpkg(client, &buffer);
isc_stats_increment(ns_g_server->udpoutstats,
ISC_MIN(respsize / 16, 256));
}
/* update statistics (XXXJT: is it okay to access message->xxxkey?) */
isc_stats_increment(ns_g_server->nsstats, dns_nsstatscounter_response);
if (opt_included) {
isc_stats_increment(ns_g_server->nsstats,
dns_nsstatscounter_edns0out);
@ -2013,6 +2025,7 @@ client_request(isc_task_t *task, isc_event_t *event) {
dns_messageid_t id;
unsigned int flags;
isc_boolean_t notimp;
size_t reqsize;
REQUIRE(event != NULL);
client = event->ev_arg;
@ -2066,6 +2079,8 @@ client_request(isc_task_t *task, isc_event_t *event) {
client->nreads--;
}
reqsize = isc_buffer_usedlength(buffer);
if (exit_check(client))
goto cleanup;
client->state = client->newstate = NS_CLIENTSTATE_WORKING;
@ -2177,9 +2192,15 @@ client_request(isc_task_t *task, isc_event_t *event) {
isc_stats_increment(ns_g_server->nsstats,
dns_nsstatscounter_requestv6);
}
if (TCP_CLIENT(client))
if (TCP_CLIENT(client)) {
isc_stats_increment(ns_g_server->nsstats,
dns_nsstatscounter_requesttcp);
isc_stats_increment(ns_g_server->tcpinstats,
ISC_MIN(reqsize / 16, 18));
} else {
isc_stats_increment(ns_g_server->udpinstats,
ISC_MIN(reqsize / 16, 18));
}
/*
* It's a request. Parse it.

293
bin/named/include/named/server.h
View file

@ -101,6 +101,10 @@ struct ns_server {
isc_stats_t * zonestats; /*% Zone management stats */
isc_stats_t * resolverstats; /*% Resolver stats */
isc_stats_t * sockstats; /*%< Socket stats */
isc_stats_t * udpinstats; /*%< Traffic size: UDP in */
isc_stats_t * udpoutstats; /*%< Traffic size: UDP out */
isc_stats_t * tcpinstats; /*%< Traffic size: TCP in */
isc_stats_t * tcpoutstats; /*%< Traffic size: TCP out */
ns_controls_t * controls; /*%< Control channels */
unsigned int dispatchgen;
@ -202,6 +206,295 @@ enum {
dns_nsstatscounter_max = 56
};
/*%
* Traffic size statistics counters. Used as isc_statscounter_t values.
*/
enum {
dns_sizecounter_in_0 = 0,
dns_sizecounter_in_16 = 1,
dns_sizecounter_in_32 = 2,
dns_sizecounter_in_48 = 3,
dns_sizecounter_in_64 = 4,
dns_sizecounter_in_80 = 5,
dns_sizecounter_in_96 = 6,
dns_sizecounter_in_112 = 7,
dns_sizecounter_in_128 = 8,
dns_sizecounter_in_144 = 9,
dns_sizecounter_in_160 = 10,
dns_sizecounter_in_176 = 11,
dns_sizecounter_in_192 = 12,
dns_sizecounter_in_208 = 13,
dns_sizecounter_in_224 = 14,
dns_sizecounter_in_240 = 15,
dns_sizecounter_in_256 = 16,
dns_sizecounter_in_272 = 17,
dns_sizecounter_in_288 = 18,
dns_sizecounter_in_max = 19,
};
enum {
dns_sizecounter_out_0 = 0,
dns_sizecounter_out_16 = 1,
dns_sizecounter_out_32 = 2,
dns_sizecounter_out_48 = 3,
dns_sizecounter_out_64 = 4,
dns_sizecounter_out_80 = 5,
dns_sizecounter_out_96 = 6,
dns_sizecounter_out_112 = 7,
dns_sizecounter_out_128 = 8,
dns_sizecounter_out_144 = 9,
dns_sizecounter_out_160 = 10,
dns_sizecounter_out_176 = 11,
dns_sizecounter_out_192 = 12,
dns_sizecounter_out_208 = 13,
dns_sizecounter_out_224 = 14,
dns_sizecounter_out_240 = 15,
dns_sizecounter_out_256 = 16,
dns_sizecounter_out_272 = 17,
dns_sizecounter_out_288 = 18,
dns_sizecounter_out_304 = 19,
dns_sizecounter_out_320 = 20,
dns_sizecounter_out_336 = 21,
dns_sizecounter_out_352 = 22,
dns_sizecounter_out_368 = 23,
dns_sizecounter_out_384 = 24,
dns_sizecounter_out_400 = 25,
dns_sizecounter_out_416 = 26,
dns_sizecounter_out_432 = 27,
dns_sizecounter_out_448 = 28,
dns_sizecounter_out_464 = 29,
dns_sizecounter_out_480 = 30,
dns_sizecounter_out_496 = 31,
dns_sizecounter_out_512 = 32,
dns_sizecounter_out_528 = 33,
dns_sizecounter_out_544 = 34,
dns_sizecounter_out_560 = 35,
dns_sizecounter_out_576 = 36,
dns_sizecounter_out_592 = 37,
dns_sizecounter_out_608 = 38,
dns_sizecounter_out_624 = 39,
dns_sizecounter_out_640 = 40,
dns_sizecounter_out_656 = 41,
dns_sizecounter_out_672 = 42,
dns_sizecounter_out_688 = 43,
dns_sizecounter_out_704 = 44,
dns_sizecounter_out_720 = 45,
dns_sizecounter_out_736 = 46,
dns_sizecounter_out_752 = 47,
dns_sizecounter_out_768 = 48,
dns_sizecounter_out_784 = 49,
dns_sizecounter_out_800 = 50,
dns_sizecounter_out_816 = 51,
dns_sizecounter_out_832 = 52,
dns_sizecounter_out_848 = 53,
dns_sizecounter_out_864 = 54,
dns_sizecounter_out_880 = 55,
dns_sizecounter_out_896 = 56,
dns_sizecounter_out_912 = 57,
dns_sizecounter_out_928 = 58,
dns_sizecounter_out_944 = 59,
dns_sizecounter_out_960 = 60,
dns_sizecounter_out_976 = 61,
dns_sizecounter_out_992 = 62,
dns_sizecounter_out_1008 = 63,
dns_sizecounter_out_1024 = 64,
dns_sizecounter_out_1040 = 65,
dns_sizecounter_out_1056 = 66,
dns_sizecounter_out_1072 = 67,
dns_sizecounter_out_1088 = 68,
dns_sizecounter_out_1104 = 69,
dns_sizecounter_out_1120 = 70,
dns_sizecounter_out_1136 = 71,
dns_sizecounter_out_1152 = 72,
dns_sizecounter_out_1168 = 73,
dns_sizecounter_out_1184 = 74,
dns_sizecounter_out_1200 = 75,
dns_sizecounter_out_1216 = 76,
dns_sizecounter_out_1232 = 77,
dns_sizecounter_out_1248 = 78,
dns_sizecounter_out_1264 = 79,
dns_sizecounter_out_1280 = 80,
dns_sizecounter_out_1296 = 81,
dns_sizecounter_out_1312 = 82,
dns_sizecounter_out_1328 = 83,
dns_sizecounter_out_1344 = 84,
dns_sizecounter_out_1360 = 85,
dns_sizecounter_out_1376 = 86,
dns_sizecounter_out_1392 = 87,
dns_sizecounter_out_1408 = 88,
dns_sizecounter_out_1424 = 89,
dns_sizecounter_out_1440 = 90,
dns_sizecounter_out_1456 = 91,
dns_sizecounter_out_1472 = 92,
dns_sizecounter_out_1488 = 93,
dns_sizecounter_out_1504 = 94,
dns_sizecounter_out_1520 = 95,
dns_sizecounter_out_1536 = 96,
dns_sizecounter_out_1552 = 97,
dns_sizecounter_out_1568 = 98,
dns_sizecounter_out_1584 = 99,
dns_sizecounter_out_1600 = 100,
dns_sizecounter_out_1616 = 101,
dns_sizecounter_out_1632 = 102,
dns_sizecounter_out_1648 = 103,
dns_sizecounter_out_1664 = 104,
dns_sizecounter_out_1680 = 105,
dns_sizecounter_out_1696 = 106,
dns_sizecounter_out_1712 = 107,
dns_sizecounter_out_1728 = 108,
dns_sizecounter_out_1744 = 109,
dns_sizecounter_out_1760 = 110,
dns_sizecounter_out_1776 = 111,
dns_sizecounter_out_1792 = 112,
dns_sizecounter_out_1808 = 113,
dns_sizecounter_out_1824 = 114,
dns_sizecounter_out_1840 = 115,
dns_sizecounter_out_1856 = 116,
dns_sizecounter_out_1872 = 117,
dns_sizecounter_out_1888 = 118,
dns_sizecounter_out_1904 = 119,
dns_sizecounter_out_1920 = 120,
dns_sizecounter_out_1936 = 121,
dns_sizecounter_out_1952 = 122,
dns_sizecounter_out_1968 = 123,
dns_sizecounter_out_1984 = 124,
dns_sizecounter_out_2000 = 125,
dns_sizecounter_out_2016 = 126,
dns_sizecounter_out_2032 = 127,
dns_sizecounter_out_2048 = 128,
dns_sizecounter_out_2064 = 129,
dns_sizecounter_out_2080 = 130,
dns_sizecounter_out_2096 = 131,
dns_sizecounter_out_2112 = 132,
dns_sizecounter_out_2128 = 133,
dns_sizecounter_out_2144 = 134,
dns_sizecounter_out_2160 = 135,
dns_sizecounter_out_2176 = 136,
dns_sizecounter_out_2192 = 137,
dns_sizecounter_out_2208 = 138,
dns_sizecounter_out_2224 = 139,
dns_sizecounter_out_2240 = 140,
dns_sizecounter_out_2256 = 141,
dns_sizecounter_out_2272 = 142,
dns_sizecounter_out_2288 = 143,
dns_sizecounter_out_2304 = 144,
dns_sizecounter_out_2320 = 145,
dns_sizecounter_out_2336 = 146,
dns_sizecounter_out_2352 = 147,
dns_sizecounter_out_2368 = 148,
dns_sizecounter_out_2384 = 149,
dns_sizecounter_out_2400 = 150,
dns_sizecounter_out_2416 = 151,
dns_sizecounter_out_2432 = 152,
dns_sizecounter_out_2448 = 153,
dns_sizecounter_out_2464 = 154,
dns_sizecounter_out_2480 = 155,
dns_sizecounter_out_2496 = 156,
dns_sizecounter_out_2512 = 157,
dns_sizecounter_out_2528 = 158,
dns_sizecounter_out_2544 = 159,
dns_sizecounter_out_2560 = 160,
dns_sizecounter_out_2576 = 161,
dns_sizecounter_out_2592 = 162,
dns_sizecounter_out_2608 = 163,
dns_sizecounter_out_2624 = 164,
dns_sizecounter_out_2640 = 165,
dns_sizecounter_out_2656 = 166,
dns_sizecounter_out_2672 = 167,
dns_sizecounter_out_2688 = 168,
dns_sizecounter_out_2704 = 169,
dns_sizecounter_out_2720 = 170,
dns_sizecounter_out_2736 = 171,
dns_sizecounter_out_2752 = 172,
dns_sizecounter_out_2768 = 173,
dns_sizecounter_out_2784 = 174,
dns_sizecounter_out_2800 = 175,
dns_sizecounter_out_2816 = 176,
dns_sizecounter_out_2832 = 177,
dns_sizecounter_out_2848 = 178,
dns_sizecounter_out_2864 = 179,
dns_sizecounter_out_2880 = 180,
dns_sizecounter_out_2896 = 181,
dns_sizecounter_out_2912 = 182,
dns_sizecounter_out_2928 = 183,
dns_sizecounter_out_2944 = 184,
dns_sizecounter_out_2960 = 185,
dns_sizecounter_out_2976 = 186,
dns_sizecounter_out_2992 = 187,
dns_sizecounter_out_3008 = 188,
dns_sizecounter_out_3024 = 189,
dns_sizecounter_out_3040 = 190,
dns_sizecounter_out_3056 = 191,
dns_sizecounter_out_3072 = 192,
dns_sizecounter_out_3088 = 193,
dns_sizecounter_out_3104 = 194,
dns_sizecounter_out_3120 = 195,
dns_sizecounter_out_3136 = 196,
dns_sizecounter_out_3152 = 197,
dns_sizecounter_out_3168 = 198,
dns_sizecounter_out_3184 = 199,
dns_sizecounter_out_3200 = 200,
dns_sizecounter_out_3216 = 201,
dns_sizecounter_out_3232 = 202,
dns_sizecounter_out_3248 = 203,
dns_sizecounter_out_3264 = 204,
dns_sizecounter_out_3280 = 205,
dns_sizecounter_out_3296 = 206,
dns_sizecounter_out_3312 = 207,
dns_sizecounter_out_3328 = 208,
dns_sizecounter_out_3344 = 209,
dns_sizecounter_out_3360 = 210,
dns_sizecounter_out_3376 = 211,
dns_sizecounter_out_3392 = 212,
dns_sizecounter_out_3408 = 213,
dns_sizecounter_out_3424 = 214,
dns_sizecounter_out_3440 = 215,
dns_sizecounter_out_3456 = 216,
dns_sizecounter_out_3472 = 217,
dns_sizecounter_out_3488 = 218,
dns_sizecounter_out_3504 = 219,
dns_sizecounter_out_3520 = 220,
dns_sizecounter_out_3536 = 221,
dns_sizecounter_out_3552 = 222,
dns_sizecounter_out_3568 = 223,
dns_sizecounter_out_3584 = 224,
dns_sizecounter_out_3600 = 225,
dns_sizecounter_out_3616 = 226,
dns_sizecounter_out_3632 = 227,
dns_sizecounter_out_3648 = 228,
dns_sizecounter_out_3664 = 229,
dns_sizecounter_out_3680 = 230,
dns_sizecounter_out_3696 = 231,
dns_sizecounter_out_3712 = 232,
dns_sizecounter_out_3728 = 233,
dns_sizecounter_out_3744 = 234,
dns_sizecounter_out_3760 = 235,
dns_sizecounter_out_3776 = 236,
dns_sizecounter_out_3792 = 237,
dns_sizecounter_out_3808 = 238,
dns_sizecounter_out_3824 = 239,
dns_sizecounter_out_3840 = 240,
dns_sizecounter_out_3856 = 241,
dns_sizecounter_out_3872 = 242,
dns_sizecounter_out_3888 = 243,
dns_sizecounter_out_3904 = 244,
dns_sizecounter_out_3920 = 245,
dns_sizecounter_out_3936 = 246,
dns_sizecounter_out_3952 = 247,
dns_sizecounter_out_3968 = 248,
dns_sizecounter_out_3984 = 249,
dns_sizecounter_out_4000 = 250,
dns_sizecounter_out_4016 = 251,
dns_sizecounter_out_4032 = 252,
dns_sizecounter_out_4048 = 253,
dns_sizecounter_out_4064 = 254,
dns_sizecounter_out_4080 = 255,
dns_sizecounter_out_4096 = 256,
dns_sizecounter_out_max = 257
};
void
ns_server_create(isc_mem_t *mctx, ns_server_t **serverp);
/*%<

24
bin/named/server.c
View file

@ -6930,6 +6930,10 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
server->zonestats = NULL;
server->resolverstats = NULL;
server->sockstats = NULL;
server->udpinstats = NULL;
server->udpoutstats = NULL;
server->tcpinstats = NULL;
server->tcpoutstats = NULL;
CHECKFATAL(isc_stats_create(server->mctx, &server->sockstats,
isc_sockstatscounter_max),
"isc_stats_create");
@ -6979,6 +6983,22 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
dns_resstatscounter_max),
"dns_stats_create (resolver)");
CHECKFATAL(isc_stats_create(ns_g_mctx, &server->udpinstats,
dns_sizecounter_in_max),
"dns_stats_create (inbound UDP traffic size)");
CHECKFATAL(isc_stats_create(ns_g_mctx, &server->udpoutstats,
dns_sizecounter_out_max),
"dns_stats_create (outbound UDP traffic size)");
CHECKFATAL(isc_stats_create(ns_g_mctx, &server->tcpinstats,
dns_sizecounter_in_max),
"dns_stats_create (inbound TCP traffic size)");
CHECKFATAL(isc_stats_create(ns_g_mctx, &server->tcpoutstats,
dns_sizecounter_out_max),
"dns_stats_create (outbound TCP traffic size)");
server->flushonshutdown = ISC_FALSE;
server->log_queries = ISC_FALSE;
@ -7017,6 +7037,10 @@ ns_server_destroy(ns_server_t **serverp) {
isc_stats_detach(&server->zonestats);
isc_stats_detach(&server->resolverstats);
isc_stats_detach(&server->sockstats);
isc_stats_detach(&server->udpinstats);
isc_stats_detach(&server->udpoutstats);
isc_stats_detach(&server->tcpinstats);
isc_stats_detach(&server->tcpoutstats);
isc_mem_free(server->mctx, server->statsfile);
isc_mem_free(server->mctx, server->bindkeysfile);

564
bin/named/statschannel.c
View file

@ -91,6 +91,10 @@ static const char *adbstats_desc[dns_adbstats_max];
static const char *zonestats_desc[dns_zonestatscounter_max];
static const char *sockstats_desc[isc_sockstatscounter_max];
static const char *dnssecstats_desc[dns_dnssecstats_max];
static const char *udpinsizestats_desc[dns_sizecounter_in_max];
static const char *udpoutsizestats_desc[dns_sizecounter_out_max];
static const char *tcpinsizestats_desc[dns_sizecounter_in_max];
static const char *tcpoutsizestats_desc[dns_sizecounter_out_max];
#if defined(EXTENDED_STATS)
static const char *nsstats_xmldesc[dns_nsstatscounter_max];
static const char *resstats_xmldesc[dns_resstatscounter_max];
@ -98,6 +102,10 @@ static const char *adbstats_xmldesc[dns_adbstats_max];
static const char *zonestats_xmldesc[dns_zonestatscounter_max];
static const char *sockstats_xmldesc[isc_sockstatscounter_max];
static const char *dnssecstats_xmldesc[dns_dnssecstats_max];
static const char *udpinsizestats_xmldesc[dns_sizecounter_in_max];
static const char *udpoutsizestats_xmldesc[dns_sizecounter_out_max];
static const char *tcpinsizestats_xmldesc[dns_sizecounter_in_max];
static const char *tcpoutsizestats_xmldesc[dns_sizecounter_out_max];
#else
#define nsstats_xmldesc NULL
#define resstats_xmldesc NULL
@ -105,6 +113,10 @@ static const char *dnssecstats_xmldesc[dns_dnssecstats_max];
#define zonestats_xmldesc NULL
#define sockstats_xmldesc NULL
#define dnssecstats_xmldesc NULL
#define udpinsizestats_xmldesc NULL
#define udpoutsizestats_xmldesc NULL
#define tcpinsizestats_xmldesc NULL
#define tcpoutsizestats_xmldesc NULL
#endif /* EXTENDED_STATS */
#define TRY0(a) do { xmlrc = (a); if (xmlrc < 0) goto error; } while(0)
@ -120,6 +132,10 @@ static int adbstats_index[dns_adbstats_max];
static int zonestats_index[dns_zonestatscounter_max];
static int sockstats_index[isc_sockstatscounter_max];
static int dnssecstats_index[dns_dnssecstats_max];
static int udpinsizestats_index[dns_sizecounter_in_max];
static int udpoutsizestats_index[dns_sizecounter_out_max];
static int tcpinsizestats_index[dns_sizecounter_in_max];
static int tcpoutsizestats_index[dns_sizecounter_out_max];
static inline void
set_desc(int counter, int maxcounter, const char *fdesc, const char **fdescs,
@ -553,6 +569,365 @@ init_desc(void) {
for (i = 0; i < dns_dnssecstats_max; i++)
INSIST(dnssecstats_xmldesc[i] != NULL);
#endif
/* Initialize traffic size statistics */
for (i = 0; i < dns_sizecounter_in_max; i++) {
udpinsizestats_desc[i] = NULL;
tcpinsizestats_desc[i] = NULL;
#if defined(EXTENDED_STATS)
udpinsizestats_xmldesc[i] = NULL;
tcpinsizestats_xmldesc[i] = NULL;
#endif
}
for (i = 0; i < dns_sizecounter_out_max; i++) {
udpoutsizestats_desc[i] = NULL;
tcpoutsizestats_desc[i] = NULL;
#if defined(EXTENDED_STATS)
udpoutsizestats_xmldesc[i] = NULL;
tcpoutsizestats_xmldesc[i] = NULL;
#endif
}
#define SET_SIZESTATDESC(counterid, desc, xmldesc, inout) \
do { \
set_desc(dns_sizecounter_ ## inout ## _ ## counterid, \
dns_sizecounter_ ## inout ## _max, \
desc, udp ## inout ## sizestats_desc, \
xmldesc, udp ## inout ## sizestats_xmldesc); \
set_desc(dns_sizecounter_ ## inout ## _ ## counterid, \
dns_sizecounter_ ## inout ## _max, \
desc, tcp ## inout ## sizestats_desc, \
xmldesc, tcp ## inout ## sizestats_xmldesc); \
udp ## inout ## sizestats_index[i] = dns_sizecounter_ ## inout ## _ ## counterid; \
tcp ## inout ## sizestats_index[i] = dns_sizecounter_ ## inout ## _ ## counterid; \
i++; \
} while (0)
i = 0;
SET_SIZESTATDESC(0, "requests received 0-15 bytes", "0-15", in);
SET_SIZESTATDESC(16, "requests received 16-31 bytes", "16-31", in);
SET_SIZESTATDESC(32, "requests received 32-47 bytes", "32-47", in);
SET_SIZESTATDESC(48, "requests received 48-63 bytes", "48-63", in);
SET_SIZESTATDESC(64, "requests received 64-79 bytes", "64-79", in);
SET_SIZESTATDESC(80, "requests received 80-95 bytes", "80-95", in);
SET_SIZESTATDESC(96, "requests received 96-111 bytes", "96-111", in);
SET_SIZESTATDESC(112, "requests received 112-127 bytes", "112-127", in);
SET_SIZESTATDESC(128, "requests received 128-143 bytes", "128-143", in);
SET_SIZESTATDESC(144, "requests received 144-159 bytes", "144-159", in);
SET_SIZESTATDESC(160, "requests received 160-175 bytes", "160-175", in);
SET_SIZESTATDESC(176, "requests received 176-191 bytes", "176-191", in);
SET_SIZESTATDESC(192, "requests received 192-207 bytes", "192-207", in);
SET_SIZESTATDESC(208, "requests received 208-223 bytes", "208-223", in);
SET_SIZESTATDESC(224, "requests received 224-239 bytes", "224-239", in);
SET_SIZESTATDESC(240, "requests received 240-255 bytes", "240-255", in);
SET_SIZESTATDESC(256, "requests received 256-271 bytes", "256-271", in);
SET_SIZESTATDESC(272, "requests received 272-287 bytes", "272-287", in);
SET_SIZESTATDESC(288, "requests received 288+ bytes", "288+", in);
INSIST(i == dns_sizecounter_in_max);
i = 0;
SET_SIZESTATDESC(0, "responses sent 0-15 bytes", "0-15", out);
SET_SIZESTATDESC(16, "responses sent 16-31 bytes", "16-31", out);
SET_SIZESTATDESC(32, "responses sent 32-47 bytes", "32-47", out);
SET_SIZESTATDESC(48, "responses sent 48-63 bytes", "48-63", out);
SET_SIZESTATDESC(64, "responses sent 64-79 bytes", "64-79", out);
SET_SIZESTATDESC(80, "responses sent 80-95 bytes", "80-95", out);
SET_SIZESTATDESC(96, "responses sent 96-111 bytes", "96-111", out);
SET_SIZESTATDESC(112, "responses sent 112-127 bytes", "112-127", out);
SET_SIZESTATDESC(128, "responses sent 128-143 bytes", "128-143", out);
SET_SIZESTATDESC(144, "responses sent 144-159 bytes", "144-159", out);
SET_SIZESTATDESC(160, "responses sent 160-175 bytes", "160-175", out);
SET_SIZESTATDESC(176, "responses sent 176-191 bytes", "176-191", out);
SET_SIZESTATDESC(192, "responses sent 192-207 bytes", "192-207", out);
SET_SIZESTATDESC(208, "responses sent 208-223 bytes", "208-223", out);
SET_SIZESTATDESC(224, "responses sent 224-239 bytes", "224-239", out);
SET_SIZESTATDESC(240, "responses sent 240-255 bytes", "240-255", out);
SET_SIZESTATDESC(256, "responses sent 256-271 bytes", "256-271", out);
SET_SIZESTATDESC(272, "responses sent 272-287 bytes", "272-287", out);
SET_SIZESTATDESC(288, "responses sent 288-303 bytes", "288-303", out);
SET_SIZESTATDESC(304, "responses sent 304-319 bytes", "304-319", out);
SET_SIZESTATDESC(320, "responses sent 320-335 bytes", "320-335", out);
SET_SIZESTATDESC(336, "responses sent 336-351 bytes", "336-351", out);
SET_SIZESTATDESC(352, "responses sent 352-367 bytes", "352-367", out);
SET_SIZESTATDESC(368, "responses sent 368-383 bytes", "368-383", out);
SET_SIZESTATDESC(384, "responses sent 384-399 bytes", "384-399", out);
SET_SIZESTATDESC(400, "responses sent 400-415 bytes", "400-415", out);
SET_SIZESTATDESC(416, "responses sent 416-431 bytes", "416-431", out);
SET_SIZESTATDESC(432, "responses sent 432-447 bytes", "432-447", out);
SET_SIZESTATDESC(448, "responses sent 448-463 bytes", "448-463", out);
SET_SIZESTATDESC(464, "responses sent 464-479 bytes", "464-479", out);
SET_SIZESTATDESC(480, "responses sent 480-495 bytes", "480-495", out);
SET_SIZESTATDESC(496, "responses sent 496-511 bytes", "496-511", out);
SET_SIZESTATDESC(512, "responses sent 512-527 bytes", "512-527", out);
SET_SIZESTATDESC(528, "responses sent 528-543 bytes", "528-543", out);
SET_SIZESTATDESC(544, "responses sent 544-559 bytes", "544-559", out);
SET_SIZESTATDESC(560, "responses sent 560-575 bytes", "560-575", out);
SET_SIZESTATDESC(576, "responses sent 576-591 bytes", "576-591", out);
SET_SIZESTATDESC(592, "responses sent 592-607 bytes", "592-607", out);
SET_SIZESTATDESC(608, "responses sent 608-623 bytes", "608-623", out);
SET_SIZESTATDESC(624, "responses sent 624-639 bytes", "624-639", out);
SET_SIZESTATDESC(640, "responses sent 640-655 bytes", "640-655", out);
SET_SIZESTATDESC(656, "responses sent 656-671 bytes", "656-671", out);
SET_SIZESTATDESC(672, "responses sent 672-687 bytes", "672-687", out);
SET_SIZESTATDESC(688, "responses sent 688-703 bytes", "688-703", out);
SET_SIZESTATDESC(704, "responses sent 704-719 bytes", "704-719", out);
SET_SIZESTATDESC(720, "responses sent 720-735 bytes", "720-735", out);
SET_SIZESTATDESC(736, "responses sent 736-751 bytes", "736-751", out);
SET_SIZESTATDESC(752, "responses sent 752-767 bytes", "752-767", out);
SET_SIZESTATDESC(768, "responses sent 768-783 bytes", "768-783", out);
SET_SIZESTATDESC(784, "responses sent 784-799 bytes", "784-799", out);
SET_SIZESTATDESC(800, "responses sent 800-815 bytes", "800-815", out);
SET_SIZESTATDESC(816, "responses sent 816-831 bytes", "816-831", out);
SET_SIZESTATDESC(832, "responses sent 832-847 bytes", "832-847", out);
SET_SIZESTATDESC(848, "responses sent 848-863 bytes", "848-863", out);
SET_SIZESTATDESC(864, "responses sent 864-879 bytes", "864-879", out);
SET_SIZESTATDESC(880, "responses sent 880-895 bytes", "880-895", out);
SET_SIZESTATDESC(896, "responses sent 896-911 bytes", "896-911", out);
SET_SIZESTATDESC(912, "responses sent 912-927 bytes", "912-927", out);
SET_SIZESTATDESC(928, "responses sent 928-943 bytes", "928-943", out);
SET_SIZESTATDESC(944, "responses sent 944-959 bytes", "944-959", out);
SET_SIZESTATDESC(960, "responses sent 960-975 bytes", "960-975", out);
SET_SIZESTATDESC(976, "responses sent 976-991 bytes", "976-991", out);
SET_SIZESTATDESC(992, "responses sent 992-1007 bytes", "992-1007", out);
SET_SIZESTATDESC(1008, "responses sent 1008-1023 bytes", "1008-1023", out);
SET_SIZESTATDESC(1024, "responses sent 1024-1039 bytes", "1024-1039", out);
SET_SIZESTATDESC(1040, "responses sent 1040-1055 bytes", "1040-1055", out);
SET_SIZESTATDESC(1056, "responses sent 1056-1071 bytes", "1056-1071", out);
SET_SIZESTATDESC(1072, "responses sent 1072-1087 bytes", "1072-1087", out);
SET_SIZESTATDESC(1088, "responses sent 1088-1103 bytes", "1088-1103", out);
SET_SIZESTATDESC(1104, "responses sent 1104-1119 bytes", "1104-1119", out);
SET_SIZESTATDESC(1120, "responses sent 1120-1135 bytes", "1120-1135", out);
SET_SIZESTATDESC(1136, "responses sent 1136-1151 bytes", "1136-1151", out);
SET_SIZESTATDESC(1152, "responses sent 1152-1167 bytes", "1152-1167", out);
SET_SIZESTATDESC(1168, "responses sent 1168-1183 bytes", "1168-1183", out);
SET_SIZESTATDESC(1184, "responses sent 1184-1199 bytes", "1184-1199", out);
SET_SIZESTATDESC(1200, "responses sent 1200-1215 bytes", "1200-1215", out);
SET_SIZESTATDESC(1216, "responses sent 1216-1231 bytes", "1216-1231", out);
SET_SIZESTATDESC(1232, "responses sent 1232-1247 bytes", "1232-1247", out);
SET_SIZESTATDESC(1248, "responses sent 1248-1263 bytes", "1248-1263", out);
SET_SIZESTATDESC(1264, "responses sent 1264-1279 bytes", "1264-1279", out);
SET_SIZESTATDESC(1280, "responses sent 1280-1295 bytes", "1280-1295", out);
SET_SIZESTATDESC(1296, "responses sent 1296-1311 bytes", "1296-1311", out);
SET_SIZESTATDESC(1312, "responses sent 1312-1327 bytes", "1312-1327", out);
SET_SIZESTATDESC(1328, "responses sent 1328-1343 bytes", "1328-1343", out);
SET_SIZESTATDESC(1344, "responses sent 1344-1359 bytes", "1344-1359", out);
SET_SIZESTATDESC(1360, "responses sent 1360-1375 bytes", "1360-1375", out);
SET_SIZESTATDESC(1376, "responses sent 1376-1391 bytes", "1376-1391", out);
SET_SIZESTATDESC(1392, "responses sent 1392-1407 bytes", "1392-1407", out);
SET_SIZESTATDESC(1408, "responses sent 1408-1423 bytes", "1408-1423", out);
SET_SIZESTATDESC(1424, "responses sent 1424-1439 bytes", "1424-1439", out);
SET_SIZESTATDESC(1440, "responses sent 1440-1455 bytes", "1440-1455", out);
SET_SIZESTATDESC(1456, "responses sent 1456-1471 bytes", "1456-1471", out);
SET_SIZESTATDESC(1472, "responses sent 1472-1487 bytes", "1472-1487", out);
SET_SIZESTATDESC(1488, "responses sent 1488-1503 bytes", "1488-1503", out);
SET_SIZESTATDESC(1504, "responses sent 1504-1519 bytes", "1504-1519", out);
SET_SIZESTATDESC(1520, "responses sent 1520-1535 bytes", "1520-1535", out);
SET_SIZESTATDESC(1536, "responses sent 1536-1551 bytes", "1536-1551", out);
SET_SIZESTATDESC(1552, "responses sent 1552-1567 bytes", "1552-1567", out);
SET_SIZESTATDESC(1568, "responses sent 1568-1583 bytes", "1568-1583", out);
SET_SIZESTATDESC(1584, "responses sent 1584-1599 bytes", "1584-1599", out);
SET_SIZESTATDESC(1600, "responses sent 1600-1615 bytes", "1600-1615", out);
SET_SIZESTATDESC(1616, "responses sent 1616-1631 bytes", "1616-1631", out);
SET_SIZESTATDESC(1632, "responses sent 1632-1647 bytes", "1632-1647", out);
SET_SIZESTATDESC(1648, "responses sent 1648-1663 bytes", "1648-1663", out);
SET_SIZESTATDESC(1664, "responses sent 1664-1679 bytes", "1664-1679", out);
SET_SIZESTATDESC(1680, "responses sent 1680-1695 bytes", "1680-1695", out);
SET_SIZESTATDESC(1696, "responses sent 1696-1711 bytes", "1696-1711", out);
SET_SIZESTATDESC(1712, "responses sent 1712-1727 bytes", "1712-1727", out);
SET_SIZESTATDESC(1728, "responses sent 1728-1743 bytes", "1728-1743", out);
SET_SIZESTATDESC(1744, "responses sent 1744-1759 bytes", "1744-1759", out);
SET_SIZESTATDESC(1760, "responses sent 1760-1775 bytes", "1760-1775", out);
SET_SIZESTATDESC(1776, "responses sent 1776-1791 bytes", "1776-1791", out);
SET_SIZESTATDESC(1792, "responses sent 1792-1807 bytes", "1792-1807", out);
SET_SIZESTATDESC(1808, "responses sent 1808-1823 bytes", "1808-1823", out);
SET_SIZESTATDESC(1824, "responses sent 1824-1839 bytes", "1824-1839", out);
SET_SIZESTATDESC(1840, "responses sent 1840-1855 bytes", "1840-1855", out);
SET_SIZESTATDESC(1856, "responses sent 1856-1871 bytes", "1856-1871", out);
SET_SIZESTATDESC(1872, "responses sent 1872-1887 bytes", "1872-1887", out);
SET_SIZESTATDESC(1888, "responses sent 1888-1903 bytes", "1888-1903", out);
SET_SIZESTATDESC(1904, "responses sent 1904-1919 bytes", "1904-1919", out);
SET_SIZESTATDESC(1920, "responses sent 1920-1935 bytes", "1920-1935", out);
SET_SIZESTATDESC(1936, "responses sent 1936-1951 bytes", "1936-1951", out);
SET_SIZESTATDESC(1952, "responses sent 1952-1967 bytes", "1952-1967", out);
SET_SIZESTATDESC(1968, "responses sent 1968-1983 bytes", "1968-1983", out);
SET_SIZESTATDESC(1984, "responses sent 1984-1999 bytes", "1984-1999", out);
SET_SIZESTATDESC(2000, "responses sent 2000-2015 bytes", "2000-2015", out);
SET_SIZESTATDESC(2016, "responses sent 2016-2031 bytes", "2016-2031", out);
SET_SIZESTATDESC(2032, "responses sent 2032-2047 bytes", "2032-2047", out);
SET_SIZESTATDESC(2048, "responses sent 2048-2063 bytes", "2048-2063", out);
SET_SIZESTATDESC(2064, "responses sent 2064-2079 bytes", "2064-2079", out);
SET_SIZESTATDESC(2080, "responses sent 2080-2095 bytes", "2080-2095", out);
SET_SIZESTATDESC(2096, "responses sent 2096-2111 bytes", "2096-2111", out);
SET_SIZESTATDESC(2112, "responses sent 2112-2127 bytes", "2112-2127", out);
SET_SIZESTATDESC(2128, "responses sent 2128-2143 bytes", "2128-2143", out);
SET_SIZESTATDESC(2144, "responses sent 2144-2159 bytes", "2144-2159", out);
SET_SIZESTATDESC(2160, "responses sent 2160-2175 bytes", "2160-2175", out);
SET_SIZESTATDESC(2176, "responses sent 2176-2191 bytes", "2176-2191", out);
SET_SIZESTATDESC(2192, "responses sent 2192-2207 bytes", "2192-2207", out);
SET_SIZESTATDESC(2208, "responses sent 2208-2223 bytes", "2208-2223", out);
SET_SIZESTATDESC(2224, "responses sent 2224-2239 bytes", "2224-2239", out);
SET_SIZESTATDESC(2240, "responses sent 2240-2255 bytes", "2240-2255", out);
SET_SIZESTATDESC(2256, "responses sent 2256-2271 bytes", "2256-2271", out);
SET_SIZESTATDESC(2272, "responses sent 2272-2287 bytes", "2272-2287", out);
SET_SIZESTATDESC(2288, "responses sent 2288-2303 bytes", "2288-2303", out);
SET_SIZESTATDESC(2304, "responses sent 2304-2319 bytes", "2304-2319", out);
SET_SIZESTATDESC(2320, "responses sent 2320-2335 bytes", "2320-2335", out);
SET_SIZESTATDESC(2336, "responses sent 2336-2351 bytes", "2336-2351", out);
SET_SIZESTATDESC(2352, "responses sent 2352-2367 bytes", "2352-2367", out);
SET_SIZESTATDESC(2368, "responses sent 2368-2383 bytes", "2368-2383", out);
SET_SIZESTATDESC(2384, "responses sent 2384-2399 bytes", "2384-2399", out);
SET_SIZESTATDESC(2400, "responses sent 2400-2415 bytes", "2400-2415", out);
SET_SIZESTATDESC(2416, "responses sent 2416-2431 bytes", "2416-2431", out);
SET_SIZESTATDESC(2432, "responses sent 2432-2447 bytes", "2432-2447", out);
SET_SIZESTATDESC(2448, "responses sent 2448-2463 bytes", "2448-2463", out);
SET_SIZESTATDESC(2464, "responses sent 2464-2479 bytes", "2464-2479", out);
SET_SIZESTATDESC(2480, "responses sent 2480-2495 bytes", "2480-2495", out);
SET_SIZESTATDESC(2496, "responses sent 2496-2511 bytes", "2496-2511", out);
SET_SIZESTATDESC(2512, "responses sent 2512-2527 bytes", "2512-2527", out);
SET_SIZESTATDESC(2528, "responses sent 2528-2543 bytes", "2528-2543", out);
SET_SIZESTATDESC(2544, "responses sent 2544-2559 bytes", "2544-2559", out);
SET_SIZESTATDESC(2560, "responses sent 2560-2575 bytes", "2560-2575", out);
SET_SIZESTATDESC(2576, "responses sent 2576-2591 bytes", "2576-2591", out);
SET_SIZESTATDESC(2592, "responses sent 2592-2607 bytes", "2592-2607", out);
SET_SIZESTATDESC(2608, "responses sent 2608-2623 bytes", "2608-2623", out);
SET_SIZESTATDESC(2624, "responses sent 2624-2639 bytes", "2624-2639", out);
SET_SIZESTATDESC(2640, "responses sent 2640-2655 bytes", "2640-2655", out);
SET_SIZESTATDESC(2656, "responses sent 2656-2671 bytes", "2656-2671", out);
SET_SIZESTATDESC(2672, "responses sent 2672-2687 bytes", "2672-2687", out);
SET_SIZESTATDESC(2688, "responses sent 2688-2703 bytes", "2688-2703", out);
SET_SIZESTATDESC(2704, "responses sent 2704-2719 bytes", "2704-2719", out);
SET_SIZESTATDESC(2720, "responses sent 2720-2735 bytes", "2720-2735", out);
SET_SIZESTATDESC(2736, "responses sent 2736-2751 bytes", "2736-2751", out);
SET_SIZESTATDESC(2752, "responses sent 2752-2767 bytes", "2752-2767", out);
SET_SIZESTATDESC(2768, "responses sent 2768-2783 bytes", "2768-2783", out);
SET_SIZESTATDESC(2784, "responses sent 2784-2799 bytes", "2784-2799", out);
SET_SIZESTATDESC(2800, "responses sent 2800-2815 bytes", "2800-2815", out);
SET_SIZESTATDESC(2816, "responses sent 2816-2831 bytes", "2816-2831", out);
SET_SIZESTATDESC(2832, "responses sent 2832-2847 bytes", "2832-2847", out);
SET_SIZESTATDESC(2848, "responses sent 2848-2863 bytes", "2848-2863", out);
SET_SIZESTATDESC(2864, "responses sent 2864-2879 bytes", "2864-2879", out);
SET_SIZESTATDESC(2880, "responses sent 2880-2895 bytes", "2880-2895", out);
SET_SIZESTATDESC(2896, "responses sent 2896-2911 bytes", "2896-2911", out);
SET_SIZESTATDESC(2912, "responses sent 2912-2927 bytes", "2912-2927", out);
SET_SIZESTATDESC(2928, "responses sent 2928-2943 bytes", "2928-2943", out);
SET_SIZESTATDESC(2944, "responses sent 2944-2959 bytes", "2944-2959", out);
SET_SIZESTATDESC(2960, "responses sent 2960-2975 bytes", "2960-2975", out);
SET_SIZESTATDESC(2976, "responses sent 2976-2991 bytes", "2976-2991", out);
SET_SIZESTATDESC(2992, "responses sent 2992-3007 bytes", "2992-3007", out);
SET_SIZESTATDESC(3008, "responses sent 3008-3023 bytes", "3008-3023", out);
SET_SIZESTATDESC(3024, "responses sent 3024-3039 bytes", "3024-3039", out);
SET_SIZESTATDESC(3040, "responses sent 3040-3055 bytes", "3040-3055", out);
SET_SIZESTATDESC(3056, "responses sent 3056-3071 bytes", "3056-3071", out);
SET_SIZESTATDESC(3072, "responses sent 3072-3087 bytes", "3072-3087", out);
SET_SIZESTATDESC(3088, "responses sent 3088-3103 bytes", "3088-3103", out);
SET_SIZESTATDESC(3104, "responses sent 3104-3119 bytes", "3104-3119", out);
SET_SIZESTATDESC(3120, "responses sent 3120-3135 bytes", "3120-3135", out);
SET_SIZESTATDESC(3136, "responses sent 3136-3151 bytes", "3136-3151", out);
SET_SIZESTATDESC(3152, "responses sent 3152-3167 bytes", "3152-3167", out);
SET_SIZESTATDESC(3168, "responses sent 3168-3183 bytes", "3168-3183", out);
SET_SIZESTATDESC(3184, "responses sent 3184-3199 bytes", "3184-3199", out);
SET_SIZESTATDESC(3200, "responses sent 3200-3215 bytes", "3200-3215", out);
SET_SIZESTATDESC(3216, "responses sent 3216-3231 bytes", "3216-3231", out);
SET_SIZESTATDESC(3232, "responses sent 3232-3247 bytes", "3232-3247", out);
SET_SIZESTATDESC(3248, "responses sent 3248-3263 bytes", "3248-3263", out);
SET_SIZESTATDESC(3264, "responses sent 3264-3279 bytes", "3264-3279", out);
SET_SIZESTATDESC(3280, "responses sent 3280-3295 bytes", "3280-3295", out);
SET_SIZESTATDESC(3296, "responses sent 3296-3311 bytes", "3296-3311", out);
SET_SIZESTATDESC(3312, "responses sent 3312-3327 bytes", "3312-3327", out);
SET_SIZESTATDESC(3328, "responses sent 3328-3343 bytes", "3328-3343", out);
SET_SIZESTATDESC(3344, "responses sent 3344-3359 bytes", "3344-3359", out);
SET_SIZESTATDESC(3360, "responses sent 3360-3375 bytes", "3360-3375", out);
SET_SIZESTATDESC(3376, "responses sent 3376-3391 bytes", "3376-3391", out);
SET_SIZESTATDESC(3392, "responses sent 3392-3407 bytes", "3392-3407", out);
SET_SIZESTATDESC(3408, "responses sent 3408-3423 bytes", "3408-3423", out);
SET_SIZESTATDESC(3424, "responses sent 3424-3439 bytes", "3424-3439", out);
SET_SIZESTATDESC(3440, "responses sent 3440-3455 bytes", "3440-3455", out);
SET_SIZESTATDESC(3456, "responses sent 3456-3471 bytes", "3456-3471", out);
SET_SIZESTATDESC(3472, "responses sent 3472-3487 bytes", "3472-3487", out);
SET_SIZESTATDESC(3488, "responses sent 3488-3503 bytes", "3488-3503", out);
SET_SIZESTATDESC(3504, "responses sent 3504-3519 bytes", "3504-3519", out);
SET_SIZESTATDESC(3520, "responses sent 3520-3535 bytes", "3520-3535", out);
SET_SIZESTATDESC(3536, "responses sent 3536-3551 bytes", "3536-3551", out);
SET_SIZESTATDESC(3552, "responses sent 3552-3567 bytes", "3552-3567", out);
SET_SIZESTATDESC(3568, "responses sent 3568-3583 bytes", "3568-3583", out);
SET_SIZESTATDESC(3584, "responses sent 3584-3599 bytes", "3584-3599", out);
SET_SIZESTATDESC(3600, "responses sent 3600-3615 bytes", "3600-3615", out);
SET_SIZESTATDESC(3616, "responses sent 3616-3631 bytes", "3616-3631", out);
SET_SIZESTATDESC(3632, "responses sent 3632-3647 bytes", "3632-3647", out);
SET_SIZESTATDESC(3648, "responses sent 3648-3663 bytes", "3648-3663", out);
SET_SIZESTATDESC(3664, "responses sent 3664-3679 bytes", "3664-3679", out);
SET_SIZESTATDESC(3680, "responses sent 3680-3695 bytes", "3680-3695", out);
SET_SIZESTATDESC(3696, "responses sent 3696-3711 bytes", "3696-3711", out);
SET_SIZESTATDESC(3712, "responses sent 3712-3727 bytes", "3712-3727", out);
SET_SIZESTATDESC(3728, "responses sent 3728-3743 bytes", "3728-3743", out);
SET_SIZESTATDESC(3744, "responses sent 3744-3759 bytes", "3744-3759", out);
SET_SIZESTATDESC(3760, "responses sent 3760-3775 bytes", "3760-3775", out);
SET_SIZESTATDESC(3776, "responses sent 3776-3791 bytes", "3776-3791", out);
SET_SIZESTATDESC(3792, "responses sent 3792-3807 bytes", "3792-3807", out);
SET_SIZESTATDESC(3808, "responses sent 3808-3823 bytes", "3808-3823", out);
SET_SIZESTATDESC(3824, "responses sent 3824-3839 bytes", "3824-3839", out);
SET_SIZESTATDESC(3840, "responses sent 3840-3855 bytes", "3840-3855", out);
SET_SIZESTATDESC(3856, "responses sent 3856-3871 bytes", "3856-3871", out);
SET_SIZESTATDESC(3872, "responses sent 3872-3887 bytes", "3872-3887", out);
SET_SIZESTATDESC(3888, "responses sent 3888-3903 bytes", "3888-3903", out);
SET_SIZESTATDESC(3904, "responses sent 3904-3919 bytes", "3904-3919", out);
SET_SIZESTATDESC(3920, "responses sent 3920-3935 bytes", "3920-3935", out);
SET_SIZESTATDESC(3936, "responses sent 3936-3951 bytes", "3936-3951", out);
SET_SIZESTATDESC(3952, "responses sent 3952-3967 bytes", "3952-3967", out);
SET_SIZESTATDESC(3968, "responses sent 3968-3983 bytes", "3968-3983", out);
SET_SIZESTATDESC(3984, "responses sent 3984-3999 bytes", "3984-3999", out);
SET_SIZESTATDESC(4000, "responses sent 4000-4015 bytes", "4000-4015", out);
SET_SIZESTATDESC(4016, "responses sent 4016-4031 bytes", "4016-4031", out);
SET_SIZESTATDESC(4032, "responses sent 4032-4047 bytes", "4032-4047", out);
SET_SIZESTATDESC(4048, "responses sent 4048-4063 bytes", "4048-4063", out);
SET_SIZESTATDESC(4064, "responses sent 4064-4079 bytes", "4064-4079", out);
SET_SIZESTATDESC(4080, "responses sent 4080-4095 bytes", "4080-4095", out);
SET_SIZESTATDESC(4096, "responses sent 4096+ bytes", "4096+", out);
INSIST(i == dns_sizecounter_out_max);
/* Sanity check */
for (i = 0; i < dns_nsstatscounter_max; i++)
INSIST(nsstats_desc[i] != NULL);
for (i = 0; i < dns_resstatscounter_max; i++)
INSIST(resstats_desc[i] != NULL);
for (i = 0; i < dns_adbstats_max; i++)
INSIST(adbstats_desc[i] != NULL);
for (i = 0; i < dns_zonestatscounter_max; i++)
INSIST(zonestats_desc[i] != NULL);
for (i = 0; i < isc_sockstatscounter_max; i++)
INSIST(sockstats_desc[i] != NULL);
for (i = 0; i < dns_dnssecstats_max; i++)
INSIST(dnssecstats_desc[i] != NULL);
for (i = 0; i < dns_sizecounter_in_max; i++) {
INSIST(udpinsizestats_desc[i] != NULL);
INSIST(tcpinsizestats_desc[i] != NULL);
}
for (i = 0; i < dns_sizecounter_out_max; i++) {
INSIST(udpoutsizestats_desc[i] != NULL);
INSIST(tcpoutsizestats_desc[i] != NULL);
}
#if defined(EXTENDED_STATS)
for (i = 0; i < dns_nsstatscounter_max; i++)
INSIST(nsstats_xmldesc[i] != NULL);
for (i = 0; i < dns_resstatscounter_max; i++)
INSIST(resstats_xmldesc[i] != NULL);
for (i = 0; i < dns_adbstats_max; i++)
INSIST(adbstats_xmldesc[i] != NULL);
for (i = 0; i < dns_zonestatscounter_max; i++)
INSIST(zonestats_xmldesc[i] != NULL);
for (i = 0; i < isc_sockstatscounter_max; i++)
INSIST(sockstats_xmldesc[i] != NULL);
for (i = 0; i < dns_dnssecstats_max; i++)
INSIST(dnssecstats_xmldesc[i] != NULL);
for (i = 0; i < dns_sizecounter_in_max; i++) {
INSIST(udpinsizestats_xmldesc[i] != NULL);
INSIST(tcpinsizestats_xmldesc[i] != NULL);
}
for (i = 0; i < dns_sizecounter_out_max; i++) {
INSIST(udpoutsizestats_xmldesc[i] != NULL);
INSIST(tcpoutsizestats_xmldesc[i] != NULL);
}
#endif
}
/*%
@ -902,6 +1277,7 @@ opcodestat_dump(dns_opcode_t code, isc_uint64_t val, void *arg) {
#define STATS_XML_TASKS 0x04
#define STATS_XML_NET 0x08
#define STATS_XML_MEM 0x10
#define STATS_XML_TRAFFIC 0x20
#define STATS_XML_ALL 0xff
static isc_result_t
@ -1003,6 +1379,10 @@ generatexml(ns_server_t *server, isc_uint32_t flags,
isc_uint64_t adbstat_values[dns_adbstats_max];
isc_uint64_t zonestat_values[dns_zonestatscounter_max];
isc_uint64_t sockstat_values[isc_sockstatscounter_max];
isc_uint64_t udpinsizestat_values[dns_sizecounter_in_max];
isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max];
isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max];
isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max];
isc_result_t result;
isc_time_now(&now);
@ -1018,7 +1398,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags,
ISC_XMLCHAR "type=\"text/xsl\" href=\"/bind9.xsl\""));
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "statistics"));
TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "version",
ISC_XMLCHAR "3.5"));
ISC_XMLCHAR "3.6"));
/* Set common fields for statistics dump */
dumparg.type = isc_statsformat_xml;
@ -1123,6 +1503,75 @@ generatexml(ns_server_t *server, isc_uint32_t flags,
}
TRY0(xmlTextWriterEndElement(writer)); /* /server */
if ((flags & STATS_XML_TRAFFIC) != 0) {
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "traffic"));
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "udp"));
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counters"));
TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type",
ISC_XMLCHAR "request-size"));
result = dump_counters(server->udpinstats,
isc_statsformat_xml, writer,
NULL, udpinsizestats_xmldesc,
dns_sizecounter_in_max,
udpinsizestats_index,
udpinsizestat_values, 0);
if (result != ISC_R_SUCCESS)
goto error;
TRY0(xmlTextWriterEndElement(writer)); /* </counters> */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counters"));
TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type",
ISC_XMLCHAR "response-size"));
result = dump_counters(server->udpoutstats,
isc_statsformat_xml, writer,
NULL, udpoutsizestats_xmldesc,
dns_sizecounter_out_max,
udpoutsizestats_index,
udpoutsizestat_values, 0);
if (result != ISC_R_SUCCESS)
goto error;
TRY0(xmlTextWriterEndElement(writer)); /* </counters> */
TRY0(xmlTextWriterEndElement(writer)); /* </udp> */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "tcp"));
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counters"));
TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type",
ISC_XMLCHAR "request-size"));
result = dump_counters(server->tcpinstats,
isc_statsformat_xml, writer,
NULL, tcpinsizestats_xmldesc,
dns_sizecounter_in_max,
tcpinsizestats_index,
tcpinsizestat_values, 0);
if (result != ISC_R_SUCCESS)
goto error;
TRY0(xmlTextWriterEndElement(writer)); /* </counters> */
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "counters"));
TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "type",
ISC_XMLCHAR "response-size"));
result = dump_counters(server->tcpoutstats,
isc_statsformat_xml, writer,
NULL, tcpoutsizestats_xmldesc,
dns_sizecounter_out_max,
tcpoutsizestats_index,
tcpoutsizestat_values, 0);
if (result != ISC_R_SUCCESS)
goto error;
TRY0(xmlTextWriterEndElement(writer)); /* </counters> */
TRY0(xmlTextWriterEndElement(writer)); /* </tcp> */
TRY0(xmlTextWriterEndElement(writer)); /* </traffic> */
}
/*
* Render views. For each view we know of, call its
* rendering function.
@ -1246,6 +1695,7 @@ generatexml(ns_server_t *server, isc_uint32_t flags,
TRY0(xmlTextWriterEndElement(writer)); /* /memory */
}
TRY0(xmlTextWriterEndElement(writer)); /* /statistics */
TRY0(xmlTextWriterEndDocument(writer));
@ -1400,6 +1850,19 @@ render_xml_mem(const char *url, isc_httpdurl_t *urlinfo,
freecb, freecb_args));
}
static isc_result_t
render_xml_traffic(const char *url, isc_httpdurl_t *urlinfo,
const char *querystring, const char *headers, void *arg,
unsigned int *retcode, const char **retmsg,
const char **mimetype, isc_buffer_t *b,
isc_httpdfree_t **freecb, void **freecb_args)
{
return (render_xml(STATS_XML_TRAFFIC, url, urlinfo,
querystring, headers, arg,
retcode, retmsg, mimetype, b,
freecb, freecb_args));
}
#endif /* HAVE_LIBXML2 */
#ifdef HAVE_JSON
@ -1412,6 +1875,7 @@ render_xml_mem(const char *url, isc_httpdurl_t *urlinfo,
#define STATS_JSON_TASKS 0x04
#define STATS_JSON_NET 0x08
#define STATS_JSON_MEM 0x10
#define STATS_JSON_TRAFFIC 0x20
#define STATS_JSON_ALL 0xff
#define CHECKMEM(m) do { \
@ -1547,6 +2011,10 @@ generatejson(ns_server_t *server, size_t *msglen,
isc_uint64_t adbstat_values[dns_adbstats_max];
isc_uint64_t zonestat_values[dns_zonestatscounter_max];
isc_uint64_t sockstat_values[isc_sockstatscounter_max];
isc_uint64_t udpinsizestat_values[dns_sizecounter_in_max];
isc_uint64_t udpoutsizestat_values[dns_sizecounter_out_max];
isc_uint64_t tcpinsizestat_values[dns_sizecounter_in_max];
isc_uint64_t tcpoutsizestat_values[dns_sizecounter_out_max];
stats_dumparg_t dumparg;
char boottime[sizeof "yyyy-mm-ddThh:mm:ssZ"];
char configtime[sizeof "yyyy-mm-ddThh:mm:ssZ"];
@ -1564,7 +2032,7 @@ generatejson(ns_server_t *server, size_t *msglen,
/*
* These statistics are included no matter which URL we use.
*/
obj = json_object_new_string("1.1");
obj = json_object_new_string("1.2");
CHECKMEM(obj);
json_object_object_add(bindstats, "json-stats-version", obj);
@ -1892,6 +2360,79 @@ generatejson(ns_server_t *server, size_t *msglen,
json_object_object_add(bindstats, "memory", memory);
}
if ((flags & STATS_JSON_TRAFFIC) != 0) {
json_object *traffic, *udpreq, *udpresp, *tcpreq, *tcpresp;
traffic = json_object_new_object();
CHECKMEM(traffic);
udpreq = json_object_new_object();
CHECKMEM(udpreq);
udpresp = json_object_new_object();
CHECKMEM(udpresp);
tcpreq = json_object_new_object();
CHECKMEM(tcpreq);
tcpresp = json_object_new_object();
CHECKMEM(tcpresp);
result = dump_counters(server->udpinstats,
isc_statsformat_json, udpreq, NULL,
udpinsizestats_xmldesc,
dns_sizecounter_in_max,
udpinsizestats_index,
udpinsizestat_values, 0);
if (result != ISC_R_SUCCESS) {
json_object_put(traffic);
goto error;
}
result = dump_counters(server->udpoutstats,
isc_statsformat_json, udpresp, NULL,
udpoutsizestats_xmldesc,
dns_sizecounter_out_max,
udpoutsizestats_index,
udpoutsizestat_values, 0);
if (result != ISC_R_SUCCESS) {
json_object_put(traffic);
goto error;
}
result = dump_counters(server->tcpinstats,
isc_statsformat_json, tcpreq, NULL,
tcpinsizestats_xmldesc,
dns_sizecounter_in_max,
tcpinsizestats_index,
tcpinsizestat_values, 0);
if (result != ISC_R_SUCCESS) {
json_object_put(traffic);
goto error;
}
result = dump_counters(server->tcpoutstats,
isc_statsformat_json, tcpresp, NULL,
tcpoutsizestats_xmldesc,
dns_sizecounter_out_max,
tcpoutsizestats_index,
tcpoutsizestat_values, 0);
if (result != ISC_R_SUCCESS) {
json_object_put(traffic);
goto error;
}
json_object_object_add(traffic,
"udp-requests-received", udpreq);
json_object_object_add(traffic,
"udp-responses-sent", udpresp);
json_object_object_add(traffic,
"tcp-requests-received", tcpreq);
json_object_object_add(traffic,
"tcp-responses-sent", tcpresp);
json_object_object_add(bindstats, "traffic", traffic);
}
*msg = json_object_to_json_string_ext(bindstats,
JSON_C_TO_STRING_PRETTY);
*msglen = strlen(*msg);
@ -1999,6 +2540,7 @@ render_json_zones(const char *url, isc_httpdurl_t *urlinfo,
retcode, retmsg, mimetype, b,
freecb, freecb_args));
}
static isc_result_t
render_json_mem(const char *url, isc_httpdurl_t *urlinfo,
const char *querystring, const char *headers, void *arg,
@ -2037,6 +2579,20 @@ render_json_net(const char *url, isc_httpdurl_t *urlinfo,
retcode, retmsg, mimetype, b,
freecb, freecb_args));
}
static isc_result_t
render_json_traffic(const char *url, isc_httpdurl_t *urlinfo,
const char *querystring, const char *headers, void *arg,
unsigned int *retcode, const char **retmsg,
const char **mimetype, isc_buffer_t *b,
isc_httpdfree_t **freecb, void **freecb_args)
{
return (render_json(STATS_JSON_TRAFFIC, url, urlinfo,
querystring, headers, arg,
retcode, retmsg, mimetype, b,
freecb, freecb_args));
}
#endif /* HAVE_JSON */
static isc_result_t
@ -2233,6 +2789,8 @@ add_listener(ns_server_t *server, ns_statschannel_t **listenerp,
render_xml_tasks, server);
isc_httpdmgr_addurl(listener->httpdmgr, "/xml/v3/mem",
render_xml_mem, server);
isc_httpdmgr_addurl(listener->httpdmgr, "/xml/v3/traffic",
render_xml_traffic, server);
#endif
#ifdef HAVE_JSON
isc_httpdmgr_addurl(listener->httpdmgr, "/json",
@ -2251,6 +2809,8 @@ add_listener(ns_server_t *server, ns_statschannel_t **listenerp,
render_json_net, server);
isc_httpdmgr_addurl(listener->httpdmgr, "/json/v1/mem",
render_json_mem, server);
isc_httpdmgr_addurl(listener->httpdmgr, "/json/v1/traffic",
render_json_traffic, server);
#endif
isc_httpdmgr_addurl2(listener->httpdmgr, "/bind9.xsl", ISC_TRUE,
render_xsl, server);

21
bin/tests/system/statschannel/clean.sh Normal file
View file

@ -0,0 +1,21 @@
#!/bin/sh
#
# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
rm -f traffic traffic.out.*
rm -f dig.out*
rm -f */named.memstats
rm -f */named.run
rm -f ns*/named.lock

52
bin/tests/system/statschannel/ns2/example.db Normal file
View file

@ -0,0 +1,52 @@
; Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; copyright notice and this permission notice appear in all copies.
;
; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
$ORIGIN .
$TTL 300 ; 5 minutes
example IN SOA mname1. . (
1 ; serial
20 ; refresh (20 seconds)
20 ; retry (20 seconds)
1814400 ; expire (3 weeks)
3600 ; minimum (1 hour)
)
example. NS ns2.example.
ns2.example. A 10.53.0.2
$ORIGIN example.
a A 10.0.0.1
MX 10 mail.example.
short TXT "short text"
long TXT (
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
"longlonglonglonglonglonglonglonglonglong"
)
mail A 10.0.0.2

39
bin/tests/system/statschannel/ns2/named.conf Normal file
View file

@ -0,0 +1,39 @@
/*
* Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
controls { /* empty */ };
options {
query-source address 10.53.0.2;
notify-source 10.53.0.2;
transfer-source 10.53.0.2;
port 5300;
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
recursion no;
notify yes;
};
statistics-channels { inet 10.53.0.2 port 8853 allow { localhost; }; };
include "../../common/controls.conf";
zone "example" {
type master;
file "example.db";
allow-transfer { any; };
};

35
bin/tests/system/statschannel/prereq.sh Normal file
View file

@ -0,0 +1,35 @@
#!/bin/sh
#
# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
fail=0
if $PERL -e 'use File::Fetch;' 2>/dev/null
then
:
else
echo "I:This test requires the File::Fetch library." >&2
fail=1
fi
if $PERL -e 'use XML::Simple;' 2>/dev/null
then
:
else
echo "I:This test requires the XML::Simple library." >&2
fail=1
fi
exit $fail

104
bin/tests/system/statschannel/tests.sh Normal file
View file

@ -0,0 +1,104 @@
#!/bin/sh
#
# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
DIGCMD="$DIG @10.53.0.2 -p 5300"
gettraffic() {
$PERL -e 'use File::Fetch;
use XML::Simple;
use Data::Dumper;
my $ff = File::Fetch->new(uri => "http://10.53.0.2:8853/xml/v3/traffic");
my $file = $ff->fetch() or die $ff->error;
my $ref = XMLin($file);
my $udp = $ref->{traffic}->{udp}->{counters};
foreach $group (@$udp) {
my $type = "udp " . $group->{type} . " ";
if (exists $group->{counter}->{name}) {
print $type . $group->{counter}->{name} . ": " . $group->{counter}->{content} . "\n";
} else {
foreach $key (keys $group->{counter}) {
print $type . $key . ": ". $group->{counter}->{$key}->{content} ."\n";
}
}
}
my $tcp = $ref->{traffic}->{tcp}->{counters};
foreach $group (@$tcp) {
my $type = "tcp " . $group->{type} . " ";
if (exists $group->{counter}->{name}) {
print $type . $group->{counter}->{name} . ": " . $group->{counter}->{content} . "\n";
} else {
foreach $key (keys $group->{counter}) {
print $type . $key . ": ". $group->{counter}->{$key}->{content} ."\n";
}
}
}' | sort > traffic.out.$1
return $?
}
status=0
n=1
ret=0
echo "I:fetching traffic size data ($n)"
gettraffic $n || ret=1
cmp traffic.out.$n traffic.expect.$n || ret=1
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
ret=0
echo "I:fetching traffic size data after small UDP query ($n)"
$DIGCMD short.example txt > dig.out.$n || ret=1
gettraffic $n || ret=1
cmp traffic.out.$n traffic.expect.$n || ret=1
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
ret=0
n=`expr $n + 1`
echo "I:fetching traffic size data after large UDP query ($n)"
$DIGCMD long.example txt > dig.out.$n || ret=1
gettraffic $n || ret=1
cmp traffic.out.$n traffic.expect.$n || ret=1
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
ret=0
echo "I:fetching traffic size data after small TCP query ($n)"
$DIGCMD +tcp short.example txt > dig.out.$n || ret=1
gettraffic $n || ret=1
cmp traffic.out.$n traffic.expect.$n || ret=1
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
ret=0
echo "I:fetching traffic size data after large TCP query ($n)"
$DIGCMD +tcp long.example txt > dig.out.$n || ret=1
gettraffic $n || ret=1
cmp traffic.out.$n traffic.expect.$n || ret=1
if [ $ret != 0 ]; then echo "I: failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
echo "I:exit status: $status"
exit $status

2
bin/tests/system/statschannel/traffic.expect.1 Normal file
View file

@ -0,0 +1,2 @@
tcp request-size 16-31: 1
tcp response-size 64-79: 1

4
bin/tests/system/statschannel/traffic.expect.2 Normal file
View file

@ -0,0 +1,4 @@
tcp request-size 16-31: 1
tcp response-size 64-79: 1
udp request-size 48-63: 1
udp response-size 112-127: 1

5
bin/tests/system/statschannel/traffic.expect.4 Normal file
View file

@ -0,0 +1,5 @@
tcp request-size 16-31: 1
tcp response-size 64-79: 1
udp request-size 48-63: 2
udp response-size 112-127: 1
udp response-size 848-863: 1

7
bin/tests/system/statschannel/traffic.expect.5 Normal file
View file

@ -0,0 +1,7 @@
tcp request-size 16-31: 1
tcp request-size 48-63: 1
tcp response-size 128-143: 1
tcp response-size 64-79: 1
udp request-size 48-63: 2
udp response-size 112-127: 1
udp response-size 848-863: 1

8
bin/tests/system/statschannel/traffic.expect.6 Normal file
View file

@ -0,0 +1,8 @@
tcp request-size 16-31: 1
tcp request-size 48-63: 2
tcp response-size 128-143: 1
tcp response-size 64-79: 1
tcp response-size 848-863: 1
udp request-size 48-63: 2
udp response-size 112-127: 1
udp response-size 848-863: 1

12
doc/arm/Bv9ARM-book.xml
View file

@ -10299,7 +10299,7 @@ example.com CNAME rpz-tcp-only.
</para>
<para>
The <command>log<command> clause can be used to optionally
The <command>log</command> clause can be used to optionally
turn off rewrite logging for a particular response policy
zone. By default, all rewrites are logged.
</para>
@ -11009,7 +11009,10 @@ example.com CNAME rpz-tcp-only.
(memory manager statistics),
<ulink url="http://127.0.0.1:8888/xml/v3/tasks"
>http://127.0.0.1:8888/xml/v3/tasks</ulink>
(task manager statistics).
(task manager statistics), and
<ulink url="http://127.0.0.1:8888/xml/v3/traffic"
>http://127.0.0.1:8888/xml/v3/traffic</ulink>
(traffic sizes).
</para>
<para>
@ -11034,7 +11037,10 @@ example.com CNAME rpz-tcp-only.
(memory manager statistics),
<ulink url="http://127.0.0.1:8888/json/v1/tasks"
>http://127.0.0.1:8888/json/v1/tasks</ulink>
(task manager statistics).
(task manager statistics), and
<ulink url="http://127.0.0.1:8888/json/v1/traffic"
>http://127.0.0.1:8888/json/v1/traffic</ulink>
(traffic sizes).
</para>
</sect2>

16
doc/arm/notes.xml
View file

@ -111,6 +111,22 @@
<sect2 id="relnotes_features">
<title>New Features</title>
<itemizedlist>
<listitem>
<para>
New statistics counters have been added to track traffic
sizes, as specified in RSSAC002. Query and response
message sizes are broken up into ranges of histogram buckets:
TCP and UDP queries of size 0-15, 16-31, ..., 272-288, and 288+,
and TCP and UDP responses of size 0-15, 16-31, ..., 4080-4095,
and 4096+. These values can be accessed via the XML and JSON
statistics channels at, for example,
<ulink url="http://localhost:8888/xml/v3/traffic"
>http://localhost:8888/xml/v3/traffic</ulink>
or
<ulink url="http://localhost:8888/json/v1/traffic"
>http://localhost:8888/json/v1/traffic</ulink>.
</para>
</listitem>
<listitem>
<para>
The serial number of a dynamically updatable zone can

14
util/copyrights
View file

@ -216,8 +216,8 @@
./bin/dnssec/win32/verify.vcxproj.user X 2013
./bin/named/.gitignore X 2012,2014
./bin/named/Makefile.in MAKE 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014
./bin/named/bind9.xsl SGML 2006,2007,2008,2009,2012,2013,2014
./bin/named/bind9.xsl.h X 2007,2008,2009,2011,2012,2013,2014
./bin/named/bind9.xsl SGML 2006,2007,2008,2009,2012,2013,2014,2015
./bin/named/bind9.xsl.h X 2007,2008,2009,2011,2012,2013,2014,2015
./bin/named/builtin.c C 2001,2002,2003,2004,2005,2007,2009,2010,2011,2012,2013,2014
./bin/named/client.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
./bin/named/config.c C 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015
@ -1973,6 +1973,16 @@
./bin/tests/system/statistics/ns3/root.hint ZONE 2012
./bin/tests/system/statistics/prereq.sh SH 2012,2014
./bin/tests/system/statistics/tests.sh SH 2012,2015
./bin/tests/system/statschannel/clean.sh SH 2015
./bin/tests/system/statschannel/ns2/example.db ZONE 2015
./bin/tests/system/statschannel/ns2/named.conf CONF-C 2015
./bin/tests/system/statschannel/prereq.sh SH 2015
./bin/tests/system/statschannel/tests.sh SH 2015
./bin/tests/system/statschannel/traffic.expect.1 X 2015
./bin/tests/system/statschannel/traffic.expect.2 X 2015
./bin/tests/system/statschannel/traffic.expect.4 X 2015
./bin/tests/system/statschannel/traffic.expect.5 X 2015
./bin/tests/system/statschannel/traffic.expect.6 X 2015
./bin/tests/system/stop.pl SH 2001,2004,2005,2006,2007,2012
./bin/tests/system/stop.sh SH 2000,2001,2004,2007,2012
./bin/tests/system/stress/clean.sh SH 2000,2001,2004,2007,2012,2014