Skip to content

[COCOA] Remove usage of libwebrtc network manager in NetworkRTCMonitor#30961

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
youennf:eng/COCOA-Remove-usage-of-libwebrtc-network-manager-in-NetworkRTCMonitor
Jul 22, 2024
Merged

[COCOA] Remove usage of libwebrtc network manager in NetworkRTCMonitor#30961
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
youennf:eng/COCOA-Remove-usage-of-libwebrtc-network-manager-in-NetworkRTCMonitor

Conversation

@youennf
Copy link
Contributor

@youennf youennf commented Jul 18, 2024

4aa16f2

[COCOA] Remove usage of libwebrtc network manager in NetworkRTCMonitor
https://bugs.webkit.org/show_bug.cgi?id=276776
rdar://132001134

Reviewed by Eric Carlson.

We remove usage of libwebrtc network manager from NetworkRTCMonitor.
Instead we reimplement the functionality through POSIX API, following what is done in libwebrtc.
This version is simpler as WebKit is only exposing interfaces that are actually in use (the default interface plus the interface that the page may use if different from the default one).
A future patch should use more nw API for Cocoa platforms.

Manually tested.

* Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp:
* Source/WebCore/PAL/pal/spi/cocoa/NetworkSPI.h:
* Source/WebKit/NetworkProcess/webrtc/NetworkRTCMonitor.cpp:
(WebKit::networkManager):
(WebKit::NetworkManager::NetworkManager):
(WebKit::NetworkManager::addListener):
(WebKit::NetworkManager::removeListener):
(WebKit::addressFromInterface):
(WebKit::interfaceAdapterType):
(WebKit::gatherNetworkMap):
(WebKit::connectToRemoteAddress):
(WebKit::getSocketLocalAddress):
(WebKit::getDefaultIPAddress):
(WebKit::NetworkManager::updateNetworks):
(WebKit::isEqual):
(WebKit::hasNetworkChanged):
(WebKit::sortNetworks):
(WebKit::NetworkManager::onGatheredNetworks):
(WebKit::NetworkRTCMonitor::ref):
(WebKit::NetworkRTCMonitor::deref):
(WebKit::NetworkManagerWrapper::addListener): Deleted.
(WebKit::NetworkManagerWrapper::removeListener): Deleted.
(WebKit::NetworkManagerWrapper::onNetworksChanged): Deleted.
* Source/WebKit/NetworkProcess/webrtc/NetworkRTCMonitor.h:
* Source/WebKit/Shared/RTCNetwork.h:

Canonical link: https://commits.webkit.org/281185@main

2c51342

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 wincairo-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🧪 vision-wk2
✅ 🛠 tv
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@youennf youennf self-assigned this Jul 18, 2024
@youennf youennf added the WebRTC For bugs in WebRTC label Jul 18, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jul 18, 2024
@youennf youennf force-pushed the eng/COCOA-Remove-usage-of-libwebrtc-network-manager-in-NetworkRTCMonitor branch from 23c2462 to f9f8fb9 Compare July 19, 2024 07:40
@youennf youennf removed the merging-blocked Applied to prevent a change from being merged label Jul 19, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jul 19, 2024
@youennf youennf force-pushed the eng/COCOA-Remove-usage-of-libwebrtc-network-manager-in-NetworkRTCMonitor branch from f9f8fb9 to 14af68a Compare July 19, 2024 08:45
@youennf youennf removed the merging-blocked Applied to prevent a change from being merged label Jul 19, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jul 19, 2024
@youennf youennf force-pushed the eng/COCOA-Remove-usage-of-libwebrtc-network-manager-in-NetworkRTCMonitor branch from 14af68a to 2c51342 Compare July 19, 2024 13:08
@youennf youennf removed the merging-blocked Applied to prevent a change from being merged label Jul 19, 2024
@youennf youennf marked this pull request as ready for review July 19, 2024 13:08
@youennf youennf requested a review from cdumez as a code owner July 19, 2024 13:08
@youennf youennf added the merge-queue Applied to send a pull request to merge-queue label Jul 22, 2024
https://bugs.webkit.org/show_bug.cgi?id=276776
rdar://132001134

Reviewed by Eric Carlson.

We remove usage of libwebrtc network manager from NetworkRTCMonitor.
Instead we reimplement the functionality through POSIX API, following what is done in libwebrtc.
This version is simpler as WebKit is only exposing interfaces that are actually in use (the default interface plus the interface that the page may use if different from the default one).
A future patch should use more nw API for Cocoa platforms.

Manually tested.

* Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp:
* Source/WebCore/PAL/pal/spi/cocoa/NetworkSPI.h:
* Source/WebKit/NetworkProcess/webrtc/NetworkRTCMonitor.cpp:
(WebKit::networkManager):
(WebKit::NetworkManager::NetworkManager):
(WebKit::NetworkManager::addListener):
(WebKit::NetworkManager::removeListener):
(WebKit::addressFromInterface):
(WebKit::interfaceAdapterType):
(WebKit::gatherNetworkMap):
(WebKit::connectToRemoteAddress):
(WebKit::getSocketLocalAddress):
(WebKit::getDefaultIPAddress):
(WebKit::NetworkManager::updateNetworks):
(WebKit::isEqual):
(WebKit::hasNetworkChanged):
(WebKit::sortNetworks):
(WebKit::NetworkManager::onGatheredNetworks):
(WebKit::NetworkRTCMonitor::ref):
(WebKit::NetworkRTCMonitor::deref):
(WebKit::NetworkManagerWrapper::addListener): Deleted.
(WebKit::NetworkManagerWrapper::removeListener): Deleted.
(WebKit::NetworkManagerWrapper::onNetworksChanged): Deleted.
* Source/WebKit/NetworkProcess/webrtc/NetworkRTCMonitor.h:
* Source/WebKit/Shared/RTCNetwork.h:

Canonical link: https://commits.webkit.org/281185@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/COCOA-Remove-usage-of-libwebrtc-network-manager-in-NetworkRTCMonitor branch from 2c51342 to 4aa16f2 Compare July 22, 2024 09:06
@webkit-commit-queue
Copy link
Collaborator

Committed 281185@main (4aa16f2): https://commits.webkit.org/281185@main

Reviewed commits have been landed. Closing PR #30961 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 4aa16f2 into WebKit:main Jul 22, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jul 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

WebRTC For bugs in WebRTC

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants