Improve functions in s_socket.c and s_client.c