Bug 1317946: disable the packet filter for testing draft
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Thu, 17 Nov 2016 14:38:27 -0800
changeset 443224 79c4e12fc5bd2ec7fb83db1787055a8b4524418e
parent 443004 47f42f21541b9b98ad7db82edb996b29065debd0
child 537986 2c40c5b5f5ca2ad3dd7da2b8bc3f4b8152746678
push id36921
push userdrno@ohlmeier.org
push dateThu, 24 Nov 2016 01:05:14 +0000
bugs1317946
milestone53.0a1
Bug 1317946: disable the packet filter for testing MozReview-Commit-ID: DXnxCPk0hnO
dom/network/UDPSocketParent.cpp
--- a/dom/network/UDPSocketParent.cpp
+++ b/dom/network/UDPSocketParent.cpp
@@ -328,16 +328,17 @@ UDPSocketParent::ConnectInternal(const n
 }
 
 mozilla::ipc::IPCResult
 UDPSocketParent::RecvOutgoingData(const UDPData& aData,
                                   const UDPSocketAddr& aAddr)
 {
   MOZ_ASSERT(mSocket);
 
+  /*
   nsresult rv;
   if (mFilter) {
     if (aAddr.type() != UDPSocketAddr::TNetAddr) {
       return IPC_OK();
     }
 
     // TODO, Packet filter doesn't support input stream yet.
     if (aData.type() != UDPData::TArrayOfuint8_t) {
@@ -350,16 +351,17 @@ UDPSocketParent::RecvOutgoingData(const 
                                data.Length(), nsISocketFilter::SF_OUTGOING,
                                &allowed);
 
     // Sending unallowed data, kill content.
     if (NS_WARN_IF(NS_FAILED(rv)) || !allowed) {
       return IPC_FAIL(this, "Content tried to send non STUN packet");
     }
   }
+  */
 
   switch(aData.type()) {
     case UDPData::TArrayOfuint8_t:
       Send(aData.get_ArrayOfuint8_t(), aAddr);
       break;
     case UDPData::TInputStreamParams:
       Send(aData.get_InputStreamParams(), aAddr);
       break;
@@ -511,32 +513,34 @@ UDPSocketParent::OnPacketReceived(nsIUDP
 
   nsCString data;
   aMessage->GetData(data);
 
   const char* buffer = data.get();
   uint32_t len = data.Length();
   UDPSOCKET_LOG(("%s: %s:%u, length %u", __FUNCTION__, ip.get(), port, len));
 
+  /*
   if (mFilter) {
     bool allowed;
     mozilla::net::NetAddr addr;
     fromAddr->GetNetAddr(&addr);
     nsresult rv = mFilter->FilterPacket(&addr,
                                         (const uint8_t*)buffer, len,
                                         nsISocketFilter::SF_INCOMING,
                                         &allowed);
     // Receiving unallowed data, drop.
     if (NS_WARN_IF(NS_FAILED(rv)) || !allowed) {
       if (!allowed) {
         UDPSOCKET_LOG(("%s: not allowed", __FUNCTION__));
       }
       return NS_OK;
     }
   }
+  */
 
   FallibleTArray<uint8_t> fallibleArray;
   if (!fallibleArray.InsertElementsAt(0, buffer, len, fallible)) {
     FireInternalError(__LINE__);
     return NS_ERROR_OUT_OF_MEMORY;
   }
   InfallibleTArray<uint8_t> infallibleArray;
   infallibleArray.SwapElements(fallibleArray);