* [PATCH] libxtables: xtables.c: Use getnameinfo()
@ 2016-12-09 11:50 Shyam Saini
2016-12-11 20:02 ` Pablo Neira Ayuso
0 siblings, 1 reply; 5+ messages in thread
From: Shyam Saini @ 2016-12-09 11:50 UTC (permalink / raw)
To: netfilter-devel; +Cc: Shyam Saini
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] libxtables: xtables.c: Use getnameinfo()
2016-12-09 11:50 [PATCH] libxtables: xtables.c: Use getnameinfo() Shyam Saini
@ 2016-12-11 20:02 ` Pablo Neira Ayuso
2016-12-11 20:05 ` Pablo Neira Ayuso
0 siblings, 1 reply; 5+ messages in thread
From: Pablo Neira Ayuso @ 2016-12-11 20:02 UTC (permalink / raw)
To: Shyam Saini; +Cc: netfilter-devel
On Fri, Dec 09, 2016 at 05:20:00PM +0530, Shyam Saini wrote:
> 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));
You can skip this by perfoming C99 initialization, eg.
struct sockaddr_in sin = { .sin_family = AF_INET, };
sin.sin_addr = *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
>
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libxtables: xtables.c: Use getnameinfo()
2016-12-11 20:02 ` Pablo Neira Ayuso
@ 2016-12-11 20:05 ` Pablo Neira Ayuso
2016-12-11 20:17 ` Shivani Bhardwaj
0 siblings, 1 reply; 5+ messages in thread
From: Pablo Neira Ayuso @ 2016-12-11 20:05 UTC (permalink / raw)
To: Shyam Saini; +Cc: netfilter-devel
On Sun, Dec 11, 2016 at 09:02:26PM +0100, Pablo Neira Ayuso wrote:
> On Fri, Dec 09, 2016 at 05:20:00PM +0530, Shyam Saini wrote:
> > 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));
>
> You can skip this by perfoming C99 initialization, eg.
>
> struct sockaddr_in sin = { .sin_family = AF_INET, };
> sin.sin_addr = *addr;
One more comment below.
> > + 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
I don't remember to have used this debugging this ever, probably it is
good to remove it.
> > + return NULL;
> > + }
> >
> > - return host->h_name;
> > +#ifdef DEBUG
> > + fprintf (stderr, "\naddr2host: %s\n", hostname);
> > +#endif
> > + return hostname;
^^^^^^^^^^^
Minor nitpick: indentation is not correct here.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libxtables: xtables.c: Use getnameinfo()
2016-12-11 20:05 ` Pablo Neira Ayuso
@ 2016-12-11 20:17 ` Shivani Bhardwaj
2016-12-11 20:25 ` Pablo Neira Ayuso
0 siblings, 1 reply; 5+ messages in thread
From: Shivani Bhardwaj @ 2016-12-11 20:17 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Shyam Saini, Netfilter Development Mailing list
On Mon, Dec 12, 2016 at 1:35 AM, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> On Sun, Dec 11, 2016 at 09:02:26PM +0100, Pablo Neira Ayuso wrote:
>> On Fri, Dec 09, 2016 at 05:20:00PM +0530, Shyam Saini wrote:
>> > 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));
>>
>> You can skip this by perfoming C99 initialization, eg.
>>
>> struct sockaddr_in sin = { .sin_family = AF_INET, };
>> sin.sin_addr = *addr;
>
> One more comment below.
>
>> > + 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
>
> I don't remember to have used this debugging this ever, probably it is
> good to remove it.
>
Debugging code has been in this applied patch too:
http://git.netfilter.org/iptables/commit/?id=2d2b5e046aa56a518160716a9ddf9df53fc79c1f.
Maybe its good to remove it as well then?
>> > + return NULL;
>> > + }
>> >
>> > - return host->h_name;
>> > +#ifdef DEBUG
>> > + fprintf (stderr, "\naddr2host: %s\n", hostname);
>> > +#endif
>> > + return hostname;
> ^^^^^^^^^^^
>
> Minor nitpick: indentation is not correct here.
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libxtables: xtables.c: Use getnameinfo()
2016-12-11 20:17 ` Shivani Bhardwaj
@ 2016-12-11 20:25 ` Pablo Neira Ayuso
0 siblings, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2016-12-11 20:25 UTC (permalink / raw)
To: Shivani Bhardwaj; +Cc: Shyam Saini, Netfilter Development Mailing list
On Mon, Dec 12, 2016 at 01:47:00AM +0530, Shivani Bhardwaj wrote:
> On Mon, Dec 12, 2016 at 1:35 AM, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > On Sun, Dec 11, 2016 at 09:02:26PM +0100, Pablo Neira Ayuso wrote:
> >> On Fri, Dec 09, 2016 at 05:20:00PM +0530, Shyam Saini wrote:
> >> > 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));
> >>
> >> You can skip this by perfoming C99 initialization, eg.
> >>
> >> struct sockaddr_in sin = { .sin_family = AF_INET, };
> >> sin.sin_addr = *addr;
> >
> > One more comment below.
> >
> >> > + 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
> >
> > I don't remember to have used this debugging this ever, probably it is
> > good to remove it.
> >
>
> Debugging code has been in this applied patch too:
> http://git.netfilter.org/iptables/commit/?id=2d2b5e046aa56a518160716a9ddf9df53fc79c1f.
> Maybe its good to remove it as well then?
Yes, please remove all debugging in libxtables/xtables.c, in an
initial patch.
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-12-11 20:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-09 11:50 [PATCH] libxtables: xtables.c: Use getnameinfo() Shyam Saini
2016-12-11 20:02 ` 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
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).