From d8b75d1ad22b3bc6e07b9547599baf9adc0d7cf4 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Thu, 20 Dec 2012 10:54:19 -0800 Subject: [PATCH] bridge: distinguish permanent and temporary mdb entries This patch adds a flag to mdb entries so that we can distinguish permanent entries with temporary ones. Signed-off-by: Cong Wang --- bridge/mdb.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/bridge/mdb.c b/bridge/mdb.c index 121ce9c2e..6217c5ffa 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -28,7 +28,7 @@ int filter_index; static void usage(void) { - fprintf(stderr, "Usage: bridge mdb { add | del } dev DEV port PORT grp GROUP\n"); + fprintf(stderr, "Usage: bridge mdb { add | del } dev DEV port PORT grp GROUP [permanent | temp]\n"); fprintf(stderr, " bridge mdb {show} [ dev DEV ]\n"); exit(-1); } @@ -53,13 +53,15 @@ static void print_mdb_entry(FILE *f, int ifindex, struct br_mdb_entry *e) SPRINT_BUF(abuf); if (e->addr.proto == htons(ETH_P_IP)) - fprintf(f, "bridge %s port %s group %s\n", ll_index_to_name(ifindex), + fprintf(f, "bridge %s port %s group %s %s\n", ll_index_to_name(ifindex), ll_index_to_name(e->ifindex), - inet_ntop(AF_INET, &e->addr.u.ip4, abuf, sizeof(abuf))); + inet_ntop(AF_INET, &e->addr.u.ip4, abuf, sizeof(abuf)), + (e->state & MDB_PERMANENT) ? "permanent" : "temp"); else - fprintf(f, "bridge %s port %s group %s\n", ll_index_to_name(ifindex), + fprintf(f, "bridge %s port %s group %s %s\n", ll_index_to_name(ifindex), ll_index_to_name(e->ifindex), - inet_ntop(AF_INET6, &e->addr.u.ip6, abuf, sizeof(abuf))); + inet_ntop(AF_INET6, &e->addr.u.ip6, abuf, sizeof(abuf)), + (e->state & MDB_PERMANENT) ? "permanent" : "temp"); } static void br_print_mdb_entry(FILE *f, int ifindex, struct rtattr *attr) @@ -179,11 +181,15 @@ static int mdb_modify(int cmd, int flags, int argc, char **argv) } else if (strcmp(*argv, "grp") == 0) { NEXT_ARG(); grp = *argv; + } else if (strcmp(*argv, "port") == 0) { + NEXT_ARG(); + p = *argv; + } else if (strcmp(*argv, "permanent") == 0) { + if (cmd == RTM_NEWMDB) + entry.state |= MDB_PERMANENT; + } else if (strcmp(*argv, "temp") == 0) { + ;/* nothing */ } else { - if (strcmp(*argv, "port") == 0) { - NEXT_ARG(); - p = *argv; - } if (matches(*argv, "help") == 0) usage(); } -- 2.47.2