From patchwork Tue Sep 21 08:53:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duncan Roe X-Patchwork-Id: 1530645 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=GXpo/Kk7; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4HDFZb3sKXz9t0k for ; Tue, 21 Sep 2021 18:53:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231260AbhIUIyw (ORCPT ); Tue, 21 Sep 2021 04:54:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231329AbhIUIyu (ORCPT ); Tue, 21 Sep 2021 04:54:50 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0DD6C061574 for ; Tue, 21 Sep 2021 01:53:22 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id q23so16731764pfs.9 for ; Tue, 21 Sep 2021 01:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uZloTX8q005+BdSO1FSu9fm8H8yHlIBpcrr0CuLnnDU=; b=GXpo/Kk7NvtQEN732p391twu7sx5VomX7+gHfs2LBbKodDNyssXvOSd7Ya3U6+TeMG 17t0mbhvjMaXuPsbZFuT75tknfiqkcwmtzL+6udnRSYTtkVQmauE7LBXj6pOCKfwzH6z 7At+KxeC+Whrn8qubNjjCD0Q95tI0/dye1GP4uwHxD1/f7SpQYaXbtBl+Z7olzsHnR45 rO+/e+Cv0PwOs2MKiD9863cQIPNpujI5VfAxK3NDGTN4Rj7zZAd2ZsV9Mh4LzsRSfbcT zeEnCf4Ie+585rODYxsZhxYgTO/hveY2XBfV003WH5h1JAvTT+Aros3dmK32EwO4TXtH f+ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uZloTX8q005+BdSO1FSu9fm8H8yHlIBpcrr0CuLnnDU=; b=DpdF7hIiKRRtvPjoNRWTtIKv8uphv9bmhC8jtT6Mby2y+ySdkd/6UO5GfBZafJBQAg CsjkewNsORdiRGeklfHk9qEDa0l0yakL1LN9jt106KzYfpnNClNjybAm125qeaQK4Hey f+HI5Oa3hXaVFaVULxA7LDEnt3OnTXTveF86BJauNtamYsPfNKMHi71uacqO0C0UdzR7 Br6kw9PsZDZUHuamGzluoMElqbzohtuhhNN5xJzz0tII7UUjYp3pGIJ/XzrzN50qvZH6 VggZs0S8OkoNUQBFkxBFo41DCh7CVdpThjKf6DEmgvaYggfs2Mi0JyJGOuqm6H9N9PuV SVPg== X-Gm-Message-State: AOAM530oSCtWK1OJIKc2C9sZOlTfrIZ0ugQjT5eP5yZWsO5ifEaCy3FZ jlsAGMbmnq5pp6gilbBvn5M= X-Google-Smtp-Source: ABdhPJw5ggEngQJTeYw97zoK1lcbO8iC2oXS0RjqUGsvdvnWstB4GA1+63tEpt346Xri1TWHB8w5gA== X-Received: by 2002:a63:ec45:: with SMTP id r5mr27505113pgj.440.1632214402511; Tue, 21 Sep 2021 01:53:22 -0700 (PDT) Received: from slk1.local.net (n49-192-82-34.sun3.vic.optusnet.com.au. [49.192.82.34]) by smtp.gmail.com with ESMTPSA id w18sm4612202pff.39.2021.09.21.01.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 01:53:22 -0700 (PDT) Sender: Duncan Roe From: Duncan Roe To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH libnetfilter_log 1/2] utils: nfulnl_test: Agree with man pages Date: Tue, 21 Sep 2021 18:53:14 +1000 Message-Id: <20210921085315.4340-2-duncan_roe@optusnet.com.au> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210921085315.4340-1-duncan_roe@optusnet.com.au> References: <20210921085315.4340-1-duncan_roe@optusnet.com.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Use the same variable name as the man pages / html for functions in the Parsing module (e.g. nflog_get_msg_packet_hdr(nfad)). Rationale: make it easier for users to follow the code Signed-off-by: Duncan Roe --- utils/nfulnl_test.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/nfulnl_test.c b/utils/nfulnl_test.c index 05ddc6c..237adc3 100644 --- a/utils/nfulnl_test.c +++ b/utils/nfulnl_test.c @@ -6,15 +6,15 @@ #include -static int print_pkt(struct nflog_data *ldata) +static int print_pkt(struct nflog_data *nfad) { - struct nfulnl_msg_packet_hdr *ph = nflog_get_msg_packet_hdr(ldata); - uint32_t mark = nflog_get_nfmark(ldata); - uint32_t indev = nflog_get_indev(ldata); - uint32_t outdev = nflog_get_outdev(ldata); - char *prefix = nflog_get_prefix(ldata); + struct nfulnl_msg_packet_hdr *ph = nflog_get_msg_packet_hdr(nfad); + uint32_t mark = nflog_get_nfmark(nfad); + uint32_t indev = nflog_get_indev(nfad); + uint32_t outdev = nflog_get_outdev(nfad); + char *prefix = nflog_get_prefix(nfad); char *payload; - int payload_len = nflog_get_payload(ldata, &payload); + int payload_len = nflog_get_payload(nfad, &payload); if (ph) { printf("hw_protocol=0x%04x hook=%u ", From patchwork Tue Sep 21 08:53:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duncan Roe X-Patchwork-Id: 1530646 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=pQ7f1q3b; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4HDFZc0cc2z9t10 for ; Tue, 21 Sep 2021 18:53:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231368AbhIUIyy (ORCPT ); Tue, 21 Sep 2021 04:54:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231329AbhIUIyx (ORCPT ); Tue, 21 Sep 2021 04:54:53 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E3D5C061574 for ; Tue, 21 Sep 2021 01:53:25 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id w14so8317092pfu.2 for ; Tue, 21 Sep 2021 01:53:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lSPDAcgKD6GbH+UvQXfcbgrv+Nf31voZWYX3naAQWbU=; b=pQ7f1q3bL/WCvPnS92jf4uVnEDR5r6N8/VY6rxW5oYqY5Kck2TxhQrx/ykynntoG8u Hm1sVDh02NklWmQAOwrLu0DhJ0qfZGxI9t10zNyiqKFBt8oiJ1zbVT77f3hcKmRJl8WN x96mdlAGx1FcqhA3cfnQPNfO8ivEldez/T/htGwlgGCHzKAZ0Njf4Kj80bbAs+6UYaNs Az8C8Zc5qbKIPLShmQ7hEDxuxXT7s+VxyhIezqOTc287eK4zt8Y6n5fUqwF4jkn68jLu PHG2CHjaCnbn/LGNlhcCOlX8qog5bqR5zwJhWWGDkoQDLI++EJ0X6CDBzVVzzEQ9k1ET S1uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lSPDAcgKD6GbH+UvQXfcbgrv+Nf31voZWYX3naAQWbU=; b=4bvmJpfeM723aedeNNyYeVapyP8M24c3g0YxImoYRmrNWKNnRfZBIjQ0+GcPyY+aBN aLz77ruoQTqIDLXyxtqSm2lCxoa+Eh3ZuHyEHFPBJ4h6fn3uBh8XUPwQeJYitxchet/Y Wsd/SvTbUDJJ5RRFSf1584FOUK2ew2U4uha9AkoLl1YLXffgpAq0ZciVtcrACvuxTZb4 i1lH5ytlK9LOAwSk77mk6tsq6LCEtXgpw+TAA1u/3icgkMfH0VP88iaHCUKH8uKAv30Y LgTRezNyNYkP4NH1p0aAWwQXtyy88LSq/oP6xsmZHWsRSM7/D5vQgSAbmNWeI+WHIM9a ZdGg== X-Gm-Message-State: AOAM532hZ0/g55myOZP6m97h+oWhSEO/LDftaje6bHdrEWFmFvZvaxTz vnNdKmD18b0aPmuZPDWbLR4t2OtM5VU= X-Google-Smtp-Source: ABdhPJzbWljimMXH09NJ1xt1TDDQt1ky2nZ4l84t+Jj5b1ePvJQ7Qb4eGdRHzCKmAbbJ8J+A5gs0Ig== X-Received: by 2002:a63:8c4d:: with SMTP id q13mr27280061pgn.92.1632214404629; Tue, 21 Sep 2021 01:53:24 -0700 (PDT) Received: from slk1.local.net (n49-192-82-34.sun3.vic.optusnet.com.au. [49.192.82.34]) by smtp.gmail.com with ESMTPSA id w18sm4612202pff.39.2021.09.21.01.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 01:53:24 -0700 (PDT) Sender: Duncan Roe From: Duncan Roe To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH libnetfilter_log 2/2] utils: nfulnl_test: Add rather extensive test of nflog_get_packet_hw() Date: Tue, 21 Sep 2021 18:53:15 +1000 Message-Id: <20210921085315.4340-3-duncan_roe@optusnet.com.au> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210921085315.4340-1-duncan_roe@optusnet.com.au> References: <20210921085315.4340-1-duncan_roe@optusnet.com.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Wasn't expecting length in NBO, so code caters for it being either way Signed-off-by: Duncan Roe --- utils/nfulnl_test.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/utils/nfulnl_test.c b/utils/nfulnl_test.c index 237adc3..a07c100 100644 --- a/utils/nfulnl_test.c +++ b/utils/nfulnl_test.c @@ -15,6 +15,31 @@ static int print_pkt(struct nflog_data *nfad) char *prefix = nflog_get_prefix(nfad); char *payload; int payload_len = nflog_get_payload(nfad, &payload); + struct nfulnl_msg_packet_hw *hw = nflog_get_packet_hw(nfad); + + if (!hw) + puts("No struct nfulnl_msg_packet_hw returned"); + else { + char *p = ""; + int i; + + if (hw->hw_addrlen > sizeof hw->hw_addr) { + i = htons(hw->hw_addrlen); + if (i <= sizeof hw->hw_addr) { + hw->hw_addrlen = i; + p = " (after htons)"; + } + } + printf("hw_addrlen = %d%s\n", hw->hw_addrlen, p); + if (i && i <= sizeof hw->hw_addr) { + uint8_t *u = hw->hw_addr; + + fputs("HW addr: ", stdout); + for (i--; i >=0; i--, u++) + printf("%02x%s", *u, i ? ":" : ""); + puts(""); + } + } if (ph) { printf("hw_protocol=0x%04x hook=%u ",