Merge branch 'frr/pull/822' ("EVPN fixes")

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

7 files changed, 523 insertions, 417 deletions

diff --git a/lib/command.c b/lib/command.c
index 09ffa6ce5..077a72398 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -101,6 +101,7 @@ const char *node_names[] = {
 	"ipv4 access list",         // ACCESS_NODE,
 	"ipv4 prefix list",         // PREFIX_NODE,
 	"ipv6 access list",         // ACCESS_IPV6_NODE,
+	"MAC access list",          // ACCESS_MAC_NODE,
 	"ipv6 prefix list",         // PREFIX_IPV6_NODE,
 	"as list",		    // AS_LIST_NODE,
 	"community list",	    // COMMUNITY_LIST_NODE,
diff --git a/lib/command.h b/lib/command.h
index d0c9f0eaf..8f12e2aab 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -123,6 +123,7 @@ enum node_type {
 	ACCESS_NODE,		/* Access list node. */
 	PREFIX_NODE,		/* Prefix list node. */
 	ACCESS_IPV6_NODE,       /* Access list node. */
+	ACCESS_MAC_NODE,	/* MAC access list node*/
 	PREFIX_IPV6_NODE,       /* Prefix list node. */
 	AS_LIST_NODE,		/* AS list node. */
 	COMMUNITY_LIST_NODE,    /* Community list node. */
diff --git a/lib/filter.c b/lib/filter.c
index 0262234c7..cb6f743c0 100644
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -90,6 +90,14 @@ struct access_master {
 	void (*delete_hook)(struct access_list *);
 };
 
+/* Static structure for mac access_list's master. */
+static struct access_master access_master_mac = {
+	{NULL, NULL},
+	{NULL, NULL},
+	NULL,
+	NULL,
+};
+
 /* Static structure for IPv4 access_list's master. */
 static struct access_master access_master_ipv4 = {
 	{NULL, NULL},
@@ -112,6 +120,8 @@ static struct access_master *access_master_get(afi_t afi)
 		return &access_master_ipv4;
 	else if (afi == AFI_IP6)
 		return &access_master_ipv6;
+	else if (afi == AFI_L2VPN)
+		return &access_master_mac;
 	return NULL;
 }
 
@@ -173,7 +183,7 @@ static int filter_match_cisco(struct filter *mfilter, struct prefix *p)
 /* If filter match to the prefix then return 1. */
 static int filter_match_zebra(struct filter *mfilter, struct prefix *p)
 {
-	struct filter_zebra *filter;
+	struct filter_zebra *filter = NULL;
 
 	filter = &mfilter->u.zfilter;
 
@@ -365,9 +375,7 @@ static struct access_list *access_list_get(afi_t afi, const char *name)
 enum filter_type access_list_apply(struct access_list *access, void *object)
 {
 	struct filter *filter;
-	struct prefix *p;
-
-	p = (struct prefix *)object;
+	struct prefix *p = (struct prefix *)object;
 
 	if (access == NULL)
 		return FILTER_DENY;
@@ -390,6 +398,7 @@ 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_mac.add_hook = func;
 }
 
 /* Delete hook function. */
@@ -397,6 +406,7 @@ 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_mac.delete_hook = func;
 }
 
 /* Add new filter to the end of specified access_list. */
@@ -515,10 +525,10 @@ static struct filter *filter_lookup_zebra(struct access_list *access,
 		filter = &mfilter->u.zfilter;
 
 		if (filter->exact == new->exact
-		    && mfilter->type
-			       == mnew->type &&prefix_same(&filter->prefix,
-							   &new->prefix))
-			return mfilter;
+		    && mfilter->type == mnew->type) {
+			if (prefix_same(&filter->prefix, &new->prefix))
+				return mfilter;
+		}
 	}
 	return NULL;
 }
@@ -1252,6 +1262,12 @@ static int filter_set_zebra(struct vty *vty, const char *name_str,
 				"IPv6 address prefix/prefixlen is malformed\n");
 			return CMD_WARNING_CONFIG_FAILED;
 		}
+	} else if (afi == AFI_L2VPN) {
+		ret = str2prefix_eth(prefix_str, (struct prefix_eth *)&p);
+		if (ret <= 0) {
+			vty_out(vty, "MAC address is malformed\n");
+			return CMD_WARNING;
+		}
 	} else
 		return CMD_WARNING_CONFIG_FAILED;
 
