bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Automated merge with ssh://dev/flexnbd-c

Browse Source
This commit is contained in:
nick
2012-06-06 12:35:18 +01:00
parent 457987664a 7544a59da1
commit 14c9468b68
6 changed files with 93 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/readwrite.c
View File

@@ -7,12 +7,20 @@
#include <string.h>
#include <sys/socket.h>
int socket_connect(struct sockaddr* to)
int socket_connect(struct sockaddr* to, struct sockaddr* from)
{
int fd = socket(to->sa_family == AF_INET ? PF_INET : PF_INET6, SOCK_STREAM, 0);
SERVER_ERROR_ON_FAILURE(fd, "Couldn't create client socket");
SERVER_ERROR_ON_FAILURE(connect(fd, to, sizeof(struct sockaddr_in6)),
"connect failed");
if (NULL != from)
SERVER_ERROR_ON_FAILURE(
bind(fd, from, sizeof(struct sockaddr_in6)),
"bind() failed"
);
SERVER_ERROR_ON_FAILURE(
connect(fd, to, sizeof(struct sockaddr_in6)),"connect failed"
);
return fd;
}
@@ -106,7 +114,7 @@ void socket_nbd_write(int fd, off64_t from, int len, int in_fd, void* in_buf)
void do_read(struct mode_readwrite_params* params)
{
params->client = socket_connect(&params->connect_to.generic);
params->client = socket_connect(&params->connect_to.generic, &params->connect_from.generic);
CHECK_RANGE("read");
socket_nbd_read(params->client, params->from, params->len,
params->data_fd, NULL);
@@ -115,7 +123,7 @@ void do_read(struct mode_readwrite_params* params)
void do_write(struct mode_readwrite_params* params)
{
params->client = socket_connect(&params->connect_to.generic);
params->client = socket_connect(&params->connect_to.generic, &params->connect_from.generic);
CHECK_RANGE("write");
socket_nbd_write(params->client, params->from, params->len,
params->data_fd, NULL);