diff --git a/src/socket/protocol.go b/src/socket/protocol.go index 905cae1..9dc10f5 100644 --- a/src/socket/protocol.go +++ b/src/socket/protocol.go @@ -3,9 +3,7 @@ package socket import ( "bytes" "fmt" - "github.com/kisielk/og-rek" "github.com/nlpodyssey/gopickle/pickle" - "net" ) const ( @@ -15,28 +13,28 @@ const ( ) func (s *Fail2BanSocket) sendCommand(command []string) (interface{}, error) { - err := write(s.encoder, command) + err := s.write(command) if err != nil { return nil, err } - return read(&s.socket) + return s.read() } -func write(encoder *ogórek.Encoder, command []string) error { - err := encoder.Encode(command) +func (s *Fail2BanSocket) write(command []string) error { + err := s.encoder.Encode(command) if err != nil { return err } - err = encoder.Encode(commandTerminator) + _, err = s.socket.Write([]byte(commandTerminator)) if err != nil { return err } return nil } -func read(s *net.Conn) (interface{}, error) { +func (s *Fail2BanSocket) read() (interface{}, error) { buf := make([]byte, socketReadBufferSize) - _, err := (*s).Read(buf) + _, err := s.socket.Read(buf) if err != nil { return nil, err }