-/***************************************************************************
- * Copyright (C) 2006 by Gerd v. Egidy *
- * gve@intra2net.com *
- * *
- * This library is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU Lesser General Public License version *
- * 2.1 as published by the Free Software Foundation. *
- * *
- * This library is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
+/*
+Copyright (C) 2006 by Intra2net AG - Gerd v. Egidy
+
+The software in this package is distributed under the GNU General
+Public License version 2 (with a special exception described below).
+
+A copy of GNU General Public License (GPL) is included in this distribution,
+in the file COPYING.GPL.
+
+As a special exception, if other files instantiate templates or use macros
+or inline functions from this file, or you compile this file and link it
+with other works to produce a work based on this file, this file
+does not by itself cause the resulting work to be covered
+by the GNU General Public License.
+
+However the source code for this file must still be made available
+in accordance with section (3) of the GNU General Public License.
+
+This exception does not invalidate any other reasons why a work based
+on this file might be covered by the GNU General Public License.
+*/
#include <stdio.h>
#include <errno.h>
{
}
+/**
+ * Destructor. Closes open socket
+ */
+socket_handler::~socket_handler()
+{
+ if (sock != -1)
+ {
+ shutdown(sock,SHUT_RDWR);
+ ::close(sock);
+
+ sock = -1;
+ }
+}
+
+/// close the underlying socket connection. Don't call directly, use the version provided
+/// by the connection class you are using.
+void socket_handler::close()
+{
+ LOGSTREAM(debug,"close connection");
+ // graceful shutdown
+ shutdown(sock,SHUT_RDWR);
+ ::close(sock);
+
+ sock = -1;
+}
/// set options like fast reuse and keepalive every socket should have
void socket_handler::set_socket_options(int sock)
EXCEPTIONSTREAM(error,t2n_communication_error,"fcntl error on socket: " << strerror(errno));
}
-/// close the underlying socket connection. Don't call directly, use the version provided
-/// by the connection class you are using.
-void socket_handler::close()
-{
- LOGSTREAM(debug,"close connection");
- // graceful shutdown
- shutdown(sock,SHUT_RDWR);
- ::close(sock);
-}
-
/// is the underlying socket connection still open?
bool socket_handler::is_closed()
{
*/
bool socket_handler::fill_buffer(std::string& buffer)
{
- bool try_again=false;
-
char socket_buffer[recv_buffer_size];
- int nbytes = read (sock, socket_buffer, recv_buffer_size);
+ const int loop_max = 32; /* limit is 32 * (default) 2048 bytes -> 65536 bytes in one go */
+ int loop_count = 0;
- if (nbytes < 0)
+ bool read_something = false;
+ while (loop_count < loop_max)
{
- if (errno == EAGAIN)
- return false; // no data was waiting
- else if (errno == EINTR)
+ const int nbytes = read(sock, socket_buffer, recv_buffer_size);
+
+ if (nbytes < 0)
{
- // interrupted, try again
- LOGSTREAM(debug,"EINTR received on read(), trying again");
- try_again=true;
+ if (errno == EAGAIN || errno == EWOULDBLOCK)
+ return read_something; // no (more) data was waiting
+ else if (errno == EINTR)
+ {
+ // interrupted, try again
+ LOGSTREAM(debug, "EINTR received on read(), trying again");
+ } else
+ EXCEPTIONSTREAM(error, t2n_transfer_error, "error reading from socket : " << strerror(errno));
}
- else
- EXCEPTIONSTREAM(error,t2n_transfer_error,"error reading from socket : " << strerror(errno));
- }
- // End-of-file
- if (nbytes == 0 && !try_again)
- {
- LOGSTREAM(debug,"0 bytes received on read(), closing connection");
- close();
- return false;
- }
+ // End-of-file
+ if (nbytes == 0)
+ {
+ LOGSTREAM(debug, "0 bytes received on read(), closing connection");
+ close();
+ return read_something;
+ }
- // Data read -> store it
- if (nbytes > 0)
- {
- buffer.append(socket_buffer,nbytes);
- LOGSTREAM(debug,nbytes << " bytes read");
- }
+ // Data read -> store it
+ if (nbytes > 0)
+ {
+ buffer.append(socket_buffer, nbytes);
+ LOGSTREAM(debug, nbytes << " bytes read");
+ read_something = true;
+ }
- // more data waiting -> recurse
- if (data_waiting(0))
- fill_buffer(buffer);
+ // more data waiting -> loop once more (up to loop_max)
+ if (data_waiting(0))
+ {
+ ++loop_count;
+ } else
+ {
+ break;
+ }
+ }
- if (nbytes > 0)
- return true;
- else
- return false;
+ return read_something;
}
/// writes raw data to the socket. Don't use directly, use the write() function provided by the
int rtn;
while ((rtn=::write(sock, data.data()+offset, write_size)) == -1 &&
- (errno == EAGAIN || errno == EINTR))
+ (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR))
{
wait_ready_to_write(sock,write_timeout);
- LOGSTREAM(debug,"resuming write() call after EAGAIN or EINTR");
+ LOGSTREAM(debug,"resuming write() call after EAGAIN or EINTR or EWOULDBLOCK");
}
if (rtn == -1)
git://developer.intra2net.com / libt2n / blobdiff