X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=lib%2Fdistribute.c;h=25fcd92580e10a6c603a25d54fe379e717c7ff6a;hb=9efdc68724c67dced6030bac513a3d21841221d0;hp=7b7d49d1d6733f5d2aa4dfeb697baa940f8c1a85;hpb=e89f016d3e882010c70689432ad9e7f7c32df224;p=mirror_frr.git

diff --git a/lib/distribute.c b/lib/distribute.c
index 7b7d49d1d..25fcd9258 100644
--- a/lib/distribute.c
+++ b/lib/distribute.c
@@ -27,226 +27,216 @@
 #include "distribute.h"
 #include "memory.h"
 
-DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE,        "Distribute list")
+DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE, "Distribute list")
 DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_IFNAME, "Dist-list ifname")
-DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_NAME,   "Dist-list name")
+DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_NAME, "Dist-list name")
 
 /* Hash of distribute list. */
 struct hash *disthash;
 
 /* Hook functions. */
-void (*distribute_add_hook) (struct distribute *);
-void (*distribute_delete_hook) (struct distribute *);
+void (*distribute_add_hook)(struct distribute *);
+void (*distribute_delete_hook)(struct distribute *);
 
-static struct distribute *
-distribute_new (void)
+static struct distribute *distribute_new(void)
 {
-  return XCALLOC (MTYPE_DISTRIBUTE, sizeof (struct distribute));
+	return XCALLOC(MTYPE_DISTRIBUTE, sizeof(struct distribute));
 }
 
 /* Free distribute object. */
-static void
-distribute_free (struct distribute *dist)
+static void distribute_free(struct distribute *dist)
 {
-  int i = 0;
+	int i = 0;
 
-  if (dist->ifname)
-    XFREE (MTYPE_DISTRIBUTE_IFNAME, dist->ifname);
+	if (dist->ifname)
+		XFREE(MTYPE_DISTRIBUTE_IFNAME, dist->ifname);
 
-  for (i = 0; i < DISTRIBUTE_MAX; i++)
-    if (dist->list[i])
-      XFREE(MTYPE_DISTRIBUTE_NAME, dist->list[i]);
+	for (i = 0; i < DISTRIBUTE_MAX; i++)
+		if (dist->list[i])
+			XFREE(MTYPE_DISTRIBUTE_NAME, dist->list[i]);
 
-  for (i = 0; i < DISTRIBUTE_MAX; i++)
-    if (dist->prefix[i])
-      XFREE(MTYPE_DISTRIBUTE_NAME, dist->prefix[i]);
+	for (i = 0; i < DISTRIBUTE_MAX; i++)
+		if (dist->prefix[i])
+			XFREE(MTYPE_DISTRIBUTE_NAME, dist->prefix[i]);
 
-  XFREE (MTYPE_DISTRIBUTE, dist);
+	XFREE(MTYPE_DISTRIBUTE, dist);
 }
 
-static void
-distribute_free_if_empty(struct distribute *dist)
+static void distribute_free_if_empty(struct distribute *dist)
 {
-  int i;
+	int i;
 
-  for (i = 0; i < DISTRIBUTE_MAX; i++)
-    if (dist->list[i] != NULL || dist->prefix[i] != NULL)
-      return;
+	for (i = 0; i < DISTRIBUTE_MAX; i++)
+		if (dist->list[i] != NULL || dist->prefix[i] != NULL)
+			return;
 
-  hash_release (disthash, dist);
-  distribute_free (dist);
+	hash_release(disthash, dist);
+	distribute_free(dist);
 }
 
 /* Lookup interface's distribute list. */
-struct distribute *
-distribute_lookup (const char *ifname)
+struct distribute *distribute_lookup(const char *ifname)
 {
-  struct distribute key;
-  struct distribute *dist;
+	struct distribute key;
+	struct distribute *dist;
 
-  /* temporary reference */
-  key.ifname = (ifname) ? XSTRDUP(MTYPE_DISTRIBUTE_IFNAME, ifname) : NULL;
+	/* temporary reference */
+	key.ifname = (ifname) ? XSTRDUP(MTYPE_DISTRIBUTE_IFNAME, ifname) : NULL;
 
-  dist = hash_lookup (disthash, &key);
+	dist = hash_lookup(disthash, &key);
 
-  if (key.ifname)
-    XFREE(MTYPE_DISTRIBUTE_IFNAME, key.ifname);
+	if (key.ifname)
+		XFREE(MTYPE_DISTRIBUTE_IFNAME, key.ifname);
 
-  return dist;
+	return dist;
 }
 
