epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

client: respect forcedServer on failed CREATE_CHANNEL

Browse Source
This commit is contained in:
Michael Davidsaver
2025-10-16 07:26:53 -07:00
parent 35c7cc5d15
commit b0b0bc8d7e
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/clientconn.cpp
+16 -5
View File
@@ -381,13 +381,24 @@ void Connection::handle_CREATE_CHANNEL()
chan->statRx += rxlen;
if(!sts.isSuccess()) {
// server refuses to create a channel, but presumably responded positively to search
if(chan->forcedServer.family()==AF_UNSPEC) {
// server refuses to create a channel, but presumably responded positively to search.
// try again
chan->state = Channel::Searching;
context->searchBuckets[context->currentBucket].push_back(chan);
log_warn_printf(io, "Server %s refuses channel to '%s' : %s\n", peerName.c_str(),
chan->name.c_str(), sts.msg.c_str());
log_warn_printf(io, "Server %s refuses channel to '%s' : %s\n", peerName.c_str(),
chan->name.c_str(), sts.msg.c_str());
chan->state = Channel::Searching;
context->searchBuckets[context->currentBucket].push_back(chan);
} else {
// server refused after we bypassed search, so can't use usual retry method.
// refuse to create a tight retry loop, and drop on the floor for now.
// retry on reconnect.
log_err_printf(io, "Server %s refuses direct channel to '%s' : %s\n", peerName.c_str(),
chan->name.c_str(), sts.msg.c_str());
return;
}
} else {
chan->state = Channel::Active;