@@ -245,22 +245,12 @@ static int nft_rule_expr_match_snprintf_xml(char *buf, size_t len,
struct nft_expr_match *mt)
{
int ret, size=len;
- int i;
int offset = 0;
- uint8_t *data = (uint8_t *)mt->data;
- ret = snprintf(buf, len, "<name>%s</name><rev>%u</rev><info>0x",
+ ret = snprintf(buf, len, "<name>%s</name><rev>%u</rev>",
mt->name, mt->rev);
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- for (i=0; i < mt->data_len; i++) {
- ret = snprintf(buf+offset, len, "%x", data[i] & 0xff);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- }
-
- ret = snprintf(buf+offset, len, "</info>");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
-
return offset;
}
@@ -249,22 +249,12 @@ int nft_rule_exp_target_snprintf_xml(char *buf, size_t len,
struct nft_expr_target *tg)
{
int ret, size=len;
- int i;
int offset = 0;
- uint8_t *data = (uint8_t *)tg->data;
- ret = snprintf(buf, len, "<name>%s</name><rev>%u</rev><info>0x",
+ ret = snprintf(buf, len, "<name>%s</name><rev>%u</rev>",
tg->name, tg->rev);
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- for (i=0; i < tg->data_len; i++) {
- ret = snprintf(buf+offset, len, "%x", data[i] & 0xff);
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- }
-
- ret = snprintf(buf+offset, len, "</info>");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
-
return offset;
}
As is not supported in parsing, don't print at all target&match <info> attribute. However, I think this could be easily supported, with the drawback of having a XML file full of binary data. Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> --- src/expr/match.c | 12 +----------- src/expr/target.c | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html