pvxslibs 1.3.2__tar.gz → 1.3.2a1__tar.gz

{pvxslibs-1.3.2/python/pvxslibs.egg-info → pvxslibs-1.3.2a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pvxslibs
-Version: 1.3.2
+Version: 1.3.2a1
 Summary: PVXS libraries packaged for python
 Home-page: https://epics-base.github.io/pvxs
 Author: Michael Davidsaver

{pvxslibs-1.3.2 → pvxslibs-1.3.2a1/python/pvxslibs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pvxslibs
-Version: 1.3.2
+Version: 1.3.2a1
 Summary: PVXS libraries packaged for python
 Home-page: https://epics-base.github.io/pvxs
 Author: Michael Davidsaver

pvxslibs-1.3.2a1/python/pvxslibs.egg-info/requires.txt

@@ -0,0 +1,2 @@
+setuptools_dso>=2.7a1
+epicscorelibs<7.0.7.99.2,>=7.0.7.99.1.1a2

{pvxslibs-1.3.2 → pvxslibs-1.3.2a1}/setup.py

@@ -696,7 +696,7 @@ build_dso.sub_commands.extend([
 
 
 pvxs_ver = '%(PVXS_MAJOR_VERSION)s.%(PVXS_MINOR_VERSION)s.%(PVXS_MAINTENANCE_VERSION)s'%pvxsversion
-#pvxs_ver += 'a2'
+pvxs_ver += 'a1'
 
 with open(os.path.join(os.path.dirname(__file__), 'README.md')) as F:
     long_description = F.read()

{pvxslibs-1.3.2 → pvxslibs-1.3.2a1}/src/serverconn.cpp

@@ -408,40 +408,18 @@ ServIface::ServIface(const SockAddr &addr, server::Server::Pvt *server, bool fal
     server->acceptor_loop.assertInLoop();
     auto orig_port = bind_addr.port();
 
-    // try to bind to requested port, then fallback to a random port
-    while(true) {
-
-        sock = evsocket(bind_addr.family(), SOCK_STREAM, 0);
+    sock = evsocket(bind_addr.family(), SOCK_STREAM, 0);
 
-        if(evutil_make_listen_socket_reuseable(sock.sock))
-            log_warn_printf(connsetup, "Unable to make socket reusable%s", "\n");
+    if(evutil_make_listen_socket_reuseable(sock.sock))
+        log_warn_printf(connsetup, "Unable to make socket reusable%s", "\n");
 
+    // try to bind to requested port, then fallback to a random port
+    while(true) {
         try {
             sock.bind(bind_addr);
-            // semantics of SO_REUSEADDR on *nix allow multiple bind() to success.
-            // however, only one listen() will succeed
-
-            // added in libevent 2.1.1
-#ifndef LEV_OPT_DISABLED
-#  define LEV_OPT_DISABLED 0
-#endif
-
-            const int backlog = 4;
-            auto list(evconnlistener_new(server->acceptor_loop.base, onConnS, this, LEV_OPT_DISABLED|LEV_OPT_CLOSE_ON_EXEC, backlog, sock.sock));
-            if(!list) {
-                int err = evutil_socket_geterror(sock);
-                throw std::system_error(err, std::system_category());
-            }
-            listener = evlisten(__FILE__, __LINE__, list);
-
-            if(!LEV_OPT_DISABLED)
-                evconnlistener_disable(listener.get());
-
         } catch(std::system_error& e) {
-            if(fallback && (e.code().value()==SOCK_EADDRINUSE || e.code().value()==SOCK_EACCES)) {
-                log_debug_printf(connsetup, "Address %s in use or not permitted: %s\n",
-                                 bind_addr.tostring().c_str(),
-                                 e.what());
+            if(fallback && e.code().value()==SOCK_EADDRINUSE) {
+                log_debug_printf(connsetup, "Address %s in use\n", bind_addr.tostring().c_str());
                 bind_addr.setPort(0);
                 fallback = false;
                 continue;
@@ -460,6 +438,18 @@ ServIface::ServIface(const SockAddr &addr, server::Server::Pvt *server, bool fal
     if(orig_port && bind_addr.port() != orig_port) {
         log_warn_printf(connsetup, "Server unable to bind port %u, falling back to %s\n", orig_port, name.c_str());
     }
+
+    // added in libevent 2.1.1
+#ifndef LEV_OPT_DISABLED
+#  define LEV_OPT_DISABLED 0
+#endif
+
+    const int backlog = 4;
+    listener = evlisten(__FILE__, __LINE__,
+                        evconnlistener_new(server->acceptor_loop.base, onConnS, this, LEV_OPT_DISABLED|LEV_OPT_CLOSE_ON_EXEC, backlog, sock.sock));
+
+    if(!LEV_OPT_DISABLED)
+        evconnlistener_disable(listener.get());
 }
 
 void ServIface::onConnS(struct evconnlistener *listener, evutil_socket_t sock, struct sockaddr *peer, int socklen, void *raw)

pvxslibs-1.3.2/python/pvxslibs.egg-info/requires.txt

@@ -1,2 +0,0 @@
-setuptools_dso>=2.7a1
-epicscorelibs<7.0.7.99.2,>=7.0.7.99.1.1