1 files changed, 191 insertions, 213 deletions

diff --git a/lib/if_rmap.c b/lib/if_rmap.c
index 2afb08c7ca..1ce2a43c59 100644
--- a/lib/if_rmap.c
+++ b/lib/if_rmap.c
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with GNU Zebra; see the file COPYING.  If not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * 02111-1307, USA.
  */
 
 #include <zebra.h>
@@ -27,186 +27,172 @@
 #include "if.h"
 #include "if_rmap.h"
 
-DEFINE_MTYPE_STATIC(LIB, IF_RMAP,      "Interface route map")
+DEFINE_MTYPE_STATIC(LIB, IF_RMAP, "Interface route map")
 DEFINE_MTYPE_STATIC(LIB, IF_RMAP_NAME, "I.f. route map name")
 
 struct hash *ifrmaphash;
 
 /* Hook functions. */
-static void (*if_rmap_add_hook) (struct if_rmap *) = NULL;
-static void (*if_rmap_delete_hook) (struct if_rmap *) = NULL;
+static void (*if_rmap_add_hook)(struct if_rmap *) = NULL;
+static void (*if_rmap_delete_hook)(struct if_rmap *) = NULL;
 
-static struct if_rmap *
-if_rmap_new (void)
+static struct if_rmap *if_rmap_new(void)
 {
-  struct if_rmap *new;
+	struct if_rmap *new;
 
-  new = XCALLOC (MTYPE_IF_RMAP, sizeof (struct if_rmap));
+	new = XCALLOC(MTYPE_IF_RMAP, sizeof(struct if_rmap));
 
-  return new;
+	return new;
 }
 
-static void
-if_rmap_free (struct if_rmap *if_rmap)
+static void if_rmap_free(struct if_rmap *if_rmap)
 {
-  if (if_rmap->ifname)
-    XFREE (MTYPE_IF_RMAP_NAME, if_rmap->ifname);
+	if (if_rmap->ifname)
+		XFREE(MTYPE_IF_RMAP_NAME, if_rmap->ifname);
 
-  if (if_rmap->routemap[IF_RMAP_IN])
-    XFREE (MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_IN]);
-  if (if_rmap->routemap[IF_RMAP_OUT])
-    XFREE (MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_OUT]);
+	if (if_rmap->routemap[IF_RMAP_IN])
+		XFREE(MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_IN]);
+	if (if_rmap->routemap[IF_RMAP_OUT])
+		XFREE(MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_OUT]);
 
-  XFREE (MTYPE_IF_RMAP, if_rmap);
+	XFREE(MTYPE_IF_RMAP, if_rmap);
 }
 
-struct if_rmap *
-if_rmap_lookup (const char *ifname)
+struct if_rmap *if_rmap_lookup(const char *ifname)
 {
-  struct if_rmap key;
-  struct if_rmap *if_rmap;
+	struct if_rmap key;
+	struct if_rmap *if_rmap;
 
-  /* temporary copy */
-  key.ifname = (ifname) ? XSTRDUP (MTYPE_IF_RMAP_NAME, ifname) : NULL;
+	/* temporary copy */
+	key.ifname = (ifname) ? XSTRDUP(MTYPE_IF_RMAP_NAME, ifname) : NULL;
 
-  if_rmap = hash_lookup (ifrmaphash, &key);
-  
-  if (key.ifname)
-    XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
+	if_rmap = hash_lookup(ifrmaphash, &key);
 
-  return if_rmap;
+	if (key.ifname)
+		XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
+
+	return if_rmap;
 }
 
-void
-if_rmap_hook_add (void (*func) (struct if_rmap *))
+void if_rmap_hook_add(void (*func)(struct if_rmap *))
 {
-  if_rmap_add_hook = func;
+	if_rmap_add_hook = func;
 }
 
-void
-if_rmap_hook_delete (void (*func) (struct if_rmap *))
+void if_rmap_hook_delete(void (*func)(struct if_rmap *))
 {
-  if_rmap_delete_hook = func;
+	if_rmap_delete_hook = func;
 }
 
-static void *
-if_rmap_hash_alloc (void *arg)
+static void *if_rmap_hash_alloc(void *arg)
 {
-  struct if_rmap *ifarg = (struct if_rmap *)arg;
-  struct if_rmap *if_rmap;
+	struct if_rmap *ifarg = (struct if_rmap *)arg;
+	struct if_rmap *if_rmap;
 
-  if_rmap = if_rmap_new ();
-  if_rmap->ifname = XSTRDUP (MTYPE_IF_RMAP_NAME, ifarg->ifname);
+	if_rmap = if_rmap_new();
+	if_rmap->ifname = XSTRDUP(MTYPE_IF_RMAP_NAME, ifarg->ifname);
 
-  return if_rmap;
+	return if_rmap;
 }
 
