adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

getting in shape for 1.2

This commit is contained in:
rafael@riseup.net 2013-05-18 19:00:08 +00:00
parent 4055ebf9ef
commit 3fbfd0f03d
3 changed files with 22 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
darkice/trunk/src/DarkIce.h
View File

@ -235,8 +235,8 @@ class DarkIce : public virtual Referable, public virtual Reporter
* @return if shouting was successful.
* @exception Exception
*/
//bool
//shout ( unsigned int ) throw ( Exception );
bool
shout ( unsigned int ) throw ( Exception );
protected:

89
darkice/trunk/src/TcpSocket.cpp
View File

@ -83,7 +83,6 @@
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#include <netinet/tcp.h>
#else
#error need signal.h
#endif
@ -194,7 +193,6 @@ bool
TcpSocket :: open ( void ) throw ( Exception )
{
int optval;
struct timeval optval2 = {5L, 0L};
socklen_t optlen;
#ifdef HAVE_ADDRINFO
struct addrinfo hints
@ -223,13 +221,10 @@ TcpSocket :: open ( void ) throw ( Exception )
memcpy ( addr, ptr->ai_addr, ptr->ai_addrlen);
freeaddrinfo(ptr);
#else
reportEvent(9, "Gonna do gethostbyname()");
if ( !(pHostEntry = gethostbyname( host)) ) {
sockfd = 0;
reportEvent(9, "Fail in gethostbyname()");
throw Exception( __FILE__, __LINE__, "gethostbyname error", errno);
}
reportEvent(9, "done gethostbyname()");
memset( &addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
@ -246,40 +241,9 @@ TcpSocket :: open ( void ) throw ( Exception )
optval = 1;
optlen = sizeof(optval);
if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, &optval, optlen) == -1) {
reportEvent(5, "can't set TCP socket SO_KEEPALIVE mode", errno);
}
// set keep alive to some short value, this is a streaming server
// a long value will not work and lead to delay in reconnection
optval=5;
if (setsockopt(sockfd, SOL_TCP, TCP_KEEPIDLE, &optval, optlen) == -1) {
reportEvent(5, "can't set TCP socket keep-alive TCP_KEEPIDLE value", errno);
}
optval=2;
if (setsockopt(sockfd, SOL_TCP, TCP_KEEPCNT, &optval, optlen) == -1) {
reportEvent(5, "can't set TCP socket keep-alive TCP_KEEPCNT value", errno);
}
optval=5;
if (setsockopt(sockfd, SOL_TCP, TCP_KEEPINTVL, &optval, optlen) == -1) {
reportEvent(5, "can't set TCP socket keep-alive TCP_KEEPCNT value", errno);
}
if (-1 == setsockopt(sockfd, SOL_SOCKET, SO_SNDTIMEO, (const char *) &optval2, sizeof (optval2))) {
reportEvent(5,"could not set socket option SO_SNDTIMEO");
reportEvent(5, "can't set TCP socket keep-alive mode", errno);
}
if (-1 == setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, (const char *) &optval2, sizeof (optval2))) {
reportEvent(5,"could not set socket option SO_RCVTIMEO");
}
#ifdef TCP_CORK
// send larger network segments, limit buffer upto 0.2 sec before actual sending
if (-1 == setsockopt(sockfd, IPPROTO_TCP, TCP_CORK, (const char *) &optval, sizeof (optval))) {
reportEvent(5,"could not set socket option TCP_CORK");
}
#endif
// connect
if ( connect( sockfd, (struct sockaddr*)&addr, sizeof(addr)) == -1 ) {
::close( sockfd);
@ -365,7 +329,7 @@ TcpSocket :: read ( void * buf,
/*------------------------------------------------------------------------------
* Check if write() would block
* Check wether read() would return anything
*----------------------------------------------------------------------------*/
bool
TcpSocket :: canWrite ( unsigned int sec,
@ -406,7 +370,7 @@ TcpSocket :: canWrite ( unsigned int sec,
* Write to the socket
*----------------------------------------------------------------------------*/
unsigned int
TcpSocket :: write ( const void * buf,
TcpSocket :: write ( const void * buf,
unsigned int len ) throw ( Exception )
{
int ret;
@ -414,42 +378,27 @@ TcpSocket :: write ( const void * buf,
if ( !isOpen() ) {
return 0;
}
// let us try to write stuff to this socket
// we can not take forever to do it, so the open() call set up
// a send timeout, of 5 seconds
// we give it 2 retries and then give up, the stream has
// been blocked for 10+ seconds and we need to take action anyway
unsigned int bytesleft = len;
int retries = 2;
errno = 0;
while (bytesleft && (retries)) {
reportEvent(9,"before write\n", retries);
#ifdef HAVE_MSG_NOSIGNAL
ret = send( sockfd, buf, bytesleft, MSG_NOSIGNAL); // no SIGPIPE
#else
ret = send( sockfd, buf, bytesleft, 0);
#endif
if ((ret < 0) && ( errno == EAGAIN )) {
// problem happened, but try again
// try again
retries--;
#ifdef HAVE_MSG_NOSIGNAL
ret = send( sockfd, buf, len, MSG_NOSIGNAL);
#else
ret = send( sockfd, buf, len, 0);
#endif
if ( ret == -1 ) {
if ( errno == EAGAIN ) {
ret = 0;
} else {
// some data was written
bytesleft -= ret; // we
buf = (char*)buf + ret; // move pointer to unsent portion
}
reportEvent(9,"after write\n",ret);
}
if (bytesleft) {
// data not send after this time means serious problem
::close(sockfd);
::close( sockfd);
sockfd = 0;
throw Exception( __FILE__, __LINE__, "send error", errno);
} else {
return len; // all bytes sent
throw Exception( __FILE__, __LINE__, "send error", errno);
}
}
return ret;
}
/*------------------------------------------------------------------------------
* Close the socket
*----------------------------------------------------------------------------*/

2
darkice/trunk/src/TcpSocket.h
View File

@ -245,7 +245,7 @@ class TcpSocket : public Source, public Sink, public virtual Reporter
* @exception Exception
*/
virtual unsigned int
write ( const void * buf,
write ( const void * buf,
unsigned int len ) throw ( Exception );
/**