Skip to content

cleanup(core): delete orphan RigctlServer and RigctlPty files#3380

Merged
jensenpat merged 1 commit into
aethersdr:mainfrom
K5PTB:fix/delete-orphan-rigctl-files
Jun 5, 2026
Merged

cleanup(core): delete orphan RigctlServer and RigctlPty files#3380
jensenpat merged 1 commit into
aethersdr:mainfrom
K5PTB:fix/delete-orphan-rigctl-files

Conversation

@K5PTB

@K5PTB K5PTB commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Removes src/core/RigctlServer.cpp/.h and src/core/RigctlPty.cpp/.h — all four were unwired by PR feat(smartcat): SmartCAT TCP server — TS-2000 and FlexCAT dialects #3131 but not deleted
  • Drops src/core/RigctlPty.cpp from CORE_SOURCES in CMakeLists.txt (the only remaining build reference)
  • Live-code grep confirms zero includes or symbol references remain; GHSA comment citations retained as-is

Test plan

  • cmake --build clean with --target all (RelWithDebInfo, macOS M2)
  • Smoke test: AetherSDR launches, rigctld CAT control functional via CatPort

Closes #3142

🤖 Generated with Claude Code

…sdr#3142)

PR aethersdr#3131 replaced the old CAT server hierarchy with CatPort +
SmartCatProtocol + SmartCatSession. The legacy files were unwired but
not deleted:

- src/core/RigctlServer.cpp / .h  (no CMake entry, no includes)
- src/core/RigctlPty.cpp / .h     (still listed in CMakeLists.txt:458)

Remove all four files and drop RigctlPty.cpp from CORE_SOURCES.
GHSA comment-only references retained; live-code grep confirms zero
users remain.

Closes aethersdr#3142

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@K5PTB K5PTB requested review from a team as code owners June 3, 2026 21:19

@aethersdr-agent aethersdr-agent Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clean surgical deletion — verified against the live tree:

  • No #include "RigctlServer.h" / #include "RigctlPty.h" from any live source.
  • No new RigctlServer(...) / new RigctlPty(...) instantiations or other symbol references.
  • CMakeLists.txt had exactly one remaining build entry (src/core/RigctlPty.cpp at line 525) — correctly removed. RigctlServer.cpp was already absent from CORE_SOURCES, consistent with the "unwired by #3131 but not deleted" framing.
  • Surviving textual references (CatPort.h/.cpp, RadioConnection.cpp, WanConnection.cpp, SmartLinkClient.cpp, DxClusterClient.cpp, RigctlProtocol.cpp, MainWindow.cpp, CHANGELOG, ROADMAP) are all narrative comments citing GHSA-7w4w-wfqm-wh93 / GHSA-qxhr-cwrc-pvrm — preserving these is the right call; they document the rationale for the hardening that CatPort now carries.

Out-of-scope check: none. Five files, all directly tied to the dead-code removal.

Thanks for picking up the #3142 loose end, @K5PTB — nice clean follow-up to the #3131 consolidation.


🤖 aethersdr-agent · cost: $16.3737 · model: claude-opus-4-7

@jensenpat jensenpat left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed: verified all four files are genuinely orphaned. RigctlServer.cpp was not in the build at all; RigctlPty.cpp was the last build reference and is correctly dropped from CORE_SOURCES. No live #include of either header remains anywhere in src/ — only GHSA/comment citations, which are intentionally retained. The still-used RigctlProtocol.cpp (consumed by CatPort) stays. CI green across build/macOS/Windows/CodeQL. Clean dead-code removal. LGTM.

@jensenpat jensenpat merged commit 21799ad into aethersdr:main Jun 5, 2026
5 checks passed
@K5PTB K5PTB deleted the fix/delete-orphan-rigctl-files branch June 5, 2026 14:17
G6PWY-Chris pushed a commit to G6PWY-Chris/AetherSDR that referenced this pull request Jun 22, 2026
…sdr#3380)

## Summary

- Removes `src/core/RigctlServer.cpp/.h` and `src/core/RigctlPty.cpp/.h`
— all four were unwired by PR aethersdr#3131 but not deleted
- Drops `src/core/RigctlPty.cpp` from `CORE_SOURCES` in `CMakeLists.txt`
(the only remaining build reference)
- Live-code grep confirms zero includes or symbol references remain;
GHSA comment citations retained as-is

## Test plan

- [x] `cmake --build` clean with `--target all` (RelWithDebInfo, macOS
M2)
- [x] Smoke test: AetherSDR launches, rigctld CAT control functional via
CatPort

Closes aethersdr#3142

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cleanup(core): delete orphan RigctlServer.cpp/.h and RigctlPty.cpp/.h

2 participants