-static struct if_rmap *
-if_rmap_get (const char *ifname)
+static struct if_rmap *if_rmap_get(const char *ifname)
 {
-  struct if_rmap key;
-  struct if_rmap *ret;
+	struct if_rmap key;
+	struct if_rmap *ret;
 
-  /* temporary copy */
-  key.ifname = (ifname) ? XSTRDUP (MTYPE_IF_RMAP_NAME, ifname) : NULL;
+	/* temporary copy */
+	key.ifname = (ifname) ? XSTRDUP(MTYPE_IF_RMAP_NAME, ifname) : NULL;
 
-  ret = hash_get (ifrmaphash, &key, if_rmap_hash_alloc);
+	ret = hash_get(ifrmaphash, &key, if_rmap_hash_alloc);
 
-  if (key.ifname)
-    XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
+	if (key.ifname)
+		XFREE(MTYPE_IF_RMAP_NAME, key.ifname);
 
-  return ret;
+	return ret;
 }
 
-static unsigned int
-if_rmap_hash_make (void *data)
+static unsigned int if_rmap_hash_make(void *data)
 {
-  const struct if_rmap *if_rmap = data;
+	const struct if_rmap *if_rmap = data;
 
-  return string_hash_make (if_rmap->ifname);
+	return string_hash_make(if_rmap->ifname);
 }
 
-static int
-if_rmap_hash_cmp (const void *arg1, const void* arg2)
+static int if_rmap_hash_cmp(const void *arg1, const void *arg2)
 {
-  const struct if_rmap *if_rmap1 = arg1;
-  const struct if_rmap *if_rmap2 = arg2;
+	const struct if_rmap *if_rmap1 = arg1;
+	const struct if_rmap *if_rmap2 = arg2;
 
-  return strcmp (if_rmap1->ifname, if_rmap2->ifname) == 0;
+	return strcmp(if_rmap1->ifname, if_rmap2->ifname) == 0;
 }
 
-static struct if_rmap *
-if_rmap_set (const char *ifname, enum if_rmap_type type, 
-             const char *routemap_name)
+static struct if_rmap *if_rmap_set(const char *ifname, enum if_rmap_type type,
+				   const char *routemap_name)
 {
-  struct if_rmap *if_rmap;
-
-  if_rmap = if_rmap_get (ifname);
-
-  if (type == IF_RMAP_IN)
-    {
-      if (if_rmap->routemap[IF_RMAP_IN])
-	XFREE (MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_IN]);
-      if_rmap->routemap[IF_RMAP_IN] 
-        = XSTRDUP (MTYPE_IF_RMAP_NAME, routemap_name);
-    }
-  if (type == IF_RMAP_OUT)
-    {
-      if (if_rmap->routemap[IF_RMAP_OUT])
-	XFREE (MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_OUT]);
-      if_rmap->routemap[IF_RMAP_OUT] 
-        = XSTRDUP (MTYPE_IF_RMAP_NAME, routemap_name);
-    }
-
-  if (if_rmap_add_hook)
-    (*if_rmap_add_hook) (if_rmap);
-  
-  return if_rmap;
+	struct if_rmap *if_rmap;
+
+	if_rmap = if_rmap_get(ifname);
+
+	if (type == IF_RMAP_IN) {
+		if (if_rmap->routemap[IF_RMAP_IN])
+			XFREE(MTYPE_IF_RMAP_NAME,
+			      if_rmap->routemap[IF_RMAP_IN]);
+		if_rmap->routemap[IF_RMAP_IN] =
+			XSTRDUP(MTYPE_IF_RMAP_NAME, routemap_name);
+	}
+	if (type == IF_RMAP_OUT) {
+		if (if_rmap->routemap[IF_RMAP_OUT])
+			XFREE(MTYPE_IF_RMAP_NAME,
+			      if_rmap->routemap[IF_RMAP_OUT]);
+		if_rmap->routemap[IF_RMAP_OUT] =
+			XSTRDUP(MTYPE_IF_RMAP_NAME, routemap_name);
+	}
+
+	if (if_rmap_add_hook)
+		(*if_rmap_add_hook)(if_rmap);
+
+	return if_rmap;
 }
 
