Don't allow local_datagram_receiver to bind multiple times

Signed-off-by: Jan Blunck <jblunck@infradead.org>
jblunck · Nov 8, 2011 · c6d68b7 · c6d68b7
1 parent 751e0ee
commit c6d68b7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/boost_asio/local_datagram_receiver.hpp b/boost_asio/local_datagram_receiver.hpp
@@ -109,12 +109,14 @@ class local_datagram_receiver :
 {
     typedef datagram_receiver<EventHandler,StatusListener,boost::asio::local::datagram_protocol> base_type;
     boost::asio::local::datagram_protocol::socket _socket;
+    unsigned short _bind_port;
 
 public:
     local_datagram_receiver(EventHandler& handler,
 			  StatusListener& listener) :
         base_type(handler, listener),
-	_socket(base_type::get_io_service())
+	_socket(base_type::get_io_service()),
+        _bind_port(0)
     {
     }
 
@@ -123,7 +125,8 @@ class local_datagram_receiver :
                             const char * /* interface_address */,
                             const bool /* is_loopback */) :
         base_type(handler, listener),
-	_socket(base_type::get_io_service())
+	_socket(base_type::get_io_service()),
+        _bind_port(0)
     {
     }
 
@@ -132,6 +135,10 @@ class local_datagram_receiver :
      */
     void bind(const unsigned short port)
     {
+        if (_bind_port)
+            throw std::runtime_error("Already bound to port " + _bind_port);
+        _bind_port = port;
+
         boost::shared_ptr<buffered_datagram_writer<T> > reader;
         reader.reset(new buffered_datagram_writer<T>(base_type::get_io_service(),
                                                      port));
@@ -149,6 +156,9 @@ class local_datagram_receiver :
 
     void unbind(const unsigned short port)
     {
+        if (port != _bind_port)
+            throw std::runtime_error("Not bound to port " + port);
+
         _socket.cancel();
         _socket.close();
     }

diff --git a/boost_asio/local_datagram_receiver_test.cpp b/boost_asio/local_datagram_receiver_test.cpp
@@ -97,3 +97,17 @@ BOOST_AUTO_TEST_CASE(local_datagram_receiver__test1)
     receiver->run();
     BOOST_CHECK_EQUAL(nh.get_buffer(), std::string(read_from_string::buf,4,10));
 }
+
+typedef local_datagram_receiver<struct nop_handler,
+                                struct cerr_status_listener,
+                                struct read_from_string> receiver2_t;
+
+BOOST_AUTO_TEST_CASE(local_datagram_receiver__bind_throws)
+{
+    struct nop_handler nh;
+    struct cerr_status_listener mc;
+    boost::shared_ptr<receiver2_t> receiver(new receiver2_t(nh, mc));
+    receiver->bind(12345);
+    BOOST_CHECK_THROW(receiver->bind(12345), std::runtime_error);
+    BOOST_CHECK_THROW(receiver->unbind(1), std::runtime_error);
+}