Skip to content

Commit 2af8195

Browse files
hhvrchhvrc
committed
Remove lcg-override config
1 parent d6e806e commit 2af8195

9 files changed

Lines changed: 8 additions & 201 deletions

File tree

‎frontend/src/lib/_fbs/open-shock/serialization/configuration/backend-config.ts‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,6 @@ authToken(optionalEncoding?:any):string|Uint8Array|null {
4242
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
4343
}
4444

45-
/**
46-
* Override the Live-Control-Gateway (LCG) URL
47-
*/
48-
lcgOverride():string|null
49-
lcgOverride(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
50-
lcgOverride(optionalEncoding?:any):string|Uint8Array|null {
51-
const offset = this.bb!.__offset(this.bb_pos, 8);
52-
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
53-
}
54-
5545
static startBackendConfig(builder:flatbuffers.Builder) {
5646
builder.startObject(3);
5747
}
@@ -64,20 +54,15 @@ static addAuthToken(builder:flatbuffers.Builder, authTokenOffset:flatbuffers.Off
6454
builder.addFieldOffset(1, authTokenOffset, 0);
6555
}
6656

67-
static addLcgOverride(builder:flatbuffers.Builder, lcgOverrideOffset:flatbuffers.Offset) {
68-
builder.addFieldOffset(2, lcgOverrideOffset, 0);
69-
}
70-
7157
static endBackendConfig(builder:flatbuffers.Builder):flatbuffers.Offset {
7258
const offset = builder.endObject();
7359
return offset;
7460
}
7561

76-
static createBackendConfig(builder:flatbuffers.Builder, domainOffset:flatbuffers.Offset, authTokenOffset:flatbuffers.Offset, lcgOverrideOffset:flatbuffers.Offset):flatbuffers.Offset {
62+
static createBackendConfig(builder:flatbuffers.Builder, domainOffset:flatbuffers.Offset, authTokenOffset:flatbuffers.Offset):flatbuffers.Offset {
7763
BackendConfig.startBackendConfig(builder);
7864
BackendConfig.addDomain(builder, domainOffset);
7965
BackendConfig.addAuthToken(builder, authTokenOffset);
80-
BackendConfig.addLcgOverride(builder, lcgOverrideOffset);
8166
return BackendConfig.endBackendConfig(builder);
8267
}
8368
}

‎include/config/BackendConfig.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
namespace OpenShock::Config {
99
struct BackendConfig : public ConfigBase<Serialization::Configuration::BackendConfig> {
1010
BackendConfig();
11-
BackendConfig(std::string_view domain, std::string_view authToken, std::string_view lcgOverride);
11+
BackendConfig(std::string_view domain, std::string_view authToken);
1212

1313
std::string domain;
1414
std::string authToken;
15-
std::string lcgOverride;
1615

1716
void ToDefault() override;
1817

‎include/config/Config.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ namespace OpenShock::Config {
7878
bool GetBackendAuthToken(std::string& out);
7979
bool SetBackendAuthToken(std::string_view token);
8080
bool ClearBackendAuthToken();
81-
bool HasBackendLCGOverride();
82-
bool GetBackendLCGOverride(std::string& out);
83-
bool SetBackendLCGOverride(std::string_view lcgOverride);
84-
bool ClearBackendLCGOverride();
8581

8682
bool GetSerialInputConfigEchoEnabled(bool& out);
8783
bool SetSerialInputConfigEchoEnabled(bool enabled);

‎include/serial/command_handlers/index.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ namespace OpenShock::Serial::CommandHandlers {
1414
OpenShock::Serial::CommandGroup EStopHandler();
1515
OpenShock::Serial::CommandGroup DomainHandler();
1616
OpenShock::Serial::CommandGroup AuthTokenHandler();
17-
OpenShock::Serial::CommandGroup LcgOverrideHandler();
1817
OpenShock::Serial::CommandGroup HostnameHandler();
1918
OpenShock::Serial::CommandGroup NetworksHandler();
2019
OpenShock::Serial::CommandGroup KeepAliveHandler();
@@ -35,7 +34,6 @@ namespace OpenShock::Serial::CommandHandlers {
3534
EStopHandler(),
3635
DomainHandler(),
3736
AuthTokenHandler(),
38-
LcgOverrideHandler(),
3937
HostnameHandler(),
4038
NetworksHandler(),
4139
KeepAliveHandler(),

‎include/serialization/_fbs/HubConfig_generated.h‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,7 @@ struct BackendConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
505505
}
506506
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
507507
VT_DOMAIN = 4,
508-
VT_AUTH_TOKEN = 6,
509-
VT_LCG_OVERRIDE = 8
508+
VT_AUTH_TOKEN = 6
510509
};
511510
/// Domain name of the backend server, e.g. "api.shocklink.net"
512511
const ::flatbuffers::String *domain() const {
@@ -516,18 +515,12 @@ struct BackendConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
516515
const ::flatbuffers::String *auth_token() const {
517516
return GetPointer<const ::flatbuffers::String *>(VT_AUTH_TOKEN);
518517
}
519-
/// Override the Live-Control-Gateway (LCG) URL
520-
const ::flatbuffers::String *lcg_override() const {
521-
return GetPointer<const ::flatbuffers::String *>(VT_LCG_OVERRIDE);
522-
}
523518
bool Verify(::flatbuffers::Verifier &verifier) const {
524519
return VerifyTableStart(verifier) &&
525520
VerifyOffset(verifier, VT_DOMAIN) &&
526521
verifier.VerifyString(domain()) &&
527522
VerifyOffset(verifier, VT_AUTH_TOKEN) &&
528523
verifier.VerifyString(auth_token()) &&
529-
VerifyOffset(verifier, VT_LCG_OVERRIDE) &&
530-
verifier.VerifyString(lcg_override()) &&
531524
verifier.EndTable();
532525
}
533526
};
@@ -542,9 +535,6 @@ struct BackendConfigBuilder {
542535
void add_auth_token(::flatbuffers::Offset<::flatbuffers::String> auth_token) {
543536
fbb_.AddOffset(BackendConfig::VT_AUTH_TOKEN, auth_token);
544537
}
545-
void add_lcg_override(::flatbuffers::Offset<::flatbuffers::String> lcg_override) {
546-
fbb_.AddOffset(BackendConfig::VT_LCG_OVERRIDE, lcg_override);
547-
}
548538
explicit BackendConfigBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
549539
: fbb_(_fbb) {
550540
start_ = fbb_.StartTable();
@@ -559,10 +549,8 @@ struct BackendConfigBuilder {
559549
inline ::flatbuffers::Offset<BackendConfig> CreateBackendConfig(
560550
::flatbuffers::FlatBufferBuilder &_fbb,
561551
::flatbuffers::Offset<::flatbuffers::String> domain = 0,
562-
::flatbuffers::Offset<::flatbuffers::String> auth_token = 0,
563-
::flatbuffers::Offset<::flatbuffers::String> lcg_override = 0) {
552+
::flatbuffers::Offset<::flatbuffers::String> auth_token = 0) {
564553
BackendConfigBuilder builder_(_fbb);
565-
builder_.add_lcg_override(lcg_override);
566554
builder_.add_auth_token(auth_token);
567555
builder_.add_domain(domain);
568556
return builder_.Finish();
@@ -576,16 +564,13 @@ struct BackendConfig::Traits {
576564
inline ::flatbuffers::Offset<BackendConfig> CreateBackendConfigDirect(
577565
::flatbuffers::FlatBufferBuilder &_fbb,
578566
const char *domain = nullptr,
579-
const char *auth_token = nullptr,
580-
const char *lcg_override = nullptr) {
567+
const char *auth_token = nullptr) {
581568
auto domain__ = domain ? _fbb.CreateString(domain) : 0;
582569
auto auth_token__ = auth_token ? _fbb.CreateString(auth_token) : 0;
583-
auto lcg_override__ = lcg_override ? _fbb.CreateString(lcg_override) : 0;
584570
return OpenShock::Serialization::Configuration::CreateBackendConfig(
585571
_fbb,
586572
domain__,
587-
auth_token__,
588-
lcg_override__);
573+
auth_token__);
589574
}
590575

591576
struct SerialInputConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {

‎src/GatewayConnectionManager.cpp‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -232,15 +232,6 @@ bool StartConnectingToLCG()
232232
}
233233
s_lastConnectionAttempt = msNow;
234234

235-
if (Config::HasBackendLCGOverride()) {
236-
std::string lcgOverride;
237-
Config::GetBackendLCGOverride(lcgOverride);
238-
239-
OS_LOGD(TAG, "Connecting to overridden LCG endpoint %s", lcgOverride.c_str());
240-
// s_wsClient->connect(lcgOverride); // TODO
241-
return true;
242-
}
243-
244235
if (!Config::HasBackendAuthToken()) {
245236
OS_LOGD(TAG, "No auth token, can't connect to LCG");
246237
return false;

‎src/config/BackendConfig.cpp‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,18 @@ using namespace OpenShock::Config;
1010
BackendConfig::BackendConfig()
1111
: domain(OPENSHOCK_API_DOMAIN)
1212
, authToken()
13-
, lcgOverride()
1413
{
1514
}
1615

17-
BackendConfig::BackendConfig(std::string_view domain, std::string_view authToken, std::string_view lcgOverride)
16+
BackendConfig::BackendConfig(std::string_view domain, std::string_view authToken)
1817
: domain(domain)
1918
, authToken(authToken)
20-
, lcgOverride(lcgOverride)
2119
{
2220
}
2321

2422
void BackendConfig::ToDefault() {
2523
domain = OPENSHOCK_API_DOMAIN;
2624
authToken.clear();
27-
lcgOverride.clear();
2825
}
2926

3027
bool BackendConfig::FromFlatbuffers(const Serialization::Configuration::BackendConfig* config) {
@@ -36,7 +33,6 @@ bool BackendConfig::FromFlatbuffers(const Serialization::Configuration::BackendC
3633

3734
Internal::Utils::FromFbsStr(domain, config->domain(), OPENSHOCK_API_DOMAIN);
3835
Internal::Utils::FromFbsStr(authToken, config->auth_token(), "");
39-
Internal::Utils::FromFbsStr(lcgOverride, config->lcg_override(), "");
4036

4137
return true;
4238
}
@@ -51,9 +47,7 @@ flatbuffers::Offset<OpenShock::Serialization::Configuration::BackendConfig> Back
5147
authTokenOffset = 0;
5248
}
5349

54-
auto lcgOverrideOffset = builder.CreateString(lcgOverride);
55-
56-
return Serialization::Configuration::CreateBackendConfig(builder, domainOffset, authTokenOffset, lcgOverrideOffset);
50+
return Serialization::Configuration::CreateBackendConfig(builder, domainOffset, authTokenOffset);
5751
}
5852

5953
bool BackendConfig::FromJSON(const cJSON* json) {
@@ -70,7 +64,6 @@ bool BackendConfig::FromJSON(const cJSON* json) {
7064

7165
Internal::Utils::FromJsonStr(domain, json, "domain", OPENSHOCK_API_DOMAIN);
7266
Internal::Utils::FromJsonStr(authToken, json, "authToken", "");
73-
Internal::Utils::FromJsonStr(lcgOverride, json, "lcgOverride", "");
7467

7568
return true;
7669
}
@@ -84,7 +77,5 @@ cJSON* BackendConfig::ToJSON(bool withSensitiveData) const {
8477
cJSON_AddStringToObject(root, "authToken", authToken.c_str());
8578
}
8679

87-
cJSON_AddStringToObject(root, "lcgOverride", lcgOverride.c_str());
88-
8980
return root;
9081
}

‎src/config/Config.cpp‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -633,38 +633,6 @@ bool Config::ClearBackendAuthToken()
633633
return _trySaveConfig();
634634
}
635635

636-
bool Config::HasBackendLCGOverride()
637-
{
638-
CONFIG_LOCK_READ(false);
639-
640-
return !_configData.backend.lcgOverride.empty();
641-
}
642-
643-
bool Config::GetBackendLCGOverride(std::string& out)
644-
{
645-
CONFIG_LOCK_READ(false);
646-
647-
out = _configData.backend.lcgOverride;
648-
649-
return true;
650-
}
651-
652-
bool Config::SetBackendLCGOverride(std::string_view lcgOverride)
653-
{
654-
CONFIG_LOCK_WRITE(false);
655-
656-
_configData.backend.lcgOverride = std::string(lcgOverride);
657-
return _trySaveConfig();
658-
}
659-
660-
bool Config::ClearBackendLCGOverride()
661-
{
662-
CONFIG_LOCK_WRITE(false);
663-
664-
_configData.backend.lcgOverride.clear();
665-
return _trySaveConfig();
666-
}
667-
668636
bool Config::GetSerialInputConfigEchoEnabled(bool& out)
669637
{
670638
CONFIG_LOCK_READ(false);

‎src/serial/command_handlers/lcgoverride.cpp‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)