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-11-03 11:17:40 +01:00
commit 4a727a8919
3 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/h264.cpp
View file

@ -1,3 +1,4 @@
#define _GNU_SOURCE
#include "h264.h"
#include <cstdlib>
#include <cstring>

1
lib/nal.cpp
View file

@ -1,3 +1,4 @@
#define _GNU_SOURCE
#include <cstdlib>
#include <cstring>
#include <math.h>//for log

20
lib/socket.cpp
View file

@ -967,18 +967,12 @@ int Socket::Server::getSocket() {
/// If both fail, prints an DLVL_FAIL debug message.
/// \param nonblock Whether the socket should be nonblocking.
Socket::UDPConnection::UDPConnection(bool nonblock) {
#ifdef __CYGWIN__
#warning UDP over IPv6 is currently disabled on windows
family = AF_INET;
sock = socket(AF_INET, SOCK_DGRAM, 0);
#else
family = AF_INET6;
sock = socket(AF_INET6, SOCK_DGRAM, 0);
if (sock == -1) {
sock = socket(AF_INET, SOCK_DGRAM, 0);
family = AF_INET;
}
#endif
if (sock == -1) {
DEBUG_MSG(DLVL_FAIL, "Could not create UDP socket: %s", strerror(errno));
}
@ -997,18 +991,12 @@ Socket::UDPConnection::UDPConnection(bool nonblock) {
/// Copies a UDP socket, re-allocating local copies of any needed structures.
/// The data/data_size/data_len variables are *not* copied over.
Socket::UDPConnection::UDPConnection(const UDPConnection & o) {
#ifdef __CYGWIN__
#warning UDP over IPv6 is currently disabled on windows
family = AF_INET;
sock = socket(AF_INET, SOCK_DGRAM, 0);
#else
family = AF_INET6;
sock = socket(AF_INET6, SOCK_DGRAM, 0);
if (sock == -1) {
sock = socket(AF_INET, SOCK_DGRAM, 0);
family = AF_INET;
}
#endif
if (sock == -1) {
DEBUG_MSG(DLVL_FAIL, "Could not create UDP socket: %s", strerror(errno));
}
@ -1271,9 +1259,6 @@ int Socket::UDPConnection::bind(int port, std::string iface, const std::string &
}
if (!multicastInterfaces.length()){
#ifdef __CYGWIN__
if (true){
#else
if (family == AF_INET6){
memcpy(&mreq6.ipv6mr_multiaddr, &((sockaddr_in6*)resmulti->ai_addr)->sin6_addr, sizeof(mreq6.ipv6mr_multiaddr));
if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, (char *)&mreq6, sizeof(mreq6)) != 0) {
@ -1282,7 +1267,6 @@ int Socket::UDPConnection::bind(int port, std::string iface, const std::string &
result = -1;
}
}else{
#endif
mreq4.imr_multiaddr = ((sockaddr_in*)resmulti->ai_addr)->sin_addr;
mreq4.imr_interface.s_addr = INADDR_ANY;
if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&mreq4, sizeof(mreq4)) != 0) {
@ -1305,9 +1289,6 @@ int Socket::UDPConnection::bind(int port, std::string iface, const std::string &
curIface = curIface.substr(1, curIface.size()-1);
}
}
#ifdef __CYGWIN__
if (true){
#else
if (family == AF_INET6){
INFO_MSG("Registering for IPv6 multicast on interface %s", curIface.c_str());
if ((addr_ret = getaddrinfo(curIface.c_str(), 0, &hints, &reslocal)) != 0){
@ -1322,7 +1303,6 @@ int Socket::UDPConnection::bind(int port, std::string iface, const std::string &
atLeastOne = true;
}
}else{
#endif
INFO_MSG("Registering for IPv4 multicast on interface %s", curIface.c_str());
if ((addr_ret = getaddrinfo(curIface.c_str(), 0, &hints, &reslocal)) != 0){
WARN_MSG("Unable to resolve IPv4 interface address %s: %s", curIface.c_str(), gai_strerror(addr_ret));