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

fix stopping of the kext service

Browse Source
This commit is contained in:
Vladimir
2022-11-07 16:42:12 +01:00
parent 101bf16727
commit fed7b74f51
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
firewall/interception/windowskext/kext.go
View File

@@ -47,9 +47,9 @@ func Start() error {
defer kextLock.Unlock() defer kextLock.Unlock()
// initialize and start driver service // initialize and start driver service
service, err := createKextService(driverName, driverPath) var err error
service, err = createKextService(driverName, driverPath)
if err != nil { if err != nil {
log.Warningf("winkext: failed to create service: %s", err)
return fmt.Errorf("failed to create service: %w", err) return fmt.Errorf("failed to create service: %w", err)
} }
@@ -58,7 +58,6 @@ func Start() error {
err = service.start(true) err = service.start(true)
if err != nil { if err != nil {
log.Warningf("winkext: failed to start service: %s", err)
return fmt.Errorf("failed to start service: %w", err) return fmt.Errorf("failed to start service: %w", err)
} }
} else if err != nil { } else if err != nil {

6
firewall/interception/windowskext/service.go
View File

@@ -115,7 +115,7 @@ func (s *KextService) start(wait bool) error {
func (s *KextService) stop(wait bool) error { func (s *KextService) stop(wait bool) error {
if !s.isValid() { if !s.isValid() {
return fmt.Errorf("kext service not initialized %v", s) return fmt.Errorf("kext service not initialized")
} }
// Stop the service // Stop the service
@@ -138,7 +138,7 @@ func (s *KextService) stop(wait bool) error {
func (s *KextService) delete() error { func (s *KextService) delete() error {
if !s.isValid() { if !s.isValid() {
return fmt.Errorf("kext service not initialized %v", s) return fmt.Errorf("kext service not initialized")
} }
err := windows.DeleteService(s.handle) err := windows.DeleteService(s.handle)
@@ -150,7 +150,7 @@ func (s *KextService) delete() error {
func (s *KextService) closeHandle() error { func (s *KextService) closeHandle() error {
if !s.isValid() { if !s.isValid() {
return fmt.Errorf("kext service not initialized %v", s) return fmt.Errorf("kext service not initialized")
} }
err := windows.CloseServiceHandle(s.handle) err := windows.CloseServiceHandle(s.handle)