Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(782)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: jingle/notifier/communicator/xmpp_connection_generator.cc

Issue 9600066: Roll libjingle to r124 and roll webrtc to 1888. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« jingle/glue/fake_network_manager.cc ('K') | « jingle/glue/fake_network_manager.cc ('k') | remoting/jingle_glue/xmpp_socket_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/notifier/communicator/xmpp_connection_generator.cc
===================================================================
--- jingle/notifier/communicator/xmpp_connection_generator.cc (revision 124888)
+++ jingle/notifier/communicator/xmpp_connection_generator.cc (working copy)
@@ -161,7 +161,7 @@
addr != NULL; addr = addr->ai_next) {
const sockaddr_in& sockaddr =
*reinterpret_cast<const sockaddr_in*>(addr->ai_addr);
- uint32 ip = ntohl(sockaddr.sin_addr.s_addr);
+ uint32 ip = talk_base::NetworkToHost32(sockaddr.sin_addr.s_addr);
ip_list.push_back(ip);
}
successfully_resolved_dns_ = !ip_list.empty();
« jingle/glue/fake_network_manager.cc ('K') | « jingle/glue/fake_network_manager.cc ('k') | remoting/jingle_glue/xmpp_socket_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698