-void
-distribute_list_add_hook (void (*func) (struct distribute *))
+void distribute_list_add_hook(void (*func)(struct distribute *))
 {
-  distribute_add_hook = func;
+	distribute_add_hook = func;
 }
 
-void
-distribute_list_delete_hook (void (*func) (struct distribute *))
+void distribute_list_delete_hook(void (*func)(struct distribute *))
 {
-  distribute_delete_hook = func;
+	distribute_delete_hook = func;
 }
 
-static void *
-distribute_hash_alloc (struct distribute *arg)
+static void *distribute_hash_alloc(struct distribute *arg)
 {
-  struct distribute *dist;
-
-  dist = distribute_new ();
-  if (arg->ifname)
-    dist->ifname = XSTRDUP (MTYPE_DISTRIBUTE_IFNAME, arg->ifname);
-  else
-    dist->ifname = NULL;
-  return dist;
+	struct distribute *dist;
+
+	dist = distribute_new();
+	if (arg->ifname)
+		dist->ifname = XSTRDUP(MTYPE_DISTRIBUTE_IFNAME, arg->ifname);
+	else
+		dist->ifname = NULL;
+	return dist;
 }
 
 /* Make new distribute list and push into hash. */
-static struct distribute *
-distribute_get (const char *ifname)
+static struct distribute *distribute_get(const char *ifname)
 {
-  struct distribute key;
-  struct distribute *ret;
+	struct distribute key;
+	struct distribute *ret;
+
+	/* temporary reference */
+	key.ifname = (ifname) ? XSTRDUP(MTYPE_DISTRIBUTE_IFNAME, ifname) : NULL;
 
-  /* temporary reference */
-  key.ifname = (ifname) ? XSTRDUP(MTYPE_DISTRIBUTE_IFNAME, ifname) : NULL;
-  
-  ret = hash_get (disthash, &key, (void * (*) (void *))distribute_hash_alloc);
+	ret = hash_get(disthash, &key,
+		       (void *(*)(void *))distribute_hash_alloc);
 
-  if (key.ifname)
-    XFREE(MTYPE_DISTRIBUTE_IFNAME, key.ifname);
+	if (key.ifname)
+		XFREE(MTYPE_DISTRIBUTE_IFNAME, key.ifname);
 
-  return ret;
+	return ret;
 }
 
-static unsigned int
-distribute_hash_make (void *arg)
+static unsigned int distribute_hash_make(void *arg)
 {
-  const struct distribute *dist = arg;
+	const struct distribute *dist = arg;
 
-  return dist->ifname ? string_hash_make (dist->ifname) : 0;
+	return dist->ifname ? string_hash_make(dist->ifname) : 0;
 }
 
 /* If two distribute-list have same value then return 1 else return
    0. This function is used by hash package. */
-static int
-distribute_cmp (const struct distribute *dist1, const struct distribute *dist2)
+static int distribute_cmp(const struct distribute *dist1,
+			  const struct distribute *dist2)
 {
-  if (dist1->ifname && dist2->ifname)
-    if (strcmp (dist1->ifname, dist2->ifname) == 0)
-      return 1;
-  if (! dist1->ifname && ! dist2->ifname)
-    return 1;
-  return 0;
+	if (dist1->ifname && dist2->ifname)
+		if (strcmp(dist1->ifname, dist2->ifname) == 0)
+			return 1;
+	if (!dist1->ifname && !dist2->ifname)
+		return 1;
+	return 0;
 }
 
 /* Set access-list name to the distribute list. */
-static void
-distribute_list_set (const char *ifname, enum distribute_type type, 
-                     const char *alist_name)
+static void distribute_list_set(const char *ifname, enum distribute_type type,
+				const char *alist_name)
 {
-  struct distribute *dist;
+	struct distribute *dist;
 
-  dist = distribute_get (ifname);
+	dist = distribute_get(ifname);
 
-  if (dist->list[type])
-    XFREE(MTYPE_DISTRIBUTE_NAME, dist->list[type]);
-  dist->list[type] = XSTRDUP(MTYPE_DISTRIBUTE_NAME, alist_name);
+	if (dist->list[type])
+		XFREE(MTYPE_DISTRIBUTE_NAME, dist->list[type]);
+	dist->list[type] = XSTRDUP(MTYPE_DISTRIBUTE_NAME, alist_name);
 
-  /* Apply this distribute-list to the interface. */
-  (*distribute_add_hook) (dist);
+	/* Apply this distribute-list to the interface. */
+	(*distribute_add_hook)(dist);
 }
 
 /* Unset distribute-list.  If matched distribute-list exist then
    return 1. */
