[MPlayer-cvslog] r31498 - trunk/stream/tcp.c

Attila Kinali attila at kinali.ch
Wed Jun 23 13:44:30 CEST 2010


On Mon, 21 Jun 2010 18:04:28 +0200
Reimar Döffinger <Reimar.Doeffinger at gmx.de> wrote:


> > -#if HAVE_INET_ATON || defined(HAVE_WINSOCK2_H)
> > -	av_strlcpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255);
> > -#else
> > +#if HAVE_INET_PTON
> >  	inet_ntop(af, our_s_addr, buf, 255);
> > +#elif HAVE_INET_ATON || defined(HAVE_WINSOCK2_H)
> > +	av_strlcpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255);
> >  #endif
> 
> This will change the behaviour with winsocks if pton is available.
> Is this intentional/likely to work right?
> I suspect it is "doubly" ok, but maybe have a quick look anyway.

Hmm.. I assumed that pton isn not available on windows (hence the
check for ATON||WINSOCK). Unfortunately, i cannot check whether this
work ok on windows, though i tested that it works fine on linux
for all 4 possible combinations of ATON and PTON.

Can someone with a windows build enviroment check whether the
above change works fine for ipv4 and ipv6 addresses, please?

			Attila Kinali

-- 
If you want to walk fast, walk alone.
If you want to walk far, walk together.
		-- African proverb


More information about the MPlayer-cvslog mailing list