zishuo/nip
1
0
Fork 0
mirror of https://github.com/cunnie/sslip.io.git synced 2025-10-07 16:41:19 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix typo: AnsweredXTVersionQueries → AnsweredTXTVersionQueries

Browse Source 
It was bothering me.
This commit is contained in:
Brian Cunnie
2022-07-12 08:41:42 -07:00
parent 57976fcfb5
commit d9e9f37f18
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sslip.io-dns-server/integration_metrics_test.go
View File

@@ -116,10 +116,10 @@ var _ = Describe("IntegrationMetrics", func() {
actualMetrics = digAndGetMetrics("@localhost ip.sslip.io txt +short -p " + strconv.Itoa(port)) actualMetrics = digAndGetMetrics("@localhost ip.sslip.io txt +short -p " + strconv.Itoa(port))
Expect(expectedMetrics.MostlyEquals(actualMetrics)).To(BeTrue()) Expect(expectedMetrics.MostlyEquals(actualMetrics)).To(BeTrue())
// TXT version.sslip.io updates .Queries, .AnsweredQueries, .AnsweredXTVersionQueries // TXT version.sslip.io updates .Queries, .AnsweredQueries, .AnsweredTXTVersionQueries
expectedMetrics.Queries++ expectedMetrics.Queries++
expectedMetrics.AnsweredQueries++ expectedMetrics.AnsweredQueries++
expectedMetrics.AnsweredXTVersionQueries++ expectedMetrics.AnsweredTXTVersionQueries++
expectedMetrics = bumpExpectedToAccountForMetricsQuery(expectedMetrics) expectedMetrics = bumpExpectedToAccountForMetricsQuery(expectedMetrics)
actualMetrics = digAndGetMetrics("@localhost version.status.sslip.io txt +short -p " + strconv.Itoa(port)) actualMetrics = digAndGetMetrics("@localhost version.status.sslip.io txt +short -p " + strconv.Itoa(port))
Expect(expectedMetrics.MostlyEquals(actualMetrics)).To(BeTrue()) Expect(expectedMetrics.MostlyEquals(actualMetrics)).To(BeTrue())
@@ -203,7 +203,7 @@ func getMetrics() (m xip.Metrics) {
&m.AnsweredAQueries, &m.AnsweredAQueries,
&m.AnsweredAAAAQueries, &m.AnsweredAAAAQueries,
&m.AnsweredTXTSrcIPQueries, &m.AnsweredTXTSrcIPQueries,
&m.AnsweredXTVersionQueries, &m.AnsweredTXTVersionQueries,
&m.AnsweredPTRQueriesIPv4, &m.AnsweredPTRQueriesIPv6, &m.AnsweredPTRQueriesIPv4, &m.AnsweredPTRQueriesIPv6,
&m.AnsweredNSDNS01ChallengeQueries, &m.AnsweredNSDNS01ChallengeQueries,
&m.AnsweredBlockedQueries, &m.AnsweredBlockedQueries,

8
src/sslip.io-dns-server/xip/xip.go
View File

@@ -51,7 +51,7 @@ type Metrics struct {
AnsweredAQueries int AnsweredAQueries int
AnsweredAAAAQueries int AnsweredAAAAQueries int
AnsweredTXTSrcIPQueries int AnsweredTXTSrcIPQueries int
AnsweredXTVersionQueries int AnsweredTXTVersionQueries int
AnsweredNSDNS01ChallengeQueries int AnsweredNSDNS01ChallengeQueries int
AnsweredBlockedQueries int AnsweredBlockedQueries int
AnsweredPTRQueriesIPv4 int AnsweredPTRQueriesIPv4 int
@@ -208,7 +208,7 @@ var (
}, },
"version.status.sslip.io.": { "version.status.sslip.io.": {
TXT: func(x *Xip, _ net.IP) ([]dnsmessage.TXTResource, error) { TXT: func(x *Xip, _ net.IP) ([]dnsmessage.TXTResource, error) {
x.Metrics.AnsweredXTVersionQueries++ x.Metrics.AnsweredTXTVersionQueries++
return []dnsmessage.TXTResource{ return []dnsmessage.TXTResource{
{TXT: []string{VersionSemantic}}, // e.g. "2.2.1' {TXT: []string{VersionSemantic}}, // e.g. "2.2.1'
{TXT: []string{VersionDate}}, // e.g. "2021/10/03-15:08:54+0100" {TXT: []string{VersionDate}}, // e.g. "2021/10/03-15:08:54+0100"
@@ -924,7 +924,7 @@ func metricsSslipIo(x *Xip, _ net.IP) (txtResources []dnsmessage.TXTResource, er
metrics = append(metrics, fmt.Sprintf("AnsA: %d", x.Metrics.AnsweredAQueries)) metrics = append(metrics, fmt.Sprintf("AnsA: %d", x.Metrics.AnsweredAQueries))
metrics = append(metrics, fmt.Sprintf("AnsAAAA: %d", x.Metrics.AnsweredAAAAQueries)) metrics = append(metrics, fmt.Sprintf("AnsAAAA: %d", x.Metrics.AnsweredAAAAQueries))
metrics = append(metrics, fmt.Sprintf("Source IP TXT: %d", x.Metrics.AnsweredTXTSrcIPQueries)) metrics = append(metrics, fmt.Sprintf("Source IP TXT: %d", x.Metrics.AnsweredTXTSrcIPQueries))
metrics = append(metrics, fmt.Sprintf("Version TXT: %d", x.Metrics.AnsweredXTVersionQueries)) metrics = append(metrics, fmt.Sprintf("Version TXT: %d", x.Metrics.AnsweredTXTVersionQueries))
metrics = append(metrics, fmt.Sprintf("PTR IPv4/IPv6: %d/%d", x.Metrics.AnsweredPTRQueriesIPv4, x.Metrics.AnsweredPTRQueriesIPv6)) metrics = append(metrics, fmt.Sprintf("PTR IPv4/IPv6: %d/%d", x.Metrics.AnsweredPTRQueriesIPv4, x.Metrics.AnsweredPTRQueriesIPv6))
metrics = append(metrics, fmt.Sprintf("DNS-01 challenge: %d", x.Metrics.AnsweredNSDNS01ChallengeQueries)) metrics = append(metrics, fmt.Sprintf("DNS-01 challenge: %d", x.Metrics.AnsweredNSDNS01ChallengeQueries))
metrics = append(metrics, fmt.Sprintf("Blocked: %d", x.Metrics.AnsweredBlockedQueries)) metrics = append(metrics, fmt.Sprintf("Blocked: %d", x.Metrics.AnsweredBlockedQueries))
@@ -1046,7 +1046,7 @@ func (a Metrics) MostlyEquals(b Metrics) bool {
a.AnsweredAQueries == b.AnsweredAQueries && a.AnsweredAQueries == b.AnsweredAQueries &&
a.AnsweredAAAAQueries == b.AnsweredAAAAQueries && a.AnsweredAAAAQueries == b.AnsweredAAAAQueries &&
a.AnsweredTXTSrcIPQueries == b.AnsweredTXTSrcIPQueries && a.AnsweredTXTSrcIPQueries == b.AnsweredTXTSrcIPQueries &&
a.AnsweredXTVersionQueries == b.AnsweredXTVersionQueries && a.AnsweredTXTVersionQueries == b.AnsweredTXTVersionQueries &&
a.AnsweredNSDNS01ChallengeQueries == b.AnsweredNSDNS01ChallengeQueries && a.AnsweredNSDNS01ChallengeQueries == b.AnsweredNSDNS01ChallengeQueries &&
a.AnsweredBlockedQueries == b.AnsweredBlockedQueries { a.AnsweredBlockedQueries == b.AnsweredBlockedQueries {
return true return true