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

Side by Side Diff: remoting/jingle_glue/chromium_socket_factory.cc

Issue 103143004: Update webrtc/libjingle 5268:5288. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/jingle_glue/chromium_socket_factory.h" 5 #include "remoting/jingle_glue/chromium_socket_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "jingle/glue/utils.h" 10 #include "jingle/glue/utils.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 return; 343 return;
344 } 344 }
345 345
346 if (result > 0) { 346 if (result > 0) {
347 talk_base::SocketAddress address; 347 talk_base::SocketAddress address;
348 if (!jingle_glue::IPEndPointToSocketAddress(receive_address_, &address)) { 348 if (!jingle_glue::IPEndPointToSocketAddress(receive_address_, &address)) {
349 NOTREACHED(); 349 NOTREACHED();
350 LOG(ERROR) << "Failed to convert address received from RecvFrom()."; 350 LOG(ERROR) << "Failed to convert address received from RecvFrom().";
351 return; 351 return;
352 } 352 }
353 SignalReadPacket(this, receive_buffer_->data(), result, address); 353 SignalReadPacket(this, receive_buffer_->data(), result, address,
354 talk_base::CreatePacketTime(0));
354 } else { 355 } else {
355 LOG(ERROR) << "Received error when reading from UDP socket: " << result; 356 LOG(ERROR) << "Received error when reading from UDP socket: " << result;
356 } 357 }
357 } 358 }
358 359
359 } // namespace 360 } // namespace
360 361
361 ChromiumPacketSocketFactory::ChromiumPacketSocketFactory() { 362 ChromiumPacketSocketFactory::ChromiumPacketSocketFactory() {
362 } 363 }
363 364
(...skipping 30 matching lines...) Expand all
394 NOTREACHED(); 395 NOTREACHED();
395 return NULL; 396 return NULL;
396 } 397 }
397 398
398 talk_base::AsyncResolverInterface* 399 talk_base::AsyncResolverInterface*
399 ChromiumPacketSocketFactory::CreateAsyncResolver() { 400 ChromiumPacketSocketFactory::CreateAsyncResolver() {
400 return new DummyAsyncResolver(); 401 return new DummyAsyncResolver();
401 } 402 }
402 403
403 } // namespace remoting 404 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/plugin/pepper_packet_socket_factory.cc ('k') | remoting/jingle_glue/chromium_socket_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698