-static int
-distribute_list_unset (const char *ifname, enum distribute_type type, 
-		       const char *alist_name)
+static int distribute_list_unset(const char *ifname, enum distribute_type type,
+				 const char *alist_name)
 {
-  struct distribute *dist;
+	struct distribute *dist;
 
-  dist = distribute_lookup (ifname);
-  if (!dist)
-    return 0;
+	dist = distribute_lookup(ifname);
+	if (!dist)
+		return 0;
 
-  if (!dist->list[type])
-	return 0;
-  if (strcmp (dist->list[type], alist_name) != 0)
-	return 0;
+	if (!dist->list[type])
+		return 0;
+	if (strcmp(dist->list[type], alist_name) != 0)
+		return 0;
 
-  XFREE(MTYPE_DISTRIBUTE_NAME, dist->list[type]);
-  dist->list[type] = NULL;
+	XFREE(MTYPE_DISTRIBUTE_NAME, dist->list[type]);
+	dist->list[type] = NULL;
 
-  /* Apply this distribute-list to the interface. */
-  (*distribute_delete_hook) (dist);
+	/* Apply this distribute-list to the interface. */
+	(*distribute_delete_hook)(dist);
 
-  /* If all dist are NULL, then free distribute list. */
-  distribute_free_if_empty(dist);
-  return 1;
+	/* If all dist are NULL, then free distribute list. */
+	distribute_free_if_empty(dist);
+	return 1;
 }
 
 /* Set access-list name to the distribute list. */
-static void
-distribute_list_prefix_set (const char *ifname, enum distribute_type type,
-			    const char *plist_name)
+static void distribute_list_prefix_set(const char *ifname,
+				       enum distribute_type type,
+				       const char *plist_name)
 {
-  struct distribute *dist;
+	struct distribute *dist;
 
-  dist = distribute_get (ifname);
+	dist = distribute_get(ifname);
 
-  if (dist->prefix[type])
-    XFREE(MTYPE_DISTRIBUTE_NAME, dist->prefix[type]);
-  dist->prefix[type] = XSTRDUP(MTYPE_DISTRIBUTE_NAME, plist_name);
+	if (dist->prefix[type])
+		XFREE(MTYPE_DISTRIBUTE_NAME, dist->prefix[type]);
+	dist->prefix[type] = XSTRDUP(MTYPE_DISTRIBUTE_NAME, plist_name);
 
-  /* Apply this distribute-list to the interface. */
-  (*distribute_add_hook) (dist);
+	/* Apply this distribute-list to the interface. */
+	(*distribute_add_hook)(dist);
 }
 
 /* Unset distribute-list.  If matched distribute-list exist then
    return 1. */
