problem: HELLO messages do no contain X-PUBLICKEY header, other misc..

.travis.yml

@@ -47,7 +47,6 @@ matrix:
   - env: BUILD_TYPE=valgrind
     os: linux
     dist: trusty
-    sudo: required
     addons:
       apt:
         sources:

api/zyre.api

@@ -107,11 +107,6 @@
         <argument name = "zcert" type = "zcert"></argument>
     </method>
 
-    <method name = "beacon set version" state = "draft">
-        Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-        <argument name = "version" type = "string"></argument>
-    </method>
-
     <method name = "gossip bind">
         Set-up gossip discovery of other nodes. At least one node in the cluster
         must bind to a well-known gossip endpoint, so other nodes can connect to

bindings/jni/src/main/c/org_zeromq_zyre_Zyre.c

@@ -114,14 +114,6 @@ Java_org_zeromq_zyre_Zyre__1_1setZcert (JNIEnv *env, jclass c, jlong self, jlong
     zyre_set_zcert ((zyre_t *) (intptr_t) self, (zcert_t *) (intptr_t) zcert);
 }
 
-JNIEXPORT void JNICALL
-Java_org_zeromq_zyre_Zyre__1_1beaconSetVersion (JNIEnv *env, jclass c, jlong self, jstring version)
-{
-    char *version_ = (char *) (*env)->GetStringUTFChars (env, version, NULL);
-    zyre_beacon_set_version ((zyre_t *) (intptr_t) self, version_);
-    (*env)->ReleaseStringUTFChars (env, version, version_);
-}
-
 JNIEXPORT void JNICALL
 Java_org_zeromq_zyre_Zyre__1_1gossipBind (JNIEnv *env, jclass c, jlong self, jstring format)
 {

bindings/jni/src/main/java/org/zeromq/zyre/Zyre.java

@@ -148,13 +148,6 @@ public void setZcert (Zcert zcert) {
         __setZcert (self, zcert.self);
     }
     /*
-    Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-    */
-    native static void __beaconSetVersion (long self, String version);
-    public void beaconSetVersion (String version) {
-        __beaconSetVersion (self, version);
-    }
-    /*
     Set-up gossip discovery of other nodes. At least one node in the cluster
     must bind to a well-known gossip endpoint, so other nodes can connect to
     it. Note that gossip endpoints are completely distinct from Zyre node

bindings/lua_ffi/zyre_ffi.lua

@@ -110,10 +110,6 @@ int
 void
     zyre_set_zcert (zyre_t *self, zcert_t *zcert);
 
-// Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-void
-    zyre_beacon_set_version (zyre_t *self, const char *version);
-
 // Set-up gossip discovery of other nodes. At least one node in the cluster
 // must bind to a well-known gossip endpoint, so other nodes can connect to
 // it. Note that gossip endpoints are completely distinct from Zyre node

bindings/nodejs/README.md

@@ -154,12 +154,6 @@ nothing my_zyre.setZcert (Zcert)
 
 Apply a azcert to a Zyre node.
 
-```
-nothing my_zyre.beaconSetVersion (String)
-```
-
-Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-
 ```
 nothing my_zyre.gossipBind (String)
 ```

bindings/nodejs/binding.cc

@@ -45,7 +45,6 @@ NAN_MODULE_INIT (Zyre::Init) {
     Nan::SetPrototypeMethod (tpl, "setInterface", _set_interface);
     Nan::SetPrototypeMethod (tpl, "setEndpoint", _set_endpoint);
     Nan::SetPrototypeMethod (tpl, "setZcert", _set_zcert);
-    Nan::SetPrototypeMethod (tpl, "beaconSetVersion", _beacon_set_version);
     Nan::SetPrototypeMethod (tpl, "gossipBind", _gossip_bind);
     Nan::SetPrototypeMethod (tpl, "gossipConnect", _gossip_connect);
     Nan::SetPrototypeMethod (tpl, "gossipConnectCurve", _gossip_connect_curve);
@@ -259,21 +258,6 @@ NAN_METHOD (Zyre::_set_zcert) {
     zyre_set_zcert (zyre->self, zcert->self);
 }
 
-NAN_METHOD (Zyre::_beacon_set_version) {
-    Zyre *zyre = Nan::ObjectWrap::Unwrap <Zyre> (info.Holder ());
-    char *version;
-    if (info [0]->IsUndefined ())
-        return Nan::ThrowTypeError ("method requires a `version`");
-    else
-    if (!info [0]->IsString ())
-        return Nan::ThrowTypeError ("`version` must be a string");
-    else {
-        Nan::Utf8String version_utf8 (info [0].As<String>());
-        version = *version_utf8;
-    }
-    zyre_beacon_set_version (zyre->self, (const char *)version);
-}
-
 NAN_METHOD (Zyre::_gossip_bind) {
     Zyre *zyre = Nan::ObjectWrap::Unwrap <Zyre> (info.Holder ());
     char *format;

bindings/nodejs/binding.h

@@ -54,7 +54,6 @@ class Zyre: public Nan::ObjectWrap {
     static NAN_METHOD (_set_interface);
     static NAN_METHOD (_set_endpoint);
     static NAN_METHOD (_set_zcert);
-    static NAN_METHOD (_beacon_set_version);
     static NAN_METHOD (_gossip_bind);
     static NAN_METHOD (_gossip_connect);
     static NAN_METHOD (_gossip_connect_curve);

bindings/python/zyre/_zyre_ctypes.py

@@ -94,8 +94,6 @@ class zyre_event_t(Structure):
 lib.zyre_set_endpoint.argtypes = [zyre_p, c_char_p]
 lib.zyre_set_zcert.restype = None
 lib.zyre_set_zcert.argtypes = [zyre_p, czmq.zcert_p]
-lib.zyre_beacon_set_version.restype = None
-lib.zyre_beacon_set_version.argtypes = [zyre_p, c_char_p]
 lib.zyre_gossip_bind.restype = None
 lib.zyre_gossip_bind.argtypes = [zyre_p, c_char_p]
 lib.zyre_gossip_connect.restype = None
@@ -287,12 +285,6 @@ def set_zcert(self, zcert):
         """
         return lib.zyre_set_zcert(self._as_parameter_, zcert)
 
-    def beacon_set_version(self, version):
-        """
-        Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-        """
-        return lib.zyre_beacon_set_version(self._as_parameter_, version)
-
     def gossip_bind(self, format, *args):
         """
         Set-up gossip discovery of other nodes. At least one node in the cluster

bindings/python_cffi/zyre_cffi/Zyre.py

@@ -124,12 +124,6 @@ def set_zcert(self, zcert):
         """
         return libzyre.zyre_set_zcert(self._p, zcert._p)
 
-    def beacon_set_version(self, version):
-        """
-        Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-        """
-        return libzyre.zyre_beacon_set_version(self._p, to_bytes(version))
-
     def gossip_bind(self, format, ):
         """
         Set-up gossip discovery of other nodes. At least one node in the cluster

bindings/python_cffi/zyre_cffi/_cdefs.inc

@@ -98,10 +98,6 @@ int
 void
     zyre_set_zcert (zyre_t *self, zcert_t *zcert);
 
-// Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-void
-    zyre_beacon_set_version (zyre_t *self, const char *version);
-
 // Set-up gossip discovery of other nodes. At least one node in the cluster
 // must bind to a well-known gossip endpoint, so other nodes can connect to
 // it. Note that gossip endpoints are completely distinct from Zyre node

bindings/python_cffi/zyre_cffi/cdefs.py

@@ -4170,10 +4170,6 @@
 void
     zyre_set_zcert (zyre_t *self, zcert_t *zcert);
 
-// Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-void
-    zyre_beacon_set_version (zyre_t *self, const char *version);
-
 // Set-up gossip discovery of other nodes. At least one node in the cluster
 // must bind to a well-known gossip endpoint, so other nodes can connect to
 // it. Note that gossip endpoints are completely distinct from Zyre node

bindings/qml/src/QmlZyre.cpp

@@ -102,12 +102,6 @@ void QmlZyre::setZcert (zcert_t *zcert) {
     zyre_set_zcert (self, zcert);
 };
 
-///
-//  Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-void QmlZyre::beaconSetVersion (const QString &version) {
-    zyre_beacon_set_version (self, version.toUtf8().data());
-};
-
 ///
 //  Set-up gossip discovery of other nodes. At least one node in the cluster
 //  must bind to a well-known gossip endpoint, so other nodes can connect to

bindings/qml/src/QmlZyre.h

@@ -86,9 +86,6 @@ public slots:
     //  Apply a azcert to a Zyre node.
     void setZcert (zcert_t *zcert);
 
-    //  Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-    void beaconSetVersion (const QString &version);
-
     //  Set-up gossip discovery of other nodes. At least one node in the cluster
     //  must bind to a well-known gossip endpoint, so other nodes can connect to
     //  it. Note that gossip endpoints are completely distinct from Zyre node

bindings/qt/src/qzyre.cpp

@@ -151,14 +151,6 @@ void QZyre::setZcert (QZcert *zcert)
 
 }
 
-///
-//  Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-void QZyre::beaconSetVersion (const QString &version)
-{
-    zyre_beacon_set_version (self, version.toUtf8().data());
-
-}
-
 ///
 //  Set-up gossip discovery of other nodes. At least one node in the cluster
 //  must bind to a well-known gossip endpoint, so other nodes can connect to

bindings/ruby/lib/zyre/ffi.rb

@@ -64,17 +64,6 @@ def self.zyre_set_zcert(*)
           raise NotImplementedError, "compile zyre with --enable-drafts"
         end
       end
-      begin # DRAFT method
-        attach_function :zyre_beacon_set_version, [:pointer, :string], :void, **opts
-      rescue ::FFI::NotFoundError
-        if $VERBOSE || $DEBUG
-          warn "The DRAFT function zyre_beacon_set_version()" +
-            " is not provided by the installed zyre library."
-        end
-        def self.zyre_beacon_set_version(*)
-          raise NotImplementedError, "compile zyre with --enable-drafts"
-        end
-      end
       attach_function :zyre_gossip_bind, [:pointer, :string, :varargs], :void, **opts
       attach_function :zyre_gossip_connect, [:pointer, :string, :varargs], :void, **opts
       begin # DRAFT method

bindings/ruby/lib/zyre/ffi/zyre.rb

@@ -253,17 +253,6 @@ def set_zcert(zcert)
         result
       end
 
-      # Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-      #
-      # @param version [String, #to_s, nil]
-      # @return [void]
-      def beacon_set_version(version)
-        raise DestroyedError unless @ptr
-        self_p = @ptr
-        result = ::Zyre::FFI.zyre_beacon_set_version(self_p, version)
-        result
-      end
-
       # Set-up gossip discovery of other nodes. At least one node in the cluster
       # must bind to a well-known gossip endpoint, so other nodes can connect to
       # it. Note that gossip endpoints are completely distinct from Zyre node

include/zyre.h

@@ -220,11 +220,6 @@ ZYRE_EXPORT void
 ZYRE_EXPORT void
     zyre_set_zcert (zyre_t *self, zcert_t *zcert);
 
-//  *** Draft method, for development use, may change without warning ***
-//  Set the beacon version. Useful when working with ZYREv3 with secure beacons.
-ZYRE_EXPORT void
-    zyre_beacon_set_version (zyre_t *self, const char *version);
-
 //  *** Draft method, for development use, may change without warning ***
 //  Set-up gossip discovery with CURVE enabled.
 ZYRE_EXPORT void