Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check result of getaddrinfo() calls consistently #28

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion chap02/time_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
6 changes: 5 additions & 1 deletion chap02/time_server_dual.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
6 changes: 5 additions & 1 deletion chap02/time_server_ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
5 changes: 3 additions & 2 deletions chap03/tcp_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(argv[1], argv[2], &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(argv[1], argv[2], &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

Expand Down
6 changes: 5 additions & 1 deletion chap03/tcp_serve_chat.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
6 changes: 5 additions & 1 deletion chap03/tcp_serve_toupper.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
6 changes: 5 additions & 1 deletion chap03/tcp_serve_toupper_fork.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
5 changes: 3 additions & 2 deletions chap04/udp_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_DGRAM;
struct addrinfo *peer_address;
if (getaddrinfo(argv[1], argv[2], &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(argv[1], argv[2], &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

Expand Down
6 changes: 5 additions & 1 deletion chap04/udp_recvfrom.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
5 changes: 3 additions & 2 deletions chap04/udp_sendto.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ int main() {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_DGRAM;
struct addrinfo *peer_address;
if (getaddrinfo("127.0.0.1", "8080", &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo("127.0.0.1", "8080", &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

Expand Down
6 changes: 5 additions & 1 deletion chap04/udp_serve_toupper.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
6 changes: 5 additions & 1 deletion chap04/udp_serve_toupper_simple.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
5 changes: 3 additions & 2 deletions chap05/dns_query.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,9 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_DGRAM;
struct addrinfo *peer_address;
if (getaddrinfo("8.8.8.8", "53", &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo("8.8.8.8", "53", &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

Expand Down
5 changes: 3 additions & 2 deletions chap05/lookup.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_ALL;
struct addrinfo *peer_address;
if (getaddrinfo(argv[1], 0, &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(argv[1], 0, &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

Expand Down
5 changes: 3 additions & 2 deletions chap06/web_get.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,9 @@ SOCKET connect_to_host(char *hostname, char *port) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(hostname, port, &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(hostname, port, &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
exit(1);
}

Expand Down
6 changes: 5 additions & 1 deletion chap07/web_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ SOCKET create_socket(const char* host, const char *port) {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(host, port, &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(host, port, &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
exit(1);
}

printf("Creating socket...\n");
SOCKET socket_listen;
Expand Down
6 changes: 5 additions & 1 deletion chap07/web_server2.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ SOCKET create_socket(const char* host, const char *port) {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(host, port, &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(host, port, &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
exit(1);
}

printf("Creating socket...\n");
SOCKET socket_listen;
Expand Down
5 changes: 3 additions & 2 deletions chap08/smtp_send.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,9 @@ SOCKET connect_to_host(const char *hostname, const char *port) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(hostname, port, &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(hostname, port, &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
exit(1);
}

Expand Down
5 changes: 3 additions & 2 deletions chap09/https_get.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ SOCKET connect_to_host(char *hostname, char *port) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(hostname, port, &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(hostname, port, &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
exit(1);
}

Expand Down
7 changes: 4 additions & 3 deletions chap09/https_simple.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(hostname, port, &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
exit(1);
int getaddrinfo_result = getaddrinfo(hostname, port, &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

printf("Remote address is: ");
Expand Down
5 changes: 3 additions & 2 deletions chap09/tls_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(argv[1], argv[2], &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(argv[1], argv[2], &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

Expand Down
7 changes: 4 additions & 3 deletions chap09/tls_get_cert.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(hostname, port, &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
exit(1);
int getaddrinfo_result = getaddrinfo(hostname, port, &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

printf("Remote address is: ");
Expand Down
6 changes: 5 additions & 1 deletion chap10/https_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ SOCKET create_socket(const char* host, const char *port) {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(host, port, &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(host, port, &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
exit(1);
}

printf("Creating socket...\n");
SOCKET socket_listen;
Expand Down
6 changes: 5 additions & 1 deletion chap10/tls_time_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
5 changes: 3 additions & 2 deletions chap13/big_send.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(argv[1], argv[2], &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(argv[1], argv[2], &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

Expand Down
5 changes: 3 additions & 2 deletions chap13/connect_blocking.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(argv[1], argv[2], &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(argv[1], argv[2], &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

Expand Down
5 changes: 3 additions & 2 deletions chap13/connect_timeout.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ int main(int argc, char *argv[]) {
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
struct addrinfo *peer_address;
if (getaddrinfo(argv[1], argv[2], &hints, &peer_address)) {
fprintf(stderr, "getaddrinfo() failed. (%d)\n", GETSOCKETERRNO());
int getaddrinfo_result = getaddrinfo(argv[1], argv[2], &hints, &peer_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}

Expand Down
6 changes: 5 additions & 1 deletion chap13/server_crash.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
6 changes: 5 additions & 1 deletion chap13/server_ignore.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
6 changes: 5 additions & 1 deletion chap13/server_noreuse.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down
6 changes: 5 additions & 1 deletion chap13/server_reuse.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ int main() {
hints.ai_flags = AI_PASSIVE;

struct addrinfo *bind_address;
getaddrinfo(0, "8080", &hints, &bind_address);
int getaddrinfo_result = getaddrinfo(0, "8080", &hints, &bind_address);
if (getaddrinfo_result) {
fprintf(stderr, "getaddrinfo() failed. (%d, %d)\n", getaddrinfo_result, GETSOCKETERRNO());
return 1;
}


printf("Creating socket...\n");
Expand Down