pvxslibs 1.4.0a1__tar.gz → 1.4.0a2__tar.gz

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

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

{pvxslibs-1.4.0a1 → pvxslibs-1.4.0a2}/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.2a2",
 ]

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

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

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

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

{pvxslibs-1.4.0a1 → pvxslibs-1.4.0a2}/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.0a2}/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.0a2}/src/udp_collector.cpp

@@ -501,12 +501,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/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