2006-07-03 01:17:05 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
2002-11-10 07:03:55 +05:30
|
|
|
/*
|
2010-07-23 05:01:24 +05:30
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
2002-11-10 07:03:55 +05:30
|
|
|
*
|
2010-07-23 05:01:24 +05:30
|
|
|
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
|
2002-11-10 07:03:55 +05:30
|
|
|
*/
|
|
|
|
#include <sys/socket.h>
|
2003-06-20 14:35:00 +05:30
|
|
|
#include <sys/uio.h>
|
|
|
|
|
2007-06-01 03:46:38 +05:30
|
|
|
#include "libbb.h"
|
2002-11-10 07:03:55 +05:30
|
|
|
#include "libnetlink.h"
|
|
|
|
|
2010-07-23 05:01:24 +05:30
|
|
|
void FAST_FUNC xrtnl_open(struct rtnl_handle *rth/*, unsigned subscriptions*/)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
2009-04-22 05:18:38 +05:30
|
|
|
memset(rth, 0, sizeof(*rth));
|
2007-04-12 17:04:39 +05:30
|
|
|
rth->fd = xsocket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
|
2002-11-10 07:03:55 +05:30
|
|
|
rth->local.nl_family = AF_NETLINK;
|
2007-04-12 17:04:39 +05:30
|
|
|
/*rth->local.nl_groups = subscriptions;*/
|
2002-11-10 07:03:55 +05:30
|
|
|
|
2007-04-12 17:04:39 +05:30
|
|
|
xbind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local));
|
2018-02-11 19:25:46 +05:30
|
|
|
bb_getsockname(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local));
|
2009-04-22 05:18:38 +05:30
|
|
|
|
|
|
|
/* too much paranoia
|
2007-04-12 17:04:39 +05:30
|
|
|
if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0)
|
2008-07-21 20:11:33 +05:30
|
|
|
bb_perror_msg_and_die("getsockname");
|
2007-04-12 17:04:39 +05:30
|
|
|
if (addr_len != sizeof(rth->local))
|
|
|
|
bb_error_msg_and_die("wrong address length %d", addr_len);
|
|
|
|
if (rth->local.nl_family != AF_NETLINK)
|
|
|
|
bb_error_msg_and_die("wrong address family %d", rth->local.nl_family);
|
2009-04-22 05:18:38 +05:30
|
|
|
*/
|
2002-11-10 07:03:55 +05:30
|
|
|
rth->seq = time(NULL);
|
|
|
|
}
|
|
|
|
|
2019-05-22 17:24:46 +05:30
|
|
|
void FAST_FUNC xrtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
|
|
|
struct {
|
|
|
|
struct nlmsghdr nlh;
|
|
|
|
struct rtgenmsg g;
|
|
|
|
} req;
|
|
|
|
|
|
|
|
req.nlh.nlmsg_len = sizeof(req);
|
|
|
|
req.nlh.nlmsg_type = type;
|
|
|
|
req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
|
|
|
|
req.nlh.nlmsg_pid = 0;
|
|
|
|
req.nlh.nlmsg_seq = rth->dump = ++rth->seq;
|
|
|
|
req.g.rtgen_family = family;
|
|
|
|
|
2019-05-22 17:24:46 +05:30
|
|
|
rtnl_send(rth, (void*)&req, sizeof(req));
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
|
2019-05-22 17:24:46 +05:30
|
|
|
/* A version which checks for e.g. EPERM errors.
|
|
|
|
* Try: setuidgid 1:1 ip addr flush dev eth0
|
|
|
|
*/
|
|
|
|
int FAST_FUNC rtnl_send_check(struct rtnl_handle *rth, const void *buf, int len)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
2019-05-22 17:24:46 +05:30
|
|
|
struct nlmsghdr *h;
|
|
|
|
int status;
|
|
|
|
char resp[1024];
|
|
|
|
|
|
|
|
status = write(rth->fd, buf, len);
|
|
|
|
if (status < 0)
|
|
|
|
return status;
|
|
|
|
|
|
|
|
/* Check for immediate errors */
|
|
|
|
status = recv(rth->fd, resp, sizeof(resp), MSG_DONTWAIT|MSG_PEEK);
|
|
|
|
if (status < 0) {
|
|
|
|
if (errno == EAGAIN) /* if no error, this happens */
|
|
|
|
return 0;
|
|
|
|
return -1;
|
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
|
2019-05-22 17:24:46 +05:30
|
|
|
for (h = (struct nlmsghdr *)resp;
|
|
|
|
NLMSG_OK(h, status);
|
|
|
|
h = NLMSG_NEXT(h, status)
|
|
|
|
) {
|
|
|
|
if (h->nlmsg_type == NLMSG_ERROR) {
|
|
|
|
struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
|
|
|
|
if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("ERROR truncated");
|
2019-05-22 17:24:46 +05:30
|
|
|
else
|
|
|
|
errno = -err->error;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
|
2019-05-22 17:24:46 +05:30
|
|
|
return 0;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
|
2008-06-29 11:52:40 +05:30
|
|
|
int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
2016-08-14 05:38:56 +05:30
|
|
|
struct {
|
|
|
|
struct nlmsghdr nlh;
|
|
|
|
struct msghdr msg;
|
|
|
|
struct sockaddr_nl nladdr;
|
|
|
|
} s;
|
|
|
|
struct iovec iov[2] = { { &s.nlh, sizeof(s.nlh) }, { req, len } };
|
|
|
|
|
|
|
|
memset(&s, 0, sizeof(s));
|
|
|
|
|
|
|
|
s.msg.msg_name = (void*)&s.nladdr;
|
|
|
|
s.msg.msg_namelen = sizeof(s.nladdr);
|
|
|
|
s.msg.msg_iov = iov;
|
|
|
|
s.msg.msg_iovlen = 2;
|
|
|
|
/*s.msg.msg_control = NULL; - already is */
|
|
|
|
/*s.msg.msg_controllen = 0; - already is */
|
|
|
|
/*s.msg.msg_flags = 0; - already is */
|
|
|
|
|
|
|
|
s.nladdr.nl_family = AF_NETLINK;
|
|
|
|
|
|
|
|
s.nlh.nlmsg_len = NLMSG_LENGTH(len);
|
|
|
|
s.nlh.nlmsg_type = type;
|
|
|
|
s.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
|
|
|
|
/*s.nlh.nlmsg_pid = 0; - already is */
|
|
|
|
s.nlh.nlmsg_seq = rth->dump = ++rth->seq;
|
|
|
|
|
|
|
|
return sendmsg(rth->fd, &s.msg, 0);
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
|
2007-04-12 17:04:39 +05:30
|
|
|
static int rtnl_dump_filter(struct rtnl_handle *rth,
|
2009-06-05 15:36:05 +05:30
|
|
|
int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *n, void *) FAST_FUNC,
|
2007-04-12 17:04:39 +05:30
|
|
|
void *arg1/*,
|
2006-11-21 21:06:08 +05:30
|
|
|
int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
|
2007-04-12 17:04:39 +05:30
|
|
|
void *arg2*/)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
2007-12-02 12:00:57 +05:30
|
|
|
int retval = -1;
|
|
|
|
char *buf = xmalloc(8*1024); /* avoid big stack buffer */
|
2002-11-10 07:03:55 +05:30
|
|
|
struct sockaddr_nl nladdr;
|
2007-12-02 12:00:57 +05:30
|
|
|
struct iovec iov = { buf, 8*1024 };
|
2002-11-10 07:03:55 +05:30
|
|
|
|
|
|
|
while (1) {
|
|
|
|
int status;
|
|
|
|
struct nlmsghdr *h;
|
2016-04-24 21:09:02 +05:30
|
|
|
/* Use designated initializers, struct layout is non-portable */
|
2002-11-10 07:03:55 +05:30
|
|
|
struct msghdr msg = {
|
2016-04-24 21:09:02 +05:30
|
|
|
.msg_name = (void*)&nladdr,
|
|
|
|
.msg_namelen = sizeof(nladdr),
|
|
|
|
.msg_iov = &iov,
|
|
|
|
.msg_iovlen = 1,
|
|
|
|
.msg_control = NULL,
|
|
|
|
.msg_controllen = 0,
|
|
|
|
.msg_flags = 0
|
2002-11-10 07:03:55 +05:30
|
|
|
};
|
|
|
|
|
|
|
|
status = recvmsg(rth->fd, &msg, 0);
|
|
|
|
|
|
|
|
if (status < 0) {
|
|
|
|
if (errno == EINTR)
|
|
|
|
continue;
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("OVERRUN");
|
2002-11-10 07:03:55 +05:30
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (status == 0) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("EOF on netlink");
|
2007-12-02 12:00:57 +05:30
|
|
|
goto ret;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
if (msg.msg_namelen != sizeof(nladdr)) {
|
2003-03-19 14:43:01 +05:30
|
|
|
bb_error_msg_and_die("sender address length == %d", msg.msg_namelen);
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
h = (struct nlmsghdr*)buf;
|
|
|
|
while (NLMSG_OK(h, status)) {
|
|
|
|
int err;
|
|
|
|
|
2004-05-05 12:35:32 +05:30
|
|
|
if (nladdr.nl_pid != 0 ||
|
|
|
|
h->nlmsg_pid != rth->local.nl_pid ||
|
2010-01-28 06:54:24 +05:30
|
|
|
h->nlmsg_seq != rth->dump
|
|
|
|
) {
|
2007-12-02 12:00:57 +05:30
|
|
|
// if (junk) {
|
|
|
|
// err = junk(&nladdr, h, arg2);
|
|
|
|
// if (err < 0) {
|
|
|
|
// retval = err;
|
|
|
|
// goto ret;
|
|
|
|
// }
|
|
|
|
// }
|
2002-11-10 07:03:55 +05:30
|
|
|
goto skip_it;
|
|
|
|
}
|
|
|
|
|
2002-11-28 18:05:46 +05:30
|
|
|
if (h->nlmsg_type == NLMSG_DONE) {
|
2007-12-02 12:00:57 +05:30
|
|
|
goto ret_0;
|
2002-11-28 18:05:46 +05:30
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
if (h->nlmsg_type == NLMSG_ERROR) {
|
2002-11-28 18:05:46 +05:30
|
|
|
struct nlmsgerr *l_err = (struct nlmsgerr*)NLMSG_DATA(h);
|
2002-11-10 07:03:55 +05:30
|
|
|
if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("ERROR truncated");
|
2002-11-10 07:03:55 +05:30
|
|
|
} else {
|
2002-11-28 18:05:46 +05:30
|
|
|
errno = -l_err->error;
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("RTNETLINK answers");
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
2007-12-02 12:00:57 +05:30
|
|
|
goto ret;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
err = filter(&nladdr, h, arg1);
|
2007-12-02 12:00:57 +05:30
|
|
|
if (err < 0) {
|
|
|
|
retval = err;
|
|
|
|
goto ret;
|
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
|
2007-12-02 12:00:57 +05:30
|
|
|
skip_it:
|
2002-11-10 07:03:55 +05:30
|
|
|
h = NLMSG_NEXT(h, status);
|
|
|
|
}
|
|
|
|
if (msg.msg_flags & MSG_TRUNC) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("message truncated");
|
2002-11-10 07:03:55 +05:30
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (status) {
|
2006-10-27 14:32:31 +05:30
|
|
|
bb_error_msg_and_die("remnant of size %d!", status);
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
2007-12-02 12:00:57 +05:30
|
|
|
} /* while (1) */
|
|
|
|
ret_0:
|
|
|
|
retval++; /* = 0 */
|
|
|
|
ret:
|
|
|
|
free(buf);
|
|
|
|
return retval;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
|
2008-06-29 11:52:40 +05:30
|
|
|
int FAST_FUNC xrtnl_dump_filter(struct rtnl_handle *rth,
|
2009-06-05 15:36:05 +05:30
|
|
|
int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *, void *) FAST_FUNC,
|
2007-04-12 17:04:39 +05:30
|
|
|
void *arg1)
|
|
|
|
{
|
|
|
|
int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/);
|
|
|
|
if (ret < 0)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("dump terminated");
|
2007-04-12 17:04:39 +05:30
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-06-29 11:52:40 +05:30
|
|
|
int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
|
2009-06-05 15:36:05 +05:30
|
|
|
pid_t peer, unsigned groups,
|
|
|
|
struct nlmsghdr *answer,
|
|
|
|
int (*junk)(struct sockaddr_nl *, struct nlmsghdr *, void *),
|
|
|
|
void *jarg)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
2007-12-02 12:00:57 +05:30
|
|
|
/* bbox doesn't use parameters no. 3, 4, 6, 7, they are stubbed out */
|
|
|
|
#define peer 0
|
|
|
|
#define groups 0
|
|
|
|
#define junk NULL
|
|
|
|
#define jarg NULL
|
|
|
|
int retval = -1;
|
2002-11-10 07:03:55 +05:30
|
|
|
int status;
|
|
|
|
unsigned seq;
|
|
|
|
struct nlmsghdr *h;
|
|
|
|
struct sockaddr_nl nladdr;
|
|
|
|
struct iovec iov = { (void*)n, n->nlmsg_len };
|
2007-12-02 12:00:57 +05:30
|
|
|
char *buf = xmalloc(8*1024); /* avoid big stack buffer */
|
2016-04-24 21:09:02 +05:30
|
|
|
/* Use designated initializers, struct layout is non-portable */
|
2002-11-10 07:03:55 +05:30
|
|
|
struct msghdr msg = {
|
2016-04-24 21:09:02 +05:30
|
|
|
.msg_name = (void*)&nladdr,
|
|
|
|
.msg_namelen = sizeof(nladdr),
|
|
|
|
.msg_iov = &iov,
|
|
|
|
.msg_iovlen = 1,
|
|
|
|
.msg_control = NULL,
|
|
|
|
.msg_controllen = 0,
|
|
|
|
.msg_flags = 0
|
2002-11-10 07:03:55 +05:30
|
|
|
};
|
|
|
|
|
|
|
|
memset(&nladdr, 0, sizeof(nladdr));
|
|
|
|
nladdr.nl_family = AF_NETLINK;
|
2007-12-02 12:00:57 +05:30
|
|
|
// nladdr.nl_pid = peer;
|
|
|
|
// nladdr.nl_groups = groups;
|
2002-11-10 07:03:55 +05:30
|
|
|
|
|
|
|
n->nlmsg_seq = seq = ++rtnl->seq;
|
2002-11-28 18:05:46 +05:30
|
|
|
if (answer == NULL) {
|
2002-11-10 07:03:55 +05:30
|
|
|
n->nlmsg_flags |= NLM_F_ACK;
|
2002-11-28 18:05:46 +05:30
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
status = sendmsg(rtnl->fd, &msg, 0);
|
|
|
|
|
|
|
|
if (status < 0) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("can't talk to rtnetlink");
|
2007-12-02 12:00:57 +05:30
|
|
|
goto ret;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
iov.iov_base = buf;
|
|
|
|
|
|
|
|
while (1) {
|
2007-12-02 12:00:57 +05:30
|
|
|
iov.iov_len = 8*1024;
|
2002-11-10 07:03:55 +05:30
|
|
|
status = recvmsg(rtnl->fd, &msg, 0);
|
|
|
|
|
|
|
|
if (status < 0) {
|
2002-11-28 18:05:46 +05:30
|
|
|
if (errno == EINTR) {
|
2002-11-10 07:03:55 +05:30
|
|
|
continue;
|
2002-11-28 18:05:46 +05:30
|
|
|
}
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("OVERRUN");
|
2002-11-10 07:03:55 +05:30
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (status == 0) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("EOF on netlink");
|
2007-12-02 12:00:57 +05:30
|
|
|
goto ret;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
if (msg.msg_namelen != sizeof(nladdr)) {
|
2003-03-19 14:43:01 +05:30
|
|
|
bb_error_msg_and_die("sender address length == %d", msg.msg_namelen);
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
2008-05-16 03:00:45 +05:30
|
|
|
for (h = (struct nlmsghdr*)buf; status >= (int)sizeof(*h); ) {
|
2007-12-02 12:00:57 +05:30
|
|
|
// int l_err;
|
2002-11-10 07:03:55 +05:30
|
|
|
int len = h->nlmsg_len;
|
|
|
|
int l = len - sizeof(*h);
|
|
|
|
|
2007-12-02 12:00:57 +05:30
|
|
|
if (l < 0 || len > status) {
|
2002-11-10 07:03:55 +05:30
|
|
|
if (msg.msg_flags & MSG_TRUNC) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("truncated message");
|
2007-12-02 12:00:57 +05:30
|
|
|
goto ret;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
2006-10-27 14:32:31 +05:30
|
|
|
bb_error_msg_and_die("malformed message: len=%d!", len);
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
|
2004-05-05 12:35:32 +05:30
|
|
|
if (nladdr.nl_pid != peer ||
|
|
|
|
h->nlmsg_pid != rtnl->local.nl_pid ||
|
2010-01-28 06:54:24 +05:30
|
|
|
h->nlmsg_seq != seq
|
|
|
|
) {
|
2007-12-02 12:00:57 +05:30
|
|
|
// if (junk) {
|
|
|
|
// l_err = junk(&nladdr, h, jarg);
|
|
|
|
// if (l_err < 0) {
|
|
|
|
// retval = l_err;
|
|
|
|
// goto ret;
|
|
|
|
// }
|
|
|
|
// }
|
2002-11-10 07:03:55 +05:30
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h->nlmsg_type == NLMSG_ERROR) {
|
|
|
|
struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
|
2008-05-16 03:00:45 +05:30
|
|
|
if (l < (int)sizeof(struct nlmsgerr)) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("ERROR truncated");
|
2002-11-10 07:03:55 +05:30
|
|
|
} else {
|
2007-12-02 12:00:57 +05:30
|
|
|
errno = - err->error;
|
2002-11-10 07:03:55 +05:30
|
|
|
if (errno == 0) {
|
2002-11-28 18:05:46 +05:30
|
|
|
if (answer) {
|
2002-11-10 07:03:55 +05:30
|
|
|
memcpy(answer, h, h->nlmsg_len);
|
2002-11-28 18:05:46 +05:30
|
|
|
}
|
2007-12-02 12:00:57 +05:30
|
|
|
goto ret_0;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg("RTNETLINK answers");
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
2007-12-02 12:00:57 +05:30
|
|
|
goto ret;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
if (answer) {
|
|
|
|
memcpy(answer, h, h->nlmsg_len);
|
2007-12-02 12:00:57 +05:30
|
|
|
goto ret_0;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("unexpected reply!");
|
2002-11-10 07:03:55 +05:30
|
|
|
|
|
|
|
status -= NLMSG_ALIGN(len);
|
|
|
|
h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
|
|
|
|
}
|
|
|
|
if (msg.msg_flags & MSG_TRUNC) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg("message truncated");
|
2002-11-10 07:03:55 +05:30
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (status) {
|
2006-10-27 14:32:31 +05:30
|
|
|
bb_error_msg_and_die("remnant of size %d!", status);
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
2007-12-02 12:00:57 +05:30
|
|
|
} /* while (1) */
|
|
|
|
ret_0:
|
|
|
|
retval++; /* = 0 */
|
|
|
|
ret:
|
|
|
|
free(buf);
|
|
|
|
return retval;
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
|
|
|
|
2008-06-29 11:52:40 +05:30
|
|
|
int FAST_FUNC addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
|
|
|
int len = RTA_LENGTH(4);
|
|
|
|
struct rtattr *rta;
|
2010-07-23 05:01:24 +05:30
|
|
|
|
libnetlink: fix alignment of netlink messages
A padding to align a message should not only be added between
different attributes of a netlink message, but also at the end of the
message to pad it to the correct size.
Without this patch the following command does not work and returns an
error code:
ip link add type nlmon
Without this ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=45, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon"}, iov_len=45}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 45
return value: 2
The normal ip utile from iproute2 sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
With this patch ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-09-17 02:10:28 +05:30
|
|
|
if ((int)(NLMSG_ALIGN(n->nlmsg_len + len)) > maxlen) {
|
2002-11-10 07:03:55 +05:30
|
|
|
return -1;
|
2010-07-23 05:01:24 +05:30
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len));
|
|
|
|
rta->rta_type = type;
|
|
|
|
rta->rta_len = len;
|
2008-12-09 04:26:18 +05:30
|
|
|
move_to_unaligned32(RTA_DATA(rta), data);
|
libnetlink: fix alignment of netlink messages
A padding to align a message should not only be added between
different attributes of a netlink message, but also at the end of the
message to pad it to the correct size.
Without this patch the following command does not work and returns an
error code:
ip link add type nlmon
Without this ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=45, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon"}, iov_len=45}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 45
return value: 2
The normal ip utile from iproute2 sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
With this patch ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-09-17 02:10:28 +05:30
|
|
|
n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len + len);
|
2002-11-10 07:03:55 +05:30
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-06-29 11:52:40 +05:30
|
|
|
int FAST_FUNC addattr_l(struct nlmsghdr *n, int maxlen, int type, void *data, int alen)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
|
|
|
int len = RTA_LENGTH(alen);
|
|
|
|
struct rtattr *rta;
|
|
|
|
|
libnetlink: fix alignment of netlink messages
A padding to align a message should not only be added between
different attributes of a netlink message, but also at the end of the
message to pad it to the correct size.
Without this patch the following command does not work and returns an
error code:
ip link add type nlmon
Without this ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=45, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon"}, iov_len=45}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 45
return value: 2
The normal ip utile from iproute2 sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
With this patch ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-09-17 02:10:28 +05:30
|
|
|
if ((int)(NLMSG_ALIGN(n->nlmsg_len + len)) > maxlen) {
|
2002-11-10 07:03:55 +05:30
|
|
|
return -1;
|
2010-07-23 05:01:24 +05:30
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len));
|
|
|
|
rta->rta_type = type;
|
|
|
|
rta->rta_len = len;
|
|
|
|
memcpy(RTA_DATA(rta), data, alen);
|
libnetlink: fix alignment of netlink messages
A padding to align a message should not only be added between
different attributes of a netlink message, but also at the end of the
message to pad it to the correct size.
Without this patch the following command does not work and returns an
error code:
ip link add type nlmon
Without this ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=45, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon"}, iov_len=45}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 45
return value: 2
The normal ip utile from iproute2 sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
With this patch ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-09-17 02:10:28 +05:30
|
|
|
n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len + len);
|
2002-11-10 07:03:55 +05:30
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-06-29 11:52:40 +05:30
|
|
|
int FAST_FUNC rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
|
|
|
int len = RTA_LENGTH(4);
|
|
|
|
struct rtattr *subrta;
|
|
|
|
|
libnetlink: fix alignment of netlink messages
A padding to align a message should not only be added between
different attributes of a netlink message, but also at the end of the
message to pad it to the correct size.
Without this patch the following command does not work and returns an
error code:
ip link add type nlmon
Without this ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=45, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon"}, iov_len=45}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 45
return value: 2
The normal ip utile from iproute2 sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
With this patch ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-09-17 02:10:28 +05:30
|
|
|
if (RTA_ALIGN(rta->rta_len + len) > maxlen) {
|
2002-11-10 07:03:55 +05:30
|
|
|
return -1;
|
2002-11-28 18:05:46 +05:30
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len));
|
|
|
|
subrta->rta_type = type;
|
|
|
|
subrta->rta_len = len;
|
2008-12-09 04:26:18 +05:30
|
|
|
move_to_unaligned32(RTA_DATA(subrta), data);
|
libnetlink: fix alignment of netlink messages
A padding to align a message should not only be added between
different attributes of a netlink message, but also at the end of the
message to pad it to the correct size.
Without this patch the following command does not work and returns an
error code:
ip link add type nlmon
Without this ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=45, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon"}, iov_len=45}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 45
return value: 2
The normal ip utile from iproute2 sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
With this patch ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-09-17 02:10:28 +05:30
|
|
|
rta->rta_len = NLMSG_ALIGN(rta->rta_len + len);
|
2002-11-10 07:03:55 +05:30
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-06-29 11:52:40 +05:30
|
|
|
int FAST_FUNC rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, int alen)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
|
|
|
struct rtattr *subrta;
|
|
|
|
int len = RTA_LENGTH(alen);
|
|
|
|
|
libnetlink: fix alignment of netlink messages
A padding to align a message should not only be added between
different attributes of a netlink message, but also at the end of the
message to pad it to the correct size.
Without this patch the following command does not work and returns an
error code:
ip link add type nlmon
Without this ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=45, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon"}, iov_len=45}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 45
return value: 2
The normal ip utile from iproute2 sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
With this patch ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-09-17 02:10:28 +05:30
|
|
|
if (RTA_ALIGN(rta->rta_len + len) > maxlen) {
|
2002-11-10 07:03:55 +05:30
|
|
|
return -1;
|
2002-11-28 18:05:46 +05:30
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len));
|
|
|
|
subrta->rta_type = type;
|
|
|
|
subrta->rta_len = len;
|
|
|
|
memcpy(RTA_DATA(subrta), data, alen);
|
libnetlink: fix alignment of netlink messages
A padding to align a message should not only be added between
different attributes of a netlink message, but also at the end of the
message to pad it to the correct size.
Without this patch the following command does not work and returns an
error code:
ip link add type nlmon
Without this ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=45, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon"}, iov_len=45}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 45
return value: 2
The normal ip utile from iproute2 sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
With this patch ip from busybox sends this:
sendmsg(3, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000},
msg_namelen=12, msg_iov=[{iov_base={{len=48, ...},
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\20\0\22\0\t\0\1nlmon\0\0\0"}, iov_len=48}],
msg_iovlen=1, msg_controllen=0, msg_flags=0}, 0) = 48
return value: 0
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2016-09-17 02:10:28 +05:30
|
|
|
rta->rta_len = NLMSG_ALIGN(rta->rta_len + len);
|
2002-11-10 07:03:55 +05:30
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-07-23 05:01:24 +05:30
|
|
|
void FAST_FUNC parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
|
2002-11-10 07:03:55 +05:30
|
|
|
{
|
2018-02-08 13:12:37 +05:30
|
|
|
memset(tb, 0, (max + 1) * sizeof(tb[0]));
|
|
|
|
|
2002-11-10 07:03:55 +05:30
|
|
|
while (RTA_OK(rta, len)) {
|
2002-11-28 18:05:46 +05:30
|
|
|
if (rta->rta_type <= max) {
|
2002-11-10 07:03:55 +05:30
|
|
|
tb[rta->rta_type] = rta;
|
2002-11-28 18:05:46 +05:30
|
|
|
}
|
2011-02-23 05:50:44 +05:30
|
|
|
rta = RTA_NEXT(rta, len);
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|
2002-11-28 18:05:46 +05:30
|
|
|
if (len) {
|
2006-10-27 14:32:31 +05:30
|
|
|
bb_error_msg("deficit %d, rta_len=%d!", len, rta->rta_len);
|
2002-11-28 18:05:46 +05:30
|
|
|
}
|
2002-11-10 07:03:55 +05:30
|
|
|
}
|