scottk/wlan-cloud-ucentralgw
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralgw.git synced 2025-11-03 20:27:45 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Improving RTTYS

Browse Source
This commit is contained in:
stephb9959
2022-04-20 08:52:06 -07:00
parent 19dfe74ada
commit ff37328806
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rttys/RTTYS_device.cpp
View File

@@ -177,14 +177,13 @@ namespace OpenWifi {
token_ = ReadString(); token_ = ReadString();
std::cout << conn_id_ << ": Device Registration ID:" << id_ << " DESC:" << desc_ << " TOK:" << token_ << std::endl; std::cout << conn_id_ << ": Device Registration ID:" << id_ << " DESC:" << desc_ << " TOK:" << token_ << std::endl;
if (RTTYS_server()->ValidEndPoint(id_, token_)) { if (RTTYS_server()->ValidEndPoint(id_, token_)) {
if (!RTTYS_server()->IsDeviceRegistered(id_, token_, this)) { if (RTTYS_server()->Register(id_, token_, this)) {
RTTYS_server()->Register(id_, this);
serial_ = RTTYS_server()->SerialNumber(id_); serial_ = RTTYS_server()->SerialNumber(id_);
Logger().debug(fmt::format("{}: Registration for SerialNumber: {}, Description: {}", Logger().debug(fmt::format("{}: Registration for SerialNumber: {}, Description: {}",
conn_id_, serial_, desc_)); conn_id_, serial_, desc_));
} else { } else {
Logout(); Logout();
return; return delete this;
} }
u_char OutBuf[12]; u_char OutBuf[12];
OutBuf[0] = msgTypeRegister; OutBuf[0] = msgTypeRegister;

19
src/rttys/RTTYS_server.h
View File

@@ -66,11 +66,11 @@ namespace OpenWifi {
return It->second.Client; return It->second.Client;
} }
inline void Register(const std::string &Id, RTTY_Device_ConnectionHandler *Conn) { inline bool Register(const std::string &Id, const std::string &Token, RTTY_Device_ConnectionHandler *Conn) {
std::lock_guard G(Mutex_); std::lock_guard G(Mutex_);
auto It = EndPoints_.find(Id); auto It = EndPoints_.find(Id);
if(It==EndPoints_.end()) { if(It==EndPoints_.end()) {
EndPoints_[Id] = EndPoint{ .Token = "" , EndPoints_[Id] = EndPoint{ .Token = Token ,
.Client = nullptr, .Client = nullptr,
.Device = Conn, .Device = Conn,
.TimeStamp = OpenWifi::Now(), .TimeStamp = OpenWifi::Now(),
@@ -80,9 +80,11 @@ namespace OpenWifi {
.SerialNumber = "" , .SerialNumber = "" ,
.Done = false }; .Done = false };
Logger().information(fmt::format("Registering session: {}, device:'{}'",Id,It->second.SerialNumber)); Logger().information(fmt::format("Registering session: {}, device:'{}'",Id,It->second.SerialNumber));
return true;
} else { } else {
It->second.Device = Conn; // It->second.Device = Conn;
} }
return false;
} }
inline void DeRegister(const std::string &Id, RTTY_Device_ConnectionHandler *Conn) { inline void DeRegister(const std::string &Id, RTTY_Device_ConnectionHandler *Conn) {
@@ -147,17 +149,6 @@ namespace OpenWifi {
return ((It->second.Token == Token) && ((Now-It->second.TimeStamp)<30)); return ((It->second.Token == Token) && ((Now-It->second.TimeStamp)<30));
} }
inline bool CanConnect( const std::string &Id, RTTY_Device_ConnectionHandler *Conn) {
std::lock_guard G(Mutex_);
auto It = EndPoints_.find(Id);
if(It!=EndPoints_.end() && It->second.Device==Conn && It->second.DeviceConnected==0) {
It->second.DeviceConnected = std::time(nullptr);
return true;
}
return false;
}
inline bool CanConnect( const std::string &Id, RTTYS_ClientConnection *Conn) { inline bool CanConnect( const std::string &Id, RTTYS_ClientConnection *Conn) {
std::lock_guard G(Mutex_); std::lock_guard G(Mutex_);