Skip to content

Commit db86b73

Browse files
hallfoxhallfox
committed
WIP fix NtcChannelFactory test
1 parent 634c1e4 commit db86b73

7 files changed

+563
-553
lines changed

‎src/groups/bmq/bmqimp/bmqimp_negotiatedchannelfactory.cpp

-14
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,6 @@ enum RcEnum {
6262
rc_NEGOTIATION_FAILURE = -7
6363
};
6464

65-
bmqio::Channel* findParent(bmqio::Channel* channel)
66-
{
67-
bmqio::Channel* self = channel;
68-
bmqio::DecoratingChannelPartialImp* decoratedChannel =
69-
dynamic_cast<bmqio::DecoratingChannelPartialImp*>(self);
70-
while (decoratedChannel != NULL) {
71-
self = decoratedChannel->base();
72-
decoratedChannel = dynamic_cast<bmqio::DecoratingChannelPartialImp*>(
73-
self);
74-
}
75-
76-
return self;
77-
}
78-
7965
} // close unnamed namespace
8066

8167
// ------------------------------------

‎src/groups/bmq/bmqio/bmqio_ntcchannel.cpp

+37-63
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,6 @@ NtcChannel::NtcChannel(
971971
, d_watermarkSignaler(basicAllocator)
972972
, d_closeSignaler(basicAllocator)
973973
, d_resultCallback(bsl::allocator_arg, basicAllocator, resultCallback)
974-
, d_upgradable()
975974
, d_allocator_p(bslma::Default::allocator(basicAllocator))
976975
{
977976
}
@@ -1382,41 +1381,48 @@ void NtcChannel::processUpgrade(
13821381
const ntca::UpgradeEvent& upgradeEvent,
13831382
const ntci::UpgradeFunction& cb)
13841383
{
1384+
BSLS_ASSERT(cb);
1385+
13851386
BALL_LOG_DEBUG << "Received upgrade event: " << upgradeEvent;
1386-
if (upgradeEvent.type() == ntca::UpgradeEventType::e_COMPLETE) {
1387-
if (cb) {
1388-
cb(upgradable, upgradeEvent);
1389-
}
1390-
}
1391-
}
13921387

1393-
void NtcChannel::setUpgradable(
1394-
const bsl::shared_ptr<ntci::Upgradable>& upgradable)
1395-
{
1396-
d_upgradable = upgradable;
1388+
cb(upgradable, upgradeEvent);
13971389
}
13981390

1399-
void NtcChannel::upgrade(
1391+
int NtcChannel::upgrade(
1392+
bmqio::Status* status,
14001393
const bsl::shared_ptr<ntci::EncryptionServer>& encryptionServer,
14011394
const ntca::UpgradeOptions& options,
14021395
const ntci::UpgradeFunction& upgradeCallback)
14031396
{
14041397
BSLS_ASSERT(encryptionServer);
1398+
BSLS_ASSERT(d_streamSocket_sp);
1399+
1400+
BALL_LOG_INFO << "Upgrading connection";
14051401

1406-
d_streamSocket_sp->upgrade(
1402+
ntsa::Error error = d_streamSocket_sp->upgrade(
14071403
encryptionServer,
14081404
options,
14091405
d_streamSocket_sp->createUpgradeCallback(
1410-
bdlf::BindUtil::bindS(d_allocator_p,
1411-
&NtcChannel::processUpgrade,
1412-
this,
1413-
bdlf::PlaceHolders::_1,
1414-
bdlf::PlaceHolders::_2,
1415-
upgradeCallback),
1406+
bdlf::BindUtil::bind(&NtcChannel::processUpgrade,
1407+
this,
1408+
bdlf::PlaceHolders::_1,
1409+
bdlf::PlaceHolders::_2,
1410+
upgradeCallback),
14161411
d_allocator_p));
1412+
1413+
if (error) {
1414+
NtcChannelUtil::fail(status,
1415+
bmqio::StatusCategory::e_CONNECTION,
1416+
"upgrade",
1417+
error);
1418+
return 1;
1419+
}
1420+
1421+
return 0;
14171422
}
14181423

1419-
void NtcChannel::upgrade(
1424+
int NtcChannel::upgrade(
1425+
bmqio::Status* status,
14201426
const bsl::shared_ptr<ntci::EncryptionClient>& encryptionClient,
14211427
const ntca::UpgradeOptions& options,
14221428
const ntci::UpgradeFunction& upgradeCallback)
@@ -1426,7 +1432,7 @@ void NtcChannel::upgrade(
14261432

14271433
BALL_LOG_INFO << "Upgrading connection";
14281434

1429-
d_streamSocket_sp->upgrade(
1435+
ntsa::Error error = d_streamSocket_sp->upgrade(
14301436
encryptionClient,
14311437
options,
14321438
d_streamSocket_sp->createUpgradeCallback(
@@ -1437,6 +1443,16 @@ void NtcChannel::upgrade(
14371443
bdlf::PlaceHolders::_2,
14381444
upgradeCallback),
14391445
d_allocator_p));
1446+
1447+
if (error) {
1448+
NtcChannelUtil::fail(status,
1449+
bmqio::StatusCategory::e_CONNECTION,
1450+
"upgrade",
1451+
error);
1452+
return 1;
1453+
}
1454+
1455+
return 0;
14401456
}
14411457

14421458
// ACCESSORS
@@ -1585,37 +1601,6 @@ void NtcListener::processAccept(
15851601
}
15861602
}
15871603

1588-
void NtcListener::processUpgrade(
1589-
const bsl::shared_ptr<ntci::Upgradable>& upgradable,
1590-
const ntca::UpgradeEvent& upgradeEvent)
1591-
{
1592-
if (upgradeEvent.type() == ntca::UpgradeEventType::e_COMPLETE) {
1593-
if (d_upgradeCallback) {
1594-
d_upgradeCallback(upgradable, upgradeEvent);
1595-
}
1596-
}
1597-
else {
1598-
bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
1599-
bsl::shared_ptr<NtcListener> self = this->shared_from_this();
1600-
1601-
BMQIO_NTCLISTENER_LOG_ACCEPT_FAILED(this,
1602-
d_listenerSocket_sp,
1603-
upgradeEvent);
1604-
bmqio::Status status;
1605-
NtcChannelUtil::fail(&status,
1606-
bmqio::StatusCategory::e_CONNECTION,
1607-
"upgrade",
1608-
upgradeEvent.context().error());
1609-
1610-
BMQIO_NTCLISTENER_LOG_CLOSING(this, d_listenerSocket_sp);
1611-
1612-
d_state = e_STATE_CLOSING;
1613-
1614-
d_listenerSocket_sp->close(
1615-
bdlf::BindUtil::bind(&NtcListener::processClose, self, status));
1616-
}
1617-
}
1618-
16191604
void NtcListener::processClose(const bmqio::Status& status)
16201605
{
16211606
bslmt::LockGuard<bslmt::Mutex> lock(&d_mutex);
@@ -1653,7 +1638,6 @@ NtcListener::NtcListener(
16531638
, d_properties(basicAllocator)
16541639
, d_closeSignaler(basicAllocator)
16551640
, d_resultCallback(bsl::allocator_arg, basicAllocator, resultCallback)
1656-
, d_encryptionServer_sp()
16571641
, d_allocator_p(bslma::Default::allocator(basicAllocator))
16581642
{
16591643
}
@@ -1936,15 +1920,5 @@ void NtcListenerUtil::fail(Status* status,
19361920
}
19371921
}
19381922

1939-
const bsl::shared_ptr<ntci::Upgradable>& NtcChannel::upgradable() const
1940-
{
1941-
return d_upgradable;
1942-
}
1943-
1944-
bsl::shared_ptr<ntci::Upgradable>& NtcChannel::upgradable()
1945-
{
1946-
return d_upgradable;
1947-
}
1948-
19491923
} // close package namespace
19501924
} // close enterprise namespace

‎src/groups/bmq/bmqio/bmqio_ntcchannel.h

+16-49
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ class NtcChannel : public bmqio::Channel,
215215
bdlmt::Signaler<WatermarkFnType> d_watermarkSignaler;
216216
bdlmt::Signaler<CloseFnType> d_closeSignaler;
217217
bmqio::ChannelFactory::ResultCallback d_resultCallback;
218-
bsl::shared_ptr<ntci::Upgradable> d_upgradable;
219218
bslma::Allocator* d_allocator_p;
220219

221220
private:
@@ -420,22 +419,21 @@ class NtcChannel : public bmqio::Channel,
420419
/// Set the write queue high watermark to the specified `highWatermark`.
421420
void setWriteQueueHighWatermark(int highWatermark);
422421

423-
/// Set the upgradable handle if this channel has been upgraded.
424-
void setUpgradable(const bsl::shared_ptr<ntci::Upgradable>& upgradable);
425-
426422
/// Assume the TLS server role and begin upgrading the socket from
427423
/// being unencrypted to being encrypted with TLS. Invoke the specified
428424
/// `upgradeCallback` when the socket has completed upgrading to TLS.
429-
void
430-
upgrade(const bsl::shared_ptr<ntci::EncryptionServer>& encryptionServer,
425+
int
426+
upgrade(bmqio::Status* status,
427+
const bsl::shared_ptr<ntci::EncryptionServer>& encryptionServer,
431428
const ntca::UpgradeOptions& options,
432429
const ntci::UpgradeFunction& upgradeCallback);
433430

434431
/// Assume the TLS client role and begin upgrading the socket from
435432
/// being unencrypted to being encrypted with TLS. Invoke the specified
436433
/// `upgradeCallback` when the socket has completed upgrading to TLS.
437-
void
438-
upgrade(const bsl::shared_ptr<ntci::EncryptionClient>& encryptionClient,
434+
int
435+
upgrade(bmqio::Status* status,
436+
const bsl::shared_ptr<ntci::EncryptionClient>& encryptionClient,
439437
const ntca::UpgradeOptions& options,
440438
const ntci::UpgradeFunction& upgradeCallback);
441439

@@ -464,11 +462,6 @@ class NtcChannel : public bmqio::Channel,
464462
/// Return the socket interface for this channel. This function is
465463
/// undefined unless the channel has succesfully established a connection.
466464
const ntci::StreamSocket& streamSocket() const;
467-
468-
/// Return the upgradable handle for the channel.
469-
const bsl::shared_ptr<ntci::Upgradable>& upgradable() const;
470-
471-
bsl::shared_ptr<ntci::Upgradable>& upgradable();
472465
};
473466

474467
// =====================
@@ -479,16 +472,6 @@ class NtcChannel : public bmqio::Channel,
479472
struct NtcChannelUtil {
480473
// CLASS METHODS
481474

482-
/// \brief Return a reference providing const access to the name of the
483-
/// property used to define the encryption client for liseners.
484-
/// This property must be a `bsl::shared_ptr<ntci::EncryptionClient>`.
485-
static bsl::string_view encryptionClientProperty();
486-
487-
/// \brief Return a reference providing const access to the name of the
488-
/// property used to define the callback on a TLS upgrade.
489-
/// This property must be a `bsl::shared_ptr<ntci::UpgradeFunction>`.
490-
static bsl::string_view upgradeCallbackProperty();
491-
492475
/// Load into the specified `status`, if defined, the description of
493476
/// the specified `error` assigned to the specified `category` that
494477
/// was detected when performing the specified `operation`.
@@ -526,18 +509,16 @@ class NtcListener : public bmqio::ChannelFactoryOperationHandle,
526509
};
527510

528511
// INSTANCE DATA
529-
bslmt::Mutex d_mutex;
530-
bsl::shared_ptr<ntci::Interface> d_interface_sp;
531-
bsl::shared_ptr<ntci::ListenerSocket> d_listenerSocket_sp;
532-
bsl::string d_localUri;
533-
State d_state;
534-
bmqio::ListenOptions d_options;
535-
bmqvt::PropertyBag d_properties;
536-
bdlmt::Signaler<CloseFnType> d_closeSignaler;
537-
bmqio::ChannelFactory::ResultCallback d_resultCallback;
538-
bsl::shared_ptr<ntci::EncryptionServer> d_encryptionServer_sp;
539-
ntci::UpgradeFunction d_upgradeCallback;
540-
bslma::Allocator* d_allocator_p;
512+
bslmt::Mutex d_mutex;
513+
bsl::shared_ptr<ntci::Interface> d_interface_sp;
514+
bsl::shared_ptr<ntci::ListenerSocket> d_listenerSocket_sp;
515+
bsl::string d_localUri;
516+
State d_state;
517+
bmqio::ListenOptions d_options;
518+
bmqvt::PropertyBag d_properties;
519+
bdlmt::Signaler<CloseFnType> d_closeSignaler;
520+
bmqio::ChannelFactory::ResultCallback d_resultCallback;
521+
bslma::Allocator* d_allocator_p;
541522

542523
private:
543524
// NOT IMPLEMENTED
@@ -556,10 +537,6 @@ class NtcListener : public bmqio::ChannelFactoryOperationHandle,
556537
/// Process the closure of the socket.
557538
void processClose(const bmqio::Status& status);
558539

559-
/// Process the upgrade of a socket
560-
void processUpgrade(const bsl::shared_ptr<ntci::Upgradable>& upgradable,
561-
const ntca::UpgradeEvent& upgradeEvent);
562-
563540
public:
564541
// TRAITS
565542
BSLMF_NESTED_TRAIT_DECLARATION(NtcListener, bslma::UsesBslmaAllocator)
@@ -638,16 +615,6 @@ struct NtcListenerUtil {
638615
/// port to which the listening socket is bound.
639616
static bslstl::StringRef listenPortProperty();
640617

641-
/// \brief Return a reference providing const access to the name of the
642-
/// property used to define the encryption server for liseners.
643-
/// This property must be a `bsl::shared_ptr<ntci::EncryptionServer>`.
644-
static bsl::string_view encryptionServerProperty();
645-
646-
/// \brief Return a reference providing const access to the name of the
647-
/// property used to define the callback on a TLS upgrade.
648-
/// This property must be a `bsl::shared_ptr<ntci::UpgradeFunction>`.
649-
static bsl::string_view upgradeCallbackProperty();
650-
651618
/// Load into the specified `status`, if defined, the description of
652619
/// the specified `error` assigned to the specified `category` that
653620
/// was detected when performing the specified `operation`.

0 commit comments

Comments
 (0)