Bug 1189961 - added DNS AAAA convertion to nICEr transport addr. r=bwc
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Fri, 31 Jul 2015 18:18:02 -0700
changeset 288158 0599674e8edfc659ebe71ec5d03e4bfcc4c62faf
parent 288157 b953b237ecadc9063066943c7be1335e5d432fcc
child 288159 4a4b5cc7433b42a16b7bb73026161c6ead1fe3b9
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwc
bugs1189961
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1189961 - added DNS AAAA convertion to nICEr transport addr. r=bwc
media/mtransport/nr_socket_prsock.cpp
--- a/media/mtransport/nr_socket_prsock.cpp
+++ b/media/mtransport/nr_socket_prsock.cpp
@@ -409,17 +409,21 @@ int nr_netaddr_to_transport_addr(const n
     switch(netaddr->raw.family) {
       case AF_INET:
         if ((r = nr_ip4_port_to_transport_addr(ntohl(netaddr->inet.ip),
                                                ntohs(netaddr->inet.port),
                                                protocol, addr)))
           ABORT(r);
         break;
       case AF_INET6:
-        ABORT(R_BAD_ARGS);
+        if ((r = nr_ip6_port_to_transport_addr((in6_addr *)&netaddr->inet6.ip.u8,
+                                               ntohs(netaddr->inet6.port),
+                                               protocol, addr)))
+          ABORT(r);
+        break;
       default:
         MOZ_ASSERT(false);
         ABORT(R_BAD_ARGS);
     }
     _status=0;
   abort:
     return(_status);
   }