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

Unified Diff: chrome/browser/extensions/api/socket/udp_socket.cc

Issue 12684008: Multicast socket API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/socket/udp_socket.cc
diff --git a/chrome/browser/extensions/api/socket/udp_socket.cc b/chrome/browser/extensions/api/socket/udp_socket.cc
index b9a804cbb98d8e3d2ff057ca1b548de9eda27628..7050746f52de14e670c8125afcebad849798e255 100644
--- a/chrome/browser/extensions/api/socket/udp_socket.cc
+++ b/chrome/browser/extensions/api/socket/udp_socket.cc
@@ -222,4 +222,55 @@ void UDPSocket::OnSendToComplete(int result) {
send_to_callback_.Reset();
}
+int UDPSocket::JoinGroup(const std::string& address) {
+ net::IPAddressNumber ip;
+ if (!net::ParseIPLiteralToNumber(address, &ip))
+ return net::ERR_ADDRESS_INVALID;
+
+ std::string normalized_address = net::IPAddressToString(ip);
+ base::hash_set<std::string>::iterator find_result =
+ multicast_groups_.find(normalized_address);
+ if (find_result != multicast_groups_.end())
+ return net::ERR_ADDRESS_INVALID;
+
+ int rv = socket_.JoinGroup(ip);
+ if (rv == 0)
+ multicast_groups_.insert(normalized_address);
+ return rv;
+}
+
+int UDPSocket::LeaveGroup(const std::string& address) {
+ net::IPAddressNumber ip;
+ if (!net::ParseIPLiteralToNumber(address, &ip))
+ return net::ERR_ADDRESS_INVALID;
+
+ std::string normalized_address = net::IPAddressToString(ip);
+ base::hash_set<std::string>::iterator find_result =
+ multicast_groups_.find(normalized_address);
+ if (find_result == multicast_groups_.end())
+ return net::ERR_ADDRESS_INVALID;
+
+ int rv = socket_.LeaveGroup(ip);
+ if (rv == 0)
+ multicast_groups_.erase(find_result);
miket_OOO 2013/04/26 01:20:01 You don't need to do the find/erase here. You can
Bei Zhang 2013/04/26 08:07:34 We are changing to a vector. Have to lookup the it
+ return rv;
+}
+
+int UDPSocket::SetMulticastTimeToLive(int ttl) {
+ return socket_.SetMulticastTimeToLive(ttl);
+}
+
+int UDPSocket::SetMulticastLoopbackMode(bool loopback) {
+ return socket_.SetMulticastLoopbackMode(loopback);
+}
+
+int UDPSocket::GetJoinedGroups(base::hash_set<std::string>* groups) const {
miket_OOO 2013/04/26 01:20:01 The hash_set really doesn't make any sense here. I
Bei Zhang 2013/04/26 08:07:34 I Agree. For our case, I think vector is our best
+ if (!socket_.is_connected())
+ return net::ERR_SOCKET_NOT_CONNECTED;
+
+ groups->clear();
+ groups->insert(multicast_groups_.begin(), multicast_groups_.end());
+ return 0;
+}
+
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/api/socket/udp_socket.h ('k') | chrome/browser/extensions/api/socket/udp_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698