linter stuff mostly

This commit is contained in:
eyedeekay
2025-06-05 15:27:19 -04:00
parent 294b34da9f
commit 01312ec495
4 changed files with 25 additions and 4 deletions

View File

@@ -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)

View File

@@ -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
}

View File

@@ -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)

View File

@@ -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
}