asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove "const" from PacketPeer get_packet/get_var

Browse source 
They are NOT constant methods, as state by the comment message,
they fetch the last packet and then forget about it, actively
changing the state of the object.
This commit is contained in:
Fabio Alessandrelli 2017-12-15 16:05:42 +01:00
parent 72d5ae84b3
commit 92067b4714
8 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/io/packet_peer.cpp
View file

@ -49,7 +49,7 @@ bool PacketPeer::is_object_decoding_allowed() const {
return allow_object_decoding; return allow_object_decoding;
} }
Error PacketPeer::get_packet_buffer(PoolVector<uint8_t> &r_buffer) const { Error PacketPeer::get_packet_buffer(PoolVector<uint8_t> &r_buffer) {
const uint8_t *buffer; const uint8_t *buffer;
int buffer_size; int buffer_size;
@ -78,7 +78,7 @@ Error PacketPeer::put_packet_buffer(const PoolVector<uint8_t> &p_buffer) {
return put_packet(&r[0], len); return put_packet(&r[0], len);
} }
Error PacketPeer::get_var(Variant &r_variant) const { Error PacketPeer::get_var(Variant &r_variant) {
const uint8_t *buffer; const uint8_t *buffer;
int buffer_size; int buffer_size;
@ -107,7 +107,7 @@ Error PacketPeer::put_var(const Variant &p_packet) {
return put_packet(buf, len); return put_packet(buf, len);
} }
Variant PacketPeer::_bnd_get_var() const { Variant PacketPeer::_bnd_get_var() {
Variant var; Variant var;
get_var(var); get_var(var);
@ -117,7 +117,7 @@ Variant PacketPeer::_bnd_get_var() const {
Error PacketPeer::_put_packet(const PoolVector<uint8_t> &p_buffer) { Error PacketPeer::_put_packet(const PoolVector<uint8_t> &p_buffer) {
return put_packet_buffer(p_buffer); return put_packet_buffer(p_buffer);
} }
PoolVector<uint8_t> PacketPeer::_get_packet() const { PoolVector<uint8_t> PacketPeer::_get_packet() {
PoolVector<uint8_t> raw; PoolVector<uint8_t> raw;
last_get_error = get_packet_buffer(raw); last_get_error = get_packet_buffer(raw);
@ -202,7 +202,7 @@ int PacketPeerStream::get_available_packet_count() const {
return count; return count;
} }
Error PacketPeerStream::get_packet(const uint8_t **r_buffer, int &r_buffer_size) const { Error PacketPeerStream::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
ERR_FAIL_COND_V(peer.is_null(), ERR_UNCONFIGURED); ERR_FAIL_COND_V(peer.is_null(), ERR_UNCONFIGURED);
_poll_buffer(); _poll_buffer();

12
core/io/packet_peer.h
View file

@ -37,13 +37,13 @@ class PacketPeer : public Reference {
GDCLASS(PacketPeer, Reference); GDCLASS(PacketPeer, Reference);
Variant _bnd_get_var() const; Variant _bnd_get_var();
void _bnd_put_var(const Variant &p_var); void _bnd_put_var(const Variant &p_var);
static void _bind_methods(); static void _bind_methods();
Error _put_packet(const PoolVector<uint8_t> &p_buffer); Error _put_packet(const PoolVector<uint8_t> &p_buffer);
PoolVector<uint8_t> _get_packet() const; PoolVector<uint8_t> _get_packet();
Error _get_packet_error() const; Error _get_packet_error() const;
mutable Error last_get_error; mutable Error last_get_error;
@ -52,17 +52,17 @@ class PacketPeer : public Reference {
public: public:
virtual int get_available_packet_count() const = 0; virtual int get_available_packet_count() const = 0;
virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) const = 0; ///< buffer is GONE after next get_packet virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) = 0; ///< buffer is GONE after next get_packet
virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) = 0; virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size) = 0;
virtual int get_max_packet_size() const = 0; virtual int get_max_packet_size() const = 0;
/* helpers / binders */ /* helpers / binders */
virtual Error get_packet_buffer(PoolVector<uint8_t> &r_buffer) const; virtual Error get_packet_buffer(PoolVector<uint8_t> &r_buffer);
virtual Error put_packet_buffer(const PoolVector<uint8_t> &p_buffer); virtual Error put_packet_buffer(const PoolVector<uint8_t> &p_buffer);
virtual Error get_var(Variant &r_variant) const; virtual Error get_var(Variant &r_variant);
virtual Error put_var(const Variant &p_packet); virtual Error put_var(const Variant &p_packet);
void set_allow_object_decoding(bool p_enable); void set_allow_object_decoding(bool p_enable);
@ -91,7 +91,7 @@ protected:
public: public:
virtual int get_available_packet_count() const; virtual int get_available_packet_count() const;
virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) const; virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size); virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
virtual int get_max_packet_size() const; virtual int get_max_packet_size() const;

2
drivers/unix/packet_peer_udp_posix.cpp
View file

@ -65,7 +65,7 @@ int PacketPeerUDPPosix::get_available_packet_count() const {
return queue_count; return queue_count;
} }
Error PacketPeerUDPPosix::get_packet(const uint8_t **r_buffer, int &r_buffer_size) const { Error PacketPeerUDPPosix::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
Error err = const_cast<PacketPeerUDPPosix *>(this)->_poll(false); Error err = const_cast<PacketPeerUDPPosix *>(this)->_poll(false);
if (err != OK) if (err != OK)

12
drivers/unix/packet_peer_udp_posix.h
View file

@ -41,12 +41,12 @@ class PacketPeerUDPPosix : public PacketPeerUDP {
PACKET_BUFFER_SIZE = 65536 PACKET_BUFFER_SIZE = 65536
}; };
mutable RingBuffer<uint8_t> rb; RingBuffer<uint8_t> rb;
uint8_t recv_buffer[PACKET_BUFFER_SIZE]; uint8_t recv_buffer[PACKET_BUFFER_SIZE];
mutable uint8_t packet_buffer[PACKET_BUFFER_SIZE]; uint8_t packet_buffer[PACKET_BUFFER_SIZE];
mutable IP_Address packet_ip; IP_Address packet_ip;
mutable int packet_port; int packet_port;
mutable int queue_count; int queue_count;
int sockfd; int sockfd;
bool sock_blocking; bool sock_blocking;
IP::Type sock_type; IP::Type sock_type;
@ -62,7 +62,7 @@ class PacketPeerUDPPosix : public PacketPeerUDP {
public: public:
virtual int get_available_packet_count() const; virtual int get_available_packet_count() const;
virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) const; virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size); virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
virtual int get_max_packet_size() const; virtual int get_max_packet_size() const;

4
modules/enet/networked_multiplayer_enet.cpp
View file

@ -386,7 +386,7 @@ int NetworkedMultiplayerENet::get_available_packet_count() const {
return incoming_packets.size(); return incoming_packets.size();
} }
Error NetworkedMultiplayerENet::get_packet(const uint8_t **r_buffer, int &r_buffer_size) const { Error NetworkedMultiplayerENet::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
ERR_FAIL_COND_V(incoming_packets.size() == 0, ERR_UNAVAILABLE); ERR_FAIL_COND_V(incoming_packets.size() == 0, ERR_UNAVAILABLE);
@ -480,7 +480,7 @@ int NetworkedMultiplayerENet::get_max_packet_size() const {
return 1 << 24; //anything is good return 1 << 24; //anything is good
} }
void NetworkedMultiplayerENet::_pop_current_packet() const { void NetworkedMultiplayerENet::_pop_current_packet() {
if (current_packet.packet) { if (current_packet.packet) {
enet_packet_destroy(current_packet.packet); enet_packet_destroy(current_packet.packet);

8
modules/enet/networked_multiplayer_enet.h
View file

@ -86,12 +86,12 @@ private:
CompressionMode compression_mode; CompressionMode compression_mode;
mutable List<Packet> incoming_packets; List<Packet> incoming_packets;
mutable Packet current_packet; Packet current_packet;
uint32_t _gen_unique_id() const; uint32_t _gen_unique_id() const;
void _pop_current_packet() const; void _pop_current_packet();
Vector<uint8_t> src_compressor_mem; Vector<uint8_t> src_compressor_mem;
Vector<uint8_t> dst_compressor_mem; Vector<uint8_t> dst_compressor_mem;
@ -123,7 +123,7 @@ public:
virtual bool is_server() const; virtual bool is_server() const;
virtual int get_available_packet_count() const; virtual int get_available_packet_count() const;
virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) const; ///< buffer is GONE after next get_packet virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size); ///< buffer is GONE after next get_packet
virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size); virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
virtual int get_max_packet_size() const; virtual int get_max_packet_size() const;

2
platform/windows/packet_peer_udp_winsock.cpp
View file

@ -43,7 +43,7 @@ int PacketPeerUDPWinsock::get_available_packet_count() const {
return queue_count; return queue_count;
} }
Error PacketPeerUDPWinsock::get_packet(const uint8_t **r_buffer, int &r_buffer_size) const { Error PacketPeerUDPWinsock::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
Error err = const_cast<PacketPeerUDPWinsock *>(this)->_poll(false); Error err = const_cast<PacketPeerUDPWinsock *>(this)->_poll(false);
if (err != OK) if (err != OK)

12
platform/windows/packet_peer_udp_winsock.h
View file

@ -39,12 +39,12 @@ class PacketPeerUDPWinsock : public PacketPeerUDP {
PACKET_BUFFER_SIZE = 65536 PACKET_BUFFER_SIZE = 65536
}; };
mutable RingBuffer<uint8_t> rb; RingBuffer<uint8_t> rb;
uint8_t recv_buffer[PACKET_BUFFER_SIZE]; uint8_t recv_buffer[PACKET_BUFFER_SIZE];
mutable uint8_t packet_buffer[PACKET_BUFFER_SIZE]; uint8_t packet_buffer[PACKET_BUFFER_SIZE];
mutable IP_Address packet_ip; IP_Address packet_ip;
mutable int packet_port; int packet_port;
mutable int queue_count; int queue_count;
int sockfd; int sockfd;
bool sock_blocking; bool sock_blocking;
IP::Type sock_type; IP::Type sock_type;
@ -62,7 +62,7 @@ class PacketPeerUDPWinsock : public PacketPeerUDP {
public: public:
virtual int get_available_packet_count() const; virtual int get_available_packet_count() const;
virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size) const; virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size);
virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size); virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
virtual int get_max_packet_size() const; virtual int get_max_packet_size() const;