[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    Re: [PATCH] fix problem with ip on mips64 n64 big endian musl systems
From:       Denys Vlasenko <vda.linux () googlemail ! com>
Date:       2016-04-24 15:42:16
Message-ID: CAK1hOcP=R_epRMi2UajXBWsmbgCCPU7xiUeBC_LrBDHHrz-Kcw () mail ! gmail ! com
[Download RAW message or body]

Applied, thanks!

On Sun, Apr 24, 2016 at 5:31 PM, Waldemar Brodkorb <wbx@openadk.org> wrote:
> Use designated initializers for struct msghdr.
> The struct layout is non-portable and musl libc does not match what busybox expects.
>
> Signed-off-by: Szabolcs Nagy <nsz@port70.net>
> Tested-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  networking/libiproute/libnetlink.c | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
> index c7533a4..f9cd9e5 100644
> --- a/networking/libiproute/libnetlink.c
> +++ b/networking/libiproute/libnetlink.c
> @@ -72,10 +72,10 @@ int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, in
>         struct sockaddr_nl nladdr;
>         struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } };
>         struct msghdr msg = {
> -               (void*)&nladdr, sizeof(nladdr),
> -               iov,  2,
> -               NULL, 0,
> -               0
> +               .msg_name = (void*)&nladdr, .msg_namelen = sizeof(nladdr),
> +               .msg_iov = iov,  .msg_iovlen = 2,
> +               .msg_control = NULL, .msg_controllen = 0,
> +               .msg_flags = 0
>         };
>
>         memset(&nladdr, 0, sizeof(nladdr));
> @@ -106,10 +106,10 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
>                 struct nlmsghdr *h;
>
>                 struct msghdr msg = {
> -                       (void*)&nladdr, sizeof(nladdr),
> -                       &iov, 1,
> -                       NULL, 0,
> -                       0
> +                       .msg_name = (void*)&nladdr, .msg_namelen = sizeof(nladdr),
> +                       .msg_iov = &iov,  .msg_iovlen = 1,
> +                       .msg_control = NULL, .msg_controllen = 0,
> +                       .msg_flags = 0
>                 };
>
>                 status = recvmsg(rth->fd, &msg, 0);
> @@ -212,10 +212,10 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
>         struct iovec iov = { (void*)n, n->nlmsg_len };
>         char   *buf = xmalloc(8*1024); /* avoid big stack buffer */
>         struct msghdr msg = {
> -               (void*)&nladdr, sizeof(nladdr),
> -               &iov, 1,
> -               NULL, 0,
> -               0
> +               .msg_name = (void*)&nladdr, .msg_namelen = sizeof(nladdr),
> +               .msg_iov = &iov,  .msg_iovlen = 1,
> +               .msg_control = NULL, .msg_controllen = 0,
> +               .msg_flags = 0
>         };
>
>         memset(&nladdr, 0, sizeof(nladdr));
> --
> 2.1.4
>
> _______________________________________________
> busybox mailing list
> busybox@busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]