Merge tls into master: bring in subscription ownership, keep all TLS/stability work
tls and master diverged from a July 2024 fork point and never reconciled - tls carries ~19 months of real socket/TLS stability fixes (uninitialized tlsInfo, TCPServer::connectionRequest() unconditionally initializing TLS, the WANT_READ write busy-spin, the console authentication fix from this session), while master independently picked up a Subscription/SubscriptionManager rework (MString-based ownership tracking: owner/ownership/selection/time fields and a working subscriptionOwner() method) that tls never had. Every file both branches touched was resolved by keeping tls's side entirely (Command.h, Socket.cpp, TCPServer.h, TCPSession.cpp/h, TCPSocket.h were pure reformatting on master's side, or an alternate/superseded fix for a bug tls already fixed a different way - e.g. master's TCPSession uuid/alias handling vs tls's existing uuid_unparse-based fix), with two deliberate exceptions: - TCPServer.cpp's constructor was missing the commands.add(subscriptions, "publish"/"subscribe"/"catalog"/...) wiring master had - without it, SubscriptionManager existed but was completely unreachable through the normal command dispatch. Restored on top of tls's TLS-aware constructor. - SubscriptionManager.cpp's "invite" command handler had a real incompatibility: master's version assigned into an `invitee` member typed as coreutils::MString via a stray `(coreutils::MString *)` cast that doesn't match the member's actual (non-pointer) type, and called session.server.getSessionByAlias() against a TCPServer reference - tls made TCPSession::server a pointer (part of removing the separate TCPSession2 class), so that call site no longer compiles as written. Took tls's cleaner local-variable version instead (functionally identical - looks up a session by alias and forwards an invite message) and removed the now-unused `invitee` member from SubscriptionManager.h. One additional compile fix needed after resolving conflicts: Subscription::subscriptionOwners is an MString (master's ownership design), but TCPSession::alias is void* (tls's identity mechanism, unchanged and depended on elsewhere) - MString has an implicit constructor from void* already used successfully elsewhere in this same file (the "publish" handler's Subscription constructor call), but operator== doesn't accept the same implicit conversion, so removeSessionSubscriptions()'s ownership check needed an explicit coreutils::MString(session.alias) construction to compile. Also drops output/main (a stray checked-in compiled binary, already removed on tls) and the doxygen docs/html output (already removed on tls, was carried on master since the fork). Verified: full ServerCore rebuild (./compile) succeeds with zero errors or warnings beyond the one compile fix documented above.
This commit is contained in:
commit
3609ed603e
2883 files changed
+5296
-84468
No files matched your search
@@ -0,0 +1,81 @@
|
||||
#include "ConsoleSession.h"
|
||||
#include "TCPServer.h"
|
||||
#include "Log.h"
|
||||
|
||||
namespace core {
|
||||
|
||||
ConsoleSession::ConsoleSession(EPoll &ePoll, TCPServer *server) : TerminalSession(ePoll, server) {}
|
||||
|
||||
ConsoleSession::~ConsoleSession() {}
|
||||
|
||||
void ConsoleSession::protocol(coreutils::ZString &data) {
|
||||
|
||||
coreutils::Log(coreutils::LOG_DEBUG_1) << data;
|
||||
|
||||
coreutils::ZString blank("");
|
||||
|
||||
switch (status) {
|
||||
|
||||
case WELCOME:
|
||||
status = LOGIN;
|
||||
protocol(blank);
|
||||
break;
|
||||
|
||||
case LOGIN:
|
||||
out << "User: ";
|
||||
status = WAIT_USER_PROFILE;
|
||||
break;
|
||||
|
||||
case WAIT_USER_PROFILE:
|
||||
status = PASSWORD;
|
||||
protocol(blank);
|
||||
break;
|
||||
|
||||
case PASSWORD:
|
||||
out << "Password: ";
|
||||
status = WAIT_PASSWORD;
|
||||
break;
|
||||
|
||||
case WAIT_PASSWORD:
|
||||
status = PROMPT;
|
||||
protocol(blank);
|
||||
break;
|
||||
|
||||
case PROMPT:
|
||||
out << (": ");
|
||||
status = INPUT;
|
||||
break;
|
||||
|
||||
case INPUT:
|
||||
command = data;
|
||||
status = PROCESS;
|
||||
protocol(blank);
|
||||
break;
|
||||
|
||||
case PROCESS:
|
||||
doCommand(command);
|
||||
status = command.equals("exit") ? DONE: PROMPT;
|
||||
protocol(blank);
|
||||
break;
|
||||
|
||||
case DONE:
|
||||
out << "Done." << std::endl;
|
||||
break;
|
||||
|
||||
default:
|
||||
out << "Unrecognized status code: ERROR.";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void ConsoleSession::writeLog(std::string data) {
|
||||
// saveCursor();
|
||||
// setCursorLocation(16, 1);
|
||||
// restoreCursor();
|
||||
}
|
||||
|
||||
void ConsoleSession::doCommand(coreutils::ZString &request) {
|
||||
server->commands.processRequest(request, *this);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user