Changeset 4910

Timestamp:

Jul 14, 2009, 4:34:14 PM (15 years ago)

Author:

huebsch

Message:

bootstrap testing

Files:

• sample/pingpong/main.cpp (modified) (1 diff)
• source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h (modified) (6 diffs)

sample/pingpong/main.cpp

@@ -17 +17 @@
 
         BootstrapManager& manager = BootstrapManager::instance();
-        manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+        manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
 
         manager.publish("testname", "testinfo1", "testinfo2", "testinfo3");

source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h

@@ -116 +116 @@
         class udp_server {
         private:
-                udp::socket socket_v4;
-                udp::socket socket_v6;
+                udp::socket socket_v4_listen;
+                udp::socket socket_v4_send;
+                //udp::socket socket_v6;
                 udp::endpoint remote_endpoint_;
                 boost::array<char, 1500> recv_buffer_;
@@ -126 +127 @@
                 udp_server(boost::asio::io_service& io_service, ServiceList* _services, boost::mutex* _servicesmutex)
                         : services(_services), servicesmutex(_servicesmutex),
-                                socket_v4(io_service), socket_v6(io_service) {
+                                socket_v4_listen(io_service), socket_v4_send(io_service) /*, socket_v6(io_service)*/ {
 
                         boost::asio::ip::udp::endpoint listen_endpoint_v4(
-                                        boost::asio::ip::address_v4::broadcast(),
+                                        boost::asio::ip::udp::v4() /*boost::asio::ip::address_v4::any()*/,
                                         PeriodicBroadcast::serverport_v4);
 
+/*
                         boost::asio::ip::udp::endpoint listen_endpoint_v6(
                                         boost::asio::ip::address_v6::from_string("ff02::1"),
                                         PeriodicBroadcast::serverport_v6);
+*/
 
                         boost::system::error_code err;
 
-                        err = socket_v4.open( listen_endpoint_v4.protocol(), err );
-                        if(err) logging_warn("failed opening ipv4 socket");
-
-                        err = socket_v6.open( listen_endpoint_v6.protocol(), err );
-                        if(err) logging_warn("failed opening ipv6 socket");
-
-                        err = socket_v4.set_option( boost::asio::ip::udp::socket::reuse_address(true), err );
-                        if(err) logging_warn("failed setting reuse address option on ipv4 socket");
-
-                        err = socket_v6.set_option( boost::asio::ip::udp::socket::reuse_address(true), err );
-                        if(err) logging_warn("failed setting reuse address option on ipv6 socket");
-
-                        err = socket_v4.set_option( boost::asio::socket_base::broadcast(true), err );
-                        if(err) logging_warn("failed setting broadcast option on ipv4 socket");
-
-                        err = socket_v6.set_option( boost::asio::socket_base::broadcast(true), err );
-                        if(err) logging_warn("failed setting broadcast option on ipv6 socket");
-
-                        err = socket_v4.bind( listen_endpoint_v4, err );
-                        if(err) logging_warn("failed binding ipv4 socket");
+                        //err = socket_v4.open( listen_endpoint_v4.protocol(), err );
+                        //if(err) logging_warn("failed opening ipv4 socket");
+
+                        //err = socket_v6.open( listen_endpoint_v6.protocol(), err );
+                        //if(err) logging_warn("failed opening ipv6 socket");
+
+                        //err = socket_v4.set_option( boost::asio::ip::udp::socket::reuse_address(true), err );
+                        //if(err) logging_warn("failed setting reuse address option on ipv4 socket");
+
+                        //err = socket_v6.set_option( boost::asio::ip::udp::socket::reuse_address(true), err );
+                        //if(err) logging_warn("failed setting reuse address option on ipv6 socket");
+
+                        err = socket_v4_listen.set_option( boost::asio::socket_base::broadcast(true), err );
+                        err = socket_v4_send.set_option( boost::asio::socket_base::broadcast(true), err );
+                        //if(err) logging_warn("failed setting broadcast option on ipv4 socket");
+
+                        //err = socket_v6.set_option( boost::asio::socket_base::broadcast(true), err );
+                        //if(err) logging_warn("failed setting broadcast option on ipv6 socket");
+
+                        //err = socket_v4.bind( listen_endpoint_v4, err );
+                        //if(err) logging_warn("failed binding ipv4 socket");
                         
                         //socket_v6.bind( listen_endpoint_v6 );
@@ -178 +182 @@
                                 udp::endpoint endp(udp::v4(), PeriodicBroadcast::serverport_v4);
                                 endp.address( boost::asio::ip::address_v4::broadcast() );
-                                socket_v4.send_to( boost::asio::buffer(pnt, len), endp, 0, err );
+                                socket_v4_send.send_to( boost::asio::buffer(pnt, len), endp, 0, err );
                                 if(err) logging_warn("failed sending message through ipv4 socket");
                         }
@@ -190 +194 @@
         private:
                 void start_receive(){
-                        socket_v4.async_receive_from(
+                        socket_v4_listen.async_receive_from(
                                         boost::asio::buffer(recv_buffer_), remote_endpoint_,
                                         boost::bind(&udp_server::handle_receive, this,
                                                         boost::asio::placeholders::error,
                                                         boost::asio::placeholders::bytes_transferred));
-
+/*
                         socket_v6.async_receive_from(
                                         boost::asio::buffer(recv_buffer_), remote_endpoint_,
@@ -201 +205 @@
                                                         boost::asio::placeholders::error,
                                                         boost::asio::placeholders::bytes_transferred));
+*/
                 }
 
@@ -248 +253 @@
 
         udp_server server;
-
 };