public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-cluster] pmxcfs: lookup_node_ip : skip local ips
Date: Wed, 28 Jun 2023 11:39:27 +0200	[thread overview]
Message-ID: <20230628093927.988114-1-aderumier@odiso.com> (raw)

stock debian or some hosting company like ovh through cloudinit at each boot,
add 127.0.1.1 <hostname> in /etc/hosts.

fix:
https://forum.proxmox.com/threads/proxmox-7-to-8-upgrade-problem-ovh.129678/
https://forum.proxmox.com/threads/update-7-to-8-issue-with-cloud-init.129669/#post-568172
https://forum.proxmox.com/threads/bookworm-installation-fails-with-pve-manager-dependency-error.129398/#post-568290
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 src/pmxcfs/pmxcfs.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/pmxcfs/pmxcfs.c b/src/pmxcfs/pmxcfs.c
index d78a248..e0f5f27 100644
--- a/src/pmxcfs/pmxcfs.c
+++ b/src/pmxcfs/pmxcfs.c
@@ -726,26 +726,34 @@ static char *
 lookup_node_ip(const char *nodename)
 {
 	char buf[INET6_ADDRSTRLEN];
-	struct addrinfo *ainfo;
+	struct addrinfo *ainfo, *rp;
 	struct addrinfo ahints;
 	char *res = NULL;
 	memset(&ahints, 0, sizeof(ahints));
+	ahints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
+	ahints.ai_socktype = SOCK_STREAM; /* Datagram socket */
+	ahints.ai_flags = AI_V4MAPPED | AI_ALL;
 
 	if (getaddrinfo(nodename, NULL, &ahints, &ainfo))
 		return NULL;
 
-	if (ainfo->ai_family == AF_INET) {
-		struct sockaddr_in *sa = (struct sockaddr_in *)ainfo->ai_addr;
-		inet_ntop(ainfo->ai_family, &sa->sin_addr, buf, sizeof(buf));
+	for (rp = ainfo; rp != NULL; rp = rp->ai_next) {
+
+	    if (ainfo->ai_family == AF_INET) {
+		struct sockaddr_in *sa = (struct sockaddr_in *)rp->ai_addr;
+		inet_ntop(rp->ai_family, &sa->sin_addr, buf, sizeof(buf));
 		if (strncmp(buf, "127.", 4) != 0) {
 			res = g_strdup(buf);
+			break;
 		}
-	} else if (ainfo->ai_family == AF_INET6) {
-		struct sockaddr_in6 *sa = (struct sockaddr_in6 *)ainfo->ai_addr;
-		inet_ntop(ainfo->ai_family, &sa->sin6_addr, buf, sizeof(buf));
+	    } else if (ainfo->ai_family == AF_INET6) {
+		struct sockaddr_in6 *sa = (struct sockaddr_in6 *)rp->ai_addr;
+		inet_ntop(rp->ai_family, &sa->sin6_addr, buf, sizeof(buf));
 		if (strcmp(buf, "::1") != 0) {
 			res = g_strdup(buf);
+			break;
 		}
+	    }
 	}
 
 	freeaddrinfo(ainfo);
-- 
2.39.2




             reply	other threads:[~2023-06-28  9:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-28  9:39 Alexandre Derumier [this message]
2023-07-01 16:03 ` Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230628093927.988114-1-aderumier@odiso.com \
    --to=aderumier@odiso.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal