netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shyam Saini <mayhs11saini@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Shyam Saini <mayhs11saini@gmail.com>
Subject: [PATCH] libxtables: xtables.c: Use getnameinfo()
Date: Fri,  9 Dec 2016 17:20:00 +0530	[thread overview]
Message-ID: <1481284200-6104-1-git-send-email-mayhs11saini@gmail.com> (raw)

Use getnameinfo() instead of deprecated gethostbyaddr()

Signed-off-by: Shyam Saini <mayhs11saini@gmail.com>
---
 libxtables/xtables.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/libxtables/xtables.c b/libxtables/xtables.c
index 921dfe9..338e325 100644
--- a/libxtables/xtables.c
+++ b/libxtables/xtables.c
@@ -1210,13 +1210,28 @@ const char *xtables_ipaddr_to_numeric(const struct in_addr *addrp)
 
 static const char *ipaddr_to_host(const struct in_addr *addr)
 {
-	struct hostent *host;
+	static char hostname[NI_MAXHOST];
+	struct sockaddr_in saddr;
+	int err;
 
-	host = gethostbyaddr(addr, sizeof(struct in_addr), AF_INET);
-	if (host == NULL)
-		return NULL;
+	memset(&saddr, 0, sizeof(struct sockaddr_in));
+	memcpy(&saddr.sin_addr, addr, sizeof(*addr));
+	saddr.sin_family = AF_INET;
+
+	err = getnameinfo((const void *)&saddr, sizeof(struct sockaddr_in),
+			              hostname, sizeof(hostname) - 1, NULL, 0, 0);
+
+	 if (err != 0) {
+#ifdef DEBUG
+		 fprintf(stderr,"IP2Name: %s\n",gai_strerror(err));
+#endif
+		 return NULL;
+	}
 
-	return host->h_name;
+#ifdef DEBUG
+		fprintf (stderr, "\naddr2host: %s\n", hostname);
+#endif
+		return hostname;
 }
 
 static const char *ipaddr_to_network(const struct in_addr *addr)
-- 
2.7.4


             reply	other threads:[~2016-12-09 11:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-09 11:50 Shyam Saini [this message]
2016-12-11 20:02 ` [PATCH] libxtables: xtables.c: Use getnameinfo() Pablo Neira Ayuso
2016-12-11 20:05   ` Pablo Neira Ayuso
2016-12-11 20:17     ` Shivani Bhardwaj
2016-12-11 20:25       ` Pablo Neira Ayuso

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=1481284200-6104-1-git-send-email-mayhs11saini@gmail.com \
    --to=mayhs11saini@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).