Merge branch 'master' of git@github.com:sustrik/zeromq2

4 files changed, 20 insertions, 1 deletions

diff --git a/bindings/c/zmq.h b/bindings/c/zmq.h
index 40750ec..ff94dd4 100644
--- a/bindings/c/zmq.h
+++ b/bindings/c/zmq.h
@@ -63,6 +63,9 @@ extern "C" {
 #ifndef EADDRNOTAVAIL
 #define EADDRNOTAVAIL (ZMQ_HAUSNUMERO + 6)
 #endif
+#ifndef ECONNREFUSED
+#define ECONNREFUSED (ZMQ_HAUSNUMERO + 7)
+#endif
 
 //  Native 0MQ error codes.
 #define EMTHREAD (ZMQ_HAUSNUMERO + 50)
@@ -180,7 +183,7 @@ ZMQ_EXPORT int zmq_term (void *context);
 
 //  Socket to send requests and receive replies. Requests are
 //  load-balanced among all the peers. This socket type allows
-//  only an alternated sequence of send's and recv's
+//  only an alternated sequence of send's and recv's.
 #define ZMQ_REQ 3
 
 //  Socket to receive requests and send replies. This socket type allows
@@ -188,6 +191,12 @@ ZMQ_EXPORT int zmq_term (void *context);
 //  the peer that issued the last received request.
 #define ZMQ_REP 4
 
+//  Socket to receive messages from up the stream.
+#define ZMQ_UPSTREAM 5
+
+//  Socket to send messages downstream.
+#define ZMQ_DOWNSTREAM 6
+
 //  Open a socket. 'type' is one of the socket types defined above.
 //
 //  Errors: EINVAL - invalid socket type.
diff --git a/bindings/java/org/zmq/Socket.java b/bindings/java/org/zmq/Socket.java
index 501bc16..396a6a0 100644
--- a/bindings/java/org/zmq/Socket.java
+++ b/bindings/java/org/zmq/Socket.java
@@ -34,6 +34,8 @@ public class Socket
     public static final int SUB = 2;
     public static final int REQ = 3;
     public static final int REP = 4;
+    public static final int UPSTREAM = 4;
+    public static final int DOWNSTREAM = 4;
 
     public static final int HWM = 1;
     public static final int LWM = 2;
diff --git a/bindings/python/pyzmq.cpp b/bindings/python/pyzmq.cpp
index b180bcd..26ca7ac 100644
--- a/bindings/python/pyzmq.cpp
+++ b/bindings/python/pyzmq.cpp
@@ -498,6 +498,12 @@ PyMODINIT_FUNC initlibpyzmq ()
     t = PyInt_FromLong (ZMQ_REP);
     PyDict_SetItemString (dict, "REP", t);
     Py_DECREF (t);
+    t = PyInt_FromLong (ZMQ_UPSTREAM);
+    PyDict_SetItemString (dict, "UPSTREAM", t);
+    Py_DECREF (t);
+    t = PyInt_FromLong (ZMQ_DOWNSTREAM);
+    PyDict_SetItemString (dict, "DOWNSTREAM", t);
+    Py_DECREF (t);
     t = PyInt_FromLong (ZMQ_HWM);
     PyDict_SetItemString (dict, "HWM", t);
     Py_DECREF (t);
diff --git a/bindings/ruby/rbzmq.cpp b/bindings/ruby/rbzmq.cpp
index 6112972..2a26ce1 100644
--- a/bindings/ruby/rbzmq.cpp
+++ b/bindings/ruby/rbzmq.cpp
@@ -275,6 +275,8 @@ extern "C" void Init_librbzmq ()
     rb_define_global_const ("PUB", INT2NUM (ZMQ_PUB));
     rb_define_global_const ("REQ", INT2NUM (ZMQ_REQ));
     rb_define_global_const ("REP", INT2NUM (ZMQ_REP));
+    rb_define_global_const ("UPSTREAM", INT2NUM (ZMQ_UPSTREAM));
+    rb_define_global_const ("DOWNSTREAM", INT2NUM (ZMQ_DOWNSTREAM));
 
     rb_define_global_const ("POLL", INT2NUM (ZMQ_POLL));
 }