@@ -1274,7 +1290,6 @@ static int filter_set_zebra(struct vty *vty, const char *name_str,
 			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);
@@ -1285,6 +1300,64 @@ static int filter_set_zebra(struct vty *vty, const char *name_str,
 	return CMD_SUCCESS;
 }
 
+DEFUN (mac_access_list,
+       mac_access_list_cmd,
+       "mac access-list WORD <deny|permit> MAC",
+       "Add a mac access-list\n"
+       "Add an access list entry\n"
+       "MAC zebra access-list name\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "MAC address to match. e.g. 00:01:00:01:00:01\n")
+{
+	return filter_set_zebra(vty, argv[2]->arg, argv[3]->arg, AFI_L2VPN,
+				argv[4]->arg, 0, 1);
+}
+
+DEFUN (no_mac_access_list,
+       no_mac_access_list_cmd,
+       "no mac access-list WORD <deny|permit> MAC",
+       NO_STR
+       "Remove a mac access-list\n"
+       "Remove an access list entry\n"
+       "MAC zebra access-list name\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "MAC address to match. e.g. 00:01:00:01:00:01\n")
+{
+	return filter_set_zebra(vty, argv[3]->arg, argv[4]->arg, AFI_L2VPN,
+				argv[5]->arg, 0, 0);
+}
+
+DEFUN (mac_access_list_any,
+       mac_access_list_any_cmd,
+       "mac access-list WORD <deny|permit> any",
+       "Add a mac access-list\n"
+       "Add an access list entry\n"
+       "MAC zebra access-list name\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "MAC address to match. e.g. 00:01:00:01:00:01\n")
+{
+	return filter_set_zebra(vty, argv[2]->arg, argv[3]->arg, AFI_L2VPN,
+				"00:00:00:00:00:00", 0, 1);
+}
+
+DEFUN (no_mac_access_list_any,
+       no_mac_access_list_any_cmd,
+       "no mac access-list WORD <deny|permit> any",
+       NO_STR
+       "Remove a mac access-list\n"
+       "Remove an access list entry\n"
+       "MAC zebra access-list name\n"
+       "Specify packets to reject\n"
+       "Specify packets to forward\n"
+       "MAC address to match. e.g. 00:01:00:01:00:01\n")
+{
+	return filter_set_zebra(vty, argv[3]->arg, argv[4]->arg, AFI_L2VPN,
+				"00:00:00:00:00:00", 0, 0);
+}
+
 DEFUN (access_list_exact,
        access_list_exact_cmd,
        "access-list WORD <deny|permit> A.B.C.D/M [exact-match]",
@@ -1666,12 +1739,15 @@ static int filter_show(struct vty *vty, const char *name, afi_t afi)
 			filter = &mfilter->u.cfilter;
 
 			if (write) {
-				vty_out(vty, "%s IP%s access list %s\n",
+				vty_out(vty, "%s %s access list %s\n",
 					mfilter->cisco ? (filter->extended
 								  ? "Extended"
 								  : "Standard")
 						       : "Zebra",
-					afi == AFI_IP6 ? "v6" : "",
+					(afi == AFI_IP)
+						? ("IP")
+						: ((afi == AFI_IP6) ? ("IPv6 ")
+								    : ("MAC ")),
 					access->name);
 				write = 0;
 			}
@@ -1710,12 +1786,15 @@ static int filter_show(struct vty *vty, const char *name, afi_t afi)
 			filter = &mfilter->u.cfilter;
 
 			if (write) {
-				vty_out(vty, "%s IP%s access list %s\n",
+				vty_out(vty, "%s %s access list %s\n",
 					mfilter->cisco ? (filter->extended
 								  ? "Extended"
 								  : "Standard")
 						       : "Zebra",
-					afi == AFI_IP6 ? "v6" : "",
+					(afi == AFI_IP)
+						? ("IP")
+						: ((afi == AFI_IP6) ? ("IPv6 ")
+								    : ("MAC ")),
 					access->name);
 				write = 0;
 			}
@@ -1746,6 +1825,28 @@ static int filter_show(struct vty *vty, const char *name, afi_t afi)
 	return CMD_SUCCESS;
 }
 
+/* show MAC access list - this only has MAC filters for now*/
+DEFUN (show_mac_access_list,
+       show_mac_access_list_cmd,
+       "show mac access-list",
+       SHOW_STR
+       "mac access lists\n"
+       "List mac access lists\n")
+{
+	return filter_show(vty, NULL, AFI_L2VPN);
+}
+
+DEFUN (show_mac_access_list_name,
+       show_mac_access_list_name_cmd,
+       "show mac access-list WORD",
+       SHOW_STR
+       "mac access lists\n"
+       "List mac access lists\n"
+       "mac address\n")
+{
+	return filter_show(vty, argv[3]->arg, AFI_L2VPN);
+}
+
 DEFUN (show_ip_access_list,
        show_ip_access_list_cmd,
        "show ip access-list",
@@ -1844,10 +1945,17 @@ void config_write_access_zebra(struct vty *vty, struct filter *mfilter)
 
 	if (p->prefixlen == 0 && !filter->exact)
 		vty_out(vty, " any");
-	else
+	else if (p->family == AF_INET6 || p->family == AF_INET)
 		vty_out(vty, " %s/%d%s",
 			inet_ntop(p->family, &p->u.prefix, buf, BUFSIZ),
 			p->prefixlen, filter->exact ? " exact-match" : "");
+	else if (p->family == AF_ETHERNET) {
+		if (p->prefixlen == 0)
+			vty_out(vty, " any");
+		else
+			vty_out(vty, " %s", prefix_mac2str(&(p->u.prefix_eth),
+							   buf, sizeof(buf)));
+	}
 
 	vty_out(vty, "\n");
 }
@@ -1866,15 +1974,19 @@ static int config_write_access(struct vty *vty, afi_t afi)
 	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);
+				(afi == AFI_IP) ? ("")
+						: ((afi == AFI_IP6) ? ("ipv6 ")
+								    : ("mac ")),
+				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));
+				(afi == AFI_IP) ? ("")
+						: ((afi == AFI_IP6) ? ("ipv6 ")
+								    : ("mac ")),
+				access->name, filter_type_str(mfilter));
 
 			if (mfilter->cisco)
 				config_write_access_cisco(vty, mfilter);
@@ -1888,15 +2000,19 @@ static int config_write_access(struct vty *vty, afi_t afi)
 	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);
