jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

* #28529: sip: fix compilation for gcc 4.6 and off-by-one error

Browse Source
This commit is contained in:
Tristan Matthews
2013-08-15 17:57:13 -04:00
parent 319688066e
commit 04650efd69
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/src/sip/sipaccount.cpp
View File

@ -47,6 +47,8 @@
#include <sstream>
#include <algorithm>
#include <cstdlib>
#include <array>
#include <memory>
#ifdef SFL_VIDEO
#include "video/libav_utils.h"
@ -64,7 +66,7 @@ const char *const TRUE_STR = "true";
const char *const FALSE_STR = "false";
}
bool SIPAccount::portsInUse_[UINT16_MAX];
bool SIPAccount::portsInUse_[1 << 16];
SIPAccount::SIPAccount(const std::string& accountID)
: Account(accountID)
@ -119,7 +121,7 @@ SIPAccount::SIPAccount(const std::string& accountID)
, via_addr_()
, audioPortRange_({16384, 32766})
#ifdef SFL_VIDEO
, videoPortRange_({49152, UINT16_MAX - 2})
, videoPortRange_({49152, (1 << 16) - 2})
#endif
{
via_addr_.host.ptr = 0;

3
daemon/src/sip/sipaccount.h
View File

@ -37,7 +37,6 @@
#include <vector>
#include <map>
#include <cstdint>
#include "account.h"
#include "pjsip/sip_transport_tls.h"
#include "pjsip/sip_types.h"
@ -789,7 +788,7 @@ class SIPAccount : public Account {
*/
std::pair<uint16_t, uint16_t> videoPortRange_;
#endif
static bool portsInUse_[UINT16_MAX];
static bool portsInUse_[1 << 16];
static uint16_t getRandomEvenNumber(const std::pair<uint16_t, uint16_t> &range);
};