X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=misc%2Fnetwork_servers%2Fv3_nbd%2Fv3_nbd.cc;h=90aa71eff44579812a0558918dd26abe176a92ef;hb=9a4af090e32278f088a3f9b444b1aa23e3b1f0d2;hp=1f7ca53a4751dfd603c840e7b794a750bdd35496;hpb=6fbb40991e6c6dc5cd247ffe3d21413722bfbfce;p=palacios.git diff --git a/misc/network_servers/v3_nbd/v3_nbd.cc b/misc/network_servers/v3_nbd/v3_nbd.cc index 1f7ca53..90aa71e 100644 --- a/misc/network_servers/v3_nbd/v3_nbd.cc +++ b/misc/network_servers/v3_nbd/v3_nbd.cc @@ -17,11 +17,12 @@ * redistribute, and modify it as specified in the file "V3VEE_LICENSE". */ -#include + #include #include #include #include +#include #ifdef linux #include @@ -31,7 +32,17 @@ #endif -#include "vtl.h" + +#include "v3_disk.h" +#include "raw.h" +#include "iso.h" + +#define NBD_KEY "V3_NBD_1" + + +#define NBD_READ_CMD 0x1 +#define NBD_WRITE_CMD 0x2 +#define NBD_CAPACITY_CMD 0x3 #define DEFAULT_LOG_FILE "./status.log" @@ -43,46 +54,55 @@ #define MAX_DISKS 32 #define LOGFILE_TAG "logfile" -#define IP_ADDR_TAG "address" #define PORT_TAG "port" #define DISKS_TAG "disks" +// Turn on 64 bit file offset support (see 'man fseeko') +#define _FILE_OFFSET_BITS 64 + using namespace std; //using namespace __gnu_cxx; -typedef enum {ISO, RAW} disk_type_t; - -struct disk_info { - string filename; - string tag; - disk_type_t type; +struct eqsock { + bool operator()(const SOCK sock1, const SOCK sock2) const { + return sock1 == sock2; + } }; -// eqstr from vtl (config.h) -typedef map disk_list_t; -struct nbd_config { - unsigned long server_addr; - int server_port; - disk_list_t disks; - int num_disks; -}; +// Server Port that we'll listen on +int server_port; + +// List of disks being served +// eqstr from vtl (config.h) +map disks; +// List of open connections +map conns; +// Enable Debugging static const int enable_debug = 1; -static struct nbd_config g_nbd_conf; + void usage(); int config_nbd(string conf_file_name); int serv_loop(int serv_sock); -void setup_disk(string disk_tag); +void setup_disk(string disk_tag, config_t &config_map); + +int handle_new_connection(SOCK new_conn); +int handle_disk_request(SOCK conn, v3_disk * disk); +int handle_capacity_request(SOCK conn, v3_disk * disk); +int handle_read_request(SOCK conn, v3_disk * disk); +int handle_write_request(SOCK conn, v3_disk * disk); int __main (int argc, char ** argv); + + #ifdef linux int main(int argc, char ** argv) { @@ -99,12 +119,20 @@ void main() { int __main (int argc, char ** argv) { string config_file; - int serv_sock; + SOCK serv_sock; + + + if (argc > 2) { usage(); exit(0); } + // init global maps + disks.clear(); + conns.clear(); + + if (argc == 2) { config_file = string(argv[1]); } else { @@ -118,6 +146,23 @@ int __main (int argc, char ** argv) { } // setup network sockets + serv_sock = CreateAndSetupTcpSocket(); + + if (serv_sock == -1) { + cerr << "Could not create server socket, exiting..." << endl; + exit(-1); + } + + if (BindSocket(serv_sock, server_port) == -1) { + cerr << "Could not bind socket to port: " << server_port << endl; + exit(-1); + } + + if (ListenSocket(serv_sock) == -1) { + cerr << "Could not listen on server socket (port=" << server_port << ")" << endl; + exit(-1); + } + vtl_debug("Starting Server Loop\n"); serv_loop(serv_sock); @@ -128,39 +173,116 @@ int __main (int argc, char ** argv) { #ifdef linux int serv_loop(int serv_sock) { - fd_set all_set, read_set; - int max_fd = -1; - RawEthernetPacket pkt; + fd_set all_set, read_set; + int max_fd = -1; + RawEthernetPacket pkt; - FD_ZERO(&all_set); - FD_SET(serv_sock, &all_set); - max_fd = serv_sock; + list pending_cons; - while (1) { - int nready = 0; - read_set = all_set; - nready = select(max_fd + 1, &read_set, NULL, NULL, NULL); - + FD_ZERO(&all_set); + FD_SET(serv_sock, &all_set); + max_fd = serv_sock; + + + while (1) { + int nready = 0; + read_set = all_set; + nready = select(max_fd + 1, &read_set, NULL, NULL, NULL); - if (nready == -1) { - if (errno == EINTR) { - continue; - } else { - perror("Select returned error: "); - break; - } - } + if (nready == -1) { + if (errno == EINTR) { + continue; + } else { + vtl_debug("Select returned error\n"); + perror("Select returned error: "); + exit(-1); + } + } - if (FD_ISSET(serv_sock, &read_set)) { - //vnet_recv(); + if (FD_ISSET(serv_sock, &read_set)) { + SOCK conn_socket; + struct sockaddr_in rem_addr; + socklen_t addr_len = sizeof(struct sockaddr_in); + // new connection + conn_socket = accept(serv_sock, (struct sockaddr *)&rem_addr, &addr_len); + + if (conn_socket < 0) { + if (errno == EINTR) { + continue; + } else { + vtl_debug("Accept returned error\n"); + exit(-1); + } + } + + pending_cons.push_front(conn_socket); + + FD_SET(conn_socket, &all_set); + + if (conn_socket > max_fd) { + max_fd = conn_socket; + } + + if (--nready <= 0) continue; + } + + + // handle open connections + for (map::iterator con_iter = conns.begin(); + con_iter != conns.end(); ) { + SOCK tmp_sock = con_iter->first; + v3_disk * tmp_disk = con_iter->second; + + if (FD_ISSET(con_iter->first, &read_set)) { + + if (handle_disk_request(tmp_sock, tmp_disk) == -1) { + vtl_debug("Error: Could not complete disk request\n"); + + map::iterator tmp_iter = con_iter; + con_iter++; + + tmp_disk->detach(); + + close(tmp_sock); + FD_CLR(tmp_sock, &all_set); + + conns.erase(tmp_iter); + } else { + con_iter++; + } + + if (--nready <= 0) break; + } + } + + if (nready <= 0) continue; + + // check pending connections + for (list::iterator pending_iter = pending_cons.begin(); + pending_iter != pending_cons.end(); + pending_iter++) { + + if (FD_ISSET(*pending_iter, &read_set)) { + if (handle_new_connection(*pending_iter) == -1) { + // error + vtl_debug("Error: Could not connect to disk\n"); + } + + pending_cons.erase(pending_iter); + + if (--nready <= 0) break; + } + } + + if (nready <= 0) continue; + } - } - return 0; + return 0; } #elif WIN32 @@ -194,7 +316,6 @@ int serv_loop(iface_t * iface, SOCK vnet_sock, struct vnet_config * vnet_info) { } if (net_events.lNetworkEvents & FD_READ) { - JRLDBG("Receied VNET Packet\n"); // we received data if (vnet_info->link_type == TCP_LINK) { @@ -220,6 +341,122 @@ int serv_loop(iface_t * iface, SOCK vnet_sock, struct vnet_config * vnet_info) { #endif +// byte 1: command (read = 1, write = 2, capacity = 3) +// byte 2 - 4: zero +int handle_disk_request(SOCK conn, v3_disk * disk) { + char buf[4]; + + int read_len = Receive(conn, buf, 4, true); + + if (read_len == 0) { + vtl_debug("Detaching from disk (conn=%d)\n", conn); + return -1; + } + + if (read_len == -1) { + vtl_debug("Could not read command\n"); + return -1; + } + + if ((buf[1] != 0) || (buf[2] != 0) || (buf[3] != 0)) { + // error + vtl_debug("Invalid command padding\n"); + return -1; + } + + switch (buf[0]) { + case NBD_CAPACITY_CMD: + return handle_capacity_request(conn, disk); + case NBD_READ_CMD: + return handle_read_request(conn, disk); + case NBD_WRITE_CMD: + return handle_write_request(conn, disk); + default: + vtl_debug("Invalid Disk Command %d\n", buf[0]); + return -1; + } + + return 0; +} + + +// send: +// 8 bytes : capacity +int handle_capacity_request(SOCK conn, v3_disk * disk) { + off_t capacity = disk->get_capacity(); + + return Send(conn, (char *)&capacity, 8, true); +} + +// receive: +// 8 bytes : offset +// 4 bytes : length +// send: +// 1 byte : status +// 4 bytes : return length +// x bytes : data +int handle_read_request(SOCK conn, v3_disk * disk) { + return -1; +} + +// receive: +// 8 bytes : offset +// 4 bytes : length +// send : +// 1 bytes : status +int handle_write_request(SOCK conn, v3_disk * disk) { + return -1; +} + + +/* Negotiation: + * \n + */ + +int handle_new_connection(SOCK new_conn) { + string input; + string key_str; + string tag_str; + v3_disk * disk = NULL; + + GetLine(new_conn, input); + + { + istringstream is(input, istringstream::in); + is >> key_str >> tag_str; + } + + if (key_str != NBD_KEY) { + vtl_debug("Error: Invalid NBD key string (%s)\n", key_str.c_str()); + return -1; + } + + if (disks.count(tag_str) == 0) { + vtl_debug("Error: Requesting disk that does not exist (%s)\n", tag_str.c_str()); + return -1; + } + + disk = disks[tag_str]; + + if (!disk) { + vtl_debug("Disk (%s) Does not exist\n", tag_str.c_str()); + return -1; + } + + if (disk->locked == 1) { + vtl_debug("Attempting to attach to a device already in use\n"); + return -1; + } + + conns[new_conn] = disk; + + disk->attach(); + + vtl_debug("Connected to disk %s\n", tag_str.c_str()); + + return 0; +} + int config_nbd(string conf_file_name) { config_t config_map; @@ -229,14 +466,10 @@ int config_nbd(string conf_file_name) { return -1; } - if (config_map.count(IP_ADDR_TAG) > 0) { - g_nbd_conf.server_addr = ToIPAddress(config_map[IP_ADDR_TAG].c_str()); - } - if (config_map.count(PORT_TAG) > 0) { - g_nbd_conf.server_port = atoi(config_map[PORT_TAG].c_str()); + server_port = atoi(config_map[PORT_TAG].c_str()); } else { - g_nbd_conf.server_port = DEFAULT_PORT; + server_port = DEFAULT_PORT; } if (config_map.count(DISKS_TAG) > 0) { @@ -251,35 +484,56 @@ int config_nbd(string conf_file_name) { break; } - setup_disk(disk_tag); - + setup_disk(disk_tag, config_map); i++; - } - - g_nbd_conf.num_disks = i; + } } else { cerr << "Must specify a set of disks" << endl; return -1; } - if (config_map.count(LOGFILE_TAG) == 0) { config_map[LOGFILE_TAG] = DEFAULT_LOG_FILE; } - vtl_debug_init(config_map[LOGFILE_TAG], enable_debug); - return 0; } -void setup_disk(string disk_tag) { - printf("Setting up %s\n", disk_tag.c_str()); +void setup_disk(string disk_tag, config_t &config_map) { + string file_tag = disk_tag + ".file"; + string type_tag = disk_tag + ".type"; + + v3_disk * disk; + string type; + + + cout << "Setting up " << disk_tag.c_str() << endl; + + if ((config_map.count(file_tag) == 0) && + (config_map.count(type_tag) == 0)) { + cerr << "Missing Disk configuration directive for " << disk_tag << endl; + } + + type = config_map[type_tag]; + + if (type == "RAW") { + disk = new raw_disk(config_map[file_tag]); + } else if (type == "ISO") { + disk = new iso_image(config_map[file_tag]); + } + + disks[disk_tag] = disk; + + return; } + + + void usage() { cout << "Usage: v3_nbd [config_file]" << endl; return;