X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fzeromq.go;h=a3d6b028fc7afba59aed9774e4eba6cd6a685076;hb=8730091c3867902511b81c17a5c074220066b03c;hp=2e28d50c276208286ea439c2d3bca91277cba914;hpb=7be7cb4517b411371b18375fd181d48df2184739;p=svn42.git

diff --git a/go/r3-eventbroker_zmq/zeromq.go b/go/r3-eventbroker_zmq/zeromq.go
index 2e28d50..a3d6b02 100644
--- a/go/r3-eventbroker_zmq/zeromq.go
+++ b/go/r3-eventbroker_zmq/zeromq.go
@@ -5,15 +5,12 @@ package main
 import (
     zmq "github.com/vaughan0/go-zmq"
     "bytes"
-    "error"
+    "errors"
  )
 
 // ---------- ZeroMQ Code -------------
 
-type ReqSocket *zmq.Socket
-type PubSocket *zmq.Socket
-
-func ZmqsInit(sub_connect_port, sub_listen_port, pub_port, keylookup_port string)  (ctx *zmq.Context, sub_chans *zmq.Channels, pub_sock PubSocket, keylookup_sock ReqSocket) {
+func ZmqsInit(sub_connect_port, sub_listen_port, pub_port, keylookup_port string)  (ctx *zmq.Context, sub_chans *zmq.Channels, pub_sock *zmq.Socket, keylookup_sock *zmq.Socket) {
     var err error
     ctx, err = zmq.NewContext()
     if err != nil {
@@ -22,13 +19,15 @@ func ZmqsInit(sub_connect_port, sub_listen_port, pub_port, keylookup_port string
     //close only on later panic, otherwise leave open:
     defer func(){ if r:= recover(); r != nil { ctx.Close(); panic(r) } }()
 
-    if len(sub_port) > 0 {
+    if len(sub_connect_port) > 0 && len(sub_listen_port) > 0 {
         sub_sock, err := ctx.Socket(zmq.Sub)
         if err != nil {
             panic(err)
         }
         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)
         }
@@ -44,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)
         }
@@ -58,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)
         }
@@ -81,9 +80,26 @@ func zmqsHandleError(chans *zmq.Channels) {
     }
 }
 
-func (s ReqSocket) ZmqsRequestAnswer(request [][]byte) (answer []][]byte) {
-    sock := s.(*zmq.Socket)
-    if err = sock.Send(request); err != nil {
+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)
     }
     parts, err := sock.Recv()
@@ -93,25 +109,38 @@ func (s ReqSocket) ZmqsRequestAnswer(request [][]byte) (answer []][]byte) {
     return parts
 }
 
-func (s PubSocket) ZmqsPublish(msg [][]byte) {
-    sock := s.(*zmq.Socket)
-    if err = sock.Send(msg); err != nil {
-        panic(err)
+func ZmqsAskQuestionsAndClose(ctx *zmq.Context, addr string, questions [][][]byte) [][][]byte {
+    if len(addr) == 0 || ctx == nil { return nil }
+
+    req_sock, err := ctx.Socket(zmq.Req)
+    if err != nil {
+        return nil
+    }
+    defer req_sock.Close()
+
+    if err = req_sock.Connect(addr); err != nil {
+        return nil
+    }
+
+    rv := make([][][]byte, len(questions))
+    for index, q := range(questions) {
+        rv[index] = ZmqsRequestAnswer(req_sock, q)
     }
+    return rv
 }
 
-func (s ReqSocket) 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") {
-        return "", errors.New(string(bytes.Join(answ[1:])))
     }
-    if answ[0] !=  []byte("RESULT") || len(answ) != 3{
+    if bytes.Compare(answ[0], []byte("ERROR")) == 0 {
+        return "", errors.New(string(bytes.Join(answ[1:],[]byte(" "))))
+    }
+    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