pvxslibs 1.4.0a1__tar.gz → 1.4.0a3__tar.gz

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

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

{pvxslibs-1.4.0a1 → pvxslibs-1.4.0a3}/pyproject.toml

@@ -4,5 +4,5 @@ requires = [
 	"wheel",
 	"setuptools_dso>=2.7a1",
 	"setuptools_dso>=2.11a2; python_version >= '3.12'",
-	"epicscorelibs>=7.0.7.99.1.2a1",
+	"epicscorelibs>=7.0.7.99.1.2a3",
 ]

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

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

pvxslibs-1.4.0a3/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.2a3

{pvxslibs-1.4.0a1 → pvxslibs-1.4.0a3}/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 += 'a1'
+pvxs_ver += 'a3'
 
 with open(os.path.join(os.path.dirname(__file__), 'README.md')) as F:
     long_description = F.read()

{pvxslibs-1.4.0a1 → pvxslibs-1.4.0a3}/src/clientconn.cpp

@@ -13,7 +13,6 @@ namespace pvxs {
 namespace client {
 
 DEFINE_LOGGER(io, "pvxs.client.io");
-DEFINE_LOGGER(connsetup, "pvxs.tcp.setup");
 DEFINE_LOGGER(remote, "pvxs.remote.log");
 
 Connection::Connection(const std::shared_ptr<ContextImpl>& context,

{pvxslibs-1.4.0a1 → pvxslibs-1.4.0a3}/src/clientget.cpp

@@ -501,7 +501,15 @@ void Connection::handle_GPR(pva_app_msg_t cmd)
 
     if(!sts.isSuccess()) {
         gpr->result = Result(std::make_exception_ptr(RemoteError(sts.msg)));
-        gpr->state = gpr->state==GPROp::Creating || gpr->autoExec ? GPROp::Done : GPROp::Idle;
+
+        if(gpr->state==GPROp::Exec && !gpr->autoExec) {
+            gpr->state = GPROp::Idle; // repeated exec may yield a different result
+            gpr->notify();
+            return;
+
+        } else {
+            gpr->state = GPROp::Done; // treat as unrecoverable, destroy OP
+        }
 
     } else if(gpr->state==GPROp::Creating) {
 

{pvxslibs-1.4.0a1 → pvxslibs-1.4.0a3}/src/osiSockExt.h

@@ -50,7 +50,7 @@ private:
     store_t  store;
 public:
 
-    explicit SockAddr(int af = AF_UNSPEC);
+    explicit SockAddr(int af = AF_UNSPEC, unsigned short port=0);
     explicit SockAddr(const char *address, unsigned short port=0);
     explicit SockAddr(const sockaddr *addr, socklen_t alen=0);
     inline explicit SockAddr(const std::string& address, unsigned short port=0) :SockAddr(address.c_str(), port) {}

{pvxslibs-1.4.0a1 → pvxslibs-1.4.0a3}/src/udp_collector.cpp

@@ -277,7 +277,8 @@ bool UDPCollector::handle_one(const IfaceMap::Current& ifinfo)
         // packet forwarded by a local PVA peer (maybe us) as IPv4 local multicast
         origin = Forwarded;
         // UDP header info of forwarder not relevant to reply.  Spoil...
-        src = dest = SockAddr(); // IPv6 does not support local mcast :(
+        src = SockAddr(src.family(), src.port());
+        dest = SockAddr(dest.family(), dest.port());
         srcIface = nullptr;
 
     } else {
@@ -289,7 +290,7 @@ bool UDPCollector::handle_one(const IfaceMap::Current& ifinfo)
         auto ifit(srcIface->bcast.find(dest));
         if(ifit!=srcIface->bcast.end()) {
             // dest is bcast, so replace with associated iface address
-            dest = ifit->second;
+            dest = ifit->second.withPort(dest.port());
 
         } else if((ifit=srcIface->addrs.find(dest))!=srcIface->addrs.end()) {
             // dest is interface address.  Nothing to do.
@@ -301,14 +302,14 @@ bool UDPCollector::handle_one(const IfaceMap::Current& ifinfo)
             bool found = false;
             for(auto& it : srcIface->addrs) {
                 if(it.first.family()==dest.family()) {
-                    dest = it.first;
+                    dest = it.first.withPort(dest.port());
                     found = true;
                     break;
                 }
             }
             if(!found) {
                 // let host mcast routing try...
-                dest = SockAddr(dest.family());
+                dest = SockAddr(dest.family(), dest.port());
             }
         }
     }
@@ -501,12 +502,17 @@ void UDPCollector::process_one(const uint8_t *buf, size_t nrx, origin_t origin,
             return;
 
         } else if(origin==Forwarded) {
-            auto ifit(ifinfo.byAddr.find(originaddr));
-            if(ifit!=ifinfo.byAddr.end()) {
-                // original destination is local interface address
+            auto isany = originaddr.isAny(); // valid ORIGIN_TAG, but no additional information
+            decltype(ifinfo.byAddr)::const_iterator ifit;
+            if(!isany)
+                ifit = ifinfo.byAddr.find(originaddr);
+
+            if(isany || ifit!=ifinfo.byAddr.end()) {
+                // original destination is wildcard, or local interface address
                 originaddr.setPort(bind_addr.port());
                 dest = originaddr;
-                srcIface = ifit->second.first;
+                if(!isany)
+                    srcIface = ifit->second.first;
                 process_one(M.save(), M.size(), OriginTag, ifinfo);
                 return;
 

{pvxslibs-1.4.0a1 → pvxslibs-1.4.0a3}/src/util.cpp

@@ -370,16 +370,24 @@ SigInt::~SigInt() {}
 #endif // !defined(__rtems__) && !defined(vxWorks)
 
 
-SockAddr::SockAddr(int af)
+SockAddr::SockAddr(int af, unsigned short port)
     :store{}
 {
     store.sa.sa_family = af;
-    if(af!=AF_INET
-#ifdef AF_INET6
-            && af!=AF_INET6
-#endif
-            && af!=AF_UNSPEC)
+    switch(af) {
+    case AF_INET:
+        store.in.sin_port = htons(port);
+        break;
+    case AF_INET6:
+        store.in6.sin6_port = htons(port);
+        break;
+    case AF_UNSPEC:
+        if(port)
+            throw std::invalid_argument("AF_UNSPEC can not specify port");
+        break;
+    default:
         throw std::invalid_argument("Unsupported address family");
+    }
 }
 
 SockAddr::SockAddr(const char *address, unsigned short port)

pvxslibs-1.4.0a1/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.2a1