From 00b9ae77f90644021381483f8d79be34aea8d9fe Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Thu, 10 Dec 2020 20:39:14 -0800 Subject: [PATCH] [sim] Change default WS port number to 3300 (#2932) --- simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp | 2 +- simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp | 2 +- .../src/test/native/cpp/WebServerClientTest.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp index 0b40a61196..47a255103f 100644 --- a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp +++ b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp @@ -57,7 +57,7 @@ bool HALSimWS::Initialize() { return false; } } else { - m_port = 8080; + m_port = 3300; } const char* uri = std::getenv("HALSIMWS_URI"); diff --git a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp index fe5393d891..5f5ae6c45b 100644 --- a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp +++ b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp @@ -87,7 +87,7 @@ bool HALSimWeb::Initialize() { return false; } } else { - m_port = 8080; + m_port = 3300; } return true; diff --git a/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp b/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp index 6cdac5ad63..c95ee37e50 100644 --- a/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp +++ b/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp @@ -121,10 +121,10 @@ void WebServerClientTest::AttemptConnect() { } struct sockaddr_in dest; - uv::NameToAddr("localhost", 8080, &dest); + uv::NameToAddr("localhost", 3300, &dest); m_tcp_client->Connect(dest, [this]() { m_tcp_connected = true; - InitializeWebSocket("localhost", 8080, "/wpilibws"); + InitializeWebSocket("localhost", 3300, "/wpilibws"); }); }