Supporting Zebra API version 6 which is used in FRRouting version 6

4 files changed, 285 insertions, 58 deletions

diff --git a/internal/pkg/config/default.go b/internal/pkg/config/default.go
index 1f4105c7..31dd1b17 100644
--- a/internal/pkg/config/default.go
+++ b/internal/pkg/config/default.go
@@ -398,8 +398,8 @@ func setDefaultConfigValuesWithViper(v *viper.Viper, b *BgpConfigSet) error {
 	}
 	if b.Zebra.Config.Version < 2 {
 		b.Zebra.Config.Version = 2
-	} else if b.Zebra.Config.Version > 5 {
-		b.Zebra.Config.Version = 5
+	} else if b.Zebra.Config.Version > 6 {
+		b.Zebra.Config.Version = 6
 	}
 	if !v.IsSet("zebra.config.nexthop-trigger-enable") && !b.Zebra.Config.NexthopTriggerEnable && b.Zebra.Config.Version > 2 {
 		b.Zebra.Config.NexthopTriggerEnable = true
diff --git a/internal/pkg/zebra/api_type_string.go b/internal/pkg/zebra/api_type_string.go
index 3d780850..af16317b 100644
--- a/internal/pkg/zebra/api_type_string.go
+++ b/internal/pkg/zebra/api_type_string.go
@@ -4,9 +4,9 @@ package zebra
 
 import "strconv"
 
-const _API_TYPE_name = "FRR_ZAPI5_INTERFACE_ADDFRR_ZAPI5_INTERFACE_DELETEFRR_ZAPI5_INTERFACE_ADDRESS_ADDFRR_ZAPI5_INTERFACE_ADDRESS_DELETEFRR_ZAPI5_INTERFACE_UPFRR_ZAPI5_INTERFACE_DOWNFRR_ZAPI5_INTERFACE_SET_MASTERFRR_ZAPI5_ROUTE_ADDFRR_ZAPI5_ROUTE_DELETEFRR_ZAPI5_ROUTE_NOTIFY_OWNERFRR_ZAPI5_IPV4_ROUTE_ADDFRR_ZAPI5_IPV4_ROUTE_DELETEFRR_ZAPI5_IPV6_ROUTE_ADDFRR_ZAPI5_IPV6_ROUTE_DELETEFRR_ZAPI5_REDISTRIBUTE_ADDFRR_ZAPI5_REDISTRIBUTE_DELETEFRR_ZAPI5_REDISTRIBUTE_DEFAULT_ADDFRR_ZAPI5_REDISTRIBUTE_DEFAULT_DELETEFRR_ZAPI5_ROUTER_ID_ADDFRR_ZAPI5_ROUTER_ID_DELETEFRR_ZAPI5_ROUTER_ID_UPDATEFRR_ZAPI5_HELLOFRR_ZAPI5_CAPABILITIESFRR_ZAPI5_NEXTHOP_REGISTERFRR_ZAPI5_NEXTHOP_UNREGISTERFRR_ZAPI5_NEXTHOP_UPDATEFRR_ZAPI5_INTERFACE_NBR_ADDRESS_ADDFRR_ZAPI5_INTERFACE_NBR_ADDRESS_DELETEFRR_ZAPI5_INTERFACE_BFD_DEST_UPDATEFRR_ZAPI5_IMPORT_ROUTE_REGISTERFRR_ZAPI5_IMPORT_ROUTE_UNREGISTERFRR_ZAPI5_IMPORT_CHECK_UPDATEFRR_ZAPI5_IPV4_ROUTE_IPV6_NEXTHOP_ADDFRR_ZAPI5_BFD_DEST_REGISTERFRR_ZAPI5_BFD_DEST_DEREGISTERFRR_ZAPI5_BFD_DEST_UPDATEFRR_ZAPI5_BFD_DEST_REPLAYFRR_ZAPI5_REDISTRIBUTE_ROUTE_ADDFRR_ZAPI5_REDISTRIBUTE_ROUTE_DELFRR_ZAPI5_VRF_UNREGISTERFRR_ZAPI5_VRF_ADDFRR_ZAPI5_VRF_DELETEFRR_ZAPI5_VRF_LABELFRR_ZAPI5_INTERFACE_VRF_UPDATEFRR_ZAPI5_BFD_CLIENT_REGISTERFRR_ZAPI5_INTERFACE_ENABLE_RADVFRR_ZAPI5_INTERFACE_DISABLE_RADVFRR_ZAPI5_IPV4_NEXTHOP_LOOKUP_MRIBFRR_ZAPI5_INTERFACE_LINK_PARAMSFRR_ZAPI5_MPLS_LABELS_ADDFRR_ZAPI5_MPLS_LABELS_DELETEFRR_ZAPI5_IPMR_ROUTE_STATSFRR_ZAPI5_LABEL_MANAGER_CONNECTFRR_ZAPI5_GET_LABEL_CHUNKFRR_ZAPI5_RELEASE_LABEL_CHUNKFRR_ZAPI5_FEC_REGISTERFRR_ZAPI5_FEC_UNREGISTERFRR_ZAPI5_FEC_UPDATEFRR_ZAPI5_ADVERTISE_DEFAULT_GWFRR_ZAPI5_ADVERTISE_SUBNETFRR_ZAPI5_ADVERTISE_ALL_VNIFRR_ZAPI5_VNI_ADDFRR_ZAPI5_VNI_DELFRR_ZAPI5_L3VNI_ADDFRR_ZAPI5_L3VNI_DELFRR_ZAPI5_REMOTE_VTEP_ADDFRR_ZAPI5_REMOTE_VTEP_DELFRR_ZAPI5_MACIP_ADDFRR_ZAPI5_MACIP_DELFRR_ZAPI5_IP_PREFIX_ROUTE_ADDFRR_ZAPI5_IP_PREFIX_ROUTE_DELFRR_ZAPI5_REMOTE_MACIP_ADDFRR_ZAPI5_REMOTE_MACIP_DELFRR_ZAPI5_PW_ADDFRR_ZAPI5_PW_DELETEFRR_ZAPI5_PW_SETFRR_ZAPI5_PW_UNSETFRR_ZAPI5_PW_STATUS_UPDATEFRR_ZAPI5_RULE_ADDFRR_ZAPI5_RULE_DELETEFRR_ZAPI5_RULE_NOTIFY_OWNERFRR_ZAPI5_TABLE_MANAGER_CONNECTFRR_ZAPI5_GET_TABLE_CHUNKFRR_ZAPI5_RELEASE_TABLE_CHUNKFRR_ZAPI5_IPSET_CREATEFRR_ZAPI5_IPSET_DESTROYFRR_ZAPI5_IPSET_ENTRY_ADDFRR_ZAPI5_IPSET_ENTRY_DELETEFRR_ZAPI5_IPSET_NOTIFY_OWNERFRR_ZAPI5_IPSET_ENTRY_NOTIFY_OWNERFRR_ZAPI5_IPTABLE_ADDFRR_ZAPI5_IPTABLE_DELETEFRR_ZAPI5_IPTABLE_NOTIFY_OWNER"
+const _API_TYPE_name = "FRR_ZAPI6_INTERFACE_ADDFRR_ZAPI6_INTERFACE_DELETEFRR_ZAPI6_INTERFACE_ADDRESS_ADDFRR_ZAPI6_INTERFACE_ADDRESS_DELETEFRR_ZAPI6_INTERFACE_UPFRR_ZAPI6_INTERFACE_DOWNFRR_ZAPI6_INTERFACE_SET_MASTERFRR_ZAPI6_ROUTE_ADDFRR_ZAPI6_ROUTE_DELETEFRR_ZAPI6_ROUTE_NOTIFY_OWNERFRR_ZAPI6_REDISTRIBUTE_ADDFRR_ZAPI6_REDISTRIBUTE_DELETEFRR_ZAPI6_REDISTRIBUTE_DEFAULT_ADDFRR_ZAPI6_REDISTRIBUTE_DEFAULT_DELETEFRR_ZAPI6_ROUTER_ID_ADDFRR_ZAPI6_ROUTER_ID_DELETEFRR_ZAPI6_ROUTER_ID_UPDATEFRR_ZAPI6_HELLOFRR_ZAPI6_CAPABILITIESFRR_ZAPI6_NEXTHOP_REGISTERFRR_ZAPI6_NEXTHOP_UNREGISTERFRR_ZAPI6_NEXTHOP_UPDATEFRR_ZAPI6_INTERFACE_NBR_ADDRESS_ADDFRR_ZAPI6_INTERFACE_NBR_ADDRESS_DELETEFRR_ZAPI6_INTERFACE_BFD_DEST_UPDATEFRR_ZAPI6_IMPORT_ROUTE_REGISTERFRR_ZAPI6_IMPORT_ROUTE_UNREGISTERFRR_ZAPI6_IMPORT_CHECK_UPDATEFRR_ZAPI6_IPV4_ROUTE_IPV6_NEXTHOP_ADDFRR_ZAPI6_BFD_DEST_REGISTERFRR_ZAPI6_BFD_DEST_DEREGISTERFRR_ZAPI6_BFD_DEST_UPDATEFRR_ZAPI6_BFD_DEST_REPLAYFRR_ZAPI6_REDISTRIBUTE_ROUTE_ADDFRR_ZAPI6_REDISTRIBUTE_ROUTE_DELFRR_ZAPI6_VRF_UNREGISTERFRR_ZAPI6_VRF_ADDFRR_ZAPI6_VRF_DELETEFRR_ZAPI6_VRF_LABELFRR_ZAPI6_INTERFACE_VRF_UPDATEFRR_ZAPI6_BFD_CLIENT_REGISTERFRR_ZAPI6_BFD_CLIENT_DEREGISTERFRR_ZAPI6_INTERFACE_ENABLE_RADVFRR_ZAPI6_INTERFACE_DISABLE_RADVFRR_ZAPI6_IPV4_NEXTHOP_LOOKUP_MRIBFRR_ZAPI6_INTERFACE_LINK_PARAMSFRR_ZAPI6_MPLS_LABELS_ADDFRR_ZAPI6_MPLS_LABELS_DELETEFRR_ZAPI6_IPMR_ROUTE_STATSFRR_ZAPI6_LABEL_MANAGER_CONNECTFRR_ZAPI6_GET_LABEL_CHUNKFRR_ZAPI6_RELEASE_LABEL_CHUNKFRR_ZAPI6_FEC_REGISTERFRR_ZAPI6_FEC_UNREGISTERFRR_ZAPI6_FEC_UPDATEFRR_ZAPI6_ADVERTISE_DEFAULT_GWFRR_ZAPI6_ADVERTISE_SUBNETFRR_ZAPI6_ADVERTISE_ALL_VNIFRR_ZAPI6_LOCAL_ES_ADDFRR_ZAPI6_LOCAL_ES_DELFRR_ZAPI6_VNI_ADDFRR_ZAPI6_VNI_DELFRR_ZAPI6_L3VNI_ADDFRR_ZAPI6_L3VNI_DELFRR_ZAPI6_REMOTE_VTEP_ADDFRR_ZAPI6_REMOTE_VTEP_DELFRR_ZAPI6_MACIP_ADDFRR_ZAPI6_MACIP_DELFRR_ZAPI6_IP_PREFIX_ROUTE_ADDFRR_ZAPI6_IP_PREFIX_ROUTE_DELFRR_ZAPI6_REMOTE_MACIP_ADDFRR_ZAPI6_REMOTE_MACIP_DELFRR_ZAPI6_PW_ADDFRR_ZAPI6_PW_DELETEFRR_ZAPI6_PW_SETFRR_ZAPI6_PW_UNSETFRR_ZAPI6_PW_STATUS_UPDATEFRR_ZAPI6_RULE_ADDFRR_ZAPI6_RULE_DELETEFRR_ZAPI6_RULE_NOTIFY_OWNERFRR_ZAPI6_TABLE_MANAGER_CONNECTFRR_ZAPI6_GET_TABLE_CHUNKFRR_ZAPI6_RELEASE_TABLE_CHUNKFRR_ZAPI6_IPSET_CREATEFRR_ZAPI6_IPSET_DESTROYFRR_ZAPI6_IPSET_ENTRY_ADDFRR_ZAPI6_IPSET_ENTRY_DELETEFRR_ZAPI6_IPSET_NOTIFY_OWNERFRR_ZAPI6_IPSET_ENTRY_NOTIFY_OWNERFRR_ZAPI6_IPTABLE_ADDFRR_ZAPI6_IPTABLE_DELETEFRR_ZAPI6_IPTABLE_NOTIFY_OWNERFRR_ZAPI5_IPTABLE_DELETEFRR_ZAPI5_IPTABLE_NOTIFY_OWNER"
 
-var _API_TYPE_index = [...]uint16{0, 23, 49, 80, 114, 136, 160, 190, 209, 231, 259, 283, 310, 334, 361, 387, 416, 450, 487, 510, 536, 562, 577, 599, 625, 653, 677, 712, 750, 785, 816, 849, 878, 915, 942, 971, 996, 1021, 1053, 1085, 1109, 1126, 1146, 1165, 1195, 1224, 1255, 1287, 1321, 1352, 1377, 1405, 1431, 1462, 1487, 1516, 1538, 1562, 1582, 1612, 1638, 1665, 1682, 1699, 1718, 1737, 1762, 1787, 1806, 1825, 1854, 1883, 1909, 1935, 1951, 1970, 1986, 2004, 2030, 2048, 2069, 2096, 2127, 2152, 2181, 2203, 2226, 2251, 2279, 2307, 2341, 2362, 2386, 2416}
+var _API_TYPE_index = [...]uint16{0, 23, 49, 80, 114, 136, 160, 190, 209, 231, 259, 285, 314, 348, 385, 408, 434, 460, 475, 497, 523, 551, 575, 610, 648, 683, 714, 747, 776, 813, 840, 869, 894, 919, 951, 983, 1007, 1024, 1044, 1063, 1093, 1122, 1153, 1184, 1216, 1250, 1281, 1306, 1334, 1360, 1391, 1416, 1445, 1467, 1491, 1511, 1541, 1567, 1594, 1616, 1638, 1655, 1672, 1691, 1710, 1735, 1760, 1779, 1798, 1827, 1856, 1882, 1908, 1924, 1943, 1959, 1977, 2003, 2021, 2042, 2069, 2100, 2125, 2154, 2176, 2199, 2224, 2252, 2280, 2314, 2335, 2359, 2389, 2413, 2443}
 
 func (i API_TYPE) String() string {
 	if i >= API_TYPE(len(_API_TYPE_index)-1) {
diff --git a/internal/pkg/zebra/route_type_string.go b/internal/pkg/zebra/route_type_string.go
index 47d6f27d..74d56a17 100644
--- a/internal/pkg/zebra/route_type_string.go
+++ b/internal/pkg/zebra/route_type_string.go
@@ -4,9 +4,9 @@ package zebra
 
 import "strconv"
 
-const _ROUTE_TYPE_name = "FRR_ZAPI5_ROUTE_SYSTEMFRR_ZAPI5_ROUTE_KERNELFRR_ZAPI5_ROUTE_CONNECTFRR_ZAPI5_ROUTE_STATICFRR_ZAPI5_ROUTE_RIPFRR_ZAPI5_ROUTE_RIPNGFRR_ZAPI5_ROUTE_OSPFFRR_ZAPI5_ROUTE_OSPF6FRR_ZAPI5_ROUTE_ISISFRR_ZAPI5_ROUTE_BGPFRR_ZAPI5_ROUTE_PIMFRR_ZAPI5_ROUTE_EIGRPFRR_ZAPI5_ROUTE_NHRPFRR_ZAPI5_ROUTE_HSLSFRR_ZAPI5_ROUTE_OLSRFRR_ZAPI5_ROUTE_TABLEFRR_ZAPI5_ROUTE_LDPFRR_ZAPI5_ROUTE_VNCFRR_ZAPI5_ROUTE_VNC_DIRECTFRR_ZAPI5_ROUTE_VNC_DIRECT_RHFRR_ZAPI5_ROUTE_BGP_DIRECTFRR_ZAPI5_ROUTE_BGP_DIRECT_EXTFRR_ZAPI5_ROUTE_BABELFRR_ZAPI5_ROUTE_SHARPFRR_ZAPI5_ROUTE_PBRFRR_ZAPI5_ROUTE_ALLFRR_ZAPI5_ROUTE_MAX"
+const _ROUTE_TYPE_name = "FRR_ZAPI6_ROUTE_SYSTEMFRR_ZAPI6_ROUTE_KERNELFRR_ZAPI6_ROUTE_CONNECTFRR_ZAPI6_ROUTE_STATICFRR_ZAPI6_ROUTE_RIPFRR_ZAPI6_ROUTE_RIPNGFRR_ZAPI6_ROUTE_OSPFFRR_ZAPI6_ROUTE_OSPF6FRR_ZAPI6_ROUTE_ISISFRR_ZAPI6_ROUTE_BGPFRR_ZAPI6_ROUTE_PIMFRR_ZAPI6_ROUTE_EIGRPFRR_ZAPI6_ROUTE_NHRPFRR_ZAPI6_ROUTE_HSLSFRR_ZAPI6_ROUTE_OLSRFRR_ZAPI6_ROUTE_TABLEFRR_ZAPI6_ROUTE_LDPFRR_ZAPI6_ROUTE_VNCFRR_ZAPI6_ROUTE_VNC_DIRECTFRR_ZAPI6_ROUTE_VNC_DIRECT_RHFRR_ZAPI6_ROUTE_BGP_DIRECTFRR_ZAPI6_ROUTE_BGP_DIRECT_EXTFRR_ZAPI6_ROUTE_BABELFRR_ZAPI6_ROUTE_SHARPFRR_ZAPI6_ROUTE_PBRFRR_ZAPI6_ROUTE_BFDFRR_ZAPI6_ROUTE_ALLFRR_ZAPI6_ROUTE_MAX"
 
-var _ROUTE_TYPE_index = [...]uint16{0, 22, 44, 67, 89, 108, 129, 149, 170, 190, 209, 228, 249, 269, 289, 309, 330, 349, 368, 394, 423, 449, 479, 500, 521, 540, 559, 578}
+var _ROUTE_TYPE_index = [...]uint16{0, 22, 44, 67, 89, 108, 129, 149, 170, 190, 209, 228, 249, 269, 289, 309, 330, 349, 368, 394, 423, 449, 479, 500, 521, 540, 559, 578, 597}
 
 func (i ROUTE_TYPE) String() string {
 	if i >= ROUTE_TYPE(len(_ROUTE_TYPE_index)-1) {
diff --git a/internal/pkg/zebra/zapi.go b/internal/pkg/zebra/zapi.go
index 9d658f1a..8189ceed 100644
--- a/internal/pkg/zebra/zapi.go
+++ b/internal/pkg/zebra/zapi.go
@@ -110,7 +110,7 @@ func HeaderSize(version uint8) uint16 {
 	switch version {
 	case 3, 4:
 		return 8
-	case 5:
+	case 5, 6:
 		return 10
 	default:
 		return 6
@@ -185,6 +185,102 @@ const (
 //go:generate stringer -type=API_TYPE
 type API_TYPE uint16
 
+// For FRRouting version 6. (ZAPI version 6)
+const (
+	FRR_ZAPI6_INTERFACE_ADD API_TYPE = iota
+	FRR_ZAPI6_INTERFACE_DELETE
+	FRR_ZAPI6_INTERFACE_ADDRESS_ADD
+	FRR_ZAPI6_INTERFACE_ADDRESS_DELETE
+	FRR_ZAPI6_INTERFACE_UP
+	FRR_ZAPI6_INTERFACE_DOWN
+	FRR_ZAPI6_INTERFACE_SET_MASTER
+	FRR_ZAPI6_ROUTE_ADD
+	FRR_ZAPI6_ROUTE_DELETE
+	FRR_ZAPI6_ROUTE_NOTIFY_OWNER
+	FRR_ZAPI6_REDISTRIBUTE_ADD
+	FRR_ZAPI6_REDISTRIBUTE_DELETE
+	FRR_ZAPI6_REDISTRIBUTE_DEFAULT_ADD
+	FRR_ZAPI6_REDISTRIBUTE_DEFAULT_DELETE
+	FRR_ZAPI6_ROUTER_ID_ADD
+	FRR_ZAPI6_ROUTER_ID_DELETE
+	FRR_ZAPI6_ROUTER_ID_UPDATE
+	FRR_ZAPI6_HELLO
+	FRR_ZAPI6_CAPABILITIES
+	FRR_ZAPI6_NEXTHOP_REGISTER
+	FRR_ZAPI6_NEXTHOP_UNREGISTER
+	FRR_ZAPI6_NEXTHOP_UPDATE
+	FRR_ZAPI6_INTERFACE_NBR_ADDRESS_ADD
+	FRR_ZAPI6_INTERFACE_NBR_ADDRESS_DELETE
+	FRR_ZAPI6_INTERFACE_BFD_DEST_UPDATE
+	FRR_ZAPI6_IMPORT_ROUTE_REGISTER
+	FRR_ZAPI6_IMPORT_ROUTE_UNREGISTER
+	FRR_ZAPI6_IMPORT_CHECK_UPDATE
+	FRR_ZAPI6_IPV4_ROUTE_IPV6_NEXTHOP_ADD
+	FRR_ZAPI6_BFD_DEST_REGISTER
+	FRR_ZAPI6_BFD_DEST_DEREGISTER
+	FRR_ZAPI6_BFD_DEST_UPDATE
+	FRR_ZAPI6_BFD_DEST_REPLAY
+	FRR_ZAPI6_REDISTRIBUTE_ROUTE_ADD
+	FRR_ZAPI6_REDISTRIBUTE_ROUTE_DEL
+	FRR_ZAPI6_VRF_UNREGISTER
+	FRR_ZAPI6_VRF_ADD
+	FRR_ZAPI6_VRF_DELETE
+	FRR_ZAPI6_VRF_LABEL
+	FRR_ZAPI6_INTERFACE_VRF_UPDATE
+	FRR_ZAPI6_BFD_CLIENT_REGISTER
+	FRR_ZAPI6_BFD_CLIENT_DEREGISTER
+	FRR_ZAPI6_INTERFACE_ENABLE_RADV
+	FRR_ZAPI6_INTERFACE_DISABLE_RADV
+	FRR_ZAPI6_IPV4_NEXTHOP_LOOKUP_MRIB
+	FRR_ZAPI6_INTERFACE_LINK_PARAMS
+	FRR_ZAPI6_MPLS_LABELS_ADD
+	FRR_ZAPI6_MPLS_LABELS_DELETE
+	FRR_ZAPI6_IPMR_ROUTE_STATS
+	FRR_ZAPI6_LABEL_MANAGER_CONNECT
+	FRR_ZAPI6_GET_LABEL_CHUNK
+	FRR_ZAPI6_RELEASE_LABEL_CHUNK
+	FRR_ZAPI6_FEC_REGISTER
+	FRR_ZAPI6_FEC_UNREGISTER
+	FRR_ZAPI6_FEC_UPDATE
+	FRR_ZAPI6_ADVERTISE_DEFAULT_GW
+	FRR_ZAPI6_ADVERTISE_SUBNET
+	FRR_ZAPI6_ADVERTISE_ALL_VNI
+	FRR_ZAPI6_LOCAL_ES_ADD
+	FRR_ZAPI6_LOCAL_ES_DEL
+	FRR_ZAPI6_VNI_ADD
+	FRR_ZAPI6_VNI_DEL
+	FRR_ZAPI6_L3VNI_ADD
+	FRR_ZAPI6_L3VNI_DEL
+	FRR_ZAPI6_REMOTE_VTEP_ADD
+	FRR_ZAPI6_REMOTE_VTEP_DEL
+	FRR_ZAPI6_MACIP_ADD
+	FRR_ZAPI6_MACIP_DEL
+	FRR_ZAPI6_IP_PREFIX_ROUTE_ADD
+	FRR_ZAPI6_IP_PREFIX_ROUTE_DEL
+	FRR_ZAPI6_REMOTE_MACIP_ADD
+	FRR_ZAPI6_REMOTE_MACIP_DEL
+	FRR_ZAPI6_PW_ADD
+	FRR_ZAPI6_PW_DELETE
+	FRR_ZAPI6_PW_SET
+	FRR_ZAPI6_PW_UNSET
+	FRR_ZAPI6_PW_STATUS_UPDATE
+	FRR_ZAPI6_RULE_ADD
+	FRR_ZAPI6_RULE_DELETE
+	FRR_ZAPI6_RULE_NOTIFY_OWNER
+	FRR_ZAPI6_TABLE_MANAGER_CONNECT
+	FRR_ZAPI6_GET_TABLE_CHUNK
+	FRR_ZAPI6_RELEASE_TABLE_CHUNK
+	FRR_ZAPI6_IPSET_CREATE
+	FRR_ZAPI6_IPSET_DESTROY
+	FRR_ZAPI6_IPSET_ENTRY_ADD
+	FRR_ZAPI6_IPSET_ENTRY_DELETE
+	FRR_ZAPI6_IPSET_NOTIFY_OWNER
+	FRR_ZAPI6_IPSET_ENTRY_NOTIFY_OWNER
+	FRR_ZAPI6_IPTABLE_ADD
+	FRR_ZAPI6_IPTABLE_DELETE
+	FRR_ZAPI6_IPTABLE_NOTIFY_OWNER
+)
+
 // For FRRouting version 4 and 5. (ZAPI version 5)
 const (
 	FRR_ZAPI5_INTERFACE_ADD API_TYPE = iota
@@ -240,6 +336,7 @@ const (
 	FRR_ZAPI5_MPLS_LABELS_DELETE
 	FRR_ZAPI5_IPMR_ROUTE_STATS
 	FRR_ZAPI5_LABEL_MANAGER_CONNECT
+	FRR_ZAPI5_LABEL_MANAGER_CONNECT_ASYNC
 	FRR_ZAPI5_GET_LABEL_CHUNK
 	FRR_ZAPI5_RELEASE_LABEL_CHUNK
 	FRR_ZAPI5_FEC_REGISTER
@@ -385,6 +482,38 @@ const (
 //go:generate stringer -type=ROUTE_TYPE
 type ROUTE_TYPE uint8
 
+// For FRRouting version 6 (ZAPI version 6).
+const (
+	FRR_ZAPI6_ROUTE_SYSTEM ROUTE_TYPE = iota
+	FRR_ZAPI6_ROUTE_KERNEL
+	FRR_ZAPI6_ROUTE_CONNECT
+	FRR_ZAPI6_ROUTE_STATIC
+	FRR_ZAPI6_ROUTE_RIP
+	FRR_ZAPI6_ROUTE_RIPNG
+	FRR_ZAPI6_ROUTE_OSPF
+	FRR_ZAPI6_ROUTE_OSPF6
+	FRR_ZAPI6_ROUTE_ISIS
+	FRR_ZAPI6_ROUTE_BGP
+	FRR_ZAPI6_ROUTE_PIM
+	FRR_ZAPI6_ROUTE_EIGRP
+	FRR_ZAPI6_ROUTE_NHRP
+	FRR_ZAPI6_ROUTE_HSLS
+	FRR_ZAPI6_ROUTE_OLSR
+	FRR_ZAPI6_ROUTE_TABLE
+	FRR_ZAPI6_ROUTE_LDP
+	FRR_ZAPI6_ROUTE_VNC
+	FRR_ZAPI6_ROUTE_VNC_DIRECT
+	FRR_ZAPI6_ROUTE_VNC_DIRECT_RH
+	FRR_ZAPI6_ROUTE_BGP_DIRECT
+	FRR_ZAPI6_ROUTE_BGP_DIRECT_EXT
+	FRR_ZAPI6_ROUTE_BABEL
+	FRR_ZAPI6_ROUTE_SHARP
+	FRR_ZAPI6_ROUTE_PBR
+	FRR_ZAPI6_ROUTE_BFD
+	FRR_ZAPI6_ROUTE_ALL
+	FRR_ZAPI6_ROUTE_MAX
+)
+
 // For FRRouting version 4 and 5 (ZAPI version 5).
 const (
 	FRR_ZAPI5_ROUTE_SYSTEM ROUTE_TYPE = iota
@@ -461,6 +590,37 @@ const (
 	ROUTE_MAX
 )
 
+var routeTypeValueMapFrrZapi6 = map[string]ROUTE_TYPE{
+	"system":             FRR_ZAPI6_ROUTE_SYSTEM,
+	"kernel":             FRR_ZAPI6_ROUTE_KERNEL,
+	"connect":            FRR_ZAPI6_ROUTE_CONNECT, // hack for backward compatibility
+	"directly-connected": FRR_ZAPI6_ROUTE_CONNECT,
+	"static":             FRR_ZAPI6_ROUTE_STATIC,
+	"rip":                FRR_ZAPI6_ROUTE_RIP,
+	"ripng":              FRR_ZAPI6_ROUTE_RIPNG,
+	"ospf":               FRR_ZAPI6_ROUTE_OSPF,
+	"ospf3":              FRR_ZAPI6_ROUTE_OSPF6,
+	"isis":               FRR_ZAPI6_ROUTE_ISIS,
+	"bgp":                FRR_ZAPI6_ROUTE_BGP,
+	"pim":                FRR_ZAPI6_ROUTE_PIM,
+	"eigrp":              FRR_ZAPI6_ROUTE_EIGRP,
+	"nhrp":               FRR_ZAPI6_ROUTE_EIGRP,
+	"hsls":               FRR_ZAPI6_ROUTE_HSLS,
+	"olsr":               FRR_ZAPI6_ROUTE_OLSR,
+	"table":              FRR_ZAPI6_ROUTE_TABLE,
+	"ldp":                FRR_ZAPI6_ROUTE_LDP,
+	"vnc":                FRR_ZAPI6_ROUTE_VNC,
+	"vnc-direct":         FRR_ZAPI6_ROUTE_VNC_DIRECT,
+	"vnc-direct-rh":      FRR_ZAPI6_ROUTE_VNC_DIRECT_RH,
+	"bgp-direct":         FRR_ZAPI6_ROUTE_BGP_DIRECT,
+	"bgp-direct-ext":     FRR_ZAPI6_ROUTE_BGP_DIRECT_EXT,
+	"babel":              FRR_ZAPI6_ROUTE_BABEL,
+	"sharp":              FRR_ZAPI6_ROUTE_SHARP,
+	"pbr":                FRR_ZAPI6_ROUTE_PBR,
+	"bfd":                FRR_ZAPI6_ROUTE_BFD,
+	"all":                FRR_ZAPI6_ROUTE_ALL,
+}
+
 var routeTypeValueMapFrrZapi5 = map[string]ROUTE_TYPE{
 	"system":             FRR_ZAPI5_ROUTE_SYSTEM,
 	"kernel":             FRR_ZAPI5_ROUTE_KERNEL,
@@ -538,8 +698,10 @@ func RouteTypeFromString(typ string, version uint8) (ROUTE_TYPE, error) {
 	delegateRouteTypeValueMap := routeTypeValueMap
 	if version == 4 {
 		delegateRouteTypeValueMap = routeTypeValueMapFrr
-	} else if version >= 5 {
+	} else if version == 5 {
 		delegateRouteTypeValueMap = routeTypeValueMapFrrZapi5
+	} else if version >= 6 {
+		delegateRouteTypeValueMap = routeTypeValueMapFrrZapi6
 	}
 	t, ok := delegateRouteTypeValueMap[typ]
 	if ok {
@@ -597,7 +759,7 @@ func ipFromFamily(family uint8, buf []byte) net.IP {
 // API Message Flags.
 type MESSAGE_FLAG uint8
 
-// For FRRouting version 4 and 5 (ZAPI version 5).
+// For FRRouting version 4, 5 and 6 (ZAPI version 5 and 6).
 const (
 	FRR_ZAPI5_MESSAGE_NEXTHOP  MESSAGE_FLAG = 0x01
 	FRR_ZAPI5_MESSAGE_DISTANCE MESSAGE_FLAG = 0x02
@@ -606,6 +768,7 @@ const (
 	FRR_ZAPI5_MESSAGE_MTU      MESSAGE_FLAG = 0x10
 	FRR_ZAPI5_MESSAGE_SRCPFX   MESSAGE_FLAG = 0x20
 	FRR_ZAPI5_MESSAGE_LABEL    MESSAGE_FLAG = 0x40
+	FRR_ZAPI5_MESSAGE_TABLEID  MESSAGE_FLAG = 0x80
 )
 
 // For FRRouting.
@@ -633,7 +796,7 @@ func (t MESSAGE_FLAG) String(version uint8) string {
 	var ss []string
 	if (version <= 3 && t&MESSAGE_NEXTHOP > 0) ||
 		(version == 4 && t&FRR_MESSAGE_NEXTHOP > 0) ||
-		(version == 5 && t&FRR_ZAPI5_MESSAGE_NEXTHOP > 0) {
+		(version >= 5 && t&FRR_ZAPI5_MESSAGE_NEXTHOP > 0) {
 		ss = append(ss, "NEXTHOP")
 	}
 	if (version <= 3 && t&MESSAGE_IFINDEX > 0) || (version == 4 && t&FRR_MESSAGE_IFINDEX > 0) {
@@ -641,27 +804,27 @@ func (t MESSAGE_FLAG) String(version uint8) string {
 	}
 	if (version <= 3 && t&MESSAGE_DISTANCE > 0) ||
 		(version == 4 && t&FRR_MESSAGE_DISTANCE > 0) ||
-		(version == 5 && t&FRR_ZAPI5_MESSAGE_DISTANCE > 0) {
+		(version >= 5 && t&FRR_ZAPI5_MESSAGE_DISTANCE > 0) {
 		ss = append(ss, "DISTANCE")
 	}
 	if (version <= 3 && t&MESSAGE_METRIC > 0) ||
 		(version == 4 && t&FRR_MESSAGE_METRIC > 0) ||
-		(version == 5 && t&FRR_ZAPI5_MESSAGE_METRIC > 0) {
+		(version >= 5 && t&FRR_ZAPI5_MESSAGE_METRIC > 0) {
 		ss = append(ss, "METRIC")
 	}
 	if (version <= 3 && t&MESSAGE_MTU > 0) || (version == 4 && t&FRR_MESSAGE_MTU > 0) ||
-		(version == 5 && t&FRR_ZAPI5_MESSAGE_MTU > 0) {
+		(version >= 5 && t&FRR_ZAPI5_MESSAGE_MTU > 0) {
 		ss = append(ss, "MTU")
 	}
 	if (version <= 3 && t&MESSAGE_TAG > 0) || (version == 4 && t&FRR_MESSAGE_TAG > 0) ||
-		(version == 5 && t&FRR_ZAPI5_MESSAGE_TAG > 0) {
+		(version >= 5 && t&FRR_ZAPI5_MESSAGE_TAG > 0) {
 		ss = append(ss, "TAG")
 	}
 	if (version == 4 && t&FRR_MESSAGE_SRCPFX > 0) ||
-		(version == 5 && t&FRR_ZAPI5_MESSAGE_SRCPFX > 0) {
+		(version >= 5 && t&FRR_ZAPI5_MESSAGE_SRCPFX > 0) {
 		ss = append(ss, "SRCPFX")
 	}
-	if version == 5 && t&FRR_ZAPI5_MESSAGE_LABEL > 0 {
+	if version >= 5 && t&FRR_ZAPI5_MESSAGE_LABEL > 0 {
 		ss = append(ss, "LABLE")
 	}
 
@@ -672,17 +835,18 @@ func (t MESSAGE_FLAG) String(version uint8) string {
 type FLAG uint64
 
 const (
-	FLAG_INTERNAL     FLAG = 0x01
-	FLAG_SELFROUTE    FLAG = 0x02
-	FLAG_BLACKHOLE    FLAG = 0x04
-	FLAG_IBGP         FLAG = 0x08
-	FLAG_SELECTED     FLAG = 0x10
-	FLAG_CHANGED      FLAG = 0x20
-	FLAG_STATIC       FLAG = 0x40
-	FLAG_REJECT       FLAG = 0x80
-	FLAG_SCOPE_LINK   FLAG = 0x100
-	FLAG_FIB_OVERRIDE FLAG = 0x200
-	FLAG_EVPN_ROUTE   FLAG = 0x400
+	FLAG_INTERNAL        FLAG = 0x01
+	FLAG_SELFROUTE       FLAG = 0x02
+	FLAG_BLACKHOLE       FLAG = 0x04
+	FLAG_IBGP            FLAG = 0x08
+	FLAG_SELECTED        FLAG = 0x10
+	FLAG_CHANGED         FLAG = 0x20
+	FLAG_STATIC          FLAG = 0x40
+	FLAG_REJECT          FLAG = 0x80
+	FLAG_SCOPE_LINK      FLAG = 0x100
+	FLAG_FIB_OVERRIDE    FLAG = 0x200
+	FLAG_EVPN_ROUTE      FLAG = 0x400
+	FLAG_RR_USE_DISTANCE FLAG = 0x800
 )
 
 func (t FLAG) String() string {
@@ -720,6 +884,9 @@ func (t FLAG) String() string {
 	if t&FLAG_EVPN_ROUTE > 0 {
 		ss = append(ss, "FLAG_EVPN_ROUTE")
 	}
+	if t&FLAG_RR_USE_DISTANCE > 0 {
+		ss = append(ss, "FLAG_RR_USE_DISTANCE")
+	}
 
 	return strings.Join(ss, "|")
 }
@@ -805,8 +972,8 @@ func NewClient(network, address string, typ ROUTE_TYPE, version uint8) (*Client,
 	incoming := make(chan *Message, 64)
 	if version < 2 {
 		version = 2
-	} else if version > 5 {
-		version = 5
+	} else if version > 6 {
+		version = 6
 	}
 
 	c := &Client{
@@ -973,8 +1140,10 @@ func (c *Client) SendHello() error {
 		command := HELLO
 		if c.Version == 4 {
 			command = FRR_HELLO
-		} else if c.Version >= 5 {
+		} else if c.Version == 5 {
 			command = FRR_ZAPI5_HELLO
+		} else if c.Version >= 6 {
+			command = FRR_ZAPI6_HELLO
 		}
 		body := &HelloBody{
 			RedistDefault: c.redistDefault,
@@ -989,8 +1158,10 @@ func (c *Client) SendRouterIDAdd() error {
 	command := ROUTER_ID_ADD
 	if c.Version == 4 {
 		command = FRR_ROUTER_ID_ADD
-	} else if c.Version >= 5 {
+	} else if c.Version == 5 {
 		command = FRR_ZAPI5_ROUTER_ID_ADD
+	} else if c.Version >= 6 {
+		command = FRR_ZAPI6_ROUTER_ID_ADD
 	}
 	return c.SendCommand(command, VRF_DEFAULT, nil)
 }
@@ -1015,8 +1186,10 @@ func (c *Client) SendRedistribute(t ROUTE_TYPE, vrfId uint32) error {
 			})
 		} else { // version >= 4
 			command = FRR_REDISTRIBUTE_ADD
-			if c.Version >= 5 {
+			if c.Version == 5 {
 				command = FRR_ZAPI5_REDISTRIBUTE_ADD
+			} else if c.Version >= 6 {
+				command = FRR_ZAPI6_REDISTRIBUTE_ADD
 			}
 			for _, afi := range []AFI{AFI_IP, AFI_IP6} {
 				bodies = append(bodies, &RedistributeBody{
@@ -1040,8 +1213,10 @@ func (c *Client) SendRedistributeDelete(t ROUTE_TYPE) error {
 		command := REDISTRIBUTE_DELETE
 		if c.Version == 4 {
 			command = FRR_REDISTRIBUTE_DELETE
-		} else if c.Version >= 5 {
+		} else if c.Version == 5 {
 			command = FRR_ZAPI5_REDISTRIBUTE_DELETE
+		} else if c.Version >= 6 {
+			command = FRR_ZAPI6_REDISTRIBUTE_DELETE
 		}
 		body := &RedistributeBody{
 			Redist: t,
@@ -1080,7 +1255,7 @@ func (c *Client) SendIPRoute(vrfId uint32, body *IPRouteBody, isWithdraw bool) e
 				command = FRR_IPV6_ROUTE_ADD
 			}
 		}
-	} else { // version >= 5
+	} else { // version >= 5 (version 6 uses the same value as version 5)
 		if isWithdraw {
 			command = FRR_ZAPI5_ROUTE_DELETE
 		} else {
@@ -1101,18 +1276,24 @@ func (c *Client) SendNexthopRegister(vrfId uint32, body *NexthopRegisterBody, is
 		if isWithdraw {
 			command = NEXTHOP_UNREGISTER
 		}
-	} else if c.Version == 4 { // version >= 4
+	} else if c.Version == 4 { // version == 4
 		if isWithdraw {
 			command = FRR_NEXTHOP_UNREGISTER
 		} else {
 			command = FRR_NEXTHOP_REGISTER
 		}
-	} else { // version >= 5
+	} else if c.Version == 5 { // version == 5
 		if isWithdraw {
 			command = FRR_ZAPI5_NEXTHOP_UNREGISTER
 		} else {
 			command = FRR_ZAPI5_NEXTHOP_REGISTER
 		}
+	} else { // version >= 6
+		if isWithdraw {
+			command = FRR_ZAPI6_NEXTHOP_UNREGISTER
+		} else {
+			command = FRR_ZAPI6_NEXTHOP_REGISTER
+		}
 	}
 	return c.SendCommand(command, vrfId, body)
 }
@@ -1141,7 +1322,7 @@ func (h *Header) Serialize() ([]byte, error) {
 	case 3, 4:
 		binary.BigEndian.PutUint16(buf[4:6], uint16(h.VrfId))
 		binary.BigEndian.PutUint16(buf[6:8], uint16(h.Command))
-	case 5:
+	case 5, 6:
 		binary.BigEndian.PutUint32(buf[4:8], uint32(h.VrfId))
 		binary.BigEndian.PutUint16(buf[8:10], uint16(h.Command))
 	default:
@@ -1166,7 +1347,7 @@ func (h *Header) DecodeFromBytes(data []byte) error {
 	case 3, 4:
 		h.VrfId = uint32(binary.BigEndian.Uint16(data[4:6]))
 		h.Command = API_TYPE(binary.BigEndian.Uint16(data[6:8]))
-	case 5:
+	case 5, 6:
 		h.VrfId = binary.BigEndian.Uint32(data[4:8])
 		h.Command = API_TYPE(binary.BigEndian.Uint16(data[8:10]))
 	default:
@@ -1266,7 +1447,7 @@ func (b *RedistributeBody) DecodeFromBytes(data []byte, version uint8) error {
 	return nil
 }
 
-//  Reference: zebra_redistribute_send function in lib/zclient.c of Quagga1.2.x (ZAPI4)
+//  Reference: zebra_redistribute_send function in lib/zclient.c of Quagga1.2.x (ZAPI3)
 //  Reference: zebra_redistribute_send function in lib/zclient.c of FRR3.x (ZAPI4)
 //  Reference: zebra_redistribute_send function in lib/zclient.c of FRR5.x (ZAPI5)
 func (b *RedistributeBody) Serialize(version uint8) ([]byte, error) {
@@ -1544,9 +1725,14 @@ func (b *IPRouteBody) IsWithdraw(version uint8) bool {
 		case FRR_IPV4_ROUTE_DELETE, FRR_IPV6_ROUTE_DELETE, FRR_REDISTRIBUTE_IPV4_DEL, FRR_REDISTRIBUTE_IPV6_DEL:
 			return true
 		}
-	} else if version >= 5 {
+	} else if version == 5 {
+		switch b.Api {
+		case FRR_ZAPI5_ROUTE_DELETE, FRR_ZAPI5_IPV4_ROUTE_DELETE, FRR_ZAPI5_IPV6_ROUTE_DELETE, FRR_ZAPI5_REDISTRIBUTE_ROUTE_DEL:
+			return true
+		}
+	} else if version >= 6 {
 		switch b.Api {
-		case FRR_ZAPI5_ROUTE_DELETE, FRR_ZAPI5_REDISTRIBUTE_ROUTE_DEL:
+		case FRR_ZAPI6_ROUTE_DELETE, FRR_ZAPI6_REDISTRIBUTE_ROUTE_DEL:
 			return true
 		}
 	}
@@ -1597,27 +1783,27 @@ func (b *IPRouteBody) Serialize(version uint8) ([]byte, error) {
 	buf = append(buf, b.Prefix.Prefix[:byteLen]...)
 
 	if (version == 4 && b.Message&FRR_MESSAGE_SRCPFX > 0) ||
-		(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_SRCPFX > 0) {
+		(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_SRCPFX > 0) {
 		byteLen = (int(b.SrcPrefix.PrefixLen) + 7) / 8
 		buf = append(buf, b.SrcPrefix.PrefixLen)
 		buf = append(buf, b.SrcPrefix.Prefix[:byteLen]...)
 	}
 	if (version <= 3 && b.Message&MESSAGE_NEXTHOP > 0) ||
 		(version == 4 && b.Message&FRR_MESSAGE_NEXTHOP > 0) ||
-		(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_NEXTHOP > 0) {
+		(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_NEXTHOP > 0) {
 		if version < 5 {
 			if b.Flags&FLAG_BLACKHOLE > 0 {
 				buf = append(buf, []byte{1, uint8(NEXTHOP_TYPE_BLACKHOLE)}...)
 			} else {
 				buf = append(buf, uint8(len(b.Nexthops)))
 			}
-		} else { // version == 5
+		} else { // version >= 5
 			bbuf := make([]byte, 2)
 			binary.BigEndian.PutUint16(bbuf, uint16(len(b.Nexthops)))
 			buf = append(buf, bbuf...)
 		}
 		for _, nexthop := range b.Nexthops {
-			if version == 5 {
+			if version >= 5 {
 				bbuf := make([]byte, 4)
 				binary.BigEndian.PutUint32(bbuf, nexthop.VrfId)
 				buf = append(buf, bbuf...)
@@ -1630,7 +1816,7 @@ func (b *IPRouteBody) Serialize(version uint8) ([]byte, error) {
 					} else {
 						nexthop.Type = FRR_NEXTHOP_TYPE_IPV4
 					}
-					if version == 5 && nexthop.Ifindex > 0 {
+					if version >= 5 && nexthop.Ifindex > 0 {
 						nexthop.Type = FRR_NEXTHOP_TYPE_IPV4_IFINDEX
 					}
 				} else if nexthop.Gate.To16() != nil {
@@ -1639,7 +1825,7 @@ func (b *IPRouteBody) Serialize(version uint8) ([]byte, error) {
 					} else {
 						nexthop.Type = FRR_NEXTHOP_TYPE_IPV6
 					}
-					if version == 5 && nexthop.Ifindex > 0 {
+					if version >= 5 && nexthop.Ifindex > 0 {
 						nexthop.Type = FRR_NEXTHOP_TYPE_IPV6_IFINDEX
 					}
 				} else if nexthop.Ifindex > 0 {
@@ -1679,7 +1865,7 @@ func (b *IPRouteBody) Serialize(version uint8) ([]byte, error) {
 			} else if version >= 5 && nexthop.Type == FRR_NEXTHOP_TYPE_BLACKHOLE {
 				buf = append(buf, uint8(nexthop.BlackholeType))
 			}
-			if version == 5 && b.Message&FRR_ZAPI5_MESSAGE_LABEL > 0 {
+			if version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_LABEL > 0 {
 				buf = append(buf, nexthop.LabelNum)
 				bbuf := make([]byte, 4)
 				binary.BigEndian.PutUint32(bbuf, nexthop.MplsLabels[0])
@@ -1688,26 +1874,26 @@ func (b *IPRouteBody) Serialize(version uint8) ([]byte, error) {
 		}
 		if (version <= 3 && b.Message&MESSAGE_DISTANCE > 0) ||
 			(version == 4 && b.Message&FRR_MESSAGE_DISTANCE > 0) ||
-			(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_DISTANCE > 0) {
+			(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_DISTANCE > 0) {
 			buf = append(buf, b.Distance)
 		}
 		if (version <= 3 && b.Message&MESSAGE_METRIC > 0) ||
 			(version == 4 && b.Message&FRR_MESSAGE_METRIC > 0) ||
-			(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_METRIC > 0) {
+			(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_METRIC > 0) {
 			bbuf := make([]byte, 4)
 			binary.BigEndian.PutUint32(bbuf, b.Metric)
 			buf = append(buf, bbuf...)
 		}
 		if (version <= 3 && b.Message&MESSAGE_MTU > 0) ||
 			(version == 4 && b.Message&FRR_MESSAGE_MTU > 0) ||
-			(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_MTU > 0) {
+			(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_MTU > 0) {
 			bbuf := make([]byte, 4)
 			binary.BigEndian.PutUint32(bbuf, b.Mtu)
 			buf = append(buf, bbuf...)
 		}
 		if (version <= 3 && b.Message&MESSAGE_TAG > 0) ||
 			(version == 4 && b.Message&FRR_MESSAGE_TAG > 0) ||
-			(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_TAG > 0) {
+			(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_TAG > 0) {
 			bbuf := make([]byte, 4)
 			binary.BigEndian.PutUint32(bbuf, b.Tag)
 			buf = append(buf, bbuf...)
@@ -1775,7 +1961,7 @@ func (b *IPRouteBody) DecodeFromBytes(data []byte, version uint8) error {
 	pos += byteLen
 
 	if (version == 4 && b.Message&FRR_MESSAGE_SRCPFX > 0) ||
-		(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_SRCPFX > 0) {
+		(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_SRCPFX > 0) {
 		if pos+1 > rest {
 			return fmt.Errorf("MESSAGE_SRCPFX message length invalid pos:%d rest:%d", pos, rest)
 		}
@@ -1797,7 +1983,7 @@ func (b *IPRouteBody) DecodeFromBytes(data []byte, version uint8) error {
 	b.Nexthops = []Nexthop{}
 	if (version <= 3 && b.Message&MESSAGE_NEXTHOP > 0) ||
 		(version == 4 && b.Message&FRR_MESSAGE_NEXTHOP > 0) ||
-		(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_NEXTHOP > 0) {
+		(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_NEXTHOP > 0) {
 		var numNexthop uint16
 		if version <= 4 {
 			if pos+1 > rest {
@@ -1915,7 +2101,7 @@ func (b *IPRouteBody) DecodeFromBytes(data []byte, version uint8) error {
 
 	if (version <= 3 && b.Message&MESSAGE_DISTANCE > 0) ||
 		(version == 4 && b.Message&FRR_MESSAGE_DISTANCE > 0) ||
-		(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_DISTANCE > 0) {
+		(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_DISTANCE > 0) {
 		if pos+1 > rest {
 			return fmt.Errorf("MESSAGE_DISTANCE message length invalid pos:%d rest:%d", pos, rest)
 		}
@@ -1924,7 +2110,7 @@ func (b *IPRouteBody) DecodeFromBytes(data []byte, version uint8) error {
 	}
 	if (version <= 3 && b.Message&MESSAGE_METRIC > 0) ||
 		(version == 4 && b.Message&FRR_MESSAGE_METRIC > 0) ||
-		(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_METRIC > 0) {
+		(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_METRIC > 0) {
 		if pos+4 > rest {
 			return fmt.Errorf("MESSAGE_METRIC message length invalid pos:%d rest:%d", pos, rest)
 		}
@@ -1933,7 +2119,7 @@ func (b *IPRouteBody) DecodeFromBytes(data []byte, version uint8) error {
 	}
 	if (version <= 3 && b.Message&MESSAGE_MTU > 0) ||
 		(version == 4 && b.Message&FRR_MESSAGE_MTU > 0) ||
-		(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_MTU > 0) {
+		(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_MTU > 0) {
 		if pos+4 > rest {
 			return fmt.Errorf("MESSAGE_MTU message length invalid pos:%d rest:%d", pos, rest)
 		}
@@ -1942,7 +2128,7 @@ func (b *IPRouteBody) DecodeFromBytes(data []byte, version uint8) error {
 	}
 	if (version <= 3 && b.Message&MESSAGE_TAG > 0) ||
 		(version == 4 && b.Message&FRR_MESSAGE_TAG > 0) ||
-		(version == 5 && b.Message&FRR_ZAPI5_MESSAGE_TAG > 0) {
+		(version >= 5 && b.Message&FRR_ZAPI5_MESSAGE_TAG > 0) {
 		if pos+4 > rest {
 			return fmt.Errorf("MESSAGE_TAG message length invalid pos:%d rest:%d", pos, rest)
 		}
@@ -2518,12 +2704,53 @@ func (m *Message) parseFrrZapi5Message(data []byte) error {
 	return m.Body.DecodeFromBytes(data, m.Header.Version)
 }
 
+func (m *Message) parseFrrZapi6Message(data []byte) error {
+	switch m.Header.Command {
+	case FRR_ZAPI6_INTERFACE_ADD, FRR_ZAPI6_INTERFACE_DELETE, FRR_ZAPI6_INTERFACE_UP, FRR_ZAPI6_INTERFACE_DOWN:
+		m.Body = &InterfaceUpdateBody{}
+	case FRR_ZAPI6_INTERFACE_ADDRESS_ADD, FRR_ZAPI6_INTERFACE_ADDRESS_DELETE:
+		m.Body = &InterfaceAddressUpdateBody{}
+	case FRR_ZAPI6_ROUTER_ID_UPDATE:
+		m.Body = &RouterIDUpdateBody{}
+	case FRR_ZAPI6_NEXTHOP_UPDATE:
+		m.Body = &NexthopUpdateBody{}
+	case FRR_ZAPI6_INTERFACE_NBR_ADDRESS_ADD, FRR_ZAPI6_INTERFACE_NBR_ADDRESS_DELETE:
+		// TODO
+		m.Body = &UnknownBody{}
+	case FRR_ZAPI6_INTERFACE_BFD_DEST_UPDATE:
+		// TODO
+		m.Body = &UnknownBody{}
+	case FRR_ZAPI6_IMPORT_CHECK_UPDATE:
+		// TODO
+		m.Body = &UnknownBody{}
+	case FRR_ZAPI6_BFD_DEST_REPLAY:
+		// TODO
+		m.Body = &UnknownBody{}
+	case FRR_ZAPI6_REDISTRIBUTE_ROUTE_ADD, FRR_ZAPI6_REDISTRIBUTE_ROUTE_DEL:
+		m.Body = &IPRouteBody{Api: m.Header.Command}
+	case FRR_ZAPI6_INTERFACE_VRF_UPDATE:
+		// TODO
+		m.Body = &UnknownBody{}
+	case FRR_ZAPI6_INTERFACE_LINK_PARAMS:
+		// TODO
+		m.Body = &UnknownBody{}
+	case FRR_ZAPI6_PW_STATUS_UPDATE:
+		// TODO
+		m.Body = &UnknownBody{}
+	default:
+		m.Body = &UnknownBody{}
+	}
+	return m.Body.DecodeFromBytes(data, m.Header.Version)
+}
+
 func ParseMessage(hdr *Header, data []byte) (m *Message, err error) {
 	m = &Message{Header: *hdr}
 	if m.Header.Version == 4 {
 		err = m.parseFrrMessage(data)
 	} else if m.Header.Version == 5 {
 		err = m.parseFrrZapi5Message(data)
+	} else if m.Header.Version == 6 {
+		err = m.parseFrrZapi6Message(data)
 	} else {
 		err = m.parseMessage(data)
 	}