Implement review suggestions, fix tests

This commit is contained in:
Daniel 2020-10-15 15:25:34 +02:00
parent 5d0db1c250
commit be75c2d99b
4 changed files with 8 additions and 6 deletions

View file

@ -95,12 +95,12 @@ func (e *Entity) Init() *Entity {
return e
}
// AddDstPort adds the destination port.
func (e *Entity) AddDstPort(dstPort uint16) {
// SetDstPort sets the destination port.
func (e *Entity) SetDstPort(dstPort uint16) {
e.dstPort = dstPort
}
// AddDstPort adds the destination port.
// DstPort returns the destination port.
func (e *Entity) DstPort() uint16 {
return e.dstPort
}

View file

@ -10,7 +10,7 @@ import (
)
// Windows specific constants for the WSAIoctl interface.
//nolint:golint
//nolint:golint,stylecheck
const (
SIO_RCVALL = syscall.IOC_IN | syscall.IOC_VENDOR | 1

View file

@ -128,7 +128,7 @@ func NewConnectionFromFirstPacket(pkt packet.Packet) *Connection {
Protocol: uint8(pkt.Info().Protocol),
Port: pkt.Info().SrcPort,
}
entity.AddDstPort(pkt.Info().DstPort)
entity.SetDstPort(pkt.Info().DstPort)
} else {
@ -138,7 +138,7 @@ func NewConnectionFromFirstPacket(pkt packet.Packet) *Connection {
Protocol: uint8(pkt.Info().Protocol),
Port: pkt.Info().DstPort,
}
entity.AddDstPort(entity.Port)
entity.SetDstPort(entity.Port)
// check if we can find a domain for that IP
ipinfo, err := resolver.GetIPInfo(proc.LocalProfileKey, pkt.Info().Dst.String())

View file

@ -17,6 +17,8 @@ func TestMain(m *testing.M) {
}
func testEndpointMatch(t *testing.T, ep Endpoint, entity *intel.Entity, expectedResult EPResult) {
entity.SetDstPort(entity.Port)
result, _ := ep.Matches(context.TODO(), entity)
if result != expectedResult {
t.Errorf(