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

Side by Side Diff: third_party/libjingle/files/talk/base/natsocketfactory.cc

Issue 338037: linux: fix gcc 4.3 issues (for arm) (Closed)
Patch Set: Created 11 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004--2005, Google Inc. 3 * Copyright 2004--2005, Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include <iostream> 28 #include <iostream>
29 #include <cassert> 29 #include <cassert>
30 #include <cstring>
30 #include "talk/base/natsocketfactory.h" 31 #include "talk/base/natsocketfactory.h"
31 32
32 namespace talk_base { 33 namespace talk_base {
33 34
34 class NATSocket : public AsyncSocket { 35 class NATSocket : public AsyncSocket {
35 public: 36 public:
36 NATSocket(Socket* socket, const SocketAddress& server_addr) 37 NATSocket(Socket* socket, const SocketAddress& server_addr)
37 : async_(false), connected_(false), server_addr_(server_addr), 38 : async_(false), connected_(false), server_addr_(server_addr),
38 socket_(socket), buf_(0), size_(0) { 39 socket_(socket), buf_(0), size_(0) {
39 } 40 }
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 assert(type == SOCK_DGRAM); // TCP is not yet suported 220 assert(type == SOCK_DGRAM); // TCP is not yet suported
220 return new NATSocket(factory_->CreateSocket(type), nat_addr_); 221 return new NATSocket(factory_->CreateSocket(type), nat_addr_);
221 } 222 }
222 223
223 AsyncSocket* NATSocketFactory::CreateAsyncSocket(int type) { 224 AsyncSocket* NATSocketFactory::CreateAsyncSocket(int type) {
224 assert(type == SOCK_DGRAM); // TCP is not yet suported 225 assert(type == SOCK_DGRAM); // TCP is not yet suported
225 return new NATSocket(factory_->CreateAsyncSocket(type), nat_addr_); 226 return new NATSocket(factory_->CreateAsyncSocket(type), nat_addr_);
226 } 227 }
227 228
228 } // namespace talk_base 229 } // namespace talk_base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698