@@ -83,7 +83,7 @@ using namespace srt::sync;
83 83 84 84
void srt::CUDTSocket::construct()
85 85
{
86 -
#if ENABLE_EXPERIMENTAL_BONDING
86 +
#if ENABLE_BONDING
87 87
m_GroupOf = NULL;
88 88
m_GroupMemberData = NULL;
89 89
#endif
@@ -356,7 +356,7 @@ SRTSOCKET srt::CUDTUnited::generateSocketID(bool for_group)
356 356
{
357 357
enterCS(m_GlobControlLock);
358 358
const bool exists =
359 -
#if ENABLE_EXPERIMENTAL_BONDING
359 +
#if ENABLE_BONDING
360 360
for_group
361 361
? m_Groups.count(sockval | SRTGROUP_MASK)
362 362
:
@@ -658,7 +658,7 @@ int srt::CUDTUnited::newConnection(const SRTSOCKET listen,
658 658
// could be requested deletion in the meantime. This will hold any possible
659 659
// removal from group and resetting m_GroupOf field.
660 660 661 -
#if ENABLE_EXPERIMENTAL_BONDING
661 +
#if ENABLE_BONDING
662 662
if (ns->m_GroupOf)
663 663
{
664 664
// XXX this might require another check of group type.
@@ -814,7 +814,7 @@ int srt::CUDTUnited::newConnection(const SRTSOCKET listen,
814 814
{
815 815
ScopedLock cg(m_GlobControlLock);
816 816 817 -
#if ENABLE_EXPERIMENTAL_BONDING
817 +
#if ENABLE_BONDING
818 818
if (ns->m_GroupOf)
819 819
{
820 820
HLOGC(smlog.Debug,
@@ -864,7 +864,7 @@ int srt::CUDTUnited::installConnectHook(const SRTSOCKET u, srt_connect_callback_
864 864
{
865 865
try
866 866
{
867 -
#if ENABLE_EXPERIMENTAL_BONDING
867 +
#if ENABLE_BONDING
868 868
if (u & SRTGROUP_MASK)
869 869
{
870 870
GroupKeeper k(*this, u, ERH_THROW);
@@ -1133,7 +1133,7 @@ SRTSOCKET srt::CUDTUnited::accept(const SRTSOCKET listen, sockaddr* pw_addr, int
1133 1133
// Check if LISTENER has the SRTO_GROUPCONNECT flag set,
1134 1134
// and the already accepted socket has successfully joined
1135 1135
// the mirror group. If so, RETURN THE GROUP ID, not the socket ID.
1136 -
#if ENABLE_EXPERIMENTAL_BONDING
1136 +
#if ENABLE_BONDING
1137 1137
if (ls->core().m_config.iGroupConnect == 1 && s->m_GroupOf)
1138 1138
{
1139 1139
// Put a lock to protect the group against accidental deletion
@@ -1192,7 +1192,7 @@ int srt::CUDTUnited::connect(SRTSOCKET u, const sockaddr* srcname, const sockadd
1192 1192
if (target_addr.len == 0)
1193 1193
throw CUDTException(MJ_NOTSUP, MN_INVAL, 0);
1194 1194 1195 -
#if ENABLE_EXPERIMENTAL_BONDING
1195 +
#if ENABLE_BONDING
1196 1196
// Check affiliation of the socket. It's now allowed for it to be
1197 1197
// a group or socket. For a group, add automatically a socket to
1198 1198
// the group.
@@ -1226,7 +1226,7 @@ int srt::CUDTUnited::connect(const SRTSOCKET u, const sockaddr* name, int namele
1226 1226
if (target_addr.len == 0)
1227 1227
throw CUDTException(MJ_NOTSUP, MN_INVAL, 0);
1228 1228 1229 -
#if ENABLE_EXPERIMENTAL_BONDING
1229 +
#if ENABLE_BONDING
1230 1230
// Check affiliation of the socket. It's now allowed for it to be
1231 1231
// a group or socket. For a group, add automatically a socket to
1232 1232
// the group.
@@ -1250,7 +1250,7 @@ int srt::CUDTUnited::connect(const SRTSOCKET u, const sockaddr* name, int namele
1250 1250
return connectIn(s, target_addr, forced_isn);
1251 1251
}
1252 1252 1253 -
#if ENABLE_EXPERIMENTAL_BONDING
1253 +
#if ENABLE_BONDING
1254 1254
int srt::CUDTUnited::singleMemberConnect(CUDTGroup* pg, SRT_SOCKGROUPCONFIG* gd)
1255 1255
{
1256 1256
int gstat = groupConnect(pg, gd, 1);
@@ -1878,7 +1878,7 @@ int srt::CUDTUnited::connectIn(CUDTSocket* s, const sockaddr_any& target_addr, i
1878 1878 1879 1879
int srt::CUDTUnited::close(const SRTSOCKET u)
1880 1880
{
1881 -
#if ENABLE_EXPERIMENTAL_BONDING
1881 +
#if ENABLE_BONDING
1882 1882
if (u & SRTGROUP_MASK)
1883 1883
{
1884 1884
GroupKeeper k(*this, u, ERH_THROW);
@@ -1894,7 +1894,7 @@ int srt::CUDTUnited::close(const SRTSOCKET u)
1894 1894
return close(s);
1895 1895
}
1896 1896 1897 -
#if ENABLE_EXPERIMENTAL_BONDING
1897 +
#if ENABLE_BONDING
1898 1898
void srt::CUDTUnited::deleteGroup(CUDTGroup* g)
1899 1899
{
1900 1900
using srt_logging::gmlog;
@@ -2008,7 +2008,7 @@ int srt::CUDTUnited::close(CUDTSocket* s)
2008 2008
s = i->second;
2009 2009
s->setClosed();
2010 2010 2011 -
#if ENABLE_EXPERIMENTAL_BONDING
2011 +
#if ENABLE_BONDING
2012 2012
if (s->m_GroupOf)
2013 2013
{
2014 2014
HLOGC(smlog.Debug,
@@ -2334,7 +2334,7 @@ int srt::CUDTUnited::epoll_clear_usocks(int eid)
2334 2334
int srt::CUDTUnited::epoll_add_usock(const int eid, const SRTSOCKET u, const int* events)
2335 2335
{
2336 2336
int ret = -1;
2337 -
#if ENABLE_EXPERIMENTAL_BONDING
2337 +
#if ENABLE_BONDING
2338 2338
if (u & SRTGROUP_MASK)
2339 2339
{
2340 2340
GroupKeeper k(*this, u, ERH_THROW);
@@ -2405,7 +2405,7 @@ int srt::CUDTUnited::epoll_remove_socket_INTERNAL(const int eid, CUDTSocket* s)
2405 2405
return epoll_remove_entity(eid, &s->core());
2406 2406
}
2407 2407 2408 -
#if ENABLE_EXPERIMENTAL_BONDING
2408 +
#if ENABLE_BONDING
2409 2409
int srt::CUDTUnited::epoll_remove_group_INTERNAL(const int eid, CUDTGroup* g)
2410 2410
{
2411 2411
return epoll_remove_entity(eid, g);
@@ -2416,7 +2416,7 @@ int srt::CUDTUnited::epoll_remove_usock(const int eid, const SRTSOCKET u)
2416 2416
{
2417 2417
CUDTSocket* s = 0;
2418 2418 2419 -
#if ENABLE_EXPERIMENTAL_BONDING
2419 +
#if ENABLE_BONDING
2420 2420
CUDTGroup* g = 0;
2421 2421
if (u & SRTGROUP_MASK)
2422 2422
{
@@ -2485,7 +2485,7 @@ srt::CUDTSocket* srt::CUDTUnited::locateSocket_LOCKED(SRTSOCKET u)
2485 2485
return i->second;
2486 2486
}
2487 2487 2488 -
#if ENABLE_EXPERIMENTAL_BONDING
2488 +
#if ENABLE_BONDING
2489 2489
srt::CUDTGroup* srt::CUDTUnited::locateAcquireGroup(SRTSOCKET u, ErrorHandling erh)
2490 2490
{
2491 2491
ScopedLock cg(m_GlobControlLock);
@@ -2545,7 +2545,7 @@ void srt::CUDTUnited::checkBrokenSockets()
2545 2545
{
2546 2546
ScopedLock cg(m_GlobControlLock);
2547 2547 2548 -
#if ENABLE_EXPERIMENTAL_BONDING
2548 +
#if ENABLE_BONDING
2549 2549
vector<SRTSOCKET> delgids;
2550 2550 2551 2551
for (groups_t::iterator i = m_ClosedGroups.begin(); i != m_ClosedGroups.end(); ++i)
@@ -2610,7 +2610,7 @@ void srt::CUDTUnited::checkBrokenSockets()
2610 2610
}
2611 2611
}
2612 2612 2613 -
#if ENABLE_EXPERIMENTAL_BONDING
2613 +
#if ENABLE_BONDING
2614 2614
if (s->m_GroupOf)
2615 2615
{
2616 2616
LOGC(smlog.Note,
@@ -2707,7 +2707,7 @@ void srt::CUDTUnited::removeSocket(const SRTSOCKET u)
2707 2707
if (rn && rn->m_bOnList)
2708 2708
return;
2709 2709 2710 -
#if ENABLE_EXPERIMENTAL_BONDING
2710 +
#if ENABLE_BONDING
2711 2711
if (s->m_GroupOf)
2712 2712
{
2713 2713
HLOGC(smlog.Debug,
@@ -3117,7 +3117,7 @@ void* srt::CUDTUnited::garbageCollect(void* p)
3117 3117
CUDTSocket* s = i->second;
3118 3118
s->breakSocket_LOCKED();
3119 3119 3120 -
#if ENABLE_EXPERIMENTAL_BONDING
3120 +
#if ENABLE_BONDING
3121 3121
if (s->m_GroupOf)
3122 3122
{
3123 3123
HLOGC(smlog.Debug,
@@ -3217,7 +3217,7 @@ srt::CUDT::APIError::APIError(CodeMajor mj, CodeMinor mn, int syserr)
3217 3217
SetThreadLocalError(CUDTException(mj, mn, syserr));
3218 3218
}
3219 3219 3220 -
#if ENABLE_EXPERIMENTAL_BONDING
3220 +
#if ENABLE_BONDING
3221 3221
// This is an internal function; 'type' should be pre-checked if it has a correct value.
3222 3222
// This doesn't have argument of GroupType due to header file conflicts.
3223 3223
@@ -3485,7 +3485,7 @@ int srt::CUDT::connect(SRTSOCKET u, const sockaddr* name, const sockaddr* tname,
3485 3485
}
3486 3486
}
3487 3487 3488 -
#if ENABLE_EXPERIMENTAL_BONDING
3488 +
#if ENABLE_BONDING
3489 3489
int srt::CUDT::connectLinks(SRTSOCKET grp, SRT_SOCKGROUPCONFIG targets[], int arraysize)
3490 3490
{
3491 3491
if (arraysize <= 0)
@@ -3601,7 +3601,7 @@ int srt::CUDT::getsockopt(SRTSOCKET u, int, SRT_SOCKOPT optname, void* pw_optval
3601 3601 3602 3602
try
3603 3603
{
3604 -
#if ENABLE_EXPERIMENTAL_BONDING
3604 +
#if ENABLE_BONDING
3605 3605
if (u & SRTGROUP_MASK)
3606 3606
{
3607 3607
CUDTUnited::GroupKeeper k(uglobal(), u, CUDTUnited::ERH_THROW);
@@ -3632,7 +3632,7 @@ int srt::CUDT::setsockopt(SRTSOCKET u, int, SRT_SOCKOPT optname, const void* opt
3632 3632 3633 3633
try
3634 3634
{
3635 -
#if ENABLE_EXPERIMENTAL_BONDING
3635 +
#if ENABLE_BONDING
3636 3636
if (u & SRTGROUP_MASK)
3637 3637
{
3638 3638
CUDTUnited::GroupKeeper k(uglobal(), u, CUDTUnited::ERH_THROW);
@@ -3677,7 +3677,7 @@ int srt::CUDT::sendmsg2(SRTSOCKET u, const char* buf, int len, SRT_MSGCTRL& w_m)
3677 3677
{
3678 3678
try
3679 3679
{
3680 -
#if ENABLE_EXPERIMENTAL_BONDING
3680 +
#if ENABLE_BONDING
3681 3681
if (u & SRTGROUP_MASK)
3682 3682
{
3683 3683
CUDTUnited::GroupKeeper k(uglobal(), u, CUDTUnited::ERH_THROW);
@@ -3721,7 +3721,7 @@ int srt::CUDT::recvmsg2(SRTSOCKET u, char* buf, int len, SRT_MSGCTRL& w_m)
3721 3721
{
3722 3722
try
3723 3723
{
3724 -
#if ENABLE_EXPERIMENTAL_BONDING
3724 +
#if ENABLE_BONDING
3725 3725
if (u & SRTGROUP_MASK)
3726 3726
{
3727 3727
CUDTUnited::GroupKeeper k(uglobal(), u, CUDTUnited::ERH_THROW);
@@ -4058,7 +4058,7 @@ srt::CUDTException& srt::CUDT::getlasterror()
4058 4058 4059 4059
int srt::CUDT::bstats(SRTSOCKET u, CBytePerfMon* perf, bool clear, bool instantaneous)
4060 4060
{
4061 -
#if ENABLE_EXPERIMENTAL_BONDING
4061 +
#if ENABLE_BONDING
4062 4062
if (u & SRTGROUP_MASK)
4063 4063
return groupsockbstats(u, perf, clear);
4064 4064
#endif
@@ -4080,7 +4080,7 @@ int srt::CUDT::bstats(SRTSOCKET u, CBytePerfMon* perf, bool clear, bool instanta
4080 4080
}
4081 4081
}
4082 4082 4083 -
#if ENABLE_EXPERIMENTAL_BONDING
4083 +
#if ENABLE_BONDING
4084 4084
int srt::CUDT::groupsockbstats(SRTSOCKET u, CBytePerfMon* perf, bool clear)
4085 4085
{
4086 4086
try
@@ -4136,7 +4136,7 @@ SRT_SOCKSTATUS srt::CUDT::getsockstate(SRTSOCKET u)
4136 4136
{
4137 4137
try
4138 4138
{
4139 -
#if ENABLE_EXPERIMENTAL_BONDING
4139 +
#if ENABLE_BONDING
4140 4140
if (isgroup(u))
4141 4141
{
4142 4142
CUDTUnited::GroupKeeper k(uglobal(), u, CUDTUnited::ERH_THROW);
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