commit dc01700b45bb6b103d7cb22740f3b61213e0e520
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jun 18 16:37:54 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jun 20 09:55:29 2014 -0700
tree 746921929e4fb62dbd5a07a32bab30a6139c0804
parent cd591e1781effb574568a6c52fbffe888ca7cd74

face: Switching to 2 sockets in MulticastUdpFace for sending and receiving

To send over UDP multicast, we should not bind to multicast address.
This is true at least on OSX 10.9, which generates "Can't assign
requested address" error (error code: 49).  However, without binding to
the multicast address, the socket may receive unnecessary unrelated
packets.  To solve this problem, this commit splits sending and
receiving into two sockets, one for sending and one for receiving.

Change-Id: Ibce05c7071fd683a26b3c88cd2a168546c5dc605
Refs: #1668

daemon/face/multicast-udp-face.cpp

diff --git a/daemon/face/multicast-udp-face.cpp b/daemon/face/multicast-udp-face.cpp
index d12ba5b..c3d7e95 100644
--- a/daemon/face/multicast-udp-face.cpp
+++ b/daemon/face/multicast-udp-face.cpp
@@ -31,12 +31,15 @@
                                                 MulticastUdpFace::protocol, Multicast,
                                                 "MulticastUdpFace");
 
-MulticastUdpFace::MulticastUdpFace(const shared_ptr<MulticastUdpFace::protocol::socket>& socket,
-                                   const MulticastUdpFace::protocol::endpoint& localEndpoint)
-  : DatagramFace<protocol, Multicast>(FaceUri(socket->local_endpoint()),
+MulticastUdpFace::MulticastUdpFace(const shared_ptr<MulticastUdpFace::protocol::socket>& recvSocket,
+                                   const shared_ptr<MulticastUdpFace::protocol::socket>& sendSocket,
+                                   const MulticastUdpFace::protocol::endpoint& localEndpoint,
+                                   const MulticastUdpFace::protocol::endpoint& multicastEndpoint)
+  : DatagramFace<protocol, Multicast>(FaceUri(multicastEndpoint),
                                       FaceUri(localEndpoint),
-                                      socket, false)
-  , m_multicastGroup(socket->local_endpoint())
+                                      recvSocket, false)
+  , m_multicastGroup(multicastEndpoint)
+  , m_sendSocket(sendSocket)
 {
   NFD_LOG_INFO("Creating multicast UDP face for group " << m_multicastGroup);
 }
@@ -50,10 +53,10 @@
 void
 MulticastUdpFace::sendBlock(const Block& block)
 {
-  m_socket->async_send_to(boost::asio::buffer(block.wire(), block.size()),
-                          m_multicastGroup,
-                          bind(&DatagramFace<protocol, Multicast>::handleSend,
-                               this, _1, block));
+  m_sendSocket->async_send_to(boost::asio::buffer(block.wire(), block.size()),
+                              m_multicastGroup,
+                              bind(&DatagramFace<protocol, Multicast>::handleSend,
+                                   this, _1, block));
 }
 
 void