On Thu, Jul 06, 2017 at 09:57:32AM +0800, JingPiao Chen wrote: > * tests/nlattr_packet_diag_msg.c: New file. > * tests/gen_tests.in (nlattr_packet_diag_msg): New entry. > * tests/pure_executables.list: Add nlattr_packet_diag_msg. > * tests/.gitignore: Likewise. > --- > tests/.gitignore | 1 + > tests/gen_tests.in | 1 + > tests/nlattr_packet_diag_msg.c | 176 > +++++++++++++++++++++++++++++++++++++++++ > tests/pure_executables.list | 1 + > 4 files changed, 179 insertions(+) > create mode 100644 tests/nlattr_packet_diag_msg.c > > diff --git a/tests/.gitignore b/tests/.gitignore > index 62de90b..671c180 100644 > --- a/tests/.gitignore > +++ b/tests/.gitignore > @@ -212,6 +212,7 @@ newfstatat > nlattr > nlattr_inet_diag_msg > nlattr_netlink_diag_msg > +nlattr_packet_diag_msg > nlattr_unix_diag_msg > nsyscalls > old_mmap > diff --git a/tests/gen_tests.in b/tests/gen_tests.in > index 57fd5fd..2ef9cdf 100644 > --- a/tests/gen_tests.in > +++ b/tests/gen_tests.in > @@ -195,6 +195,7 @@ newfstatat -a32 -v -P stat.sample -P /dev/full > nlattr +netlink_sock_diag.test > nlattr_inet_diag_msg +netlink_sock_diag.test > nlattr_netlink_diag_msg +netlink_sock_diag.test > +nlattr_packet_diag_msg +netlink_sock_diag.test > nlattr_unix_diag_msg +netlink_sock_diag.test > old_mmap -a11 -e trace=mmap > oldfstat -a18 -v -P stat.sample > diff --git a/tests/nlattr_packet_diag_msg.c b/tests/nlattr_packet_diag_msg.c > new file mode 100644 > index 0000000..08ad7ef > --- /dev/null > +++ b/tests/nlattr_packet_diag_msg.c > @@ -0,0 +1,176 @@ > +/* > + * Copyright (c) 2017 JingPiao Chen <[email protected]> > + * 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. > + */ > + > +#include "tests.h" > + > +#include <stdio.h> > +#include <string.h> > +#include <stdint.h> > +#include <net/if.h> > +#include "test_nlattr.h" > +#include <sys/socket.h> > +#ifdef HAVE_LINUX_FILTER_H > +# include <linux/filter.h> > +#endif > +#include <linux/packet_diag.h> > +#include <linux/rtnetlink.h> > +#include <linux/sock_diag.h> > + > +#ifdef HAVE_IF_INDEXTONAME > +# define IFINDEX_LO (if_nametoindex("lo")) > +#else > +# define IFINDEX_LO 1 > +#endif > + > +static void > +init_packet_diag_msg(struct nlmsghdr *nlh, unsigned int msg_len) > +{ > + struct packet_diag_msg *msg; > + > + SET_STRUCT(struct nlmsghdr, nlh, > + .nlmsg_len = msg_len, > + .nlmsg_type = SOCK_DIAG_BY_FAMILY, > + .nlmsg_flags = NLM_F_DUMP > + ); > + > + msg = NLMSG_DATA(nlh);
Why not "struct packet_diag_msg *msg = NLMSG_DATA(nlh);" ?
> + *msg = (struct packet_diag_msg) {
> + .pdiag_family = AF_PACKET,
> + .pdiag_type = SOCK_STREAM
> + };
> +}
> +
> +static void
> +print_packet_diag_msg(const unsigned int msg_len)
> +{
> + printf("{len=%u, type=SOCK_DIAG_BY_FAMILY"
> + ", flags=NLM_F_DUMP, seq=0, pid=0}"
> + ", {pdiag_family=AF_PACKET"
> + ", pdiag_type=SOCK_STREAM, pdiag_num=0"
> + ", pdiag_ino=0, pdiag_cookie=[0, 0]}",
> + msg_len);
> +}
> +
> +static void
> +print_packet_diag_mclist(const struct packet_diag_mclist *dml)
> +{
> + printf("{pdmc_index=if_nametoindex(\"lo\")");
> + PRINT_FIELD_U(", ", *dml, pdmc_count);
> + PRINT_FIELD_U(", ", *dml, pdmc_type);
> + PRINT_FIELD_U(", ", *dml, pdmc_alen);
> + printf(", pdmc_addr=");
> + print_quoted_string((char *) dml->pdmc_addr);
> + printf("}");
> +}
> +
> +int
> +main(void)
> +{
> + skip_if_unavailable("/proc/self/fd/");
> +
> + int fd = create_nl_socket(NETLINK_SOCK_DIAG);
> + const int hdrlen = sizeof(struct packet_diag_msg);
Please change the type of hdrlen to unsigned int.
> + void *const nlh0 = tail_alloc(NLMSG_SPACE(hdrlen));
> +
> + static char pattern[4096];
> + fill_memory_ex(pattern, sizeof(pattern), 'a', 'z' - 'a' + 1);
> +
> + static const struct packet_diag_info pinfo = {
> + .pdi_index = 0xabcddafa,
> + .pdi_version = 0xbabcdafb,
> + .pdi_reserve = 0xcfaacdaf,
> + .pdi_copy_thresh = 0xdabacdaf,
> + .pdi_tstamp = 0xeafbaadf,
> + .pdi_flags = PDI_RUNNING
> + };
> + TEST_NLATTR_OBJECT(fd, nlh0, hdrlen,
> + init_packet_diag_msg, print_packet_diag_msg,
> + PACKET_DIAG_INFO, pattern, pinfo,
> + PRINT_FIELD_U("{", pinfo, pdi_index);
> + PRINT_FIELD_U(", ", pinfo, pdi_version);
> + PRINT_FIELD_U(", ", pinfo, pdi_reserve);
> + PRINT_FIELD_U(", ", pinfo, pdi_copy_thresh);
> + PRINT_FIELD_U(", ", pinfo, pdi_tstamp);
> + printf(", pdi_flags=PDI_RUNNING}"));
> +
> + const struct packet_diag_mclist dml[] = {
> + {
> + .pdmc_index = IFINDEX_LO,
> + .pdmc_count = 0xabcdaefc,
> + .pdmc_type = 0xcdaf,
> + .pdmc_alen = 4,
> + .pdmc_addr = "1234"
> + },
> + {
> + .pdmc_index = IFINDEX_LO,
> + .pdmc_count = 0xdaefeafc,
> + .pdmc_type = 0xadef,
> + .pdmc_alen = 4,
> + .pdmc_addr = "5678"
> + }
> + };
> + TEST_NLATTR_ARRAY(fd, nlh0, hdrlen,
> + init_packet_diag_msg, print_packet_diag_msg,
> + PACKET_DIAG_MCLIST, pattern, dml,
> + print_packet_diag_mclist);
> +
> + static const struct packet_diag_ring pdr = {
> + .pdr_block_size = 0xabcdafed,
> + .pdr_block_nr = 0xbcadefae,
> + .pdr_frame_size = 0xcabdfeac,
> + .pdr_frame_nr = 0xdeaeadef,
> + .pdr_retire_tmo = 0xedbafeac,
> + .pdr_sizeof_priv = 0xfeadeacd,
> + .pdr_features = 0xadebadea
> + };
> + TEST_NLATTR_OBJECT(fd, nlh0, hdrlen,
> + init_packet_diag_msg, print_packet_diag_msg,
> + PACKET_DIAG_RX_RING, pattern, pdr,
> + PRINT_FIELD_U("{", pdr, pdr_block_size);
> + PRINT_FIELD_U(", ", pdr, pdr_block_nr);
> + PRINT_FIELD_U(", ", pdr, pdr_frame_size);
> + PRINT_FIELD_U(", ", pdr, pdr_frame_nr);
> + PRINT_FIELD_U(", ", pdr, pdr_retire_tmo);
> + PRINT_FIELD_U(", ", pdr, pdr_sizeof_priv);
> + PRINT_FIELD_U(", ", pdr, pdr_features);
> + printf("}"));
> +
> +#ifdef HAVE_LINUX_FILTER_H
> + static const struct sock_filter filter[] = {
> + BPF_JUMP(BPF_JMP|BPF_K|BPF_JEQ, 1, 0, 1)
> + };
> + TEST_NLATTR(fd, nlh0, hdrlen,
> + init_packet_diag_msg, print_packet_diag_msg,
> + PACKET_DIAG_FILTER, sizeof(filter),
> + filter, sizeof(filter),
> + printf("%p", RTA_DATA(NLATTR)));
> +#endif
Something is wrong here if the filter is printed as a pointer
instead of an array of bpf_filter structures.
--
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 [email protected] https://lists.sourceforge.net/lists/listinfo/strace-devel
