A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://github.com/Haivision/srt/commit/042df34fc27d40da1ea5396985500168e41de4e5 below:

[API] Removed balancing and multicast group types (#2323) · Haivision/srt@042df34 · GitHub

File tree Expand file treeCollapse file tree 4 files changed

+6

-35

lines changed

Filter options

Expand file treeCollapse file tree 4 files changed

+6

-35

lines changed Original file line number Diff line number Diff line change

@@ -289,8 +289,6 @@ CUDTGroup::CUDTGroup(SRT_GROUP_TYPE gtype)

 289 289

// Set this data immediately during creation before

 290 290

// two or more sockets start arguing about it.

 291 291

m_iLastSchedSeqNo = CUDT::generateISN();

 292 - 293 -

m_bSyncOnMsgNo = (gtype == SRT_GTYPE_BALANCING);

 294 292

}

 295 293 296 294

CUDTGroup::~CUDTGroup()

@@ -576,38 +574,15 @@ void CUDTGroup::deriveSettings(CUDT* u)

 576 574

#undef IMF

 577 575

}

 578 576 579 -

bool CUDTGroup::applyFlags(uint32_t flags, HandshakeSide hsd)

 577 +

bool CUDTGroup::applyFlags(uint32_t flags, HandshakeSide)

 580 578

{

 581 -

bool synconmsg = IsSet(flags, SRT_GFLAG_SYNCONMSG);

 582 - 583 -

if (m_type == SRT_GTYPE_BALANCING)

 584 -

{

 585 -

// We support only TRUE for this flag

 586 -

if (!synconmsg)

 587 -

{

 588 -

HLOGP(gmlog.Debug, "GROUP: Balancing mode implemented only with sync on msgno - overridden request");

 589 -

return true; // accept, but override

 590 -

}

 591 - 592 -

// We have this flag set; change it in yourself, if needed.

 593 -

if (hsd == HSD_INITIATOR && !m_bSyncOnMsgNo)

 594 -

{

 595 -

// With this you can change in future the default value to false.

 596 -

HLOGP(gmlog.Debug, "GROUP: Balancing requrested msgno-sync, OVERRIDING original setting");

 597 -

m_bSyncOnMsgNo = true;

 598 -

return true;

 599 -

}

 600 -

}

 601 -

else

 579 +

const bool synconmsg = IsSet(flags, SRT_GFLAG_SYNCONMSG);

 580 +

if (synconmsg)

 602 581

{

 603 -

if (synconmsg)

 604 -

{

 605 -

LOGP(gmlog.Error, "GROUP: non-balancing type requested sync on msgno - IPE/EPE?");

 606 -

return false;

 607 -

}

 582 +

LOGP(gmlog.Error, "GROUP: requested sync on msgno - not supported.");

 583 +

return false;

 608 584

}

 609 585 610 -

// Ignore the flag anyway. This can change in future versions though.

 611 586

return true;

 612 587

}

 613 588 Original file line number Diff line number Diff line change

@@ -437,7 +437,7 @@ class CUDTGroup

 437 437

void erase(gli_t it);

 438 438

};

 439 439

GroupContainer m_Group;

 440 -

bool m_bSyncOnMsgNo;

 440 +

const bool m_bSyncOnMsgNo; // It goes into a dedicated HS field. Could be true for balancing groups (not implemented).

 441 441

SRT_GROUP_TYPE m_type;

 442 442

CUDTSocket* m_listener; // A "group" can only have one listener.

 443 443

srt::sync::atomic<int> m_iBusy;

 Original file line number Diff line number Diff line change

@@ -772,8 +772,6 @@ typedef enum SRT_GROUP_TYPE

 772 772

SRT_GTYPE_UNDEFINED,

 773 773

SRT_GTYPE_BROADCAST,

 774 774

SRT_GTYPE_BACKUP,

 775 -

SRT_GTYPE_BALANCING,

 776 -

SRT_GTYPE_MULTICAST,

 777 775

// ...

 778 776

SRT_GTYPE_E_END

 779 777

} SRT_GROUP_TYPE;

 Original file line number Diff line number Diff line change

@@ -956,8 +956,6 @@ void SrtCommon::OpenGroupClient()

 956 956

type = SRT_GTYPE_BROADCAST;

 957 957

else if (m_group_type == "backup")

 958 958

type = SRT_GTYPE_BACKUP;

 959 -

else if (m_group_type == "balancing")

 960 -

type = SRT_GTYPE_BALANCING;

 961 959

else

 962 960

{

 963 961

Error("With //group, type='" + m_group_type + "' undefined");

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