Alternate server tcp udp distinction #1604#1605
Open
Cybermilitia wants to merge 8 commits intocoturn:masterfrom
Open
Alternate server tcp udp distinction #1604#1605Cybermilitia wants to merge 8 commits intocoturn:masterfrom
Cybermilitia wants to merge 8 commits intocoturn:masterfrom
Conversation
Contributor
Cybermilitia
commented
Nov 26, 2024
- Added separate TCP and UDP alternate server lists to resolve port ambiguity.
- Enabled the use of an existing TLS counter for Alternate Server round-robin selection, fixing a bug where only the generic counter was used.
- Ensures correct redirection for clients using different protocols (TCP/UDP).
- Improves reliability and prevents misdirected connections in multi-protocol setups.
added 6 commits
November 28, 2023 14:33
Added session id parameter to use it in "A peer IP <IP> denied in the range" logs. Besides, server ID has been made visible in this logs.
Added separate TCP and UDP alternate server lists to resolve port ambiguity. Enabled the use of an existing TLS counter for Alternate Server round-robin selection
Contributor
Author
|
As far as I can understand, the fails are not related to the code directly. Do you have any opinion? |
Collaborator
|
Hi @Cybermilitia ! Could you please rebase and resolve the conflicts? Thanks! |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR separates TCP and UDP alternate server lists, adjusts the round-robin counters accordingly, and exposes the new lists in both CLI and HTTP admin interfaces to prevent protocol misdirection.
- Introduce
tcp_alternate_servers_listandudp_alternate_servers_listalong with their counters in the server struct. - Update selection logic in
ns_turn_server.cto pick protocol-specific lists and counters. - Add CLI commands, HTTP printouts, and initialization for the new lists in relay tools.
Reviewed Changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/server/ns_turn_server.h | Declare new TCP/UDP alternate server lists and counters |
| src/server/ns_turn_server.c | Protocol-aware selection logic uses correct list and counter |
| src/apps/relay/turn_admin_server.c | Add CLI handlers and config printing for TCP/UDP alternate servers |
| src/apps/relay/netengine.c | Implement add_/del_{tcp,udp}_alternate_server functions |
| src/apps/relay/mainrelay.h | Declare new CLI option handlers for TCP/UDP alternate servers |
| src/apps/relay/mainrelay.c | Initialize new lists and wire up long options for TCP/UDP alternate servers |
Comments suppressed due to low confidence (2)
src/apps/relay/turn_admin_server.c:1103
- [nitpick] The CLI commands
atcpasandaudpasare terse and may be confusing; consider using clearer names likeadd-tcp-alt-serverandadd-udp-alt-serverto match long-option style.
} else if (strstr(cmd, "atcpas ") == cmd) {
src/apps/relay/netengine.c:291
- New functions
add_/del_tcp_alternate_serverandadd_/del_udp_alternate_serverare added—consider adding unit tests to verify their behavior and ensure correct list manipulation.
void add_tcp_alternate_server(const char *saddr) {
src/apps/relay/netengine.c
Outdated
Comment on lines
+292
to
+304
| add_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.tcp_alternate_servers_list); | ||
| } | ||
|
|
||
| void del_tcp_alternate_server(const char *saddr) { | ||
| del_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.tcp_alternate_servers_list); | ||
| } | ||
|
|
||
| void add_udp_alternate_server(const char *saddr) { | ||
| add_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.udp_alternate_servers_list); | ||
| } | ||
|
|
||
| void del_udp_alternate_server(const char *saddr) { | ||
| del_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.udp_alternate_servers_list); |
There was a problem hiding this comment.
Using DEFAULT_STUN_TLS_PORT as the default port for TCP alternate servers may be incorrect; consider using a TCP-appropriate default or make the port configurable to match the protocol.
Suggested change
| add_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.tcp_alternate_servers_list); | |
| } | |
| void del_tcp_alternate_server(const char *saddr) { | |
| del_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.tcp_alternate_servers_list); | |
| } | |
| void add_udp_alternate_server(const char *saddr) { | |
| add_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.udp_alternate_servers_list); | |
| } | |
| void del_udp_alternate_server(const char *saddr) { | |
| del_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.udp_alternate_servers_list); | |
| add_alt_server(saddr, DEFAULT_TCP_PORT, &turn_params.tcp_alternate_servers_list); | |
| } | |
| void del_tcp_alternate_server(const char *saddr) { | |
| del_alt_server(saddr, DEFAULT_TCP_PORT, &turn_params.tcp_alternate_servers_list); | |
| } | |
| void add_udp_alternate_server(const char *saddr) { | |
| add_alt_server(saddr, DEFAULT_UDP_PORT, &turn_params.udp_alternate_servers_list); | |
| } | |
| void del_udp_alternate_server(const char *saddr) { | |
| del_alt_server(saddr, DEFAULT_UDP_PORT, &turn_params.udp_alternate_servers_list); |
src/apps/relay/netengine.c
Outdated
| } | ||
|
|
||
| void add_udp_alternate_server(const char *saddr) { | ||
| add_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.udp_alternate_servers_list); |
There was a problem hiding this comment.
The UDP alternate server is initialized with DEFAULT_STUN_TLS_PORT; it should likely use DEFAULT_STUN_PORT (3478) or be configurable to avoid mis-routing.
Suggested change
| add_alt_server(saddr, DEFAULT_STUN_TLS_PORT, &turn_params.udp_alternate_servers_list); | |
| add_alt_server(saddr, DEFAULT_STUN_PORT, &turn_params.udp_alternate_servers_list); |
Contributor
|
Fixed bug with ports and also rebased and reformatted. But it is still missing updating the config file and the READMe doc. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.