X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fzeromq.go;fp=go%2Fr3-eventbroker_zmq%2Fzeromq.go;h=09720e10f437a88ffc411eb4f5b9b42a105c31cc;hb=03f11406495d2de6340f0331f91ebfd25fbe67ed;hp=55aa20165a7b2fdbc50701d552c4d18ab9c3b2cc;hpb=845254e617b714552edbf860632f0e763a40d1a5;p=svn42.git diff --git a/go/r3-eventbroker_zmq/zeromq.go b/go/r3-eventbroker_zmq/zeromq.go index 55aa201..09720e1 100644 --- a/go/r3-eventbroker_zmq/zeromq.go +++ b/go/r3-eventbroker_zmq/zeromq.go @@ -78,7 +78,7 @@ func zmqsHandleError(chans *zmq.Channels) { } } -func (sock *zmq.Socket) ZmqsRequestAnswer(request [][]byte) (answer [][]byte) { +func ZmqsRequestAnswer(sock *zmq.Socket, request [][]byte) (answer [][]byte) { if err := sock.Send(request); err != nil { panic(err) } @@ -89,18 +89,18 @@ func (sock *zmq.Socket) ZmqsRequestAnswer(request [][]byte) (answer [][]byte) { return parts } -func (s *zmq.Socket) LookupCardIdNick(hexbytes []byte) (nick string, error) { - answ := s.ZmqsRequestAnswer([][]byte{hexbytes}) +func LookupCardIdNick(s *zmq.Socket, hexbytes []byte) (string, error) { + answ := ZmqsRequestAnswer(s, [][]byte{hexbytes}) if len(answ) == 0 { return "", errors.New("Empty reply received") } - if answ[0] == []byte("ERROR") { + if bytes.Compare(answ[0], []byte("ERROR")) == 0 { return "", errors.New(string(bytes.Join(answ[1:],[]byte(" ")))) } - if answ[0] != []byte("RESULT") || len(answ) != 3{ + if bytes.Compare(answ[0], []byte("RESULT")) != 0 || len(answ) != 3{ return "", errors.New("Unknown reply received") } - if answ[1] != hexbytes { + if bytes.Compare(answ[1], hexbytes) != 0 { return "", errors.New("Wrong reply received") } return string(answ[2]), nil