Attachment 372840 Details for Bug 199035 – PATCH

[patch] PATCH

199035.diff (text/plain), 4.04 KB, created by Basuke Suzuki on 2019-06-25 10:34:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2019-06-25 10:34:00 PDT

Size: 4.04 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 706050d1f84..34e276aa584 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-06-25  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [RemoteInspector] Add address argument to listen for RemoteInspectorServer Socket implementation.
>+        https://bugs.webkit.org/show_bug.cgi?id=199035
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added new argument `address` to start listening. 
>+
>+        * inspector/remote/socket/RemoteInspectorServer.cpp:
>+        (Inspector::RemoteInspectorServer::start):
>+        * inspector/remote/socket/RemoteInspectorServer.h:
>+        * inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp:
>+        (Inspector::Socket::listen):
>+        * inspector/remote/socket/win/RemoteInspectorSocketWin.cpp:
>+        (Inspector::Socket::listen):
>+
> 2019-06-19  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [WPE][GTK] Fix build with unified sources disabled
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.cpp b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.cpp
>index d2a5c3a5065..40ae5b8b200 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.cpp
>@@ -132,11 +132,11 @@ RemoteInspectorServer& RemoteInspectorServer::singleton()
>     return server;
> }
> 
>-bool RemoteInspectorServer::start(uint16_t port)
>+bool RemoteInspectorServer::start(const char* address, uint16_t port)
> {
>     m_server = RemoteInspectorSocketEndpoint::create(this, "RemoteInspectorServer");
> 
>-    if (!m_server->listenInet(nullptr, port)) {
>+    if (!m_server->listenInet(address, port)) {
>         m_server = nullptr;
>         return false;
>     }
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.h b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.h
>index 4138ab53349..74076e1d59e 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.h
>+++ b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.h
>@@ -40,7 +40,7 @@ class RemoteInspectorServer : public RemoteInspectorConnectionClient {
> public:
>     JS_EXPORT_PRIVATE static RemoteInspectorServer& singleton();
> 
>-    JS_EXPORT_PRIVATE bool start(uint16_t);
>+    JS_EXPORT_PRIVATE bool start(const char* address, uint16_t port);
>     bool isRunning() const { return !!m_server; }
> 
>     JS_EXPORT_PRIVATE Optional<uint16_t> listenForTargets();
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp b/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp
>index 7037c4af6b6..7317c925f0a 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp
>@@ -92,7 +92,7 @@ Optional<PlatformSocketType> listen(const char* addressStr, uint16_t port)
> 
>     // FIXME: Support AF_INET6 connections.
>     address.sin_family = AF_INET;
>-    if (addressStr)
>+    if (addressStr && *addressStr)
>         inet_aton(addressStr, &address.sin_addr);
>     else
>         address.sin_addr.s_addr = htonl(INADDR_ANY);
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/win/RemoteInspectorSocketWin.cpp b/Source/JavaScriptCore/inspector/remote/socket/win/RemoteInspectorSocketWin.cpp
>index dc32cd611c0..5e0a5c360fb 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/win/RemoteInspectorSocketWin.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/socket/win/RemoteInspectorSocketWin.cpp
>@@ -178,7 +178,7 @@ Optional<PlatformSocketType> listen(const char* addressStr, uint16_t port)
>     // FIXME: Support AF_INET6 connections.
>     struct sockaddr_in address = { };
>     address.sin_family = AF_INET;
>-    if (addressStr)
>+    if (addressStr && *addressStr)
>         ::inet_pton(AF_INET, addressStr, &address.sin_addr);
>     else
>         address.sin_addr.s_addr = htonl(INADDR_ANY);

Actions: View | Formatted Diff | Diff

Attachments on bug 199035: 372503 | 372840