On Wed, Oct 16, 2019 at 08:19:28PM +1000, David Gwynne wrote:
> the ipv4 ones return void, and these can't fail, so make them return
> nothing too.
>
> ok?
OK bluhm@
> Index: netinet/in_pcb.h
> ===================================================================
> RCS file: /cvs/src/sys/netinet/in_pcb.h,v
> retrieving revision 1.116
> diff -u -p -r1.116 in_pcb.h
> --- netinet/in_pcb.h 15 Jul 2019 12:40:42 -0000 1.116
> +++ netinet/in_pcb.h 16 Oct 2019 10:09:24 -0000
> @@ -287,8 +287,8 @@ struct inpcb *
> int in6_pcbaddrisavail(struct inpcb *, struct sockaddr_in6 *, int,
> struct proc *);
> int in6_pcbconnect(struct inpcb *, struct mbuf *);
> -int in6_setsockaddr(struct inpcb *, struct mbuf *);
> -int in6_setpeeraddr(struct inpcb *, struct mbuf *);
> +void in6_setsockaddr(struct inpcb *, struct mbuf *);
> +void in6_setpeeraddr(struct inpcb *, struct mbuf *);
> #endif /* INET6 */
> void in_pcbinit(struct inpcbtable *, int);
> struct inpcb *
> Index: netinet6/in6_pcb.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet6/in6_pcb.c,v
> retrieving revision 1.108
> diff -u -p -r1.108 in6_pcb.c
> --- netinet6/in6_pcb.c 4 Oct 2018 17:33:41 -0000 1.108
> +++ netinet6/in6_pcb.c 16 Oct 2019 10:09:24 -0000
> @@ -305,7 +305,7 @@ in6_pcbconnect(struct inpcb *inp, struct
> * Get the local address/port, and put it in a sockaddr_in6.
> * This services the getsockname(2) call.
> */
> -int
> +void
> in6_setsockaddr(struct inpcb *inp, struct mbuf *nam)
> {
> struct sockaddr_in6 *sin6;
> @@ -320,15 +320,13 @@ in6_setsockaddr(struct inpcb *inp, struc
> sin6->sin6_addr = inp->inp_laddr6;
> /* KAME hack: recover scopeid */
> in6_recoverscope(sin6, &inp->inp_laddr6);
> -
> - return 0;
> }
>
> /*
> * Get the foreign address/port, and put it in a sockaddr_in6.
> * This services the getpeername(2) call.
> */
> -int
> +void
> in6_setpeeraddr(struct inpcb *inp, struct mbuf *nam)
> {
> struct sockaddr_in6 *sin6;
> @@ -343,8 +341,6 @@ in6_setpeeraddr(struct inpcb *inp, struc
> sin6->sin6_addr = inp->inp_faddr6;
> /* KAME hack: recover scopeid */
> in6_recoverscope(sin6, &inp->inp_faddr6);
> -
> - return 0;
> }
>
> /*
