X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Fsocket.c;h=8dc3ed2d6b0d5a9fc1a5d731f2cd96bd3ad0d48c;hb=c022471e52d3ea679139cdf026dcde179c8de23c;hp=038f6ca33201643a2b008067c6d50ffb407393d0;hpb=b990de23c6cb1c172487f21574b3725e44461734;p=deb_libnfs.git
diff --git a/lib/socket.c b/lib/socket.c
index 038f6ca..8dc3ed2 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -14,34 +14,58 @@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see .
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
#ifdef WIN32
#include "win32_compat.h"
-#else
-#include
-#include
+#endif
+
+#ifdef HAVE_ARPA_INET_H
#include
+#endif
+
+#ifdef HAVE_POLL_H
+#include
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
#include
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
#include
-#include
-#endif/*WIN32*/
+#endif
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifdef HAVE_NETDB_H
+#include
#endif
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+
#ifdef HAVE_SYS_FILIO_H
#include
#endif
+
#ifdef HAVE_SYS_SOCKIO_H
#include
#endif
+
+#include
+#include
+#include
+#include
+#include
+#include
#include
+#include "libnfs-zdr.h"
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-private.h"
@@ -61,7 +85,7 @@ static void set_nonblocking(int fd)
int v = 0;
#if defined(WIN32)
long nonblocking=1;
- v = ioctlsocket(fd, FIONBIO,&nonblocking);
+ v = ioctl(fd, FIONBIO, &nonblocking);
#else
v = fcntl(fd, F_GETFL, 0);
fcntl(fd, F_SETFL, v | O_NONBLOCK);
@@ -70,12 +94,18 @@ static void set_nonblocking(int fd)
int rpc_get_fd(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
return rpc->fd;
}
int rpc_which_events(struct rpc_context *rpc)
{
- int events = rpc->is_connected ? POLLIN : POLLOUT;
+ int events;
+
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+ events = rpc->is_connected ? POLLIN : POLLOUT;
if (rpc->is_udp != 0) {
/* for udp sockets we only wait for pollin */
@@ -90,26 +120,21 @@ int rpc_which_events(struct rpc_context *rpc)
static int rpc_write_to_socket(struct rpc_context *rpc)
{
- ssize_t count;
+ int32_t count;
+
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
- if (rpc == NULL) {
- return -1;
- }
if (rpc->fd == -1) {
rpc_set_error(rpc, "trying to write but not connected");
return -1;
}
while (rpc->outqueue != NULL) {
- ssize_t total;
+ int64_t total;
total = rpc->outqueue->outdata.size;
-#if defined(WIN32)
count = send(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written, 0);
-#else
- count = write(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written);
-#endif
if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0;
@@ -134,13 +159,13 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
int available;
int size;
int pdu_size;
- ssize_t count;
+ int32_t count;
+
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
-#if defined(WIN32)
- if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
-#else
if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
-#endif
rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
return -1;
}
@@ -185,11 +210,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
if (rpc->inpos < 4) {
size = 4 - rpc->inpos;
-#if defined(WIN32)
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
- count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
if (count == -1) {
if (errno == EINTR) {
return 0;
@@ -225,11 +246,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
size = rpc->insize - rpc->inpos;
}
-#if defined(WIN32)
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
- count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
if (count == -1) {
if (errno == EINTR) {
return 0;
@@ -258,6 +275,8 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
int rpc_service(struct rpc_context *rpc, int revents)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (revents & POLLERR) {
#ifdef WIN32
char err = 0;
@@ -336,11 +355,15 @@ int rpc_service(struct rpc_context *rpc, int revents)
void rpc_set_autoreconnect(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
rpc->auto_reconnect = 1;
}
void rpc_unset_autoreconnect(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
rpc->auto_reconnect = 0;
}
@@ -348,6 +371,8 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
{
int socksize;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
switch (s->ss_family) {
case AF_INET:
socksize = sizeof(struct sockaddr_in);
@@ -363,8 +388,6 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
return -1;
}
-
-#if !defined(WIN32)
/* Some systems allow you to set capabilities on an executable
* to allow the file to be executed with privilege to bind to
* privileged system ports, even if the user is not root.
@@ -379,39 +402,47 @@ static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
* On linux, use
* sudo setcap 'cap_net_bind_service=+ep' /path/executable
* to make the executable able to bind to a system port.
+ *
+ * On Windows, there is no concept of privileged ports. Thus
+ * binding will usually succeed.
*/
- if (1) {
- int port;
- int one = 1;
-
- setsockopt(rpc->fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one));
-
- for (port = 200; port < 500; port++) {
- struct sockaddr_in sin;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_port = htons(port);
- sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = 0;
-
- if (bind(rpc->fd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in)) != 0 && errno != EACCES) {
- /* we didnt get EACCES, so try again */
- continue;
- }
- break;
+ {
+ struct sockaddr_in sin;
+ static int portOfs = 0;
+ const int firstPort = 512; /* >= 512 according to Sun docs */
+ const int portCount = IPPORT_RESERVED - firstPort;
+ int startOfs, port, rc;
+
+ if (portOfs == 0) {
+ portOfs = time(NULL) % 400;
}
- }
+ startOfs = portOfs;
+ do {
+ rc = -1;
+ port = htons(firstPort + portOfs);
+ portOfs = (portOfs + 1) % portCount;
+
+ /* skip well-known ports */
+ if (!getservbyport(port, "tcp")) {
+ memset(&sin, 0, sizeof(sin));
+ sin.sin_port = port;
+ sin.sin_family = AF_INET;
+ sin.sin_addr.s_addr = 0;
+
+ rc = bind(rpc->fd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in));
+#if !defined(WIN32)
+ /* we got EACCES, so don't try again */
+ if (rc != 0 && errno == EACCES)
+ break;
#endif
+ }
+ } while (rc != 0 && portOfs != startOfs);
+ }
set_nonblocking(rpc->fd);
-#if defined(WIN32)
- if (connect(rpc->fd, (struct sockaddr *)s, socksize) == 0 && errno != EINPROGRESS )
-#else
- if (connect(rpc->fd, (struct sockaddr *)s, socksize) != 0 && errno != EINPROGRESS)
-#endif
- {
- rpc_set_error(rpc, "connect() to server failed");
+ if (connect(rpc->fd, (struct sockaddr *)s, socksize) != 0 && errno != EINPROGRESS) {
+ rpc_set_error(rpc, "connect() to server failed. %s(%d)", strerror(errno), errno);
return -1;
}
@@ -422,6 +453,8 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
{
struct sockaddr_in *sin = (struct sockaddr_in *)&rpc->s;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->fd != -1) {
rpc_set_error(rpc, "Trying to connect while already connected");
return -1;
@@ -462,14 +495,12 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
int rpc_disconnect(struct rpc_context *rpc, char *error)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
rpc_unset_autoreconnect(rpc);
if (rpc->fd != -1) {
-#if defined(WIN32)
- closesocket(rpc->fd);
-#else
close(rpc->fd);
-#endif
}
rpc->fd = -1;
@@ -482,6 +513,8 @@ int rpc_disconnect(struct rpc_context *rpc, char *error)
static void reconnect_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (status != RPC_STATUS_SUCCESS) {
rpc_error_all_pdus(rpc, "RPC ERROR: Failed to reconnect async");
return;
@@ -496,12 +529,10 @@ static int rpc_reconnect_requeue(struct rpc_context *rpc)
{
struct rpc_pdu *pdu;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->fd != -1) {
-#if defined(WIN32)
- closesocket(rpc->fd);
-#else
close(rpc->fd);
-#endif
}
rpc->fd = -1;
@@ -535,6 +566,8 @@ int rpc_bind_udp(struct rpc_context *rpc, char *addr, int port)
struct addrinfo *ai = NULL;
char service[6];
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->is_udp == 0) {
rpc_set_error(rpc, "Cant not bind UDP. Not UDP context");
return -1;
@@ -578,6 +611,8 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
struct addrinfo *ai = NULL;
char service[6];
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->is_udp == 0) {
rpc_set_error(rpc, "Can not set destination sockaddr. Not UDP context");
return -1;
@@ -597,6 +632,7 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
rpc->udp_dest = malloc(ai->ai_addrlen);
if (rpc->udp_dest == NULL) {
rpc_set_error(rpc, "Out of memory. Failed to allocate sockaddr structure");
+ freeaddrinfo(ai);
return -1;
}
memcpy(rpc->udp_dest, ai->ai_addr, ai->ai_addrlen);
@@ -610,6 +646,8 @@ int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
return (struct sockaddr *)&rpc->udp_src;
}
@@ -618,6 +656,8 @@ int rpc_queue_length(struct rpc_context *rpc)
int i=0;
struct rpc_pdu *pdu;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
for(pdu = rpc->outqueue; pdu; pdu = pdu->next) {
i++;
}