Skip to content

Commit

Permalink
Merge tag '3.12.16' into v3
Browse files Browse the repository at this point in the history
3.12.16

# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
github-actions committed Oct 24, 2023
2 parents d548706 + 43edb3a commit ee811f7
Show file tree
Hide file tree
Showing 6 changed files with 145 additions and 89 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog


### 3.12.16

* Fix `IceServer` crash when client uses ICE renomination ([PR #1182](https://github.com/versatica/mediasoup/pull/1182)).


### 3.12.15

* Fix NPM "postinstall" task in Windows ([PR #1187](https://github.com/versatica/mediasoup/pull/1187)).
Expand Down
94 changes: 54 additions & 40 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mafalda-sfu/mediasoup",
"version": "3.12.15",
"version": "3.12.16",
"description": "Cutting Edge WebRTC Video Conferencing",
"contributors": [
"Iñaki Baz Castillo <[email protected]> (https://inakibaz.me)",
Expand Down Expand Up @@ -104,8 +104,8 @@
"@types/uuid": "^9.0.6",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"eslint": "^8.51.0",
"eslint-plugin-jest": "^27.4.2",
"eslint": "^8.52.0",
"eslint-plugin-jest": "^27.4.3",
"jest": "^29.7.0",
"marked": "^9.1.2",
"open-cli": "^7.2.0",
Expand Down
10 changes: 6 additions & 4 deletions worker/include/RTC/IceServer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,11 @@ namespace RTC
}
bool IsValidTuple(const RTC::TransportTuple* tuple) const;
void RemoveTuple(RTC::TransportTuple* tuple);
// This should be just called in 'connected' or completed' state
// and the given tuple must be an already valid tuple.
void ForceSelectedTuple(const RTC::TransportTuple* tuple);
/**
* This should be just called in 'connected' or 'completed' state and the
* given tuple must be an already valid tuple.
*/
void MayForceSelectedTuple(const RTC::TransportTuple* tuple);

private:
void HandleTuple(
Expand All @@ -122,8 +124,8 @@ namespace RTC
std::string password;
std::string oldUsernameFragment;
std::string oldPassword;
uint32_t remoteNomination{ 0u };
IceState state{ IceState::NEW };
uint32_t remoteNomination{ 0u };
std::list<RTC::TransportTuple> tuples;
RTC::TransportTuple* selectedTuple{ nullptr };
};
Expand Down
Loading

0 comments on commit ee811f7

Please sign in to comment.