Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion amp-embedded-infra-lib
2 changes: 1 addition & 1 deletion amp-hal-st
Submodule amp-hal-st updated 712 files
18 changes: 9 additions & 9 deletions postmaster/instantiations/EchoServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ namespace main_
}

SingleConnectionLink::SingleConnectionLink(services::SingleConnectionListener& listener1, services::SingleConnectionListener& listener2)
: listener1(listener1)
, listener2(listener2)
: listener1(&listener1)
, listener2(&listener2)
{
listener1.SetNewConnectionStrategy(*this);
listener2.SetNewConnectionStrategy(*this);
}

void SingleConnectionLink::StopCurrentConnection(services::SingleConnectionListener& listener)
void SingleConnectionLink::StopCurrentConnection(void* listener)
{
if (&listener == &listener1)
if (listener == listener1)
listener1RequestedNewConnection = true;
if (&listener == &listener2)
if (listener == listener2)
listener2RequestedNewConnection = true;

numStopped = 0;
listener1.StopCurrentConnection(listener1);
listener2.StopCurrentConnection(listener2);
listener1->StopCurrentConnection(listener1);
listener2->StopCurrentConnection(listener2);
}

void SingleConnectionLink::StartNewConnection()
Expand All @@ -50,15 +50,15 @@ namespace main_
if (listener1RequestedNewConnection)
{
listener1RequestedNewConnection = false;
listener1.StartNewConnection();
listener1->StartNewConnection();

if (listener2RequestedNewConnection)
StopCurrentConnection(listener1);
}
else if (listener2RequestedNewConnection)
{
listener2RequestedNewConnection = false;
listener2.StartNewConnection();
listener2->StartNewConnection();
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions postmaster/instantiations/EchoServer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ namespace main_
SingleConnectionLink(services::SingleConnectionListener& listener1, services::SingleConnectionListener& listener2);

private:
void StopCurrentConnection(services::SingleConnectionListener& listener) override;
void StopCurrentConnection(void* listener) override;
void StartNewConnection() override;

private:
uint32_t numStopped = 0;
services::SingleConnectionListener& listener1;
services::SingleConnectionListener& listener2;
services::SingleConnectionListener* const listener1;
services::SingleConnectionListener* const listener2;

bool listener1RequestedNewConnection = false;
bool listener2RequestedNewConnection = false;
Expand Down