| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/p2p/client/httpportallocator.h" | 11 #include "webrtc/p2p/client/httpportallocator.h" |
| 12 | 12 |
| 13 #include <algorithm> | 13 #include <algorithm> |
| 14 #include <map> | 14 #include <map> |
| 15 | 15 |
| 16 #include "webrtc/base/basicdefs.h" | |
| 17 #include "webrtc/base/common.h" | 16 #include "webrtc/base/common.h" |
| 18 #include "webrtc/base/helpers.h" | 17 #include "webrtc/base/helpers.h" |
| 19 #include "webrtc/base/httpcommon.h" | 18 #include "webrtc/base/httpcommon.h" |
| 20 #include "webrtc/base/logging.h" | 19 #include "webrtc/base/logging.h" |
| 21 #include "webrtc/base/nethelpers.h" | 20 #include "webrtc/base/nethelpers.h" |
| 22 #include "webrtc/base/signalthread.h" | 21 #include "webrtc/base/signalthread.h" |
| 23 #include "webrtc/base/stringencode.h" | 22 #include "webrtc/base/stringencode.h" |
| 24 | 23 |
| 25 namespace { | 24 namespace { |
| 26 | 25 |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 } | 213 } |
| 215 if (!relay_ssltcp_port.empty()) { | 214 if (!relay_ssltcp_port.empty()) { |
| 216 rtc::SocketAddress address(relay_ip, atoi(relay_ssltcp_port.c_str())); | 215 rtc::SocketAddress address(relay_ip, atoi(relay_ssltcp_port.c_str())); |
| 217 relay_config.ports.push_back(ProtocolAddress(address, PROTO_SSLTCP)); | 216 relay_config.ports.push_back(ProtocolAddress(address, PROTO_SSLTCP)); |
| 218 } | 217 } |
| 219 config->AddRelay(relay_config); | 218 config->AddRelay(relay_config); |
| 220 ConfigReady(config); | 219 ConfigReady(config); |
| 221 } | 220 } |
| 222 | 221 |
| 223 } // namespace cricket | 222 } // namespace cricket |
| OLD | NEW |