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

Rename the 'debug' cli option 'verbose' and switch default-deny from 'D' to 'd'

Browse Source
This commit is contained in:
Alex Young
2012-06-01 16:58:32 +01:00
parent 8511cacb03
commit d87d7a826f
2 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/flexnbd.c
View File

@@ -186,9 +186,9 @@ void read_serve_param( int c, char **ip_addr, char **ip_port, char **file, char
case 's': case 's':
*sock = optarg; *sock = optarg;
break; break;
case 'd': case 'v':
set_debug(1); set_debug(1);
case 'D': case 'd':
*default_deny = 1; *default_deny = 1;
break; break;
default: default:
@@ -217,7 +217,7 @@ void read_readwrite_param( int c, char **ip_addr, char **ip_port, char **from, c
case 'S': case 'S':
*size = optarg; *size = optarg;
break; break;
case 'd': case 'v':
set_debug(1); set_debug(1);
break; break;
default: default:
@@ -236,7 +236,7 @@ void read_sock_param( int c, char **sock, char *help_text )
case 's': case 's':
*sock = optarg; *sock = optarg;
break; break;
case 'd': case 'v':
set_debug(1); set_debug(1);
break; break;
default: default:
@@ -266,7 +266,7 @@ void read_mirror_param( int c, char **sock, char **ip_addr, char **ip_port )
case 'p': case 'p':
*ip_port = optarg; *ip_port = optarg;
break; break;
case 'd': case 'v':
set_debug(1); set_debug(1);
break; break;
default: default:

70
src/options.h
View File

@@ -1,3 +1,5 @@
#define OPTIONS_H
#define GETOPT_ARG(x,s) {(x), 1, 0, (s)} #define GETOPT_ARG(x,s) {(x), 1, 0, (s)}
#define GETOPT_FLAG(x,v) {(x), 0, 0, (v)} #define GETOPT_FLAG(x,v) {(x), 0, 0, (v)}
@@ -26,7 +28,7 @@
#define IS_CMD(x,c) (strncmp((x),(c),(LEN_CMD_MAX)) == 0) #define IS_CMD(x,c) (strncmp((x),(c),(LEN_CMD_MAX)) == 0)
#define GETOPT_HELP GETOPT_FLAG( OPT_HELP, 'h' ) #define GETOPT_HELP GETOPT_FLAG( OPT_HELP, 'h' )
#define GETOPT_DENY GETOPT_FLAG( OPT_DENY, 'D' ) #define GETOPT_DENY GETOPT_FLAG( OPT_DENY, 'd' )
#define GETOPT_ADDR GETOPT_ARG( OPT_ADDR, 'l' ) #define GETOPT_ADDR GETOPT_ARG( OPT_ADDR, 'l' )
#define GETOPT_PORT GETOPT_ARG( OPT_PORT, 'p' ) #define GETOPT_PORT GETOPT_ARG( OPT_PORT, 'p' )
@@ -35,40 +37,44 @@
#define GETOPT_FROM GETOPT_ARG( OPT_FROM, 'F' ) #define GETOPT_FROM GETOPT_ARG( OPT_FROM, 'F' )
#define GETOPT_SIZE GETOPT_ARG( OPT_SIZE, 'S' ) #define GETOPT_SIZE GETOPT_ARG( OPT_SIZE, 'S' )
#define HELP_LINE "\t--" OPT_HELP ",-h\t\tThis text.\n"
#ifdef DEBUG #ifdef DEBUG
# define OPT_DEBUG "debug" # define OPT_VERBOSE "verbose"
# define GETOPT_DEBUG GETOPT_FLAG( OPT_DEBUG, 'd' ) # define SOPT_VERBOSE "v"
# define SOPT_DEBUG "d" # define GETOPT_VERBOSE GETOPT_FLAG( OPT_VERBOSE, 'v' )
# define DEBUG_LINE \ # define VERBOSE_LINE \
"\t--" OPT_DEBUG ",-d\tOutput debug information.\n" "\t--" OPT_VERBOSE ",-" SOPT_VERBOSE "\t\tOutput debug information.\n"
#else #else
# define GETOPT_DEBUG {0} # define GETOPT_VERBOSE {0}
# define DEBUG_LINE "" # define VERBOSE_LINE ""
# define SOPT_DEBUG "" # define SOPT_VERBOSE ""
#endif #endif
static struct option serve_options[] = { static struct option serve_options[] = {
GETOPT_HELP, GETOPT_HELP,
GETOPT_ADDR, GETOPT_ADDR,
GETOPT_PORT, GETOPT_PORT,
GETOPT_FILE, GETOPT_FILE,
GETOPT_SOCK, GETOPT_SOCK,
GETOPT_DEBUG,
GETOPT_DENY, GETOPT_DENY,
GETOPT_VERBOSE,
{0} {0}
}; };
static char serve_short_options[] = "Dhl:p:f:s:" SOPT_DEBUG; static char serve_short_options[] = "hl:p:f:s:d" SOPT_VERBOSE;
static char serve_help_text[] = static char serve_help_text[] =
"Usage: flexnbd " CMD_SERVE " <options> [<acl address>*]\n\n" "Usage: flexnbd " CMD_SERVE " <options> [<acl address>*]\n\n"
"Serve FILE from ADDR:PORT, with an optional control socket at SOCK.\n\n" "Serve FILE from ADDR:PORT, with an optional control socket at SOCK.\n\n"
"\t--" OPT_HELP ",-h\tThis text.\n" HELP_LINE
"\t--" OPT_ADDR ",-l <ADDR>\tThe address to serve on.\n" "\t--" OPT_ADDR ",-l <ADDR>\tThe address to serve on.\n"
"\t--" OPT_PORT ",-p <PORT>\tThe port to serve on.\n" "\t--" OPT_PORT ",-p <PORT>\tThe port to serve on.\n"
"\t--" OPT_FILE ",-f <FILE>\tThe file to serve.\n" "\t--" OPT_FILE ",-f <FILE>\tThe file to serve.\n"
"\t--" OPT_DENY ",-D\tDeny connections by default unless in ACL\n" "\t--" OPT_DENY ",-d\tDeny connections by default unless in ACL\n"
"\t--" OPT_SOCK ",-s <SOCK>\tPath to the control socket to open.\n" "\t--" OPT_SOCK ",-s <SOCK>\tPath to the control socket to open.\n"
DEBUG_LINE; VERBOSE_LINE;
static struct option read_options[] = { static struct option read_options[] = {
GETOPT_HELP, GETOPT_HELP,
@@ -76,19 +82,19 @@ static struct option read_options[] = {
GETOPT_PORT, GETOPT_PORT,
GETOPT_FROM, GETOPT_FROM,
GETOPT_SIZE, GETOPT_SIZE,
GETOPT_DEBUG, GETOPT_VERBOSE,
{0} {0}
}; };
static char read_short_options[] = "hl:p:F:S:" SOPT_DEBUG; static char read_short_options[] = "hl:p:F:S:" SOPT_VERBOSE;
static char read_help_text[] = static char read_help_text[] =
"Usage: flexnbd " CMD_READ " <options>\n\n" "Usage: flexnbd " CMD_READ " <options>\n\n"
"Read SIZE bytes from a server at ADDR:PORT to stdout, starting at OFFSET.\n\n" "Read SIZE bytes from a server at ADDR:PORT to stdout, starting at OFFSET.\n\n"
"\t--" OPT_HELP ",-h\tThis text.\n" HELP_LINE
"\t--" OPT_ADDR ",-l <ADDR>\tThe address to read from.\n" "\t--" OPT_ADDR ",-l <ADDR>\tThe address to read from.\n"
"\t--" OPT_PORT ",-p <PORT>\tThe port to read from.\n" "\t--" OPT_PORT ",-p <PORT>\tThe port to read from.\n"
"\t--" OPT_FROM ",-F <OFFSET>\tByte offset to read from.\n" "\t--" OPT_FROM ",-F <OFFSET>\tByte offset to read from.\n"
"\t--" OPT_SIZE ",-S <SIZE>\tBytes to read.\n" "\t--" OPT_SIZE ",-S <SIZE>\tBytes to read.\n"
DEBUG_LINE; VERBOSE_LINE;
static struct option *write_options = read_options; static struct option *write_options = read_options;
@@ -96,59 +102,59 @@ static char *write_short_options = read_short_options;
static char write_help_text[] = static char write_help_text[] =
"Usage: flexnbd " CMD_WRITE" <options>\n\n" "Usage: flexnbd " CMD_WRITE" <options>\n\n"
"Write SIZE bytes from stdin to a server at ADDR:PORT, starting at OFFSET.\n\n" "Write SIZE bytes from stdin to a server at ADDR:PORT, starting at OFFSET.\n\n"
"\t--" OPT_HELP ",-h\tThis text.\n" HELP_LINE
"\t--" OPT_ADDR ",-l <ADDR>\tThe address to write to.\n" "\t--" OPT_ADDR ",-l <ADDR>\tThe address to write to.\n"
"\t--" OPT_PORT ",-p <PORT>\tThe port to write to.\n" "\t--" OPT_PORT ",-p <PORT>\tThe port to write to.\n"
"\t--" OPT_FROM ",-F <OFFSET>\tByte offset to write from.\n" "\t--" OPT_FROM ",-F <OFFSET>\tByte offset to write from.\n"
"\t--" OPT_SIZE ",-S <SIZE>\tBytes to write.\n" "\t--" OPT_SIZE ",-S <SIZE>\tBytes to write.\n"
DEBUG_LINE; VERBOSE_LINE;
struct option acl_options[] = { struct option acl_options[] = {
GETOPT_HELP, GETOPT_HELP,
GETOPT_SOCK, GETOPT_SOCK,
GETOPT_DEBUG, GETOPT_VERBOSE,
{0} {0}
}; };
static char acl_short_options[] = "hs:" SOPT_DEBUG; static char acl_short_options[] = "hs:" SOPT_VERBOSE;
static char acl_help_text[] = static char acl_help_text[] =
"Usage: flexnbd " CMD_ACL " <options> [<acl address>+]\n\n" "Usage: flexnbd " CMD_ACL " <options> [<acl address>+]\n\n"
"Set the access control list for a server with control socket SOCK.\n\n" "Set the access control list for a server with control socket SOCK.\n\n"
"\t--" OPT_HELP ",-h\tThis text.\n" HELP_LINE
"\t--" OPT_SOCK ",-s <SOCK>\tPath to the control socket.\n" "\t--" OPT_SOCK ",-s <SOCK>\tPath to the control socket.\n"
DEBUG_LINE; VERBOSE_LINE;
struct option mirror_options[] = { struct option mirror_options[] = {
GETOPT_HELP, GETOPT_HELP,
GETOPT_SOCK, GETOPT_SOCK,
GETOPT_ADDR, GETOPT_ADDR,
GETOPT_PORT, GETOPT_PORT,
GETOPT_DEBUG, GETOPT_VERBOSE,
{0} {0}
}; };
static char mirror_short_options[] = "hs:l:p:" SOPT_DEBUG; static char mirror_short_options[] = "hs:l:p:" SOPT_VERBOSE;
static char mirror_help_text[] = static char mirror_help_text[] =
"Usage: flexnbd " CMD_MIRROR " <options>\n\n" "Usage: flexnbd " CMD_MIRROR " <options>\n\n"
"Start mirroring from the server with control socket SOCK to one at ADDR:PORT.\n\n" "Start mirroring from the server with control socket SOCK to one at ADDR:PORT.\n\n"
"\t--" OPT_HELP ",-h\tThis text.\n" HELP_LINE
"\t--" OPT_SOCK ",-s <SOCK>\tPath to the control socket.\n" "\t--" OPT_SOCK ",-s <SOCK>\tPath to the control socket.\n"
"\t--" OPT_ADDR ",-l <ADDR>\tThe address to mirror to.\n" "\t--" OPT_ADDR ",-l <ADDR>\tThe address to mirror to.\n"
"\t--" OPT_PORT ",-p <PORT>\tThe port to mirror to.\n" "\t--" OPT_PORT ",-p <PORT>\tThe port to mirror to.\n"
DEBUG_LINE; VERBOSE_LINE;
struct option status_options[] = { struct option status_options[] = {
GETOPT_HELP, GETOPT_HELP,
GETOPT_SOCK, GETOPT_SOCK,
GETOPT_DEBUG, GETOPT_VERBOSE,
{0} {0}
}; };
static char status_short_options[] = "hs:" SOPT_DEBUG; static char status_short_options[] = "hs:" SOPT_VERBOSE;
static char status_help_text[] = static char status_help_text[] =
"Usage: flexnbd " CMD_STATUS " <options>\n\n" "Usage: flexnbd " CMD_STATUS " <options>\n\n"
"Get the status for a server with control socket SOCK.\n\n" "Get the status for a server with control socket SOCK.\n\n"
"\t--" OPT_HELP ",-h\tThis text.\n" HELP_LINE
"\t--" OPT_SOCK ",-s <SOCK>\tPath to the control socket.\n" "\t--" OPT_SOCK ",-s <SOCK>\tPath to the control socket.\n"
DEBUG_LINE; VERBOSE_LINE;
static char help_help_text[] = static char help_help_text[] =
"Usage: flexnbd <cmd> [cmd options]\n\n" "Usage: flexnbd <cmd> [cmd options]\n\n"