From 290b565203891041b1fbcc7033e04cabd1609283 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 30 Aug 2021 21:37:02 -0700
Subject: [PATCH] minor

---
 src/client.cpp   | 4 ++--
 src/evhelper.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client.cpp b/src/client.cpp
index 54949ba..0486067 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -479,7 +479,7 @@ ContextImpl::ContextImpl(const Config& conf, const evbase& tcp_loop)
 
     searchBuckets.resize(nBuckets);
 
-    std::set<SockAddr> bcasts;
+    std::set<SockAddr, SockAddrOnlyLess> bcasts;
     for(auto& addr : searchTx.broadcasts()) {
         addr.setPort(0u);
         bcasts.insert(addr);
@@ -517,7 +517,7 @@ ContextImpl::ContextImpl(const Config& conf, const evbase& tcp_loop)
         }
         auto top = ntohl(saddr->in.sin_addr.s_addr)>>24u;
         auto ismcast = top>224 && top<239;
-        bool isbcast = bcasts.find(saddr.withPort(0))!=bcasts.end(); // TODO: exclude port
+        bool isbcast = bcasts.find(saddr)!=bcasts.end();
         auto isucast = !isbcast && !ismcast;
 
         log_info_printf(io, "Searching to %s%s\n", saddr.tostring().c_str(), (isucast?" unicast":""));
diff --git a/src/evhelper.cpp b/src/evhelper.cpp
index ee26c34..101c955 100644
--- a/src/evhelper.cpp
+++ b/src/evhelper.cpp
@@ -88,7 +88,7 @@ struct ThreadEvent
             } else {
                 // race
                 epicsThreadPrivateDelete(temp);
-                id = pvt.load();
+                assert(id);
             }
         }