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 2019-10-03 15:26:18 +02:00
commit c60f96a1cb
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/socket.cpp
View file

@ -1137,7 +1137,11 @@ Socket::Connection::Connection(const Connection &rhs){
clear(); clear();
if (!rhs){return;} if (!rhs){return;}
#if DEBUG >= DLVL_DEVEL #if DEBUG >= DLVL_DEVEL
#ifdef SSL
HIGH_MSG("Copying %s socket", rhs.sslConnected ? "SSL" : "regular"); HIGH_MSG("Copying %s socket", rhs.sslConnected ? "SSL" : "regular");
#else
HIGH_MSG("Copying regular socket");
#endif
#endif #endif
conntime = rhs.conntime; conntime = rhs.conntime;
isTrueSocket = rhs.isTrueSocket; isTrueSocket = rhs.isTrueSocket;
@ -1166,7 +1170,11 @@ Socket::Connection &Socket::Connection::operator=(const Socket::Connection &rhs)
clear(); clear();
if (!rhs){return *this;} if (!rhs){return *this;}
#if DEBUG >= DLVL_DEVEL #if DEBUG >= DLVL_DEVEL
#ifdef SSL
HIGH_MSG("Assigning %s socket", rhs.sslConnected ? "SSL" : "regular"); HIGH_MSG("Assigning %s socket", rhs.sslConnected ? "SSL" : "regular");
#else
HIGH_MSG("Assigning regular socket");
#endif
#endif #endif
conntime = rhs.conntime; conntime = rhs.conntime;
isTrueSocket = rhs.isTrueSocket; isTrueSocket = rhs.isTrueSocket;
@ -1766,6 +1774,11 @@ uint16_t Socket::UDPConnection::bind(int port, std::string iface, const std::str
sockaddr_in *addr4 = (sockaddr_in *)(rp->ai_addr); sockaddr_in *addr4 = (sockaddr_in *)(rp->ai_addr);
// multicast has a "1110" bit prefix // multicast has a "1110" bit prefix
multicast = (((char *)&(addr4->sin_addr))[0] & 0xF0) == 0xE0; multicast = (((char *)&(addr4->sin_addr))[0] & 0xF0) == 0xE0;
#ifdef __CYGWIN__
if (multicast){
((sockaddr_in*)rp->ai_addr)->sin_addr.s_addr = htonl(INADDR_ANY);
}
#endif
} }
if (multicast){ if (multicast){
const int optval = 1; const int optval = 1;

13
src/io.cpp
View file

@ -664,6 +664,9 @@ namespace Mist {
DEBUG_MSG(DLVL_FAIL, "Failed to negotiate for incoming track %lu, there does not seem to be a connection with the buffer", tid); DEBUG_MSG(DLVL_FAIL, "Failed to negotiate for incoming track %lu, there does not seem to be a connection with the buffer", tid);
return; return;
} }
#if defined(__CYGWIN__) || defined(_WIN32)
static std::map<unsigned long, std::string> preservedTempMetas;
#endif
unsigned long offset = 6 * trackOffset[tid]; unsigned long offset = 6 * trackOffset[tid];
//If we have a new track to negotiate //If we have a new track to negotiate
if (!trackState.count(tid)) { if (!trackState.count(tid)) {
@ -691,9 +694,10 @@ namespace Mist {
std::string tmpStr = tmpVal.toNetPacked(); std::string tmpStr = tmpVal.toNetPacked();
memcpy(metaPages[tid].mapped, tmpStr.data(), tmpStr.size()); memcpy(metaPages[tid].mapped, tmpStr.data(), tmpStr.size());
#if defined(__CYGWIN__) || defined(_WIN32)
IPC::preservePage(pageName);
preservedTempMetas[tid] = pageName;
#endif
snprintf(pageName, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, streamName.c_str(), finalTid); snprintf(pageName, NAME_BUFFER_SIZE, SHM_TRACK_INDEX, streamName.c_str(), finalTid);
metaPages[tid].init(pageName, SHM_TRACK_INDEX_SIZE, true); metaPages[tid].init(pageName, SHM_TRACK_INDEX_SIZE, true);
@ -710,9 +714,6 @@ namespace Mist {
} }
return; return;
} }
#if defined(__CYGWIN__) || defined(_WIN32)
static std::map<unsigned long, std::string> preservedTempMetas;
#endif
switch (trackState[tid]) { switch (trackState[tid]) {
case FILL_NEW: { case FILL_NEW: {
unsigned long newTid = ((long)(tmp[offset]) << 24) | ((long)(tmp[offset + 1]) << 16) | ((long)(tmp[offset + 2]) << 8) | tmp[offset + 3]; unsigned long newTid = ((long)(tmp[offset]) << 24) | ((long)(tmp[offset + 1]) << 16) | ((long)(tmp[offset + 2]) << 8) | tmp[offset + 3];