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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2016-06-06 12:19:01 +02:00
commit 326061ca18
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/socket.cpp
View file

@ -423,12 +423,12 @@ unsigned int Socket::Connection::connTime() {
} }
/// Returns total amount of bytes sent. /// Returns total amount of bytes sent.
unsigned int Socket::Connection::dataUp() { uint64_t Socket::Connection::dataUp() {
return up; return up;
} }
/// Returns total amount of bytes received. /// Returns total amount of bytes received.
unsigned int Socket::Connection::dataDown() { uint64_t Socket::Connection::dataDown() {
return down; return down;
} }

8
lib/socket.h
View file

@ -49,8 +49,8 @@ namespace Socket {
int sock; ///< Internally saved socket number. int sock; ///< Internally saved socket number.
int pipes[2]; ///< Internally saved file descriptors for pipe socket simulation. int pipes[2]; ///< Internally saved file descriptors for pipe socket simulation.
std::string remotehost; ///< Stores remote host address. std::string remotehost; ///< Stores remote host address.
unsigned int up; uint64_t up;
unsigned int down; uint64_t down;
long long int conntime; long long int conntime;
Buffer downbuffer; ///< Stores temporary data coming in. Buffer downbuffer; ///< Stores temporary data coming in.
int iread(void * buffer, int len, int flags = 0); ///< Incremental read call. int iread(void * buffer, int len, int flags = 0); ///< Incremental read call.
@ -88,8 +88,8 @@ namespace Socket {
void SendNow(const char * data, size_t len); ///< Will not buffer anything but always send right away. Blocks. void SendNow(const char * data, size_t len); ///< Will not buffer anything but always send right away. Blocks.
//stats related methods //stats related methods
unsigned int connTime();///< Returns the time this socket has been connected. unsigned int connTime();///< Returns the time this socket has been connected.
unsigned int dataUp(); ///< Returns total amount of bytes sent. uint64_t dataUp(); ///< Returns total amount of bytes sent.
unsigned int dataDown(); ///< Returns total amount of bytes received. uint64_t dataDown(); ///< Returns total amount of bytes received.
std::string getStats(std::string C); ///< Returns a std::string of stats, ended by a newline. std::string getStats(std::string C); ///< Returns a std::string of stats, ended by a newline.
friend class Server; friend class Server;
bool Error; ///< Set to true if a socket error happened. bool Error; ///< Set to true if a socket error happened.

2
src/output/output.cpp
View file

@ -229,7 +229,7 @@ namespace Mist {
void Output::reconnect(){ void Output::reconnect(){
thisPacket.null(); thisPacket.null();
if (!Util::startInput(streamName)){ if (!Util::startInput(streamName)){
FAIL_MSG("Opening stream %s failed - aborting initalization", streamName.c_str()); FAIL_MSG("Opening stream %s failed - aborting initialization", streamName.c_str());
onFail(); onFail();
return; return;
} }