github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Restructure modules (#1572)

Browse Source 
* Move portbase into monorepo

* Add new simple module mgr

* [WIP] Switch to new simple module mgr

* Add StateMgr and more worker variants

* [WIP] Switch more modules

* [WIP] Switch more modules

* [WIP] swtich more modules

* [WIP] switch all SPN modules

* [WIP] switch all service modules

* [WIP] Convert all workers to the new module system

* [WIP] add new task system to module manager

* [WIP] Add second take for scheduling workers

* [WIP] Add FIXME for bugs in new scheduler

* [WIP] Add minor improvements to scheduler

* [WIP] Add new worker scheduler

* [WIP] Fix more bug related to new module system

* [WIP] Fix start handing of the new module system

* [WIP] Improve startup process

* [WIP] Fix minor issues

* [WIP] Fix missing subsystem in settings

* [WIP] Initialize managers in constructor

* [WIP] Move module event initialization to constrictors

* [WIP] Fix setting for enabling and disabling the SPN module

* [WIP] Move API registeration into module construction

* [WIP] Update states mgr for all modules

* [WIP] Add CmdLine operation support

* Add state helper methods to module group and instance

* Add notification and module status handling to status package

* Fix starting issues

* Remove pilot widget and update security lock to new status data

* Remove debug logs

* Improve http server shutdown

* Add workaround for cleanly shutting down firewall+netquery

* Improve logging

* Add syncing states with notifications for new module system

* Improve starting, stopping, shutdown; resolve FIXMEs/TODOs

* [WIP] Fix most unit tests

* Review new module system and fix minor issues

* Push shutdown and restart events again via API

* Set sleep mode via interface

* Update example/template module

* [WIP] Fix spn/cabin unit test

* Remove deprecated UI elements

* Make log output more similar for the logging transition phase

* Switch spn hub and observer cmds to new module system

* Fix log sources

* Make worker mgr less error prone

* Fix tests and minor issues

* Fix observation hub

* Improve shutdown and restart handling

* Split up big connection.go source file

* Move varint and dsd packages to structures repo

* Improve expansion test

* Fix linter warnings

* Fix interception module on windows

* Fix linter errors

---------

Co-authored-by: Vladimir Stoilov <vladimir@safing.io>
This commit is contained in:
Daniel Hååvi
2024-08-09 17:15:48 +02:00
committed by GitHub
parent 10a77498f4
commit 80664d1a27
647 changed files with 37690 additions and 3366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
service/resolver/resolver-mdns.go
View File

@@ -11,7 +11,8 @@ import (
"github.com/miekg/dns"
"github.com/safing/portbase/log"
"github.com/safing/portmaster/base/log"
"github.com/safing/portmaster/service/mgr"
"github.com/safing/portmaster/service/netenv"
"github.com/safing/portmaster/service/network/netutils"
)
@@ -74,7 +75,7 @@ func indexOfRR(entry *dns.RR_Header, list *[]dns.RR) int {
}
//nolint:gocyclo,gocognit // TODO: make simpler
func listenToMDNS(ctx context.Context) error {
func listenToMDNS(wc *mgr.WorkerCtx) error {
var err error
messages := make(chan *dns.Msg, 32)
@@ -86,8 +87,8 @@ func listenToMDNS(ctx context.Context) error {
// TODO: retry after some time
log.Warningf("intel(mdns): failed to create udp4 listen multicast socket: %s", err)
} else {
module.StartServiceWorker("mdns udp4 multicast listener", 0, func(ctx context.Context) error {
return listenForDNSPackets(ctx, multicast4Conn, messages)
module.mgr.Go("mdns udp4 multicast listener", func(wc *mgr.WorkerCtx) error {
return listenForDNSPackets(wc.Ctx(), multicast4Conn, messages)
})
defer func() {
_ = multicast4Conn.Close()
@@ -99,8 +100,8 @@ func listenToMDNS(ctx context.Context) error {
// TODO: retry after some time
log.Warningf("intel(mdns): failed to create udp4 listen socket: %s", err)
} else {
module.StartServiceWorker("mdns udp4 unicast listener", 0, func(ctx context.Context) error {
return listenForDNSPackets(ctx, unicast4Conn, messages)
module.mgr.Go("mdns udp4 unicast listener", func(wc *mgr.WorkerCtx) error {
return listenForDNSPackets(wc.Ctx(), unicast4Conn, messages)
})
defer func() {
_ = unicast4Conn.Close()
@@ -113,8 +114,8 @@ func listenToMDNS(ctx context.Context) error {
// TODO: retry after some time
log.Warningf("intel(mdns): failed to create udp6 listen multicast socket: %s", err)
} else {
module.StartServiceWorker("mdns udp6 multicast listener", 0, func(ctx context.Context) error {
return listenForDNSPackets(ctx, multicast6Conn, messages)
module.mgr.Go("mdns udp6 multicast listener", func(wc *mgr.WorkerCtx) error {
return listenForDNSPackets(wc.Ctx(), multicast6Conn, messages)
})
defer func() {
_ = multicast6Conn.Close()
@@ -126,8 +127,8 @@ func listenToMDNS(ctx context.Context) error {
// TODO: retry after some time
log.Warningf("intel(mdns): failed to create udp6 listen socket: %s", err)
} else {
module.StartServiceWorker("mdns udp6 unicast listener", 0, func(ctx context.Context) error {
return listenForDNSPackets(ctx, unicast6Conn, messages)
module.mgr.Go("mdns udp6 unicast listener", func(wc *mgr.WorkerCtx) error {
return listenForDNSPackets(wc.Ctx(), unicast6Conn, messages)
})
defer func() {
_ = unicast6Conn.Close()
@@ -138,12 +139,12 @@ func listenToMDNS(ctx context.Context) error {
}
// start message handler
module.StartServiceWorker("mdns message handler", 0, func(ctx context.Context) error {
return handleMDNSMessages(ctx, messages)
module.mgr.Go("mdns message handler", func(wc *mgr.WorkerCtx) error {
return handleMDNSMessages(wc.Ctx(), messages)
})
// wait for shutdown
<-module.Ctx.Done()
<-wc.Done()
return nil
}
@@ -341,7 +342,7 @@ func listenForDNSPackets(ctx context.Context, conn *net.UDPConn, messages chan *
for {
n, err := conn.Read(buf)
if err != nil {
if module.IsStopping() {
if module.mgr.IsDone() {
return nil
}
log.Debugf("resolver: failed to read packet: %s", err)