| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 // Defines local discovery messages between the browser and utility process. | 5 // Defines local discovery messages between the browser and utility process. |
| 6 | 6 |
| 7 // Multiple-included file, no traditional include guard. | 7 // Multiple-included file, no traditional include guard. |
| 8 |
| 9 #include <stdint.h> |
| 10 |
| 8 #include <vector> | 11 #include <vector> |
| 9 | 12 |
| 13 #include "build/build_config.h" |
| 10 #include "chrome/common/local_discovery/service_discovery_client.h" | 14 #include "chrome/common/local_discovery/service_discovery_client.h" |
| 11 #include "ipc/ipc_message_macros.h" | 15 #include "ipc/ipc_message_macros.h" |
| 12 | 16 |
| 13 #ifndef CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ | 17 #ifndef CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ |
| 14 #define CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ | 18 #define CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ |
| 15 | 19 |
| 16 #if defined(OS_POSIX) | 20 #if defined(OS_POSIX) |
| 17 #include "base/file_descriptor_posix.h" | 21 #include "base/file_descriptor_posix.h" |
| 18 #endif | 22 #endif |
| 19 | 23 |
| 20 #if defined(OS_POSIX) | 24 #if defined(OS_POSIX) |
| 21 struct LocalDiscoveryMsg_SocketInfo { | 25 struct LocalDiscoveryMsg_SocketInfo { |
| 22 LocalDiscoveryMsg_SocketInfo() | 26 LocalDiscoveryMsg_SocketInfo() |
| 23 : address_family(net::ADDRESS_FAMILY_UNSPECIFIED), | 27 : address_family(net::ADDRESS_FAMILY_UNSPECIFIED), |
| 24 interface_index(0) { | 28 interface_index(0) { |
| 25 } | 29 } |
| 26 | 30 |
| 27 base::FileDescriptor descriptor; | 31 base::FileDescriptor descriptor; |
| 28 net::AddressFamily address_family; | 32 net::AddressFamily address_family; |
| 29 uint32 interface_index; | 33 uint32_t interface_index; |
| 30 }; | 34 }; |
| 31 #endif // OS_POSIX | 35 #endif // OS_POSIX |
| 32 | 36 |
| 33 #endif // CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ | 37 #endif // CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ |
| 34 | 38 |
| 35 #define IPC_MESSAGE_START LocalDiscoveryMsgStart | 39 #define IPC_MESSAGE_START LocalDiscoveryMsgStart |
| 36 | 40 |
| 37 IPC_ENUM_TRAITS_MAX_VALUE(local_discovery::ServiceWatcher::UpdateType, | 41 IPC_ENUM_TRAITS_MAX_VALUE(local_discovery::ServiceWatcher::UpdateType, |
| 38 local_discovery::ServiceWatcher::UPDATE_TYPE_LAST) | 42 local_discovery::ServiceWatcher::UPDATE_TYPE_LAST) |
| 39 | 43 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 62 // Utility process messages: | 66 // Utility process messages: |
| 63 // These are messages from the browser to the utility process. | 67 // These are messages from the browser to the utility process. |
| 64 | 68 |
| 65 #if defined(OS_POSIX) | 69 #if defined(OS_POSIX) |
| 66 IPC_MESSAGE_CONTROL1(LocalDiscoveryMsg_SetSockets, | 70 IPC_MESSAGE_CONTROL1(LocalDiscoveryMsg_SetSockets, |
| 67 std::vector<LocalDiscoveryMsg_SocketInfo> /* sockets */) | 71 std::vector<LocalDiscoveryMsg_SocketInfo> /* sockets */) |
| 68 #endif // OS_POSIX | 72 #endif // OS_POSIX |
| 69 | 73 |
| 70 // Creates watcher and starts listening in utility process. | 74 // Creates watcher and starts listening in utility process. |
| 71 IPC_MESSAGE_CONTROL2(LocalDiscoveryMsg_StartWatcher, | 75 IPC_MESSAGE_CONTROL2(LocalDiscoveryMsg_StartWatcher, |
| 72 uint64 /* id */, | 76 uint64_t /* id */, |
| 73 std::string /* service_type */) | 77 std::string /* service_type */) |
| 74 | 78 |
| 75 // Discovers new services. | 79 // Discovers new services. |
| 76 IPC_MESSAGE_CONTROL2(LocalDiscoveryMsg_DiscoverServices, | 80 IPC_MESSAGE_CONTROL2(LocalDiscoveryMsg_DiscoverServices, |
| 77 uint64 /* id */, | 81 uint64_t /* id */, |
| 78 bool /* force_update */) | 82 bool /* force_update */) |
| 79 | 83 |
| 80 // Discovers new services. | 84 // Discovers new services. |
| 81 IPC_MESSAGE_CONTROL2(LocalDiscoveryMsg_SetActivelyRefreshServices, | 85 IPC_MESSAGE_CONTROL2(LocalDiscoveryMsg_SetActivelyRefreshServices, |
| 82 uint64 /* id */, | 86 uint64_t /* id */, |
| 83 bool /* actively_refresh_services */) | 87 bool /* actively_refresh_services */) |
| 84 | 88 |
| 85 // Destroys watcher in utility process. | 89 // Destroys watcher in utility process. |
| 86 IPC_MESSAGE_CONTROL1(LocalDiscoveryMsg_DestroyWatcher, | 90 IPC_MESSAGE_CONTROL1(LocalDiscoveryMsg_DestroyWatcher, uint64_t /* id */) |
| 87 uint64 /* id */) | |
| 88 | 91 |
| 89 // Creates service resolver and starts resolving service in utility process. | 92 // Creates service resolver and starts resolving service in utility process. |
| 90 IPC_MESSAGE_CONTROL2(LocalDiscoveryMsg_ResolveService, | 93 IPC_MESSAGE_CONTROL2(LocalDiscoveryMsg_ResolveService, |
| 91 uint64 /* id */, | 94 uint64_t /* id */, |
| 92 std::string /* service_name */) | 95 std::string /* service_name */) |
| 93 | 96 |
| 94 // Destroys service resolver in utility process. | 97 // Destroys service resolver in utility process. |
| 95 IPC_MESSAGE_CONTROL1(LocalDiscoveryMsg_DestroyResolver, | 98 IPC_MESSAGE_CONTROL1(LocalDiscoveryMsg_DestroyResolver, uint64_t /* id */) |
| 96 uint64 /* id */) | |
| 97 | 99 |
| 98 // Creates a local domain resolver and starts resolving in utility process. | 100 // Creates a local domain resolver and starts resolving in utility process. |
| 99 IPC_MESSAGE_CONTROL3(LocalDiscoveryMsg_ResolveLocalDomain, | 101 IPC_MESSAGE_CONTROL3(LocalDiscoveryMsg_ResolveLocalDomain, |
| 100 uint64 /* id */, | 102 uint64_t /* id */, |
| 101 std::string /* domain */, | 103 std::string /* domain */, |
| 102 net::AddressFamily /* address_family */) | 104 net::AddressFamily /* address_family */) |
| 103 | 105 |
| 104 // Destroys local domain resolver in utility process. | 106 // Destroys local domain resolver in utility process. |
| 105 IPC_MESSAGE_CONTROL1(LocalDiscoveryMsg_DestroyLocalDomainResolver, | 107 IPC_MESSAGE_CONTROL1(LocalDiscoveryMsg_DestroyLocalDomainResolver, |
| 106 uint64 /* id */) | 108 uint64_t /* id */) |
| 107 | 109 |
| 108 // Stops local discovery in utility process. http://crbug.com/268466. | 110 // Stops local discovery in utility process. http://crbug.com/268466. |
| 109 IPC_MESSAGE_CONTROL0(LocalDiscoveryMsg_ShutdownLocalDiscovery) | 111 IPC_MESSAGE_CONTROL0(LocalDiscoveryMsg_ShutdownLocalDiscovery) |
| 110 | 112 |
| 111 | 113 |
| 112 //------------------------------------------------------------------------------ | 114 //------------------------------------------------------------------------------ |
| 113 // Utility process host messages: | 115 // Utility process host messages: |
| 114 // These are messages from the utility process to the browser. | 116 // These are messages from the utility process to the browser. |
| 115 | 117 |
| 116 // Notifies browser process if process failed. | 118 // Notifies browser process if process failed. |
| 117 IPC_MESSAGE_CONTROL0(LocalDiscoveryHostMsg_Error) | 119 IPC_MESSAGE_CONTROL0(LocalDiscoveryHostMsg_Error) |
| 118 | 120 |
| 119 // Notifies browser process about new services. | 121 // Notifies browser process about new services. |
| 120 IPC_MESSAGE_CONTROL3(LocalDiscoveryHostMsg_WatcherCallback, | 122 IPC_MESSAGE_CONTROL3(LocalDiscoveryHostMsg_WatcherCallback, |
| 121 uint64 /* id */, | 123 uint64_t /* id */, |
| 122 local_discovery::ServiceWatcher::UpdateType /* update */, | 124 local_discovery::ServiceWatcher::UpdateType /* update */, |
| 123 std::string /* service_name */) | 125 std::string /* service_name */) |
| 124 | 126 |
| 125 // Notifies browser process about service resolution results. | 127 // Notifies browser process about service resolution results. |
| 126 IPC_MESSAGE_CONTROL3( | 128 IPC_MESSAGE_CONTROL3( |
| 127 LocalDiscoveryHostMsg_ResolverCallback, | 129 LocalDiscoveryHostMsg_ResolverCallback, |
| 128 uint64 /* id */, | 130 uint64_t /* id */, |
| 129 local_discovery::ServiceResolver::RequestStatus /* status */, | 131 local_discovery::ServiceResolver::RequestStatus /* status */, |
| 130 local_discovery::ServiceDescription /* description */) | 132 local_discovery::ServiceDescription /* description */) |
| 131 | 133 |
| 132 // Notifies browser process about local domain resolution results. | 134 // Notifies browser process about local domain resolution results. |
| 133 IPC_MESSAGE_CONTROL4( | 135 IPC_MESSAGE_CONTROL4(LocalDiscoveryHostMsg_LocalDomainResolverCallback, |
| 134 LocalDiscoveryHostMsg_LocalDomainResolverCallback, | 136 uint64_t /* id */, |
| 135 uint64 /* id */, | 137 bool /* success */, |
| 136 bool /* success */, | 138 net::IPAddressNumber /* ip_address_ipv4 */, |
| 137 net::IPAddressNumber /* ip_address_ipv4 */, | 139 net::IPAddressNumber /* ip_address_ipv6 */) |
| 138 net::IPAddressNumber /* ip_address_ipv6 */) | |
| OLD | NEW |