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

Increased stream name length to 100 bytes

Browse source
This commit is contained in:
Thulinma 2015-03-11 17:25:32 +01:00
parent f3060781a7
commit cfc6d9d6d3
2 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/shared_memory.cpp
View file

@ -563,45 +563,37 @@ namespace IPC {
///\brief Sets the name of the stream this user is viewing ///\brief Sets the name of the stream this user is viewing
void statExchange::streamName(std::string name) { void statExchange::streamName(std::string name) {
memcpy(data + 48, name.c_str(), std::min((int)name.size(), 20)); size_t splitChar = name.find_first_of("+ ");
if (splitChar != std::string::npos){
name[splitChar] = '+';
}
memcpy(data + 48, name.c_str(), std::min((int)name.size(), 100));
} }
///\brief Gets the name of the stream this user is viewing ///\brief Gets the name of the stream this user is viewing
std::string statExchange::streamName() { std::string statExchange::streamName() {
return std::string(data + 48, std::min((int)strlen(data + 48), 20)); return std::string(data + 48, strnlen(data + 48, 100));
} }
///\brief Sets the name of the connector through which this user is viewing ///\brief Sets the name of the connector through which this user is viewing
void statExchange::connector(std::string name) { void statExchange::connector(std::string name) {
memcpy(data + 68, name.c_str(), std::min((int)name.size(), 20)); memcpy(data + 148, name.c_str(), std::min((int)name.size(), 20));
} }
///\brief Gets the name of the connector through which this user is viewing ///\brief Gets the name of the connector through which this user is viewing
std::string statExchange::connector() { std::string statExchange::connector() {
return std::string(data + 68, std::min((int)strlen(data + 68), 20)); return std::string(data + 148, std::min((int)strlen(data + 148), 20));
} }
///\brief Sets checksum field ///\brief Sets checksum field
void statExchange::crc(unsigned int sum) { void statExchange::crc(unsigned int sum) {
htobl(data + 88, sum); htobl(data + 186, sum);
} }
///\brief Gets checksum field ///\brief Gets checksum field
unsigned int statExchange::crc() { unsigned int statExchange::crc() {
unsigned int result; unsigned int result;
btohl(data + 88, result); btohl(data + 186, result);
return result;
}
///\brief Sets PID field
void statExchange::pid(unsigned short id) {
htobs(data + 92, id);
}
///\brief Gets PID field
unsigned short statExchange::pid() {
unsigned short result;
btohs(data + 92, result);
return result; return result;
} }

7
lib/shared_memory.h
View file

@ -10,7 +10,7 @@
#include <semaphore.h> #include <semaphore.h>
#endif #endif
#define STAT_EX_SIZE 94 #define STAT_EX_SIZE 172
#define PLAY_EX_SIZE 32 #define PLAY_EX_SIZE 32
namespace IPC { namespace IPC {
@ -37,8 +37,6 @@ namespace IPC {
std::string connector(); std::string connector();
void crc(unsigned int sum); void crc(unsigned int sum);
unsigned int crc(); unsigned int crc();
void pid(unsigned short id);
unsigned short pid();
private: private:
///\brief The payload for the stat exchange ///\brief The payload for the stat exchange
/// - 8 byte - now (timestamp of last statistics) /// - 8 byte - now (timestamp of last statistics)
@ -47,10 +45,9 @@ namespace IPC {
/// - 8 byte - down (Number of bytes received from peer) /// - 8 byte - down (Number of bytes received from peer)
/// - 8 byte - up (Number of bytes sent to peer) /// - 8 byte - up (Number of bytes sent to peer)
/// - 16 byte - host (ip address of the peer) /// - 16 byte - host (ip address of the peer)
/// - 20 byte - streamName (name of the stream peer is viewing) /// - 100 byte - streamName (name of the stream peer is viewing)
/// - 20 byte - connector (name of the connector the peer is using) /// - 20 byte - connector (name of the connector the peer is using)
/// - 4 byte - CRC32 of user agent (or zero if none) /// - 4 byte - CRC32 of user agent (or zero if none)
/// - 2 byte - process PID
char * data; char * data;
}; };