From 911a80996a6abc208fe078c3461ab40d6bd3a3a3 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 1 Jun 2022 13:45:13 +0200 Subject: [PATCH] Fix multicast detection on ended connections as well as some linter errors --- core/base/databases.go | 2 -- network/multicast.go | 4 ++-- profile/module.go | 2 -- resolver/resolver_test.go | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/base/databases.go b/core/base/databases.go index d2ba2552..56355125 100644 --- a/core/base/databases.go +++ b/core/base/databases.go @@ -2,8 +2,6 @@ package base import ( "github.com/safing/portbase/database" - - // Dependencies. _ "github.com/safing/portbase/database/dbmodule" _ "github.com/safing/portbase/database/storage/bbolt" ) diff --git a/network/multicast.go b/network/multicast.go index 82cb2173..8a32aea7 100644 --- a/network/multicast.go +++ b/network/multicast.go @@ -17,8 +17,8 @@ func GetMulticastRequestConn(responseConn *Connection, responseFromNet *net.IPNe switch { case conn.Inbound: // Ignore incoming connections. - //case conn.Ended != 0: - // Ignore ended connections. + case conn.Ended != 0: + // Ignore ended connections. case conn.Entity.Protocol != responseConn.Entity.Protocol: // Ignore on protocol mismatch. case conn.LocalPort != responseConn.LocalPort: diff --git a/profile/module.go b/profile/module.go index da479663..31b52704 100644 --- a/profile/module.go +++ b/profile/module.go @@ -6,8 +6,6 @@ import ( "github.com/safing/portbase/database/migration" "github.com/safing/portbase/log" "github.com/safing/portbase/modules" - - // Dependency. _ "github.com/safing/portmaster/core/base" "github.com/safing/portmaster/updates" ) diff --git a/resolver/resolver_test.go b/resolver/resolver_test.go index 61e05376..a03b3eb9 100644 --- a/resolver/resolver_test.go +++ b/resolver/resolver_test.go @@ -7,9 +7,8 @@ import ( "testing" "time" - "github.com/stretchr/testify/assert" - "github.com/miekg/dns" + "github.com/stretchr/testify/assert" "github.com/safing/portbase/log" )