src/proto2/NetworkServer.cc
author saiam
Thu, 20 Nov 2008 22:45:10 +0000
changeset 86 ed31ece6f340
parent 66 1415a2d45686
child 89 825c4613e087
permissions -rw-r--r--
Segfault <3 (mik? oli odotettavaa)
5
617813994ab1 move proto/p2 -> src/proto2
terom
parents:
diff changeset
     1
#include "NetworkServer.hh"
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
     2
#include "Engine.hh"
23
8d802b573cf0 fixed more network code, there's actually a high probability of it working now
terom
parents: 22
diff changeset
     3
#include "Logger.hh"
5
617813994ab1 move proto/p2 -> src/proto2
terom
parents:
diff changeset
     4
14
22e3bfb6720d NetworkServer.cc finally works as intended
terom
parents: 13
diff changeset
     5
#include <cassert>
5
617813994ab1 move proto/p2 -> src/proto2
terom
parents:
diff changeset
     6
21
32c6cc55256a change proto2 network code to use CL_NetSession
terom
parents: 15
diff changeset
     7
NetworkServer::NetworkServer (GameState &state, const std::string &listen_port) : 
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
     8
    NetworkCore(state), pid_pool(0) {
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
     9
    
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    10
    // connect slots
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    11
    slots.connect(netsession.sig_computer_connected(), this, &NetworkServer::on_connect);
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    12
    slots.connect(netsession.sig_computer_disconnected(), this, &NetworkServer::on_disconnect);
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    13
    
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    14
    // and then we listen
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    15
    netsession.start_listen(listen_port);
23
8d802b573cf0 fixed more network code, there's actually a high probability of it working now
terom
parents: 22
diff changeset
    16
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    17
    Engine::log(INFO, "server") << "running, listen_port=" << listen_port;
5
617813994ab1 move proto/p2 -> src/proto2
terom
parents:
diff changeset
    18
}
617813994ab1 move proto/p2 -> src/proto2
terom
parents:
diff changeset
    19
21
32c6cc55256a change proto2 network code to use CL_NetSession
terom
parents: 15
diff changeset
    20
void NetworkServer::on_connect (CL_NetComputer &computer) {
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    21
    // assign a pid
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    22
    uint16_t pid = ++pid_pool;
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    23
    
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    24
    // create the player object (it logs it)
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    25
    NetworkServerPlayer *player = new NetworkServerPlayer(*this, computer, pid);
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    26
    
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    27
    // map computer to it
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    28
    players[computer] = player;
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    29
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    30
    // add to GameState
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    31
    state.newRemotePlayer(player);
5
617813994ab1 move proto/p2 -> src/proto2
terom
parents:
diff changeset
    32
}
617813994ab1 move proto/p2 -> src/proto2
terom
parents:
diff changeset
    33
21
32c6cc55256a change proto2 network code to use CL_NetSession
terom
parents: 15
diff changeset
    34
void NetworkServer::on_disconnect (CL_NetComputer &computer) {
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    35
    NetworkServerPlayer *player = players[computer];
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    36
    
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    37
    // remove from players
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    38
    players.erase(computer);
23
8d802b573cf0 fixed more network code, there's actually a high probability of it working now
terom
parents: 22
diff changeset
    39
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    40
    // remove from state
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    41
    state.removePlayer(player);
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    42
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    43
    // remove from game
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    44
    player->disconnected();
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    45
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    46
    // delete
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    47
    delete player;
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    48
}
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    49
        
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    50
NetworkServerPlayer::NetworkServerPlayer (NetworkServer &server, CL_NetComputer &computer, uint16_t pid) : 
66
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
    51
    RemotePlayer(server.state, Vector(PLAYER_INITIAL_X, PLAYER_INITIAL_Y), true), server(server), computer(computer), obj(&server.netobjs), pid(pid) {
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    52
    
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    53
    // log
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    54
    Engine::log(INFO, "server_player.connected") << "computer=" << computer << ", obj=" << obj;
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    55
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    56
    // messages
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    57
    slots.connect(obj.sig_received_message(NETMSG_CLIENT_MOVE), this, &NetworkServerPlayer::on_move);   
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    58
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    59
    // the initial NETMSG_PLAYER_HELLO
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    60
    CL_NetPacket hello_pkt;
66
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
    61
    writeVector(hello_pkt, position);
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    62
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    63
    obj.send(computer, NETMSG_SERVER_HELLO, hello_pkt, true);
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    64
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    65
    // send other player objects
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    66
    for (std::map<CL_NetComputer, NetworkServerPlayer*>::iterator it = server.players.begin(); it != server.players.end(); it++) {
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    67
        NetworkServerPlayer *player = it->second;
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    68
        CL_NetPacket player_pkt;
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    69
        
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    70
        // player is not in players list yet
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    71
        assert(player != this);
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    72
66
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
    73
        writeVector(player_pkt, player->position);
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    74
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    75
        player->obj.send(computer, NETMSG_PLAYER_INFO, player_pkt, true);
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    76
    }
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    77
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    78
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    79
    // broadcast NETMSG_PLAYER_JOIN to all clients
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    80
    obj.send(server.netsession.get_all(), NETMSG_PLAYER_JOIN, hello_pkt, true);
5
617813994ab1 move proto/p2 -> src/proto2
terom
parents:
diff changeset
    81
}
617813994ab1 move proto/p2 -> src/proto2
terom
parents:
diff changeset
    82
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    83
void NetworkServerPlayer::disconnected (void) {
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    84
    CL_NetPacket pkt;
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    85
    
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    86
    Engine::log(INFO, "server_player.disconnected") << "computer=" << computer << ", obj=" << obj;
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    87
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    88
    obj.send(server.netsession.get_all(), NETMSG_PLAYER_QUIT, pkt, true);
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    89
}
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    90
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
    91
void NetworkServerPlayer::on_move (CL_NetComputer &from, CL_NetPacket &pkt) {
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    92
    // sanity-check
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    93
    if (!(from == computer))
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    94
        return;
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
    95
    
66
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
    96
    Vector impulse_force = readVector(pkt);    
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
    97
    uint16_t impulse_ms = pkt.input.read_uint16();
23
8d802b573cf0 fixed more network code, there's actually a high probability of it working now
terom
parents: 22
diff changeset
    98
66
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
    99
    Engine::log(INFO, "server_player.on_move") << "obj=" << obj << ", old_pos=" << position << ", impulse=" << impulse_force << "@" << impulse_ms << "ms";
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
   100
    
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
   101
    // apply force
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
   102
    applyForce(impulse_force, impulse_ms);
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
   103
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
   104
    // send position update
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
   105
    send_position_update();
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
   106
}
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
   107
        
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
   108
void NetworkServerPlayer::send_position_update (void) {
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
   109
    CL_NetPacket pkt;
66
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
   110
    writeVector(pkt, position);
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
   111
    writeVector(pkt, velocity);
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
   112
66
1415a2d45686 working simple network-physics code
terom
parents: 60
diff changeset
   113
    Engine::log(INFO, "server_player.send_position_update") << "obj=" << obj << " -> " << position << "+" << velocity;
23
8d802b573cf0 fixed more network code, there's actually a high probability of it working now
terom
parents: 22
diff changeset
   114
24
b81cb670e6b2 the great :retab
terom
parents: 23
diff changeset
   115
    obj.send(server.netsession.get_all(), NETMSG_PLAYER_POSITION, pkt, false);
22
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
   116
}
b70d30e1b0fe all the network code is now there, although it doesn't quite work
terom
parents: 21
diff changeset
   117