mirror of
https://github.com/mjl-/mox.git
synced 2024-12-26 16:33:47 +03:00
5742ed1537
the idea is to make it clear from the logging if non-ascii characters are used. this is implemented by making mlog recognize if a field value that will be logged has a LogString method. if so, that value is logged. dns.Domain, smtp.Address, smtp.Localpart, smtp.Path now have a LogString method. some explicit calls to String have been replaced to LogString, and some %q formatting have been replaced with %s, because the escaped localpart would already have double quotes, and double doublequotes aren't easy to read.
51 lines
1.1 KiB
Go
51 lines
1.1 KiB
Go
package dns
|
|
|
|
import (
|
|
"net"
|
|
)
|
|
|
|
// IPDomain is an ip address, a domain, or empty.
|
|
type IPDomain struct {
|
|
IP net.IP
|
|
Domain Domain
|
|
}
|
|
|
|
// IsZero returns if both IP and Domain are zero.
|
|
func (d IPDomain) IsZero() bool {
|
|
return d.IP == nil && d.Domain == Domain{}
|
|
}
|
|
|
|
// String returns a string representation of either the IP or domain (with
|
|
// UTF-8).
|
|
func (d IPDomain) String() string {
|
|
if len(d.IP) > 0 {
|
|
return d.IP.String()
|
|
}
|
|
return d.Domain.Name()
|
|
}
|
|
|
|
// LogString returns a string with both ASCII-only and optional UTF-8
|
|
// representation.
|
|
func (d IPDomain) LogString() string {
|
|
if len(d.IP) > 0 {
|
|
return d.IP.String()
|
|
}
|
|
return d.Domain.LogString()
|
|
}
|
|
|
|
// XString is like String, but only returns UTF-8 domains if utf8 is true.
|
|
func (d IPDomain) XString(utf8 bool) string {
|
|
if d.IsIP() {
|
|
// todo: check callers if this is valid syntax for them. should we add [] for ipv6? perhaps also ipv4? probably depends on context. in smtp, the syntax is [<ipv4>] and [IPv6:<ipv6>].
|
|
return d.IP.String()
|
|
}
|
|
return d.Domain.XName(utf8)
|
|
}
|
|
|
|
func (d IPDomain) IsIP() bool {
|
|
return len(d.IP) > 0
|
|
}
|
|
|
|
func (d IPDomain) IsDomain() bool {
|
|
return !d.Domain.IsZero()
|
|
}
|