hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a few generic socket mistakes and uninitialized memory occurances.

Browse source
This commit is contained in:
Thulinma 2014-04-29 15:33:41 +02:00
parent 8c69afe18a
commit 7f65aec7a0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/socket.cpp
View file

@ -458,9 +458,9 @@ void Socket::Connection::SendNow(const char * data, size_t len){
while (upbuffer.size() > 0 && connected()){ while (upbuffer.size() > 0 && connected()){
iwrite(upbuffer.get()); iwrite(upbuffer.get());
} }
unsigned int i = iwrite(data, len); unsigned int i = iwrite(data, std::min(len, 51200ul));
while (i < len && connected()){ while (i < len && connected()){
i += iwrite(data + i, std::min(len - i, (size_t)51200)); i += iwrite(data + i, std::min(len - i, 51200ul));
} }
if (!bing){setBlocking(false);} if (!bing){setBlocking(false);}
} }
@ -508,7 +508,7 @@ void Socket::Connection::Send(const char * data){
/// This will send the upbuffer (if non-empty) first, then the data. /// This will send the upbuffer (if non-empty) first, then the data.
/// Any data that could not be send will block until it can be send or the connection is severed. /// Any data that could not be send will block until it can be send or the connection is severed.
void Socket::Connection::SendNow(const std::string & data){ void Socket::Connection::SendNow(const std::string & data){
SendNow(data.c_str(), data.size()); SendNow(data.data(), data.size());
} }
/// Appends data to the upbuffer. /// Appends data to the upbuffer.
@ -737,6 +737,7 @@ bool Socket::Server::IPv6bind(int port, std::string hostname, bool nonblock){
fcntl(sock, F_SETFL, flags); fcntl(sock, F_SETFL, flags);
} }
struct sockaddr_in6 addr; struct sockaddr_in6 addr;
memset(&addr, 0, sizeof(addr));
addr.sin6_family = AF_INET6; addr.sin6_family = AF_INET6;
addr.sin6_port = htons(port); //set port addr.sin6_port = htons(port); //set port
if (hostname == "0.0.0.0" || hostname.length() == 0){ if (hostname == "0.0.0.0" || hostname.length() == 0){
@ -784,6 +785,7 @@ bool Socket::Server::IPv4bind(int port, std::string hostname, bool nonblock){
fcntl(sock, F_SETFL, flags); fcntl(sock, F_SETFL, flags);
} }
struct sockaddr_in addr4; struct sockaddr_in addr4;
memset(&addr4, 0, sizeof(addr4));
addr4.sin_family = AF_INET; addr4.sin_family = AF_INET;
addr4.sin_port = htons(port); //set port addr4.sin_port = htons(port); //set port
if (hostname == "0.0.0.0" || hostname.length() == 0){ if (hostname == "0.0.0.0" || hostname.length() == 0){