X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fzeromq.go;h=81952c95b1edd800301a145795cab5e2dfcf1d8c;hb=ff98cdc53bc87b9d4f3215df248c188a84cb2fb1;hp=55aa20165a7b2fdbc50701d552c4d18ab9c3b2cc;hpb=39b62b90f21c12aac821b80b40ee162390ccbbc1;p=svn42.git

diff --git a/go/r3-eventbroker_zmq/zeromq.go b/go/r3-eventbroker_zmq/zeromq.go
index 55aa201..81952c9 100644
--- a/go/r3-eventbroker_zmq/zeromq.go
+++ b/go/r3-eventbroker_zmq/zeromq.go
@@ -26,6 +26,8 @@ func ZmqsInit(sub_connect_port, sub_listen_port, pub_port, keylookup_port string
         }
         defer func() { if r:= recover(); r != nil { sub_sock.Close(); panic(r) } }()
 
+        sub_sock.Subscribe([]byte{}) //subscribe empty filter -> aka to all messages
+
 	    if err = sub_sock.Bind(sub_listen_port); err != nil {
             panic(err)
         }
@@ -41,7 +43,7 @@ func ZmqsInit(sub_connect_port, sub_listen_port, pub_port, keylookup_port string
     }
 
     if len(pub_port) > 0 {
-        pub_sock, err := ctx.Socket(zmq.Pub)
+        pub_sock, err = ctx.Socket(zmq.Pub)
         if err != nil {
             panic(err)
         }
@@ -55,7 +57,7 @@ func ZmqsInit(sub_connect_port, sub_listen_port, pub_port, keylookup_port string
     }
 
     if len(keylookup_port) > 0 {
-        keylookup_sock, err := ctx.Socket(zmq.Req)
+        keylookup_sock, err = ctx.Socket(zmq.Req)
         if err != nil {
             panic(err)
         }
@@ -78,7 +80,25 @@ func zmqsHandleError(chans *zmq.Channels) {
     }
 }
 
-func (sock *zmq.Socket) ZmqsRequestAnswer(request [][]byte) (answer [][]byte) {
+func ZmqsBindNewReplySocket(ctx *zmq.Context, addr string) (chans *zmq.Channels, err error) {
+    if len(addr) == 0 {
+        return nil, errors.New("No listen address given")
+    }
+    sock, err := ctx.Socket(zmq.Rep)
+    if err != nil { return nil, err}
+
+    if err = sock.Bind(addr); err != nil {
+        sock.Close()
+        return nil, err
+    }
+
+    chans = sock.ChannelsBuffer(10)
+    go zmqsHandleError(chans)
+
+    return chans, nil
+}
+
+func ZmqsRequestAnswer(sock *zmq.Socket, request [][]byte) (answer [][]byte) {
     if err := sock.Send(request); err != nil {
         panic(err)
     }
@@ -89,18 +109,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