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

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

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

David Ahern wrote:
> On 2/6/18 7:16 PM, 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:
>>
>> 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
>>
> 
> Fixed by patch 5 which deletes do_tunnels_list. So why have a cleanup
> patch that changes code you then delete?
> 

There at least two reasons:

  1) Abstract tunnel matching code into a function that will be used as
     callback ->match() in upcoming change.

  2) Make do_tunnels_list() ip and ipv6 variants diff contain only
     real differences to show upcoming change where common
     do_tunnels_list() introduced is correct.

Will update comment for this patch in v2.


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