diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-10 11:39:25 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-10-10 11:39:25 +0200 |
| commit | 2e71bf974f42cfe9edf9c8289602eec0c7ecadf9 (patch) | |
| tree | 574bd00266dacf3dc7b21d6f601131c85340663b /src/TcpSocket.h | |
| parent | bbafa23de92eb542f4c8266d484aed9faf88d360 (diff) | |
| parent | 4576c71f10dc009ce0dd9aedbc2f81a3e1a8be0e (diff) | |
| download | dabmux-2e71bf974f42cfe9edf9c8289602eec0c7ecadf9.tar.gz dabmux-2e71bf974f42cfe9edf9c8289602eec0c7ecadf9.tar.bz2 dabmux-2e71bf974f42cfe9edf9c8289602eec0c7ecadf9.zip | |
Merge next into servicelinking
Diffstat (limited to 'src/TcpSocket.h')
| -rw-r--r-- | src/TcpSocket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/TcpSocket.h b/src/TcpSocket.h index f1354a7..5a4a808 100644 --- a/src/TcpSocket.h +++ b/src/TcpSocket.h @@ -46,6 +46,8 @@ #include <iostream> #include <string> +#include <boost/optional.hpp> + /** * This class represents a TCP socket. */ @@ -84,6 +86,7 @@ class TcpSocket void listen(void); TcpSocket accept(void); + boost::optional<TcpSocket> accept(int timeout_ms); /** Retrieve address this socket is bound to */ InetAddress getOwnAddress() const; |