*: reindentreindent-master-after

indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

1 files changed, 1154 insertions, 1223 deletions

diff --git a/lib/filter.c b/lib/filter.c
index c1e922f5b..0262234c7 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -30,475 +30,432 @@
 #include "routemap.h"
 #include "libfrr.h"
 
-DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST,     "Access List")
+DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST, "Access List")
 DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST_STR, "Access List Str")
-DEFINE_MTYPE_STATIC(LIB, ACCESS_FILTER,   "Access Filter")
-
-struct filter_cisco
-{
-  /* Cisco access-list */
-  int extended;
-  struct in_addr addr;
-  struct in_addr addr_mask;
-  struct in_addr mask;
-  struct in_addr mask_mask;
+DEFINE_MTYPE_STATIC(LIB, ACCESS_FILTER, "Access Filter")
+
+struct filter_cisco {
+	/* Cisco access-list */
+	int extended;
+	struct in_addr addr;
+	struct in_addr addr_mask;
+	struct in_addr mask;
+	struct in_addr mask_mask;
 };
 
-struct filter_zebra
-{
-  /* If this filter is "exact" match then this flag is set. */
-  int exact;
+struct filter_zebra {
+	/* If this filter is "exact" match then this flag is set. */
+	int exact;
 
-  /* Prefix information. */
-  struct prefix prefix;
+	/* Prefix information. */
+	struct prefix prefix;
 };
 
 /* Filter element of access list */
-struct filter
-{
-  /* For doubly linked list. */
-  struct filter *next;
-  struct filter *prev;
+struct filter {
+	/* For doubly linked list. */
+	struct filter *next;
+	struct filter *prev;
 
-  /* Filter type information. */
-  enum filter_type type;
+	/* Filter type information. */
+	enum filter_type type;
 
-  /* Cisco access-list */
-  int cisco;
+	/* Cisco access-list */
+	int cisco;
 
-  union
-    {
-      struct filter_cisco cfilter;
-      struct filter_zebra zfilter;
-    } u;
+	union {
+		struct filter_cisco cfilter;
+		struct filter_zebra zfilter;
+	} u;
 };
 
 /* List of access_list. */
-struct access_list_list
-{
-  struct access_list *head;
-  struct access_list *tail;
+struct access_list_list {
+	struct access_list *head;
+	struct access_list *tail;
 };
 
 /* Master structure of access_list. */
-struct access_master
-{
-  /* List of access_list which name is number. */
-  struct access_list_list num;
+struct access_master {
+	/* List of access_list which name is number. */
+	struct access_list_list num;
 
-  /* List of access_list which name is string. */
-  struct access_list_list str;
+	/* List of access_list which name is string. */
+	struct access_list_list str;
 
-  /* Hook function which is executed when new access_list is added. */
-  void (*add_hook) (struct access_list *);
+	/* Hook function which is executed when new access_list is added. */
+	void (*add_hook)(struct access_list *);
 
-  /* Hook function which is executed when access_list is deleted. */
-  void (*delete_hook) (struct access_list *);
+	/* Hook function which is executed when access_list is deleted. */
+	void (*delete_hook)(struct access_list *);
 };
 
 /* Static structure for IPv4 access_list's master. */
-static struct access_master access_master_ipv4 = 
-{ 
-  {NULL, NULL},
-  {NULL, NULL},
-  NULL,
-  NULL,
+static struct access_master access_master_ipv4 = {
+	{NULL, NULL},
+	{NULL, NULL},
+	NULL,
+	NULL,
 };
 
 /* Static structure for IPv6 access_list's master. */
-static struct access_master access_master_ipv6 = 
-{ 
-  {NULL, NULL},
-  {NULL, NULL},
-  NULL,
-  NULL,
+static struct access_master access_master_ipv6 = {
+	{NULL, NULL},
+	{NULL, NULL},
+	NULL,
+	NULL,
 };
 
-static struct access_master *
-access_master_get (afi_t afi)
+static struct access_master *access_master_get(afi_t afi)
 {
-  if (afi == AFI_IP)
-    return &access_master_ipv4;
-  else if (afi == AFI_IP6)
-    return &access_master_ipv6;
-  return NULL;
+	if (afi == AFI_IP)
+		return &access_master_ipv4;
+	else if (afi == AFI_IP6)
+		return &access_master_ipv6;
+	return NULL;
 }
 
 /* Allocate new filter structure. */
-static struct filter *
-filter_new (void)
+static struct filter *filter_new(void)
 {
-  return (struct filter *) XCALLOC (MTYPE_ACCESS_FILTER,
-				    sizeof (struct filter));
+	return (struct filter *)XCALLOC(MTYPE_ACCESS_FILTER,
+					sizeof(struct filter));
 }
 
-static void
-filter_free (struct filter *filter)
+static void filter_free(struct filter *filter)
 {
-  XFREE (MTYPE_ACCESS_FILTER, filter);
+	XFREE(MTYPE_ACCESS_FILTER, filter);
 }
 
 /* Return string of filter_type. */
-static const char *
-filter_type_str (struct filter *filter)
-{
-  switch (filter->type)
-    {
-    case FILTER_PERMIT:
-      return "permit";
-      break;
-    case FILTER_DENY:
-      return "deny";
-      break;
-    case FILTER_DYNAMIC:
-      return "dynamic";
-      break;
-    default:
-      return "";
-      break;
-    }
+static const char *filter_type_str(struct filter *filter)
+{
+	switch (filter->type) {
+	case FILTER_PERMIT:
+		return "permit";
+		break;
+	case FILTER_DENY:
+		return "deny";
+		break;
+	case FILTER_DYNAMIC:
+		return "dynamic";
+		break;
+	default:
+		return "";
+		break;
+	}
 }
 
 /* If filter match to the prefix then return 1. */
-static int
-filter_match_cisco (struct filter *mfilter, struct prefix *p)
+static int filter_match_cisco(struct filter *mfilter, struct prefix *p)
 {
-  struct filter_cisco *filter;
-  struct in_addr mask;
-  u_int32_t check_addr;
-  u_int32_t check_mask;
+	struct filter_cisco *filter;
+	struct in_addr mask;
+	u_int32_t check_addr;
+	u_int32_t check_mask;
 
-  filter = &mfilter->u.cfilter;
-  check_addr = p->u.prefix4.s_addr & ~filter->addr_mask.s_addr;
+	filter = &mfilter->u.cfilter;
+	check_addr = p->u.prefix4.s_addr & ~filter->addr_mask.s_addr;
 
-  if (filter->extended)
-    {
-      masklen2ip (p->prefixlen, &mask);
-      check_mask = mask.s_addr & ~filter->mask_mask.s_addr;
+	if (filter->extended) {
+		masklen2ip(p->prefixlen, &mask);
+		check_mask = mask.s_addr & ~filter->mask_mask.s_addr;
 
-      if (memcmp (&check_addr, &filter->addr.s_addr, 4) == 0
-          && memcmp (&check_mask, &filter->mask.s_addr, 4) == 0)
-	return 1;
-    }
-  else if (memcmp (&check_addr, &filter->addr.s_addr, 4) == 0)
-    return 1;
+		if (memcmp(&check_addr, &filter->addr.s_addr, 4) == 0
+		    && memcmp(&check_mask, &filter->mask.s_addr, 4) == 0)
+			return 1;
+	} else if (memcmp(&check_addr, &filter->addr.s_addr, 4) == 0)
+		return 1;
 
-  return 0;
+	return 0;
 }
 
 /* If filter match to the prefix then return 1. */
-static int
-filter_match_zebra (struct filter *mfilter, struct prefix *p)
+static int filter_match_zebra(struct filter *mfilter, struct prefix *p)
 {
-  struct filter_zebra *filter;
+	struct filter_zebra *filter;
 
-  filter = &mfilter->u.zfilter;
+	filter = &mfilter->u.zfilter;
 
-  if (filter->prefix.family == p->family)
-    {
-      if (filter->exact)
-	{
-	  if (filter->prefix.prefixlen == p->prefixlen)
-	    return prefix_match (&filter->prefix, p);
-	  else
-	    return 0;
-	}
-      else
-	return prefix_match (&filter->prefix, p);
-    }
-  else
-    return 0;
+	if (filter->prefix.family == p->family) {
+		if (filter->exact) {
+			if (filter->prefix.prefixlen == p->prefixlen)
+				return prefix_match(&filter->prefix, p);
+			else
+				return 0;
+		} else
+			return prefix_match(&filter->prefix, p);
+	} else
+		return 0;
 }
 
 /* Allocate new access list structure. */
-static struct access_list *
-access_list_new (void)
+static struct access_list *access_list_new(void)
 {
-  return (struct access_list *) XCALLOC (MTYPE_ACCESS_LIST,
-					 sizeof (struct access_list));
+	return (struct access_list *)XCALLOC(MTYPE_ACCESS_LIST,
+					     sizeof(struct access_list));
 }
 
 /* Free allocated access_list. */
-static void
-access_list_free (struct access_list *access)
+static void access_list_free(struct access_list *access)
 {
-  XFREE (MTYPE_ACCESS_LIST, access);
+	XFREE(MTYPE_ACCESS_LIST, access);
 }
 
 /* Delete access_list from access_master and free it. */
-static void
-access_list_delete (struct access_list *access)
+static void access_list_delete(struct access_list *access)
 {
-  struct filter *filter;
-  struct filter *next;
-  struct access_list_list *list;
-  struct access_master *master;
+	struct filter *filter;
+	struct filter *next;
+	struct access_list_list *list;
+	struct access_master *master;
 
-  for (filter = access->head; filter; filter = next)
-    {
-      next = filter->next;
-      filter_free (filter);
-    }
+	for (filter = access->head; filter; filter = next) {
+		next = filter->next;
+		filter_free(filter);
+	}
 
-  master = access->master;
+	master = access->master;
 
-  if (access->type == ACCESS_TYPE_NUMBER)
-    list = &master->num;
-  else
-    list = &master->str;
+	if (access->type == ACCESS_TYPE_NUMBER)
+		list = &master->num;
+	else
+		list = &master->str;
 
-  if (access->next)
-    access->next->prev = access->prev;
-  else
-    list->tail = access->prev;
+	if (access->next)
+		access->next->prev = access->prev;
+	else
+		list->tail = access->prev;
 
-  if (access->prev)
-    access->prev->next = access->next;
-  else
-    list->head = access->next;
+	if (access->prev)
+		access->prev->next = access->next;
+	else
+		list->head = access->next;
 
-  if (access->name)
-    XFREE (MTYPE_ACCESS_LIST_STR, access->name);
+	if (access->name)
+		XFREE(MTYPE_ACCESS_LIST_STR, access->name);
 
-  if (access->remark)
-    XFREE (MTYPE_TMP, access->remark);
+	if (access->remark)
+		XFREE(MTYPE_TMP, access->remark);
 
-  access_list_free (access);
+	access_list_free(access);
 }
 
 /* Insert new access list to list of access_list.  Each acceess_list
    is sorted by the name. */
-static struct access_list *
-access_list_insert (afi_t afi, const char *name)
-{
-  unsigned int i;
-  long number;
-  struct access_list *access;
-  struct access_list *point;
-  struct access_list_list *alist;
-  struct access_master *master;
-
-  master = access_master_get (afi);
-  if (master == NULL)
-    return NULL;
-
-  /* Allocate new access_list and copy given name. */
-  access = access_list_new ();
-  access->name = XSTRDUP (MTYPE_ACCESS_LIST_STR, name);
-  access->master = master;
-
-  /* If name is made by all digit character.  We treat it as
-     number. */
-  for (number = 0, i = 0; i < strlen (name); i++)
-    {
-      if (isdigit ((int) name[i]))
-	number = (number * 10) + (name[i] - '0');
-      else
-	break;
-    }
-
-  /* In case of name is all digit character */
-  if (i == strlen (name))
-    {
-      access->type = ACCESS_TYPE_NUMBER;
-
-      /* Set access_list to number list. */
-      alist = &master->num;
-
-      for (point = alist->head; point; point = point->next)
-	if (atol (point->name) >= number)
-	  break;
-    }
-  else
-    {
-      access->type = ACCESS_TYPE_STRING;
-
-      /* Set access_list to string list. */
-      alist = &master->str;
-  
-      /* Set point to insertion point. */
-      for (point = alist->head; point; point = point->next)
-	if (strcmp (point->name, name) >= 0)
-	  break;
-    }
-
-  /* In case of this is the first element of master. */
-  if (alist->head == NULL)
-    {
-      alist->head = alist->tail = access;
-      return access;
-    }
-
-  /* In case of insertion is made at the tail of access_list. */
-  if (point == NULL)
-    {
-      access->prev = alist->tail;
-      alist->tail->next = access;
-      alist->tail = access;
-      return access;
-    }
-
-  /* In case of insertion is made at the head of access_list. */
-  if (point == alist->head)
-    {
-      access->next = alist->head;
-      alist->head->prev = access;
-      alist->head = access;
-      return access;
-    }
-
-  /* Insertion is made at middle of the access_list. */
-  access->next = point;
-  access->prev = point->prev;
-
-  if (point->prev)
-    point->prev->next = access;
-  point->prev = access;
-
-  return access;
+static struct access_list *access_list_insert(afi_t afi, const char *name)
+{
+	unsigned int i;
+	long number;
+	struct access_list *access;
+	struct access_list *point;
+	struct access_list_list *alist;
+	struct access_master *master;
+
+	master = access_master_get(afi);
+	if (master == NULL)
+		return NULL;
+
+	/* Allocate new access_list and copy given name. */
+	access = access_list_new();
+	access->name = XSTRDUP(MTYPE_ACCESS_LIST_STR, name);
+	access->master = master;
+
+	/* If name is made by all digit character.  We treat it as
+	   number. */
+	for (number = 0, i = 0; i < strlen(name); i++) {
+		if (isdigit((int)name[i]))
+			number = (number * 10) + (name[i] - '0');
+		else
+			break;
+	}
+
+	/* In case of name is all digit character */
+	if (i == strlen(name)) {
+		access->type = ACCESS_TYPE_NUMBER;
+
+		/* Set access_list to number list. */
+		alist = &master->num;
+
+		for (point = alist->head; point; point = point->next)
+			if (atol(point->name) >= number)
+				break;
+	} else {
+		access->type = ACCESS_TYPE_STRING;
+
+		/* Set access_list to string list. */
+		alist = &master->str;
+
+		/* Set point to insertion point. */
+		for (point = alist->head; point; point = point->next)
+			if (strcmp(point->name, name) >= 0)
+				break;
+	}
+
+	/* In case of this is the first element of master. */
+	if (alist->head == NULL) {
+		alist->head = alist->tail = access;
+		return access;
+	}
+
+	/* In case of insertion is made at the tail of access_list. */
+	if (point == NULL) {
+		access->prev = alist->tail;
+		alist->tail->next = access;
+		alist->tail = access;
+		return access;
+	}
+
+	/* In case of insertion is made at the head of access_list. */
+	if (point == alist->head) {
+		access->next = alist->head;
+		alist->head->prev = access;
+		alist->head = access;
+		return access;
+	}
+
+	/* Insertion is made at middle of the access_list. */
+	access->next = point;
+	access->prev = point->prev;
+
+	if (point->prev)
+		point->prev->next = access;
+	point->prev = access;
+
+	return access;
 }
 
 /* Lookup access_list from list of access_list by name. */
-struct access_list *
-access_list_lookup (afi_t afi, const char *name)
+struct access_list *access_list_lookup(afi_t afi, const char *name)
 {
-  struct access_list *access;
-  struct access_master *master;
+	struct access_list *access;
+	struct access_master *master;
 
-  if (name == NULL)
-    return NULL;
+	if (name == NULL)
+		return NULL;
 
-  master = access_master_get (afi);
-  if (master == NULL)
-    return NULL;
+	master = access_master_get(afi);
+	if (master == NULL)
+		return NULL;
 
-  for (access = master->num.head; access; access = access->next)
-    if (strcmp (access->name, name) == 0)
-      return access;
+	for (access = master->num.head; access; access = access->next)
+		if (strcmp(access->name, name) == 0)
+			return access;
 
-  for (access = master->str.head; access; access = access->next)
-    if (strcmp (access->name, name) == 0)
-      return access;
+	for (access = master->str.head; access; access = access->next)
+		if (strcmp(access->name, name) == 0)
+			return access;
 
-  return NULL;
+	return NULL;
 }
 
 /* Get access list from list of access_list.  If there isn't matched
    access_list create new one and return it. */
-static struct access_list *
-access_list_get (afi_t afi, const char *name)
+static struct access_list *access_list_get(afi_t afi, const char *name)
 {
-  struct access_list *access;
+	struct access_list *access;
 
-  access = access_list_lookup (afi, name);
-  if (access == NULL)
-    access = access_list_insert (afi, name);
-  return access;
+	access = access_list_lookup(afi, name);
+	if (access == NULL)
+		access = access_list_insert(afi, name);
+	return access;
 }
 
 /* Apply access list to object (which should be struct prefix *). */
-enum filter_type
-access_list_apply (struct access_list *access, void *object)
+enum filter_type access_list_apply(struct access_list *access, void *object)
 {
-  struct filter *filter;
-  struct prefix *p;
+	struct filter *filter;
+	struct prefix *p;
 
-  p = (struct prefix *) object;
+	p = (struct prefix *)object;
 
-  if (access == NULL)
-    return FILTER_DENY;
+	if (access == NULL)
+		return FILTER_DENY;
 
-  for (filter = access->head; filter; filter = filter->next)
-    {
-      if (filter->cisco)
-	{
-	  if (filter_match_cisco (filter, p))
-	    return filter->type;
-	}
-      else
-	{
-	  if (filter_match_zebra (filter, p))
-	    return filter->type;
+	for (filter = access->head; filter; filter = filter->next) {
+		if (filter->cisco) {
+			if (filter_match_cisco(filter, p))
+				return filter->type;
+		} else {
+			if (filter_match_zebra(filter, p))
+				return filter->type;
+		}
 	}
-    }
 
-  return FILTER_DENY;
+	return FILTER_DENY;
 }
 
 /* Add hook function. */
-void
-access_list_add_hook (void (*func) (struct access_list *access))
+void access_list_add_hook(void (*func)(struct access_list *access))
 {
-  access_master_ipv4.add_hook = func;
-  access_master_ipv6.add_hook = func;
+	access_master_ipv4.add_hook = func;
+	access_master_ipv6.add_hook = func;
 }
 
 /* Delete hook function. */
-void
-access_list_delete_hook (void (*func) (struct access_list *access))
+void access_list_delete_hook(void (*func)(struct access_list *access))
 {
-  access_master_ipv4.delete_hook = func;
-  access_master_ipv6.delete_hook = func;
+	access_master_ipv4.delete_hook = func;
+	access_master_ipv6.delete_hook = func;
 }
 
 /* Add new filter to the end of specified access_list. */
-static void
-access_list_filter_add (struct access_list *access, struct filter *filter)
+static void access_list_filter_add(struct access_list *access,
+				   struct filter *filter)
 {
-  filter->next = NULL;
-  filter->prev = access->tail;
+	filter->next = NULL;
+	filter->prev = access->tail;
 
-  if (access->tail)
-    access->tail->next = filter;
-  else
-    access->head = filter;
-  access->tail = filter;
+	if (access->tail)
+		access->tail->next = filter;
+	else
+		access->head = filter;
+	access->tail = filter;
 
-  /* Run hook function. */
-  if (access->master->add_hook)
-    (*access->master->add_hook) (access);
-  route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_ADDED);
+	/* Run hook function. */
+	if (access->master->add_hook)
+		(*access->master->add_hook)(access);
+	route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_ADDED);
 }
 
 /* If access_list has no filter then return 1. */
-static int
-access_list_empty (struct access_list *access)
+static int access_list_empty(struct access_list *access)
 {
-  if (access->head == NULL && access->tail == NULL)
-    return 1;
-  else
-    return 0;
+	if (access->head == NULL && access->tail == NULL)
+		return 1;
+	else
+		return 0;
 }
 
 /* Delete filter from specified access_list.  If there is hook
    function execute it. */
-static void
-access_list_filter_delete (struct access_list *access, struct filter *filter)
+static void access_list_filter_delete(struct access_list *access,
+				      struct filter *filter)
 {
-  struct access_master *master;
+	struct access_master *master;
 
-  master = access->master;
+	master = access->master;
 
-  if (filter->next)
-    filter->next->prev = filter->prev;
-  else
-    access->tail = filter->prev;
+	if (filter->next)
+		filter->next->prev = filter->prev;
+	else
+		access->tail = filter->prev;
 
-  if (filter->prev)
-    filter->prev->next = filter->next;
-  else
-    access->head = filter->next;
+	if (filter->prev)
+		filter->prev->next = filter->next;
+	else
+		access->head = filter->next;
 
-  filter_free (filter);
+	filter_free(filter);
 
-  route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_DELETED);
-  /* Run hook function. */
-  if (master->delete_hook)
-    (*master->delete_hook) (access);
+	route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_DELETED);
+	/* Run hook function. */
+	if (master->delete_hook)
+		(*master->delete_hook)(access);
 
-  /* If access_list becomes empty delete it from access_master. */
-  if (access_list_empty (access))
-    access_list_delete (access);
+	/* If access_list becomes empty delete it from access_master. */
+	if (access_list_empty(access))
+		access_list_delete(access);
 }
 
 /*
@@ -513,179 +470,165 @@ access_list_filter_delete (struct access_list *access, struct filter *filter)
   host                 A single host address
 */
 
-static struct filter *
-filter_lookup_cisco (struct access_list *access, struct filter *mnew)
+static struct filter *filter_lookup_cisco(struct access_list *access,
+					  struct filter *mnew)
+{
+	struct filter *mfilter;
+	struct filter_cisco *filter;
+	struct filter_cisco *new;
+
+	new = &mnew->u.cfilter;
+
+	for (mfilter = access->head; mfilter; mfilter = mfilter->next) {
+		filter = &mfilter->u.cfilter;
+
+		if (filter->extended) {
+			if (mfilter->type == mnew->type
+			    && filter->addr.s_addr == new->addr.s_addr
+			    && filter->addr_mask.s_addr == new->addr_mask.s_addr
+			    && filter->mask.s_addr == new->mask.s_addr
+			    && filter->mask_mask.s_addr
+				       == new->mask_mask.s_addr)
+				return mfilter;
+		} else {
+			if (mfilter->type == mnew->type
+			    && filter->addr.s_addr == new->addr.s_addr
+			    && filter->addr_mask.s_addr
+				       == new->addr_mask.s_addr)
+				return mfilter;
+		}
+	}
+
+	return NULL;
+}
+
+static struct filter *filter_lookup_zebra(struct access_list *access,
+					  struct filter *mnew)
 {
-  struct filter *mfilter;
-  struct filter_cisco *filter;
-  struct filter_cisco *new;
+	struct filter *mfilter;
+	struct filter_zebra *filter;
+	struct filter_zebra *new;
 
-  new = &mnew->u.cfilter;
+	new = &mnew->u.zfilter;
 
-  for (mfilter = access->head; mfilter; mfilter = mfilter->next)
-    {
-      filter = &mfilter->u.cfilter;
+	for (mfilter = access->head; mfilter; mfilter = mfilter->next) {
+		filter = &mfilter->u.zfilter;
 
-      if (filter->extended)
-	{
-	  if (mfilter->type == mnew->type
-	      && filter->addr.s_addr == new->addr.s_addr
-	      && filter->addr_mask.s_addr == new->addr_mask.s_addr
-	      && filter->mask.s_addr == new->mask.s_addr
-	      && filter->mask_mask.s_addr == new->mask_mask.s_addr)
-	    return mfilter;
+		if (filter->exact == new->exact
+		    && mfilter->type
+			       == mnew->type &&prefix_same(&filter->prefix,
+							   &new->prefix))
+			return mfilter;
 	}
-      else
-	{
-	  if (mfilter->type == mnew->type
-	      && filter->addr.s_addr == new->addr.s_addr
-	      && filter->addr_mask.s_addr == new->addr_mask.s_addr)
-	    return mfilter;
+	return NULL;
+}
+
+static int vty_access_list_remark_unset(struct vty *vty, afi_t afi,
+					const char *name)
+{
+	struct access_list *access;
+
+	access = access_list_lookup(afi, name);
+	if (!access) {
+		vty_out(vty, "%% access-list %s doesn't exist\n", name);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	if (access->remark) {
+		XFREE(MTYPE_TMP, access->remark);
+		access->remark = NULL;
 	}
-    }
-
-  return NULL;
-}
-
-static struct filter *
-filter_lookup_zebra (struct access_list *access, struct filter *mnew)
-{
-  struct filter *mfilter;
-  struct filter_zebra *filter;
-  struct filter_zebra *new;
-
-  new = &mnew->u.zfilter;
-
-  for (mfilter = access->head; mfilter; mfilter = mfilter->next)
-    {
-      filter = &mfilter->u.zfilter;
-
-      if (filter->exact == new->exact
-	  && mfilter->type == mnew->type
-	  && prefix_same (&filter->prefix, &new->prefix))
-	return mfilter;
-    }
-  return NULL;
-}
-
-static int
-vty_access_list_remark_unset (struct vty *vty, afi_t afi, const char *name)
-{
-  struct access_list *access;
-
-  access = access_list_lookup (afi, name);
-  if (! access)
-    {
-      vty_out (vty, "%% access-list %s doesn't exist\n",name);
-      return CMD_WARNING_CONFIG_FAILED;
-    }
-
-  if (access->remark)
-    {
-      XFREE (MTYPE_TMP, access->remark);
-      access->remark = NULL;
-    }
-
-  if (access->head == NULL && access->tail == NULL && access->remark == NULL)
-    access_list_delete (access);
-
-  return CMD_SUCCESS;
-}
-
-static int
-filter_set_cisco (struct vty *vty, const char *name_str, const char *type_str,
-		  const char *addr_str, const char *addr_mask_str,
-		  const char *mask_str, const char *mask_mask_str,
-		  int extended, int set)
-{
-  int ret;
-  enum filter_type type;
-  struct filter *mfilter;
-  struct filter_cisco *filter;
-  struct access_list *access;
-  struct in_addr addr;
-  struct in_addr addr_mask;
-  struct in_addr mask;
-  struct in_addr mask_mask;
-
-  /* Check of filter type. */
-  if (strncmp (type_str, "p", 1) == 0)
-    type = FILTER_PERMIT;
-  else if (strncmp (type_str, "d", 1) == 0)
-    type = FILTER_DENY;
-  else
-    {
-      vty_out (vty, "%% filter type must be permit or deny\n");
-      return CMD_WARNING_CONFIG_FAILED;
-    }
-
-  ret = inet_aton (addr_str, &addr);
-  if (ret <= 0)
-    {
-      vty_out (vty,"%%Inconsistent address and mask\n");
-      return CMD_WARNING_CONFIG_FAILED;
-    }
-
-  ret = inet_aton (addr_mask_str, &addr_mask);
-  if (ret <= 0)
-    {
-      vty_out (vty,"%%Inconsistent address and mask\n");
-      return CMD_WARNING_CONFIG_FAILED;
-    }
-
-  if (extended)
-    {
-      ret = inet_aton (mask_str, &mask);
-      if (ret <= 0)
-	{
-	  vty_out (vty,"%%Inconsistent address and mask\n");
-          return CMD_WARNING_CONFIG_FAILED;
+
+	if (access->head == NULL && access->tail == NULL
+	    && access->remark == NULL)
+		access_list_delete(access);
+
+	return CMD_SUCCESS;
+}
+
+static int filter_set_cisco(struct vty *vty, const char *name_str,
+			    const char *type_str, const char *addr_str,
+			    const char *addr_mask_str, const char *mask_str,
+			    const char *mask_mask_str, int extended, int set)
+{
+	int ret;
+	enum filter_type type;
+	struct filter *mfilter;
+	struct filter_cisco *filter;
+	struct access_list *access;
+	struct in_addr addr;
+	struct in_addr addr_mask;
+	struct in_addr mask;
+	struct in_addr mask_mask;
+
+	/* Check of filter type. */
+	if (strncmp(type_str, "p", 1) == 0)
+		type = FILTER_PERMIT;
+	else if (strncmp(type_str, "d", 1) == 0)
+		type = FILTER_DENY;
+	else {
+		vty_out(vty, "%% filter type must be permit or deny\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	ret = inet_aton(addr_str, &addr);
+	if (ret <= 0) {
+		vty_out(vty, "%%Inconsistent address and mask\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	ret = inet_aton(addr_mask_str, &addr_mask);
+	if (ret <= 0) {
+		vty_out(vty, "%%Inconsistent address and mask\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	if (extended) {
+		ret = inet_aton(mask_str, &mask);
+		if (ret <= 0) {
+			vty_out(vty, "%%Inconsistent address and mask\n");
+			return CMD_WARNING_CONFIG_FAILED;
+		}
+
+		ret = inet_aton(mask_mask_str, &mask_mask);
+		if (ret <= 0) {
+			vty_out(vty, "%%Inconsistent address and mask\n");
+			return CMD_WARNING_CONFIG_FAILED;
+		}
+	}
+
+	mfilter = filter_new();
+	mfilter->type = type;
+	mfilter->cisco = 1;
+	filter = &mfilter->u.cfilter;
+	filter->extended = extended;
+	filter->addr.s_addr = addr.s_addr & ~addr_mask.s_addr;
+	filter->addr_mask.s_addr = addr_mask.s_addr;
+
+	if (extended) {
+		filter->mask.s_addr = mask.s_addr & ~mask_mask.s_addr;
+		filter->mask_mask.s_addr = mask_mask.s_addr;
 	}
 
-      ret = inet_aton (mask_mask_str, &mask_mask);
-      if (ret <= 0)
-	{
-	  vty_out (vty,"%%Inconsistent address and mask\n");
-          return CMD_WARNING_CONFIG_FAILED;
+	/* Install new filter to the access_list. */
+	access = access_list_get(AFI_IP, name_str);
+
+	if (set) {
+		if (filter_lookup_cisco(access, mfilter))
+			filter_free(mfilter);
+		else
+			access_list_filter_add(access, mfilter);
+	} else {
+		struct filter *delete_filter;
+
+		delete_filter = filter_lookup_cisco(access, mfilter);
+		if (delete_filter)
+			access_list_filter_delete(access, delete_filter);
+
+		filter_free(mfilter);
 	}
-    }
-
-  mfilter = filter_new();
-  mfilter->type = type;
-  mfilter->cisco = 1;
-  filter = &mfilter->u.cfilter;
-  filter->extended = extended;
-  filter->addr.s_addr = addr.s_addr & ~addr_mask.s_addr;
-  filter->addr_mask.s_addr = addr_mask.s_addr;
-
-  if (extended)
-    {
-      filter->mask.s_addr = mask.s_addr & ~mask_mask.s_addr;
-      filter->mask_mask.s_addr = mask_mask.s_addr;
-    }
-
-  /* Install new filter to the access_list. */
-  access = access_list_get (AFI_IP, name_str);
-
-  if (set)
-    {
-      if (filter_lookup_cisco (access, mfilter))
-	filter_free (mfilter);
-      else
-	access_list_filter_add (access, mfilter);
-    }
-  else
-    {
-      struct filter *delete_filter;
-
-      delete_filter = filter_lookup_cisco (access, mfilter);
-      if (delete_filter)
-	access_list_filter_delete (access, delete_filter);
-
-      filter_free (mfilter);
-    }
-
-  return CMD_SUCCESS;
+
+	return CMD_SUCCESS;
 }
 
 /* Standard access-list */
@@ -700,12 +643,13 @@ DEFUN (access_list_standard,
        "Address to match\n"
        "Wildcard bits\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 3;
-  int idx_ipv4_2 = 4;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg, argv[idx_ipv4_2]->arg,
-			   NULL, NULL, 0, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 3;
+	int idx_ipv4_2 = 4;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, NULL, NULL, 0, 1);
 }
 
 DEFUN (access_list_standard_nomask,
@@ -718,11 +662,12 @@ DEFUN (access_list_standard_nomask,
        "Specify packets to forward\n"
        "Address to match\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 3;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg, "0.0.0.0",
-			   NULL, NULL, 0, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 3;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", NULL, NULL, 0, 1);
 }
 
 DEFUN (access_list_standard_host,
@@ -736,11 +681,12 @@ DEFUN (access_list_standard_host,
        "A single host address\n"
        "Address to match\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 4;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg, "0.0.0.0",
-			   NULL, NULL, 0, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 4;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", NULL, NULL, 0, 1);
 }
 
 DEFUN (access_list_standard_any,
@@ -753,10 +699,11 @@ DEFUN (access_list_standard_any,
        "Specify packets to forward\n"
        "Any source host\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
-			   "255.255.255.255", NULL, NULL, 0, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, "0.0.0.0",
+				"255.255.255.255", NULL, NULL, 0, 1);
 }
 
 DEFUN (no_access_list_standard,
@@ -771,12 +718,13 @@ DEFUN (no_access_list_standard,
        "Address to match\n"
        "Wildcard bits\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 4;
-  int idx_ipv4_2 = 5;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg, argv[idx_ipv4_2]->arg,
-			   NULL, NULL, 0, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 4;
+	int idx_ipv4_2 = 5;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, NULL, NULL, 0, 0);
 }
 
 DEFUN (no_access_list_standard_nomask,
@@ -790,11 +738,12 @@ DEFUN (no_access_list_standard_nomask,
        "Specify packets to forward\n"
        "Address to match\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 4;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg, "0.0.0.0",
-			   NULL, NULL, 0, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 4;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", NULL, NULL, 0, 0);
 }
 
 DEFUN (no_access_list_standard_host,
@@ -809,11 +758,12 @@ DEFUN (no_access_list_standard_host,
        "A single host address\n"
        "Address to match\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 5;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg, "0.0.0.0",
-			   NULL, NULL, 0, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 5;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", NULL, NULL, 0, 0);
 }
 
 DEFUN (no_access_list_standard_any,
@@ -827,10 +777,11 @@ DEFUN (no_access_list_standard_any,
        "Specify packets to forward\n"
        "Any source host\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
-			   "255.255.255.255", NULL, NULL, 0, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, "0.0.0.0",
+				"255.255.255.255", NULL, NULL, 0, 0);
 }
 
 /* Extended access-list */
@@ -848,14 +799,16 @@ DEFUN (access_list_extended,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 4;
-  int idx_ipv4_2 = 5;
-  int idx_ipv4_3 = 6;
-  int idx_ipv4_4 = 7;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   argv[idx_ipv4_2]->arg, argv[idx_ipv4_3]->arg, argv[idx_ipv4_4]->arg, 1 ,1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 4;
+	int idx_ipv4_2 = 5;
+	int idx_ipv4_3 = 6;
+	int idx_ipv4_4 = 7;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, argv[idx_ipv4_3]->arg,
+				argv[idx_ipv4_4]->arg, 1, 1);
 }
 
 DEFUN (access_list_extended_mask_any,
@@ -871,13 +824,14 @@ DEFUN (access_list_extended_mask_any,
        "Source wildcard bits\n"
        "Any destination host\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 4;
-  int idx_ipv4_2 = 5;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   argv[idx_ipv4_2]->arg, "0.0.0.0",
-			   "255.255.255.255", 1, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 4;
+	int idx_ipv4_2 = 5;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, "0.0.0.0",
+				"255.255.255.255", 1, 1);
 }
 
 DEFUN (access_list_extended_any_mask,
@@ -893,13 +847,14 @@ DEFUN (access_list_extended_any_mask,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 5;
-  int idx_ipv4_2 = 6;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
-			   "255.255.255.255", argv[idx_ipv4]->arg,
-			   argv[idx_ipv4_2]->arg, 1, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 5;
+	int idx_ipv4_2 = 6;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, "0.0.0.0",
+				"255.255.255.255", argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, 1, 1);
 }
 
 DEFUN (access_list_extended_any_any,
@@ -914,11 +869,11 @@ DEFUN (access_list_extended_any_any,
        "Any source host\n"
        "Any destination host\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
-			   "255.255.255.255", "0.0.0.0",
-			   "255.255.255.255", 1, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	return filter_set_cisco(
+		vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
+		"255.255.255.255", "0.0.0.0", "255.255.255.255", 1, 1);
 }
 
 DEFUN (access_list_extended_mask_host,
@@ -935,14 +890,15 @@ DEFUN (access_list_extended_mask_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 4;
-  int idx_ipv4_2 = 5;
-  int idx_ipv4_3 = 7;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   argv[idx_ipv4_2]->arg, argv[idx_ipv4_3]->arg,
-			   "0.0.0.0", 1, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 4;
+	int idx_ipv4_2 = 5;
+	int idx_ipv4_3 = 7;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, argv[idx_ipv4_3]->arg,
+				"0.0.0.0", 1, 1);
 }
 
 DEFUN (access_list_extended_host_mask,
@@ -959,14 +915,15 @@ DEFUN (access_list_extended_host_mask,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 5;
-  int idx_ipv4_2 = 6;
-  int idx_ipv4_3 = 7;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   "0.0.0.0", argv[idx_ipv4_2]->arg,
-			   argv[idx_ipv4_3]->arg, 1, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 5;
+	int idx_ipv4_2 = 6;
+	int idx_ipv4_3 = 7;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", argv[idx_ipv4_2]->arg,
+				argv[idx_ipv4_3]->arg, 1, 1);
 }
 
 DEFUN (access_list_extended_host_host,
@@ -983,13 +940,14 @@ DEFUN (access_list_extended_host_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 5;
-  int idx_ipv4_2 = 7;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   "0.0.0.0", argv[idx_ipv4_2]->arg,
-			   "0.0.0.0", 1, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 5;
+	int idx_ipv4_2 = 7;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", argv[idx_ipv4_2]->arg, "0.0.0.0", 1,
+				1);
 }
 
 DEFUN (access_list_extended_any_host,
@@ -1005,12 +963,12 @@ DEFUN (access_list_extended_any_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 6;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
-			   "255.255.255.255", argv[idx_ipv4]->arg,
-			   "0.0.0.0", 1, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 6;
+	return filter_set_cisco(
+		vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
+		"255.255.255.255", argv[idx_ipv4]->arg, "0.0.0.0", 1, 1);
 }
 
 DEFUN (access_list_extended_host_any,
@@ -1026,12 +984,12 @@ DEFUN (access_list_extended_host_any,
        "Source address\n"
        "Any destination host\n")
 {
-  int idx_acl = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4 = 5;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   "0.0.0.0", "0.0.0.0",
-			   "255.255.255.255", 1, 1);
+	int idx_acl = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4 = 5;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", "0.0.0.0", "255.255.255.255", 1, 1);
 }
 
 DEFUN (no_access_list_extended,
@@ -1049,14 +1007,16 @@ DEFUN (no_access_list_extended,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 5;
-  int idx_ipv4_2 = 6;
-  int idx_ipv4_3 = 7;
-  int idx_ipv4_4 = 8;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   argv[idx_ipv4_2]->arg, argv[idx_ipv4_3]->arg, argv[idx_ipv4_4]->arg, 1, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 5;
+	int idx_ipv4_2 = 6;
+	int idx_ipv4_3 = 7;
+	int idx_ipv4_4 = 8;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, argv[idx_ipv4_3]->arg,
+				argv[idx_ipv4_4]->arg, 1, 0);
 }
 
 DEFUN (no_access_list_extended_mask_any,
@@ -1073,13 +1033,14 @@ DEFUN (no_access_list_extended_mask_any,
        "Source wildcard bits\n"
        "Any destination host\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 5;
-  int idx_ipv4_2 = 6;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   argv[idx_ipv4_2]->arg, "0.0.0.0",
-			   "255.255.255.255", 1, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 5;
+	int idx_ipv4_2 = 6;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, "0.0.0.0",
+				"255.255.255.255", 1, 0);
 }
 
 DEFUN (no_access_list_extended_any_mask,
@@ -1096,13 +1057,14 @@ DEFUN (no_access_list_extended_any_mask,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 6;
-  int idx_ipv4_2 = 7;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
-			   "255.255.255.255", argv[idx_ipv4]->arg,
-			   argv[idx_ipv4_2]->arg, 1, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 6;
+	int idx_ipv4_2 = 7;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, "0.0.0.0",
+				"255.255.255.255", argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, 1, 0);
 }
 
 DEFUN (no_access_list_extended_any_any,
@@ -1118,11 +1080,11 @@ DEFUN (no_access_list_extended_any_any,
        "Any source host\n"
        "Any destination host\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
-			   "255.255.255.255", "0.0.0.0",
-			   "255.255.255.255", 1, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	return filter_set_cisco(
+		vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
+		"255.255.255.255", "0.0.0.0", "255.255.255.255", 1, 0);
 }
 
 DEFUN (no_access_list_extended_mask_host,
@@ -1140,14 +1102,15 @@ DEFUN (no_access_list_extended_mask_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 5;
-  int idx_ipv4_2 = 6;
-  int idx_ipv4_3 = 8;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   argv[idx_ipv4_2]->arg, argv[idx_ipv4_3]->arg,
-			   "0.0.0.0", 1, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 5;
+	int idx_ipv4_2 = 6;
+	int idx_ipv4_3 = 8;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				argv[idx_ipv4_2]->arg, argv[idx_ipv4_3]->arg,
+				"0.0.0.0", 1, 0);
 }
 
 DEFUN (no_access_list_extended_host_mask,
@@ -1165,14 +1128,15 @@ DEFUN (no_access_list_extended_host_mask,
        "Destination address\n"
        "Destination Wildcard bits\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 6;
-  int idx_ipv4_2 = 7;
-  int idx_ipv4_3 = 8;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   "0.0.0.0", argv[idx_ipv4_2]->arg,
-			   argv[idx_ipv4_3]->arg, 1, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 6;
+	int idx_ipv4_2 = 7;
+	int idx_ipv4_3 = 8;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", argv[idx_ipv4_2]->arg,
+				argv[idx_ipv4_3]->arg, 1, 0);
 }
 
 DEFUN (no_access_list_extended_host_host,
@@ -1190,13 +1154,14 @@ DEFUN (no_access_list_extended_host_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 6;
-  int idx_ipv4_2 = 8;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   "0.0.0.0", argv[idx_ipv4_2]->arg,
-			   "0.0.0.0", 1, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 6;
+	int idx_ipv4_2 = 8;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", argv[idx_ipv4_2]->arg, "0.0.0.0", 1,
+				0);
 }
 
 DEFUN (no_access_list_extended_any_host,
@@ -1213,12 +1178,12 @@ DEFUN (no_access_list_extended_any_host,
        "A single destination host\n"
        "Destination address\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 7;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
-			   "255.255.255.255", argv[idx_ipv4]->arg,
-			   "0.0.0.0", 1, 0);
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 7;
+	return filter_set_cisco(
+		vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, "0.0.0.0",
+		"255.255.255.255", argv[idx_ipv4]->arg, "0.0.0.0", 1, 0);
 }
 
 DEFUN (no_access_list_extended_host_any,
@@ -1235,97 +1200,89 @@ DEFUN (no_access_list_extended_host_any,
        "Source address\n"
        "Any destination host\n")
 {
-  int idx_acl = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4 = 6;
-  return filter_set_cisco (vty, argv[idx_acl]->arg, argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
-			   "0.0.0.0", "0.0.0.0",
-			   "255.255.255.255", 1, 0);
-}
-
-static int
-filter_set_zebra (struct vty *vty, const char *name_str, const char *type_str,
-		  afi_t afi, const char *prefix_str, int exact, int set)
-{
-  int ret;
-  enum filter_type type;
-  struct filter *mfilter;
-  struct filter_zebra *filter;
-  struct access_list *access;
-  struct prefix p;
-
-  if (strlen(name_str) > ACL_NAMSIZ)
-    {
-      vty_out (vty, "%% ACL name %s is invalid: length exceeds "
-                    "%d characters\n",
-               name_str, ACL_NAMSIZ);
-      return CMD_WARNING_CONFIG_FAILED;
-    }
-
-  /* Check of filter type. */
-  if (strncmp (type_str, "p", 1) == 0)
-    type = FILTER_PERMIT;
-  else if (strncmp (type_str, "d", 1) == 0)
-    type = FILTER_DENY;
-  else
-    {
-      vty_out (vty, "filter type must be [permit|deny]\n");
-      return CMD_WARNING_CONFIG_FAILED;
-    }
-
-  /* Check string format of prefix and prefixlen. */
-  if (afi == AFI_IP)
-    {
-      ret = str2prefix_ipv4 (prefix_str, (struct prefix_ipv4 *)&p);
-      if (ret <= 0)
-	{
-	  vty_out (vty,"IP address prefix/prefixlen is malformed\n");
-          return CMD_WARNING_CONFIG_FAILED;
+	int idx_acl = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4 = 6;
+	return filter_set_cisco(vty, argv[idx_acl]->arg,
+				argv[idx_permit_deny]->arg, argv[idx_ipv4]->arg,
+				"0.0.0.0", "0.0.0.0", "255.255.255.255", 1, 0);
+}
+
+static int filter_set_zebra(struct vty *vty, const char *name_str,
+			    const char *type_str, afi_t afi,
+			    const char *prefix_str, int exact, int set)
+{
+	int ret;
+	enum filter_type type;
+	struct filter *mfilter;
+	struct filter_zebra *filter;
+	struct access_list *access;
+	struct prefix p;
+
+	if (strlen(name_str) > ACL_NAMSIZ) {
+		vty_out(vty,
+			"%% ACL name %s is invalid: length exceeds "
+			"%d characters\n",
+			name_str, ACL_NAMSIZ);
+		return CMD_WARNING_CONFIG_FAILED;
 	}
-    }
-  else if (afi == AFI_IP6)
-    {
-      ret = str2prefix_ipv6 (prefix_str, (struct prefix_ipv6 *) &p);
-      if (ret <= 0)
-	{
-	  vty_out (vty,"IPv6 address prefix/prefixlen is malformed\n");
-          return CMD_WARNING_CONFIG_FAILED;
-	}
-    }
-  else
-    return CMD_WARNING_CONFIG_FAILED;
-
-  mfilter = filter_new ();
-  mfilter->type = type;
-  filter = &mfilter->u.zfilter;
-  prefix_copy (&filter->prefix, &p);
-
-  /* "exact-match" */
-  if (exact)
-    filter->exact = 1;
 
-  /* Install new filter to the access_list. */
-  access = access_list_get (afi, name_str);
-
-  if (set)
-    {
-      if (filter_lookup_zebra (access, mfilter))
-	filter_free (mfilter);
-      else
-	access_list_filter_add (access, mfilter);
-    }
-  else
-    {
-      struct filter *delete_filter;
-
-      delete_filter = filter_lookup_zebra (access, mfilter);
-      if (delete_filter)
-        access_list_filter_delete (access, delete_filter);
+	/* Check of filter type. */
+	if (strncmp(type_str, "p", 1) == 0)
+		type = FILTER_PERMIT;
+	else if (strncmp(type_str, "d", 1) == 0)
+		type = FILTER_DENY;
+	else {
+		vty_out(vty, "filter type must be [permit|deny]\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-      filter_free (mfilter);
-    }
+	/* Check string format of prefix and prefixlen. */
+	if (afi == AFI_IP) {
+		ret = str2prefix_ipv4(prefix_str, (struct prefix_ipv4 *)&p);
+		if (ret <= 0) {
+			vty_out(vty,
+				"IP address prefix/prefixlen is malformed\n");
+			return CMD_WARNING_CONFIG_FAILED;
+		}
+	} else if (afi == AFI_IP6) {
+		ret = str2prefix_ipv6(prefix_str, (struct prefix_ipv6 *)&p);
+		if (ret <= 0) {
+			vty_out(vty,
+				"IPv6 address prefix/prefixlen is malformed\n");
+			return CMD_WARNING_CONFIG_FAILED;
+		}
+	} else
+		return CMD_WARNING_CONFIG_FAILED;
+
+	mfilter = filter_new();
+	mfilter->type = type;
+	filter = &mfilter->u.zfilter;
+	prefix_copy(&filter->prefix, &p);
+
+	/* "exact-match" */
+	if (exact)
+		filter->exact = 1;
+
+	/* Install new filter to the access_list. */
+	access = access_list_get(afi, name_str);
+
+	if (set) {
+		if (filter_lookup_zebra(access, mfilter))
+			filter_free(mfilter);
+		else
+			access_list_filter_add(access, mfilter);
+	} else {
+		struct filter *delete_filter;
+
+		delete_filter = filter_lookup_zebra(access, mfilter);
+		if (delete_filter)
+			access_list_filter_delete(access, delete_filter);
+
+		filter_free(mfilter);
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (access_list_exact,
@@ -1338,18 +1295,19 @@ DEFUN (access_list_exact,
        "Prefix to match. e.g. 10.0.0.0/8\n"
        "Exact match of the prefixes\n")
 {
-  int idx;
-  int exact = 0;
-  int idx_word = 1;
-  int idx_permit_deny = 2;
-  int idx_ipv4_prefixlen = 3;
-  idx = idx_ipv4_prefixlen;
+	int idx;
+	int exact = 0;
+	int idx_word = 1;
+	int idx_permit_deny = 2;
+	int idx_ipv4_prefixlen = 3;
+	idx = idx_ipv4_prefixlen;
 
-  if (argv_find (argv, argc, "exact-match", &idx))
-    exact = 1;
+	if (argv_find(argv, argc, "exact-match", &idx))
+		exact = 1;
 
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_permit_deny]->arg,
-                           AFI_IP, argv[idx_ipv4_prefixlen]->arg, exact, 1);
+	return filter_set_zebra(vty, argv[idx_word]->arg,
+				argv[idx_permit_deny]->arg, AFI_IP,
+				argv[idx_ipv4_prefixlen]->arg, exact, 1);
 }
 
 DEFUN (access_list_any,
@@ -1361,9 +1319,11 @@ DEFUN (access_list_any,
        "Specify packets to forward\n"
        "Prefix to match. e.g. 10.0.0.0/8\n")
 {
-  int idx_word = 1;
-  int idx_permit_deny = 2;
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_permit_deny]->arg, AFI_IP, "0.0.0.0/0", 0, 1);
+	int idx_word = 1;
+	int idx_permit_deny = 2;
+	return filter_set_zebra(vty, argv[idx_word]->arg,
+				argv[idx_permit_deny]->arg, AFI_IP, "0.0.0.0/0",
+				0, 1);
 }
 
 DEFUN (no_access_list_exact,
@@ -1377,17 +1337,19 @@ DEFUN (no_access_list_exact,
        "Prefix to match. e.g. 10.0.0.0/8\n"
        "Exact match of the prefixes\n")
 {
-  int idx;
-  int exact = 0;
-  int idx_word = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv4_prefixlen = 4;
-  idx = idx_ipv4_prefixlen;
+	int idx;
+	int exact = 0;
+	int idx_word = 2;
+	int idx_permit_deny = 3;
+	int idx_ipv4_prefixlen = 4;
+	idx = idx_ipv4_prefixlen;
 
-  if (argv_find (argv, argc, "exact-match", &idx))
-    exact = 1;
+	if (argv_find(argv, argc, "exact-match", &idx))
+		exact = 1;
 
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_permit_deny]->arg, AFI_IP, argv[idx_ipv4_prefixlen]->arg, exact, 0);
+	return filter_set_zebra(vty, argv[idx_word]->arg,
+				argv[idx_permit_deny]->arg, AFI_IP,
+				argv[idx_ipv4_prefixlen]->arg, exact, 0);
 }
 
 DEFUN (no_access_list_any,
@@ -1400,9 +1362,11 @@ DEFUN (no_access_list_any,
        "Specify packets to forward\n"
        "Prefix to match. e.g. 10.0.0.0/8\n")
 {
-  int idx_word = 2;
-  int idx_permit_deny = 3;
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_permit_deny]->arg, AFI_IP, "0.0.0.0/0", 0, 0);
+	int idx_word = 2;
+	int idx_permit_deny = 3;
+	return filter_set_zebra(vty, argv[idx_word]->arg,
+				argv[idx_permit_deny]->arg, AFI_IP, "0.0.0.0/0",
+				0, 0);
 }
 
 DEFUN (no_access_list_all,
@@ -1416,29 +1380,29 @@ DEFUN (no_access_list_all,
        "IP extended access list (expanded range)\n"
        "IP zebra access-list name\n")
 {
-  int idx_acl = 2;
-  struct access_list *access;
-  struct access_master *master;
+	int idx_acl = 2;
+	struct access_list *access;
+	struct access_master *master;
 
-  /* Looking up access_list. */
-  access = access_list_lookup (AFI_IP, argv[idx_acl]->arg);
-  if (access == NULL)
-    {
-      vty_out (vty, "%% access-list %s doesn't exist\n",argv[idx_acl]->arg);
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	/* Looking up access_list. */
+	access = access_list_lookup(AFI_IP, argv[idx_acl]->arg);
+	if (access == NULL) {
+		vty_out(vty, "%% access-list %s doesn't exist\n",
+			argv[idx_acl]->arg);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	master = access->master;
 
-  master = access->master;
+	route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_DELETED);
+	/* Run hook function. */
+	if (master->delete_hook)
+		(*master->delete_hook)(access);
 
-  route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_DELETED);
-  /* Run hook function. */
-  if (master->delete_hook)
-    (*master->delete_hook) (access);
- 
-  /* Delete all filter from access-list. */
-  access_list_delete (access);
+	/* Delete all filter from access-list. */
+	access_list_delete(access);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (access_list_remark,
@@ -1453,20 +1417,19 @@ DEFUN (access_list_remark,
        "Access list entry comment\n"
        "Comment up to 100 characters\n")
 {
-  int idx_acl = 1;
-  int idx_remark = 3;
-  struct access_list *access;
+	int idx_acl = 1;
+	int idx_remark = 3;
+	struct access_list *access;
 
-  access = access_list_get (AFI_IP, argv[idx_acl]->arg);
+	access = access_list_get(AFI_IP, argv[idx_acl]->arg);
 
-  if (access->remark)
-    {
-      XFREE (MTYPE_TMP, access->remark);
-      access->remark = NULL;
-    }
-  access->remark = argv_concat(argv, argc, idx_remark);
+	if (access->remark) {
+		XFREE(MTYPE_TMP, access->remark);
+		access->remark = NULL;
+	}
+	access->remark = argv_concat(argv, argc, idx_remark);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_access_list_remark,
@@ -1481,8 +1444,8 @@ DEFUN (no_access_list_remark,
        "IP zebra access-list\n"
        "Access list entry comment\n")
 {
-  int idx_acl = 2;
-  return vty_access_list_remark_unset (vty, AFI_IP, argv[idx_acl]->arg);
+	int idx_acl = 2;
+	return vty_access_list_remark_unset(vty, AFI_IP, argv[idx_acl]->arg);
 }
 
 /* ALIAS_FIXME */
@@ -1499,7 +1462,7 @@ DEFUN (no_access_list_remark_comment,
        "Access list entry comment\n"
        "Comment up to 100 characters\n")
 {
-  return no_access_list_remark (self, vty, argc, argv);
+	return no_access_list_remark(self, vty, argc, argv);
 }
 
 DEFUN (ipv6_access_list_exact,
@@ -1513,18 +1476,18 @@ DEFUN (ipv6_access_list_exact,
        "IPv6 prefix\n"
        "Exact match of the prefixes\n")
 {
-  int idx;
-  int exact = 0;
-  int idx_word = 2;
-  int idx_allow = 3;
-  int idx_addr = 4;
-  idx = idx_addr;
+	int idx;
+	int exact = 0;
+	int idx_word = 2;
+	int idx_allow = 3;
+	int idx_addr = 4;
+	idx = idx_addr;
 
-  if (argv_find (argv, argc, "exact-match", &idx))
-    exact = 1;
+	if (argv_find(argv, argc, "exact-match", &idx))
+		exact = 1;
 
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_allow]->text,
-                           AFI_IP6, argv[idx_addr]->arg, exact, 1);
+	return filter_set_zebra(vty, argv[idx_word]->arg, argv[idx_allow]->text,
+				AFI_IP6, argv[idx_addr]->arg, exact, 1);
 }
 
 DEFUN (ipv6_access_list_any,
@@ -1537,9 +1500,11 @@ DEFUN (ipv6_access_list_any,
        "Specify packets to forward\n"
        "Any prefixi to match\n")
 {
-  int idx_word = 2;
-  int idx_permit_deny = 3;
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_permit_deny]->arg, AFI_IP6, "::/0", 0, 1);
+	int idx_word = 2;
+	int idx_permit_deny = 3;
+	return filter_set_zebra(vty, argv[idx_word]->arg,
+				argv[idx_permit_deny]->arg, AFI_IP6, "::/0", 0,
+				1);
 }
 
 DEFUN (no_ipv6_access_list_exact,
@@ -1554,18 +1519,19 @@ DEFUN (no_ipv6_access_list_exact,
        "Prefix to match. e.g. 3ffe:506::/32\n"
        "Exact match of the prefixes\n")
 {
-  int idx;
-  int exact = 0;
-  int idx_word = 3;
-  int idx_permit_deny = 4;
-  int idx_ipv6_prefixlen = 5;
-  idx = idx_ipv6_prefixlen;
+	int idx;
+	int exact = 0;
+	int idx_word = 3;
+	int idx_permit_deny = 4;
+	int idx_ipv6_prefixlen = 5;
+	idx = idx_ipv6_prefixlen;
 
-  if (argv_find (argv, argc, "exact-match", &idx))
-    exact = 1;
+	if (argv_find(argv, argc, "exact-match", &idx))
+		exact = 1;
 
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_permit_deny]->arg,
-                           AFI_IP6, argv[idx_ipv6_prefixlen]->arg, exact, 0);
+	return filter_set_zebra(vty, argv[idx_word]->arg,
+				argv[idx_permit_deny]->arg, AFI_IP6,
+				argv[idx_ipv6_prefixlen]->arg, exact, 0);
 }
 
 DEFUN (no_ipv6_access_list_any,
@@ -1579,9 +1545,11 @@ DEFUN (no_ipv6_access_list_any,
        "Specify packets to forward\n"
        "Any prefixi to match\n")
 {
-  int idx_word = 3;
-  int idx_permit_deny = 4;
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_permit_deny]->arg, AFI_IP6, "::/0", 0, 0);
+	int idx_word = 3;
+	int idx_permit_deny = 4;
+	return filter_set_zebra(vty, argv[idx_word]->arg,
+				argv[idx_permit_deny]->arg, AFI_IP6, "::/0", 0,
+				0);
 }
 
 
@@ -1593,29 +1561,29 @@ DEFUN (no_ipv6_access_list_all,
        "Add an access list entry\n"
        "IPv6 zebra access-list\n")
 {
-  int idx_word = 3;
-  struct access_list *access;
-  struct access_master *master;
+	int idx_word = 3;
+	struct access_list *access;
+	struct access_master *master;
 
-  /* Looking up access_list. */
-  access = access_list_lookup (AFI_IP6, argv[idx_word]->arg);
-  if (access == NULL)
-    {
-      vty_out (vty, "%% access-list %s doesn't exist\n",argv[idx_word]->arg);
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	/* Looking up access_list. */
+	access = access_list_lookup(AFI_IP6, argv[idx_word]->arg);
+	if (access == NULL) {
+		vty_out(vty, "%% access-list %s doesn't exist\n",
+			argv[idx_word]->arg);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  master = access->master;
+	master = access->master;
 
-  route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_DELETED);
-  /* Run hook function. */
-  if (master->delete_hook)
-    (*master->delete_hook) (access);
+	route_map_notify_dependencies(access->name, RMAP_EVENT_FILTER_DELETED);
+	/* Run hook function. */
+	if (master->delete_hook)
+		(*master->delete_hook)(access);
 
-  /* Delete all filter from access-list. */
-  access_list_delete (access);
+	/* Delete all filter from access-list. */
+	access_list_delete(access);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ipv6_access_list_remark,
@@ -1627,20 +1595,19 @@ DEFUN (ipv6_access_list_remark,
        "Access list entry comment\n"
        "Comment up to 100 characters\n")
 {
-  int idx_word = 2;
-  int idx_line = 4;
-  struct access_list *access;
+	int idx_word = 2;
+	int idx_line = 4;
+	struct access_list *access;
 
-  access = access_list_get (AFI_IP6, argv[idx_word]->arg);
+	access = access_list_get(AFI_IP6, argv[idx_word]->arg);
 
-  if (access->remark)
-    {
-      XFREE (MTYPE_TMP, access->remark);
-      access->remark = NULL;
-    }
-  access->remark = argv_concat(argv, argc, idx_line);
+	if (access->remark) {
+		XFREE(MTYPE_TMP, access->remark);
+		access->remark = NULL;
+	}
+	access->remark = argv_concat(argv, argc, idx_line);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ipv6_access_list_remark,
@@ -1652,8 +1619,8 @@ DEFUN (no_ipv6_access_list_remark,
        "IPv6 zebra access-list\n"
        "Access list entry comment\n")
 {
-  int idx_word = 3;
-  return vty_access_list_remark_unset (vty, AFI_IP6, argv[idx_word]->arg);
+	int idx_word = 3;
+	return vty_access_list_remark_unset(vty, AFI_IP6, argv[idx_word]->arg);
 }
 
 /* ALIAS_FIXME */
@@ -1667,115 +1634,116 @@ DEFUN (no_ipv6_access_list_remark_comment,
        "Access list entry comment\n"
        "Comment up to 100 characters\n")
 {
-  return no_ipv6_access_list_remark (self, vty, argc, argv);
+	return no_ipv6_access_list_remark(self, vty, argc, argv);
 }
 
-void config_write_access_zebra (struct vty *, struct filter *);
-void config_write_access_cisco (struct vty *, struct filter *);
+void config_write_access_zebra(struct vty *, struct filter *);
+void config_write_access_cisco(struct vty *, struct filter *);
 
 /* show access-list command. */
-static int
-filter_show (struct vty *vty, const char *name, afi_t afi)
-{
-  struct access_list *access;
-  struct access_master *master;
-  struct filter *mfilter;
-  struct filter_cisco *filter;
-  int write = 0;
-
-  master = access_master_get (afi);
-  if (master == NULL)
-    return 0;
-
-  /* Print the name of the protocol */
-  vty_out (vty, "%s:\n", frr_protoname);
-
-  for (access = master->num.head; access; access = access->next)
-    {
-      if (name && strcmp (access->name, name) != 0)
-	continue;
-
-      write = 1;
-
-      for (mfilter = access->head; mfilter; mfilter = mfilter->next)
-	{
-	  filter = &mfilter->u.cfilter;
-
-	  if (write)
-	    {
-	      vty_out (vty, "%s IP%s access list %s\n",
-		       mfilter->cisco ? 
-		       (filter->extended ? "Extended" : "Standard") : "Zebra",
-		       afi == AFI_IP6 ? "v6" : "",
-		       access->name);
-	      write = 0;
-	    }
-
-	  vty_out (vty, "    %s%s", filter_type_str (mfilter),
-		   mfilter->type == FILTER_DENY ? "  " : "");
-
-	  if (! mfilter->cisco)
-	    config_write_access_zebra (vty, mfilter);
-	  else if (filter->extended)
-	    config_write_access_cisco (vty, mfilter);
-	  else
-	    {
-	      if (filter->addr_mask.s_addr == 0xffffffff)
-		vty_out (vty, " any\n");
-	      else
-		{
-		  vty_out (vty, " %s", inet_ntoa (filter->addr));
-		  if (filter->addr_mask.s_addr != 0)
-		    vty_out (vty, ", wildcard bits %s", inet_ntoa (filter->addr_mask));
-		  vty_out (vty, "\n");
+static int filter_show(struct vty *vty, const char *name, afi_t afi)
+{
+	struct access_list *access;
+	struct access_master *master;
+	struct filter *mfilter;
+	struct filter_cisco *filter;
+	int write = 0;
+
+	master = access_master_get(afi);
+	if (master == NULL)
+		return 0;
+
+	/* Print the name of the protocol */
+	vty_out(vty, "%s:\n", frr_protoname);
+
+	for (access = master->num.head; access; access = access->next) {
+		if (name && strcmp(access->name, name) != 0)
+			continue;
+
+		write = 1;
+
+		for (mfilter = access->head; mfilter; mfilter = mfilter->next) {
+			filter = &mfilter->u.cfilter;
+
+			if (write) {
+				vty_out(vty, "%s IP%s access list %s\n",
+					mfilter->cisco ? (filter->extended
+								  ? "Extended"
+								  : "Standard")
+						       : "Zebra",
+					afi == AFI_IP6 ? "v6" : "",
+					access->name);
+				write = 0;
+			}
+
+			vty_out(vty, "    %s%s", filter_type_str(mfilter),
+				mfilter->type == FILTER_DENY ? "  " : "");
+
+			if (!mfilter->cisco)
+				config_write_access_zebra(vty, mfilter);
+			else if (filter->extended)
+				config_write_access_cisco(vty, mfilter);
+			else {
+				if (filter->addr_mask.s_addr == 0xffffffff)
+					vty_out(vty, " any\n");
+				else {
+					vty_out(vty, " %s",
+						inet_ntoa(filter->addr));
+					if (filter->addr_mask.s_addr != 0)
+						vty_out(vty,
+							", wildcard bits %s",
+							inet_ntoa(
+								filter->addr_mask));
+					vty_out(vty, "\n");
+				}
+			}
 		}
-	    }
 	}
-    }
-
-  for (access = master->str.head; access; access = access->next)
-    {
-      if (name && strcmp (access->name, name) != 0)
-	continue;
-
-      write = 1;
-
-      for (mfilter = access->head; mfilter; mfilter = mfilter->next)
-	{
-	  filter = &mfilter->u.cfilter;
-
-	  if (write)
-	    {
-	      vty_out (vty, "%s IP%s access list %s\n",
-		       mfilter->cisco ? 
-		       (filter->extended ? "Extended" : "Standard") : "Zebra",
-		       afi == AFI_IP6 ? "v6" : "",
-		       access->name);
-	      write = 0;
-	    }
-
-	  vty_out (vty, "    %s%s", filter_type_str (mfilter),
-		   mfilter->type == FILTER_DENY ? "  " : "");
-
-	  if (! mfilter->cisco)
-	    config_write_access_zebra (vty, mfilter);
-	  else if (filter->extended)
-	    config_write_access_cisco (vty, mfilter);
-	  else
-	    {
-	      if (filter->addr_mask.s_addr == 0xffffffff)
-		vty_out (vty, " any\n");
-	      else
-		{
-		  vty_out (vty, " %s", inet_ntoa (filter->addr));
-		  if (filter->addr_mask.s_addr != 0)
-		    vty_out (vty, ", wildcard bits %s", inet_ntoa (filter->addr_mask));
-		  vty_out (vty, "\n");
+
+	for (access = master->str.head; access; access = access->next) {
+		if (name && strcmp(access->name, name) != 0)
+			continue;
+
+		write = 1;
+
+		for (mfilter = access->head; mfilter; mfilter = mfilter->next) {
+			filter = &mfilter->u.cfilter;
+
+			if (write) {
+				vty_out(vty, "%s IP%s access list %s\n",
+					mfilter->cisco ? (filter->extended
+								  ? "Extended"
+								  : "Standard")
+						       : "Zebra",
+					afi == AFI_IP6 ? "v6" : "",
+					access->name);
+				write = 0;
+			}
+
+			vty_out(vty, "    %s%s", filter_type_str(mfilter),
+				mfilter->type == FILTER_DENY ? "  " : "");
+
+			if (!mfilter->cisco)
+				config_write_access_zebra(vty, mfilter);
+			else if (filter->extended)
+				config_write_access_cisco(vty, mfilter);
+			else {
+				if (filter->addr_mask.s_addr == 0xffffffff)
+					vty_out(vty, " any\n");
+				else {
+					vty_out(vty, " %s",
+						inet_ntoa(filter->addr));
+					if (filter->addr_mask.s_addr != 0)
+						vty_out(vty,
+							", wildcard bits %s",
+							inet_ntoa(
+								filter->addr_mask));
+					vty_out(vty, "\n");
+				}
+			}
 		}
-	    }
 	}
-    }
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_access_list,
@@ -1785,7 +1753,7 @@ DEFUN (show_ip_access_list,
        IP_STR
        "List IP access lists\n")
 {
-  return filter_show (vty, NULL, AFI_IP);
+	return filter_show(vty, NULL, AFI_IP);
 }
 
 DEFUN (show_ip_access_list_name,
@@ -1800,8 +1768,8 @@ DEFUN (show_ip_access_list_name,
        "IP extended access list (expanded range)\n"
        "IP zebra access-list\n")
 {
-  int idx_acl = 3;
-  return filter_show (vty, argv[idx_acl]->arg, AFI_IP);
+	int idx_acl = 3;
+	return filter_show(vty, argv[idx_acl]->arg, AFI_IP);
 }
 
 DEFUN (show_ipv6_access_list,
@@ -1811,7 +1779,7 @@ DEFUN (show_ipv6_access_list,
        IPV6_STR
        "List IPv6 access lists\n")
 {
-  return filter_show (vty, NULL, AFI_IP6);
+	return filter_show(vty, NULL, AFI_IP6);
 }
 
 DEFUN (show_ipv6_access_list_name,
@@ -1822,307 +1790,270 @@ DEFUN (show_ipv6_access_list_name,
        "List IPv6 access lists\n"
        "IPv6 zebra access-list\n")
 {
-  int idx_word = 3;
-  return filter_show (vty, argv[idx_word]->arg, AFI_IP6);
-}
-
-void
-config_write_access_cisco (struct vty *vty, struct filter *mfilter)
-{
-  struct filter_cisco *filter;
-
-  filter = &mfilter->u.cfilter;
-
-  if (filter->extended)
-    {
-      vty_out (vty, " ip");
-      if (filter->addr_mask.s_addr == 0xffffffff)
-	vty_out (vty, " any");
-      else if (filter->addr_mask.s_addr == 0)
-	vty_out (vty, " host %s", inet_ntoa (filter->addr));
-      else
-	{
-	  vty_out (vty, " %s", inet_ntoa (filter->addr));
-	  vty_out (vty, " %s", inet_ntoa (filter->addr_mask));
-        }
-
-      if (filter->mask_mask.s_addr == 0xffffffff)
-	vty_out (vty, " any");
-      else if (filter->mask_mask.s_addr == 0)
-	vty_out (vty, " host %s", inet_ntoa (filter->mask));
-      else
-	{
-	  vty_out (vty, " %s", inet_ntoa (filter->mask));
-	  vty_out (vty, " %s", inet_ntoa (filter->mask_mask));
-	}
-      vty_out (vty, "\n");
-    }
-  else
-    {
-      if (filter->addr_mask.s_addr == 0xffffffff)
-	vty_out (vty, " any\n");
-      else
-	{
-	  vty_out (vty, " %s", inet_ntoa (filter->addr));
-	  if (filter->addr_mask.s_addr != 0)
-	    vty_out (vty, " %s", inet_ntoa (filter->addr_mask));
-	  vty_out (vty, "\n");
+	int idx_word = 3;
+	return filter_show(vty, argv[idx_word]->arg, AFI_IP6);
+}
+
+void config_write_access_cisco(struct vty *vty, struct filter *mfilter)
+{
+	struct filter_cisco *filter;
+
+	filter = &mfilter->u.cfilter;
+
+	if (filter->extended) {
+		vty_out(vty, " ip");
+		if (filter->addr_mask.s_addr == 0xffffffff)
+			vty_out(vty, " any");
+		else if (filter->addr_mask.s_addr == 0)
+			vty_out(vty, " host %s", inet_ntoa(filter->addr));
+		else {
+			vty_out(vty, " %s", inet_ntoa(filter->addr));
+			vty_out(vty, " %s", inet_ntoa(filter->addr_mask));
+		}
+
+		if (filter->mask_mask.s_addr == 0xffffffff)
+			vty_out(vty, " any");
+		else if (filter->mask_mask.s_addr == 0)
+			vty_out(vty, " host %s", inet_ntoa(filter->mask));
+		else {
+			vty_out(vty, " %s", inet_ntoa(filter->mask));
+			vty_out(vty, " %s", inet_ntoa(filter->mask_mask));
+		}
+		vty_out(vty, "\n");
+	} else {
+		if (filter->addr_mask.s_addr == 0xffffffff)
+			vty_out(vty, " any\n");
+		else {
+			vty_out(vty, " %s", inet_ntoa(filter->addr));
+			if (filter->addr_mask.s_addr != 0)
+				vty_out(vty, " %s",
+					inet_ntoa(filter->addr_mask));
+			vty_out(vty, "\n");
+		}
 	}
-    }
 }
 
-void
-config_write_access_zebra (struct vty *vty, struct filter *mfilter)
+void config_write_access_zebra(struct vty *vty, struct filter *mfilter)
 {
-  struct filter_zebra *filter;
-  struct prefix *p;
-  char buf[BUFSIZ];
+	struct filter_zebra *filter;
+	struct prefix *p;
+	char buf[BUFSIZ];
 
-  filter = &mfilter->u.zfilter;
-  p = &filter->prefix;
+	filter = &mfilter->u.zfilter;
+	p = &filter->prefix;
 
-  if (p->prefixlen == 0 && ! filter->exact)
-    vty_out (vty, " any");
-  else
-    vty_out (vty, " %s/%d%s",
-	     inet_ntop (p->family, &p->u.prefix, buf, BUFSIZ),
-	     p->prefixlen,
-	     filter->exact ? " exact-match" : "");
+	if (p->prefixlen == 0 && !filter->exact)
+		vty_out(vty, " any");
+	else
+		vty_out(vty, " %s/%d%s",
+			inet_ntop(p->family, &p->u.prefix, buf, BUFSIZ),
+			p->prefixlen, filter->exact ? " exact-match" : "");
 
-  vty_out (vty, "\n");
+	vty_out(vty, "\n");
 }
 
-static int
-config_write_access (struct vty *vty, afi_t afi)
+static int config_write_access(struct vty *vty, afi_t afi)
 {
-  struct access_list *access;
-  struct access_master *master;
-  struct filter *mfilter;
-  int write = 0;
+	struct access_list *access;
+	struct access_master *master;
+	struct filter *mfilter;
+	int write = 0;
 
-  master = access_master_get (afi);
-  if (master == NULL)
-    return 0;
+	master = access_master_get(afi);
+	if (master == NULL)
+		return 0;
 
-  for (access = master->num.head; access; access = access->next)
-    {
-      if (access->remark)
-	{
-	  vty_out (vty, "%saccess-list %s remark %s\n",
-		   afi == AFI_IP ? "" : "ipv6 ",
-		   access->name,access->remark);
-	  write++;
-	}
+	for (access = master->num.head; access; access = access->next) {
+		if (access->remark) {
+			vty_out(vty, "%saccess-list %s remark %s\n",
+				afi == AFI_IP ? "" : "ipv6 ", access->name,
+				access->remark);
+			write++;
+		}
 
-      for (mfilter = access->head; mfilter; mfilter = mfilter->next)
-	{
-	  vty_out (vty, "%saccess-list %s %s",
-	     afi == AFI_IP ? "" : "ipv6 ",
-	     access->name,
-	     filter_type_str (mfilter));
+		for (mfilter = access->head; mfilter; mfilter = mfilter->next) {
+			vty_out(vty, "%saccess-list %s %s",
+				afi == AFI_IP ? "" : "ipv6 ", access->name,
+				filter_type_str(mfilter));
 
-	  if (mfilter->cisco)
-	    config_write_access_cisco (vty, mfilter);
-	  else
-	    config_write_access_zebra (vty, mfilter);
+			if (mfilter->cisco)
+				config_write_access_cisco(vty, mfilter);
+			else
+				config_write_access_zebra(vty, mfilter);
 
-	  write++;
-	}
-    }
-
-  for (access = master->str.head; access; access = access->next)
-    {
-      if (access->remark)
-	{
-	  vty_out (vty, "%saccess-list %s remark %s\n",
-		   afi == AFI_IP ? "" : "ipv6 ",
-		   access->name,access->remark);
-	  write++;
+			write++;
+		}
 	}
 
-      for (mfilter = access->head; mfilter; mfilter = mfilter->next)
-	{
-	  vty_out (vty, "%saccess-list %s %s",
-	     afi == AFI_IP ? "" : "ipv6 ",
-	     access->name,
-	     filter_type_str (mfilter));
+	for (access = master->str.head; access; access = access->next) {
+		if (access->remark) {
+			vty_out(vty, "%saccess-list %s remark %s\n",
+				afi == AFI_IP ? "" : "ipv6 ", access->name,
+				access->remark);
+			write++;
+		}
+
+		for (mfilter = access->head; mfilter; mfilter = mfilter->next) {
+			vty_out(vty, "%saccess-list %s %s",
+				afi == AFI_IP ? "" : "ipv6 ", access->name,
+				filter_type_str(mfilter));
 
-	  if (mfilter->cisco)
-	    config_write_access_cisco (vty, mfilter);
-	  else
-	    config_write_access_zebra (vty, mfilter);
+			if (mfilter->cisco)
+				config_write_access_cisco(vty, mfilter);
+			else
+				config_write_access_zebra(vty, mfilter);
 
-	  write++;
+			write++;
+		}
 	}
-    }
-  return write;
+	return write;
 }
 
 /* Access-list node. */
-static struct cmd_node access_node =
-{
-  ACCESS_NODE,
-  "",				/* Access list has no interface. */
-  1
-};
+static struct cmd_node access_node = {ACCESS_NODE,
+				      "", /* Access list has no interface. */
+				      1};
 
-static int
-config_write_access_ipv4 (struct vty *vty)
+static int config_write_access_ipv4(struct vty *vty)
 {
-  return config_write_access (vty, AFI_IP);
+	return config_write_access(vty, AFI_IP);
 }
 
-static void
-access_list_reset_ipv4 (void)
+static void access_list_reset_ipv4(void)
 {
-  struct access_list *access;
-  struct access_list *next;
-  struct access_master *master;
+	struct access_list *access;
+	struct access_list *next;
+	struct access_master *master;
 
-  master = access_master_get (AFI_IP);
-  if (master == NULL)
-    return;
+	master = access_master_get(AFI_IP);
+	if (master == NULL)
+		return;
 
-  for (access = master->num.head; access; access = next)
-    {
-      next = access->next;
-      access_list_delete (access);
-    }
-  for (access = master->str.head; access; access = next)
-    {
-      next = access->next;
-      access_list_delete (access);
-    }
+	for (access = master->num.head; access; access = next) {
+		next = access->next;
+		access_list_delete(access);
+	}
+	for (access = master->str.head; access; access = next) {
+		next = access->next;
+		access_list_delete(access);
+	}
 
-  assert (master->num.head == NULL);
-  assert (master->num.tail == NULL);
+	assert(master->num.head == NULL);
+	assert(master->num.tail == NULL);
 
-  assert (master->str.head == NULL);
-  assert (master->str.tail == NULL);
+	assert(master->str.head == NULL);
+	assert(master->str.tail == NULL);
 }
 
 /* Install vty related command. */
-static void
-access_list_init_ipv4 (void)
-{
-  install_node (&access_node, config_write_access_ipv4);
-
-  install_element (ENABLE_NODE, &show_ip_access_list_cmd);
-  install_element (ENABLE_NODE, &show_ip_access_list_name_cmd);
-
-  /* Zebra access-list */
-  install_element (CONFIG_NODE, &access_list_exact_cmd);
-  install_element (CONFIG_NODE, &access_list_any_cmd);
-  install_element (CONFIG_NODE, &no_access_list_exact_cmd);
-  install_element (CONFIG_NODE, &no_access_list_any_cmd);
-
-  /* Standard access-list */
-  install_element (CONFIG_NODE, &access_list_standard_cmd);
-  install_element (CONFIG_NODE, &access_list_standard_nomask_cmd);
-  install_element (CONFIG_NODE, &access_list_standard_host_cmd);
-  install_element (CONFIG_NODE, &access_list_standard_any_cmd);
-  install_element (CONFIG_NODE, &no_access_list_standard_cmd);
-  install_element (CONFIG_NODE, &no_access_list_standard_nomask_cmd);
-  install_element (CONFIG_NODE, &no_access_list_standard_host_cmd);
-  install_element (CONFIG_NODE, &no_access_list_standard_any_cmd);
-
-  /* Extended access-list */
-  install_element (CONFIG_NODE, &access_list_extended_cmd);
-  install_element (CONFIG_NODE, &access_list_extended_any_mask_cmd);
-  install_element (CONFIG_NODE, &access_list_extended_mask_any_cmd);
-  install_element (CONFIG_NODE, &access_list_extended_any_any_cmd);
-  install_element (CONFIG_NODE, &access_list_extended_host_mask_cmd);
-  install_element (CONFIG_NODE, &access_list_extended_mask_host_cmd);
-  install_element (CONFIG_NODE, &access_list_extended_host_host_cmd);
-  install_element (CONFIG_NODE, &access_list_extended_any_host_cmd);
-  install_element (CONFIG_NODE, &access_list_extended_host_any_cmd);
-  install_element (CONFIG_NODE, &no_access_list_extended_cmd);
-  install_element (CONFIG_NODE, &no_access_list_extended_any_mask_cmd);
-  install_element (CONFIG_NODE, &no_access_list_extended_mask_any_cmd);
-  install_element (CONFIG_NODE, &no_access_list_extended_any_any_cmd);
-  install_element (CONFIG_NODE, &no_access_list_extended_host_mask_cmd);
-  install_element (CONFIG_NODE, &no_access_list_extended_mask_host_cmd);
-  install_element (CONFIG_NODE, &no_access_list_extended_host_host_cmd);
-  install_element (CONFIG_NODE, &no_access_list_extended_any_host_cmd);
-  install_element (CONFIG_NODE, &no_access_list_extended_host_any_cmd);
-
-  install_element (CONFIG_NODE, &access_list_remark_cmd);
-  install_element (CONFIG_NODE, &no_access_list_all_cmd);
-  install_element (CONFIG_NODE, &no_access_list_remark_cmd);
-  install_element (CONFIG_NODE, &no_access_list_remark_comment_cmd);
-}
-
-static struct cmd_node access_ipv6_node =
-{
-  ACCESS_IPV6_NODE,
-  "",
-  1
-};
-
-static int
-config_write_access_ipv6 (struct vty *vty)
-{
-  return config_write_access (vty, AFI_IP6);
-}
-
-static void
-access_list_reset_ipv6 (void)
-{
-  struct access_list *access;
-  struct access_list *next;
-  struct access_master *master;
-
-  master = access_master_get (AFI_IP6);
-  if (master == NULL)
-    return;
-
-  for (access = master->num.head; access; access = next)
-    {
-      next = access->next;
-      access_list_delete (access);
-    }
-  for (access = master->str.head; access; access = next)
-    {
-      next = access->next;
-      access_list_delete (access);
-    }
+static void access_list_init_ipv4(void)
+{
+	install_node(&access_node, config_write_access_ipv4);
+
+	install_element(ENABLE_NODE, &show_ip_access_list_cmd);
+	install_element(ENABLE_NODE, &show_ip_access_list_name_cmd);
+
+	/* Zebra access-list */
+	install_element(CONFIG_NODE, &access_list_exact_cmd);
+	install_element(CONFIG_NODE, &access_list_any_cmd);
+	install_element(CONFIG_NODE, &no_access_list_exact_cmd);
+	install_element(CONFIG_NODE, &no_access_list_any_cmd);
+
+	/* Standard access-list */
+	install_element(CONFIG_NODE, &access_list_standard_cmd);
+	install_element(CONFIG_NODE, &access_list_standard_nomask_cmd);
+	install_element(CONFIG_NODE, &access_list_standard_host_cmd);
+	install_element(CONFIG_NODE, &access_list_standard_any_cmd);
+	install_element(CONFIG_NODE, &no_access_list_standard_cmd);
+	install_element(CONFIG_NODE, &no_access_list_standard_nomask_cmd);
+	install_element(CONFIG_NODE, &no_access_list_standard_host_cmd);
+	install_element(CONFIG_NODE, &no_access_list_standard_any_cmd);
+
+	/* Extended access-list */
+	install_element(CONFIG_NODE, &access_list_extended_cmd);
+	install_element(CONFIG_NODE, &access_list_extended_any_mask_cmd);
+	install_element(CONFIG_NODE, &access_list_extended_mask_any_cmd);
+	install_element(CONFIG_NODE, &access_list_extended_any_any_cmd);
+	install_element(CONFIG_NODE, &access_list_extended_host_mask_cmd);
+	install_element(CONFIG_NODE, &access_list_extended_mask_host_cmd);
+	install_element(CONFIG_NODE, &access_list_extended_host_host_cmd);
+	install_element(CONFIG_NODE, &access_list_extended_any_host_cmd);
+	install_element(CONFIG_NODE, &access_list_extended_host_any_cmd);
+	install_element(CONFIG_NODE, &no_access_list_extended_cmd);
+	install_element(CONFIG_NODE, &no_access_list_extended_any_mask_cmd);
+	install_element(CONFIG_NODE, &no_access_list_extended_mask_any_cmd);
+	install_element(CONFIG_NODE, &no_access_list_extended_any_any_cmd);
+	install_element(CONFIG_NODE, &no_access_list_extended_host_mask_cmd);
+	install_element(CONFIG_NODE, &no_access_list_extended_mask_host_cmd);
+	install_element(CONFIG_NODE, &no_access_list_extended_host_host_cmd);
+	install_element(CONFIG_NODE, &no_access_list_extended_any_host_cmd);
+	install_element(CONFIG_NODE, &no_access_list_extended_host_any_cmd);
+
+	install_element(CONFIG_NODE, &access_list_remark_cmd);
+	install_element(CONFIG_NODE, &no_access_list_all_cmd);
+	install_element(CONFIG_NODE, &no_access_list_remark_cmd);
+	install_element(CONFIG_NODE, &no_access_list_remark_comment_cmd);
+}
+
+static struct cmd_node access_ipv6_node = {ACCESS_IPV6_NODE, "", 1};
+
+static int config_write_access_ipv6(struct vty *vty)
+{
+	return config_write_access(vty, AFI_IP6);
+}
+
+static void access_list_reset_ipv6(void)
+{
+	struct access_list *access;
+	struct access_list *next;
+	struct access_master *master;
+
+	master = access_master_get(AFI_IP6);
+	if (master == NULL)
+		return;
+
+	for (access = master->num.head; access; access = next) {
+		next = access->next;
+		access_list_delete(access);
+	}
+	for (access = master->str.head; access; access = next) {
+		next = access->next;
+		access_list_delete(access);
+	}
 
-  assert (master->num.head == NULL);
-  assert (master->num.tail == NULL);
+	assert(master->num.head == NULL);
+	assert(master->num.tail == NULL);
 
-  assert (master->str.head == NULL);
-  assert (master->str.tail == NULL);
+	assert(master->str.head == NULL);
+	assert(master->str.tail == NULL);
 }
 
-static void
-access_list_init_ipv6 (void)
+static void access_list_init_ipv6(void)
 {
-  install_node (&access_ipv6_node, config_write_access_ipv6);
+	install_node(&access_ipv6_node, config_write_access_ipv6);
 
-  install_element (ENABLE_NODE, &show_ipv6_access_list_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_access_list_name_cmd);
+	install_element(ENABLE_NODE, &show_ipv6_access_list_cmd);
+	install_element(ENABLE_NODE, &show_ipv6_access_list_name_cmd);
 
-  install_element (CONFIG_NODE, &ipv6_access_list_exact_cmd);
-  install_element (CONFIG_NODE, &ipv6_access_list_any_cmd);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_exact_cmd);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_any_cmd);
+	install_element(CONFIG_NODE, &ipv6_access_list_exact_cmd);
+	install_element(CONFIG_NODE, &ipv6_access_list_any_cmd);
+	install_element(CONFIG_NODE, &no_ipv6_access_list_exact_cmd);
+	install_element(CONFIG_NODE, &no_ipv6_access_list_any_cmd);
 
-  install_element (CONFIG_NODE, &no_ipv6_access_list_all_cmd);
-  install_element (CONFIG_NODE, &ipv6_access_list_remark_cmd);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_remark_cmd);
-  install_element (CONFIG_NODE, &no_ipv6_access_list_remark_comment_cmd);
+	install_element(CONFIG_NODE, &no_ipv6_access_list_all_cmd);
+	install_element(CONFIG_NODE, &ipv6_access_list_remark_cmd);
+	install_element(CONFIG_NODE, &no_ipv6_access_list_remark_cmd);
+	install_element(CONFIG_NODE, &no_ipv6_access_list_remark_comment_cmd);
 }
 
-void
-access_list_init ()
+void access_list_init()
 {
-  access_list_init_ipv4 ();
-  access_list_init_ipv6();
+	access_list_init_ipv4();
+	access_list_init_ipv6();
 }
 
-void
-access_list_reset ()
+void access_list_reset()
 {
-  access_list_reset_ipv4 ();
-  access_list_reset_ipv6();
+	access_list_reset_ipv4();
+	access_list_reset_ipv6();
 }