Skip to content

D
dlib
Commit 768888ff authored by Davis King's avatar Davis King
Browse files
Options

Added another version of bsp_listen() called bsp_listen_dynamic_port() 

that has a callback to the user that tells them when a listening port
has been opened and what the port number is.
parent 2e821608
Expand all Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 121 deletions
dlib/bsp/bsp.cpp
View file @ 768888ff
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#include "bsp.h" #include "bsp.h"
#include "../ref.h"
#include <stack> #include <stack>
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
...@@ -14,25 +13,6 @@ namespace dlib ...@@ -14,25 +13,6 @@ namespace dlib
namespace impl1 namespace impl1
{ {
struct hostinfo
{
hostinfo() {}
hostinfo (
const std::string& ip_,
unsigned short port_,
unsigned long node_id_
) :
ip(ip_),
port(port_),
node_id(node_id_)
{
}
std::string ip;
unsigned short port;
unsigned long node_id;
};
void connect_all ( void connect_all (
map_id_to_con& cons, map_id_to_con& cons,
const std::vector<std::pair<std::string,unsigned short> >& hosts, const std::vector<std::pair<std::string,unsigned short> >& hosts,
...@@ -43,7 +23,7 @@ namespace dlib ...@@ -43,7 +23,7 @@ namespace dlib
for (unsigned long i = 0; i < hosts.size(); ++i) for (unsigned long i = 0; i < hosts.size(); ++i)
{ {
scoped_ptr<bsp_con> con(new bsp_con(hosts[i])); scoped_ptr<bsp_con> con(new bsp_con(hosts[i]));
serialize(node_id, con->stream); // tell the other end our node_id dlib::serialize(node_id, con->stream); // tell the other end our node_id
unsigned long id = i+1; unsigned long id = i+1;
cons.add(id, con); cons.add(id, con);
} }
...@@ -62,7 +42,7 @@ namespace dlib ...@@ -62,7 +42,7 @@ namespace dlib
try try
{ {
scoped_ptr<bsp_con> con(new bsp_con(make_pair(hosts[i].ip,hosts[i].port))); scoped_ptr<bsp_con> con(new bsp_con(make_pair(hosts[i].ip,hosts[i].port)));
serialize(node_id, con->stream); // tell the other end our node_id dlib::serialize(node_id, con->stream); // tell the other end our node_id
con->stream.flush(); con->stream.flush();
unsigned long id = hosts[i].node_id; unsigned long id = hosts[i].node_id;
cons.add(id, con); cons.add(id, con);
...@@ -78,26 +58,6 @@ namespace dlib ...@@ -78,26 +58,6 @@ namespace dlib
} }
void serialize (
const hostinfo& item,
std::ostream& out
)
{
dlib::serialize(item.ip, out);
dlib::serialize(item.port, out);
dlib::serialize(item.node_id, out);
}
void deserialize (
hostinfo& item,
std::istream& in
)
{
dlib::deserialize(item.ip, in);
dlib::deserialize(item.port, in);
dlib::deserialize(item.node_id, in);
}
void send_out_connection_orders ( void send_out_connection_orders (
map_id_to_con& cons, map_id_to_con& cons,
const std::vector<std::pair<std::string,unsigned short> >& hosts const std::vector<std::pair<std::string,unsigned short> >& hosts
...@@ -128,80 +88,6 @@ namespace dlib ...@@ -128,80 +88,6 @@ namespace dlib
// ------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------
void listen_and_connect_all(
unsigned long& node_id,
map_id_to_con& cons,
unsigned short port
)
{
cons.clear();
scoped_ptr<listener> list;
const int status = create_listener(list, port);
if (status == PORTINUSE)
{
throw socket_error("Unable to create listening port " + cast_to_string(port) +
". The port is already in use");
}
else if (status != 0)
{
throw socket_error("Unable to create listening port " + cast_to_string(port) );
}
scoped_ptr<connection> con;
if (list->accept(con))
{
throw socket_error("Error occurred while accepting new connection");
}
scoped_ptr<bsp_con> temp(new bsp_con(con));
unsigned long remote_node_id;
dlib::deserialize(remote_node_id, temp->stream);
dlib::deserialize(node_id, temp->stream);
std::vector<hostinfo> targets;
dlib::deserialize(targets, temp->stream);
unsigned long num_incoming_connections;
dlib::deserialize(num_incoming_connections, temp->stream);
cons.add(remote_node_id,temp);
// make a thread that will connect to all the targets
map_id_to_con cons2;
std::string error_string;
thread_function thread(connect_all_hostinfo, dlib::ref(cons2), dlib::ref(targets), node_id, dlib::ref(error_string));
if (error_string.size() != 0)
throw socket_error(error_string);
// accept any incoming connections
for (unsigned long i = 0; i < num_incoming_connections; ++i)
{
// If it takes more than 10 seconds for the other nodes to connect to us
// then something has gone horribly wrong and it almost certainly will
// never connect at all. So just give up if that happens.
const unsigned long timeout_milliseconds = 10000;
if (list->accept(con, timeout_milliseconds))
{
throw socket_error("Error occurred while accepting new connection");
}
temp.reset(new bsp_con(con));
dlib::deserialize(remote_node_id, temp->stream);
cons.add(remote_node_id,temp);
}
// put all the connections created by the thread into cons
thread.wait();
while (cons2.size() > 0)
{
unsigned long id;
scoped_ptr<bsp_con> temp;
cons2.remove_any(id,temp);
cons.add(id,temp);
}
}
} }
......
dlib/bsp/bsp.h
View file @ 768888ff
This diff is collapsed.
dlib/bsp/bsp_abstract.h
View file @ 768888ff
...@@ -187,21 +187,25 @@ namespace dlib ...@@ -187,21 +187,25 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template < template <
typename port_notify_function_type,
typename funct_type typename funct_type
> >
void bsp_listen ( void bsp_listen_dynamic_port (
unsigned short listening_port, unsigned short listening_port,
port_notify_function_type port_notify_function,
funct_type funct funct_type funct
); );
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template < template <
typename port_notify_function_type,
typename funct_type, typename funct_type,
typename ARG1 typename ARG1
> >
void bsp_listen ( void bsp_listen_dynamic_port (
unsigned short listening_port, unsigned short listening_port,
port_notify_function_type port_notify_function,
funct_type funct, funct_type funct,
ARG1 arg1 ARG1 arg1
); );
...@@ -209,12 +213,14 @@ namespace dlib ...@@ -209,12 +213,14 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template < template <
typename port_notify_function_type,
typename funct_type, typename funct_type,
typename ARG1, typename ARG1,
typename ARG2 typename ARG2
> >
void bsp_listen ( void bsp_listen_dynamic_port (
unsigned short listening_port, unsigned short listening_port,
port_notify_function_type port_notify_function,
funct_type funct, funct_type funct,
ARG1 arg1, ARG1 arg1,
ARG2 arg2 ARG2 arg2
...@@ -223,13 +229,15 @@ namespace dlib ...@@ -223,13 +229,15 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template < template <
typename port_notify_function_type,
typename funct_type, typename funct_type,
typename ARG1, typename ARG1,
typename ARG2, typename ARG2,
typename ARG3 typename ARG3
> >
void bsp_listen ( void bsp_listen_dynamic_port (
unsigned short listening_port, unsigned short listening_port,
port_notify_function_type port_notify_function,
funct_type funct, funct_type funct,
ARG1 arg1, ARG1 arg1,
ARG2 arg2, ARG2 arg2,
...@@ -239,14 +247,16 @@ namespace dlib ...@@ -239,14 +247,16 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template < template <
typename port_notify_function_type,
typename funct_type, typename funct_type,
typename ARG1, typename ARG1,
typename ARG2, typename ARG2,
typename ARG3, typename ARG3,
typename ARG4 typename ARG4
> >
void bsp_listen ( void bsp_listen_dynamic_port (
unsigned short listening_port, unsigned short listening_port,
port_notify_function_type port_notify_function,
funct_type funct, funct_type funct,
ARG1 arg1, ARG1 arg1,
ARG2 arg2, ARG2 arg2,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment