altcloud/fence-virt
3
0
Fork 1
Code Issues Pull Requests Releases Activity

fence-virt: Cleanup numeric argument parsing

Browse Source 
Cleanup the parsing of numeric command line arguments.

Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
This commit is contained in:
Ryan McCabe 2017-03-13 17:43:17 -04:00
parent 85eb949759
commit b3ea4870c8
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
client/options.c
View File

@ -130,14 +130,18 @@ assign_channel_address(fence_virt_args_t *args, struct arg_info *arg, char *valu
static inline void
assign_port(fence_virt_args_t *args, struct arg_info *arg, char *value)
{
char *p;
int ret;
if (!value)
return;
args->net.port = atoi(value);
if (args->net.port <= 0 || args->net.port >= 65536) {
ret = strtol(value, &p, 0);
if (ret <= 0 || ret >= 65536 || *p != '\0') {
printf("Invalid port: '%s'\n", value);
args->flags |= F_ERR;
}
} else
args->net.port = ret;
}
@ -154,14 +158,18 @@ assign_interface(fence_virt_args_t *args, struct arg_info *arg, char *value)
static inline void
assign_retrans(fence_virt_args_t *args, struct arg_info *arg, char *value)
{
char *p;
int ret;
if (!value)
return;
args->retr_time = atoi(value);
if (args->retr_time <= 0) {
ret = strtol(value, &p, 0);
if (ret <= 0 || *p != '\0') {
printf("Invalid retransmit time: '%s'\n", value);
args->flags |= F_ERR;
}
} else
args->retr_time = ret;
}
static inline void
@ -319,27 +327,35 @@ assign_uuid_lookup(fence_virt_args_t *args, struct arg_info *arg, char *value)
static inline void
assign_timeout(fence_virt_args_t *args, struct arg_info *arg, char *value)
{
char *p;
int ret;
if (!value)
return;
args->timeout = atoi(value);
if (args->timeout <= 0) {
ret = strtol(value, &p, 0);
if (ret <= 0 || *p != '\0') {
printf("Invalid timeout: '%s'\n", value);
args->flags |= F_ERR;
}
} else
args->timeout = ret;
}
static inline void
assign_delay(fence_virt_args_t *args, struct arg_info *arg, char *value)
{
char *p;
int ret;
if (!value)
return;
args->delay = atoi(value);
if (args->delay < 0) {
ret = strtol(value, &p, 0);
if (ret < 0 || *p != '\0') {
printf("Invalid delay: '%s'\n", value);
args->flags |= F_ERR;
}
} else
args->delay = ret;
}
static inline void

10
server/config.c
View File

@ -237,9 +237,10 @@ listener_config_multicast(config_object_t *config)
do {
text_input("Multicast IP Port", val, inp, sizeof(inp));
char *p;
done = atoi(inp);
if (done <= 0 || done >= 65536) {
done = strtol(inp, &p, 0);
if (*p != '\0' || done <= 0 || done >= 65536) {
printf("Port value '%s' is out of range\n", val);
continue;
}
@ -374,9 +375,10 @@ listener_config_tcp(config_object_t *config)
do {
text_input("TCP Listen Port", val, inp, sizeof(inp));
char *p;
done = atoi(inp);
if (done <= 0 || done != (done & 0xffff)) {
done = strtol(inp, &p, 0);
if (*p != '\0' || done <= 0 || done >= 65536) {
printf("Port value '%s' is out of range\n", val);
continue;
}