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

Side by Side Diff: net/dns/mdns_client.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback eroman Created 4 years, 11 months 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 // 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 #include "net/dns/mdns_client.h" 5 #include "net/dns/mdns_client.h"
6 6
7 #include "net/base/net_errors.h" 7 #include "net/base/net_errors.h"
8 #include "net/base/net_util.h" 8 #include "net/base/net_util.h"
9 #include "net/base/network_interfaces.h" 9 #include "net/base/network_interfaces.h"
10 #include "net/dns/dns_protocol.h" 10 #include "net/dns/dns_protocol.h"
(...skipping 11 matching lines...) Expand all
22 bool success = ParseIPLiteralToNumber(address, 22 bool success = ParseIPLiteralToNumber(address,
23 &multicast_group_number); 23 &multicast_group_number);
24 DCHECK(success); 24 DCHECK(success);
25 return IPEndPoint(multicast_group_number, 25 return IPEndPoint(multicast_group_number,
26 dns_protocol::kDefaultPortMulticast); 26 dns_protocol::kDefaultPortMulticast);
27 } 27 }
28 28
29 int Bind(const IPEndPoint& multicast_addr, 29 int Bind(const IPEndPoint& multicast_addr,
30 uint32_t interface_index, 30 uint32_t interface_index,
31 DatagramServerSocket* socket) { 31 DatagramServerSocket* socket) {
32 IPAddressNumber address_any(multicast_addr.address().size()); 32 IPAddressNumber address_any(multicast_addr.address().bytes().size());
33 IPEndPoint bind_endpoint(address_any, multicast_addr.port()); 33 IPEndPoint bind_endpoint(address_any, multicast_addr.port());
34 34
35 socket->AllowAddressReuse(); 35 socket->AllowAddressReuse();
36 socket->SetMulticastInterface(interface_index); 36 socket->SetMulticastInterface(interface_index);
37 37
38 int rv = socket->Listen(bind_endpoint); 38 int rv = socket->Listen(bind_endpoint);
39 if (rv < OK) 39 if (rv < OK)
40 return rv; 40 return rv;
41 41
42 return socket->JoinGroup(multicast_addr.address()); 42 return socket->JoinGroup(multicast_addr.address().bytes());
43 } 43 }
44 44
45 } // namespace 45 } // namespace
46 46
47 // static 47 // static
48 scoped_ptr<MDnsSocketFactory> MDnsSocketFactory::CreateDefault() { 48 scoped_ptr<MDnsSocketFactory> MDnsSocketFactory::CreateDefault() {
49 return scoped_ptr<MDnsSocketFactory>(new MDnsSocketFactoryImpl); 49 return scoped_ptr<MDnsSocketFactory>(new MDnsSocketFactoryImpl);
50 } 50 }
51 51
52 // static 52 // static
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 int rv = Bind(multicast_addr, interface_index, socket.get()); 95 int rv = Bind(multicast_addr, interface_index, socket.get());
96 if (rv != OK) { 96 if (rv != OK) {
97 socket.reset(); 97 socket.reset();
98 VLOG(1) << "Bind failed, endpoint=" << multicast_addr.ToStringWithoutPort() 98 VLOG(1) << "Bind failed, endpoint=" << multicast_addr.ToStringWithoutPort()
99 << ", error=" << rv; 99 << ", error=" << rv;
100 } 100 }
101 return socket; 101 return socket;
102 } 102 }
103 103
104 } // namespace net 104 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698