Re: [PATCH iproute2-next 4/6] iptunnel/ip6tunnel: Code cleanups

[Serhey Popovych <serhe.popovych@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1645 bytes --]

David Ahern wrote:
> On 2/2/18 6:10 AM, Serhey Popovych wrote:
>> @@ -414,15 +428,18 @@ static int do_tunnels_list(struct ip_tunnel_parm *p)
>>  			fprintf(stderr, "Failed to get type of \"%s\"\n", name);
>>  			continue;
>>  		}
>> -		if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT)
>> +		switch (type) {
>> +		case ARPHRD_TUNNEL:
>> +		case ARPHRD_IPGRE:
>> +		case ARPHRD_SIT:
>> +			break;
>> +		default:
>>  			continue;
>> +		}
>> +		memset(p1, 0, sizeof(p1));
> 
> Shouldn't that be &p1 for the first arg? I get a compile failure:

Yes, definitely, sorry for that. Will fix in v2.

> 
> ip
>     CC       iptunnel.o
>     CC       ip6tunnel.o
> iptunnel.c: In function ‘do_tunnels_list’:
> iptunnel.c:439:10: error: incompatible type for argument 1 of ‘memset’
>    memset(p1, 0, sizeof(p1));
>           ^~
> In file included from iptunnel.c:15:0:
> /usr/include/string.h:62:14: note: expected ‘void *’ but argument is of
> type ‘struct ip_tunnel_parm’
>  extern void *memset (void *__s, int __c, size_t __n) __THROW __nonnull
> ((1));
>               ^~~~~~
> ../config.mk:48: recipe for target 'iptunnel.o' failed
> 
>>  		if (tnl_get_ioctl(name, &p1))
>>  			continue;
>> -		if ((p->link && p1.link != p->link) ||
>> -		    (p->name[0] && strcmp(p1.name, p->name)) ||
>> -		    (p->iph.daddr && p1.iph.daddr != p->iph.daddr) ||
>> -		    (p->iph.saddr && p1.iph.saddr != p->iph.saddr) ||
>> -		    (p->i_key && p1.i_key != p->i_key))
>> +		if (!ip_tunnel_parm_match(p, &p1))
>>  			continue;
>>  		print_tunnel(&p1);
>>  		if (show_stats) {



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]