Formatted all code using indent
This commit is contained in:
Patrick J Cherry
@@ -8,214 +8,217 @@
|
||||
#include <string.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
int socket_connect(struct sockaddr* to, struct sockaddr* from)
|
||||
int socket_connect(struct sockaddr *to, struct sockaddr *from)
|
||||
{
|
||||
int fd = socket(to->sa_family == AF_INET ? PF_INET : PF_INET6, SOCK_STREAM, 0);
|
||||
if( fd < 0 ){
|
||||
warn( "Couldn't create client socket");
|
||||
return -1;
|
||||
}
|
||||
int fd =
|
||||
socket(to->sa_family == AF_INET ? PF_INET : PF_INET6, SOCK_STREAM,
|
||||
0);
|
||||
if (fd < 0) {
|
||||
warn("Couldn't create client socket");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (NULL != from) {
|
||||
if ( 0 > bind( fd, from, sizeof(struct sockaddr_in6 ) ) ){
|
||||
warn( SHOW_ERRNO( "bind() to source address failed" ) );
|
||||
if ( 0 > close( fd ) ) { /* Non-fatal leak */
|
||||
warn( SHOW_ERRNO( "Failed to close fd %i", fd ) );
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
if (NULL != from) {
|
||||
if (0 > bind(fd, from, sizeof(struct sockaddr_in6))) {
|
||||
warn(SHOW_ERRNO("bind() to source address failed"));
|
||||
if (0 > close(fd)) { /* Non-fatal leak */
|
||||
warn(SHOW_ERRNO("Failed to close fd %i", fd));
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if ( 0 > sock_try_connect( fd, to, sizeof( struct sockaddr_in6 ), 15 ) ) {
|
||||
warn( SHOW_ERRNO( "connect failed" ) );
|
||||
if ( 0 > close( fd ) ) { /* Non-fatal leak */
|
||||
warn( SHOW_ERRNO( "Failed to close fd %i", fd ) );
|
||||
}
|
||||
return -1;
|
||||
if (0 > sock_try_connect(fd, to, sizeof(struct sockaddr_in6), 15)) {
|
||||
warn(SHOW_ERRNO("connect failed"));
|
||||
if (0 > close(fd)) { /* Non-fatal leak */
|
||||
warn(SHOW_ERRNO("Failed to close fd %i", fd));
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ( sock_set_tcp_nodelay( fd, 1 ) == -1 ) {
|
||||
warn( SHOW_ERRNO( "Failed to set TCP_NODELAY" ) );
|
||||
}
|
||||
if (sock_set_tcp_nodelay(fd, 1) == -1) {
|
||||
warn(SHOW_ERRNO("Failed to set TCP_NODELAY"));
|
||||
}
|
||||
|
||||
return fd;
|
||||
return fd;
|
||||
}
|
||||
|
||||
int nbd_check_hello( struct nbd_init_raw* init_raw, uint64_t* out_size, uint32_t* out_flags )
|
||||
int nbd_check_hello(struct nbd_init_raw *init_raw, uint64_t * out_size,
|
||||
uint32_t * out_flags)
|
||||
{
|
||||
if ( strncmp( init_raw->passwd, INIT_PASSWD, 8 ) != 0 ) {
|
||||
warn( "wrong passwd" );
|
||||
goto fail;
|
||||
}
|
||||
if ( be64toh( init_raw->magic ) != INIT_MAGIC ) {
|
||||
warn( "wrong magic (%x)", be64toh( init_raw->magic ) );
|
||||
goto fail;
|
||||
}
|
||||
if (strncmp(init_raw->passwd, INIT_PASSWD, 8) != 0) {
|
||||
warn("wrong passwd");
|
||||
goto fail;
|
||||
}
|
||||
if (be64toh(init_raw->magic) != INIT_MAGIC) {
|
||||
warn("wrong magic (%x)", be64toh(init_raw->magic));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if ( NULL != out_size ) {
|
||||
*out_size = be64toh( init_raw->size );
|
||||
}
|
||||
if (NULL != out_size) {
|
||||
*out_size = be64toh(init_raw->size);
|
||||
}
|
||||
|
||||
if ( NULL != out_flags ) {
|
||||
*out_flags = be32toh( init_raw->flags );
|
||||
}
|
||||
if (NULL != out_flags) {
|
||||
*out_flags = be32toh(init_raw->flags);
|
||||
}
|
||||
|
||||
return 1;
|
||||
fail:
|
||||
return 1;
|
||||
fail:
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
int socket_nbd_read_hello(int fd, uint64_t * out_size,
|
||||
uint32_t * out_flags)
|
||||
{
|
||||
struct nbd_init_raw init_raw;
|
||||
|
||||
|
||||
if (0 > readloop(fd, &init_raw, sizeof(init_raw))) {
|
||||
warn("Couldn't read init");
|
||||
return 0;
|
||||
}
|
||||
|
||||
return nbd_check_hello(&init_raw, out_size, out_flags);
|
||||
}
|
||||
|
||||
int socket_nbd_read_hello( int fd, uint64_t* out_size, uint32_t* out_flags )
|
||||
void nbd_hello_to_buf(struct nbd_init_raw *buf, off64_t out_size,
|
||||
uint32_t out_flags)
|
||||
{
|
||||
struct nbd_init_raw init_raw;
|
||||
struct nbd_init init;
|
||||
|
||||
memcpy(&init.passwd, INIT_PASSWD, 8);
|
||||
init.magic = INIT_MAGIC;
|
||||
init.size = out_size;
|
||||
init.flags = out_flags;
|
||||
|
||||
if ( 0 > readloop( fd, &init_raw, sizeof(init_raw) ) ) {
|
||||
warn( "Couldn't read init" );
|
||||
return 0;
|
||||
}
|
||||
memset(buf, 0, sizeof(struct nbd_init_raw)); // ensure reserved is 0s
|
||||
nbd_h2r_init(&init, buf);
|
||||
|
||||
return nbd_check_hello( &init_raw, out_size, out_flags );
|
||||
return;
|
||||
}
|
||||
|
||||
void nbd_hello_to_buf( struct nbd_init_raw *buf, off64_t out_size, uint32_t out_flags )
|
||||
int socket_nbd_write_hello(int fd, off64_t out_size, uint32_t out_flags)
|
||||
{
|
||||
struct nbd_init init;
|
||||
struct nbd_init_raw init_raw;
|
||||
nbd_hello_to_buf(&init_raw, out_size, out_flags);
|
||||
|
||||
memcpy( &init.passwd, INIT_PASSWD, 8 );
|
||||
init.magic = INIT_MAGIC;
|
||||
init.size = out_size;
|
||||
init.flags = out_flags;
|
||||
|
||||
memset( buf, 0, sizeof( struct nbd_init_raw ) ); // ensure reserved is 0s
|
||||
nbd_h2r_init( &init, buf );
|
||||
|
||||
return;
|
||||
if (0 > writeloop(fd, &init_raw, sizeof(init_raw))) {
|
||||
warn(SHOW_ERRNO("failed to write hello to socket"));
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int socket_nbd_write_hello( int fd, off64_t out_size, uint32_t out_flags )
|
||||
void fill_request(struct nbd_request_raw *request_raw, uint16_t type,
|
||||
uint16_t flags, uint64_t from, uint32_t len)
|
||||
{
|
||||
struct nbd_init_raw init_raw;
|
||||
nbd_hello_to_buf( &init_raw, out_size, out_flags );
|
||||
|
||||
if ( 0 > writeloop( fd, &init_raw, sizeof( init_raw ) ) ) {
|
||||
warn( SHOW_ERRNO( "failed to write hello to socket" ) );
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
request_raw->magic = htobe32(REQUEST_MAGIC);
|
||||
request_raw->type = htobe16(type);
|
||||
request_raw->flags = htobe16(flags);
|
||||
request_raw->handle.w =
|
||||
(((uint64_t) rand()) << 32) | ((uint64_t) rand());
|
||||
request_raw->from = htobe64(from);
|
||||
request_raw->len = htobe32(len);
|
||||
}
|
||||
|
||||
void fill_request(struct nbd_request_raw *request_raw, uint16_t type, uint16_t flags, uint64_t from, uint32_t len)
|
||||
void read_reply(int fd, uint64_t request_raw_handle,
|
||||
struct nbd_reply *reply)
|
||||
{
|
||||
request_raw->magic = htobe32(REQUEST_MAGIC);
|
||||
request_raw->type = htobe16(type);
|
||||
request_raw->flags = htobe16(flags);
|
||||
request_raw->handle.w = (((uint64_t)rand()) << 32) | ((uint64_t)rand());
|
||||
request_raw->from = htobe64(from);
|
||||
request_raw->len = htobe32(len);
|
||||
struct nbd_reply_raw reply_raw;
|
||||
|
||||
ERROR_IF_NEGATIVE(readloop
|
||||
(fd, &reply_raw, sizeof(struct nbd_reply_raw)),
|
||||
"Couldn't read reply");
|
||||
|
||||
nbd_r2h_reply(&reply_raw, reply);
|
||||
|
||||
if (reply->magic != REPLY_MAGIC) {
|
||||
error("Reply magic incorrect (%x)", reply->magic);
|
||||
}
|
||||
if (reply->error != 0) {
|
||||
error("Server replied with error %d", reply->error);
|
||||
}
|
||||
if (request_raw_handle != reply_raw.handle.w) {
|
||||
error("Did not reply with correct handle");
|
||||
}
|
||||
}
|
||||
|
||||
void read_reply(int fd, uint64_t request_raw_handle, struct nbd_reply *reply)
|
||||
void wait_for_data(int fd, int timeout_secs)
|
||||
{
|
||||
struct nbd_reply_raw reply_raw;
|
||||
fd_set fds;
|
||||
struct timeval tv = { timeout_secs, 0 };
|
||||
int selected;
|
||||
|
||||
ERROR_IF_NEGATIVE(readloop(fd, &reply_raw, sizeof(struct nbd_reply_raw)),
|
||||
"Couldn't read reply");
|
||||
FD_ZERO(&fds);
|
||||
FD_SET(fd, &fds);
|
||||
|
||||
nbd_r2h_reply( &reply_raw, reply );
|
||||
selected =
|
||||
sock_try_select(FD_SETSIZE, &fds, NULL, NULL,
|
||||
timeout_secs >= 0 ? &tv : NULL);
|
||||
|
||||
if (reply->magic != REPLY_MAGIC) {
|
||||
error("Reply magic incorrect (%x)", reply->magic);
|
||||
}
|
||||
if (reply->error != 0) {
|
||||
error("Server replied with error %d", reply->error);
|
||||
}
|
||||
if (request_raw_handle != reply_raw.handle.w) {
|
||||
error("Did not reply with correct handle");
|
||||
}
|
||||
}
|
||||
|
||||
void wait_for_data( int fd, int timeout_secs )
|
||||
{
|
||||
fd_set fds;
|
||||
struct timeval tv = { timeout_secs, 0 };
|
||||
int selected;
|
||||
|
||||
FD_ZERO( &fds );
|
||||
FD_SET( fd, &fds );
|
||||
|
||||
selected = sock_try_select(
|
||||
FD_SETSIZE, &fds, NULL, NULL, timeout_secs >=0 ? &tv : NULL
|
||||
);
|
||||
|
||||
FATAL_IF( -1 == selected, "Select failed" );
|
||||
ERROR_IF( 0 == selected, "Timed out waiting for reply" );
|
||||
FATAL_IF(-1 == selected, "Select failed");
|
||||
ERROR_IF(0 == selected, "Timed out waiting for reply");
|
||||
}
|
||||
|
||||
|
||||
void socket_nbd_read(int fd, uint64_t from, uint32_t len, int out_fd, void* out_buf, int timeout_secs)
|
||||
void socket_nbd_read(int fd, uint64_t from, uint32_t len, int out_fd,
|
||||
void *out_buf, int timeout_secs)
|
||||
{
|
||||
struct nbd_request_raw request_raw;
|
||||
struct nbd_reply reply;
|
||||
struct nbd_request_raw request_raw;
|
||||
struct nbd_reply reply;
|
||||
|
||||
fill_request(&request_raw, REQUEST_READ, 0, from, len);
|
||||
FATAL_IF_NEGATIVE(writeloop(fd, &request_raw, sizeof(request_raw)),
|
||||
"Couldn't write request");
|
||||
fill_request(&request_raw, REQUEST_READ, 0, from, len);
|
||||
FATAL_IF_NEGATIVE(writeloop(fd, &request_raw, sizeof(request_raw)),
|
||||
"Couldn't write request");
|
||||
|
||||
|
||||
wait_for_data( fd, timeout_secs );
|
||||
read_reply(fd, request_raw.handle.w, &reply);
|
||||
wait_for_data(fd, timeout_secs);
|
||||
read_reply(fd, request_raw.handle.w, &reply);
|
||||
|
||||
if (out_buf) {
|
||||
FATAL_IF_NEGATIVE(readloop(fd, out_buf, len),
|
||||
"Read failed");
|
||||
}
|
||||
else {
|
||||
FATAL_IF_NEGATIVE(
|
||||
splice_via_pipe_loop(fd, out_fd, len),
|
||||
"Splice failed"
|
||||
);
|
||||
}
|
||||
if (out_buf) {
|
||||
FATAL_IF_NEGATIVE(readloop(fd, out_buf, len), "Read failed");
|
||||
} else {
|
||||
FATAL_IF_NEGATIVE(splice_via_pipe_loop(fd, out_fd, len),
|
||||
"Splice failed");
|
||||
}
|
||||
}
|
||||
|
||||
void socket_nbd_write(int fd, uint64_t from, uint32_t len, int in_fd, void* in_buf, int timeout_secs)
|
||||
void socket_nbd_write(int fd, uint64_t from, uint32_t len, int in_fd,
|
||||
void *in_buf, int timeout_secs)
|
||||
{
|
||||
struct nbd_request_raw request_raw;
|
||||
struct nbd_reply reply;
|
||||
struct nbd_request_raw request_raw;
|
||||
struct nbd_reply reply;
|
||||
|
||||
fill_request(&request_raw, REQUEST_WRITE, 0, from, len);
|
||||
ERROR_IF_NEGATIVE(writeloop(fd, &request_raw, sizeof(request_raw)),
|
||||
"Couldn't write request");
|
||||
fill_request(&request_raw, REQUEST_WRITE, 0, from, len);
|
||||
ERROR_IF_NEGATIVE(writeloop(fd, &request_raw, sizeof(request_raw)),
|
||||
"Couldn't write request");
|
||||
|
||||
if (in_buf) {
|
||||
ERROR_IF_NEGATIVE(writeloop(fd, in_buf, len),
|
||||
"Write failed");
|
||||
}
|
||||
else {
|
||||
ERROR_IF_NEGATIVE(
|
||||
splice_via_pipe_loop(in_fd, fd, len),
|
||||
"Splice failed"
|
||||
);
|
||||
}
|
||||
if (in_buf) {
|
||||
ERROR_IF_NEGATIVE(writeloop(fd, in_buf, len), "Write failed");
|
||||
} else {
|
||||
ERROR_IF_NEGATIVE(splice_via_pipe_loop(in_fd, fd, len),
|
||||
"Splice failed");
|
||||
}
|
||||
|
||||
wait_for_data( fd, timeout_secs );
|
||||
read_reply(fd, request_raw.handle.w, &reply);
|
||||
wait_for_data(fd, timeout_secs);
|
||||
read_reply(fd, request_raw.handle.w, &reply);
|
||||
}
|
||||
|
||||
|
||||
int socket_nbd_disconnect( int fd )
|
||||
int socket_nbd_disconnect(int fd)
|
||||
{
|
||||
int success = 1;
|
||||
struct nbd_request_raw request_raw;
|
||||
int success = 1;
|
||||
struct nbd_request_raw request_raw;
|
||||
|
||||
fill_request( &request_raw, REQUEST_DISCONNECT, 0, 0, 0 );
|
||||
/* FIXME: This shouldn't be a FATAL error. We should just drop
|
||||
* the mirror without affecting the main server.
|
||||
*/
|
||||
FATAL_IF_NEGATIVE( writeloop( fd, &request_raw, sizeof( request_raw ) ),
|
||||
"Failed to write the disconnect request." );
|
||||
return success;
|
||||
fill_request(&request_raw, REQUEST_DISCONNECT, 0, 0, 0);
|
||||
/* FIXME: This shouldn't be a FATAL error. We should just drop
|
||||
* the mirror without affecting the main server.
|
||||
*/
|
||||
FATAL_IF_NEGATIVE(writeloop(fd, &request_raw, sizeof(request_raw)),
|
||||
"Failed to write the disconnect request.");
|
||||
return success;
|
||||
}
|
||||
|
||||
#define CHECK_RANGE(error_type) { \
|
||||
@@ -237,23 +240,26 @@ int socket_nbd_disconnect( int fd )
|
||||
}\
|
||||
}
|
||||
|
||||
void do_read(struct mode_readwrite_params* params)
|
||||
void do_read(struct mode_readwrite_params *params)
|
||||
{
|
||||
params->client = socket_connect(¶ms->connect_to.generic, ¶ms->connect_from.generic);
|
||||
FATAL_IF_NEGATIVE( params->client, "Couldn't connect." );
|
||||
CHECK_RANGE("read");
|
||||
socket_nbd_read(params->client, params->from, params->len,
|
||||
params->data_fd, NULL, 10);
|
||||
close(params->client);
|
||||
params->client =
|
||||
socket_connect(¶ms->connect_to.generic,
|
||||
¶ms->connect_from.generic);
|
||||
FATAL_IF_NEGATIVE(params->client, "Couldn't connect.");
|
||||
CHECK_RANGE("read");
|
||||
socket_nbd_read(params->client, params->from, params->len,
|
||||
params->data_fd, NULL, 10);
|
||||
close(params->client);
|
||||
}
|
||||
|
||||
void do_write(struct mode_readwrite_params* params)
|
||||
void do_write(struct mode_readwrite_params *params)
|
||||
{
|
||||
params->client = socket_connect(¶ms->connect_to.generic, ¶ms->connect_from.generic);
|
||||
FATAL_IF_NEGATIVE( params->client, "Couldn't connect." );
|
||||
CHECK_RANGE("write");
|
||||
socket_nbd_write(params->client, params->from, params->len,
|
||||
params->data_fd, NULL, 10);
|
||||
close(params->client);
|
||||
params->client =
|
||||
socket_connect(¶ms->connect_to.generic,
|
||||
¶ms->connect_from.generic);
|
||||
FATAL_IF_NEGATIVE(params->client, "Couldn't connect.");
|
||||
CHECK_RANGE("write");
|
||||
socket_nbd_write(params->client, params->from, params->len,
|
||||
params->data_fd, NULL, 10);
|
||||
close(params->client);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user