On Wed, Jun 21, 2017 at 10:11:23PM +0800, JingPiao Chen wrote: > * netlink.h: New file. > * Makefile.am (strace_SOURCES): Add it. > * netlink_sock_diag.c: Include "netlink.h", > remove <sys/socket.h> and <linux/netlink.h>. > * netlink.c: Likewise. > (NLMSG_HDRLEN): Move to netlink.h.
Let's change the tests that use NLMSG_HDRLEN to include "netlink.h" instead of <linux/netlink.h>, too. These tests still have to include <sys/socket.h> because they use prototypes from that header. > --- > Makefile.am | 1 + > netlink.c | 6 +----- > netlink.h | 53 > +++++++++++++++++++++++++++++++++++++++++++++++++++++ > netlink_sock_diag.c | 3 +-- > 4 files changed, 56 insertions(+), 7 deletions(-) > create mode 100644 netlink.h > > diff --git a/Makefile.am b/Makefile.am > index f9e78ed..0d75970 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -173,6 +173,7 @@ strace_SOURCES = \ > native_defs.h \ > net.c \ > netlink.c \ > + netlink.h \ > netlink_sock_diag.c \ > nsfs.c \ > nsfs.h \ > diff --git a/netlink.c b/netlink.c > index 24ac1ec..87b389c 100644 > --- a/netlink.c > +++ b/netlink.c > @@ -28,9 +28,8 @@ > */ > > #include "defs.h" > -#include <sys/socket.h> > +#include "netlink.h" > #include <linux/audit.h> > -#include <linux/netlink.h> > #include <linux/rtnetlink.h> > #include <linux/xfrm.h> > #include "xlat/netlink_flags.h" > @@ -46,9 +45,6 @@ > #include "xlat/nl_sock_diag_types.h" > #include "xlat/nl_xfrm_types.h" > > -#undef NLMSG_HDRLEN > -#define NLMSG_HDRLEN NLMSG_ALIGN(sizeof(struct nlmsghdr)) > - > /* > * Fetch a struct nlmsghdr from the given address. > */ > diff --git a/netlink.h b/netlink.h > new file mode 100644 > index 0000000..fd77eaa > --- /dev/null > +++ b/netlink.h > @@ -0,0 +1,53 @@ > +/* > + * Copyright (c) 2017 JingPiao Chen <chenjingp...@gmail.com> > + * Copyright (c) 2017 The strace developers. > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 3. The name of the author may not be used to endorse or promote products > + * derived from this software without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR > + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES > + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. > + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, > + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT > + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, > + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF > + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > + */ > + > +#ifndef STRACE_NETLINK_H > +#define STRACE_NETLINK_H > + > +#include <sys/socket.h> > +#include <linux/netlink.h> > + > +#undef NLMSG_HDRLEN > +#define NLMSG_HDRLEN ((unsigned int) NLMSG_ALIGN(sizeof(struct nlmsghdr))) > + > +#define NLMSG_MIN_TYPE 0x10 No need to redefine NLMSG_MIN_TYPE if it's already defined. -- ldv
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________ Strace-devel mailing list Strace-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/strace-devel
