Improve --timeout method to take into account all socket I/O that is