QTfrontend/net/newnetclient.cpp
author Wuzzy <Wuzzy2@mail.ru>
Thu, 18 Jul 2019 03:25:15 +0200
changeset 15272 9be05ae1b726
parent 14927 8b5d06749026
child 15438 5fcdc072d706
permissions -rw-r--r--
Use minimum size for keybinder category list
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     1
/*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 884
diff changeset
     2
 * Hedgewars, a free turn based strategy game
4976
088d40d8aba2 Happy 2011 :)
koda
parents: 4973
diff changeset
     3
 * Copyright (c) 2006-2008 Igor Ulyanov <iulyanov@gmail.com>
11046
47a8c19ecb60 more copyright fixes
sheepluva
parents: 10695
diff changeset
     4
 * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     5
 *
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     6
 * This program is free software; you can redistribute it and/or modify
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     7
 * it under the terms of the GNU General Public License as published by
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     8
 * the Free Software Foundation; version 2 of the License
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
     9
 *
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    10
 * This program is distributed in the hope that it will be useful,
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    13
 * GNU General Public License for more details.
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    14
 *
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    16
 * along with this program; if not, write to the Free Software
10108
c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents: 10076
diff changeset
    17
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    18
 */
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    19
1189
f66cdbbfc4b6 Fix compile under Ubuntu (why it compiles everywhere else?)
unc0rr
parents: 1083
diff changeset
    20
#include <QDebug>
1844
81abed9d4c11 Ask user password and send it to server
unc0rr
parents: 1842
diff changeset
    21
#include <QInputDialog>
1905
b1ec8db513f2 - Use QCryptographicHash for md5
unc0rr
parents: 1899
diff changeset
    22
#include <QCryptographicHash>
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    23
#include <QSortFilterProxyModel>
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
    24
#include <QUuid>
1844
81abed9d4c11 Ask user password and send it to server
unc0rr
parents: 1842
diff changeset
    25
697
44f167938201 pre-alpha network weapons selection
displacer
parents: 660
diff changeset
    26
#include "hwconsts.h"
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    27
#include "newnetclient.h"
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    28
#include "proto.h"
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    29
#include "game.h"
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
    30
#include "roomslistmodel.h"
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
    31
#include "playerslistmodel.h"
8401
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
    32
#include "servermessages.h"
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
    33
#include "HWApplication.h"
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    34
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
    35
char delimiter='\n';
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    36
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
    37
