c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto-initialize per-addr keys in SMTPErrors

Browse Source
This commit is contained in:
ooni noob 2022-11-20 18:30:15 +01:00
parent c35e01f640
commit 25ebafa427
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/engine/experiment/smtp/smtp.go
View File

@ -133,12 +133,8 @@ type SMTPRunner struct {
func (r SMTPRunner) smtp_error(err error) { func (r SMTPRunner) smtp_error(err error) {
key := net.JoinHostPort(r.addr, r.port) key := net.JoinHostPort(r.addr, r.port)
errors, exists := r.tk.SMTPErrors[key] // Key is initialized in conn() no need to check here
if exists { r.tk.SMTPErrors[key] = append(r.tk.SMTPErrors[key], tracex.NewFailure(err))
r.tk.SMTPErrors[key] = append(errors, tracex.NewFailure(err))
} else {
r.tk.SMTPErrors[key] = []*string{tracex.NewFailure(err)}
}
} }
func (r SMTPRunner) resolve(host string) ([]string, bool) { func (r SMTPRunner) resolve(host string) ([]string, bool) {
@ -156,7 +152,13 @@ func (r SMTPRunner) resolve(host string) ([]string, bool) {
} }
func (r SMTPRunner) conn(addr string) (net.Conn, bool) { func (r SMTPRunner) conn(addr string) (net.Conn, bool) {
// Initialize addr field and corresponding errors in TestKeys
r.addr = addr r.addr = addr
if r.tk.SMTPErrors == nil {
r.tk.SMTPErrors = make(map[string][]*string)
}
r.tk.SMTPErrors[net.JoinHostPort(addr, r.port)] = []*string{}
dialer := r.trace.NewDialerWithoutResolver(r.logger) dialer := r.trace.NewDialerWithoutResolver(r.logger)
conn, err := dialer.DialContext(r.ctx, "tcp", net.JoinHostPort(r.addr, r.port)) conn, err := dialer.DialContext(r.ctx, "tcp", net.JoinHostPort(r.addr, r.port))
r.tk.TCPConnect = append(r.tk.TCPConnect, r.trace.TCPConnects()...) r.tk.TCPConnect = append(r.tk.TCPConnect, r.trace.TCPConnects()...)
@ -243,8 +245,6 @@ func (m Measurer) Run(
} }
tk := new(TestKeys) tk := new(TestKeys)
// TODO: make it so we don't forget it
tk.SMTPErrors = make(map[string][]*string)
measurement.TestKeys = tk measurement.TestKeys = tk
ctx, cancel := context.WithTimeout(ctx, 60*time.Second) ctx, cancel := context.WithTimeout(ctx, 60*time.Second)