#include "win32_compat.h"
#else
#include <unistd.h>
-#include <poll.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
+#include <assert.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
#ifdef HAVE_SYS_FILIO_H
#include <sys/filio.h>
#endif
#include <sys/sockio.h>
#endif
#include <sys/types.h>
+#include "libnfs-zdr.h"
#include "libnfs.h"
#include "libnfs-raw.h"
#include "libnfs-private.h"
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 */
static int rpc_write_to_socket(struct rpc_context *rpc)
{
- int64_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;
int available;
int size;
int pdu_size;
- int64_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) {
int rpc_service(struct rpc_context *rpc, int revents)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (revents & POLLERR) {
#ifdef WIN32
char err = 0;
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;
}
{
int socksize;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
switch (s->ss_family) {
case AF_INET:
socksize = sizeof(struct sockaddr_in);
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.
* 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;
+ {
+ 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 = portOfs, port, rc;
+
+ 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
}
- break;
- }
+ } while (rc != 0 && portOfs != startOfs);
}
-#endif
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;
}
{
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;
int rpc_disconnect(struct rpc_context *rpc, char *error)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
rpc_unset_autoreconnect(rpc);
if (rpc->fd != -1) {
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;
{
struct rpc_pdu *pdu;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->fd != -1) {
#if defined(WIN32)
closesocket(rpc->fd);
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;
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;
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);
struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
return (struct sockaddr *)&rpc->udp_src;
}
int i=0;
struct rpc_pdu *pdu;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
for(pdu = rpc->outqueue; pdu; pdu = pdu->next) {
i++;
}