HWNewNet::HWNewNet() :
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    38
    isChief(false),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    39
    m_game_connected(false),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
    40
    netClientState(Disconnected)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    41
{
10248
7b9b44a051f8 Fix some of issues found by coverity
unc0rr
parents: 10144
diff changeset
    42
    m_private_game = false;
7b9b44a051f8 Fix some of issues found by coverity
unc0rr
parents: 10144
diff changeset
    43
    m_nick_registered = false;
14924
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
    44
    m_demo_data_pending = false;
10248
7b9b44a051f8 Fix some of issues found by coverity
unc0rr
parents: 10144
diff changeset
    45
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
    46
    m_roomsListModel = new RoomsListModel(this);
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    47
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    48
    m_playersModel = new PlayersListModel(this);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    49
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    50
    m_lobbyPlayersModel = new QSortFilterProxyModel(this);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    51
    m_lobbyPlayersModel->setSourceModel(m_playersModel);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    52
    m_lobbyPlayersModel->setSortRole(PlayersListModel::SortRole);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    53
    m_lobbyPlayersModel->setDynamicSortFilter(true);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    54
    m_lobbyPlayersModel->sort(0);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    55
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    56
    m_roomPlayersModel = new QSortFilterProxyModel(this);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    57
    m_roomPlayersModel->setSourceModel(m_playersModel);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    58
    m_roomPlayersModel->setSortRole(PlayersListModel::SortRole);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    59
    m_roomPlayersModel->setDynamicSortFilter(true);
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    60
    m_roomPlayersModel->sort(0);
7731
262228c64f15 Room players list
unc0rr
parents: 7728
diff changeset
    61
    m_roomPlayersModel->setFilterRole(PlayersListModel::RoomFilterRole);
7834
3a65b70b1285 Oops, fix room players list emptyness
unc0rr
parents: 7775
diff changeset
    62
    m_roomPlayersModel->setFilterFixedString("true");
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    63
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
    64
    // socket stuff
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    65
    connect(&NetSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    66
    connect(&NetSocket, SIGNAL(connected()), this, SLOT(OnConnect()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    67
    connect(&NetSocket, SIGNAL(disconnected()), this, SLOT(OnDisconnect()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    68
    connect(&NetSocket, SIGNAL(error(QAbstractSocket::SocketError)), this,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    69
            SLOT(displayError(QAbstractSocket::SocketError)));
8534
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
    70
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
    71
    connect(this, SIGNAL(messageProcessed()), this, SLOT(ClientRead()), Qt::QueuedConnection);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    72
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    73
1526
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    74
HWNewNet::~HWNewNet()
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    75
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    76
    if (m_game_connected)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    77
    {
13673
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
    78
        RawSendNet(QString("QUIT%1").arg(delimiter));
13867
d8e606cf8ff5 Simplify /quit chat command
Wuzzy <Wuzzy2@mail.ru>
parents: 13695
diff changeset
    79
        emit disconnected("");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    80
    }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    81
    NetSocket.flush();
1526
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    82
}
18e412dd7d50 Send QUIT message to server when netclient object is destroyed
unc0rr
parents: 1512
diff changeset
    83
14886
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
    84
void HWNewNet::Connect(const QString & hostName, quint16 port, bool useTls, const QString & nick)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
    85
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
    86
    netClientState = Connecting;
5390
f41e87de8989 (fix issue 126) moved initial nickname popup to the netconnection page
koda
parents: 5230
diff changeset
    87
    mynick = nick;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
    88
    myhost = hostName + QString(":%1").arg(port);
14887
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    89
    if (useTls)
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    90
    {
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    91
        NetSocket.connectToHostEncrypted(hostName, port);
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    92
        if (!NetSocket.waitForEncrypted())
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    93
        {
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    94
            qWarning("Handshake failed");
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    95
        }
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    96
    }
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    97
    else 
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    98
    {
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
    99
        NetSocket.connectToHost(hostName, port);
e088bd03812d upgrade to QSslSocket
alfadur
parents: 14886
diff changeset
   100
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   101
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   102
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   103
void HWNewNet::Disconnect()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   104
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   105
    if (m_game_connected)
13673
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
   106
        RawSendNet(QString("QUIT%1").arg(delimiter));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   107
    m_game_connected = false;
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   108
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   109
    NetSocket.disconnectFromHost();
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   110
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   111
9541
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   112
void HWNewNet::CreateRoom(const QString & room, const QString & password)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   113
{
13322
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   114
    if(netClientState != InLobby || !ByteLength(room))
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   115
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   116
        qWarning("Illegal try to create room!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   117
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   118
    }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   119
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   120
    myroom = room;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   121
9541
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   122
    if(password.isEmpty())
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   123
        RawSendNet(QString("CREATE_ROOM%1%2").arg(delimiter).arg(room));
9541
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   124
    else
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   125
        RawSendNet(QString("CREATE_ROOM%1%2%1%3").arg(delimiter).arg(room).arg(password));
9541
312bb4384f33 - Frontend finally learns how to create passworded room
unc0rr
parents: 9503
diff changeset
   126
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   127
    isChief = true;
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   128
}
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   129
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   130
void HWNewNet::JoinRoom(const QString & room, const QString &password)
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   131
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   132
    if(netClientState != InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   133
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   134
        qWarning("Illegal try to join room!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   135
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   136
    }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   137
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   138
    myroom = room;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
   139
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   140
    if(password.isEmpty())
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   141
        RawSendNet(QString("JOIN_ROOM%1%2").arg(delimiter).arg(room));
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   142
    else
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   143
        RawSendNet(QString("JOIN_ROOM%1%2%1%3").arg(delimiter).arg(room).arg(password));
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
   144
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   145
    isChief = false;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   146
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   147
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   148
void HWNewNet::AddTeam(const HWTeam & team)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   149
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   150
    QString cmd = QString("ADD_TEAM") + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   151
                  team.name() + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   152
                  QString::number(team.color()) + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   153
                  team.grave() + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   154
                  team.fort() + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   155
                  team.voicepack() + delimiter +
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   156
                  team.flag() + delimiter +
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   157
                  QString::number(team.difficulty());
1245
d2eca4a053f5 Send hats info via net. Hats implementation complete now.
unc0rr
parents: 1189
diff changeset
   158
6024
d38da7c19e43 some more cleanups and refactoring.
sheepluva
parents: 6015
diff changeset
   159
    for(int i = 0; i < HEDGEHOGS_PER_TEAM; ++i)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   160
    {
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   161
        cmd.append(delimiter);
6015
daffc14a518a cleaning up a little bit more, especially team class. we were leaking teams into heap memory on quick game starts btw
sheepluva
parents: 5998
diff changeset
   162
        cmd.append(team.hedgehog(i).Name);
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   163
        cmd.append(delimiter);
6015
daffc14a518a cleaning up a little bit more, especially team class. we were leaking teams into heap memory on quick game starts btw
sheepluva
parents: 5998
diff changeset
   164
        cmd.append(team.hedgehog(i).Hat);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   165
    }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   166
    RawSendNet(cmd);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   167
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   168
347
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   169
void HWNewNet::RemoveTeam(const HWTeam & team)
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   170
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   171
    RawSendNet(QString("REMOVE_TEAM") + delimiter + team.name());
347
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   172
}
6521e1b2cd40 more correct remove net teams
displacer
parents: 341
diff changeset
   173
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   174
void HWNewNet::NewNick(const QString & nick)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   175
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   176
    RawSendNet(QString("NICK%1%2").arg(delimiter).arg(nick));
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   177
}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   178
1404
2b6b6809c2e4 - Fix a bug in READY message handling
unc0rr
parents: 1391
diff changeset
   179
void HWNewNet::ToggleReady()
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   180
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   181
    RawSendNet(QString("TOGGLE_READY"));
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   182
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   183
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   184
void HWNewNet::SendNet(const QByteArray & buf)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   185
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   186
    QString msg = QString(buf.toBase64());
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   187
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   188
    RawSendNet(QString("EM%1%2").arg(delimiter).arg(msg));
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   189
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   190
13322
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   191
int HWNewNet::ByteLength(const QString & str)
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   192
{
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   193
	return str.toUtf8().size();
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   194
}
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
   195
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   196
void HWNewNet::RawSendNet(const QString & str)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   197
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   198
    RawSendNet(str.toUtf8());
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   199
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   200
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   201
void HWNewNet::RawSendNet(const QByteArray & buf)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   202
{
11461
5dbc0f976b4a assume frontend buffer utf-8 to avoid garbage strings in debug
nemo
parents: 11046
diff changeset
   203
    qDebug() << "Client: " << QString(QString::fromUtf8(buf)).split("\n");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   204
    NetSocket.write(buf);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   205
    NetSocket.write("\n\n", 2);
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   206
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   207
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   208
void HWNewNet::ClientRead()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   209
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   210
    while (NetSocket.canReadLine())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   211
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   212
        QString s = QString::fromUtf8(NetSocket.readLine());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   213
        if (s.endsWith('\n')) s.chop(1);
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   214
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   215
        if (s.size() == 0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   216
        {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   217
            ParseCmd(cmdbuf);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   218
            cmdbuf.clear();
8534
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
   219
            emit messageProcessed();
92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents: 8489
diff changeset
   220
            return ;
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   221
        }
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   222
        else
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   223
            cmdbuf << s;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   224
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   225
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   226
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   227
void HWNewNet::OnConnect()
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   228
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   229
    netClientState = Connected;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   230
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   231
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   232
void HWNewNet::OnDisconnect()
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   233
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   234
    netClientState = Disconnected;
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   235
    if(m_game_connected) emit disconnected("");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   236
    m_game_connected = false;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   237
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   238
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   239
void HWNewNet::displayError(QAbstractSocket::SocketError socketError)
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   240
{
5230
c088be28d5e8 Set m_game_connected to false after emitting Disconnected(). This fixes a bug in a case such that when entering an invalid password, the game would bring you back to the main menu.
Zorg <zorgiepoo@gmail.com>
parents: 5229
diff changeset
   241
    m_game_connected = false;
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   242
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   243
    switch (socketError)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   244
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   245
        case QAbstractSocket::RemoteHostClosedError:
6722
e3a35bc838fb Show message and return from network game pages on server shutdown
unc0rr
parents: 6700
diff changeset
   246
            emit disconnected(tr("Remote host has closed connection"));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   247
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   248
        case QAbstractSocket::HostNotFoundError:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   249
            emit disconnected(tr("The host was not found. Please check the host name and port settings."));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   250
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   251
        case QAbstractSocket::ConnectionRefusedError:
13658
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   252
            if (getHost() == (QString("%1:%2").arg(NETGAME_DEFAULT_SERVER).arg(NETGAME_DEFAULT_PORT)))
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   253
                // Error for official server
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   254
                emit disconnected(tr("The connection was refused by the official server or timed out. Something seems to be wrong with the official server at the moment. This might be a temporary problem. Please try again later."));
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   255
            else
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   256
                // Error for every other host
73993abb85d7 Improve “Connection refused” error message
Wuzzy <Wuzzy2@mail.ru>
parents: 13322
diff changeset
   257
                emit disconnected(tr("The connection was refused by the host or timed out. This might have one of the following reasons:\n- The Hedgewars Server program does currently not run on the host\n- The specified port number is incorrect\n- There is a temporary network problem\n\nPlease check the host name and port settings and/or try again later."));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   258
            break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   259
        default:
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   260
            emit disconnected(NetSocket.errorString());
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   261
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   262
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   263
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   264
void HWNewNet::SendPasswordHash(const QString & hash)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   265
{
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   266
    // don't send it immediately, only store and check if server asked us for a password
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   267
    m_passwordHash = hash.toLatin1();
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   268
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   269
    maybeSendPassword();
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   270
}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   271
14886
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   272
void HWNewNet::ContinueConnection()
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   273
{
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   274
    if (netClientState == Connected)    
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   275
    {
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   276
        RawSendNet(QString("NICK%1%2").arg(delimiter).arg(mynick));
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   277
        RawSendNet(QString("PROTO%1%2").arg(delimiter).arg(*cProtoVer));    
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   278
        m_game_connected = true;
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   279
        emit adminAccess(false);
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   280
    }
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   281
}
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   282
1082
596b1dcdc1df - Modify network protocol to use new delimiter
unc0rr
parents: 1081
diff changeset
   283
void HWNewNet::ParseCmd(const QStringList & lst)
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   284
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   285
    qDebug() << "Server: " << lst;
1305
453882eb4467 - Fix build of server (has some bugs now)
unc0rr
parents: 1302
diff changeset
   286
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   287
    if(!lst.size())
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   288
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   289
        qWarning("Net client: Bad message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   290
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   291
    }
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 319
diff changeset
   292
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   293
    if (lst[0] == "NICK")
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   294
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   295
        mynick = lst[1];
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   296
        m_playersModel->setNickname(mynick);
8299
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   297
        m_nick_registered = false;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   298
        return ;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   299
    }
1308
d5dcd6cfa5e2 Fix another server failure (when second client in room disconnects)
unc0rr
parents: 1307
diff changeset
   300
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   301
    if (lst[0] == "PROTO")
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   302
        return ;
2108
a689375bbfee Silence frontend debug output
unc0rr
parents: 1990
diff changeset
   303
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   304
    if (lst[0] == "ERROR")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   305
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   306
        if (lst.size() == 2)
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   307
            emit Error(HWApplication::translate("server", lst[1].toLatin1().constData()));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   308
        else
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   309
            emit Error("Unknown error");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   310
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   311
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   312
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   313
    if (lst[0] == "WARNING")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   314
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   315
        if (lst.size() == 2)
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   316
            emit Warning(HWApplication::translate("server", lst[1].toLatin1().constData()));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   317
        else
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   318
            emit Warning("Unknown warning");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   319
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   320
    }
1307
ce26e16d18ab - Now actually fix
unc0rr
parents: 1305
diff changeset
   321
14859
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   322
    if (lst[0] == "REDIRECT")
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   323
    {        
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   324
        if (lst.size() < 2 || lst[1].toInt() == 0)
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   325
        {
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   326
            qWarning("Net: Malformed REDIRECT message");
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   327
            return;            
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   328
        }
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   329
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   330
        quint16 port = lst[1].toInt();
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   331
        if (port == 0) 
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   332
        {
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   333
            qWarning() << "Invalid redirection port";            
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   334
        }
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   335
        else 
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   336
        {
14886
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   337
            netClientState = Redirected;
14859
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   338
            emit redirected(port);
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   339
        }
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   340
        return;
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   341
    }
bdb47255d7e4 accept redirect messages
alfadur
parents: 13990
diff changeset
   342
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   343
    if (lst[0] == "CONNECTED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   344
    {
4973
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   345
        if(lst.size() < 3 || lst[2].toInt() < cMinServerVersion)
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   346
        {
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   347
            // TODO: Warn user, disconnect
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   348
            qWarning() << "Server too old";
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   349
            RawSendNet(QString("QUIT%1%2").arg(delimiter).arg("Server too old"));
6737
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   350
            Disconnect();
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   351
            emit disconnected(tr("The server is too old. Disconnecting now."));
ce5fbd98370f - Increase server version number due to rooms list protocol changes
unc0rr
parents: 6735
diff changeset
   352
            return;
4973
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   353
        }
53411a26df7e Add server version (which is separate from protocol version) and a check in frontend for a new enough server (currently only qWarning)
unc0rr
parents: 4963
diff changeset
   354
14886
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   355
        ClientState lastState = netClientState;
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   356
        netClientState = Connected;      
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   357
        if (lastState != Redirected)
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   358
        {
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   359
            ContinueConnection();
90cf07c60feb add argument flag for tls connections
alfadur
parents: 14859
diff changeset
   360
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   361
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   362
    }
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   363
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   364
    if (lst[0] == "SERVER_AUTH")
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   365
    {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   366
        if(lst.size() < 2)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   367
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   368
            qWarning("Net: Malformed SERVER_AUTH message");
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   369
            return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   370
        }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   371
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
   372
        if(lst[1] != m_serverHash)
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   373
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   374
            Error("Server authentication error");
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   375
            Disconnect();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   376
        } else
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   377
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   378
            // empty m_serverHash variable means no authentication was performed
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   379
            // or server passed authentication
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   380
            m_serverHash.clear();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   381
        }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   382
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   383
        return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   384
    }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   385
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   386
    if (lst[0] == "PING")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   387
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   388
        if (lst.size() > 1)
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   389
            RawSendNet(QString("PONG%1%2").arg(delimiter).arg(lst[1]));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   390
        else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   391
            RawSendNet(QString("PONG"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   392
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   393
    }
1462
d3323637da1f Client sends PONG to server's PING
unc0rr
parents: 1427
diff changeset
   394
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   395
    if (lst[0] == "ROOMS")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   396
    {
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   397
        if(lst.size() % 9 != 1)
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   398
        {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   399
            qWarning("Net: Malformed ROOMS message");
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   400
            return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   401
        }
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   402
        m_roomsListModel->setRoomsList(lst.mid(1));
8720
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548)
koda
parents: 8567
diff changeset
   403
        if (m_private_game == false && m_nick_registered == false)
8299
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   404
        {
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   405
            emit NickNotRegistered(mynick);
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   406
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   407
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   408
    }
1313
f4c54e9e1b8c - Introduce a bit of state miachine in client code (should be more robust and verbosive now)
unc0rr
parents: 1311
diff changeset
   409
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   410
    if (lst[0] == "SERVER_MESSAGE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   411
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   412
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   413
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   414
            qWarning("Net: Empty SERVERMESSAGE message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   415
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   416
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   417
        emit serverMessage(lst[1]);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   418
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   419
    }
1377
a9e768739345 - Customize QTextBrowser look
unc0rr
parents: 1369
diff changeset
   420
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   421
    if (lst[0] == "CHAT")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   422
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   423
        if(lst.size() < 3)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   424
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   425
            qWarning("Net: Empty CHAT message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   426
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   427
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   428
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   429
        QString action;
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   430
        QString message;
13990
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   431
        QString sender = lst[1];
13695
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   432
        // '[' is a special character used in fake nick names of server messages.
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   433
        // Those are supposed to be translated
13990
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   434
        if(!sender.startsWith('['))
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   435
        {
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   436
            // Normal message
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   437
            message = lst[2];
13695
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   438
            // Another kind of fake nick. '(' nicks are server messages, but they must not be translated
13990
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   439
            if(!sender.startsWith('('))
13695
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   440
            {
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   441
                // Check for action (/me command)
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   442
                action = HWProto::chatStringToAction(message);
e529a34872f9 Fix some formatting problems with /me
Wuzzy <Wuzzy2@mail.ru>
parents: 13692
diff changeset
   443
            }
13990
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   444
            else
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   445
            {
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   446
                // If parenthesis were used, replace them with square brackets
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   447
                // for a consistent style.
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   448
                sender.replace(0, 1, '[');
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   449
                sender.replace(sender.length()-1, 1, ']');
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   450
            }
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   451
        }
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   452
        else
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   453
        {
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   454
            // Server message
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   455
            // Server messages are translated client-side
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   456
            message = HWApplication::translate("server", lst[2].toLatin1().constData());
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   457
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   458
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   459
        if (netClientState == InLobby)
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   460
        {
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   461
            if (!action.isNull())
13990
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   462
                emit lobbyChatAction(sender, action);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   463
            else
13990
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   464
                emit lobbyChatMessage(sender, message);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   465
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   466
        else
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   467
        {
13990
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   468
            emit chatStringFromNet(HWProto::formatChatMsg(sender, message));
13692
70c8feb81d35 Make frontend translate server messages properly
Wuzzy <Wuzzy2@mail.ru>
parents: 13673
diff changeset
   469
            if (!action.isNull())
13990
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   470
                emit roomChatAction(sender, action);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   471
            else
13990
4d761adb4e6c Frontend: Make sure special nicks always show up in square brackets
Wuzzy <Wuzzy2@mail.ru>
parents: 13867
diff changeset
   472
                emit roomChatMessage(sender, message);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   473
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   474
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   475
    }
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
   476
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   477
    if (lst[0] == "INFO")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   478
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   479
        if(lst.size() < 5)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   480
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   481
            qWarning("Net: Malformed INFO message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   482
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   483
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   484
        emit playerInfo(lst[1], lst[2], lst[3], lst[4]);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   485
        if (netClientState != InLobby)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   486
        {
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   487
            QStringList tmp = lst;
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   488
            tmp.removeFirst();
8762
388d2bf73ff9 fix player info
sheepluva
parents: 8759
diff changeset
   489
            emit chatStringFromNet(tmp.join(" ").prepend('\x01'));
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   490
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   491
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   492
    }
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
   493
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   494
    if (lst[0] == "SERVER_VARS")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   495
    {
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   496
        QStringList tmp = lst;
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   497
        tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   498
        while (tmp.size() >= 2)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   499
        {
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   500
            if(tmp[0] == "MOTD_NEW") emit serverMessageNew(tmp[1]);
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   501
            else if(tmp[0] == "MOTD_OLD") emit serverMessageOld(tmp[1]);
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   502
            else if(tmp[0] == "LATEST_PROTO") emit latestProtocolVar(tmp[1].toInt());
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3555
diff changeset
   503
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   504
            tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   505
            tmp.removeFirst();
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   506
        }
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   507
        return;
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   508
    }
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
   509
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   510
    if (lst[0] == "BANLIST")
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   511
    {
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   512
        QStringList tmp = lst;
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   513
        tmp.removeFirst();
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   514
        emit bansList(tmp);
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   515
        return;
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   516
    }
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
   517
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   518
    if (lst[0] == "CLIENT_FLAGS" || lst[0] == "CF")
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   519
    {
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   520
        if(lst.size() < 3 || lst[1].size() < 2)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   521
        {
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   522
            qWarning("Net: Malformed CLIENT_FLAGS message");
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   523
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   524
        }
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   525
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   526
        QString flags = lst[1];
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   527
        bool setFlag = flags[0] == '+';
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   528
        const QStringList nicks = lst.mid(2);
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   529
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   530
        while(flags.size() > 1)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   531
        {
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   532
            flags.remove(0, 1);
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   533
            char c = flags[0].toLatin1();
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   534
            bool inRoom = (netClientState == InRoom || netClientState == InGame);
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   535
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   536
            switch(c)
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   537
            {
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   538
                // flag indicating if a player is ready to start a game
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   539
                case 'r':
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   540
                    if(inRoom)
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   541
                        foreach (const QString & nick, nicks)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   542
                        {
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   543
                            if (nick == mynick)
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   544
                            {
8983
a25e18295959 Restore ready toggle for room admins (issue 432)
unc0rr
parents: 8891
diff changeset
   545
                                emit setMyReadyStatus(setFlag);
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   546
                            }
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   547
                            m_playersModel->setFlag(nick, PlayersListModel::Ready, setFlag);
6539
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   548
                        }
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   549
                        break;
6539
3222bb0612ca GCI task: idea
kragniz
parents: 6513
diff changeset
   550
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   551
                // flag indicating if a player is a registered user
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   552
                case 'u':
7727
bd252cacabe8 Bring icons back
unc0rr
parents: 7725
diff changeset
   553
                        foreach(const QString & nick, nicks)
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   554
                            m_playersModel->setFlag(nick, PlayersListModel::Registered, setFlag);
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   555
                        break;
9503
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   556
                // flag indicating if a player is in room
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   557
                case 'i':
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   558
                        foreach(const QString & nick, nicks)
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   559
                            m_playersModel->setFlag(nick, PlayersListModel::InRoom, setFlag);
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   560
                        break;
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   561
                // flag indicating if a player is contributor
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   562
                case 'c':
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   563
                        foreach(const QString & nick, nicks)
10144
b9d5a91605c7 Fix issue 780 (copy-paste fail)
unc0rr
parents: 10108
diff changeset
   564
                            m_playersModel->setFlag(nick, PlayersListModel::Contributor, setFlag);
9503
8f9b04138456 Icons for 'i' and 'c' flags
unc0rr
parents: 9080
diff changeset
   565
                        break;
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   566
                // flag indicating if a player has engine running
7765
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   567
                case 'g':
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   568
                    if(inRoom)
7765
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   569
                        foreach(const QString & nick, nicks)
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   570
                            m_playersModel->setFlag(nick, PlayersListModel::InGame, setFlag);
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   571
                        break;
1e162c1d6dc7 'In game' client flag, both server and frontend support
unc0rr
parents: 7744
diff changeset
   572
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   573
                // flag indicating if a player is the host/master of the room
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   574
                case 'h':
8021
095d5ff3d39b Don't accept in-room flags when not in room
unc0rr
parents: 7834
diff changeset
   575
                    if(inRoom)
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   576
                        foreach (const QString & nick, nicks)
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   577
                        {
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   578
                            if (nick == mynick)
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   579
                            {
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   580
                                isChief = setFlag;
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   581
                                emit roomMaster(isChief);
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   582
                            }
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   583
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   584
                            m_playersModel->setFlag(nick, PlayersListModel::RoomAdmin, setFlag);
7684
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   585
                        }
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   586
                        break;
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   587
db140521d102 recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
sheepluva
parents: 7683
diff changeset
   588
                // flag indicating if a player is admin (if so -> worship them!)
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   589
                case 'a':
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   590
                        foreach (const QString & nick, nicks)
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   591
                        {
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   592
                            if (nick == mynick)
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   593
                                emit adminAccess(setFlag);
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   594
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
   595
                            m_playersModel->setFlag(nick, PlayersListModel::ServerAdmin, setFlag);
7683
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   596
                        }
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   597
                        break;
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   598
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   599
                default:
993337e5021f client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
sheepluva
parents: 7545
diff changeset
   600
                        qWarning() << "Net: Unknown client-flag: " << c;
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   601
            }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   602
        }
4917
8ff92bdc9f98 Convert READY and NOT_READY messages to CLIENT_FLAGS message
unc0rr
parents: 4908
diff changeset
   603
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   604
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   605
    }
1405
ee4b28a1861d Show players ready status in chat nick list
unc0rr
parents: 1404
diff changeset
   606
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   607
    if(lst[0] == "KICKED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   608
    {
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   609
        netClientState = InLobby;
6513
677b96d13e1f Auto refresh room list after leaving room. Fixes issue #320 for voluntarily and involuntarily coming to room list.
blackmetalowiec
parents: 6222
diff changeset
   610
        askRoomsList();
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   611
        emit LeftRoom(tr("You got kicked"));
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   612
        m_playersModel->resetRoomFlags();
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   613
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   614
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   615
    }
1879
bb114339eb4e Implement kick from room
unc0rr
parents: 1878
diff changeset
   616
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   617
    if(lst[0] == "LOBBY:JOINED")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   618
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   619
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   620
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   621
            qWarning("Net: Bad JOINED message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   622
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   623
        }
2377
f3fab2b09e0c And in frontend
nemo
parents: 2356
diff changeset
   624
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   625
        for(int i = 1; i < lst.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   626
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   627
            if (lst[i] == mynick)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   628
            {
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   629
                // check if server is authenticated or no authentication was performed at all
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   630
                if(!m_serverHash.isEmpty())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   631
                {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   632
                    Error(tr("Server authentication error"));
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   633
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   634
                    Disconnect();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   635
                }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   636
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   637
                netClientState = InLobby;
11463
fe46826de291 Don't send LIST command on join
unc0rr
parents: 11461
diff changeset
   638
                //RawSendNet(QString("LIST")); //deprecated
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
   639
                emit connected();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   640
            }
1838
00a5fc50aa43 Use another event to change state from 'logging in' to 'lobby'
unc0rr
parents: 1829
diff changeset
   641
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   642
            m_playersModel->addPlayer(lst[i], false);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   643
        }
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   644
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   645
    }
1566
6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents: 1560
diff changeset
   646
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   647
    if(lst[0] == "ROOM" && lst.size() == 11 && lst[1] == "ADD")
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   648
    {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   649
        QStringList tmp = lst;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   650
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   651
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   652
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   653
        m_roomsListModel->addRoom(tmp);
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   654
        return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   655
    }
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   656
9702
27006953d901 - Column for script in rooms list
unc0rr
parents: 9549
diff changeset
   657
    if(lst[0] == "ROOM" && lst.size() == 12 && lst[1] == "UPD")
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   658
    {
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   659
        QStringList tmp = lst;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   660
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   661
        tmp.removeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   662
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   663
        QString roomName = tmp.takeFirst();
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   664
        m_roomsListModel->updateRoom(roomName, tmp);
7710
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents: 7684
diff changeset
   665
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   666
        // keep track of room name so correct name is displayed
9906
93c16a4b0c6a Only emit roomNameUpdated when it actually is changed
unc0rr
parents: 9730
diff changeset
   667
        if(myroom == roomName && myroom != tmp[1])
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   668
        {
7712
unc0rr
parents: 7710
diff changeset
   669
            myroom = tmp[1];
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   670
            emit roomNameUpdated(myroom);
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   671
        }
7710
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents: 7684
diff changeset
   672
6733
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   673
        return;
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   674
    }
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   675
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   676
    if(lst[0] == "ROOM" && lst.size() == 3 && lst[1] == "DEL")
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   677
    {
5abbc345a82f Handle ROOM* commands in rooms list model
unc0rr
parents: 6732
diff changeset
   678
        m_roomsListModel->removeRoom(lst[2]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   679
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   680
    }
1591
1db9b654f880 Notify lobby when a room is created or deleted
unc0rr
parents: 1587
diff changeset
   681
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   682
    if(lst[0] == "LOBBY:LEFT")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   683
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   684
        if(lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   685
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   686
            qWarning("Net: Bad LOBBY:LEFT message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   687
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   688
        }
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
   689
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   690
        if (lst.size() < 3)
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   691
            m_playersModel->removePlayer(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   692
        else
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   693
            m_playersModel->removePlayer(lst[1], lst[2]);
7725
4ad05a478c6c Further work on moving to players list model
unc0rr
parents: 7723
diff changeset
   694
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   695
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   696
    }
1566
6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents: 1560
diff changeset
   697
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   698
    if (lst[0] == "ASKPASSWORD")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   699
    {
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   700
        // server should send us salt of at least 16 characters
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   701
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   702
        if(lst.size() < 2 || lst[1].size() < 16)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   703
        {
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   704
            qWarning("Net: Bad ASKPASSWORD message");
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   705
            return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   706
        }
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   707
8291
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8157
diff changeset
   708
        emit NickRegistered(mynick);
8299
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents: 8291
diff changeset
   709
        m_nick_registered = true;
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   710
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   711
        // store server salt
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   712
        // when this variable is set, it is assumed that server asked us for a password
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   713
        m_serverSalt = lst[1];
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   714
        m_clientSalt = QUuid::createUuid().toString();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   715
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   716
        maybeSendPassword();
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
   717
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   718
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   719
    }
1841
fba7210b438b Retrieve client password from web database and ask for it
unc0rr
parents: 1838
diff changeset
   720
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   721
    if (lst[0] == "NOTICE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   722
    {
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   723
        if(lst.size() < 2)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   724
        {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   725
            qWarning("Net: Bad NOTICE message");
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   726
            return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   727
        }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   728
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   729
        bool ok;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   730
        int n = lst[1].toInt(&ok);
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   731
        if(!ok)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   732
        {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   733
            qWarning("Net: Bad NOTICE message");
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   734
            return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   735
        }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   736
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   737
        handleNotice(n);
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   738
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   739
        return;
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   740
    }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
   741
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   742
    if (lst[0] == "BYE")
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   743
    {
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   744
        if (lst.size() < 2)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   745
        {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   746
            qWarning("Net: Bad BYE message");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   747
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   748
        }
5861
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   749
        if (lst[1] == "Authentication failed")
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   750
        {
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   751
            emit AuthFailed();
8401
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   752
            m_game_connected = false;
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   753
            Disconnect();
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   754
            //omitted 'emit disconnected()', we don't want the error message
87410ae372f6 Server messages localization using Qt's l10n subsystem:
unc0rr
parents: 8396
diff changeset
   755
            return;
5861
b102aa6a853e fix for disconnect reason not being shown
sheepluva
parents: 5390
diff changeset
   756
        }
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   757
        m_game_connected = false;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
   758
        Disconnect();
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   759
        emit disconnected(HWApplication::translate("server", lst[1].toLatin1().constData()));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   760
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   761
    }
1512
43742041c211 - Don't send 'Bad param' msg, as the only reason of it is just some lag
unc0rr
parents: 1475
diff changeset
   762
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   763
    if(lst[0] == "JOINING")
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   764
    {
9730
20dca3377887 Fix erroneous message in console debug
unc0rr
parents: 9702
diff changeset
   765
        if(lst.size() != 2)
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   766
        {
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   767
            qWarning("Net: Bad JOINING message");
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   768
            return;
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   769
        }
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   770
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   771
        myroom = lst[1];
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   772
        emit roomNameUpdated(myroom);
9730
20dca3377887 Fix erroneous message in console debug
unc0rr
parents: 9702
diff changeset
   773
        return;
8489
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   774
    }
25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents: 8436
diff changeset
   775
7535
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   776
    if(netClientState == InLobby && lst[0] == "JOINED")
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   777
    {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   778
        if(lst.size() < 2 || lst[1] != mynick)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   779
        {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   780
            qWarning("Net: Bad JOINED message");
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   781
            return;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   782
        }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   783
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   784
        for(int i = 1; i < lst.size(); ++i)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   785
        {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   786
            if (lst[i] == mynick)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   787
            {
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   788
                netClientState = InRoom;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   789
                emit EnteredGame();
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   790
                emit roomMaster(isChief);
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   791
                if (isChief)
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   792
                    emit configAsked();
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   793
            }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   794
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   795
            m_playersModel->playerJoinedRoom(lst[i], isChief && (lst[i] != mynick));
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   796
7535
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   797
            emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   798
        }
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   799
        return;
87e5838103ff Allow JOINED message in lobby
unc0rr
parents: 7526
diff changeset
   800
    }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   801
14924
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   802
    if(netClientState == InLobby && lst[0] == "REPLAY_START")
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   803
    {
14927
8b5d06749026 Remove unused REPLAY_START cruft from frontend
Wuzzy <Wuzzy2@mail.ru>
parents: 14924
diff changeset
   804
        netClientState = InRoom;
8b5d06749026 Remove unused REPLAY_START cruft from frontend
Wuzzy <Wuzzy2@mail.ru>
parents: 14924
diff changeset
   805
        m_demo_data_pending = true;
8b5d06749026 Remove unused REPLAY_START cruft from frontend
Wuzzy <Wuzzy2@mail.ru>
parents: 14924
diff changeset
   806
        emit EnteredGame();
8b5d06749026 Remove unused REPLAY_START cruft from frontend
Wuzzy <Wuzzy2@mail.ru>
parents: 14924
diff changeset
   807
        emit roomMaster(false);
14924
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   808
        return;
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   809
    }
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   810
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   811
    if(netClientState == InRoom || netClientState == InGame || netClientState == InDemo)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   812
    {
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   813
        if (lst[0] == "EM")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   814
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   815
            if(lst.size() < 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   816
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   817
                qWarning("Net: Bad EM message");
14924
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   818
                m_demo_data_pending = false;
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   819
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   820
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   821
            for(int i = 1; i < lst.size(); ++i)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   822
            {
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
   823
                QByteArray em = QByteArray::fromBase64(lst[i].toLatin1());
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   824
                emit FromNet(em);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   825
            }
14924
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   826
            m_demo_data_pending = false;
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   827
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   828
        }
14924
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   829
    }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   830
14924
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   831
    if(netClientState == InRoom || netClientState == InGame)
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   832
    {
8303
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   833
        if (lst[0] == "ROUND_FINISHED")
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   834
        {
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   835
            emit FromNet(QByteArray("\x01o"));
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   836
            return;
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   837
        }
6331bceac95c Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr
parents: 8299
diff changeset
   838
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   839
        if (lst[0] == "ADD_TEAM")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   840
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   841
            if(lst.size() != 24)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   842
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   843
                qWarning("Net: Bad ADDTEAM message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   844
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   845
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   846
            QStringList tmp = lst;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   847
            tmp.removeFirst();
10400
47e2189eae44 This should make frontend aware of your own teams in game on rejoin
unc0rr
parents: 10248
diff changeset
   848
            HWTeam team(tmp);
47e2189eae44 This should make frontend aware of your own teams in game on rejoin
unc0rr
parents: 10248
diff changeset
   849
            emit AddNetTeam(team);
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   850
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   851
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   852
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   853
        if (lst[0] == "REMOVE_TEAM")
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   854
        {
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   855
            if(lst.size() != 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   856
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   857
                qWarning("Net: Bad REMOVETEAM message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   858
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   859
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   860
            emit RemoveNetTeam(HWTeam(lst[1]));
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   861
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   862
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   863
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   864
        if(lst[0] == "ROOMABANDONED")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   865
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   866
            netClientState = InLobby;
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
   867
            m_playersModel->resetRoomFlags();
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   868
            emit LeftRoom(tr("Room destroyed"));
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   869
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   870
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   871
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   872
        if (lst[0] == "RUN_GAME")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   873
        {
14924
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   874
            if(m_demo_data_pending)
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   875
            {
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   876
                netClientState = InDemo;
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   877
                emit AskForOfficialServerDemo();
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   878
            }
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   879
            else
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   880
            {
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   881
                netClientState = InGame;
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   882
                emit AskForRunGame();
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
   883
            }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   884
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   885
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   886
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   887
        if (lst[0] == "TEAM_ACCEPTED")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   888
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   889
            if (lst.size() != 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   890
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   891
                qWarning("Net: Bad TEAM_ACCEPTED message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   892
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   893
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   894
            emit TeamAccepted(lst[1]);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   895
            return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   896
        }
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   897
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   898
        if (lst[0] == "CFG")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   899
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   900
            if(lst.size() < 3)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   901
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   902
                qWarning("Net: Bad CFG message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   903
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   904
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   905
            QStringList tmp = lst;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   906
            tmp.removeFirst();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   907
            tmp.removeFirst();
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   908
            if (lst[1] == "SCHEME")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   909
                emit netSchemeConfig(tmp);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   910
            else
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   911
                emit paramChanged(lst[1], tmp);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   912
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   913
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   914
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   915
        if (lst[0] == "HH_NUM")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   916
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   917
            if (lst.size() != 3)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   918
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   919
                qWarning("Net: Bad TEAM_ACCEPTED message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   920
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   921
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   922
            HWTeam tmptm(lst[1]);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   923
            tmptm.setNumHedgehogs(lst[2].toUInt());
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   924
            emit hhnumChanged(tmptm);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   925
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   926
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   927
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   928
        if (lst[0] == "TEAM_COLOR")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   929
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   930
            if (lst.size() != 3)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   931
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   932
                qWarning("Net: Bad TEAM_COLOR message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   933
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   934
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   935
            HWTeam tmptm(lst[1]);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   936
            tmptm.setColor(lst[2].toInt());
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   937
            emit teamColorChanged(tmptm);
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   938
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   939
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   940
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   941
        if(lst[0] == "JOINED")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   942
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   943
            if(lst.size() < 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   944
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   945
                qWarning("Net: Bad JOINED message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   946
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   947
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   948
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   949
            for(int i = 1; i < lst.size(); ++i)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   950
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   951
                emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   952
                m_playersModel->playerJoinedRoom(lst[i], isChief && (lst[i] != mynick));
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   953
            }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   954
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   955
        }
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   956
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   957
        if(lst[0] == "LEFT")
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   958
        {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   959
            if(lst.size() < 2)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   960
            {
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   961
                qWarning("Net: Bad LEFT message");
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   962
                return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   963
            }
8891
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem
unc0rr
parents: 8765
diff changeset
   964
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   965
            if (lst.size() < 3)
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   966
                emit chatStringFromNet(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   967
            else
13673
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
   968
            {
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
   969
                QString leaveMsg = QString(lst[2]);
13867
d8e606cf8ff5 Simplify /quit chat command
Wuzzy <Wuzzy2@mail.ru>
parents: 13695
diff changeset
   970
                emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1]).arg(HWApplication::translate("server", leaveMsg.toLatin1().constData())));
13673
1aa5e884326a Fix some string/translation inconsistencies in strings related to leaving
Wuzzy <Wuzzy2@mail.ru>
parents: 13658
diff changeset
   971
            }
7731
262228c64f15 Room players list
unc0rr
parents: 7728
diff changeset
   972
            m_playersModel->playerLeftRoom(lst[1]);
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   973
            return;
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   974
        }
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   975
    }
2340
3b35fd5f67c7 Fix a bug when you are unable to do anything in lobby when room is closed during round
unc0rr
parents: 2335
diff changeset
   976
7526
ff3a05e29ddd Don't accept room messages when not in room state. Not tested even if it builds.
unc0rr
parents: 7130
diff changeset
   977
    qWarning() << "Net: Unknown message or wrong state:" << lst;
315
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   978
}
73003488240b client/server net pre-alpha
displacer
parents:
diff changeset
   979
352
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   980
void HWNewNet::onHedgehogsNumChanged(const HWTeam& team)
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   981
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   982
    if (isChief)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   983
        RawSendNet(QString("HH_NUM%1%2%1%3")
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   984
                   .arg(delimiter)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   985
                   .arg(team.name())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   986
                   .arg(team.numHedgehogs()));
352
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   987
}
4665bfe25470 first buggy hedgehogs num net change
displacer
parents: 349
diff changeset
   988
372
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   989
void HWNewNet::onTeamColorChanged(const HWTeam& team)
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   990
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
   991
    if (isChief)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   992
        RawSendNet(QString("TEAM_COLOR%1%2%1%3")
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
   993
                   .arg(delimiter)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
   994
                   .arg(team.name())
7130
fcab1fd02bc6 - Allow switching colors with mouse wheel
unc0rr
parents: 6952
diff changeset
   995
                   .arg(team.color()));
372
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   996
}
4bac77f8cd38 network colors (alpha)
displacer
parents: 362
diff changeset
   997
1873
815a3ff1fe4b Start refactoring some things. Frontend becomes temporarily unusable for network game
unc0rr
parents: 1866
diff changeset
   998
void HWNewNet::onParamChanged(const QString & param, const QStringList & value)
1782
e7589e37a6d6 Options for bonus box probability tuning and number of turn until sudden death
unc0rr
parents: 1742
diff changeset
   999
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1000
    if (isChief)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1001
        RawSendNet(
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1002
            QString("CFG%1%2%1%3")
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1003
            .arg(delimiter)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1004
            .arg(param)
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1005
            .arg(value.join(QString(delimiter)))
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1006
        );
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1793
diff changeset
  1007
}
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1793
diff changeset
  1008
8765
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
  1009
void HWNewNet::chatLineToNetWithEcho(const QString& str)
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
  1010
{
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
  1011
    if(str != "")
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
  1012
    {
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
  1013
        emit chatStringFromNet(HWProto::formatChatMsg(mynick, str));
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
  1014
        chatLineToNet(str);
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
  1015
    }
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
  1016
}
688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents: 8762
diff changeset
  1017
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
  1018
void HWNewNet::chatLineToNet(const QString& str)
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
  1019
{
13322
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
  1020
    if(ByteLength(str))
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1021
    {
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1022
        RawSendNet(QString("CHAT") + delimiter + str);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1023
        QString action = HWProto::chatStringToAction(str);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1024
        if (action != NULL)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1025
            emit(roomChatAction(mynick, action));
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1026
        else
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1027
            emit(roomChatMessage(mynick, str));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1028
    }
1568
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
  1029
}
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
  1030
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
  1031
void HWNewNet::chatLineToLobby(const QString& str)
15a446307993 Lobby chat should work now
unc0rr
parents: 1566
diff changeset
  1032
{
13322
b77a9380dd0f QT for some reason messes with XCompose causing broken input (Qt 5 only - Qt 4 did not break anything). In Qt 5.2 and 5.3 this was causing an invalid conversion in chat messages containing these resulting in the bad bytes being stripped. In Qt 5.9 it is still broken, but you at least get a string with something in it. This checks for non-zero converted strings for room creation and chat lines.
nemo
parents: 12897
diff changeset
  1033
    if(ByteLength(str))
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1034
    {
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1035
        RawSendNet(QString("CHAT") + delimiter + str);
8759
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1036
        QString action = HWProto::chatStringToAction(str);
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1037
        if (action != NULL)
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1038
            emit(lobbyChatAction(mynick, action));
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1039
        else
1a4b9b9fe2b0 add lobby chat features to room chat
sheepluva
parents: 8720
diff changeset
  1040
            emit(lobbyChatMessage(mynick, str));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1041
    }
453
4b1236759402 simple net cha added
displacer
parents: 448
diff changeset
  1042
}
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
  1043
2403
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
  1044
void HWNewNet::SendTeamMessage(const QString& str)
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
  1045
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1046
    RawSendNet(QString("TEAMCHAT") + delimiter + str);
2403
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
  1047
}
6c5d504af2ba - Proper /team command implementation
unc0rr
parents: 2396
diff changeset
  1048
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
  1049
void HWNewNet::askRoomsList()
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
  1050
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
  1051
    if(netClientState != InLobby)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1052
    {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1053
        qWarning("Illegal try to get rooms list!");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1054
        return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1055
    }
11463
fe46826de291 Don't send LIST command on join
unc0rr
parents: 11461
diff changeset
  1056
    //RawSendNet(QString("LIST")); //deprecated
1315
c2f09811bb8c Implement rooms list refresh
unc0rr
parents: 1313
diff changeset
  1057
}
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
  1058
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
  1059
HWNewNet::ClientState HWNewNet::clientState()
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1060
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1061
    return netClientState;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1062
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1063
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1064
QString HWNewNet::getNick()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1065
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1066
    return mynick;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1067
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1068
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1069
QString HWNewNet::getRoom()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1070
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1071
    return myroom;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1072
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1073
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1074
QString HWNewNet::getHost()
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1075
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1076
    return myhost;
2821
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1077
}
67815ee123d7 Frontend:
smxx
parents: 2777
diff changeset
  1078
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
  1079
bool HWNewNet::isRoomChief()
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
  1080
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1081
    return isChief;
1339
8a11157c6c81 Fix the bug
unc0rr
parents: 1338
diff changeset
  1082
}
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
  1083
4908
99d6797b7ff4 Frontend sends ROUNDFINISHED with information about whether the round was played till end (will be needed for stats)
unc0rr
parents: 4897
diff changeset
  1084
void HWNewNet::gameFinished(bool correctly)
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
  1085
{
6739
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
  1086
    if (netClientState == InGame)
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
  1087
    {
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
  1088
        netClientState = InRoom;
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1089
        RawSendNet(QString("ROUNDFINISHED%1%2").arg(delimiter).arg(correctly ? "1" : "0"));
6739
97dab041f995 Send ROUND_FINISHED only once (only from in game mode)
unc0rr
parents: 6737
diff changeset
  1090
    }
14924
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
  1091
    else if (netClientState == InDemo)
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
  1092
    {
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
  1093
        netClientState = InLobby;
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
  1094
        askRoomsList();
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
  1095
        emit LeftRoom(QString());
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
  1096
        m_playersModel->resetRoomFlags();
5119203470f3 Teach frontend how to deal with official server replays (/watch)
Wuzzy <Wuzzy2@mail.ru>
parents: 14887
diff changeset
  1097
    }
1344
4004e597f1bf Clients send roundfinished message to server when the round is over
unc0rr
parents: 1339
diff changeset
  1098
}
1378
1a391883261d Allow /me in chat
unc0rr
parents: 1377
diff changeset
  1099
1860
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
  1100
void HWNewNet::banPlayer(const QString & nick)
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
  1101
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1102
    RawSendNet(QString("BAN%1%2").arg(delimiter).arg(nick));
1860
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
  1103
}
ce140b2b928a Some work on players lists context menus
unc0rr
parents: 1856
diff changeset
  1104
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1105
void HWNewNet::banIP(const QString & ip, const QString & reason, int seconds)
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1106
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1107
    RawSendNet(QString("BANIP%1%2%1%3%1%4").arg(delimiter).arg(ip).arg(reason).arg(seconds));
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1108
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1109
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1110
void HWNewNet::banNick(const QString & nick, const QString & reason, int seconds)
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1111
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1112
    RawSendNet(QString("BANNICK%1%2%1%3%1%4").arg(delimiter).arg(nick).arg(reason).arg(seconds));
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1113
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1114
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1115
void HWNewNet::getBanList()
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1116
{
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1117
    RawSendNet(QByteArray("BANLIST"));
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1118
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1119
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1120
void HWNewNet::removeBan(const QString & b)
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1121
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1122
    RawSendNet(QString("UNBAN%1%2").arg(delimiter).arg(b));
8157
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1123
}
695f1eef72c8 Bans manager
unc0rr
parents: 8021
diff changeset
  1124
1391
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
  1125
void HWNewNet::kickPlayer(const QString & nick)
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
  1126
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1127
    RawSendNet(QString("KICK%1%2").arg(delimiter).arg(nick));
1391
735f6d43780b Implement kick
unc0rr
parents: 1385
diff changeset
  1128
}
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1129
11865
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1130
void HWNewNet::delegateToPlayer(const QString & nick)
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1131
{
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1132
    RawSendNet(QString("DELEGATE%1%2").arg(delimiter).arg(nick));
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1133
}
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents: 11463
diff changeset
  1134
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1135
void HWNewNet::infoPlayer(const QString & nick)
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1136
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1137
    RawSendNet(QString("INFO%1%2").arg(delimiter).arg(nick));
1577
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1138
}
e3e37c730dc0 - Decrease font size in chat
unc0rr
parents: 1576
diff changeset
  1139
2706
935b7d618cf0 sheepluva's patch to add a "follow" command to server and frontend, in order to stalk people and join them in their rooms
koda
parents: 2543
diff changeset
  1140
void HWNewNet::followPlayer(const QString & nick)
935b7d618cf0 sheepluva's patch to add a "follow" command to server and frontend, in order to stalk people and join them in their rooms
koda
parents: 2543
diff changeset
  1141
{
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1142
    if (!isInRoom())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6539
diff changeset
  1143
    {
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1144
        RawSendNet(QString("FOLLOW%1%2").arg(delimiter).arg(nick));
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1145
        isChief = false;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1146
    }
2706
935b7d618cf0 sheepluva's patch to add a "follow" command to server and frontend, in order to stalk people and join them in their rooms
koda
parents: 2543
diff changeset
  1147
}
935b7d618cf0 sheepluva's patch to add a "follow" command to server and frontend, in order to stalk people and join them in their rooms
koda
parents: 2543
diff changeset
  1148
8396
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1149
void HWNewNet::consoleCommand(const QString & cmd)
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1150
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1151
    RawSendNet(QString("CMD%1%2").arg(delimiter).arg(cmd));
8396
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1152
}
5123eac2f9d6 - Pass unknown chat commands to server
unc0rr
parents: 8303
diff changeset
  1153
8416
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1154
bool HWNewNet::allPlayersReady()
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1155
{
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1156
    int ready = 0;
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1157
    for (int i = 0; i < m_roomPlayersModel->rowCount(); i++)
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1158
        if (m_roomPlayersModel->index(i, 0).data(PlayersListModel::Ready).toBool()) ready++;
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1159
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1160
    return (ready == m_roomPlayersModel->rowCount());
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1161
}
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents: 8401
diff changeset
  1162
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1163
void HWNewNet::startGame()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1164
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1165
    RawSendNet(QString("START_GAME"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1166
}
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1167
5126
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1168
void HWNewNet::updateRoomName(const QString & name)
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1169
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1170
    RawSendNet(QString("ROOM_NAME%1%2").arg(delimiter).arg(name));
5126
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1171
}
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1172
50803f3403a5 Frontend: room rename
claymore
parents: 4976
diff changeset
  1173
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1174
void HWNewNet::toggleRestrictJoins()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1175
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1176
    RawSendNet(QString("TOGGLE_RESTRICT_JOINS"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1177
}
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1178
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1179
void HWNewNet::toggleRestrictTeamAdds()
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1180
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1181
    RawSendNet(QString("TOGGLE_RESTRICT_TEAMS"));
1410
eece43296890 Send appropriate messages to server on control menu actions
unc0rr
parents: 1405
diff changeset
  1182
}
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1183
8559
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1184
void HWNewNet::toggleRegisteredOnly()
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1185
{
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1186
    RawSendNet(QString("TOGGLE_REGISTERED_ONLY"));
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1187
}
29e420194558 Support 'registered only' room flag in frontend
unc0rr
parents: 8534
diff changeset
  1188
2155
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1189
void HWNewNet::clearAccountsCache()
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1190
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1191
    RawSendNet(QString("CLEAR_ACCOUNTS_CACHE"));
2155
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1192
}
d897222d3339 Implement ability for server admin to clear accounts cache
unc0rr
parents: 2149
diff changeset
  1193
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1194
void HWNewNet::partRoom()
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1195
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
  1196
    netClientState = InLobby;
7732
fad3408fdcc1 Load friends/ignored nicks from file
unc0rr
parents: 7731
diff changeset
  1197
    m_playersModel->resetRoomFlags();
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2821
diff changeset
  1198
    RawSendNet(QString("PART"));
1592
5ee77ee470a6 Start converting network protocol to no-disconnecting religion
unc0rr
parents: 1591
diff changeset
  1199
}
1671
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1200
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1201
bool HWNewNet::isInRoom()
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1202
{
6036
727d13409891 small cleanup: enum instead of magic numbers
sheepluva
parents: 6024
diff changeset
  1203
    return netClientState >= InRoom;
1671
bb12cb688f75 Implement isInRoom in client
unc0rr
parents: 1668
diff changeset
  1204
}
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
  1205
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1206
void HWNewNet::setServerMessageNew(const QString & msg)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1207
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1208
    RawSendNet(QString("SET_SERVER_VAR%1MOTD_NEW%1%2").arg(delimiter).arg(msg));
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1209
}
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1210
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1211
void HWNewNet::setServerMessageOld(const QString & msg)
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
  1212
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1213
    RawSendNet(QString("SET_SERVER_VAR%1MOTD_OLD%1%2").arg(delimiter).arg(msg));
1925
ec923e56c444 Allow admin to set server's motd
unc0rr
parents: 1905
diff changeset
  1214
}
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1215
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1216
void HWNewNet::setLatestProtocolVar(int proto)
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1217
{
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1218
    RawSendNet(QString("SET_SERVER_VAR%1LATEST_PROTO%1%2").arg(delimiter).arg(proto));
3283
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1219
}
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1220
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1221
void HWNewNet::askServerVars()
18ee933a5864 Some stuff for game server administration task
unc0rr
parents: 3246
diff changeset
  1222
{
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3555
diff changeset
  1223
    RawSendNet(QString("GET_SERVER_VAR"));
3343
6289df7747c0 Clarify an ambiguity as to what to do here if your name is already taken.
nemo
parents: 3283
diff changeset
  1224
}
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1225
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1226
void HWNewNet::handleNotice(int n)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1227
{
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1228
    switch(n)
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1229
    {
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1230
        case 0:
5998
e8f44e9433f0 many many netclient/frondent changes (just the beginning though):
sheepluva
parents: 5959
diff changeset
  1231
            emit NickTaken(mynick);
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1232
            break;
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1233
        case 2:
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1234
            emit askForRoomPassword();
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1235
            break;
4879
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1236
    }
55f939e2c19c Ask for another nickname on collision. Works only with new server.
unc0rr
parents: 4535
diff changeset
  1237
}
6732
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1238
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1239
RoomsListModel * HWNewNet::roomsListModel()
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1240
{
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1241
    return m_roomsListModel;
c906dc78091f Start switching to rooms list model. To be continued.
unc0rr
parents: 6722
diff changeset
  1242
}
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1243
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
  1244
QAbstractItemModel *HWNewNet::lobbyPlayersModel()
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1245
{
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1246
    return m_lobbyPlayersModel;
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1247
}
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1248
7728
664738870325 Bring back sorting
unc0rr
parents: 7727
diff changeset
  1249
QAbstractItemModel *HWNewNet::roomPlayersModel()
7723
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1250
{
ca05b576ec74 Start moving to players list model.
unc0rr
parents: 7712
diff changeset
  1251
    return m_roomPlayersModel;
8436
b89aacebb9db - Also pass unknown cmds to the server when in room
unc0rr
parents: 8416
diff changeset
  1252
}
9549
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1253
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1254
void HWNewNet::roomPasswordEntered(const QString &password)
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1255
{
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1256
    if(!myroom.isEmpty())
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1257
        JoinRoom(myroom, password);
ac5c1f691ce2 Allow user to enter password for the room he joins
unc0rr
parents: 9541
diff changeset
  1258
}
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1259
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1260
void HWNewNet::maybeSendPassword()
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1261
{
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1262
/* When we got password hash, and server asked us for a password, perform mutual authentication:
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1263
 * at this point we have salt chosen by server
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1264
 * client sends client salt and hash of secret (password hash) salted with client salt, server salt,
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1265
 * and static salt (predefined string + protocol number)
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1266
 * server should respond with hash of the same set in different order.
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1267
 */
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1268
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1269
    if(m_passwordHash.isEmpty() || m_serverSalt.isEmpty())
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1270
        return;
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1271
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
  1272
    QString hash = QCryptographicHash::hash(
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1273
                m_clientSalt.toLatin1()
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1274
                .append(m_serverSalt.toLatin1())
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1275
                .append(m_passwordHash)
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1276
                .append(cProtoVer->toLatin1())
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1277
                .append("!hedgewars")
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
  1278
                , QCryptographicHash::Sha1).toHex();
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1279
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1280
    m_serverHash = QCryptographicHash::hash(
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1281
                m_serverSalt.toLatin1()
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1282
                .append(m_clientSalt.toLatin1())
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1283
                .append(m_passwordHash)
12897
fc47fc4af6bd Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents: 11865
diff changeset
  1284
                .append(cProtoVer->toLatin1())
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1285
                .append("!hedgewars")
10076
b235e520ea21 Mutual authentication: server side
unc0rr
parents: 10074
diff changeset
  1286
                , QCryptographicHash::Sha1).toHex();
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1287
10695
e295995348f9 this bugs me every time I look at it
nemo
parents: 10401
diff changeset
  1288
    RawSendNet(QString("PASSWORD%1%2%1%3").arg(delimiter).arg(hash).arg(m_clientSalt));
10074
66cab76eb56f Mutual authentication: client side
unc0rr
parents: 10015
diff changeset
  1289
}