diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-06-14 01:44:23 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-06-23 19:51:28 +0200 |
| commit | a7db2f4f8e3e367578bf7ddd9e7f4a17589f6328 (patch) | |
| tree | 3d4dab743b1344c538f4ea6ad1976c329c455a04 | |
| parent | 17c0ab15ae0b5f96a73648b7ca96e14c250e93e5 (diff) | |
Add and use set_deadline_from_now().
| -rw-r--r-- | src/lib/dcpomatic_socket.cc | 12 | ||||
| -rw-r--r-- | src/lib/dcpomatic_socket.h | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc index 6dcc8e933..e86f2e2ae 100644 --- a/src/lib/dcpomatic_socket.cc +++ b/src/lib/dcpomatic_socket.cc @@ -63,7 +63,7 @@ Socket::check () void Socket::connect (boost::asio::ip::tcp::endpoint endpoint) { - _deadline.expires_from_now (boost::posix_time::seconds (_timeout)); + set_deadline_from_now(_timeout); boost::system::error_code ec = boost::asio::error::would_block; _socket.async_connect (endpoint, boost::lambda::var(ec) = boost::lambda::_1); do { @@ -95,7 +95,7 @@ Socket::connect (boost::asio::ip::tcp::endpoint endpoint) void Socket::write (uint8_t const * data, int size) { - _deadline.expires_from_now (boost::posix_time::seconds (_timeout)); + set_deadline_from_now(_timeout); boost::system::error_code ec = boost::asio::error::would_block; boost::asio::async_write (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1); @@ -136,7 +136,7 @@ Socket::write (uint32_t v) void Socket::read (uint8_t* data, int size) { - _deadline.expires_from_now (boost::posix_time::seconds (_timeout)); + set_deadline_from_now(_timeout); boost::system::error_code ec = boost::asio::error::would_block; boost::asio::async_read (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1); @@ -266,3 +266,9 @@ Socket::set_send_buffer_size (int size) _send_buffer_size = size; } + +void +Socket::set_deadline_from_now(int seconds) +{ + _deadline.expires_from_now(boost::posix_time::seconds(seconds)); +} diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h index ef92ea844..79cf7efe2 100644 --- a/src/lib/dcpomatic_socket.h +++ b/src/lib/dcpomatic_socket.h @@ -52,6 +52,7 @@ public: void read (uint8_t* data, int size); uint32_t read_uint32 (); + void set_deadline_from_now(int seconds); class ReadDigestScope { public: |