+0
-65
lines changedFilter options
+0
-65
lines changed Original file line number Diff line number Diff line change
@@ -3302,22 +3302,6 @@ SRTSOCKET srt::CUDT::getGroupOfSocket(SRTSOCKET socket)
3302 3302
return s->m_GroupOf->id();
3303 3303
}
3304 3304 3305 -
int srt::CUDT::configureGroup(SRTSOCKET groupid, const char* str)
3306 -
{
3307 -
if ((groupid & SRTGROUP_MASK) == 0)
3308 -
{
3309 -
return APIError(MJ_NOTSUP, MN_INVAL, 0);
3310 -
}
3311 - 3312 -
CUDTUnited::GroupKeeper k(uglobal(), groupid, CUDTUnited::ERH_RETURN);
3313 -
if (!k.group)
3314 -
{
3315 -
return APIError(MJ_NOTSUP, MN_INVAL, 0);
3316 -
}
3317 - 3318 -
return k.group->configure(str);
3319 -
}
3320 - 3321 3305
int srt::CUDT::getGroupData(SRTSOCKET groupid, SRT_SOCKGROUPDATA* pdata, size_t* psize)
3322 3306
{
3323 3307
if ((groupid & SRTGROUP_MASK) == 0 || !psize)
@@ -194,7 +194,6 @@ class CUDT
194 194
static SRTSOCKET createGroup(SRT_GROUP_TYPE);
195 195
static SRTSOCKET getGroupOfSocket(SRTSOCKET socket);
196 196
static int getGroupData(SRTSOCKET groupid, SRT_SOCKGROUPDATA* pdata, size_t* psize);
197 -
static int configureGroup(SRTSOCKET groupid, const char* str);
198 197
static bool isgroup(SRTSOCKET sock) { return (sock & SRTGROUP_MASK) != 0; }
199 198
#endif
200 199
static int bind(SRTSOCKET u, const sockaddr* name, int namelen);
@@ -4529,47 +4529,6 @@ void CUDTGroup::internalKeepalive(SocketData* gli)
4529 4529 4530 4530
CUDTGroup::BufferedMessageStorage CUDTGroup::BufferedMessage::storage(SRT_LIVE_MAX_PLSIZE /*, 1000*/);
4531 4531 4532 -
int CUDTGroup::configure(const char* str)
4533 -
{
4534 -
string config = str;
4535 -
switch (type())
4536 -
{
4537 -
/* TMP review stub case SRT_GTYPE_BALANCING:
4538 -
// config contains the algorithm name
4539 -
if (config == "" || config == "auto")
4540 -
{
4541 -
m_cbSelectLink.set(this, &CUDTGroup::linkSelect_window_fw);
4542 -
HLOGC(gmlog.Debug, log << "group(balancing): WINDOW algorithm selected");
4543 -
}
4544 -
else if (config == "fixed")
4545 -
{
4546 -
m_cbSelectLink.set(this, &CUDTGroup::linkSelect_fixed_fw);
4547 -
HLOGC(gmlog.Debug, log << "group(balancing): FIXED algorithm selected");
4548 -
}
4549 -
else
4550 -
{
4551 -
LOGC(gmlog.Error, log << "group(balancing): unknown selection algorithm '"
4552 -
<< config << "'");
4553 -
return CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0);
4554 -
}
4555 - 4556 -
break;*/
4557 -
case SRT_GTYPE_BROADCAST:
4558 -
case SRT_GTYPE_BACKUP:
4559 -
default:
4560 -
if (config == "")
4561 -
{
4562 -
// You can always call the config with empty string,
4563 -
// it should set defaults or do nothing, if not supported.
4564 -
return 0;
4565 -
}
4566 -
LOGC(gmlog.Error, log << "this group type doesn't support any configuration");
4567 -
return CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0);
4568 -
}
4569 - 4570 -
return 0;
4571 -
}
4572 - 4573 4532
// Forwarder needed due to class definition order
4574 4533
int32_t CUDTGroup::generateISN()
4575 4534
{
@@ -375,7 +375,6 @@ class CUDTGroup
375 375
void syncWithSocket(const srt::CUDT& core, const HandshakeSide side);
376 376
int getGroupData(SRT_SOCKGROUPDATA* pdata, size_t* psize);
377 377
int getGroupData_LOCKED(SRT_SOCKGROUPDATA* pdata, size_t* psize);
378 -
int configure(const char* str);
379 378 380 379
/// Predicted to be called from the reading function to fill
381 380
/// the group data array as requested.
@@ -990,7 +990,6 @@ typedef struct SRT_GroupMemberConfig_
990 990
SRT_API SRTSOCKET srt_create_group(SRT_GROUP_TYPE);
991 991
SRT_API SRTSOCKET srt_groupof(SRTSOCKET socket);
992 992
SRT_API int srt_group_data(SRTSOCKET socketgroup, SRT_SOCKGROUPDATA* output, size_t* inoutlen);
993 -
SRT_API int srt_group_configure(SRTSOCKET socketgroup, const char* str);
994 993 995 994
SRT_API SRT_SOCKOPT_CONFIG* srt_create_config(void);
996 995
SRT_API void srt_delete_config(SRT_SOCKOPT_CONFIG* config /*nullable*/);
@@ -44,10 +44,6 @@ int srt_group_data(SRTSOCKET socketgroup, SRT_SOCKGROUPDATA* output, size_t* ino
44 44
{
45 45
return CUDT::getGroupData(socketgroup, output, inoutlen);
46 46
}
47 -
int srt_group_configure(SRTSOCKET socketgroup, const char* str)
48 -
{
49 -
return CUDT::configureGroup(socketgroup, str);
50 -
}
51 47 52 48
SRT_SOCKOPT_CONFIG* srt_create_config()
53 49
{
@@ -101,7 +97,6 @@ int srt_connect_group(SRTSOCKET group,
101 97
SRTSOCKET srt_create_group(SRT_GROUP_TYPE) { return SRT_INVALID_SOCK; }
102 98
SRTSOCKET srt_groupof(SRTSOCKET) { return SRT_INVALID_SOCK; }
103 99
int srt_group_data(SRTSOCKET, SRT_SOCKGROUPDATA*, size_t*) { return srt::CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0); }
104 -
int srt_group_configure(SRTSOCKET, const char*) { return srt::CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0); }
105 100
SRT_SOCKOPT_CONFIG* srt_create_config() { return NULL; }
106 101
void srt_delete_config(SRT_SOCKOPT_CONFIG*) { return; }
107 102
int srt_config_add(SRT_SOCKOPT_CONFIG*, SRT_SOCKOPT, const void*, int) { return srt::CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0); }
You can’t perform that action at this time.
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