Title: [208583] trunk/Tools
Revision
208583
Author
[email protected]
Date
2016-11-11 00:08:15 -0800 (Fri, 11 Nov 2016)

Log Message

[GTK][JHbuild] bump libnice version in openwebrtc.modules
https://bugs.webkit.org/show_bug.cgi?id=164586

Reviewed by Michael Catanzaro.

Update to a recent libnice git snapshot and remove patches already
upstream or not applying anymore. The patches not upstream yet
will be reported in Phabricator.

* gtk/openwebrtc.modules:
* gtk/patches/libnice-0001-agent-Remove-unnecessary-NULL-check.patch: Removed.
* gtk/patches/libnice-0002-Do-not-update-a-remote-candidate-s-type.patch: Removed.
* gtk/patches/libnice-0002-TURN-handle-437-Allocation-Mismatch-responses.patch: Removed.
* gtk/patches/libnice-0003-Do-not-compare-scope-for-IPv6-address-when-scope-is-.patch: Removed.
* gtk/patches/libnice-0004-Removing-no-op-assignment.patch: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/Tools/ChangeLog (208582 => 208583)


--- trunk/Tools/ChangeLog	2016-11-11 07:42:05 UTC (rev 208582)
+++ trunk/Tools/ChangeLog	2016-11-11 08:08:15 UTC (rev 208583)
@@ -1,3 +1,21 @@
+2016-11-11  Philippe Normand  <[email protected]>
+
+        [GTK][JHbuild] bump libnice version in openwebrtc.modules
+        https://bugs.webkit.org/show_bug.cgi?id=164586
+
+        Reviewed by Michael Catanzaro.
+
+        Update to a recent libnice git snapshot and remove patches already
+        upstream or not applying anymore. The patches not upstream yet
+        will be reported in Phabricator.
+
+        * gtk/openwebrtc.modules:
+        * gtk/patches/libnice-0001-agent-Remove-unnecessary-NULL-check.patch: Removed.
+        * gtk/patches/libnice-0002-Do-not-update-a-remote-candidate-s-type.patch: Removed.
+        * gtk/patches/libnice-0002-TURN-handle-437-Allocation-Mismatch-responses.patch: Removed.
+        * gtk/patches/libnice-0003-Do-not-compare-scope-for-IPv6-address-when-scope-is-.patch: Removed.
+        * gtk/patches/libnice-0004-Removing-no-op-assignment.patch: Removed.
+
 2016-11-10  Alex Christensen  <[email protected]>
 
         Fix assertion after r208534.

Modified: trunk/Tools/gtk/openwebrtc.modules (208582 => 208583)


--- trunk/Tools/gtk/openwebrtc.modules	2016-11-11 07:42:05 UTC (rev 208582)
+++ trunk/Tools/gtk/openwebrtc.modules	2016-11-11 08:08:15 UTC (rev 208583)
@@ -7,8 +7,6 @@
       href=""
   <repository type="git" name="gstreamer"
       href=""
-  <repository type="tarball" name="nice.freedesktop.org"
-      href=""
   <repository type="git" name="github.com"
       href=""
 
@@ -29,14 +27,10 @@
     <dependencies>
       <dep package="gstreamer"/>
     </dependencies>
-    <branch repo="nice.freedesktop.org" module="releases/libnice-${version}.tar.gz" version="0.1.13" checkoutdir="libnice-${version}">
-      <patch file="libnice-0001-agent-Remove-unnecessary-NULL-check.patch" strip="1"/>
-      <patch file="libnice-0002-Do-not-update-a-remote-candidate-s-type.patch" strip="1"/>
-      <patch file="libnice-0003-Do-not-compare-scope-for-IPv6-address-when-scope-is-.patch" strip="1"/>
-      <patch file="libnice-0004-Removing-no-op-assignment.patch" strip="1"/>
+    <branch module="libnice/libnice/archive/${version}.tar.gz" version="2803a0b4b70af9684e05ef5ed3f0c2fbca4b6c93"
+            checkoutdir="libnice-${version}" repo="github-tarball">
       <patch file="libnice-0001-nicesrc-spin-the-agent-mainloop-in-a-separate-thread.patch" strip="1"/>
       <patch file="libnice-0001-TURN-allow-REALM-to-be-empty.patch" strip="1"/>
-      <patch file="libnice-0002-TURN-handle-437-Allocation-Mismatch-responses.patch" strip="1"/>
     </branch>
   </autotools>
 

Deleted: trunk/Tools/gtk/patches/libnice-0001-agent-Remove-unnecessary-NULL-check.patch (208582 => 208583)


--- trunk/Tools/gtk/patches/libnice-0001-agent-Remove-unnecessary-NULL-check.patch	2016-11-11 07:42:05 UTC (rev 208582)
+++ trunk/Tools/gtk/patches/libnice-0001-agent-Remove-unnecessary-NULL-check.patch	2016-11-11 08:08:15 UTC (rev 208583)
@@ -1,44 +0,0 @@
-From 7b7d2d986876fc53a23af7b516d78f82f2a546e9 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <[email protected]>
-Date: Sun, 3 May 2015 16:05:30 +0100
-Subject: [PATCH 1/4] agent: Remove unnecessary NULL check
-
-With the changes in commit 483bdcf8, @name is now guaranteed to be
-non-NULL. Spotted by Coverity.
-
-CID: #109878
----
- agent/agent.c | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 259fdc9..e733c82 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -5329,16 +5329,14 @@ nice_agent_set_stream_name (NiceAgent *agent, guint stream_id,
- 
-   agent_lock();
- 
--  if (name != NULL) {
--    for (i = agent->streams; i; i = i->next) {
--      Stream *stream = i->data;
-+  for (i = agent->streams; i; i = i->next) {
-+    Stream *stream = i->data;
- 
--      if (stream->id != stream_id &&
--          g_strcmp0 (stream->name, name) == 0)
--        goto done;
--      else if (stream->id == stream_id)
--        stream_to_name = stream;
--    }
-+    if (stream->id != stream_id &&
-+        g_strcmp0 (stream->name, name) == 0)
-+      goto done;
-+    else if (stream->id == stream_id)
-+      stream_to_name = stream;
-   }
- 
-   if (stream_to_name == NULL)
--- 
-2.3.2 (Apple Git-55)
-

Deleted: trunk/Tools/gtk/patches/libnice-0002-Do-not-update-a-remote-candidate-s-type.patch (208582 => 208583)


--- trunk/Tools/gtk/patches/libnice-0002-Do-not-update-a-remote-candidate-s-type.patch	2016-11-11 07:42:05 UTC (rev 208582)
+++ trunk/Tools/gtk/patches/libnice-0002-Do-not-update-a-remote-candidate-s-type.patch	2016-11-11 08:08:15 UTC (rev 208583)
@@ -1,31 +0,0 @@
-From 93862c1e1940618e06143d4788f54bffd4d1c5da Mon Sep 17 00:00:00 2001
-From: Youness Alaoui <[email protected]>
-Date: Tue, 5 May 2015 14:24:15 -0400
-Subject: [PATCH 2/4] Do not update a remote candidate's type
-
-When adding a remote candidate, if it's the same ip:port, we should
-also check its type, otherwise it's a new candidate. We can't allow
-a candidate type to be updated. This caused issues to ikonst_ on IRC
-where for some reason a host candidate appeared as both host and prflx
-and the update caused a remote host candidate to be updated to prflx
-causing a crash when the sockptr was being accessed.
----
- agent/agent.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index e733c82..38b679f 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -3041,7 +3041,7 @@ static gboolean priv_add_remote_candidate (
- 
-   /* step: check whether the candidate already exists */
-   candidate = component_find_remote_candidate(component, addr, transport);
--  if (candidate) {
-+  if (candidate && candidate->type == type) {
-     if (nice_debug_is_enabled ()) {
-       gchar tmpbuf[INET6_ADDRSTRLEN];
-       nice_address_to_string (addr, tmpbuf);
--- 
-2.3.2 (Apple Git-55)
-

Deleted: trunk/Tools/gtk/patches/libnice-0002-TURN-handle-437-Allocation-Mismatch-responses.patch (208582 => 208583)


--- trunk/Tools/gtk/patches/libnice-0002-TURN-handle-437-Allocation-Mismatch-responses.patch	2016-11-11 07:42:05 UTC (rev 208582)
+++ trunk/Tools/gtk/patches/libnice-0002-TURN-handle-437-Allocation-Mismatch-responses.patch	2016-11-11 08:08:15 UTC (rev 208583)
@@ -1,131 +0,0 @@
-From 9e2ced131ac0fc642ef5c861851c5988d8b96d16 Mon Sep 17 00:00:00 2001
-From: Alessandro Decina <[email protected]>
-Date: Thu, 24 Mar 2016 10:54:20 +1100
-Subject: [PATCH 2/2] TURN: handle 437 Allocation Mismatch responses
-
-On Allocation Mismatch responses, the client is supposed to retry with a
-different host:port combination.
----
- agent/conncheck.c | 42 +++++++++++++++++++++++++++++++++---------
- agent/discovery.h |  1 +
- stun/stunagent.c  |  2 +-
- 3 files changed, 35 insertions(+), 10 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 97bf536..d03e57a 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -2630,9 +2630,10 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
-   StunTransactionId discovery_id;
-   StunTransactionId response_id;
-   stun_message_id (resp, response_id);
-+  CandidateDiscovery *d = NULL;
- 
-   for (i = agent->discovery_list; i && trans_found != TRUE; i = i->next) {
--    CandidateDiscovery *d = i->data;
-+    d = i->data;
- 
-     if (d->type == NICE_CANDIDATE_TYPE_RELAYED &&
-         d->stun_message.buffer) {
-@@ -2757,6 +2758,7 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
-           uint16_t sent_realm_len = 0;
-           uint16_t recv_realm_len = 0;
- 
-+          trans_found = TRUE;
-           sent_realm = (uint8_t *) stun_message_find (&d->stun_message,
-               STUN_ATTRIBUTE_REALM, &sent_realm_len);
-           recv_realm = (uint8_t *) stun_message_find (resp,
-@@ -2769,11 +2771,31 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
-               stun_message_get_class (resp) == STUN_ERROR &&
-               stun_message_find_error (resp, &code) ==
-               STUN_MESSAGE_RETURN_SUCCESS) {
--            if (code == 438 ||
-+            if (code == 437 ||
-+                code == 438 ||
-                 (code == 401 &&
-                     !(recv_realm_len == sent_realm_len &&
-                         recv_realm != NULL && sent_realm != NULL &&
-                         memcmp (sent_realm, recv_realm, sent_realm_len) == 0))) {
-+              if (code == 437) {
-+                if (d->turn_retries++ == 3)
-+                  goto error;
-+
-+                /* retry up to three times on Allocation Mismatch errors */
-+                NiceAddress addr = d->nicesock->addr;
-+                NiceSocket *new_socket;
-+
-+                /* FIXME: this ignores nice_agent_set_port_range */
-+                nice_address_set_port (&addr, 0);
-+
-+                new_socket = nice_udp_bsd_socket_new (&addr);
-+                if (new_socket) {
-+                  _priv_set_socket_tos (agent, new_socket, d->stream->tos);
-+                  component_attach_socket (d->component, new_socket);
-+                  d->nicesock = new_socket;
-+                }
-+              }
-+
-               d->stun_resp_msg = *resp;
-               memcpy (d->stun_resp_buffer, resp->buffer,
-                   stun_message_length (resp));
-@@ -2782,23 +2804,25 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
-               d->pending = FALSE;
-             } else {
-               /* case: a real unauthorized error */
--              d->stun_message.buffer = NULL;
--              d->stun_message.buffer_len = 0;
--              d->done = TRUE;
-+              goto error;
-             }
-           } else {
-             /* case: STUN error, the check STUN context was freed */
--            d->stun_message.buffer = NULL;
--            d->stun_message.buffer_len = 0;
--            d->done = TRUE;
-+            goto error;
-           }
--          trans_found = TRUE;
-         }
-       }
-     }
-   }
- 
-   return trans_found;
-+
-+error:
-+  d->stun_message.buffer = NULL;
-+  d->stun_message.buffer_len = 0;
-+  d->done = TRUE;
-+
-+  return trans_found;
- }
- 
- 
-diff --git a/agent/discovery.h b/agent/discovery.h
-index c22ea6a..148b8c2 100644
---- a/agent/discovery.h
-+++ b/agent/discovery.h
-@@ -56,6 +56,7 @@ typedef struct
-   Stream *stream;
-   Component *component;
-   TurnServer *turn;
-+  gint turn_retries;
-   StunAgent stun_agent;
-   StunTimer timer;
-   uint8_t stun_buffer[STUN_MAX_MESSAGE_SIZE_IPV6];
-diff --git a/stun/stunagent.c b/stun/stunagent.c
-index 2abcc29..0abae3d 100644
---- a/stun/stunagent.c
-+++ b/stun/stunagent.c
-@@ -301,7 +301,7 @@ StunValidationStatus stun_agent_validate (StunAgent *agent, StunMessage *msg,
-     } else if (!(stun_message_get_class (msg) == STUN_ERROR &&
-         stun_message_find_error (msg, &error_code) ==
-             STUN_MESSAGE_RETURN_SUCCESS &&
--        (error_code == 400 || error_code == 401))) {
-+        (error_code == 400 || error_code == 401 || error_code == 437))) {
-       stun_debug ("STUN auth error: No message integrity attribute!");
-       return STUN_VALIDATION_UNAUTHORIZED;
-     }
--- 
-2.3.4
-

Deleted: trunk/Tools/gtk/patches/libnice-0003-Do-not-compare-scope-for-IPv6-address-when-scope-is-.patch (208582 => 208583)


--- trunk/Tools/gtk/patches/libnice-0003-Do-not-compare-scope-for-IPv6-address-when-scope-is-.patch	2016-11-11 07:42:05 UTC (rev 208582)
+++ trunk/Tools/gtk/patches/libnice-0003-Do-not-compare-scope-for-IPv6-address-when-scope-is-.patch	2016-11-11 08:08:15 UTC (rev 208583)
@@ -1,43 +0,0 @@
-From 91a7b9324244844baf35d8fcef019a4ea3872d30 Mon Sep 17 00:00:00 2001
-From: Youness Alaoui <[email protected]>
-Date: Tue, 5 May 2015 15:00:30 -0400
-Subject: [PATCH 3/4] Do not compare scope for IPv6 address when scope is 0
-
-This caused issues with thinking local host candidates were peer-reflexive
-candidates because the nice_address_equal would fail since the scope
-would be 6 (or some other value) but locally created NiceAddress from
-a stun response would have the scope set to 0.
-We ignore the scope when comparing ipv6 candidates when scope is 0
-to avoid these kinds of issues.
-Thanks to ikonst_ for finding these issues
----
- agent/address.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/agent/address.c b/agent/address.c
-index a8d9c76..01eebab 100644
---- a/agent/address.c
-+++ b/agent/address.c
-@@ -297,7 +297,8 @@ nice_address_equal (const NiceAddress *a, const NiceAddress *b)
-     case AF_INET6:
-       return IN6_ARE_ADDR_EQUAL (&a->s.ip6.sin6_addr, &b->s.ip6.sin6_addr)
-           && (a->s.ip6.sin6_port == b->s.ip6.sin6_port)
--          && (a->s.ip6.sin6_scope_id == b->s.ip6.sin6_scope_id);
-+          && (a->s.ip6.sin6_scope_id == 0 || b->s.ip6.sin6_scope_id == 0 ||
-+              (a->s.ip6.sin6_scope_id == b->s.ip6.sin6_scope_id));
- 
-     default:
-       g_return_val_if_reached (FALSE);
-@@ -412,7 +413,8 @@ nice_address_equal_no_port (const NiceAddress *a, const NiceAddress *b)
- 
-     case AF_INET6:
-       return IN6_ARE_ADDR_EQUAL (&a->s.ip6.sin6_addr, &b->s.ip6.sin6_addr)
--          && (a->s.ip6.sin6_scope_id == b->s.ip6.sin6_scope_id);
-+          && (a->s.ip6.sin6_scope_id == 0 || b->s.ip6.sin6_scope_id == 0 ||
-+              (a->s.ip6.sin6_scope_id == b->s.ip6.sin6_scope_id));
- 
-     default:
-       g_return_val_if_reached (FALSE);
--- 
-2.3.2 (Apple Git-55)
-

Deleted: trunk/Tools/gtk/patches/libnice-0004-Removing-no-op-assignment.patch (208582 => 208583)


--- trunk/Tools/gtk/patches/libnice-0004-Removing-no-op-assignment.patch	2016-11-11 07:42:05 UTC (rev 208582)
+++ trunk/Tools/gtk/patches/libnice-0004-Removing-no-op-assignment.patch	2016-11-11 08:08:15 UTC (rev 208583)
@@ -1,24 +0,0 @@
-From 6a8c63219c632c27707267b6510dca096c6fd511 Mon Sep 17 00:00:00 2001
-From: Youness Alaoui <[email protected]>
-Date: Tue, 5 May 2015 15:07:10 -0400
-Subject: [PATCH 4/4] Removing no-op assignment
-
----
- agent/agent.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 38b679f..84d4093 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -3051,7 +3051,6 @@ static gboolean priv_add_remote_candidate (
-           username, password, priority);
-     }
-     /* case 1: an existing candidate, update the attributes */
--    candidate->type = type;
-     if (base_addr)
-       candidate->base_addr = *base_addr;
-     candidate->priority = priority;
--- 
-2.3.2 (Apple Git-55)
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to