@@ -70,16 +70,23 @@ modified by
70 70 71 71
#include <srt_compat.h> // SysStrError
72 72 73 -
using namespace srt;
73 +
using namespace std;
74 74
using namespace srt::sync;
75 +
using namespace srt_logging;
75 76 76 -
namespace srt_logging {
77 -
extern Logger inlog;
77 +
namespace srt_logging
78 +
{
79 +
extern Logger inlog;
78 80
}
79 81 80 -
using namespace srt_logging;
82 +
namespace srt
83 +
{
84 + 85 +
const char* strerror_get_message(size_t major, size_t minor);
86 +
} // namespace srt
87 + 81 88 82 -
CUDTException::CUDTException(CodeMajor major, CodeMinor minor, int err):
89 +
srt::CUDTException::CUDTException(CodeMajor major, CodeMinor minor, int err):
83 90
m_iMajor(major),
84 91
m_iMinor(minor)
85 92
{
@@ -89,34 +96,30 @@ m_iMinor(minor)
89 96
m_iErrno = err;
90 97
}
91 98 92 -
namespace srt {
93 -
const char* strerror_get_message(size_t major, size_t minor);
94 -
}
95 - 96 -
const char* CUDTException::getErrorMessage() const ATR_NOTHROW
99 +
const char* srt::CUDTException::getErrorMessage() const ATR_NOTHROW
97 100
{
98 -
return srt::strerror_get_message(m_iMajor, m_iMinor);
101 +
return strerror_get_message(m_iMajor, m_iMinor);
99 102
}
100 103 101 -
std::string CUDTException::getErrorString() const
104 +
std::string srt::CUDTException::getErrorString() const
102 105
{
103 106
return getErrorMessage();
104 107
}
105 108 106 109
#define UDT_XCODE(mj, mn) (int(mj)*1000)+int(mn)
107 110 108 -
int CUDTException::getErrorCode() const
111 +
int srt::CUDTException::getErrorCode() const
109 112
{
110 113
return UDT_XCODE(m_iMajor, m_iMinor);
111 114
}
112 115 113 -
int CUDTException::getErrno() const
116 +
int srt::CUDTException::getErrno() const
114 117
{
115 118
return m_iErrno;
116 119
}
117 120 118 121 119 -
void CUDTException::clear()
122 +
void srt::CUDTException::clear()
120 123
{
121 124
m_iMajor = MJ_SUCCESS;
122 125
m_iMinor = MN_NONE;
@@ -126,7 +129,7 @@ void CUDTException::clear()
126 129
#undef UDT_XCODE
127 130 128 131
//
129 -
bool CIPAddress::ipcmp(const sockaddr* addr1, const sockaddr* addr2, int ver)
132 +
bool srt::CIPAddress::ipcmp(const sockaddr* addr1, const sockaddr* addr2, int ver)
130 133
{
131 134
if (AF_INET == ver)
132 135
{
@@ -154,7 +157,7 @@ bool CIPAddress::ipcmp(const sockaddr* addr1, const sockaddr* addr2, int ver)
154 157
return false;
155 158
}
156 159 157 -
void CIPAddress::ntop(const sockaddr_any& addr, uint32_t ip[4])
160 +
void srt::CIPAddress::ntop(const sockaddr_any& addr, uint32_t ip[4])
158 161
{
159 162
if (addr.family() == AF_INET)
160 163
{
@@ -173,6 +176,7 @@ void CIPAddress::ntop(const sockaddr_any& addr, uint32_t ip[4])
173 176
}
174 177
}
175 178 179 +
namespace srt {
176 180
bool checkMappedIPv4(const uint16_t* addr)
177 181
{
178 182
static const uint16_t ipv4on6_model [8] =
@@ -187,11 +191,13 @@ bool checkMappedIPv4(const uint16_t* addr)
187 191 188 192
return std::equal(mbegin, mend, addr);
189 193
}
194 +
}
190 195 191 196
// XXX This has void return and the first argument is passed by reference.
192 197
// Consider simply returning sockaddr_any by value.
193 -
void CIPAddress::pton(sockaddr_any& w_addr, const uint32_t ip[4], const sockaddr_any& peer)
198 +
void srt::CIPAddress::pton(sockaddr_any& w_addr, const uint32_t ip[4], const sockaddr_any& peer)
194 199
{
200 +
//using ::srt_logging::inlog;
195 201
uint32_t* target_ipv4_addr = NULL;
196 202 197 203
if (peer.family() == AF_INET)
@@ -308,8 +314,8 @@ void CIPAddress::pton(sockaddr_any& w_addr, const uint32_t ip[4], const sockaddr
308 314
}
309 315
}
310 316 311 -
using namespace std;
312 317 318 +
namespace srt {
313 319
static string ShowIP4(const sockaddr_in* sin)
314 320
{
315 321
ostringstream os;
@@ -361,9 +367,10 @@ string CIPAddress::show(const sockaddr* adr)
361 367
else
362 368
return "(unsupported sockaddr type)";
363 369
}
370 +
} // namespace srt
364 371 365 372
//
366 -
void CMD5::compute(const char* input, unsigned char result[16])
373 +
void srt::CMD5::compute(const char* input, unsigned char result[16])
367 374
{
368 375
md5_state_t state;
369 376
@@ -372,6 +379,7 @@ void CMD5::compute(const char* input, unsigned char result[16])
372 379
md5_finish(&state, result);
373 380
}
374 381 382 +
namespace srt {
375 383
std::string MessageTypeStr(UDTMessageType mt, uint32_t extt)
376 384
{
377 385
using std::string;
@@ -470,6 +478,7 @@ bool SrtParseConfig(string s, SrtConfig& w_config)
470 478 471 479
return true;
472 480
}
481 +
} // namespace srt
473 482 474 483
namespace srt_logging
475 484
{
@@ -535,7 +544,7 @@ std::string MemberStatusStr(SRT_MEMBERSTATUS s)
535 544 536 545
#if ENABLE_LOGGING
537 546 538 -
LogDispatcher::Proxy::Proxy(LogDispatcher& guy) : that(guy), that_enabled(that.CheckEnabled())
547 +
srt::logging::LogDispatcher::Proxy::Proxy(LogDispatcher& guy) : that(guy), that_enabled(that.CheckEnabled())
539 548
{
540 549
if (that_enabled)
541 550
{
@@ -555,6 +564,7 @@ LogDispatcher::Proxy LogDispatcher::operator()()
555 564
void LogDispatcher::CreateLogLinePrefix(std::ostringstream& serr)
556 565
{
557 566
using namespace std;
567 +
using namespace srt;
558 568 559 569
SRT_STATIC_ASSERT(ThreadName::BUFSIZE >= sizeof("hh:mm:ss.") * 2, // multiply 2 for some margin
560 570
"ThreadName::BUFSIZE is too small to be used for strftime");
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4