along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <poll.h>
#include <string.h>
#include <errno.h>
+#include <rpc/rpc.h>
#include <rpc/xdr.h>
#include <arpa/inet.h>
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
#include <sys/ioctl.h>
#include "libnfs.h"
#include "libnfs-raw.h"
int rpc_which_events(struct rpc_context *rpc)
{
- int events = POLLIN;
-
- if (rpc->is_connected == 0) {
- events |= POLLOUT;
- }
+ int events = rpc->is_connected ? POLLIN : POLLOUT;
if (rpc->outqueue) {
events |= POLLOUT;
ssize_t count;
if (rpc == NULL) {
- printf("trying to write to socket for NULL context\n");
return -1;
}
if (rpc->fd == -1) {
- printf("trying to write but not connected\n");
- return -2;
+ rpc_set_error(rpc, "trying to write but not connected");
+ return -1;
}
while (rpc->outqueue != NULL) {
count = write(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written);
if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
- printf("socket would block, return from write to socket\n");
return 0;
}
- printf("Error when writing to socket :%s(%d)\n", strerror(errno), errno);
- return -3;
+ rpc_set_error(rpc, "Error when writing to socket :%s(%d)", strerror(errno), errno);
+ return -1;
}
rpc->outqueue->written += count;
{
int available;
int size;
- unsigned char *buf;
+ int pdu_size;
ssize_t count;
if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
}
if (available == 0) {
rpc_set_error(rpc, "Socket has been closed");
- return -2;
- }
- size = rpc->insize - rpc->inpos + available;
- buf = malloc(size);
- if (buf == NULL) {
- rpc_set_error(rpc, "Out of memory: failed to allocate %d bytes for input buffer. Closing socket.", size);
- return -3;
+ return -1;
}
- if (rpc->insize > rpc->inpos) {
- memcpy(buf, rpc->inbuf + rpc->inpos, rpc->insize - rpc->inpos);
- rpc->insize -= rpc->inpos;
- rpc->inpos = 0;
+
+ /* read record marker, 4 bytes at the beginning of every pdu */
+ if (rpc->inbuf == NULL) {
+ rpc->insize = 4;
+ rpc->inbuf = malloc(rpc->insize);
+ if (rpc->inbuf == NULL) {
+ rpc_set_error(rpc, "Failed to allocate buffer for record marker, errno:%d. Closing socket.", errno);
+ return -1;
+ }
}
+ if (rpc->inpos < 4) {
+ size = 4 - rpc->inpos;
- count = read(rpc->fd, buf + rpc->insize, available);
- if (count == -1) {
- if (errno == EINTR) {
- free(buf);
- buf = NULL;
- return 0;
+ count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+ if (count == -1) {
+ if (errno == EINTR) {
+ return 0;
+ }
+ rpc_set_error(rpc, "Read from socket failed, errno:%d. Closing socket.", errno);
+ return -1;
}
- rpc_set_error(rpc, "Read from socket failed, errno:%d. Closing socket.", errno);
- free(buf);
- buf = NULL;
- return -4;
+ available -= count;
+ rpc->inpos += count;
}
- if (rpc->inbuf != NULL) {
- free(rpc->inbuf);
+ if (available == 0) {
+ return 0;
}
- rpc->inbuf = (char *)buf;
- rpc->insize += count;
- while (1) {
- if (rpc->insize - rpc->inpos < 4) {
- return 0;
+ pdu_size = rpc_get_pdu_size(rpc->inbuf);
+ if (rpc->insize < pdu_size) {
+ unsigned char *buf;
+
+ buf = malloc(pdu_size);
+ if (buf == NULL) {
+ rpc_set_error(rpc, "Failed to allocate buffer of %d bytes for pdu, errno:%d. Closing socket.", pdu_size, errno);
+ return -1;
}
- count = rpc_get_pdu_size(rpc->inbuf + rpc->inpos);
- if (rpc->insize + rpc->inpos < count) {
+ memcpy(buf, rpc->inbuf, rpc->insize);
+ free(rpc->inbuf);
+ rpc->inbuf = buf;
+ rpc->insize = rpc_get_pdu_size(rpc->inbuf);
+ }
+
+ size = available;
+ if (size > rpc->insize - rpc->inpos) {
+ size = rpc->insize - rpc->inpos;
+ }
+
+ count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+ if (count == -1) {
+ if (errno == EINTR) {
return 0;
}
- if (rpc_process_pdu(rpc, rpc->inbuf + rpc->inpos, count) != 0) {
+ rpc_set_error(rpc, "Read from socket failed, errno:%d. Closing socket.", errno);
+ return -1;
+ }
+ available -= count;
+ rpc->inpos += count;
+
+ if (rpc->inpos == rpc->insize) {
+ if (rpc_process_pdu(rpc, rpc->inbuf, pdu_size) != 0) {
rpc_set_error(rpc, "Invalid/garbage pdu received from server. Closing socket");
- return -5;
- }
- rpc->inpos += count;
- if (rpc->inpos == rpc->insize) {
- free(rpc->inbuf);
- rpc->inbuf = NULL;
- rpc->insize = 0;
- rpc->inpos = 0;
+ return -1;
}
+ free(rpc->inbuf);
+ rpc->inbuf = NULL;
+ rpc->insize = 0;
+ rpc->inpos = 0;
}
+
return 0;
}
int rpc_service(struct rpc_context *rpc, int revents)
{
if (revents & POLLERR) {
- printf("rpc_service: POLLERR, socket error\n");
- if (rpc->is_connected == 0) {
- rpc_set_error(rpc, "Failed to connect to server socket.");
+ int err = 0;
+ socklen_t err_size = sizeof(err);
+
+ if (getsockopt(rpc->fd, SOL_SOCKET, SO_ERROR,
+ &err, &err_size) != 0 || err != 0) {
+ if (err == 0) {
+ err = errno;
+ }
+ rpc_set_error(rpc, "rpc_service: socket error "
+ "%s(%d).",
+ strerror(err), err);
} else {
- rpc_set_error(rpc, "Socket closed with POLLERR");
+ rpc_set_error(rpc, "rpc_service: POLLERR, "
+ "Unknown socket error.");
}
rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
return -1;
}
if (revents & POLLHUP) {
- printf("rpc_service: POLLHUP, socket error\n");
rpc_set_error(rpc, "Socket failed with POLLHUP");
rpc->connect_cb(rpc, RPC_STATUS_ERROR, rpc->error_string, rpc->connect_data);
- return -2;
+ return -1;
}
if (rpc->is_connected == 0 && rpc->fd != -1 && revents&POLLOUT) {
+ int err = 0;
+ socklen_t err_size = sizeof(err);
+
+ if (getsockopt(rpc->fd, SOL_SOCKET, SO_ERROR,
+ &err, &err_size) != 0 || err != 0) {
+ if (err == 0) {
+ err = errno;
+ }
+ rpc_set_error(rpc, "rpc_service: socket error "
+ "%s(%d) while connecting.",
+ strerror(err), err);
+ rpc->connect_cb(rpc, RPC_STATUS_ERROR,
+ NULL, rpc->connect_data);
+ return -1;
+ }
+
rpc->is_connected = 1;
rpc->connect_cb(rpc, RPC_STATUS_SUCCESS, NULL, rpc->connect_data);
return 0;
if (revents & POLLOUT && rpc->outqueue != NULL) {
if (rpc_write_to_socket(rpc) != 0) {
- printf("write to socket failed\n");
- return -3;
+ rpc_set_error(rpc, "write to socket failed");
+ return -1;
}
}
if (revents & POLLIN) {
if (rpc_read_from_socket(rpc) != 0) {
rpc_disconnect(rpc, rpc_get_error(rpc));
- return -4;
+ return -1;
}
}
if (rpc->fd != -1) {
rpc_set_error(rpc, "Trying to connect while already connected");
- printf("%s\n", rpc->error_string);
return -1;
}
sin->sin_port = htons(port);
if (inet_pton(AF_INET, server, &sin->sin_addr) != 1) {
rpc_set_error(rpc, "Not a valid server ip address");
- printf("%s\n", rpc->error_string);
- return -2;
+ return -1;
}
switch (s.ss_family) {
case AF_INET:
- rpc->fd = socket(AF_INET, SOCK_STREAM, 0);
socksize = sizeof(struct sockaddr_in);
+#ifdef HAVE_SOCK_SIN_LEN
+ sin->sin_len = socksize;
+#endif
+ rpc->fd = socket(AF_INET, SOCK_STREAM, 0);
break;
}
if (rpc->fd == -1) {
rpc_set_error(rpc, "Failed to open socket");
- printf("%s\n", rpc->error_string);
- return -3;
+ return -1;
}
rpc->connect_cb = cb;
if (connect(rpc->fd, (struct sockaddr *)&s, socksize) != 0 && errno != EINPROGRESS) {
rpc_set_error(rpc, "connect() to server failed");
- printf("%s\n", rpc->error_string);
- return -4;
+ return -1;
}
return 0;
repositories / deb_libnfs.git / blobdiff