Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-26 03:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various coverity scan fixes for networking

Browse source 
Fix FreeBSD websocket compilation error
This commit is contained in:
Fabio Alessandrelli 2018-04-19 23:20:26 +02:00
parent 7d6f210ccb
commit 03bf783f3c
6 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/unix/tcp_server_posix.cpp
View file

@ -91,10 +91,14 @@ Error TCPServerPosix::listen(uint16_t p_port, const IP_Address &p_bind_address)
ERR_FAIL_COND_V(sockfd == -1, FAILED);
#ifndef NO_FCNTL
fcntl(sockfd, F_SETFL, O_NONBLOCK);
if (fcntl(sockfd, F_SETFL, O_NONBLOCK) < 0) {
WARN_PRINT("Error setting socket as non blocking");
}
#else
int bval = 1;
ioctl(sockfd, FIONBIO, &bval);
if (ioctl(sockfd, FIONBIO, &bval) < 0) {
WARN_PRINT("Error setting socket as non blocking");
}
#endif
int reuse = 1;
@ -113,6 +117,7 @@ Error TCPServerPosix::listen(uint16_t p_port, const IP_Address &p_bind_address)
ERR_FAIL_V(FAILED);
};
} else {
close(sockfd);
return ERR_ALREADY_IN_USE;
};
@ -157,10 +162,14 @@ Ref<StreamPeerTCP> TCPServerPosix::take_connection() {
int fd = accept(listen_sockfd, (struct sockaddr *)&their_addr, &size);
ERR_FAIL_COND_V(fd == -1, Ref<StreamPeerTCP>());
#ifndef NO_FCNTL
fcntl(fd, F_SETFL, O_NONBLOCK);
if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) {
WARN_PRINT("Error setting socket as non blocking");
}
#else
int bval = 1;
ioctl(fd, FIONBIO, &bval);
if (ioctl(fd, FIONBIO, &bval) < 0) {
WARN_PRINT("Error setting socket as non blocking");
}
#endif
Ref<StreamPeerTCPPosix> conn = memnew(StreamPeerTCPPosix);