<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213104] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213104">213104</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-27 17:10:39 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Add support for libwebrtc TCP incoming connections
https://bugs.webkit.org/show_bug.cgi?id=168748
Patch by Youenn Fablet <youenn@apple.com> on 2017-02-27
Reviewed by Alex Christensen.
Source/WebKit2:
Covered by added layout tests.
When a libwebrtc server socket is signalling a new connnection through SignalNewConnection, we do:
- Wrap the incoming socket into a LibWebRTCSocketClient
- Store it into a pending socket map with an identifier
- Send a message to the web process of a new connection with the server socket identifier and new connection socket identifier.
The Web process then creates a WebRTCSocket wrapper around it by sendinig a WrapNewTCPConnection message.
It then propagates the SignalNewConnection to libwebrtc code path.
* NetworkProcess/webrtc/LibWebRTCSocketClient.cpp:
(WebKit::LibWebRTCSocketClient::LibWebRTCSocketClient):
(WebKit::LibWebRTCSocketClient::signalReadPacket):
(WebKit::LibWebRTCSocketClient::signalSentPacket):
(WebKit::LibWebRTCSocketClient::signalNewConnection):
(WebKit::LibWebRTCSocketClient::signalAddressReady):
(WebKit::LibWebRTCSocketClient::signalConnect):
(WebKit::LibWebRTCSocketClient::signalClose):
* NetworkProcess/webrtc/LibWebRTCSocketClient.h:
* NetworkProcess/webrtc/NetworkRTCProvider.cpp:
(WebKit::NetworkRTCProvider::wrapNewTCPConnection):
(WebKit::NetworkRTCProvider::newConnection):
* NetworkProcess/webrtc/NetworkRTCProvider.h:
* NetworkProcess/webrtc/NetworkRTCProvider.messages.in:
* WebProcess/Network/webrtc/LibWebRTCSocket.cpp:
(WebKit::LibWebRTCSocket::signalNewConnection):
* WebProcess/Network/webrtc/LibWebRTCSocket.h:
* WebProcess/Network/webrtc/LibWebRTCSocketFactory.cpp:
(WebKit::LibWebRTCSocketFactory::createNewConnectionSocket):
* WebProcess/Network/webrtc/LibWebRTCSocketFactory.h:
* WebProcess/Network/webrtc/WebRTCSocket.cpp:
(WebKit::WebRTCSocket::signalNewConnection):
* WebProcess/Network/webrtc/WebRTCSocket.h:
* WebProcess/Network/webrtc/WebRTCSocket.messages.in:
LayoutTests:
* webrtc/datachannel/basic-expected.txt: Added.
* webrtc/datachannel/basic.html:
* webrtc/routines.js:
(createConnections):
(iceCallback1):
(iceCallback2):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachannelbasichtml">trunk/LayoutTests/webrtc/datachannel/basic.html</a></li>
<li><a href="#trunkLayoutTestswebrtcroutinesjs">trunk/LayoutTests/webrtc/routines.js</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesswebrtcLibWebRTCSocketClientcpp">trunk/Source/WebKit2/NetworkProcess/webrtc/LibWebRTCSocketClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesswebrtcLibWebRTCSocketClienth">trunk/Source/WebKit2/NetworkProcess/webrtc/LibWebRTCSocketClient.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCProvidercpp">trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCProviderh">trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCProvidermessagesin">trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketcpp">trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketh">trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketFactorycpp">trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocketFactory.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketFactoryh">trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocketFactory.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCSocketcpp">trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCSocketh">trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCSocketmessagesin">trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.messages.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebrtcdatachannelbasicexpectedtxt">trunk/LayoutTests/webrtc/datachannel/basic-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/LayoutTests/ChangeLog 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-27 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] Add support for libwebrtc TCP incoming connections
+ https://bugs.webkit.org/show_bug.cgi?id=168748
+
+ Reviewed by Alex Christensen.
+
+ * webrtc/datachannel/basic-expected.txt: Added.
+ * webrtc/datachannel/basic.html:
+ * webrtc/routines.js:
+ (createConnections):
+ (iceCallback1):
+ (iceCallback2):
+
</ins><span class="cx"> 2017-02-27 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark fast/dom/timer-throttling-hidden-page.html as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachannelbasicexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/datachannel/basic-expected.txt (0 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/basic-expected.txt (rev 0)
+++ trunk/LayoutTests/webrtc/datachannel/basic-expected.txt 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+
+PASS Basic data channel exchange from offerer to receiver
+PASS Basic data channel exchange from receiver to offerer
+PASS Basic data channel exchange from offerer to receiver using UDP only
+PASS Basic data channel exchange from offerer to receiver using TCP only
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachannelbasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/datachannel/basic.html (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/basic.html 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/LayoutTests/webrtc/datachannel/basic.html 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -9,9 +9,6 @@
</span><span class="cx"> <body>
</span><span class="cx"> <script src ="../routines.js"></script>
</span><span class="cx"> <script>
</span><del>-if (window.internals)
- internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
-
</del><span class="cx"> var localChannel;
</span><span class="cx"> var remoteChannel;
</span><span class="cx">
</span><span class="lines">@@ -60,6 +57,9 @@
</span><span class="cx"> promise_test((test) => {
</span><span class="cx"> counter = 0;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><ins>+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
+
</ins><span class="cx"> finishTest = resolve;
</span><span class="cx"> createConnections((localConnection) => {
</span><span class="cx"> localChannel = localConnection.createDataChannel('sendDataChannel');
</span><span class="lines">@@ -76,6 +76,9 @@
</span><span class="cx"> promise_test((test) => {
</span><span class="cx"> counter = 0;
</span><span class="cx"> return new Promise((resolve, reject) => {
</span><ins>+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
+
</ins><span class="cx"> finishTest = resolve;
</span><span class="cx"> createConnections((localConnection) => {
</span><span class="cx"> localChannel = localConnection.createDataChannel('sendDataChannel');
</span><span class="lines">@@ -88,6 +91,45 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }, "Basic data channel exchange from receiver to offerer");
</span><ins>+
+promise_test((test) => {
+ counter = 0;
+ return new Promise((resolve, reject) => {
+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
+
+ finishTest = resolve;
+ createConnections((localConnection) => {
+ localChannel = localConnection.createDataChannel('sendDataChannel');
+ localChannel.onopen = () => { sendMessages(localChannel) };
+ }, (remoteConnection) => {
+ remoteConnection.ondatachannel = (event) => {
+ remoteChannel = event.channel;
+ remoteChannel.onmessage = receiveMessages;
+ };
+ }, (candidate) => { return candidate.candidate.toLowerCase().indexOf("udp") == -1; });
+ });
+}, "Basic data channel exchange from offerer to receiver using UDP only");
+
+promise_test((test) => {
+ counter = 0;
+ return new Promise((resolve, reject) => {
+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
+
+ finishTest = resolve;
+ createConnections((localConnection) => {
+ localChannel = localConnection.createDataChannel('sendDataChannel');
+ localChannel.onopen = () => { sendMessages(localChannel) };
+ }, (remoteConnection) => {
+ remoteConnection.ondatachannel = (event) => {
+ remoteChannel = event.channel;
+ remoteChannel.onmessage = receiveMessages;
+ };
+ }, (candidate) => { return candidate.candidate.toLowerCase().indexOf("tcp") == -1; });
+ });
+}, "Basic data channel exchange from offerer to receiver using TCP only");
+
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcroutinesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/routines.js (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/routines.js 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/LayoutTests/webrtc/routines.js 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -2,13 +2,13 @@
</span><span class="cx"> var localConnection;
</span><span class="cx"> var remoteConnection;
</span><span class="cx">
</span><del>-function createConnections(setupLocalConnection, setupRemoteConnection) {
</del><ins>+function createConnections(setupLocalConnection, setupRemoteConnection, filterOutICECandidate) {
</ins><span class="cx"> localConnection = new RTCPeerConnection();
</span><del>- localConnection.onicecandidate = iceCallback1;
</del><ins>+ localConnection.onicecandidate = (event) => { iceCallback1(event, filterOutICECandidate) };
</ins><span class="cx"> setupLocalConnection(localConnection);
</span><span class="cx">
</span><span class="cx"> remoteConnection = new RTCPeerConnection();
</span><del>- remoteConnection.onicecandidate = iceCallback2;
</del><ins>+ remoteConnection.onicecandidate = (event) => { iceCallback2(event, filterOutICECandidate) };
</ins><span class="cx"> setupRemoteConnection(remoteConnection);
</span><span class="cx">
</span><span class="cx"> localConnection.createOffer().then(gotDescription1, onCreateSessionDescriptionError);
</span><span class="lines">@@ -40,14 +40,25 @@
</span><span class="cx"> localConnection.setRemoteDescription(desc);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function iceCallback1(event)
</del><ins>+function iceCallback1(event, filterOutICECandidate)
</ins><span class="cx"> {
</span><del>- if (event.candidate)
- remoteConnection.addIceCandidate(event.candidate).then(onAddIceCandidateSuccess, onAddIceCandidateError);
</del><ins>+ if (!event.candidate)
+ return;
+
+ if (filterOutICECandidate && filterOutICECandidate(event.candidate))
+ return;
+
+ remoteConnection.addIceCandidate(event.candidate).then(onAddIceCandidateSuccess, onAddIceCandidateError);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function iceCallback2(event)
</del><ins>+function iceCallback2(event, filterOutICECandidate)
</ins><span class="cx"> {
</span><ins>+ if (!event.candidate)
+ return;
+
+ if (filterOutICECandidate && filterOutICECandidate(event.candidate))
+ return;
+
</ins><span class="cx"> if (event.candidate)
</span><span class="cx"> localConnection.addIceCandidate(event.candidate).then(onAddIceCandidateSuccess, onAddIceCandidateError);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2017-02-27 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] Add support for libwebrtc TCP incoming connections
+ https://bugs.webkit.org/show_bug.cgi?id=168748
+
+ Reviewed by Alex Christensen.
+
+ Covered by added layout tests.
+
+ When a libwebrtc server socket is signalling a new connnection through SignalNewConnection, we do:
+ - Wrap the incoming socket into a LibWebRTCSocketClient
+ - Store it into a pending socket map with an identifier
+ - Send a message to the web process of a new connection with the server socket identifier and new connection socket identifier.
+ The Web process then creates a WebRTCSocket wrapper around it by sendinig a WrapNewTCPConnection message.
+ It then propagates the SignalNewConnection to libwebrtc code path.
+
+ * NetworkProcess/webrtc/LibWebRTCSocketClient.cpp:
+ (WebKit::LibWebRTCSocketClient::LibWebRTCSocketClient):
+ (WebKit::LibWebRTCSocketClient::signalReadPacket):
+ (WebKit::LibWebRTCSocketClient::signalSentPacket):
+ (WebKit::LibWebRTCSocketClient::signalNewConnection):
+ (WebKit::LibWebRTCSocketClient::signalAddressReady):
+ (WebKit::LibWebRTCSocketClient::signalConnect):
+ (WebKit::LibWebRTCSocketClient::signalClose):
+ * NetworkProcess/webrtc/LibWebRTCSocketClient.h:
+ * NetworkProcess/webrtc/NetworkRTCProvider.cpp:
+ (WebKit::NetworkRTCProvider::wrapNewTCPConnection):
+ (WebKit::NetworkRTCProvider::newConnection):
+ * NetworkProcess/webrtc/NetworkRTCProvider.h:
+ * NetworkProcess/webrtc/NetworkRTCProvider.messages.in:
+ * WebProcess/Network/webrtc/LibWebRTCSocket.cpp:
+ (WebKit::LibWebRTCSocket::signalNewConnection):
+ * WebProcess/Network/webrtc/LibWebRTCSocket.h:
+ * WebProcess/Network/webrtc/LibWebRTCSocketFactory.cpp:
+ (WebKit::LibWebRTCSocketFactory::createNewConnectionSocket):
+ * WebProcess/Network/webrtc/LibWebRTCSocketFactory.h:
+ * WebProcess/Network/webrtc/WebRTCSocket.cpp:
+ (WebKit::WebRTCSocket::signalNewConnection):
+ * WebProcess/Network/webrtc/WebRTCSocket.h:
+ * WebProcess/Network/webrtc/WebRTCSocket.messages.in:
+
</ins><span class="cx"> 2017-02-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Don't use undefined sandbox rule on macOS 10.11 or earlier
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesswebrtcLibWebRTCSocketClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/webrtc/LibWebRTCSocketClient.cpp (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/webrtc/LibWebRTCSocketClient.cpp 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/NetworkProcess/webrtc/LibWebRTCSocketClient.cpp 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -51,14 +51,25 @@
</span><span class="cx">
</span><span class="cx"> m_socket->SignalReadPacket.connect(this, &LibWebRTCSocketClient::signalReadPacket);
</span><span class="cx"> m_socket->SignalSentPacket.connect(this, &LibWebRTCSocketClient::signalSentPacket);
</span><del>- m_socket->SignalConnect.connect(this, &LibWebRTCSocketClient::signalConnect);
</del><span class="cx"> m_socket->SignalClose.connect(this, &LibWebRTCSocketClient::signalClose);
</span><span class="cx">
</span><del>- if (type == Type::ClientTCP) {
</del><ins>+ switch (type) {
+ case Type::ServerConnectionTCP:
+ return;
+ case Type::ClientTCP:
+ m_socket->SignalConnect.connect(this, &LibWebRTCSocketClient::signalConnect);
</ins><span class="cx"> m_socket->SignalAddressReady.connect(this, &LibWebRTCSocketClient::signalAddressReady);
</span><span class="cx"> return;
</span><ins>+ case Type::ServerTCP:
+ m_socket->SignalConnect.connect(this, &LibWebRTCSocketClient::signalConnect);
+ m_socket->SignalNewConnection.connect(this, &LibWebRTCSocketClient::signalNewConnection);
+ signalAddressReady();
+ return;
+ case Type::UDP:
+ m_socket->SignalConnect.connect(this, &LibWebRTCSocketClient::signalConnect);
+ signalAddressReady();
+ return;
</ins><span class="cx"> }
</span><del>- signalAddressReady();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LibWebRTCSocketClient::sendTo(const WebCore::SharedBuffer& buffer, const rtc::SocketAddress& socketAddress, const rtc::PacketOptions& options)
</span><span class="lines">@@ -79,8 +90,9 @@
</span><span class="cx"> m_socket->SetOption(static_cast<rtc::Socket::Option>(option), value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LibWebRTCSocketClient::signalReadPacket(rtc::AsyncPacketSocket*, const char* value, size_t length, const rtc::SocketAddress& address, const rtc::PacketTime& packetTime)
</del><ins>+void LibWebRTCSocketClient::signalReadPacket(rtc::AsyncPacketSocket* socket, const char* value, size_t length, const rtc::SocketAddress& address, const rtc::PacketTime& packetTime)
</ins><span class="cx"> {
</span><ins>+ ASSERT_UNUSED(socket, m_socket.get() == socket);
</ins><span class="cx"> auto buffer = WebCore::SharedBuffer::create(value, length);
</span><span class="cx"> m_rtcProvider.sendFromMainThread([identifier = m_identifier, buffer = WTFMove(buffer), address = RTCNetwork::isolatedCopy(address), packetTime](IPC::Connection& connection) {
</span><span class="cx"> IPC::DataReference data(reinterpret_cast<const uint8_t*>(buffer->data()), buffer->size());
</span><span class="lines">@@ -88,15 +100,23 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LibWebRTCSocketClient::signalSentPacket(rtc::AsyncPacketSocket*, const rtc::SentPacket& sentPacket)
</del><ins>+void LibWebRTCSocketClient::signalSentPacket(rtc::AsyncPacketSocket* socket, const rtc::SentPacket& sentPacket)
</ins><span class="cx"> {
</span><ins>+ ASSERT_UNUSED(socket, m_socket.get() == socket);
</ins><span class="cx"> m_rtcProvider.sendFromMainThread([identifier = m_identifier, sentPacket](IPC::Connection& connection) {
</span><span class="cx"> connection.send(Messages::WebRTCSocket::SignalSentPacket(sentPacket.packet_id, sentPacket.send_time_ms), identifier);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LibWebRTCSocketClient::signalAddressReady(rtc::AsyncPacketSocket*, const rtc::SocketAddress& address)
</del><ins>+void LibWebRTCSocketClient::signalNewConnection(rtc::AsyncPacketSocket* socket, rtc::AsyncPacketSocket* newSocket)
</ins><span class="cx"> {
</span><ins>+ ASSERT_UNUSED(socket, m_socket.get() == socket);
+ m_rtcProvider.newConnection(*this, std::unique_ptr<rtc::AsyncPacketSocket>(newSocket));
+}
+
+void LibWebRTCSocketClient::signalAddressReady(rtc::AsyncPacketSocket* socket, const rtc::SocketAddress& address)
+{
+ ASSERT_UNUSED(socket, m_socket.get() == socket);
</ins><span class="cx"> m_rtcProvider.sendFromMainThread([identifier = m_identifier, address = RTCNetwork::isolatedCopy(address)](IPC::Connection& connection) {
</span><span class="cx"> connection.send(Messages::WebRTCSocket::SignalAddressReady(RTCNetwork::SocketAddress(address)), identifier);
</span><span class="cx"> });
</span><span class="lines">@@ -107,15 +127,17 @@
</span><span class="cx"> signalAddressReady(m_socket.get(), m_socket->GetLocalAddress());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LibWebRTCSocketClient::signalConnect(rtc::AsyncPacketSocket*)
</del><ins>+void LibWebRTCSocketClient::signalConnect(rtc::AsyncPacketSocket* socket)
</ins><span class="cx"> {
</span><ins>+ ASSERT_UNUSED(socket, m_socket.get() == socket);
</ins><span class="cx"> m_rtcProvider.sendFromMainThread([identifier = m_identifier](IPC::Connection& connection) {
</span><span class="cx"> connection.send(Messages::WebRTCSocket::SignalConnect(), identifier);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LibWebRTCSocketClient::signalClose(rtc::AsyncPacketSocket*, int error)
</del><ins>+void LibWebRTCSocketClient::signalClose(rtc::AsyncPacketSocket* socket, int error)
</ins><span class="cx"> {
</span><ins>+ ASSERT_UNUSED(socket, m_socket.get() == socket);
</ins><span class="cx"> m_rtcProvider.sendFromMainThread([identifier = m_identifier, error](IPC::Connection& connection) {
</span><span class="cx"> connection.send(Messages::WebRTCSocket::SignalClose(error), identifier);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesswebrtcLibWebRTCSocketClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/webrtc/LibWebRTCSocketClient.h (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/webrtc/LibWebRTCSocketClient.h 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/NetworkProcess/webrtc/LibWebRTCSocketClient.h 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -49,10 +49,12 @@
</span><span class="cx">
</span><span class="cx"> class LibWebRTCSocketClient final : public sigslot::has_slots<> {
</span><span class="cx"> public:
</span><del>- enum class Type { UDP, ServerTCP, ClientTCP };
</del><ins>+ enum class Type { UDP, ServerTCP, ClientTCP, ServerConnectionTCP };
</ins><span class="cx">
</span><span class="cx"> LibWebRTCSocketClient(uint64_t identifier, NetworkRTCProvider&, std::unique_ptr<rtc::AsyncPacketSocket>&&, Type);
</span><span class="cx">
</span><ins>+ uint64_t identifier() const { return m_identifier; }
+
</ins><span class="cx"> private:
</span><span class="cx"> friend class NetworkRTCSocket;
</span><span class="cx">
</span><span class="lines">@@ -65,6 +67,7 @@
</span><span class="cx"> void signalAddressReady(rtc::AsyncPacketSocket*, const rtc::SocketAddress&);
</span><span class="cx"> void signalConnect(rtc::AsyncPacketSocket*);
</span><span class="cx"> void signalClose(rtc::AsyncPacketSocket*, int);
</span><ins>+ void signalNewConnection(rtc::AsyncPacketSocket* socket, rtc::AsyncPacketSocket* newSocket);
</ins><span class="cx">
</span><span class="cx"> void signalAddressReady();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.cpp (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.cpp 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.cpp 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx"> #include "NetworkRTCSocket.h"
</span><span class="cx"> #include "WebRTCResolverMessages.h"
</span><ins>+#include "WebRTCSocketMessages.h"
</ins><span class="cx"> #include <WebCore/LibWebRTCMacros.h>
</span><span class="cx"> #include <webrtc/base/asyncpacketsocket.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -91,6 +92,14 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkRTCProvider::wrapNewTCPConnection(uint64_t identifier, uint64_t newConnectionSocketIdentifier)
+{
+ callOnRTCNetworkThread([this, identifier, newConnectionSocketIdentifier]() {
+ std::unique_ptr<rtc::AsyncPacketSocket> socket = m_pendingIncomingSockets.take(newConnectionSocketIdentifier);
+ addSocket(identifier, std::make_unique<LibWebRTCSocketClient>(identifier, *this, WTFMove(socket), LibWebRTCSocketClient::Type::ServerConnectionTCP));
+ });
+}
+
</ins><span class="cx"> void NetworkRTCProvider::addSocket(uint64_t identifier, std::unique_ptr<LibWebRTCSocketClient>&& socket)
</span><span class="cx"> {
</span><span class="cx"> m_sockets.add(identifier, WTFMove(socket));
</span><span class="lines">@@ -101,6 +110,14 @@
</span><span class="cx"> return m_sockets.take(identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkRTCProvider::newConnection(LibWebRTCSocketClient& serverSocket, std::unique_ptr<rtc::AsyncPacketSocket>&& newSocket)
+{
+ sendFromMainThread([identifier = serverSocket.identifier(), incomingSocketIdentifier = ++m_incomingSocketIdentifier, remoteAddress = RTCNetwork::isolatedCopy(newSocket->GetRemoteAddress())](IPC::Connection& connection) {
+ connection.send(Messages::WebRTCSocket::SignalNewConnection(incomingSocketIdentifier, RTCNetwork::SocketAddress(remoteAddress)), identifier);
+ });
+ m_pendingIncomingSockets.add(m_incomingSocketIdentifier, WTFMove(newSocket));
+}
+
</ins><span class="cx"> void NetworkRTCProvider::didReceiveNetworkRTCSocketMessage(IPC::Connection& connection, IPC::Decoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> NetworkRTCSocket(decoder.destinationID(), *this).didReceiveMessage(connection, decoder);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.h (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.h 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.h 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx"> void callOnRTCNetworkThread(Function<void()>&&);
</span><span class="cx"> void sendFromMainThread(Function<void(IPC::Connection&)>&&);
</span><span class="cx">
</span><ins>+ void newConnection(LibWebRTCSocketClient&, std::unique_ptr<rtc::AsyncPacketSocket>&&);
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit NetworkRTCProvider(NetworkConnectionToWebProcess&);
</span><span class="cx">
</span><span class="lines">@@ -72,6 +74,8 @@
</span><span class="cx"> void createUDPSocket(uint64_t, const RTCNetwork::SocketAddress&, uint16_t, uint16_t);
</span><span class="cx"> void createClientTCPSocket(uint64_t, const RTCNetwork::SocketAddress&, const RTCNetwork::SocketAddress&, int);
</span><span class="cx"> void createServerTCPSocket(uint64_t, const RTCNetwork::SocketAddress&, uint16_t minPort, uint16_t maxPort, int);
</span><ins>+ void wrapNewTCPConnection(uint64_t identifier, uint64_t newConnectionSocketIdentifier);
+
</ins><span class="cx"> void createResolver(uint64_t, const String&);
</span><span class="cx"> void stopResolver(uint64_t);
</span><span class="cx">
</span><span class="lines">@@ -102,6 +106,9 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<rtc::Thread> m_rtcNetworkThread;
</span><span class="cx"> UniqueRef<rtc::BasicPacketSocketFactory> m_packetSocketFactory;
</span><ins>+
+ HashMap<uint64_t, std::unique_ptr<rtc::AsyncPacketSocket>> m_pendingIncomingSockets;
+ uint64_t m_incomingSocketIdentifier { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCProvidermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.messages.in (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.messages.in 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.messages.in 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> CreateClientTCPSocket(int identifier, WebKit::RTCNetwork::SocketAddress localAddress, WebKit::RTCNetwork::SocketAddress remoteAddress, int options)
</span><span class="cx"> CreateResolver(uint64_t identifier, String address)
</span><span class="cx"> StopResolver(uint64_t identifier)
</span><ins>+ WrapNewTCPConnection(uint64_t identifier, uint64_t newConnectionSocketIdentifier)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // USE(LIBWEBRTC)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.cpp (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.cpp 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.cpp 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -106,6 +106,12 @@
</span><span class="cx"> SignalClose(this, error);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void LibWebRTCSocket::signalNewConnection(rtc::AsyncPacketSocket* newConnectionSocket)
+{
+ ASSERT(m_type == Type::ServerTCP);
+ SignalNewConnection(this, newConnectionSocket);
+}
+
</ins><span class="cx"> static inline String authKey(const rtc::PacketOptions& options)
</span><span class="cx"> {
</span><span class="cx"> if (options.packet_time_params.srtp_auth_key.size() <= 0)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.h (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.h 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocket.h 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> class LibWebRTCSocket final : public rtc::AsyncPacketSocket {
</span><span class="cx"> public:
</span><del>- enum class Type { UDP, ServerTCP, ClientTCP };
</del><ins>+ enum class Type { UDP, ServerTCP, ClientTCP, ServerConnectionTCP };
</ins><span class="cx">
</span><span class="cx"> LibWebRTCSocket(LibWebRTCSocketFactory&, uint64_t identifier, Type, const rtc::SocketAddress& localAddress, const rtc::SocketAddress& remoteAddress);
</span><span class="cx"> ~LibWebRTCSocket();
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> void signalAddressReady(const rtc::SocketAddress&);
</span><span class="cx"> void signalConnect();
</span><span class="cx"> void signalClose(int);
</span><ins>+ void signalNewConnection(rtc::AsyncPacketSocket*);
</ins><span class="cx">
</span><span class="cx"> // AsyncPacketSocket API
</span><span class="cx"> int GetError() const final { return m_error; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocketFactory.cpp (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocketFactory.cpp 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocketFactory.cpp 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -86,6 +86,21 @@
</span><span class="cx"> return socket.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+rtc::AsyncPacketSocket* LibWebRTCSocketFactory::createNewConnectionSocket(LibWebRTCSocket& serverSocket, uint64_t newConnectionSocketIdentifier, const rtc::SocketAddress& remoteAddress)
+{
+ auto socket = std::make_unique<LibWebRTCSocket>(*this, ++s_uniqueSocketIdentifier, LibWebRTCSocket::Type::ServerConnectionTCP, serverSocket.localAddress(), remoteAddress);
+ socket->setState(LibWebRTCSocket::STATE_CONNECTED);
+ m_sockets.set(socket->identifier(), socket.get());
+
+ callOnMainThread([identifier = socket->identifier(), newConnectionSocketIdentifier]() {
+ if (!WebProcess::singleton().networkConnection().connection().send(Messages::NetworkRTCProvider::WrapNewTCPConnection(identifier, newConnectionSocketIdentifier), 0)) {
+ // FIXME: Set error back to socket
+ return;
+ }
+ });
+ return socket.release();
+}
+
</ins><span class="cx"> void LibWebRTCSocketFactory::detach(LibWebRTCSocket& socket)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_sockets.contains(socket.identifier()));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcLibWebRTCSocketFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocketFactory.h (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocketFactory.h 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/LibWebRTCSocketFactory.h 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<LibWebRTCResolver> takeResolver(uint64_t identifier) { return m_resolvers.take(identifier); }
</span><span class="cx">
</span><ins>+ rtc::AsyncPacketSocket* createNewConnectionSocket(LibWebRTCSocket&, uint64_t newConnectionSocketIdentifier, const rtc::SocketAddress&);
+
</ins><span class="cx"> private:
</span><span class="cx"> rtc::AsyncPacketSocket* CreateUdpSocket(const rtc::SocketAddress&, uint16_t minPort, uint16_t maxPort) final;
</span><span class="cx"> rtc::AsyncPacketSocket* CreateServerTcpSocket(const rtc::SocketAddress&, uint16_t min_port, uint16_t max_port, int options) final;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.cpp (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.cpp 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.cpp 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -90,6 +90,13 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebRTCSocket::signalNewConnection(uint64_t newSocketIdentifier, const RTCNetwork::SocketAddress& remoteAddress)
+{
+ signalOnNetworkThread(m_factory, m_identifier, [newSocketIdentifier, remoteAddress = RTCNetwork::isolatedCopy(remoteAddress.value)](LibWebRTCSocket& socket) {
+ socket.signalNewConnection(socket.m_factory.createNewConnectionSocket(socket, newSocketIdentifier, remoteAddress));
+ });
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // USE(LIBWEBRTC)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCSocketh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.h (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.h 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.h 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -55,7 +55,8 @@
</span><span class="cx"> void signalAddressReady(const RTCNetwork::SocketAddress&);
</span><span class="cx"> void signalConnect();
</span><span class="cx"> void signalClose(int);
</span><del>-
</del><ins>+ void signalNewConnection(uint64_t newSocketIdentifier, const WebKit::RTCNetwork::SocketAddress&);
+
</ins><span class="cx"> LibWebRTCSocketFactory& m_factory;
</span><span class="cx"> uint64_t m_identifier { 0 };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkwebrtcWebRTCSocketmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.messages.in (213103 => 213104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.messages.in 2017-02-28 01:03:10 UTC (rev 213103)
+++ trunk/Source/WebKit2/WebProcess/Network/webrtc/WebRTCSocket.messages.in 2017-02-28 01:10:39 UTC (rev 213104)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> SignalAddressReady(WebKit::RTCNetwork::SocketAddress address)
</span><span class="cx"> SignalConnect()
</span><span class="cx"> SignalClose(int error)
</span><ins>+ SignalNewConnection(uint64_t newSocketIdentifier, WebKit::RTCNetwork::SocketAddress remoteAddress)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // USE(LIBWEBRTC)
</span></span></pre>
</div>
</div>
</body>
</html>