src/Network/Packet.cc
author Tero Marttila <terom@fixme.fi>
Fri, 16 Jan 2009 22:03:49 +0200
changeset 400 d64bf28c4340
parent 391 59c2499fe7bb
child 425 567144562978
permissions -rw-r--r--
more documentation tweaking, all Network/ files now have a @file comment. Fix Platform.h -> Platform.hh, and Buffer.hh + Packet.cc
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
     1
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
     2
#include <cassert>
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
     3
#include <cstring>
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
     4
186
0738f2949a2b move src/Network% to src/Network/%
terom
parents: 185
diff changeset
     5
#include "Packet.hh"
400
d64bf28c4340 more documentation tweaking, all Network/ files now have a @file comment. Fix Platform.h -> Platform.hh, and Buffer.hh + Packet.cc
Tero Marttila <terom@fixme.fi>
parents: 391
diff changeset
     6
#include "Platform.hh"
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
     7
391
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
     8
#include <zlib.h>
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
     9
365
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
    10
// XXX: assumes that sizeof(float32) == sizeof(int32);
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
    11
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    12
/*
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    13
 * NetworkPacketInput
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    14
 */
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    15
template <typename T> T NetworkPacketInput::read_val (void) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    16
    T val;
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    17
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    18
    // read
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    19
    read(&val, sizeof(T));
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    20
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    21
    // return
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    22
    return val;
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    23
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    24
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    25
uint32_t NetworkPacketInput::read_uint32 (void) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    26
    return ntohl(read_val<uint32_t>());
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    27
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    28
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    29
uint16_t NetworkPacketInput::read_uint16 (void) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    30
    return ntohs(read_val<uint16_t>());
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    31
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    32
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    33
uint8_t NetworkPacketInput::read_uint8 (void) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    34
    return read_val<uint8_t>();
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    35
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    36
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    37
int32_t NetworkPacketInput::read_int32 (void) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    38
    return ntohl(read_val<int32_t>());
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    39
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    40
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    41
int16_t NetworkPacketInput::read_int16 (void) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    42
    return ntohs(read_val<int16_t>());
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    43
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    44
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    45
int8_t NetworkPacketInput::read_int8 (void) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    46
    return read_val<int8_t>();
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    47
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    48
        
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    49
float NetworkPacketInput::read_float32 (void) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    50
    int32_t ival = read_int32();
365
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
    51
    float fval;
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
    52
    
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
    53
    assert(sizeof(ival) == sizeof(fval));
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    54
365
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
    55
    memcpy(&fval, &ival, sizeof(float));
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
    56
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
    57
    return fval;
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    58
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    59
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    60
Vector NetworkPacketInput::read_vector (void) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    61
    float fx = read_float32();
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    62
    float fy = read_float32();
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    63
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    64
    return Vector(fx, fy);
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    65
}
391
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    66
        
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    67
size_t NetworkPacketInput::read_uncompressed (void *buf, size_t len) {
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    68
    // given len
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    69
    unsigned long inflate_size = len;
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    70
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    71
    // read deflate size
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    72
    unsigned long deflate_size = read_uint32();
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    73
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    74
    // pointer to packet data
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    75
    const void *deflate_ptr = read_ptr(deflate_size);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    76
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    77
    // uncompress the rest of the packet data
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    78
    if (uncompress((uint8_t *) buf, &inflate_size, (const uint8_t *) deflate_ptr, deflate_size) != Z_OK)
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    79
        throw Error("uncompress");
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    80
    
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    81
    // return inflated size
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    82
    return inflate_size;
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
    83
}
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    84
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    85
/*
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    86
 * NetworkPacketOutput
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    87
 */
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    88
template <typename T> void NetworkPacketOutput::write_val (const T &val) {
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    89
    // write
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    90
    write(&val, sizeof(T));
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    91
}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    92
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    93
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    94
void NetworkPacketOutput::write_uint32 (uint32_t val) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    95
    write_val<uint32_t>(htonl(val));
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    96
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    97
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
    98
void NetworkPacketOutput::write_uint16 (uint16_t val) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
    99
    write_val<uint16_t>(htons(val));
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   100
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   101
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   102
void NetworkPacketOutput::write_uint8 (uint8_t val) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   103
    write_val<uint8_t>(val);
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   104
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   105
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   106
void NetworkPacketOutput::write_int32 (int32_t val) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   107
    write_val<int32_t>(htonl(val));
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   108
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   109
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   110
void NetworkPacketOutput::write_int16 (int16_t val) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   111
    write_val<int16_t>(htons(val));
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   112
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   113
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   114
void NetworkPacketOutput::write_int8 (int8_t val) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   115
    write_val<int8_t>(val);
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   116
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   117
        
365
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
   118
void NetworkPacketOutput::write_float32 (float fval) {
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
   119
    int32_t ival;
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
   120
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
   121
    assert(sizeof(ival) == sizeof(fval));
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
   122
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
   123
    memcpy(&ival, &fval, sizeof(int32_t));
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
   124
65295dfbbf64 fix optimization-related warnings
terom
parents: 202
diff changeset
   125
    write_int32(ival);
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   126
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   127
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   128
void NetworkPacketOutput::write_vector (const Vector &vec) {
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   129
    write_float32(vec.x);
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   130
    write_float32(vec.y);
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   131
}
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   132
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   133
void NetworkPacketOutput::write_packet (const NetworkPacketBuffer &pkt) {
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   134
    // just write() it
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   135
    write(pkt.get_buf(), pkt.get_data_size());
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   136
}
391
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   137
        
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   138
void NetworkPacketOutput::write_compressed (const void *ptr, uint32_t len) {
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   139
    // full compression buffer size, including header
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   140
    unsigned long deflate_buf_size = write_compressed_size(len);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   141
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   142
    // size of compressed data area after header
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   143
    unsigned long deflate_size = deflate_buf_size - sizeof(uint32_t);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   144
    
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   145
    // packet buffer
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   146
    void *deflate_buf = write_ptr(deflate_buf_size);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   147
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   148
    // compress
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   149
    if (compress((uint8_t *) deflate_buf + sizeof(uint32_t), &deflate_size, (const uint8_t *) ptr, len) != Z_OK)
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   150
       throw Error("compress failed"); 
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   151
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   152
    // write data size
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   153
    *((uint32_t *) deflate_buf) = htonl(deflate_size);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   154
    
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   155
    // adjust final area
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   156
    write_ptr_adjust(deflate_buf_size, sizeof(uint32_t) + deflate_size);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   157
}
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   158
        
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   159
size_t NetworkPacketOutput::write_compressed_size (uint32_t len) {
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   160
    return sizeof(uint32_t) + compressBound(len);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   161
}
185
25becd2cb026 that's not a prototype anymore... at least it shouldn't be
terom
parents:
diff changeset
   162
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   163
/*
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   164
 * NetworkPacketBuffer
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   165
 */
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   166
NetworkPacketBuffer::NetworkPacketBuffer (char *buf_ptr, size_t buf_size, size_t data_size) :
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   167
    buf_ptr(buf_ptr), buf_size(buf_size), data_size(data_size), offset(0) {
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   168
    
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   169
    // nothing
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   170
    if (buf_ptr == NULL)
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   171
        throw NetworkPacketError("buf_ptr may not be NULL");
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   172
}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   173
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   174
void NetworkPacketBuffer::check_write_size (size_t item_size) {
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   175
     if (offset + item_size > buf_size)
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   176
        throw NetworkPacketError("not enough space to write");
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   177
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   178
}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   179
        
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   180
void NetworkPacketBuffer::check_read_size (size_t item_size) {
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   181
    if (offset + item_size > data_size)
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   182
        throw NetworkPacketError("not enough data to read");
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   183
}
387
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   184
       
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   185
const void* NetworkPacketBuffer::read_ptr (size_t len) {
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   186
    // check buffer overflow
391
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   187
    check_read_size(len);
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   188
387
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   189
    // pointer value...
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   190
    const void *ptr = buf_ptr + offset;
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   191
    
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   192
    // update offset
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   193
    offset += len;
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   194
    
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   195
    // return pointer
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   196
    return ptr;
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   197
}
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   198
        
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   199
void* NetworkPacketBuffer::write_ptr (size_t len) {
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   200
    // check buffer overflow
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   201
    check_write_size(len);
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   202
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   203
    // pointer value...
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   204
    void *ptr = buf_ptr + offset;
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   205
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   206
    // update offset and size
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   207
    offset += len;
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   208
    data_size += len;
387
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   209
    
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   210
    // return pointer
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   211
    return ptr;
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   212
}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   213
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   214
void NetworkPacketBuffer::read (void *ptr, size_t len) {
387
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   215
    // get input pointer...
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   216
    const void *input_ptr = read_ptr(len);
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   217
387
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   218
    // copy value out
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   219
    memcpy(ptr, input_ptr, len);
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   220
}
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   221
 
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   222
void NetworkPacketBuffer::write (const void *ptr, size_t len) {
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   223
    // get output pointer...
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   224
    void *output_ptr = write_ptr(len);
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   225
387
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   226
    // copy value in
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   227
    memcpy(output_ptr, ptr, len);
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   228
}
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   229
        
391
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   230
void NetworkPacketBuffer::write_ptr_adjust (size_t buf_len, size_t data_len) {
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   231
    assert(data_len <= buf_len);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   232
    
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   233
    // adjust offset backwards
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   234
    offset -= (buf_len - data_len);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   235
    data_size -= (buf_len - data_len);
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   236
}
59c2499fe7bb add compressed read/write NetworkPacket API and move zlib stuff out of NetworkServer/Client
Tero Marttila <terom@fixme.fi>
parents: 387
diff changeset
   237
387
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   238
size_t NetworkPacketBuffer::tell_remaining (void) {
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   239
    // number of bytes in total - number of bytes read
294ce7ae8140 dirty implementation of compressed terrain array data
terom
parents: 365
diff changeset
   240
    return data_size - offset;
200
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   241
}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   242
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   243
/*
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   244
 * NetworkPacket
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   245
 */
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   246
NetworkPacket::NetworkPacket (void) : 
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   247
    NetworkPacketBuffer(_buf, NETWORK_PACKET_SIZE, 0) 
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   248
{ 
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   249
    
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   250
}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   251
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   252
/*
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   253
 * BigNetworkPacket
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   254
 */
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   255
BigNetworkPacket::BigNetworkPacket (size_t size) :
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   256
    NetworkPacketBuffer((char *) malloc(size), size, 0)
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   257
{
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   258
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   259
}
2dbf40661580 better NetworkBuffer/Packet stuff + some additional Physics+Network stuff + random fixes
terom
parents: 186
diff changeset
   260
202
b3f5d766391e support sending of raw packets
terom
parents: 200
diff changeset
   261
BigNetworkPacket::~BigNetworkPacket (void) {
b3f5d766391e support sending of raw packets
terom
parents: 200
diff changeset
   262
    free(buf_ptr);
b3f5d766391e support sending of raw packets
terom
parents: 200
diff changeset
   263
}
b3f5d766391e support sending of raw packets
terom
parents: 200
diff changeset
   264