From c6b95f5e180c8dde3f1b54256c5c56958e06c3db Mon Sep 17 00:00:00 2001 From: Maxim Sharabayko Date: Wed, 4 May 2022 14:51:25 +0200 Subject: [PATCH] [API] Removed unused srt_group_configure API function. --- srtcore/api.cpp | 16 ---------------- srtcore/core.h | 1 - srtcore/group.cpp | 41 ----------------------------------------- srtcore/group.h | 1 - srtcore/srt.h | 1 - srtcore/srt_c_api.cpp | 5 ----- 6 files changed, 65 deletions(-) diff --git a/srtcore/api.cpp b/srtcore/api.cpp index b6c97e1de..1776451fe 100644 --- a/srtcore/api.cpp +++ b/srtcore/api.cpp @@ -3302,22 +3302,6 @@ SRTSOCKET srt::CUDT::getGroupOfSocket(SRTSOCKET socket) return s->m_GroupOf->id(); } -int srt::CUDT::configureGroup(SRTSOCKET groupid, const char* str) -{ - if ((groupid & SRTGROUP_MASK) == 0) - { - return APIError(MJ_NOTSUP, MN_INVAL, 0); - } - - CUDTUnited::GroupKeeper k(uglobal(), groupid, CUDTUnited::ERH_RETURN); - if (!k.group) - { - return APIError(MJ_NOTSUP, MN_INVAL, 0); - } - - return k.group->configure(str); -} - int srt::CUDT::getGroupData(SRTSOCKET groupid, SRT_SOCKGROUPDATA* pdata, size_t* psize) { if ((groupid & SRTGROUP_MASK) == 0 || !psize) diff --git a/srtcore/core.h b/srtcore/core.h index 720092e95..4bb1a7390 100644 --- a/srtcore/core.h +++ b/srtcore/core.h @@ -194,7 +194,6 @@ class CUDT static SRTSOCKET createGroup(SRT_GROUP_TYPE); static SRTSOCKET getGroupOfSocket(SRTSOCKET socket); static int getGroupData(SRTSOCKET groupid, SRT_SOCKGROUPDATA* pdata, size_t* psize); - static int configureGroup(SRTSOCKET groupid, const char* str); static bool isgroup(SRTSOCKET sock) { return (sock & SRTGROUP_MASK) != 0; } #endif static int bind(SRTSOCKET u, const sockaddr* name, int namelen); diff --git a/srtcore/group.cpp b/srtcore/group.cpp index 20b13b364..61aab9d74 100644 --- a/srtcore/group.cpp +++ b/srtcore/group.cpp @@ -4529,47 +4529,6 @@ void CUDTGroup::internalKeepalive(SocketData* gli) CUDTGroup::BufferedMessageStorage CUDTGroup::BufferedMessage::storage(SRT_LIVE_MAX_PLSIZE /*, 1000*/); -int CUDTGroup::configure(const char* str) -{ - string config = str; - switch (type()) - { - /* TMP review stub case SRT_GTYPE_BALANCING: - // config contains the algorithm name - if (config == "" || config == "auto") - { - m_cbSelectLink.set(this, &CUDTGroup::linkSelect_window_fw); - HLOGC(gmlog.Debug, log << "group(balancing): WINDOW algorithm selected"); - } - else if (config == "fixed") - { - m_cbSelectLink.set(this, &CUDTGroup::linkSelect_fixed_fw); - HLOGC(gmlog.Debug, log << "group(balancing): FIXED algorithm selected"); - } - else - { - LOGC(gmlog.Error, log << "group(balancing): unknown selection algorithm '" - << config << "'"); - return CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0); - } - - break;*/ - case SRT_GTYPE_BROADCAST: - case SRT_GTYPE_BACKUP: - default: - if (config == "") - { - // You can always call the config with empty string, - // it should set defaults or do nothing, if not supported. - return 0; - } - LOGC(gmlog.Error, log << "this group type doesn't support any configuration"); - return CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0); - } - - return 0; -} - // Forwarder needed due to class definition order int32_t CUDTGroup::generateISN() { diff --git a/srtcore/group.h b/srtcore/group.h index 58464d4ab..eb358dd9a 100644 --- a/srtcore/group.h +++ b/srtcore/group.h @@ -375,7 +375,6 @@ class CUDTGroup void syncWithSocket(const srt::CUDT& core, const HandshakeSide side); int getGroupData(SRT_SOCKGROUPDATA* pdata, size_t* psize); int getGroupData_LOCKED(SRT_SOCKGROUPDATA* pdata, size_t* psize); - int configure(const char* str); /// Predicted to be called from the reading function to fill /// the group data array as requested. diff --git a/srtcore/srt.h b/srtcore/srt.h index e8c549f96..883cbb711 100644 --- a/srtcore/srt.h +++ b/srtcore/srt.h @@ -990,7 +990,6 @@ typedef struct SRT_GroupMemberConfig_ SRT_API SRTSOCKET srt_create_group(SRT_GROUP_TYPE); SRT_API SRTSOCKET srt_groupof(SRTSOCKET socket); SRT_API int srt_group_data(SRTSOCKET socketgroup, SRT_SOCKGROUPDATA* output, size_t* inoutlen); -SRT_API int srt_group_configure(SRTSOCKET socketgroup, const char* str); SRT_API SRT_SOCKOPT_CONFIG* srt_create_config(void); SRT_API void srt_delete_config(SRT_SOCKOPT_CONFIG* config /*nullable*/); diff --git a/srtcore/srt_c_api.cpp b/srtcore/srt_c_api.cpp index 8618f169e..4add1aa34 100644 --- a/srtcore/srt_c_api.cpp +++ b/srtcore/srt_c_api.cpp @@ -44,10 +44,6 @@ int srt_group_data(SRTSOCKET socketgroup, SRT_SOCKGROUPDATA* output, size_t* ino { return CUDT::getGroupData(socketgroup, output, inoutlen); } -int srt_group_configure(SRTSOCKET socketgroup, const char* str) -{ - return CUDT::configureGroup(socketgroup, str); -} SRT_SOCKOPT_CONFIG* srt_create_config() { @@ -101,7 +97,6 @@ int srt_connect_group(SRTSOCKET group, SRTSOCKET srt_create_group(SRT_GROUP_TYPE) { return SRT_INVALID_SOCK; } SRTSOCKET srt_groupof(SRTSOCKET) { return SRT_INVALID_SOCK; } int srt_group_data(SRTSOCKET, SRT_SOCKGROUPDATA*, size_t*) { return srt::CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0); } -int srt_group_configure(SRTSOCKET, const char*) { return srt::CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0); } SRT_SOCKOPT_CONFIG* srt_create_config() { return NULL; } void srt_delete_config(SRT_SOCKOPT_CONFIG*) { return; } int srt_config_add(SRT_SOCKOPT_CONFIG*, SRT_SOCKOPT, const void*, int) { return srt::CUDT::APIError(MJ_NOTSUP, MN_INVAL, 0); }