diff options
| author | Ana Rey <anarey@gmail.com> | 2014-04-09 11:16:54 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-04-14 10:46:11 +0200 |
| commit | ba1eaf0b3df13cc45b963a4d2bedda89ea510c2c (patch) | |
| tree | d04e2595018418513ad097e2a163b2699a10990a /src/expr/immediate.c | |
| parent | 1a0abb3036452852757d13fe394c6c72dff877bd (diff) | |
xml, json: Delete an immediatedate label in xml and json file
It deletes the immediatedata label in the structure of json and xml file.
Example of the old structure of xmlfile:
<nftables>
<rule>
<family>ip</family>
<table>filter</table>
<chain>input</chain>
<handle>32</handle>
<expr type="immediate">
<dreg>0</dreg>
<immediatedata>
<data_reg type="verdict">
<verdict>accept</verdict>
</data_reg>
</immediatedata>
</expr>
</rule>
</nftables>
Example of the new structure of xmlfile:
<nftables>
<rule>
<family>ip</family>
<table>filter</table>
<chain>input</chain>
<handle>32</handle>
<expr type="immediate">
<dreg>0</dreg>
<data_reg type="verdict">
<verdict>accept</verdict>
</data_reg>
</expr>
</rule>
</nftables>
To generate the new testfiles, It use the option -u of nft-parsing-test
script.
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/immediate.c')
| -rw-r--r-- | src/expr/immediate.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/expr/immediate.c b/src/expr/immediate.c index b3c52b8..2ea4636 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -263,8 +263,7 @@ nft_rule_expr_immediate_snprintf_json(char *buf, size_t len, int size = len, offset = 0, ret; struct nft_expr_immediate *imm = nft_expr_data(e); - ret = snprintf(buf, len, "\"dreg\":%u," - "\"immediatedata\":{", imm->dreg); + ret = snprintf(buf, len, "\"dreg\":%u,", imm->dreg); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); @@ -284,9 +283,6 @@ nft_rule_expr_immediate_snprintf_json(char *buf, size_t len, SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - ret = snprintf(buf+offset, len, "}"); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - return offset; } @@ -297,8 +293,7 @@ nft_rule_expr_immediate_snprintf_xml(char *buf, size_t len, int size = len, offset = 0, ret; struct nft_expr_immediate *imm = nft_expr_data(e); - ret = snprintf(buf, len, "<dreg>%u</dreg>" - "<immediatedata>", imm->dreg); + ret = snprintf(buf, len, "<dreg>%u</dreg>", imm->dreg); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); @@ -318,9 +313,6 @@ nft_rule_expr_immediate_snprintf_xml(char *buf, size_t len, SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - ret = snprintf(buf+offset, len, "</immediatedata>"); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - return offset; } |