godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
platform/windows/packet_peer_udp_winsock.cpp
View File

@@ -35,19 +35,19 @@
int PacketPeerUDPWinsock::get_available_packet_count() const {
Error err = const_cast<PacketPeerUDPWinsock*>(this)->_poll(false);
if (err!=OK)
Error err = const_cast<PacketPeerUDPWinsock *>(this)->_poll(false);
if (err != OK)
return 0;
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) const {
Error err = const_cast<PacketPeerUDPWinsock*>(this)->_poll(false);
if (err!=OK)
Error err = const_cast<PacketPeerUDPWinsock *>(this)->_poll(false);
if (err != OK)
return err;
if (queue_count==0)
if (queue_count == 0)
return ERR_UNAVAILABLE;
uint32_t size;
@@ -55,26 +55,25 @@ Error PacketPeerUDPWinsock::get_packet(const uint8_t **r_buffer,int &r_buffer_si
rb.read(&type, 1, true);
if (type == IP::TYPE_IPV4) {
uint8_t ip[4];
rb.read(ip,4,true);
rb.read(ip, 4, true);
packet_ip.set_ipv4(ip);
} else {
uint8_t ip[16];
rb.read(ip,16,true);
rb.read(ip, 16, true);
packet_ip.set_ipv6(ip);
};
rb.read((uint8_t*)&packet_port,4,true);
rb.read((uint8_t*)&size,4,true);
rb.read(packet_buffer,size,true);
rb.read((uint8_t *)&packet_port, 4, true);
rb.read((uint8_t *)&size, 4, true);
rb.read(packet_buffer, size, true);
--queue_count;
*r_buffer=packet_buffer;
r_buffer_size=size;
*r_buffer = packet_buffer;
r_buffer_size = size;
return OK;
}
Error PacketPeerUDPWinsock::put_packet(const uint8_t *p_buffer,int p_buffer_size){
Error PacketPeerUDPWinsock::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
int sock = _get_socket();
ERR_FAIL_COND_V( sock == -1, FAILED );
ERR_FAIL_COND_V(sock == -1, FAILED);
struct sockaddr_storage addr;
size_t addr_size = _set_sockaddr(&addr, peer_addr, peer_port, ip_type);
@@ -82,7 +81,7 @@ Error PacketPeerUDPWinsock::put_packet(const uint8_t *p_buffer,int p_buffer_size
errno = 0;
int err;
while ( (err = sendto(sock, (const char*)p_buffer, p_buffer_size, 0, (struct sockaddr*)&addr, addr_size)) != p_buffer_size) {
while ((err = sendto(sock, (const char *)p_buffer, p_buffer_size, 0, (struct sockaddr *)&addr, addr_size)) != p_buffer_size) {
if (WSAGetLastError() != WSAEWOULDBLOCK) {
return FAILED;
@@ -92,21 +91,20 @@ Error PacketPeerUDPWinsock::put_packet(const uint8_t *p_buffer,int p_buffer_size
return OK;
}
int PacketPeerUDPWinsock::get_max_packet_size() const{
int PacketPeerUDPWinsock::get_max_packet_size() const {
return 512; // uhm maybe not
}
void PacketPeerUDPWinsock::_set_blocking(bool p_blocking) {
//am no windows expert
//hope this is the right thing
if (blocking==p_blocking)
if (blocking == p_blocking)
return;
blocking=p_blocking;
unsigned long par = blocking?0:1;
blocking = p_blocking;
unsigned long par = blocking ? 0 : 1;
if (ioctlsocket(sockfd, FIONBIO, &par)) {
perror("setting non-block mode");
//close();
@@ -118,56 +116,53 @@ Error PacketPeerUDPWinsock::listen(int p_port, int p_recv_buffer_size) {
close();
int sock = _get_socket();
if (sock == -1 )
if (sock == -1)
return ERR_CANT_CREATE;
struct sockaddr_storage addr = {0};
struct sockaddr_storage addr = { 0 };
size_t addr_size = _set_listen_sockaddr(&addr, p_port, ip_type, NULL);
if (bind(sock, (struct sockaddr*)&addr, addr_size) == -1 ) {
if (bind(sock, (struct sockaddr *)&addr, addr_size) == -1) {
close();
return ERR_UNAVAILABLE;
}
blocking=true;
blocking = true;
printf("UDP Connection listening on port %i\n", p_port);
rb.resize(nearest_shift(p_recv_buffer_size));
return OK;
}
void PacketPeerUDPWinsock::close(){
void PacketPeerUDPWinsock::close() {
if (sockfd != -1)
::closesocket(sockfd);
sockfd=-1;
sockfd = -1;
rb.resize(8);
queue_count=0;
queue_count = 0;
}
Error PacketPeerUDPWinsock::wait() {
return _poll(true);
}
Error PacketPeerUDPWinsock::_poll(bool p_wait) {
_set_blocking(p_wait);
struct sockaddr_storage from = {0};
struct sockaddr_storage from = { 0 };
int len = sizeof(struct sockaddr_storage);
int ret;
while ( (ret = recvfrom(sockfd, (char*)recv_buffer, MIN((int)sizeof(recv_buffer),MAX(rb.space_left()-12, 0)), 0, (struct sockaddr*)&from, &len)) > 0) {
while ((ret = recvfrom(sockfd, (char *)recv_buffer, MIN((int)sizeof(recv_buffer), MAX(rb.space_left() - 12, 0)), 0, (struct sockaddr *)&from, &len)) > 0) {
uint32_t port = 0;
if (from.ss_family == AF_INET) {
uint8_t type = (uint8_t)IP::TYPE_IPV4;
rb.write(&type, 1);
struct sockaddr_in* sin_from = (struct sockaddr_in*)&from;
rb.write((uint8_t*)&sin_from->sin_addr, 4);
struct sockaddr_in *sin_from = (struct sockaddr_in *)&from;
rb.write((uint8_t *)&sin_from->sin_addr, 4);
port = ntohs(sin_from->sin_port);
} else if (from.ss_family == AF_INET6) {
@@ -175,8 +170,8 @@ Error PacketPeerUDPWinsock::_poll(bool p_wait) {
uint8_t type = (uint8_t)IP::TYPE_IPV6;
rb.write(&type, 1);
struct sockaddr_in6* s6_from = (struct sockaddr_in6*)&from;
rb.write((uint8_t*)&s6_from->sin6_addr, 16);
struct sockaddr_in6 *s6_from = (struct sockaddr_in6 *)&from;
rb.write((uint8_t *)&s6_from->sin6_addr, 16);
port = ntohs(s6_from->sin6_port);
@@ -186,44 +181,39 @@ Error PacketPeerUDPWinsock::_poll(bool p_wait) {
rb.write(&type, 1);
};
rb.write((uint8_t*)&port, 4);
rb.write((uint8_t*)&ret, 4);
rb.write((uint8_t *)&port, 4);
rb.write((uint8_t *)&ret, 4);
rb.write(recv_buffer, ret);
len = sizeof(struct sockaddr_storage);
++queue_count;
};
if (ret == SOCKET_ERROR){
if (ret == SOCKET_ERROR) {
int error = WSAGetLastError();
if (error == WSAEWOULDBLOCK){
if (error == WSAEWOULDBLOCK) {
// Expected when doing non-blocking sockets, retry later.
}
else if (error == WSAECONNRESET){
} else if (error == WSAECONNRESET) {
// If the remote target does not accept messages, this error may occur, but is harmless.
// Once the remote target gets available, this message will disappear for new messages.
}
else
{
} else {
close();
return FAILED;
}
}
if (ret == 0) {
close();
return FAILED;
};
return OK;
}
bool PacketPeerUDPWinsock::is_listening() const{
bool PacketPeerUDPWinsock::is_listening() const {
return sockfd!=-1;
return sockfd != -1;
}
IP_Address PacketPeerUDPWinsock::get_packet_address() const {
@@ -231,7 +221,7 @@ IP_Address PacketPeerUDPWinsock::get_packet_address() const {
return packet_ip;
}
int PacketPeerUDPWinsock::get_packet_port() const{
int PacketPeerUDPWinsock::get_packet_port() const {
return packet_port;
}
@@ -246,11 +236,10 @@ int PacketPeerUDPWinsock::_get_socket() {
return sockfd;
}
void PacketPeerUDPWinsock::set_send_address(const IP_Address &p_address, int p_port) {
void PacketPeerUDPWinsock::set_send_address(const IP_Address& p_address,int p_port) {
peer_addr=p_address;
peer_port=p_port;
peer_addr = p_address;
peer_port = p_port;
}
void PacketPeerUDPWinsock::make_default() {
@@ -258,19 +247,17 @@ void PacketPeerUDPWinsock::make_default() {
PacketPeerUDP::_create = PacketPeerUDPWinsock::_create;
};
PacketPeerUDP* PacketPeerUDPWinsock::_create() {
PacketPeerUDP *PacketPeerUDPWinsock::_create() {
return memnew(PacketPeerUDPWinsock);
};
PacketPeerUDPWinsock::PacketPeerUDPWinsock() {
sockfd=-1;
packet_port=0;
queue_count=0;
peer_port=0;
sockfd = -1;
packet_port = 0;
queue_count = 0;
peer_port = 0;
ip_type = IP::TYPE_ANY;
}