From 0e4f87544309c28c624053f3f00998b3a1ddfdd3 Mon Sep 17 00:00:00 2001 From: riso <4726939+risostk@users.noreply.github.com> Date: Tue, 3 Sep 2019 14:24:03 -0500 Subject: [PATCH] Clean IPV4/ipv4 to IPv4, IPV6/ipv6 to IPv6 --- CMakeLists.txt | 2 +- NETWORKING.md | 14 +++++++------- .../gui/screens/online/server_selection.stkgui | 2 +- lib/enet/unix.c | 2 +- lib/enet/win32.c | 2 +- src/main.cpp | 2 +- src/network/ios_ipv6.cpp | 6 +++--- src/network/network_console.cpp | 2 +- src/network/protocols/connect_to_server.cpp | 8 ++++---- src/network/protocols/server_lobby.cpp | 10 +++++----- src/network/server_config.cpp | 2 +- src/network/server_config.hpp | 4 ++-- src/network/servers_manager.cpp | 2 +- src/network/stk_host.cpp | 18 +++++++++--------- src/network/stk_host.hpp | 2 +- src/network/stk_ipv6.cpp | 18 +++++++++--------- src/network/stk_peer.cpp | 4 ++-- 17 files changed, 50 insertions(+), 50 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6311be2c..ae7cb5dbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ option(SERVER_ONLY "Create a server only (i.e. no graphics or sound)" OFF) option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON) option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angelscript. If you enable this option, make sure to use a compatible version." OFF) option(USE_SYSTEM_ENET "Use system ENet instead of the built-in version, when available." ON) -option(USE_IPV6 "Allow create or connect to game server with ipv6 address, system enet will not be used." ON) +option(USE_IPV6 "Allow create or connect to game server with IPv6 address, system enet will not be used." ON) option(USE_SYSTEM_GLEW "Use system GLEW instead of the built-in version, when available." ON) option(USE_SYSTEM_WIIUSE "Use system WiiUse instead of the built-in version, when available." OFF) option(USE_SQLITE3 "Use sqlite to manage server stats and ban list." ON) diff --git a/NETWORKING.md b/NETWORKING.md index a335982a8..1f9db0b55 100644 --- a/NETWORKING.md +++ b/NETWORKING.md @@ -78,7 +78,7 @@ The current server configuration xml looks like this: - + @@ -224,9 +224,9 @@ You have the best gaming experience when choosing server having all players less Currently STK uses sqlite (if building with sqlite3 on) for server management with the following functions at the moment: 1. Server statistics -2. IPV4 / online ID ban list +2. IPv4 / online ID ban list 3. Player reports -4. IPV4 geolocation +4. IPv4 geolocation You need to create a database in sqlite first, run `sqlite3 stkservers.db` in the folder where (all) your server_config.xml(s) located. @@ -236,7 +236,7 @@ CREATE TABLE IF NOT EXISTS (table name above) ( host_id INTEGER UNSIGNED NOT NULL PRIMARY KEY, -- Unique host id in STKHost of each connection session for a STKPeer ip INTEGER UNSIGNED NOT NULL, -- IP decimal of host - ipv6 TEXT NOT NULL DEFAULT '', -- IPV6 (if exists) in string of host (only created if ipv6 server) + ipv6 TEXT NOT NULL DEFAULT '', -- IPv6 (if exists) in string of host (only created if IPv6 server) port INTEGER UNSIGNED NOT NULL, -- Port of host online_id INTEGER UNSIGNED NOT NULL, -- Online if of the host (0 for offline account) username TEXT NOT NULL, -- First player name in the host (if the host has splitscreen player) @@ -273,7 +273,7 @@ CREATE TABLE IF NOT EXISTS (table name above) If you want to see flags and readable names of countries in the above views, you need to initialize `v(server database version)_countries` table, check [this script](tools/generate-countries-table.py). -For IPV4 and online ID ban list, player reports or IP mapping, you need to create one yourself: +For IPv4 and online ID ban list, player reports or IP mapping, you need to create one yourself: ```sql CREATE TABLE ip_ban ( @@ -302,13 +302,13 @@ CREATE TABLE player_reports ( server_uid TEXT NOT NULL, -- Report from which server unique id (config filename) reporter_ip INTEGER UNSIGNED NOT NULL, -- IP decimal of player who reports - reporter_ipv6 TEXT NOT NULL DEFAULT '', -- IPV6 (if exists) in string of player who reports (only needed for ipv6 server) + reporter_ipv6 TEXT NOT NULL DEFAULT '', -- IPv6 (if exists) in string of player who reports (only needed for IPv6 server) reporter_online_id INTEGER UNSIGNED NOT NULL, -- Online id of player who reports, 0 for offline player reporter_username TEXT NOT NULL, -- Player name who reports reported_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -- Time of reporting info TEXT NOT NULL, -- Report info by reporter reporting_ip INTEGER UNSIGNED NOT NULL, -- IP decimal of player being reported - reporting_ipv6 TEXT NOT NULL DEFAULT '', -- IPV6 (if exists) in string of player who reports (only needed for ipv6 server) + reporting_ipv6 TEXT NOT NULL DEFAULT '', -- IPv6 (if exists) in string of player who reports (only needed for IPv6 server) reporting_online_id INTEGER UNSIGNED NOT NULL, -- Online id of player being reported, 0 for offline player reporting_username TEXT NOT NULL -- Player name being reported ); diff --git a/data/gui/screens/online/server_selection.stkgui b/data/gui/screens/online/server_selection.stkgui index 980f4c1f4..2a147c7a8 100644 --- a/data/gui/screens/online/server_selection.stkgui +++ b/data/gui/screens/online/server_selection.stkgui @@ -22,7 +22,7 @@