-static int
-distribute_list_prefix_unset (const char *ifname, enum distribute_type type,
-			      const char *plist_name)
+static int distribute_list_prefix_unset(const char *ifname,
+					enum distribute_type type,
+					const char *plist_name)
 {
-  struct distribute *dist;
+	struct distribute *dist;
 
-  dist = distribute_lookup (ifname);
-  if (!dist)
-    return 0;
+	dist = distribute_lookup(ifname);
+	if (!dist)
+		return 0;
 
-  if (!dist->prefix[type])
-	return 0;
-  if (strcmp (dist->prefix[type], plist_name) != 0)
-	return 0;
+	if (!dist->prefix[type])
+		return 0;
+	if (strcmp(dist->prefix[type], plist_name) != 0)
+		return 0;
 
-  XFREE(MTYPE_DISTRIBUTE_NAME, dist->prefix[type]);
-  dist->prefix[type] = NULL;
+	XFREE(MTYPE_DISTRIBUTE_NAME, dist->prefix[type]);
+	dist->prefix[type] = NULL;
 
-  /* Apply this distribute-list to the interface. */
-  (*distribute_delete_hook) (dist);
+	/* Apply this distribute-list to the interface. */
+	(*distribute_delete_hook)(dist);
 
-  /* If all dist are NULL, then free distribute list. */
-  distribute_free_if_empty(dist);
-  return 1;
+	/* If all dist are NULL, then free distribute list. */
+	distribute_free_if_empty(dist);
+	return 1;
 }
 
 DEFUN (distribute_list,
@@ -259,25 +249,26 @@ DEFUN (distribute_list,
        "Filter outgoing routing updates\n"
        "Interface name\n")
 {
-  int prefix = (argv[1]->type == WORD_TKN) ? 1 : 0;
+	int prefix = (argv[1]->type == WORD_TKN) ? 1 : 0;
+
+	/* Check of distribute list type. */
+	enum distribute_type type = argv[2 + prefix]->arg[0] == 'i'
+					    ? DISTRIBUTE_V4_IN
+					    : DISTRIBUTE_V4_OUT;
 
-  /* Check of distribute list type. */
-  enum distribute_type type = argv[2 + prefix]->arg[0] == 'i' ?
-    DISTRIBUTE_V4_IN : DISTRIBUTE_V4_OUT;
+	/* Set appropriate function call */
+	void (*distfn)(const char *, enum distribute_type, const char *) =
+		prefix ? &distribute_list_prefix_set : &distribute_list_set;
 
-  /* Set appropriate function call */
-  void (*distfn)(const char *, enum distribute_type, const char *) = prefix ? 
-    &distribute_list_prefix_set : &distribute_list_set;
-  
-  /* if interface is present, get name */
-  const char *ifname = NULL;
-  if (argv[argc - 1]->type == VARIABLE_TKN)
-    ifname = argv[argc - 1]->arg;
+	/* if interface is present, get name */
+	const char *ifname = NULL;
+	if (argv[argc - 1]->type == VARIABLE_TKN)
+		ifname = argv[argc - 1]->arg;
 
-  /* Get interface name corresponding distribute list. */
-  distfn (ifname, type, argv[1 + prefix]->arg);
+	/* Get interface name corresponding distribute list. */
+	distfn(ifname, type, argv[1 + prefix]->arg);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ipv6_distribute_list,
@@ -291,27 +282,28 @@ DEFUN (ipv6_distribute_list,
        "Filter outgoing routing updates\n"
        "Interface name\n")
 {
-  int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
+	int prefix = (argv[2]->type == WORD_TKN) ? 1 : 0;
 
-  /* Check of distribute list type. */
-  enum distribute_type type = argv[3 + prefix]->arg[0] == 'i' ?
-    DISTRIBUTE_V6_IN : DISTRIBUTE_V6_OUT;
+	/* Check of distribute list type. */
+	enum distribute_type type = argv[3 + prefix]->arg[0] == 'i'
+					    ? DISTRIBUTE_V6_IN
+					    : DISTRIBUTE_V6_OUT;
 
-  /* Set appropriate function call */
-  void (*distfn)(const char *, enum distribute_type, const char *) = prefix ? 
-    &distribute_list_prefix_set : &distribute_list_set;
-  
-  /* if interface is present, get name */
-  const char *ifname = NULL;
-  if (argv[argc - 1]->type == VARIABLE_TKN)
-    ifname = argv[argc - 1]->arg;
+	/* Set appropriate function call */
+	void (*distfn)(const char *, enum distribute_type, const char *) =
+		prefix ? &distribute_list_prefix_set : &distribute_list_set;
 
-  /* Get interface name corresponding distribute list. */
-  distfn (ifname, type, argv[1 + prefix]->arg);
+	/* if interface is present, get name */
+	const char *ifname = NULL;
+	if (argv[argc - 1]->type == VARIABLE_TKN)
+		ifname = argv[argc - 1]->arg;
 
-  return CMD_SUCCESS;
+	/* Get interface name corresponding distribute list. */
+	distfn(ifname, type, argv[1 + prefix]->arg);
+
+	return CMD_SUCCESS;
 }
-       
+
 DEFUN (no_distribute_list,
        no_distribute_list_cmd,
        "no [ipv6] distribute-list [prefix] WORD <in|out> [WORD]",
@@ -324,231 +316,237 @@ DEFUN (no_distribute_list,
        "Filter outgoing routing updates\n"
        "Interface name\n")
 {
-  int ipv6 = strmatch(argv[1]->text, "ipv6");
-  int prefix = (argv[2 + ipv6]->type == WORD_TKN) ? 1 : 0;
-
-  int idx_alname = 2 + ipv6 + prefix;
-  int idx_disttype = idx_alname + 1;
-
-  /* Check of distribute list type. */
-  enum distribute_type distin = (ipv6) ? DISTRIBUTE_V6_IN : DISTRIBUTE_V4_IN;
-  enum distribute_type distout = (ipv6) ? DISTRIBUTE_V6_OUT : DISTRIBUTE_V4_OUT;
-
-  enum distribute_type type = argv[idx_disttype]->arg[0] == 'i' ? distin : distout;
-
-  /* Set appropriate function call */
-  int (*distfn)(const char *, enum distribute_type, const char *) = prefix ? 
-    &distribute_list_prefix_unset : &distribute_list_unset;
-  
-  /* if interface is present, get name */
-  const char *ifname = NULL;
-  if (argv[argc - 1]->type == VARIABLE_TKN)
-    ifname = argv[argc - 1]->arg;
-  /* Get interface name corresponding distribute list. */
-  int ret = distfn (ifname, type, argv[2 + prefix]->arg);
-
-  if (! ret)
-    {
-      vty_out (vty, "distribute list doesn't exist%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-  return CMD_SUCCESS;
+	int ipv6 = strmatch(argv[1]->text, "ipv6");
+	int prefix = (argv[2 + ipv6]->type == WORD_TKN) ? 1 : 0;
+
+	int idx_alname = 2 + ipv6 + prefix;
+	int idx_disttype = idx_alname + 1;
+
+	/* Check of distribute list type. */
+	enum distribute_type distin =
+		(ipv6) ? DISTRIBUTE_V6_IN : DISTRIBUTE_V4_IN;
+	enum distribute_type distout =
+		(ipv6) ? DISTRIBUTE_V6_OUT : DISTRIBUTE_V4_OUT;
+
+	enum distribute_type type =
+		argv[idx_disttype]->arg[0] == 'i' ? distin : distout;
+
+	/* Set appropriate function call */
+	int (*distfn)(const char *, enum distribute_type, const char *) =
+		prefix ? &distribute_list_prefix_unset : &distribute_list_unset;
+
+	/* if interface is present, get name */
+	const char *ifname = NULL;
+	if (argv[argc - 1]->type == VARIABLE_TKN)
+		ifname = argv[argc - 1]->arg;
+	/* Get interface name corresponding distribute list. */
+	int ret = distfn(ifname, type, argv[2 + prefix]->arg);
+
+	if (!ret) {
+		vty_out(vty, "distribute list doesn't exist\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+	return CMD_SUCCESS;
 }
 
-static int
-distribute_print (struct vty *vty, char *tab[], int is_prefix,
-                  enum distribute_type type, int has_print)
+static int distribute_print(struct vty *vty, char *tab[], int is_prefix,
+			    enum distribute_type type, int has_print)
 {
-  if (tab[type]) {
-    vty_out (vty, "%s %s%s",
-             has_print ? "," : "",
-             is_prefix ? "(prefix-list) " : "",
-             tab[type]);
-    return 1;
-  }
-  return has_print;
+	if (tab[type]) {
+		vty_out(vty, "%s %s%s", has_print ? "," : "",
+			is_prefix ? "(prefix-list) " : "", tab[type]);
+		return 1;
+	}
+	return has_print;
 }
 
-int
-config_show_distribute (struct vty *vty)
+int config_show_distribute(struct vty *vty)
 {
-  unsigned int i;
-  int has_print = 0;
-  struct hash_backet *mp;
-  struct distribute *dist;
-
-  /* Output filter configuration. */
-  dist = distribute_lookup (NULL);
-      vty_out (vty, "  Outgoing update filter list for all interface is");
-  has_print = 0;
-  if (dist)
-    {
-      has_print = distribute_print(vty, dist->list,   0,
-                                   DISTRIBUTE_V4_OUT, has_print);
-      has_print = distribute_print(vty, dist->prefix, 1,
-                                   DISTRIBUTE_V4_OUT, has_print);
-      has_print = distribute_print(vty, dist->list,   0,
-                                   DISTRIBUTE_V6_OUT, has_print);
-      has_print = distribute_print(vty, dist->prefix, 1,
-                                   DISTRIBUTE_V6_OUT, has_print);
-    }
-  if (has_print)
-    vty_out (vty, "%s", VTY_NEWLINE);
-  else
-    vty_out (vty, " not set%s", VTY_NEWLINE);
-
-  for (i = 0; i < disthash->size; i++)
-    for (mp = disthash->index[i]; mp; mp = mp->next)
-      {
-	dist = mp->data;
-	if (dist->ifname)
-	    {
-	      vty_out (vty, "    %s filtered by", dist->ifname);
-            has_print = 0;
-            has_print = distribute_print(vty, dist->list,   0,
-                                         DISTRIBUTE_V4_OUT, has_print);
-            has_print = distribute_print(vty, dist->prefix, 1,
-                                         DISTRIBUTE_V4_OUT, has_print);
-            has_print = distribute_print(vty, dist->list,   0,
-                                         DISTRIBUTE_V6_OUT, has_print);
-            has_print = distribute_print(vty, dist->prefix, 1,
-                                         DISTRIBUTE_V6_OUT, has_print);
-            if (has_print)
-	      vty_out (vty, "%s", VTY_NEWLINE);
-            else
-              vty_out(vty, " nothing%s", VTY_NEWLINE);
-	    }
-      }
-
-
-  /* Input filter configuration. */
-  dist = distribute_lookup (NULL);
-      vty_out (vty, "  Incoming update filter list for all interface is");
-  has_print = 0;
-  if (dist)
-    {
-      has_print = distribute_print(vty, dist->list,   0,
-                                   DISTRIBUTE_V4_IN, has_print);
-      has_print = distribute_print(vty, dist->prefix, 1,
-                                   DISTRIBUTE_V4_IN, has_print);
-      has_print = distribute_print(vty, dist->list,   0,
-                                   DISTRIBUTE_V6_IN, has_print);
-      has_print = distribute_print(vty, dist->prefix, 1,
-                                   DISTRIBUTE_V6_IN, has_print);
-    }
-  if (has_print)
-    vty_out (vty, "%s", VTY_NEWLINE);
-  else
-    vty_out (vty, " not set%s", VTY_NEWLINE);
-
-  for (i = 0; i < disthash->size; i++)
-    for (mp = disthash->index[i]; mp; mp = mp->next)
-      {
-	dist = mp->data;
-	if (dist->ifname)
-	    {
-	      vty_out (vty, "    %s filtered by", dist->ifname);
-            has_print = 0;
-            has_print = distribute_print(vty, dist->list,   0,
-                                         DISTRIBUTE_V4_IN, has_print);
-            has_print = distribute_print(vty, dist->prefix, 1,
-                                         DISTRIBUTE_V4_IN, has_print);
-            has_print = distribute_print(vty, dist->list,   0,
-                                         DISTRIBUTE_V6_IN, has_print);
-            has_print = distribute_print(vty, dist->prefix, 1,
-                                         DISTRIBUTE_V6_IN, has_print);
-            if (has_print)
-	      vty_out (vty, "%s", VTY_NEWLINE);
-            else
-              vty_out(vty, " nothing%s", VTY_NEWLINE);
-	    }
-      }
-  return 0;
+	unsigned int i;
+	int has_print = 0;
+	struct hash_backet *mp;
+	struct distribute *dist;
+
+	/* Output filter configuration. */
+	dist = distribute_lookup(NULL);
+	vty_out(vty, "  Outgoing update filter list for all interface is");
+	has_print = 0;
+	if (dist) {
+		has_print = distribute_print(vty, dist->list, 0,
+					     DISTRIBUTE_V4_OUT, has_print);
+		has_print = distribute_print(vty, dist->prefix, 1,
+					     DISTRIBUTE_V4_OUT, has_print);
+		has_print = distribute_print(vty, dist->list, 0,
+					     DISTRIBUTE_V6_OUT, has_print);
+		has_print = distribute_print(vty, dist->prefix, 1,
+					     DISTRIBUTE_V6_OUT, has_print);
+	}
+	if (has_print)
+		vty_out(vty, "\n");
+	else
+		vty_out(vty, " not set\n");
+
+	for (i = 0; i < disthash->size; i++)
+		for (mp = disthash->index[i]; mp; mp = mp->next) {
+			dist = mp->data;
+			if (dist->ifname) {
+				vty_out(vty, "    %s filtered by",
+					dist->ifname);
+				has_print = 0;
+				has_print = distribute_print(vty, dist->list, 0,
+							     DISTRIBUTE_V4_OUT,
+							     has_print);
+				has_print = distribute_print(
+					vty, dist->prefix, 1, DISTRIBUTE_V4_OUT,
+					has_print);
+				has_print = distribute_print(vty, dist->list, 0,
+							     DISTRIBUTE_V6_OUT,
+							     has_print);
+				has_print = distribute_print(
+					vty, dist->prefix, 1, DISTRIBUTE_V6_OUT,
+					has_print);
+				if (has_print)
+					vty_out(vty, "\n");
+				else
+					vty_out(vty, " nothing\n");
+			}
+		}
+
+
+	/* Input filter configuration. */
+	dist = distribute_lookup(NULL);
+	vty_out(vty, "  Incoming update filter list for all interface is");
+	has_print = 0;
+	if (dist) {
+		has_print = distribute_print(vty, dist->list, 0,
+					     DISTRIBUTE_V4_IN, has_print);
+		has_print = distribute_print(vty, dist->prefix, 1,
+					     DISTRIBUTE_V4_IN, has_print);
+		has_print = distribute_print(vty, dist->list, 0,
+					     DISTRIBUTE_V6_IN, has_print);
+		has_print = distribute_print(vty, dist->prefix, 1,
+					     DISTRIBUTE_V6_IN, has_print);
+	}
+	if (has_print)
+		vty_out(vty, "\n");
+	else
+		vty_out(vty, " not set\n");
+
+	for (i = 0; i < disthash->size; i++)
+		for (mp = disthash->index[i]; mp; mp = mp->next) {
+			dist = mp->data;
+			if (dist->ifname) {
+				vty_out(vty, "    %s filtered by",
+					dist->ifname);
+				has_print = 0;
+				has_print = distribute_print(vty, dist->list, 0,
+							     DISTRIBUTE_V4_IN,
+							     has_print);
+				has_print = distribute_print(
+					vty, dist->prefix, 1, DISTRIBUTE_V4_IN,
+					has_print);
+				has_print = distribute_print(vty, dist->list, 0,
+							     DISTRIBUTE_V6_IN,
+							     has_print);
+				has_print = distribute_print(
+					vty, dist->prefix, 1, DISTRIBUTE_V6_IN,
+					has_print);
+				if (has_print)
+					vty_out(vty, "\n");
+				else
+					vty_out(vty, " nothing\n");
+			}
+		}
+	return 0;
 }
 
 /* Configuration write function. */
-int
-config_write_distribute (struct vty *vty)
+int config_write_distribute(struct vty *vty)
 {
-  unsigned int i;
-  int j;
-  int output, v6;
-  struct hash_backet *mp;
-  int write = 0;
-
-  for (i = 0; i < disthash->size; i++)
-    for (mp = disthash->index[i]; mp; mp = mp->next)
-      {
-	struct distribute *dist;
-
-	dist = mp->data;
-
-	for (j = 0; j < DISTRIBUTE_MAX; j++)
-	  if (dist->list[j]) {
-	    output = j == DISTRIBUTE_V4_OUT || j == DISTRIBUTE_V6_OUT;
-            v6 = j == DISTRIBUTE_V6_IN || j == DISTRIBUTE_V6_OUT;
-	    vty_out (vty, " %sdistribute-list %s %s %s%s",
-                     v6 ? "ipv6 " : "",
-		     dist->list[j],
-		     output ? "out" : "in",
-		     dist->ifname ? dist->ifname : "",
-		     VTY_NEWLINE);
-	    write++;
-	  }
-
-	for (j = 0; j < DISTRIBUTE_MAX; j++)
-	  if (dist->prefix[j]) {
-	    output = j == DISTRIBUTE_V4_OUT || j == DISTRIBUTE_V6_OUT;
-            v6 = j == DISTRIBUTE_V6_IN || j == DISTRIBUTE_V6_OUT;
-	    vty_out (vty, " %sdistribute-list prefix %s %s %s%s",
-                     v6 ? "ipv6 " : "",
-		     dist->prefix[j],
-		     output ? "out" : "in",
-		     dist->ifname ? dist->ifname : "",
-		     VTY_NEWLINE);
-	    write++;
-	  }
-      }
-  return write;
+	unsigned int i;
+	int j;
+	int output, v6;
+	struct hash_backet *mp;
+	int write = 0;
+
+	for (i = 0; i < disthash->size; i++)
+		for (mp = disthash->index[i]; mp; mp = mp->next) {
+			struct distribute *dist;
+
+			dist = mp->data;
+
+			for (j = 0; j < DISTRIBUTE_MAX; j++)
+				if (dist->list[j]) {
+					output = j == DISTRIBUTE_V4_OUT
+						 || j == DISTRIBUTE_V6_OUT;
+					v6 = j == DISTRIBUTE_V6_IN
+					     || j == DISTRIBUTE_V6_OUT;
+					vty_out(vty,
+						" %sdistribute-list %s %s %s\n",
+						v6 ? "ipv6 " : "",
+						dist->list[j],
+						output ? "out" : "in",
+						dist->ifname ? dist->ifname
+							     : "");
+					write++;
+				}
+
+			for (j = 0; j < DISTRIBUTE_MAX; j++)
+				if (dist->prefix[j]) {
+					output = j == DISTRIBUTE_V4_OUT
+						 || j == DISTRIBUTE_V6_OUT;
+					v6 = j == DISTRIBUTE_V6_IN
+					     || j == DISTRIBUTE_V6_OUT;
+					vty_out(vty,
+						" %sdistribute-list prefix %s %s %s\n",
+						v6 ? "ipv6 " : "",
+						dist->prefix[j],
+						output ? "out" : "in",
+						dist->ifname ? dist->ifname
+							     : "");
+					write++;
+				}
+		}
+	return write;
 }
 
 /* Clear all distribute list. */
-void
-distribute_list_reset ()
+void distribute_list_reset()
 {
-  hash_clean (disthash, (void (*) (void *)) distribute_free);
+	hash_clean(disthash, (void (*)(void *))distribute_free);
 }
 
 /* Initialize distribute list related hash. */
-void
-distribute_list_init (int node)
+void distribute_list_init(int node)
 {
-  disthash = hash_create (distribute_hash_make,
-                          (int (*) (const void *, const void *)) distribute_cmp);
-
-  /* vtysh command-extraction doesn't grok install_element(node, ) */
-  if (node == RIP_NODE) {
-    install_element (RIP_NODE, &distribute_list_cmd);
-    install_element (RIP_NODE, &no_distribute_list_cmd);
-  } else if (node == RIPNG_NODE) {
-    install_element (RIPNG_NODE, &distribute_list_cmd);
-    install_element (RIPNG_NODE, &no_distribute_list_cmd);
-  }
-
-  /* install v6 */
-  if (node == RIPNG_NODE) {
-    install_element (RIPNG_NODE, &ipv6_distribute_list_cmd);
-  }
-
-  /* TODO: install v4 syntax command for v6 only protocols. */
- /* if (node == RIPNG_NODE) {
-  *   install_element (node, &ipv6_as_v4_distribute_list_all_cmd);
-  *   install_element (node, &no_ipv6_as_v4_distribute_list_all_cmd);
-  *   install_element (node, &ipv6_as_v4_distribute_list_cmd);
-  *   install_element (node, &no_ipv6_as_v4_distribute_list_cmd);
-  *   install_element (node, &ipv6_as_v4_distribute_list_prefix_all_cmd);
-  *   install_element (node, &no_ipv6_as_v4_distribute_list_prefix_all_cmd);
-  *   install_element (node, &ipv6_as_v4_distribute_list_prefix_cmd);
-  *   install_element (node, &no_ipv6_as_v4_distribute_list_prefix_cmd);
-    }*/
+	disthash = hash_create(
+		distribute_hash_make,
+		(int (*)(const void *, const void *))distribute_cmp, NULL);
+
+	/* vtysh command-extraction doesn't grok install_element(node, ) */
+	if (node == RIP_NODE) {
+		install_element(RIP_NODE, &distribute_list_cmd);
+		install_element(RIP_NODE, &no_distribute_list_cmd);
+	} else if (node == RIPNG_NODE) {
+		install_element(RIPNG_NODE, &distribute_list_cmd);
+		install_element(RIPNG_NODE, &no_distribute_list_cmd);
+	}
+
+	/* install v6 */
+	if (node == RIPNG_NODE) {
+		install_element(RIPNG_NODE, &ipv6_distribute_list_cmd);
+	}
+
+	/* TODO: install v4 syntax command for v6 only protocols. */
+	/* if (node == RIPNG_NODE) {
+	 *   install_element (node, &ipv6_as_v4_distribute_list_all_cmd);
+	 *   install_element (node, &no_ipv6_as_v4_distribute_list_all_cmd);
+	 *   install_element (node, &ipv6_as_v4_distribute_list_cmd);
+	 *   install_element (node, &no_ipv6_as_v4_distribute_list_cmd);
+	 *   install_element (node, &ipv6_as_v4_distribute_list_prefix_all_cmd);
+	 *   install_element (node,
+	 &no_ipv6_as_v4_distribute_list_prefix_all_cmd);
+	 *   install_element (node, &ipv6_as_v4_distribute_list_prefix_cmd);
+	 *   install_element (node, &no_ipv6_as_v4_distribute_list_prefix_cmd);
+	   }*/
 }