fix sending update verdict info

This commit is contained in:
Vladimir
2022-11-08 16:39:26 +01:00
parent 7a639be526
commit 8b8755458e
3 changed files with 42 additions and 16 deletions

View File

@@ -13,6 +13,7 @@ import (
"github.com/safing/portbase/log"
"github.com/safing/portmaster/network"
"github.com/safing/portmaster/network/packet"
"golang.org/x/sys/windows"
)
@@ -217,24 +218,27 @@ func UpdateVerdict(conn *network.Connection) error {
defer kextLock.RUnlock()
// Check if driver is initialized
if !ready.IsSet() {
if kextHandle == winInvalidHandleValue {
log.Error("kext: failed to clear the cache: kext not ready")
return ErrKextNotReady
}
var isIpv6 uint8 = 0
if conn.IPVersion == packet.IPv6 {
isIpv6 = 1
}
// initialize variables
info := &VerdictUpdateInfo{
ipV6: uint8(conn.IPVersion),
info := VerdictUpdateInfo{
ipV6: isIpv6,
protocol: uint8(conn.IPProtocol),
localIP: ipAddressToArray(conn.LocalIP, isIpv6 == 1),
localPort: conn.LocalPort,
remoteIP: ipAddressToArray(conn.Entity.IP, isIpv6 == 1),
remotePort: conn.Entity.Port,
verdict: uint8(conn.Verdict.Active),
}
// copy ip addresses
copy(asByteArray(&info.localIP[0]), conn.LocalIP)
copy(asByteArray(&info.remoteIP[0]), conn.Entity.IP)
// Make driver request
data := asByteArray(&info)
err := deviceIoControlDirect(kextHandle, IOCTL_UPDATE_VERDICT, data)
@@ -246,7 +250,7 @@ func GetVersion() (*VersionInfo, error) {
defer kextLock.RUnlock()
// Check if driver is initialized
if !ready.IsSet() {
if kextHandle == winInvalidHandleValue {
log.Error("kext: failed to clear the cache: kext not ready")
return nil, ErrKextNotReady
}
@@ -267,10 +271,6 @@ func GetVersion() (*VersionInfo, error) {
return version, nil
}
func asByteArray[T any](obj *T) []byte {
return unsafe.Slice((*byte)(unsafe.Pointer(obj)), unsafe.Sizeof(*obj))
}
func openDriver(filename string) (windows.Handle, error) {
u16filename, err := syscall.UTF16FromString(filename)
if err != nil {