aboutsummaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorAbdou-31 <abdou31.coding@gmail.com>2022-11-09 17:57:19 +0100
committerGitHub <noreply@github.com>2022-11-09 11:57:19 -0500
commitd1b80b462eaa74a8640cf132c21f74e4f924052a (patch)
treed5804214487f339643ab6cdf74fbd113cb02cb2b /src/network
parent6191bafcadc21277be5527ed1ac05f7902e710ad (diff)
downloadminetest-d1b80b462eaa74a8640cf132c21f74e4f924052a.tar.xz
Fix typos and en_US/en_GB inconsistency in various files (#12902)
Diffstat (limited to 'src/network')
-rw-r--r--src/network/clientpackethandler.cpp4
-rw-r--r--src/network/connection.h2
-rw-r--r--src/network/connectionthreads.cpp4
-rw-r--r--src/network/networkprotocol.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 2933bb9f0..9044e6e35 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -86,7 +86,7 @@ void Client::handleCommand_Hello(NetworkPacket* pkt)
//TODO verify that username_legacy matches sent username, only
// differs in casing (make both uppercase and compare)
- // This is only neccessary though when we actually want to add casing support
+ // This is only necessary though when we actually want to add casing support
if (m_chosen_auth_mech != AUTH_MECHANISM_NONE) {
// we received a TOCLIENT_HELLO while auth was already going on
@@ -186,7 +186,7 @@ void Client::handleCommand_DenySudoMode(NetworkPacket* pkt)
void Client::handleCommand_AccessDenied(NetworkPacket* pkt)
{
// The server didn't like our password. Note, this needs
- // to be processed even if the serialisation format has
+ // to be processed even if the serialization format has
// not been agreed yet, the same as TOCLIENT_INIT.
m_access_denied = true;
m_access_denied_reason = "Unknown";
diff --git a/src/network/connection.h b/src/network/connection.h
index b5ae24882..dec0ffb66 100644
--- a/src/network/connection.h
+++ b/src/network/connection.h
@@ -364,7 +364,7 @@ public:
u16 readNextIncomingSeqNum();
u16 incNextIncomingSeqNum();
- u16 getOutgoingSequenceNumber(bool& successfull);
+ u16 getOutgoingSequenceNumber(bool& successful);
u16 readOutgoingSequenceNumber();
bool putBackSequenceNumber(u16);
diff --git a/src/network/connectionthreads.cpp b/src/network/connectionthreads.cpp
index 90936b43d..452a55929 100644
--- a/src/network/connectionthreads.cpp
+++ b/src/network/connectionthreads.cpp
@@ -1130,7 +1130,7 @@ SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Control(Channel *chan
// Get round trip time
u64 current_time = porting::getTimeMs();
- // a overflow is quite unlikely but as it'd result in major
+ // an overflow is quite unlikely but as it'd result in major
// rtt miscalculation we handle it here
if (current_time > p->absolute_send_time) {
float rtt = (current_time - p->absolute_send_time) / 1000.0;
@@ -1277,7 +1277,7 @@ SharedBuffer<u8> ConnectionReceiveThread::handlePacketType_Reliable(Channel *cha
throw ProcessedSilentlyException(
"Received packet newer then expected, not sending ack");
- /* seems like our ack was lost, send another one for a old packet */
+ /* seems like our ack was lost, send another one for an old packet */
if (is_old_packet) {
LOG(dout_con << m_connection->getDesc()
<< "RE-SENDING ACK: peer_id: " << peer->id
diff --git a/src/network/networkprotocol.h b/src/network/networkprotocol.h
index 3ab839f8d..a1cd926df 100644
--- a/src/network/networkprotocol.h
+++ b/src/network/networkprotocol.h
@@ -243,7 +243,7 @@ enum ToClientCommand
/*
Sent after TOSERVER_INIT.
- u8 deployed serialisation version
+ u8 deployed serialization version
u16 deployed network compression mode
u16 deployed protocol version
u32 supported auth methods
@@ -841,7 +841,7 @@ enum ToServerCommand
/*
Sent first after connected.
- u8 serialisation version (=SER_FMT_VER_HIGHEST_READ)
+ u8 serialization version (=SER_FMT_VER_HIGHEST_READ)
u16 supported network compression modes
u16 minimum supported network protocol version
u16 maximum supported network protocol version