Re: route: zap unused sockaddr

[Jeremie Courreges-Anglas]

On Sun, Jun 03 2018, Alexander Bluhm  wrote:
> On Sun, Jun 03, 2018 at 01:05:32AM +0200, Klemens Nanni wrote:
>> No object change.
>> 
>> OK?
>
> usr.bin/netstat/show.c has the same code.  They should stay in sync.
> Please change it there, too.  Then OK bluhm@.

Agreed, please amend netstat too (ok jca@).

>> Index: show.c
>> ===
>> RCS file: /cvs/src/sbin/route/show.c,v
>> retrieving revision 1.112
>> diff -u -p -r1.112 show.c
>> --- show.c   1 May 2018 18:13:21 -   1.112
>> +++ show.c   2 Jun 2018 22:55:26 -
>> @@ -140,7 +140,6 @@ p_rttables(int af, u_int tableid, char p
>>  char *buf = NULL, *next, *lim = NULL;
>>  size_t needed;
>>  int mib[7], mcnt;
>> -struct sockaddr *sa;
>>  
>>  mib[0] = CTL_NET;
>>  mib[1] = PF_ROUTE;
>> @@ -164,7 +163,6 @@ p_rttables(int af, u_int tableid, char p
>>  rtm = (struct rt_msghdr *)next;
>>  if (rtm->rtm_version != RTM_VERSION)
>>  continue;
>> -sa = (struct sockaddr *)(next + rtm->rtm_hdrlen);
>>  p_rtentry(rtm);
>>  }
>>  }
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: route: zap unused sockaddr

[Alexander Bluhm]

On Sun, Jun 03, 2018 at 01:05:32AM +0200, Klemens Nanni wrote:
> No object change.
> 
> OK?

usr.bin/netstat/show.c has the same code.  They should stay in sync.
Please change it there, too.  Then OK bluhm@.

> Index: show.c
> ===
> RCS file: /cvs/src/sbin/route/show.c,v
> retrieving revision 1.112
> diff -u -p -r1.112 show.c
> --- show.c1 May 2018 18:13:21 -   1.112
> +++ show.c2 Jun 2018 22:55:26 -
> @@ -140,7 +140,6 @@ p_rttables(int af, u_int tableid, char p
>   char *buf = NULL, *next, *lim = NULL;
>   size_t needed;
>   int mib[7], mcnt;
> - struct sockaddr *sa;
>  
>   mib[0] = CTL_NET;
>   mib[1] = PF_ROUTE;
> @@ -164,7 +163,6 @@ p_rttables(int af, u_int tableid, char p
>   rtm = (struct rt_msghdr *)next;
>   if (rtm->rtm_version != RTM_VERSION)
>   continue;
> - sa = (struct sockaddr *)(next + rtm->rtm_hdrlen);
>   p_rtentry(rtm);
>   }
>   }

route: zap unused sockaddr

[Klemens Nanni]

No object change.

OK?

Index: show.c
===
RCS file: /cvs/src/sbin/route/show.c,v
retrieving revision 1.112
diff -u -p -r1.112 show.c
--- show.c  1 May 2018 18:13:21 -   1.112
+++ show.c  2 Jun 2018 22:55:26 -
@@ -140,7 +140,6 @@ p_rttables(int af, u_int tableid, char p
char *buf = NULL, *next, *lim = NULL;
size_t needed;
int mib[7], mcnt;
-   struct sockaddr *sa;
 
mib[0] = CTL_NET;
mib[1] = PF_ROUTE;
@@ -164,7 +163,6 @@ p_rttables(int af, u_int tableid, char p
rtm = (struct rt_msghdr *)next;
if (rtm->rtm_version != RTM_VERSION)
continue;
-   sa = (struct sockaddr *)(next + rtm->rtm_hdrlen);
p_rtentry(rtm);
}
}