Skip to content

feat: Log errors when Relay/WebSocket settings are mismatched #2715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simon-lemay-unity merged 4 commits into from
Oct 4, 2023
Merged

feat: Log errors when Relay/WebSocket settings are mismatched #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bee3901
feat: Log errors when Relay/WebSocket settings are mismatched
simon-lemay-unity Sep 26, 2023
f4be94c
Merge branch 'develop' into feat/warn-on-ws-mismatch
NoelStephensUnity Oct 3, 2023
d246bf8
Merge branch 'develop' into feat/warn-on-ws-mismatch
simon-lemay-unity Oct 4, 2023
03d0a0b
Merge develop into feat/warn-on-ws-mismatch
netcode-ci-service Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,6 +1562,21 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
}
#endif

#if UTP_TRANSPORT_2_1_ABOVE
if (m_ProtocolType == ProtocolType.RelayUnityTransport)
{
if (m_UseWebSockets && m_RelayServerData.IsWebSocket == 0)
{
Debug.LogError("Transport is configured to use WebSockets, but Relay server data isn't. Be sure to use \"wss\" as the connection type when creating the server data (instead of \"dtls\" or \"udp\").");
}

if (!m_UseWebSockets && m_RelayServerData.IsWebSocket != 0)
{
Debug.LogError("Relay server data indicates usage of WebSockets, but \"Use WebSockets\" checkbox isn't checked under \"Unity Transport\" component.");
}
}
#endif

#if UTP_TRANSPORT_2_0_ABOVE
if (m_UseWebSockets)
{
Expand Down
5 changes: 5 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
"name": "com.unity.transport",
"expression": "2.0.0-exp",
"define": "UTP_TRANSPORT_2_0_ABOVE"
},
{
"name": "com.unity.transport",
"expression": "2.1.0",
"define": "UTP_TRANSPORT_2_1_ABOVE"
}
]
}