Arav
/
tetatet
1
0
Fork 0
Code Releases Activity

Compare commits

base: Arav:68cb43795bf149f63ddcf1ead33c2cbbb6e2efd7
Branches Tags
Arav:main
...
compare: Arav:489d8850490009fa47ea108f69b2b5b11ba22ece
Branches Tags
Arav:main

2 Commits
68cb43795b ... 489d885049

Author SHA1 Message Date
Alexander Andreev 489d885049
Since a user can pass a port as well as an alias let's check for it every time. 2024-03-30 04:15:40 +04:00
Alexander Andreev 9288797c03
Alright, a test struct sockaddr is not needed for inet_pton(). 2024-03-30 04:12:51 +04:00
1 changed files with 6 additions and 12 deletions
Show Stats Expand all files Collapse all files

18
src/main.c
View File

@ -265,8 +265,7 @@ int parse_argv(int argc, const char **argv, struct options *opts) {
case 'a': opts->addressbook_path = argv[i+1]; ++i; continue;
case 'v': return -2;
case 'h': return -3;
default:
return -1;
default: return -1;
}
} else {
if (opts->command == 'c' || opts->command == 's') {
@ -287,18 +286,13 @@ int parse_argv(int argc, const char **argv, struct options *opts) {
}
}
if (command_arg_num == 1) {
struct sockaddr test = {0};
int r = inet_pton(AF_INET, opts->addr, &test);
if (r == -1)
r = inet_pton(AF_INET6, opts->addr, &test);
opts->is_alias_passed = r != 1;
}
int r = inet_pton(AF_INET, opts->addr, NULL);
if (r == -1)
r = inet_pton(AF_INET6, opts->addr, NULL);
opts->is_alias_passed = r == 0;
// opts->is_alias_passed = ((opts->addr[0]>>4) & 0xf) != 0x3;
if (opts->command == '\0' || opts->addr[0] == '\0'
|| (!opts->is_alias_passed && opts->port[0] == '\0'))
|| (!opts->is_alias_passed && opts->port == NULL))
return -1;
return 0;