From 01312ec4959f7f548e5c69f4e6afd115165b382c Mon Sep 17 00:00:00 2001 From: eyedeekay Date: Thu, 5 Jun 2025 15:27:19 -0400 Subject: [PATCH] linter stuff mostly --- certificate.go | 6 ++++++ lease.go | 9 +++++++++ session_config.go | 8 ++++---- stream.go | 6 ++++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/certificate.go b/certificate.go index 9a1d4a4..b58ead3 100644 --- a/certificate.go +++ b/certificate.go @@ -20,6 +20,9 @@ func NewCertificate(typ uint8) (cert Certificate) { func NewCertificateFromMessage(stream *Stream) (cert Certificate, err error) { cert.certType, err = stream.ReadByte() + if err != nil { + return + } cert.length, err = stream.ReadUint16() if err != nil { return @@ -49,6 +52,9 @@ func (cert *Certificate) Copy() (newCert Certificate) { func (cert *Certificate) WriteToMessage(stream *Stream) (err error) { err = stream.WriteByte(cert.certType) + if err != nil { + return + } err = stream.WriteUint16(cert.length) if cert.length > 0 { _, err = stream.Write(cert.data) diff --git a/lease.go b/lease.go index 3a3f124..227e928 100644 --- a/lease.go +++ b/lease.go @@ -10,13 +10,22 @@ func NewLeaseFromStream(stream *Stream) (l *Lease, err error) { l = &Lease{} stream.Read(l.tunnelGateway[:]) l.tunnelId, err = stream.ReadUint32() + if err != nil { + return nil, err + } l.endDate, err = stream.ReadUint64() return } func (l *Lease) WriteToMessage(stream *Stream) (err error) { _, err = stream.Write(l.tunnelGateway[:]) + if err != nil { + return err + } err = stream.WriteUint32(l.tunnelId) + if err != nil { + return err + } err = stream.WriteUint64(l.endDate) return } diff --git a/session_config.go b/session_config.go index 5ba2118..06a5757 100644 --- a/session_config.go +++ b/session_config.go @@ -4,8 +4,8 @@ import ( "bufio" "os" "regexp" + "strings" "time" - "strings" ) type SessionConfigProperty int @@ -140,9 +140,9 @@ func (config *SessionConfig) SetProperty(prop SessionConfigProperty, value strin func ParseConfig(s string, cb func(string, string)) { file, err := os.Open(s) if err != nil { - if !strings.Contains(err.Error(), "no such file") { - Error(SESSION_CONFIG, err.Error()) - } + if !strings.Contains(err.Error(), "no such file") { + Error(SESSION_CONFIG, err.Error()) + } return } Debug(SESSION_CONFIG, "Parsing config file '%s'", s) diff --git a/stream.go b/stream.go index d262986..69461bb 100644 --- a/stream.go +++ b/stream.go @@ -54,6 +54,9 @@ func (s *Stream) WriteUint64(i uint64) (err error) { func (stream *Stream) WriteLenPrefixedString(s string) (err error) { err = stream.WriteByte(uint8(len(s))) + if err != nil { + return + } _, err = stream.WriteString(s) return } @@ -75,6 +78,9 @@ func (stream *Stream) WriteMapping(m map[string]string) (err error) { buf.WriteByte(byte(';')) } err = stream.WriteUint16(uint16(buf.Len())) + if err != nil { + return + } _, err = stream.Write(buf.Bytes()) return }