From c1e9a0f02151ac6c55636acbd422f155f4ace136 Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Fri, 28 Jul 2023 18:10:25 -0500 Subject: [PATCH 1/5] add exclusions for FE and FF --- src/cli.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cli.cpp b/src/cli.cpp index e79a425..cedf8b5 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -217,8 +217,10 @@ int CLI::validateCommandLine(Options* options, char *argv[], json *keys) { sscanf(options->binkid.c_str(), "%x", &intBinkID); if (intBinkID >= 0x40) { - // set bink2002 validate mode if in bink1998 validate mode, else set bink2002 generate mode - options->applicationMode = (options->applicationMode == MODE_BINK1998_VALIDATE) ? MODE_BINK2002_VALIDATE : MODE_BINK2002_GENERATE; + if (intBinkID != 0xFE && intBinkID != 0xFF) { // FE and FF are oddballs that are bink1998, this excludes them from being set to bink2002 + // set bink2002 validate mode if in bink1998 validate mode, else set bink2002 generate mode + options->applicationMode = (options->applicationMode == MODE_BINK1998_VALIDATE) ? MODE_BINK2002_VALIDATE : MODE_BINK2002_GENERATE; + } } if (options->channelID > 999) { From 03ae90163a155b2b665a47354ee1a131c2e2150e Mon Sep 17 00:00:00 2001 From: Neo <321592+Neo-Desktop@users.noreply.github.com> Date: Fri, 28 Jul 2023 16:15:37 -0700 Subject: [PATCH 2/5] cleaner cli.cpp fix --- src/cli.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/cli.cpp b/src/cli.cpp index cedf8b5..d407e9a 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -216,11 +216,8 @@ int CLI::validateCommandLine(Options* options, char *argv[], json *keys) { int intBinkID; sscanf(options->binkid.c_str(), "%x", &intBinkID); - if (intBinkID >= 0x40) { - if (intBinkID != 0xFE && intBinkID != 0xFF) { // FE and FF are oddballs that are bink1998, this excludes them from being set to bink2002 - // set bink2002 validate mode if in bink1998 validate mode, else set bink2002 generate mode - options->applicationMode = (options->applicationMode == MODE_BINK1998_VALIDATE) ? MODE_BINK2002_VALIDATE : MODE_BINK2002_GENERATE; - } + if (intBinkID >= 0x40 && intBinkID < 0xFE ) { // FE and FF are BINK 1998 + options->applicationMode = (options->applicationMode == MODE_BINK1998_VALIDATE) ? MODE_BINK2002_VALIDATE : MODE_BINK2002_GENERATE; } if (options->channelID > 999) { From a4cb524fed36a352085c9e5c436a1a7b86a9c044 Mon Sep 17 00:00:00 2001 From: Neo <321592+Neo-Desktop@users.noreply.github.com> Date: Fri, 28 Jul 2023 16:16:31 -0700 Subject: [PATCH 3/5] re-add removed comment --- src/cli.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cli.cpp b/src/cli.cpp index d407e9a..ac8fabf 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -217,6 +217,7 @@ int CLI::validateCommandLine(Options* options, char *argv[], json *keys) { sscanf(options->binkid.c_str(), "%x", &intBinkID); if (intBinkID >= 0x40 && intBinkID < 0xFE ) { // FE and FF are BINK 1998 + // set bink2002 validate mode if in bink1998 validate mode, else set bink2002 generate mode options->applicationMode = (options->applicationMode == MODE_BINK1998_VALIDATE) ? MODE_BINK2002_VALIDATE : MODE_BINK2002_GENERATE; } From 45004623be7a90a02054151e4edd8699a70d37ee Mon Sep 17 00:00:00 2001 From: Neo <321592+Neo-Desktop@users.noreply.github.com> Date: Fri, 28 Jul 2023 16:17:57 -0700 Subject: [PATCH 4/5] Why does the Github web editor commit tabs??? --- src/cli.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli.cpp b/src/cli.cpp index ac8fabf..ed0e5f8 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -216,9 +216,9 @@ int CLI::validateCommandLine(Options* options, char *argv[], json *keys) { int intBinkID; sscanf(options->binkid.c_str(), "%x", &intBinkID); - if (intBinkID >= 0x40 && intBinkID < 0xFE ) { // FE and FF are BINK 1998 + if (intBinkID >= 0x40 && intBinkID < 0xFE ) { // FE and FF are BINK 1998 // set bink2002 validate mode if in bink1998 validate mode, else set bink2002 generate mode - options->applicationMode = (options->applicationMode == MODE_BINK1998_VALIDATE) ? MODE_BINK2002_VALIDATE : MODE_BINK2002_GENERATE; + options->applicationMode = (options->applicationMode == MODE_BINK1998_VALIDATE) ? MODE_BINK2002_VALIDATE : MODE_BINK2002_GENERATE; } if (options->channelID > 999) { From ae391a5e502edc897569bef2824610da3d69c177 Mon Sep 17 00:00:00 2001 From: WitherOrNot Date: Fri, 1 Sep 2023 22:43:32 -0400 Subject: [PATCH 5/5] Update cli.cpp --- src/cli.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/cli.cpp b/src/cli.cpp index ed0e5f8..1b3b608 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -216,7 +216,13 @@ int CLI::validateCommandLine(Options* options, char *argv[], json *keys) { int intBinkID; sscanf(options->binkid.c_str(), "%x", &intBinkID); - if (intBinkID >= 0x40 && intBinkID < 0xFE ) { // FE and FF are BINK 1998 + // FE and FF are BINK 1998, but do not generate valid keys, so we throw an error + if (intBinkID >= 0xFE) { + fmt::print("ERROR: Terminal Services BINKs (FE and FF) are unsupported at this time\n"); + return 1; + } + + if (intBinkID >= 0x40) { // set bink2002 validate mode if in bink1998 validate mode, else set bink2002 generate mode options->applicationMode = (options->applicationMode == MODE_BINK1998_VALIDATE) ? MODE_BINK2002_VALIDATE : MODE_BINK2002_GENERATE; }