-static int
-if_rmap_unset (const char *ifname, enum if_rmap_type type, 
-               const char *routemap_name)
+static int if_rmap_unset(const char *ifname, enum if_rmap_type type,
+			 const char *routemap_name)
 {
-  struct if_rmap *if_rmap;
-
-  if_rmap = if_rmap_lookup (ifname);
-  if (!if_rmap)
-    return 0;
-
-  if (type == IF_RMAP_IN)
-    {
-      if (!if_rmap->routemap[IF_RMAP_IN])
-	return 0;
-      if (strcmp (if_rmap->routemap[IF_RMAP_IN], routemap_name) != 0)
-	return 0;
-
-      XFREE (MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_IN]);
-      if_rmap->routemap[IF_RMAP_IN] = NULL;      
-    }
-
-  if (type == IF_RMAP_OUT)
-    {
-      if (!if_rmap->routemap[IF_RMAP_OUT])
-	return 0;
-      if (strcmp (if_rmap->routemap[IF_RMAP_OUT], routemap_name) != 0)
-	return 0;
-
-      XFREE (MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_OUT]);
-      if_rmap->routemap[IF_RMAP_OUT] = NULL;      
-    }
-
-  if (if_rmap_delete_hook)
-    (*if_rmap_delete_hook) (if_rmap);
-
-  if (if_rmap->routemap[IF_RMAP_IN] == NULL &&
-      if_rmap->routemap[IF_RMAP_OUT] == NULL)
-    {
-      hash_release (ifrmaphash, if_rmap);
-      if_rmap_free (if_rmap);
-    }
-
-  return 1;
+	struct if_rmap *if_rmap;
+
+	if_rmap = if_rmap_lookup(ifname);
+	if (!if_rmap)
+		return 0;
+
+	if (type == IF_RMAP_IN) {
+		if (!if_rmap->routemap[IF_RMAP_IN])
+			return 0;
+		if (strcmp(if_rmap->routemap[IF_RMAP_IN], routemap_name) != 0)
+			return 0;
+
+		XFREE(MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_IN]);
+		if_rmap->routemap[IF_RMAP_IN] = NULL;
+	}
+
+	if (type == IF_RMAP_OUT) {
+		if (!if_rmap->routemap[IF_RMAP_OUT])
+			return 0;
+		if (strcmp(if_rmap->routemap[IF_RMAP_OUT], routemap_name) != 0)
+			return 0;
+
+		XFREE(MTYPE_IF_RMAP_NAME, if_rmap->routemap[IF_RMAP_OUT]);
+		if_rmap->routemap[IF_RMAP_OUT] = NULL;
+	}
+
+	if (if_rmap_delete_hook)
+		(*if_rmap_delete_hook)(if_rmap);
+
+	if (if_rmap->routemap[IF_RMAP_IN] == NULL
+	    && if_rmap->routemap[IF_RMAP_OUT] == NULL) {
+		hash_release(ifrmaphash, if_rmap);
+		if_rmap_free(if_rmap);
+	}
+
+	return 1;
 }
 
 DEFUN (if_rmap,
@@ -218,24 +204,24 @@ DEFUN (if_rmap,
        "Route map set for output filtering\n"
        "Route map interface name\n")
 {
-  int idx_rmap_name = 1;
-  int idx_in_out = 2;
-  int idx_ifname = 3;
-  enum if_rmap_type type;
-
-  if (strncmp (argv[idx_in_out]->text, "in", 1) == 0)
-    type = IF_RMAP_IN;
-  else if (strncmp (argv[idx_in_out]->text, "out", 1) == 0)
-    type = IF_RMAP_OUT;
-  else
-    {
-      vty_out (vty, "route-map direction must be [in|out]%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  if_rmap_set (argv[idx_ifname]->arg, type, argv[idx_rmap_name]->arg);
-
-  return CMD_SUCCESS;
+	int idx_rmap_name = 1;
+	int idx_in_out = 2;
+	int idx_ifname = 3;
+	enum if_rmap_type type;
+
+	if (strncmp(argv[idx_in_out]->text, "in", 1) == 0)
+		type = IF_RMAP_IN;
+	else if (strncmp(argv[idx_in_out]->text, "out", 1) == 0)
+		type = IF_RMAP_OUT;
+	else {
+		vty_out(vty, "route-map direction must be [in|out]%s",
+			VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	if_rmap_set(argv[idx_ifname]->arg, type, argv[idx_rmap_name]->arg);
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_if_rmap,
@@ -248,81 +234,73 @@ DEFUN (no_if_rmap,
        "Route map for output filtering\n"
        "Route map interface name\n")
 {
-  int idx_routemap_name = 2;
-  int idx_in_out = 3;
-  int idx_ifname = 4;
-  int ret;
-  enum if_rmap_type type;
-
-  if (strncmp (argv[idx_in_out]->arg, "i", 1) == 0)
-    type = IF_RMAP_IN;
-  else if (strncmp (argv[idx_in_out]->arg, "o", 1) == 0)
-    type = IF_RMAP_OUT;
-  else
-    {
-      vty_out (vty, "route-map direction must be [in|out]%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  ret = if_rmap_unset (argv[idx_ifname]->arg, type, argv[idx_routemap_name]->arg);
-  if (! ret)
-    {
-      vty_out (vty, "route-map doesn't exist%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-  return CMD_SUCCESS;
+	int idx_routemap_name = 2;
+	int idx_in_out = 3;
+	int idx_ifname = 4;
+	int ret;
+	enum if_rmap_type type;
+
+	if (strncmp(argv[idx_in_out]->arg, "i", 1) == 0)
+		type = IF_RMAP_IN;
+	else if (strncmp(argv[idx_in_out]->arg, "o", 1) == 0)
+		type = IF_RMAP_OUT;
+	else {
+		vty_out(vty, "route-map direction must be [in|out]%s",
+			VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	ret = if_rmap_unset(argv[idx_ifname]->arg, type,
+			    argv[idx_routemap_name]->arg);
+	if (!ret) {
+		vty_out(vty, "route-map doesn't exist%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+	return CMD_SUCCESS;
 }
 
 
 /* Configuration write function. */
-int
-config_write_if_rmap (struct vty *vty)
+int config_write_if_rmap(struct vty *vty)
 {
-  unsigned int i;
-  struct hash_backet *mp;
-  int write = 0;
-
-  for (i = 0; i < ifrmaphash->size; i++)
-    for (mp = ifrmaphash->index[i]; mp; mp = mp->next)
-      {
-	struct if_rmap *if_rmap;
-
-	if_rmap = mp->data;
-
-	if (if_rmap->routemap[IF_RMAP_IN])
-	  {
-	    vty_out (vty, " route-map %s in %s%s", 
-		     if_rmap->routemap[IF_RMAP_IN],
-		     if_rmap->ifname,
-		     VTY_NEWLINE);
-	    write++;
-	  }
-
-	if (if_rmap->routemap[IF_RMAP_OUT])
-	  {
-	    vty_out (vty, " route-map %s out %s%s", 
-		     if_rmap->routemap[IF_RMAP_OUT],
-		     if_rmap->ifname,
-		     VTY_NEWLINE);
-	    write++;
-	  }
-      }
-  return write;
+	unsigned int i;
+	struct hash_backet *mp;
+	int write = 0;
+
+	for (i = 0; i < ifrmaphash->size; i++)
+		for (mp = ifrmaphash->index[i]; mp; mp = mp->next) {
+			struct if_rmap *if_rmap;
+
+			if_rmap = mp->data;
+
+			if (if_rmap->routemap[IF_RMAP_IN]) {
+				vty_out(vty, " route-map %s in %s%s",
+					if_rmap->routemap[IF_RMAP_IN],
+					if_rmap->ifname, VTY_NEWLINE);
+				write++;
+			}
+
+			if (if_rmap->routemap[IF_RMAP_OUT]) {
+				vty_out(vty, " route-map %s out %s%s",
+					if_rmap->routemap[IF_RMAP_OUT],
+					if_rmap->ifname, VTY_NEWLINE);
+				write++;
+			}
+		}
+	return write;
 }
 
-void
-if_rmap_reset ()
+void if_rmap_reset()
 {
-  hash_clean (ifrmaphash, (void (*) (void *)) if_rmap_free);
+	hash_clean(ifrmaphash, (void (*)(void *))if_rmap_free);
 }
 
-void
-if_rmap_init (int node)
+void if_rmap_init(int node)
 {
-  ifrmaphash = hash_create (if_rmap_hash_make, if_rmap_hash_cmp);
-  if (node == RIPNG_NODE) {
-  } else if (node == RIP_NODE) {
-    install_element (RIP_NODE, &if_rmap_cmd);
-    install_element (RIP_NODE, &no_if_rmap_cmd);
-  }
+	ifrmaphash = hash_create(if_rmap_hash_make, if_rmap_hash_cmp);
+	if (node == RIPNG_NODE) {
+	} else if (node == RIP_NODE) {
+		install_element(RIP_NODE, &if_rmap_cmd);
+		install_element(RIP_NODE, &no_if_rmap_cmd);
+	}
 }