|
 |
d82776 |
From ecdb9294c5dce938ef7c488404be65d23552fb18 Mon Sep 17 00:00:00 2001
|
|
|
d82776 |
From: Xin Long <lucien.xin@gmail.com>
|
|
|
d82776 |
Date: Wed, 4 Aug 2021 07:29:15 -0400
|
|
|
d82776 |
Subject: [PATCH 3/4] sctp_test: replace use of deprecated gethostbyname with
|
|
|
d82776 |
getaddrinfo
|
|
|
d82776 |
|
|
|
d82776 |
This patch is to replace use of deprecated gethostbyname with
|
|
|
d82776 |
getaddrinfo in the file src/apps/sctp_test.c.
|
|
|
d82776 |
|
|
|
d82776 |
Signed-off-by: Xin Long <lucien.xin@gmail.com>
|
|
|
d82776 |
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
|
|
|
d82776 |
---
|
|
|
d82776 |
src/apps/sctp_test.c | 63 +++++++++++---------------------------------
|
|
|
d82776 |
1 file changed, 16 insertions(+), 47 deletions(-)
|
|
|
d82776 |
|
|
|
d82776 |
diff --git a/src/apps/sctp_test.c b/src/apps/sctp_test.c
|
|
|
d82776 |
index cd7654b..e382804 100644
|
|
|
d82776 |
--- a/src/apps/sctp_test.c
|
|
|
d82776 |
+++ b/src/apps/sctp_test.c
|
|
|
d82776 |
@@ -487,14 +487,11 @@ struct sockaddr *
|
|
|
d82776 |
append_addr(const char *parm, struct sockaddr *addrs, int *ret_count)
|
|
|
d82776 |
{
|
|
|
d82776 |
struct sockaddr *new_addrs = NULL;
|
|
|
d82776 |
+ struct addrinfo hints, *res, *rp;
|
|
|
d82776 |
void *aptr;
|
|
|
d82776 |
struct sockaddr *sa_addr;
|
|
|
d82776 |
struct sockaddr_in *b4ap;
|
|
|
d82776 |
struct sockaddr_in6 *b6ap;
|
|
|
d82776 |
- struct hostent *hst4 = NULL;
|
|
|
d82776 |
- struct hostent *hst6 = NULL;
|
|
|
d82776 |
- int i4 = 0;
|
|
|
d82776 |
- int i6 = 0;
|
|
|
d82776 |
int j;
|
|
|
d82776 |
int orig_count = *ret_count;
|
|
|
d82776 |
int count = orig_count;
|
|
|
d82776 |
@@ -514,27 +511,16 @@ append_addr(const char *parm, struct sockaddr *addrs, int *ret_count)
|
|
|
d82776 |
}
|
|
|
d82776 |
}
|
|
|
d82776 |
|
|
|
d82776 |
- /* Get the entries for this host. */
|
|
|
d82776 |
- hst4 = gethostbyname(ipaddr);
|
|
|
d82776 |
- hst6 = gethostbyname2(ipaddr, AF_INET6);
|
|
|
d82776 |
-
|
|
|
d82776 |
- if ((NULL == hst4 || hst4->h_length < 1)
|
|
|
d82776 |
- && (NULL == hst6 || hst6->h_length < 1)) {
|
|
|
d82776 |
+ memset(&hints, 0, sizeof(struct addrinfo));
|
|
|
d82776 |
+ hints.ai_family = AF_UNSPEC;
|
|
|
d82776 |
+ hints.ai_protocol = IPPROTO_SCTP;
|
|
|
d82776 |
+ if (getaddrinfo(ipaddr, NULL, &hints, &res) != 0) {
|
|
|
d82776 |
fprintf(stderr, "bad hostname: %s\n", ipaddr);
|
|
|
d82776 |
goto finally;
|
|
|
d82776 |
}
|
|
|
d82776 |
|
|
|
d82776 |
- /* Figure out the number of addresses. */
|
|
|
d82776 |
- if (NULL != hst4) {
|
|
|
d82776 |
- for (i4 = 0; NULL != hst4->h_addr_list[i4]; ++i4) {
|
|
|
d82776 |
- count++;
|
|
|
d82776 |
- }
|
|
|
d82776 |
- }
|
|
|
d82776 |
- if (NULL != hst6) {
|
|
|
d82776 |
- for (i6 = 0; NULL != hst6->h_addr_list[i6]; ++i6) {
|
|
|
d82776 |
- count++;
|
|
|
d82776 |
- }
|
|
|
d82776 |
- }
|
|
|
d82776 |
+ for (rp = res; rp != NULL; rp = rp->ai_next)
|
|
|
d82776 |
+ count++;
|
|
|
d82776 |
|
|
|
d82776 |
/* Expand memory for the new addresses. Assume all the addresses
|
|
|
d82776 |
* are v6 addresses.
|
|
|
d82776 |
@@ -565,34 +551,17 @@ append_addr(const char *parm, struct sockaddr *addrs, int *ret_count)
|
|
|
d82776 |
}
|
|
|
d82776 |
|
|
|
d82776 |
/* Put the new addresses away. */
|
|
|
d82776 |
- if (NULL != hst4) {
|
|
|
d82776 |
- for (j = 0; j < i4; ++j) {
|
|
|
d82776 |
- b4ap = (struct sockaddr_in *)aptr;
|
|
|
d82776 |
- memset(b4ap, 0x00, sizeof(*b4ap));
|
|
|
d82776 |
- b4ap->sin_family = AF_INET;
|
|
|
d82776 |
- b4ap->sin_port = htons(local_port);
|
|
|
d82776 |
- bcopy(hst4->h_addr_list[j], &b4ap->sin_addr,
|
|
|
d82776 |
- hst4->h_length);
|
|
|
d82776 |
-
|
|
|
d82776 |
- aptr += sizeof(struct sockaddr_in);
|
|
|
d82776 |
- } /* for (loop through the new v4 addresses) */
|
|
|
d82776 |
- }
|
|
|
d82776 |
-
|
|
|
d82776 |
- if (NULL != hst6) {
|
|
|
d82776 |
- for (j = 0; j < i6; ++j) {
|
|
|
d82776 |
- b6ap = (struct sockaddr_in6 *)aptr;
|
|
|
d82776 |
- memset(b6ap, 0x00, sizeof(*b6ap));
|
|
|
d82776 |
- b6ap->sin6_family = AF_INET6;
|
|
|
d82776 |
- b6ap->sin6_port = htons(local_port);
|
|
|
d82776 |
+ for (rp = res; rp != NULL; rp = rp->ai_next) {
|
|
|
d82776 |
+ b4ap = (struct sockaddr_in *)aptr;
|
|
|
d82776 |
+ b6ap = (struct sockaddr_in6 *)aptr;
|
|
|
d82776 |
+ bcopy(rp->ai_addr, aptr, rp->ai_addrlen);
|
|
|
d82776 |
+ b4ap->sin_port = htons(local_port); /* equal to b6ap.v6.sin6_port */
|
|
|
d82776 |
+ if (rp->ai_family == AF_INET6) {
|
|
|
d82776 |
b6ap->sin6_scope_id = if_index;
|
|
|
d82776 |
- bcopy(hst6->h_addr_list[j], &b6ap->sin6_addr,
|
|
|
d82776 |
- hst6->h_length);
|
|
|
d82776 |
- if (!ifindex) {
|
|
|
d82776 |
+ if (!ifindex)
|
|
|
d82776 |
b6ap->sin6_scope_id = ifindex;
|
|
|
d82776 |
- }
|
|
|
d82776 |
-
|
|
|
d82776 |
- aptr += sizeof(struct sockaddr_in6);
|
|
|
d82776 |
- } /* for (loop through the new v6 addresses) */
|
|
|
d82776 |
+ }
|
|
|
d82776 |
+ aptr += rp->ai_addrlen;
|
|
|
d82776 |
}
|
|
|
d82776 |
|
|
|
d82776 |
finally:
|
|
|
d82776 |
--
|
|
|
d82776 |
2.27.0
|
|
|
d82776 |
|