From 6e25d4459797dcfa432fabda510ce64beac08a52 Mon Sep 17 00:00:00 2001 From: Siyuan Miao Date: Sat, 14 Jun 2025 14:56:05 +0200 Subject: [PATCH] fix lint issues --- internal/lldp/afpacket.go | 1 - internal/lldp/lldp.go | 7 +++++-- internal/lldp/rx.go | 5 +++-- internal/network/lldp.go | 14 +++++++------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/internal/lldp/afpacket.go b/internal/lldp/afpacket.go index bb30d52..10775dd 100644 --- a/internal/lldp/afpacket.go +++ b/internal/lldp/afpacket.go @@ -18,7 +18,6 @@ const ( func afPacketComputeSize(targetSizeMb int, snaplen int, pageSize int) ( frameSize int, blockSize int, numBlocks int, err error) { - if snaplen < pageSize { frameSize = pageSize / (pageSize / snaplen) } else { diff --git a/internal/lldp/lldp.go b/internal/lldp/lldp.go index 81bf32c..85020b6 100644 --- a/internal/lldp/lldp.go +++ b/internal/lldp/lldp.go @@ -74,7 +74,10 @@ func (l *LLDP) Start() error { l.l.Error().Err(err).Msg("unable to set up AF_PACKET") return err } - l.startCapture() + if err := l.startCapture(); err != nil { + l.l.Error().Err(err).Msg("unable to start capture") + return err + } } go l.neighbors.Start() @@ -93,7 +96,7 @@ func (l *LLDP) Stop() error { } if l.enableRx { - l.shutdownCapture() + _ = l.shutdownCapture() } l.neighbors.Stop() diff --git a/internal/lldp/rx.go b/internal/lldp/rx.go index 909806c..759d3ba 100644 --- a/internal/lldp/rx.go +++ b/internal/lldp/rx.go @@ -20,6 +20,8 @@ var ( // from lldpd // https://github.com/lldpd/lldpd/blob/9034c9332cca0c8b1a20e1287f0e5fed81f7eb2a/src/daemon/lldpd.h#L246 +// +//nolint:govet var bpfFilter = []bpf.RawInstruction{ {0x30, 0, 0, 0x00000000}, {0x54, 0, 0, 0x00000001}, {0x15, 0, 16, 0x00000001}, {0x28, 0, 0, 0x0000000c}, {0x15, 0, 6, 0x000088cc}, @@ -110,7 +112,6 @@ func (l *LLDP) startCapture() error { } } } - }() return nil @@ -239,7 +240,7 @@ func (l *LLDP) handlePacketCDP(mac string, raw *layers.CiscoDiscovery, info *lay } if len(info.MgmtAddresses) > 0 { - n.ManagementAddress = fmt.Sprintf("%s", info.MgmtAddresses[0]) + n.ManagementAddress = string(info.MgmtAddresses[0]) } l.addNeighbor(mac, *n, ttl) diff --git a/internal/network/lldp.go b/internal/network/lldp.go index df342ff..8a3e214 100644 --- a/internal/network/lldp.go +++ b/internal/network/lldp.go @@ -14,11 +14,7 @@ func (s *NetworkInterfaceState) shouldStartLLDP() bool { s.l.Trace().Msgf("LLDP mode: %s", s.config.LLDPMode.String) - if s.config.LLDPMode.String == "disabled" { - return false - } - - return true + return s.config.LLDPMode.String != "disabled" } func (s *NetworkInterfaceState) startLLDP() { @@ -27,7 +23,9 @@ func (s *NetworkInterfaceState) startLLDP() { } s.l.Trace().Msg("starting LLDP") - s.lldp.Start() + if err := s.lldp.Start(); err != nil { + s.l.Error().Err(err).Msg("unable to start LLDP") + } } func (s *NetworkInterfaceState) stopLLDP() { @@ -35,7 +33,9 @@ func (s *NetworkInterfaceState) stopLLDP() { return } s.l.Trace().Msg("stopping LLDP") - s.lldp.Stop() + if err := s.lldp.Stop(); err != nil { + s.l.Error().Err(err).Msg("unable to stop LLDP") + } } func (s *NetworkInterfaceState) GetLLDPNeighbors() ([]lldp.Neighbor, error) {