projects
/
anytun.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.3.3 - merge fix
[anytun.git]
/
src
/
syncServer.h
diff --git
a/src/syncServer.h
b/src/syncServer.h
index
b73247f
..
032e975
100644
(file)
--- a/
src/syncServer.h
+++ b/
src/syncServer.h
@@
-50,7
+50,8
@@
class SyncServer
{
public:
SyncServer(std::string localaddr, std::string port, ConnectCallback onConnect);
{
public:
SyncServer(std::string localaddr, std::string port, ConnectCallback onConnect);
- void onResolve(const SyncTcpConnection::proto::endpoint& e);
+ ~SyncServer();
+ void onResolve(SyncTcpConnection::proto::resolver::iterator& it);
void onResolvError(const std::runtime_error& e);
void run();
void onResolvError(const std::runtime_error& e);
void run();
@@
-59,14
+60,18
@@
public:
std::list<SyncTcpConnection::pointer> conns_;
private:
std::list<SyncTcpConnection::pointer> conns_;
private:
- void start_accept();
- void handle_accept(SyncTcpConnection::pointer new_connection, const boost::system::error_code& error);
-
Mutex mutex_; //Mutex for list conns_
boost::asio::io_service io_service_;
Mutex mutex_; //Mutex for list conns_
boost::asio::io_service io_service_;
- SyncTcpConnection::proto::acceptor acceptor_;
+ typedef struct {
+ SyncTcpConnection::proto::acceptor* acceptor_;
+ bool started_;
+ } AcceptorsElement;
+ std::list<AcceptorsElement> acceptors_;
ConnectCallback onConnect_;
Semaphore ready_sem_;
ConnectCallback onConnect_;
Semaphore ready_sem_;
+
+ void start_accept();
+ void handle_accept(SyncTcpConnection::pointer new_connection, const boost::system::error_code& error, std::list<AcceptorsElement>::iterator it);
};
#endif
};
#endif