Bug 1231975 - Part 5: Fix an intermittent failure caused by the NAT simulator erroneously canceling NR_ASYNC_WAIT_READ. r=drno draft
authorByron Campen [:bwc] <docfaraday@gmail.com>
Thu, 14 Apr 2016 15:33:40 -0500
changeset 357942 fd5d972f042baf0007d09579fe43893c1a787836
parent 357941 d611712e2a7f0a29063ee5765dc66fb7ed9e5b0f
child 357943 09cb3564f933d2f159939e06459a5517425e9c1d
push id16896
push userbcampen@mozilla.com
push dateFri, 29 Apr 2016 21:42:02 +0000
reviewersdrno
bugs1231975
milestone49.0a1
Bug 1231975 - Part 5: Fix an intermittent failure caused by the NAT simulator erroneously canceling NR_ASYNC_WAIT_READ. r=drno MozReview-Commit-ID: HwatO6UaeEX
media/mtransport/test_nr_socket.cpp
--- a/media/mtransport/test_nr_socket.cpp
+++ b/media/mtransport/test_nr_socket.cpp
@@ -701,20 +701,16 @@ void TestNrSocket::on_socket_readable(Nr
     readable_socket_ = real_socket;
   }
 
   fire_readable_callback();
 }
 
 void TestNrSocket::fire_readable_callback() {
   MOZ_ASSERT(poll_flags() & PR_POLL_READ);
-  // Stop listening on all real sockets; we will start listening again
-  // if the app starts listening to us again.
-  cancel_port_mapping_async_wait(NR_ASYNC_WAIT_READ);
-  internal_socket_->cancel(NR_ASYNC_WAIT_READ);
   r_log(LOG_GENERIC, LOG_DEBUG, "TestNrSocket %s ready for read",
         internal_socket_->my_addr().as_string);
   fire_callback(NR_ASYNC_WAIT_READ);
 }
 
 void TestNrSocket::port_mapping_writeable_callback(void *ext_sock_v,
                                                    int how,
                                                    void *test_sock_v) {