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

Side by Side Diff: net/socket/udp_socket_posix.cc

Issue 2508593002: net: move udp directory into socket (Closed)
Patch Set: revert sys/socket.h change Created 4 years, 1 month 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
« no previous file with comments | « net/socket/udp_socket_posix.h ('k') | net/socket/udp_socket_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "net/udp/udp_socket_posix.h" 5 #include "net/socket/udp_socket_posix.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <net/if.h> 9 #include <net/if.h>
10 #include <netdb.h> 10 #include <netdb.h>
11 #include <netinet/in.h> 11 #include <netinet/in.h>
12 #include <sys/ioctl.h> 12 #include <sys/ioctl.h>
13 #include <sys/socket.h> 13 #include <sys/socket.h>
14 14
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/debug/alias.h" 16 #include "base/debug/alias.h"
17 #include "base/files/file_util.h" 17 #include "base/files/file_util.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/message_loop/message_loop.h" 19 #include "base/message_loop/message_loop.h"
20 #include "base/metrics/histogram_macros.h" 20 #include "base/metrics/histogram_macros.h"
21 #include "base/posix/eintr_wrapper.h" 21 #include "base/posix/eintr_wrapper.h"
22 #include "base/rand_util.h" 22 #include "base/rand_util.h"
23 #include "base/trace_event/trace_event.h" 23 #include "base/trace_event/trace_event.h"
24 #include "net/base/io_buffer.h" 24 #include "net/base/io_buffer.h"
25 #include "net/base/ip_address.h" 25 #include "net/base/ip_address.h"
26 #include "net/base/ip_endpoint.h" 26 #include "net/base/ip_endpoint.h"
27 #include "net/base/net_errors.h" 27 #include "net/base/net_errors.h"
28 #include "net/base/network_activity_monitor.h" 28 #include "net/base/network_activity_monitor.h"
29 #include "net/base/sockaddr_storage.h" 29 #include "net/base/sockaddr_storage.h"
30 #include "net/log/net_log.h" 30 #include "net/log/net_log.h"
31 #include "net/log/net_log_event_type.h" 31 #include "net/log/net_log_event_type.h"
32 #include "net/log/net_log_source.h" 32 #include "net/log/net_log_source.h"
33 #include "net/log/net_log_source_type.h" 33 #include "net/log/net_log_source_type.h"
34 #include "net/socket/socket_descriptor.h" 34 #include "net/socket/socket_descriptor.h"
35 #include "net/udp/udp_net_log_parameters.h" 35 #include "net/socket/udp_net_log_parameters.h"
36 36
37 #if defined(OS_ANDROID) 37 #if defined(OS_ANDROID)
38 #include <dlfcn.h> 38 #include <dlfcn.h>
39 // This was added in Lollipop to dlfcn.h 39 // This was added in Lollipop to dlfcn.h
40 #define RTLD_NOLOAD 4 40 #define RTLD_NOLOAD 4
41 #include "base/android/build_info.h" 41 #include "base/android/build_info.h"
42 #include "base/native_library.h" 42 #include "base/native_library.h"
43 #include "base/strings/utf_string_conversions.h" 43 #include "base/strings/utf_string_conversions.h"
44 #endif 44 #endif
45 45
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 return MapSystemError(errno); 879 return MapSystemError(errno);
880 880
881 return OK; 881 return OK;
882 } 882 }
883 883
884 void UDPSocketPosix::DetachFromThread() { 884 void UDPSocketPosix::DetachFromThread() {
885 base::NonThreadSafe::DetachFromThread(); 885 base::NonThreadSafe::DetachFromThread();
886 } 886 }
887 887
888 } // namespace net 888 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/udp_socket_posix.h ('k') | net/socket/udp_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698