+				(afi == AFI_IP) ? ("")
+						: ((afi == AFI_IP6) ? ("ipv6 ")
+								    : ("mac ")),
+				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));
+				(afi == AFI_IP) ? ("")
+						: ((afi == AFI_IP6) ? ("ipv6 ")
+								    : ("mac ")),
+				access->name, filter_type_str(mfilter));
 
 			if (mfilter->cisco)
 				config_write_access_cisco(vty, mfilter);
@@ -1909,6 +2025,56 @@ static int config_write_access(struct vty *vty, afi_t afi)
 	return write;
 }
 
+static struct cmd_node access_mac_node = {
+	ACCESS_MAC_NODE, "", /* Access list has no interface. */
+	1};
+
+static int config_write_access_mac(struct vty *vty)
+{
+	return config_write_access(vty, AFI_L2VPN);
+}
+
+static void access_list_reset_mac(void)
+{
+	struct access_list *access;
+	struct access_list *next;
+	struct access_master *master;
+
+	master = access_master_get(AFI_L2VPN);
+	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->str.head == NULL);
+	assert(master->str.tail == NULL);
+}
+
+/* Install vty related command. */
+static void access_list_init_mac(void)
+{
+	install_node(&access_mac_node, config_write_access_mac);
+
+	install_element(ENABLE_NODE, &show_mac_access_list_cmd);
+	install_element(ENABLE_NODE, &show_mac_access_list_name_cmd);
+
+	/* Zebra access-list */
+	install_element(CONFIG_NODE, &mac_access_list_cmd);
+	install_element(CONFIG_NODE, &no_mac_access_list_cmd);
+	install_element(CONFIG_NODE, &mac_access_list_any_cmd);
+	install_element(CONFIG_NODE, &no_mac_access_list_any_cmd);
+}
+
 /* Access-list node. */
 static struct cmd_node access_node = {ACCESS_NODE,
 				      "", /* Access list has no interface. */
@@ -2050,10 +2216,12 @@ void access_list_init()
 {
 	access_list_init_ipv4();
 	access_list_init_ipv6();
+	access_list_init_mac();
 }
 
 void access_list_reset()
 {
 	access_list_reset_ipv4();
 	access_list_reset_ipv6();
+	access_list_reset_mac();
 }
diff --git a/lib/log.c b/lib/log.c
index 49351a065..5c89e7080 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -917,6 +917,7 @@ static const struct zebra_desc_table command_types[] = {
 	DESC_ENTRY(ZEBRA_GET_LABEL_CHUNK),
 	DESC_ENTRY(ZEBRA_RELEASE_LABEL_CHUNK),
 	DESC_ENTRY(ZEBRA_ADVERTISE_ALL_VNI),
+	DESC_ENTRY(ZEBRA_ADVERTISE_DEFAULT_GW),
 	DESC_ENTRY(ZEBRA_VNI_ADD),
 	DESC_ENTRY(ZEBRA_VNI_DEL),
 	DESC_ENTRY(ZEBRA_REMOTE_VTEP_ADD),
diff --git a/lib/prefix.c b/lib/prefix.c
index 33b6ff198..de521b2e3 100644
--- a/lib/prefix.c
+++ b/lib/prefix.c
@@ -37,390 +37,262 @@ static const u_char maskbit[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0,
 static const struct in6_addr maskbytes6[] = {
 	/* /0   */ {{{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /1   */
-	{{{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /2   */
-	{{{0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /3   */
-	{{{0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /4   */
-	{{{0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /5   */
-	{{{0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /6   */
-	{{{0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /7   */
-	{{{0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /8   */
-	{{{0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /9   */
-	{{{0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /10  */
-	{{{0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /11  */
-	{{{0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /12  */
-	{{{0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /13  */
-	{{{0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /14  */
-	{{{0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /15  */
-	{{{0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /16  */
-	{{{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /17  */
-	{{{0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /18  */
-	{{{0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /19  */
-	{{{0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /20  */
-	{{{0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /21  */
-	{{{0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /22  */
-	{{{0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /23  */
-	{{{0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /24  */
-	{{{0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /25  */
-	{{{0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /26  */
-	{{{0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /27  */
-	{{{0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /28  */
-	{{{0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /29  */
-	{{{0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /30  */
-	{{{0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /31  */
-	{{{0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /32  */
-	{{{0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /33  */
-	{{{0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /34  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /35  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /36  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /37  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /38  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /39  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /40  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /41  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /42  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /43  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /44  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /45  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /46  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /47  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /48  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /49  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /50  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /51  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /52  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /53  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /54  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /55  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /56  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /57  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /58  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /59  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /60  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /61  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /62  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /63  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /64  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /65  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /66  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /67  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /68  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /69  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /70  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /71  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /72  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /73  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /74  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /75  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /76  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /77  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /78  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /79  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /80  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /81  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /82  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /83  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /84  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /85  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /86  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /87  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /88  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0x00, 0x00, 0x00, 0x00, 0x00}}},
-	/* /89  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0x80, 0x00, 0x00, 0x00, 0x00}}},
-	/* /90  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xc0, 0x00, 0x00, 0x00, 0x00}}},
-	/* /91  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xe0, 0x00, 0x00, 0x00, 0x00}}},
-	/* /92  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xf0, 0x00, 0x00, 0x00, 0x00}}},
-	/* /93  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xf8, 0x00, 0x00, 0x00, 0x00}}},
-	/* /94  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xfc, 0x00, 0x00, 0x00, 0x00}}},
-	/* /95  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xfe, 0x00, 0x00, 0x00, 0x00}}},
-	/* /96  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0x00, 0x00, 0x00, 0x00}}},
-	/* /97  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0x80, 0x00, 0x00, 0x00}}},
-	/* /98  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xc0, 0x00, 0x00, 0x00}}},
-	/* /99  */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xe0, 0x00, 0x00, 0x00}}},
-	/* /100 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xf0, 0x00, 0x00, 0x00}}},
-	/* /101 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xf8, 0x00, 0x00, 0x00}}},
-	/* /102 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xfc, 0x00, 0x00, 0x00}}},
-	/* /103 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xfe, 0x00, 0x00, 0x00}}},
-	/* /104 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0x00, 0x00, 0x00}}},
-	/* /105 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0x80, 0x00, 0x00}}},
-	/* /106 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xc0, 0x00, 0x00}}},
-	/* /107 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xe0, 0x00, 0x00}}},
-	/* /108 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xf0, 0x00, 0x00}}},
-	/* /109 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xf8, 0x00, 0x00}}},
-	/* /110 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xfc, 0x00, 0x00}}},
-	/* /111 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xfe, 0x00, 0x00}}},
-	/* /112 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0x00, 0x00}}},
-	/* /113 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0x80, 0x00}}},
-	/* /114 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xc0, 0x00}}},
-	/* /115 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xe0, 0x00}}},
-	/* /116 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xf0, 0x00}}},
-	/* /117 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xf8, 0x00}}},
-	/* /118 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xfc, 0x00}}},
-	/* /119 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xfe, 0x00}}},
-	/* /120 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xff, 0x00}}},
-	/* /121 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xff, 0x80}}},
-	/* /122 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xff, 0xc0}}},
-	/* /123 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xff, 0xe0}}},
-	/* /124 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xff, 0xf0}}},
-	/* /125 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xff, 0xf8}}},
-	/* /126 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xff, 0xfc}}},
-	/* /127 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xff, 0xfe}}},
-	/* /128 */
-	{{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	   0xff, 0xff, 0xff, 0xff, 0xff}}}};
+	/* /1   */ {{{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /2   */ {{{0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /3   */ {{{0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /4   */ {{{0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /5   */ {{{0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /6   */ {{{0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /7   */ {{{0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /8   */ {{{0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /9   */ {{{0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /10  */ {{{0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /11  */ {{{0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /12  */ {{{0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /13  */ {{{0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /14  */ {{{0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /15  */ {{{0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /16  */ {{{0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /17  */ {{{0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /18  */ {{{0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /19  */ {{{0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /20  */ {{{0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /21  */ {{{0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /22  */ {{{0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /23  */ {{{0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /24  */ {{{0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /25  */ {{{0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /26  */ {{{0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /27  */ {{{0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /28  */ {{{0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /29  */ {{{0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /30  */ {{{0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /31  */ {{{0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /32  */ {{{0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /33  */ {{{0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /34  */ {{{0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /35  */ {{{0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /36  */ {{{0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /37  */ {{{0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /38  */ {{{0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /39  */ {{{0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /40  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /41  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /42  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /43  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /44  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /45  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /46  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /47  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /48  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /49  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /50  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /51  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /52  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /53  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /54  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /55  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /56  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /57  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /58  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /59  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /60  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /61  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /62  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /63  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /64  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /65  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /66  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /67  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /68  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /69  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /70  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /71  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /72  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /73  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /74  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /75  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /76  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /77  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /78  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /79  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /80  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /81  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /82  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /83  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /84  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /85  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /86  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /87  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /88  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00}}},
+	/* /89  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00}}},
+	/* /90  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00}}},
+	/* /91  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00}}},
+	/* /92  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00}}},
+	/* /93  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00}}},
+	/* /94  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00}}},
+	/* /95  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00}}},
+	/* /96  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00}}},
+	/* /97  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00}}},
+	/* /98  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00}}},
+	/* /99  */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00}}},
+	/* /100 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00}}},
+	/* /101 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00}}},
+	/* /102 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00}}},
+	/* /103 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00}}},
+	/* /104 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00}}},
+	/* /105 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00}}},
+	/* /106 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00}}},
+	/* /107 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00}}},
+	/* /108 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00}}},
+	/* /109 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00}}},
+	/* /110 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00}}},
+	/* /111 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00}}},
+	/* /112 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00}}},
+	/* /113 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00}}},
+	/* /114 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00}}},
+	/* /115 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00}}},
+	/* /116 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00}}},
+	/* /117 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00}}},
+	/* /118 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00}}},
+	/* /119 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00}}},
+	/* /120 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00}}},
+	/* /121 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80}}},
+	/* /122 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0}}},
+	/* /123 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0}}},
+	/* /124 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0}}},
+	/* /125 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8}}},
+	/* /126 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc}}},
+	/* /127 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe}}},
+	/* /128 */ {{{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+		      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}}};
 
 /* Number of bits in prefix type. */
 #ifndef PNBBY
@@ -429,6 +301,18 @@ static const struct in6_addr maskbytes6[] = {
 
 #define MASKBIT(offset)  ((0xff << (PNBBY - (offset))) & 0xff)
 
+static int is_zero_mac(const struct ethaddr *mac)
+{
+	int i = 0;
+
+	for (i = 0; i < ETH_ALEN; i++) {
+		if (mac->octet[i])
+			return 0;
+	}
+
+	return 1;
+}
+
 unsigned int prefix_bit(const u_char *prefix, const u_char prefixlen)
 {
 	unsigned int offset = prefixlen / 8;
@@ -450,6 +334,8 @@ int str2family(const char *string)
 		return AF_INET6;
 	else if (!strcmp("ethernet", string))
 		return AF_ETHERNET;
+	else if (!strcmp("evpn", string))
+		return AF_EVPN;
 	return -1;
 }
 
@@ -462,6 +348,7 @@ int afi2family(afi_t afi)
 		return AF_INET6;
 	else if (afi == AFI_L2VPN)
 		return AF_ETHERNET;
+	/* NOTE: EVPN code should NOT use this interface. */
 	return 0;
 }
 
@@ -471,7 +358,7 @@ afi_t family2afi(int family)
 		return AFI_IP;
 	else if (family == AF_INET6)
 		return AFI_IP6;
-	else if (family == AF_ETHERNET)
+	else if (family == AF_ETHERNET || family == AF_EVPN)
 		return AFI_L2VPN;
 	return 0;
 }
@@ -577,6 +464,9 @@ void prefix_copy(struct prefix *dest, const struct prefix *src)
 	else if (src->family == AF_INET6)
 		dest->u.prefix6 = src->u.prefix6;
 	else if (src->family == AF_ETHERNET) {
+		memcpy(&dest->u.prefix_eth, &src->u.prefix_eth,
+		       sizeof(struct ethaddr));
+	} else if (src->family == AF_EVPN) {
 		memcpy(&dest->u.prefix_evpn, &src->u.prefix_evpn,
 		       sizeof(struct evpn_addr));
 	} else if (src->family == AF_UNSPEC) {
@@ -615,6 +505,10 @@ int prefix_same(const struct prefix *p1, const struct prefix *p2)
 					   &p2->u.prefix6.s6_addr))
 				return 1;
 		if (p1->family == AF_ETHERNET)
+			if (!memcmp(&p1->u.prefix_eth, &p2->u.prefix_eth,
+				    sizeof(struct ethaddr)))
+				return 1;
+		if (p1->family == AF_EVPN)
 			if (!memcmp(&p1->u.prefix_evpn, &p2->u.prefix_evpn,
 				    sizeof(struct evpn_addr)))
 				return 1;
@@ -679,6 +573,8 @@ int prefix_common_bits(const struct prefix *p1, const struct prefix *p2)
 	if (p1->family == AF_INET6)
 		length = IPV6_MAX_BYTELEN;
 	if (p1->family == AF_ETHERNET)
+		length = ETH_ALEN;
+	if (p1->family == AF_EVPN)
 		length = 8 * sizeof(struct evpn_addr);
 
 	if (p1->family != p2->family || !length)
@@ -707,6 +603,8 @@ const char *prefix_family_str(const struct prefix *p)
 		return "inet6";
 	if (p->family == AF_ETHERNET)
 		return "ether";
+	if (p->family == AF_EVPN)
+		return "evpn";
 	return "unspec";
 }
 
@@ -783,6 +681,13 @@ int str2prefix_eth(const char *str, struct prefix_eth *p)
 	const char *str_addr = str;
 	unsigned int a[6];
 	int i;
+	bool slash = false;
+
+	if (!strcmp(str, "any")) {
+		memset(p, 0, sizeof(*p));
+		p->family = AF_ETHERNET;
+		return 1;
+	}
 
 	/* Find slash inside string. */
 	pnt = strchr(str, '/');
@@ -800,6 +705,7 @@ int str2prefix_eth(const char *str, struct prefix_eth *p)
 		*(cp + (pnt - str)) = '\0';
 
 		str_addr = cp;
+		slash = true;
 	}
 
 	/* Convert string to prefix. */
@@ -814,6 +720,15 @@ int str2prefix_eth(const char *str, struct prefix_eth *p)
 	}
 	p->prefixlen = plen;
 	p->family = AF_ETHERNET;
+
+	/*
+	 * special case to allow old configurations to work
+	 * Since all zero's is implicitly meant to allow
+	 * a comparison to zero, let's assume
+	 */
+	if (!slash && is_zero_mac(&(p->eth_addr)))
+	    p->prefixlen = 0;
+
 	ret = 1;
 
 done:
@@ -1063,6 +978,7 @@ int prefix_blen(const struct prefix *p)
 		break;
 	case AF_ETHERNET:
 		return ETH_ALEN;
+		break;
 	}
 	return 0;
 }
@@ -1090,7 +1006,7 @@ int str2prefix(const char *str, struct prefix *p)
 	return 0;
 }
 
-static const char *prefixeth2str(const struct prefix *p, char *str, int size)
+static const char *prefixevpn2str(const struct prefix *p, char *str, int size)
 {
 	u_char family;
 	char buf[PREFIX2STR_BUFFER];
@@ -1134,12 +1050,8 @@ static const char *prefixeth2str(const struct prefix *p, char *str, int size)
 				   PREFIX2STR_BUFFER),
 			 p->prefixlen);
 	} else {
-		sprintf(str, "UNK AF_ETHER prefix");
-		snprintf(str, size, "%02x:%02x:%02x:%02x:%02x:%02x/%d",
-			 p->u.prefix_eth.octet[0], p->u.prefix_eth.octet[1],
-			 p->u.prefix_eth.octet[2], p->u.prefix_eth.octet[3],
-			 p->u.prefix_eth.octet[4], p->u.prefix_eth.octet[5],
-			 p->prefixlen);
+		sprintf(str, "Unsupported EVPN route type %d",
+			 p->u.prefix_evpn.route_type);
 	}
 
 	return str;
@@ -1159,7 +1071,13 @@ const char *prefix2str(union prefixconstptr pu, char *str, int size)
 		break;
 
 	case AF_ETHERNET:
-		prefixeth2str(p, str, size);
+		snprintf(str, size, "%s/%d",
+			 prefix_mac2str(&p->u.prefix_eth, buf, sizeof(buf)),
+			 p->prefixlen);
+		break;
+
+	case AF_EVPN:
+		prefixevpn2str(p, str, size);
 		break;
 
 	default:
diff --git a/lib/prefix.h b/lib/prefix.h
index 5f2b57ccc..f0644ea88 100644
--- a/lib/prefix.h
+++ b/lib/prefix.h
@@ -116,7 +116,18 @@ struct evpn_addr {
 #endif
 #endif
 
-/* IPv4 and IPv6 unified prefix structure. */
+/* The 'family' in the prefix structure is internal to FRR and need not
+ * map to standard OS AF_ definitions except where needed for interacting
+ * with the kernel. However, AF_ definitions are currently in use and
+ * prevalent across the code. Define a new FRR-specific AF for EVPN to
+ * distinguish between 'ethernet' (MAC-only) and 'evpn' prefixes and
+ * ensure it does not conflict with any OS AF_ definition.
+ */
+#if !defined(AF_EVPN)
+#define AF_EVPN (AF_MAX + 1)
+#endif
+
+/* FRR generic prefix structure. */
 struct prefix {
 	u_char family;
 	u_char prefixlen;
@@ -131,7 +142,7 @@ struct prefix {
 		struct ethaddr prefix_eth; /* AF_ETHERNET */
 		u_char val[8];
 		uintptr_t ptr;
-		struct evpn_addr prefix_evpn;
+		struct evpn_addr prefix_evpn; /* AF_EVPN */
 	} u __attribute__((aligned(8)));
 };
 
@@ -356,6 +367,7 @@ static inline int ipv6_martian(struct in6_addr *addr)
 }
 
 extern int all_digit(const char *);
+extern int macstr2prefix_evpn(const char *str, struct prefix_evpn *p);
 
 /* NOTE: This routine expects the address argument in network byte order. */
 static inline int ipv4_martian(struct in_addr *addr)
diff --git a/lib/zclient.h b/lib/zclient.h
index 5edb56f51..15d1858d8 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -111,6 +111,7 @@ typedef enum {
 	ZEBRA_FEC_REGISTER,
 	ZEBRA_FEC_UNREGISTER,
 	ZEBRA_FEC_UPDATE,
+	ZEBRA_ADVERTISE_DEFAULT_GW,
 	ZEBRA_ADVERTISE_ALL_VNI,
 	ZEBRA_VNI_ADD,
 	ZEBRA_VNI_DEL,
@@ -305,6 +306,10 @@ struct zapi_pw_status {
 	uint32_t status;
 };
 
+/* Zebra MAC types */
+#define ZEBRA_MAC_TYPE_STICKY                0x01 /* Sticky MAC*/
+#define ZEBRA_MAC_TYPE_GW                    0x02 /* gateway (SVI) mac*/
+
 /* Prototypes of zebra client service functions. */
 extern struct zclient *zclient_new(struct thread_master *);
 extern void zclient_init(struct zclient *, int, u_short);