status-im/BearSSL
2
0
Fork 0
mirror of https://github.com/status-im/BearSSL.git synced 2025-02-24 00:18:09 +00:00
Code Issues Projects Releases Wiki Activity

Moved address-to-string translation code to blocks that depend on the 'verbose' flag.

Browse Source
This commit is contained in:
Thomas Pornin 2016-11-12 16:49:27 +01:00
parent 133705ee65
commit f3ac21cb00
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tools/client.c
View File

@ -57,27 +57,29 @@ host_connect(const char *host, const char *port, int verbose)
}
fd = -1;
for (p = si; p != NULL; p = p->ai_next) {
struct sockaddr *sa;
void *addr;
char tmp[INET6_ADDRSTRLEN + 50];
sa = (struct sockaddr *)p->ai_addr;
if (sa->sa_family == AF_INET) {
addr = &((struct sockaddr_in *)sa)->sin_addr;
} else if (sa->sa_family == AF_INET6) {
addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
} else {
addr = NULL;
}
if (addr != NULL) {
if (!inet_ntop(p->ai_family, addr, tmp, sizeof tmp)) {
strcpy(tmp, "<invalid>");
}
} else {
sprintf(tmp, "<unknown family: %d>",
(int)sa->sa_family);
}
if (verbose) {
struct sockaddr *sa;
void *addr;
char tmp[INET6_ADDRSTRLEN + 50];
sa = (struct sockaddr *)p->ai_addr;
if (sa->sa_family == AF_INET) {
addr = &((struct sockaddr_in *)sa)->sin_addr;
} else if (sa->sa_family == AF_INET6) {
addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
} else {
addr = NULL;
}
if (addr != NULL) {
if (!inet_ntop(p->ai_family, addr,
tmp, sizeof tmp))
{
strcpy(tmp, "<invalid>");
}
} else {
sprintf(tmp, "<unknown family: %d>",
(int)sa->sa_family);
}
fprintf(stderr, "connecting to: %s\n", tmp);
}
fd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);

21
tools/server.c
View File

@ -62,7 +62,6 @@ host_bind(const char *host, const char *port, int verbose)
struct sockaddr_in6 sa6;
size_t sa_len;
void *addr;
char tmp[INET6_ADDRSTRLEN + 50];
int opt;
sa = (struct sockaddr *)p->ai_addr;
@ -86,15 +85,19 @@ host_bind(const char *host, const char *port, int verbose)
addr = NULL;
sa_len = p->ai_addrlen;
}
if (addr != NULL) {
if (!inet_ntop(p->ai_family, addr, tmp, sizeof tmp)) {
strcpy(tmp, "<invalid>");
}
} else {
sprintf(tmp, "<unknown family: %d>",
(int)sa->sa_family);
}
if (verbose) {
char tmp[INET6_ADDRSTRLEN + 50];
if (addr != NULL) {
if (!inet_ntop(p->ai_family, addr,
tmp, sizeof tmp))
{
strcpy(tmp, "<invalid>");
}
} else {
sprintf(tmp, "<unknown family: %d>",
(int)sa->sa_family);
}
fprintf(stderr, "binding to: %s\n", tmp);
}
fd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);