fix(query): fix printing irregularities (#140)
continuous-integration/drone/push Build is passing Details

1. Before, the port printed was duplicated, eg.
`;; SERVER: [::1]:53:53 (UDP)` when making query. This has been fixed (not sure what caused it)
2. JSON/XML/YAML date formatting to be compliant with RFC3339 (thanks, std/time!)

Co-authored-by: Sam Therapy <sam@samtherapy.net>
Reviewed-on: #140
Reviewed-by: grumbulon <grumbulon@grumbulon.xyz>
This commit is contained in:
Sam Therapy 2022-10-14 16:51:27 +00:00
parent add1ef61a2
commit dc4edd55bb
Signed by: Froth Git
GPG Key ID: 5D8CD75CC6B79913
1 changed files with 6 additions and 11 deletions

View File

@ -147,23 +147,18 @@ func ToString(res util.Response, opts *util.Options) (string, error) {
}
func serverExtra(opts *util.Options) string {
// Add extra information to server string
var extra string
switch {
case opts.TCP:
extra = ":" + strconv.Itoa(opts.Request.Port) + " (TCP)"
return " (TCP)"
case opts.TLS:
extra = ":" + strconv.Itoa(opts.Request.Port) + " (TLS)"
return " (TLS)"
case opts.HTTPS, opts.DNSCrypt:
extra = ""
return ""
case opts.QUIC:
extra = ":" + strconv.Itoa(opts.Request.Port) + " (QUIC)"
return " (QUIC)"
default:
extra = ":" + strconv.Itoa(opts.Request.Port) + " (UDP)"
return " (UDP)"
}
return extra
}
// stringParse edits the raw responses to user requests.
@ -419,7 +414,7 @@ func MakePrintable(res util.Response, opts *util.Options) (*Message, error) {
ret.Statistics = Statistics{
RTT: res.RTT.String(),
Server: opts.Request.Server + serverExtra(opts),
When: time.Now().Format(time.RFC1123Z),
When: time.Now().Format(time.RFC3339),
MsgSize: res.DNS.Len(),
}
} else {