diff options
| author | Edward Liaw <edliaw@google.com> | 2024-02-29 06:49:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 06:49:08 +0000 |
| commit | 708c955922265042c9d52fe78447afd40bbbecb4 (patch) | |
| tree | 115fc470e0ca9adc43b6e899a59ce9efc2d50251 | |
| parent | 5120e62d51f045838f79b171798953d9f42bdc7e (diff) | |
| parent | 54cba336036ccf76b10ec42f9ba6d9868166392e (diff) | |
| download | ltp-708c955922265042c9d52fe78447afd40bbbecb4.tar.gz | |
nft02: Fix initializer element is not a compile-time constant am: 54cba33603
Original change: https://android-review.googlesource.com/c/platform/external/ltp/+/2983199
Change-Id: I28e601be8f18a435661040297b712920f2196954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | testcases/network/iptables/nft02.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/testcases/network/iptables/nft02.c b/testcases/network/iptables/nft02.c index 8b7248c69..20475fee4 100644 --- a/testcases/network/iptables/nft02.c +++ b/testcases/network/iptables/nft02.c @@ -42,27 +42,27 @@ static struct tst_netlink_context *ctx; /* Table creation config */ static const struct tst_netlink_attr_list table_config[] = { - {NFTA_TABLE_NAME, TABNAME, strlen(TABNAME) + 1, NULL}, + {NFTA_TABLE_NAME, TABNAME, sizeof(TABNAME), NULL}, {0, NULL, -1, NULL} }; /* Chain creation and deletion config */ static const struct tst_netlink_attr_list destchain_config[] = { - {NFTA_TABLE_NAME, TABNAME, strlen(TABNAME) + 1, NULL}, - {NFTA_CHAIN_NAME, DESTCHAIN, strlen(DESTCHAIN) + 1, NULL}, + {NFTA_TABLE_NAME, TABNAME, sizeof(TABNAME), NULL}, + {NFTA_CHAIN_NAME, DESTCHAIN, sizeof(DESTCHAIN), NULL}, {NFTA_CHAIN_ID, &chain_id, sizeof(chain_id), NULL}, {0, NULL, -1, NULL} }; static const struct tst_netlink_attr_list delchain_config[] = { - {NFTA_TABLE_NAME, TABNAME, strlen(TABNAME) + 1, NULL}, - {NFTA_CHAIN_NAME, DESTCHAIN, strlen(DESTCHAIN) + 1, NULL}, + {NFTA_TABLE_NAME, TABNAME, sizeof(TABNAME), NULL}, + {NFTA_CHAIN_NAME, DESTCHAIN, sizeof(DESTCHAIN), NULL}, {0, NULL, -1, NULL} }; static const struct tst_netlink_attr_list srcchain_config[] = { - {NFTA_TABLE_NAME, TABNAME, strlen(TABNAME) + 1, NULL}, - {NFTA_CHAIN_NAME, SRCCHAIN, strlen(SRCCHAIN) + 1, NULL}, + {NFTA_TABLE_NAME, TABNAME, sizeof(TABNAME), NULL}, + {NFTA_CHAIN_NAME, SRCCHAIN, sizeof(SRCCHAIN), NULL}, {0, NULL, -1, NULL} }; @@ -93,8 +93,8 @@ static const struct tst_netlink_attr_list rule_expr_config[] = { static const struct tst_netlink_attr_list rule_config[] = { {NFTA_RULE_EXPRESSIONS, NULL, 0, rule_expr_config}, - {NFTA_RULE_TABLE, TABNAME, strlen(TABNAME) + 1, NULL}, - {NFTA_RULE_CHAIN, SRCCHAIN, strlen(SRCCHAIN) + 1, NULL}, + {NFTA_RULE_TABLE, TABNAME, sizeof(TABNAME), NULL}, + {NFTA_RULE_CHAIN, SRCCHAIN, sizeof(SRCCHAIN), NULL}, {0, NULL, -1, NULL} }; |