summaryrefslogtreecommitdiff
path: root/src/session.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/session.cpp')
-rw-r--r--src/session.cpp18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/session.cpp b/src/session.cpp
index 6744fc9..228f183 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -58,7 +58,7 @@ void CSession::onSend(const std::string &msg) {
void CSession::recvLoop() {
while (true) {
- auto recvData = read(NFormatter::fmt(NONE, "{}: ", m_name));
+ auto recvData = read(NFormatter::fmt(NONEWLINE, "{}: ", m_name));
if (!recvData->good)
break;
@@ -90,7 +90,7 @@ std::unique_ptr<CSession::SRecvData> CSession::read() {
}
std::unique_ptr<CSession::SRecvData> CSession::read(const std::string &msg) {
- write("{}", msg, false);
+ write(NONEWLINE, "{}", msg, false);
m_isReading = true;
return read();
}
@@ -159,6 +159,20 @@ bool CSession::write(std::format_string<Args...> fmt, Args &&...args) {
return true;
}
+template <typename... Args>
+bool CSession::write(eFormatType type, std::format_string<Args...> fmt, Args &&...args) {
+ std::string msg = NFormatter::fmt(type, fmt, std::forward<Args>(args)...);
+ if (m_isReading)
+ msg.insert(0, "\n");
+
+ if (send(m_sockfd.get(), msg.c_str(), msg.size(), 0) < 0) {
+ onErrno(WRITE);
+ return false;
+ }
+ onSend(msg);
+ return true;
+}
+
bool CSession::write(const std::string &msg) {
return write("{}", msg);
}