Hi Arturo,
On Wed, Feb 26, 2014 at 05:09:49PM +0100, Arturo Borrero Gonzalez wrote:
> Allow to print sets with or without format.
>
> This is useful in situations where we want to print more or less the same
> the user typed (IOW, in one single line, and with family/table info).
>
> While at it, make family2str() function public, so it can be used in
> other places.
>
> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@xxxxxxxxx>
> ---
> include/rule.h | 3 +++
> src/rule.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++---------
> 2 files changed, 55 insertions(+), 10 deletions(-)
>
> diff --git a/include/rule.h b/include/rule.h
> index e06444e..b263593 100644
> --- a/include/rule.h
> +++ b/include/rule.h
> @@ -125,6 +125,8 @@ extern void chain_add_hash(struct chain *chain, struct table *table);
> extern struct chain *chain_lookup(const struct table *table,
> const struct handle *h);
>
> +extern const char *family2str(unsigned int family);
> +
> /**
> * struct rule - nftables rule
> *
> @@ -193,6 +195,7 @@ extern void set_free(struct set *set);
> extern void set_add_hash(struct set *set, struct table *table);
> extern struct set *set_lookup(const struct table *table, const char *name);
> extern void set_print(const struct set *set);
> +extern void set_print_plain(const struct set *s);
>
> /**
> * enum cmd_ops - command operations
> diff --git a/src/rule.c b/src/rule.c
> index ab96e62..c774664 100644
> --- a/src/rule.c
> +++ b/src/rule.c
> @@ -90,21 +90,37 @@ struct set *set_lookup(const struct table *table, const char *name)
> return NULL;
> }
>
> -void set_print(const struct set *set)
> +struct print_fmt_options {
> + const char *tab;
> + const char *nl;
> + const char *table;
> + const char *family;
> + const char *stmt_separator;
> +};
> +
> +static void do_set_print(const struct set *set, struct print_fmt_options *opts)
> {
> const char *delim = "";
> const char *type;
>
> type = set->flags & SET_F_MAP ? "map" : "set";
> - printf("\t%s %s {\n", type, set->handle.set);
> + printf("%s%s", opts->tab, type);
> +
> + if (opts->family != NULL)
> + printf(" %s", opts->family);
> +
> + if (opts->table != NULL)
> + printf(" %s", opts->table);
> +
> + printf(" %s { %s", set->handle.set, opts->nl);
>
> - printf("\t\ttype %s", set->keytype->name);
> + printf("%s%stype %s", opts->tab, opts->tab, set->keytype->name);
> if (set->flags & SET_F_MAP)
> printf(" : %s", set->datatype->name);
> - printf("\n");
> + printf("%s", opts->stmt_separator);
>
> if (set->flags & (SET_F_CONSTANT | SET_F_INTERVAL)) {
> - printf("\t\tflags ");
> + printf("%s%sflags ", opts->tab, opts->tab);
> if (set->flags & SET_F_CONSTANT) {
> printf("%sconstant", delim);
> delim = ",";
> @@ -113,15 +129,41 @@ void set_print(const struct set *set)
> printf("%sinterval", delim);
> delim = ",";
> }
> - printf("\n");
> + printf("%s", opts->nl);
> }
>
> if (set->init != NULL && set->init->size > 0) {
> - printf("\t\telements = ");
> + printf("%s%selements = ", opts->tab, opts->tab);
> expr_print(set->init);
> - printf("\n");
> + printf("%s", opts->nl);
> }
> - printf("\t}\n");
> + printf("%s}%s", opts->tab, opts->nl);
> +}
> +
> +void set_print(const struct set *s)
> +{
> + struct print_fmt_options opts;
> +
> + opts.tab = "\t";
> + opts.nl = "\n";
> + opts.table = NULL;
> + opts.family = NULL;
> + opts.stmt_separator = "\n";
I think you can use C99 structure initialization:
struct print_fmt_options opts = {
.tabs = "\t",
.nl = "\n",
.stmt_separator = "\n",
};
Note that unspecified fields are already set to zero.
> +
> + do_set_print(s, &opts);
> +}
> +
> +void set_print_plain(const struct set *s)
> +{
> + struct print_fmt_options opts;
> +
> + opts.tab = "";
> + opts.nl = "";
> + opts.table = s->handle.table;
> + opts.family = family2str(s->handle.family);
> + opts.stmt_separator = ";";
Same thing here.
> + do_set_print(s, &opts);
> }
>
> struct rule *rule_alloc(const struct location *loc, const struct handle *h)
> @@ -279,7 +321,7 @@ struct chain *chain_lookup(const struct table *table, const struct handle *h)
> return NULL;
> }
>
> -static const char *family2str(unsigned int family)
> +const char *family2str(unsigned int family)
> {
> switch (family) {
> case NFPROTO_IPV4:
>
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
