Changeset 11190 for trunk/FACT++/src
- Timestamp:
- 06/27/11 13:00:22 (13 years ago)
- Location:
- trunk/FACT++/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/Connection.cc
r11164 r11190 3 3 4 4 @brief Maintains an ansynchronous TCP/IP client connection 5 6 @todo 7 Unify with ConnectionUSB 5 8 6 9 */ … … 44 47 } 45 48 49 /* 46 50 void Connection::AsyncWait(ba::deadline_timer &timer, int millisec, 47 51 void (Connection::*handler)(const bs::error_code&)) … … 59 63 timer.async_wait(boost::bind(handler, this, dummy::error)); 60 64 } 65 */ 61 66 62 67 void Connection::AsyncConnect(tcp::resolver::iterator iterator) … … 66 71 // AsyncConnect + Deadline 67 72 async_connect(endpoint, 68 boost::bind(&Connection::ConnectImp, 69 this, ba::placeholders::error, 70 iterator)); 73 boost::bind(&Connection::ConnectIterImp, 74 this, iterator, ba::placeholders::error)); 75 76 // We will get a "Connection timeout anyway" 77 //AsyncWait(fConnectTimeout, 5, &Connection::HandleConnectTimeout); 78 } 79 80 void Connection::AsyncConnect() 81 { 82 // AsyncConnect + Deadline 83 async_connect(fEndpoint, 84 boost::bind(&Connection::ConnectAddrImp, 85 this, fEndpoint, ba::placeholders::error)); 71 86 72 87 // We will get a "Connection timeout anyway" … … 275 290 } 276 291 277 void Connection::ConnectImp(const bs::error_code& error, 278 tcp::resolver::iterator iterator) 279 { 280 tcp::endpoint endpoint = *iterator; 281 292 void Connection::ConnectAddrImp(const tcp::endpoint &endpoint, const bs::error_code& error) 293 { 282 294 const string host = endpoint.port()==0 ? "" : 283 295 endpoint.address().to_string()+":"+lexical_cast<string>(endpoint.port()); … … 325 337 326 338 fConnectionStatus = kConnecting; 327 339 /* 328 340 // Go on with the next 329 341 if (++iterator != tcp::resolver::iterator()) … … 332 344 return; 333 345 } 334 346 */ 335 347 // No more entries to try, if we would not put anything else 336 348 // into the queue anymore it would now return (run() would return) … … 343 355 } 344 356 357 void Connection::ConnectIterImp(tcp::resolver::iterator iterator, const bs::error_code& error) 358 { 359 ConnectAddrImp(*iterator, error); 360 /* 361 tcp::endpoint endpoint = *iterator; 362 363 const string host = endpoint.port()==0 ? "" : 364 endpoint.address().to_string()+":"+lexical_cast<string>(endpoint.port()); 365 366 // Connection established 367 if (!error) 368 { 369 set_option(socket_base::keep_alive(true)); 370 371 const int optval = 10; 372 // First keep alive after 10s 373 setsockopt(native(), SOL_TCP, TCP_KEEPIDLE, &optval, sizeof(optval)); 374 // New keep alive after 10s 375 setsockopt(native(), SOL_TCP, TCP_KEEPINTVL, &optval, sizeof(optval)); 376 377 Info("Connection established to "+host+"..."); 378 379 fConnectionStatus = kConnected; 380 381 ConnectionEstablished(); 382 return; 383 } 384 385 // If returning from run will lead to deletion of this 386 // instance, close() is not needed (maybe implicitly called). 387 // If run is called again, close() is needed here. Otherwise: 388 // Software caused connection abort when we try to resolve 389 // the endpoint again. 390 CloseImp(false); 391 392 ostringstream msg; 393 if (!host.empty()) 394 msg << "Connecting to " << host << ": " << error.message() << " (" << error << ")"; 395 396 if (fErrConnect!=msg.str()) 397 { 398 if (error!=ba::error::basic_errors::connection_refused) 399 fMsgConnect = ""; 400 fErrConnect = msg.str(); 401 Warn(fErrConnect); 402 } 403 404 if (error==ba::error::basic_errors::operation_aborted) 405 return; 406 407 fConnectionStatus = kConnecting; 408 */ 409 // Go on with the next 410 if (++iterator != tcp::resolver::iterator()) 411 { 412 AsyncConnect(iterator); 413 return; 414 } 415 /* 416 // No more entries to try, if we would not put anything else 417 // into the queue anymore it would now return (run() would return) 418 419 // Since we don't want to block the main loop, we wait using an 420 // asnychronous timer 421 422 // FIXME: Should we move this before AsyncConnect() ? 423 AsyncWait(fConnectionTimer, 250, &Connection::HandleConnectionTimer); 424 */ 425 } 426 345 427 // FIXME: Async connect should get address and port as an argument 346 428 void Connection::StartConnect() 347 429 { 348 430 fConnectionStatus = kConnecting; 431 432 if (fEndpoint!=tcp::endpoint()) 433 { 434 ostringstream msg; 435 msg << "Trying to connect to " << fEndpoint << "..."; 436 Info(msg); 437 438 AsyncConnect(); 439 return; 440 } 349 441 350 442 tcp::resolver resolver(get_io_service()); -
trunk/FACT++/src/Connection.h
r11118 r11190 4 4 #include <deque> 5 5 #include <string> 6 #include <boost/bind.hpp> 6 7 #include <boost/asio.hpp> 7 8 #include <boost/function.hpp> … … 17 18 std::string fAddress; 18 19 std::string fPort; 20 21 boost::asio::ip::tcp::endpoint fEndpoint; 19 22 20 23 bool fDebugTx; … … 48 51 void AsyncRead(const boost::asio::mutable_buffers_1 buffers, int type=0); 49 52 void AsyncWrite(const boost::asio::const_buffers_1 &buffers); 53 54 template<class T> 55 void AsyncWaitImp(boost::asio::deadline_timer &timer, int millisec, 56 void (T::*handler)(const boost::system::error_code&)) 57 { 58 // - The boost::asio::basic_deadline_timer::expires_from_now() 59 // function cancels any pending asynchronous waits, and returns 60 // the number of asynchronous waits that were cancelled. If it 61 // returns 0 then you were too late and the wait handler has 62 // already been executed, or will soon be executed. If it 63 // returns 1 then the wait handler was successfully cancelled. 64 // - If a wait handler is cancelled, the bs::error_code passed to 65 // it contains the value bs::error::operation_aborted. 66 timer.expires_from_now(boost::posix_time::milliseconds(millisec)); 67 68 timer.async_wait(boost::bind(handler, this, boost::asio::placeholders::error)); 69 } 70 50 71 void AsyncWait(boost::asio::deadline_timer &timer, int millisec, 51 void (Connection::*handler)(const boost::system::error_code&)); 72 void (Connection::*handler)(const boost::system::error_code&)) 73 { 74 AsyncWaitImp(timer, millisec, handler); 75 } 76 52 77 53 78 private: 54 79 void AsyncConnect(boost::asio::ip::tcp::resolver::iterator iterator); 80 void AsyncConnect(); 55 81 56 82 void CloseImp(bool restart=true); 57 83 58 void ConnectImp(const boost::system::error_code& error, 59 boost::asio::ip::tcp::resolver::iterator endpoint_iterator); 84 void ConnectAddrImp(const boost::asio::ip::tcp::endpoint &endpoint, 85 const boost::system::error_code& error); 86 void ConnectIterImp(boost::asio::ip::tcp::resolver::iterator endpoint_iterator, 87 const boost::system::error_code& error); 60 88 61 89 void HandleConnectionTimer(const boost::system::error_code &error); … … 75 103 void SetEndpoint(const std::string &addr, const std::string &port); 76 104 void SetEndpoint(const std::string &addr); 105 void SetEndpoint(const boost::asio::ip::tcp::endpoint &ep) { fEndpoint = ep; } 77 106 78 107 void StartConnect(); … … 112 141 113 142 std::string URL() const { return fAddress + ":" + fPort; } 143 144 const boost::asio::ip::tcp::endpoint &GetEndpoint() const { return fEndpoint; } 114 145 }; 115 146
Note:
See TracChangeset
for help on using the changeset viewer.