From 35ae7af4c8f541785699ad7ca1ad64d2413a88ec Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 2 Jan 2015 15:06:58 +0100 Subject: [SERVER] Dead code removal, minor performance tweaks, refactoring, etc. --- src/server/helper.h | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) (limited to 'src/server/helper.h') diff --git a/src/server/helper.h b/src/server/helper.h index 0ecbdfd..7c962d7 100644 --- a/src/server/helper.h +++ b/src/server/helper.h @@ -29,56 +29,6 @@ static inline bool isSameAddressPort(const dnbd3_host_t * const a, const dnbd3_h return (a->type == b->type) && (a->port == b->port) && (0 == memcmp( a->addr, b->addr, (a->type == AF_INET ? 4 : 16) )); } -/** - * Send message to client. - * @return true on success, false on failure - */ -static inline int send_data(int client_sock, void *data_in, int len) -{ - if ( len <= 0 ) return true; // Nothing to send - char *data = data_in; // Needed for pointer arithmetic - int ret, i; - for (i = 0; i < 3; ++i) // Retry at most 3 times, each try takes at most 0.5 seconds (socket timeout) - { - ret = send( client_sock, data, len, 0 ); - if ( ret == 0 ) return false; // Connection closed - if ( ret < 0 ) { - if ( errno != EAGAIN ) return false; // Some unexpected error - usleep( 1000 ); // 1ms - continue; - } - len -= ret; - if ( len <= 0 ) return true; // Sent everything - data += ret; // move target buffer pointer - } - return false; -} - -/** - * Receive data from client. - * @return true on success, false otherwise - */ -static inline bool recv_data(int client_sock, void *buffer_out, int len) -{ - if ( len <= 0 ) return true; // Nothing to receive - char *data = buffer_out; // Needed for pointer arithmetic - int ret, i; - for (i = 0; i < 3; ++i) // Retry at most 3 times, each try takes at most 0.5 seconds (socket timeout) - { - ret = recv( client_sock, data, len, MSG_WAITALL ); - if ( ret == 0 ) return false; // Connection closed - if ( ret < 0 ) { - if ( errno != EAGAIN ) return false; // Some unexpected error - usleep( 1000 ); // 1ms - continue; - } - len -= ret; - if ( len <= 0 ) return true; // Received everything - data += ret; // move target buffer pointer - } - return false; -} - /** * Test whether string ends in suffix. * @return true if string =~ /suffix$/ -- cgit v1.2.3-55-g7522