diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-01-17 06:16:33 -0800 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-01-17 06:21:23 -0800 |
commit | f4c409941848b72ba5b162405dc5022d76fcc59f (patch) | |
tree | 03d378ab66b07b94ff7473d2e000be44d71a28e6 | |
parent | 1e564f2d3085e394c0983627ea6fcc95df49a50d (diff) |
update rpki monitor API
- handle withdraw
- added some new info (peer address, timestamp, aspath attribute)
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r-- | api/gobgp.pb.go | 424 | ||||
-rw-r--r-- | api/gobgp.proto | 13 | ||||
-rw-r--r-- | server/rpki.go | 5 | ||||
-rw-r--r-- | server/server.go | 70 | ||||
-rw-r--r-- | table/destination.go | 30 |
5 files changed, 308 insertions, 234 deletions
diff --git a/api/gobgp.pb.go b/api/gobgp.pb.go index b85923ea..e0561799 100644 --- a/api/gobgp.pb.go +++ b/api/gobgp.pb.go @@ -79,6 +79,10 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +const _ = proto.ProtoPackageIsVersion1 + type Resource int32 const ( @@ -1324,11 +1328,14 @@ func (m *ROA) GetConf() *RPKIConf { } type ROAResult struct { - OriginAs uint32 `protobuf:"varint,1,opt,name=origin_as" json:"origin_as,omitempty"` - Prefix string `protobuf:"bytes,2,opt,name=prefix" json:"prefix,omitempty"` - OldResult ROAResult_ValidationResult `protobuf:"varint,3,opt,name=old_result,enum=gobgpapi.ROAResult_ValidationResult" json:"old_result,omitempty"` - NewResult ROAResult_ValidationResult `protobuf:"varint,4,opt,name=new_result,enum=gobgpapi.ROAResult_ValidationResult" json:"new_result,omitempty"` - Roas []*ROA `protobuf:"bytes,5,rep,name=roas" json:"roas,omitempty"` + Address string `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` + Timestamp int64 `protobuf:"varint,2,opt,name=timestamp" json:"timestamp,omitempty"` + AspathAttr []byte `protobuf:"bytes,3,opt,name=aspath_attr,proto3" json:"aspath_attr,omitempty"` + OriginAs uint32 `protobuf:"varint,4,opt,name=origin_as" json:"origin_as,omitempty"` + Prefix string `protobuf:"bytes,5,opt,name=prefix" json:"prefix,omitempty"` + OldResult ROAResult_ValidationResult `protobuf:"varint,6,opt,name=old_result,enum=gobgpapi.ROAResult_ValidationResult" json:"old_result,omitempty"` + NewResult ROAResult_ValidationResult `protobuf:"varint,7,opt,name=new_result,enum=gobgpapi.ROAResult_ValidationResult" json:"new_result,omitempty"` + Roas []*ROA `protobuf:"bytes,8,rep,name=roas" json:"roas,omitempty"` } func (m *ROAResult) Reset() { *m = ROAResult{} } @@ -2872,211 +2879,212 @@ var _GobgpApi_serviceDesc = grpc.ServiceDesc{ } var fileDescriptor0 = []byte{ - // 3285 bytes of a gzipped FileDescriptorProto + // 3308 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x1a, 0xcb, 0x72, 0xdb, 0xd6, 0xd5, 0x7c, 0x8a, 0x3c, 0x24, 0x25, 0x0a, 0x92, 0x1d, 0x99, 0x79, 0x39, 0x68, 0x6a, 0x3b, 0x4a, 0xec, 0x38, 0xce, 0xa3, 0x99, 0x24, 0x9d, 0x96, 0x22, 0x61, 0x9b, 0x89, 0x24, 0x32, 0x14, 0xa5, 0x49, 0xa6, 0x9d, 0xc1, 0x40, 0x24, 0x48, 0xa1, 0x21, 0x01, 0x04, 0x00, 0xfd, 0xe8, 0x74, 0xd7, - 0x7e, 0x45, 0xa7, 0xd3, 0x99, 0x76, 0xd1, 0x75, 0x57, 0xdd, 0x74, 0xd9, 0x0f, 0xe8, 0x47, 0x74, - 0x91, 0xdf, 0xe8, 0x39, 0xe7, 0x5e, 0x10, 0x00, 0x09, 0xd9, 0x92, 0xd3, 0xe9, 0xc6, 0x22, 0xee, - 0x3d, 0xaf, 0x7b, 0xde, 0xe7, 0x5e, 0x43, 0x65, 0xe2, 0x9c, 0x4e, 0xdc, 0xbb, 0xae, 0xe7, 0x04, - 0x8e, 0x52, 0xe2, 0x0f, 0xc3, 0xb5, 0x54, 0x03, 0x0a, 0x9a, 0xe7, 0x39, 0x9e, 0x72, 0x0b, 0xf2, - 0x43, 0x67, 0x64, 0xee, 0x64, 0x6e, 0x64, 0x6e, 0xaf, 0xdf, 0xbf, 0x7e, 0x37, 0x84, 0xb8, 0xcb, - 0xdb, 0xe2, 0xdf, 0x16, 0x02, 0x28, 0x15, 0xc8, 0xcd, 0xfc, 0xc9, 0x4e, 0x16, 0xe1, 0xca, 0xaa, - 0x0a, 0xe5, 0xf8, 0xce, 0xda, 0xd1, 0x71, 0xab, 0xa5, 0x1d, 0x1d, 0xd5, 0xaf, 0x28, 0x25, 0xc8, - 0x3f, 0x68, 0x76, 0xf6, 0xeb, 0x19, 0xb5, 0x0b, 0xe5, 0xa6, 0x37, 0x99, 0xcf, 0x4c, 0x3b, 0xf0, - 0x95, 0xb7, 0xa1, 0xe4, 0x99, 0xbe, 0x33, 0xf7, 0x86, 0x21, 0x2b, 0x25, 0x62, 0xd5, 0x97, 0x3b, - 0xca, 0x3a, 0x14, 0xc7, 0xc6, 0xcc, 0x9a, 0x3e, 0x63, 0x36, 0x35, 0xa5, 0x0a, 0x79, 0xdb, 0x98, - 0x99, 0x3b, 0x39, 0x66, 0xfa, 0xc7, 0x0c, 0xd4, 0x0f, 0x9c, 0x51, 0xcf, 0x08, 0xce, 0x22, 0xc2, - 0x37, 0xa1, 0xec, 0xb8, 0xa6, 0x67, 0x04, 0x96, 0x63, 0x4b, 0xca, 0x5b, 0x11, 0xe5, 0x6e, 0xb8, - 0x95, 0x10, 0x20, 0x7b, 0xae, 0x00, 0x09, 0x86, 0xca, 0x6b, 0x90, 0x77, 0x91, 0xd9, 0x4e, 0x1e, - 0xbf, 0x2a, 0xf7, 0xd7, 0x23, 0x78, 0x12, 0x81, 0x60, 0xe7, 0x73, 0x6b, 0xb4, 0x53, 0xc0, 0xdd, - 0xaa, 0xfa, 0x26, 0x6c, 0x48, 0xd9, 0x90, 0x98, 0xeb, 0xd8, 0xbe, 0xb9, 0x00, 0xc8, 0x30, 0xc0, - 0x18, 0x36, 0x25, 0x80, 0x7f, 0x59, 0xb5, 0x84, 0x52, 0xb1, 0xee, 0x95, 0xd7, 0xa1, 0x40, 0x52, - 0xf9, 0x28, 0x64, 0x6e, 0x55, 0x2c, 0xf5, 0xd7, 0xb0, 0x8d, 0x7c, 0x0e, 0x4d, 0x6b, 0x72, 0x76, - 0xea, 0x78, 0x97, 0x57, 0x14, 0x1d, 0xda, 0x34, 0x3d, 0x66, 0x96, 0xa4, 0x8e, 0xab, 0xaa, 0x0b, - 0xd5, 0x03, 0x2f, 0xf8, 0xb1, 0x76, 0xad, 0x43, 0xc9, 0xb2, 0x03, 0xd3, 0x7b, 0x6c, 0x4c, 0x59, - 0xd5, 0x79, 0x65, 0x07, 0xea, 0xb6, 0x14, 0x59, 0x37, 0x46, 0x23, 0xa4, 0xe9, 0xb3, 0xda, 0xcb, - 0xea, 0x57, 0xac, 0xd8, 0x04, 0xd3, 0x8b, 0x1e, 0x05, 0xd9, 0x8c, 0xad, 0xa9, 0x19, 0xe9, 0x4e, - 0xfd, 0x57, 0x86, 0xa9, 0xed, 0xcd, 0xdc, 0xcb, 0x53, 0xdb, 0x80, 0xb5, 0x50, 0x32, 0x61, 0x08, - 0x34, 0x8b, 0xeb, 0x78, 0x01, 0x9f, 0xa0, 0xa6, 0x7c, 0x0a, 0xf9, 0xe0, 0x99, 0x6b, 0xb2, 0xd4, - 0xeb, 0xf7, 0x77, 0x23, 0x0a, 0x4b, 0xfc, 0xf0, 0xdb, 0xb6, 0x02, 0xc7, 0xb3, 0xec, 0x49, 0xcf, - 0x99, 0x5a, 0xc3, 0x67, 0xea, 0xfb, 0xe4, 0xd6, 0xc9, 0x35, 0x65, 0x0d, 0x72, 0xbd, 0xbe, 0x26, - 0xe2, 0xa9, 0xd7, 0x3d, 0x1a, 0xd4, 0x33, 0xf4, 0x6b, 0xaf, 0x3b, 0x78, 0x54, 0xcf, 0xaa, 0xdf, - 0x72, 0x1c, 0xf4, 0xdd, 0xef, 0xac, 0xff, 0xf5, 0x29, 0xd4, 0x63, 0xd6, 0xcf, 0x89, 0x37, 0xbe, - 0x3c, 0xe5, 0x06, 0xe4, 0x1e, 0x7b, 0x63, 0xe9, 0x37, 0xb5, 0x08, 0x02, 0x89, 0xa9, 0x43, 0xb8, - 0x86, 0x64, 0xdb, 0xe6, 0xd8, 0xb2, 0xcd, 0xd1, 0x91, 0xf9, 0x12, 0xb6, 0x7c, 0x0b, 0x72, 0xbe, - 0x19, 0x48, 0xea, 0xdb, 0x11, 0x44, 0x44, 0x53, 0x9d, 0xc0, 0x55, 0x64, 0x72, 0x14, 0x18, 0x81, - 0x49, 0xb4, 0x2f, 0xcf, 0x03, 0xe1, 0xfc, 0x10, 0x5b, 0x72, 0x8a, 0xc1, 0x2d, 0x08, 0xab, 0x7f, - 0xce, 0x80, 0x42, 0xb1, 0xcc, 0xa6, 0xba, 0x3c, 0x9b, 0x1b, 0x50, 0x74, 0x19, 0x55, 0xf2, 0xa8, - 0xc7, 0x62, 0x4c, 0x58, 0xff, 0x2d, 0xb8, 0xee, 0x99, 0x63, 0xd3, 0xd3, 0xcd, 0xa7, 0x96, 0x1f, - 0xa0, 0x57, 0xe8, 0x0b, 0xb9, 0x7c, 0x36, 0x54, 0x49, 0x79, 0x15, 0xb6, 0x5c, 0xb4, 0x22, 0xc6, - 0x90, 0x19, 0xdf, 0x24, 0xef, 0x2b, 0xa9, 0x8f, 0xe1, 0xb5, 0x48, 0x3e, 0xdf, 0xb7, 0x26, 0xf6, - 0xcb, 0x29, 0xe4, 0x2e, 0x80, 0xb1, 0x40, 0x97, 0xd2, 0x36, 0x96, 0xa5, 0x8d, 0x18, 0xa8, 0x23, - 0xd8, 0x41, 0xbe, 0x0f, 0xa7, 0xce, 0xa9, 0x31, 0x6d, 0x39, 0xf6, 0xd8, 0x9a, 0xbc, 0x94, 0x76, - 0x26, 0x4c, 0x60, 0x55, 0x3b, 0x82, 0xb0, 0xfa, 0xef, 0x0c, 0xc6, 0x84, 0xcc, 0xc0, 0xf6, 0xd4, - 0xb3, 0x44, 0x82, 0xa5, 0x24, 0x83, 0x79, 0x31, 0xf0, 0xc8, 0xb1, 0x73, 0xf8, 0x8d, 0x05, 0xcb, - 0x98, 0x88, 0x54, 0x9e, 0x23, 0xd0, 0x53, 0xd3, 0x0f, 0x84, 0x7e, 0x94, 0x2d, 0xa8, 0x58, 0xbe, - 0xfe, 0xc4, 0x0a, 0xce, 0x46, 0x9e, 0xf1, 0x84, 0x33, 0x78, 0x49, 0x51, 0x00, 0x30, 0x1f, 0x59, - 0x23, 0x21, 0x61, 0x11, 0xd7, 0x0a, 0x98, 0x0c, 0xb7, 0x6d, 0x47, 0xb7, 0x66, 0x2e, 0x1e, 0xd4, - 0x0a, 0x22, 0x8c, 0x35, 0xc6, 0x88, 0xd2, 0x5a, 0x89, 0x53, 0x00, 0x52, 0x10, 0x09, 0x4f, 0x37, - 0x7c, 0x7b, 0xa7, 0xcc, 0x6b, 0x9b, 0xe8, 0x53, 0x62, 0x0d, 0x2b, 0x01, 0x70, 0xc4, 0x89, 0xb4, - 0x84, 0xe9, 0xcf, 0x1c, 0xed, 0x54, 0xd8, 0x5e, 0xc7, 0x50, 0x69, 0x9b, 0x64, 0x68, 0xa1, 0x02, - 0x3a, 0x09, 0xda, 0xdf, 0x7a, 0xca, 0x27, 0x8b, 0x65, 0xfc, 0x6c, 0x5a, 0xc6, 0x57, 0x5e, 0x81, - 0x8d, 0xa9, 0x63, 0x4f, 0xd0, 0x5d, 0x04, 0x96, 0x29, 0x7d, 0x44, 0x0d, 0xa0, 0x30, 0x30, 0x4e, - 0xa7, 0x26, 0xea, 0x54, 0xe4, 0xa6, 0x8b, 0x96, 0x98, 0xe8, 0x60, 0x22, 0xb7, 0xbd, 0x0b, 0xd5, - 0x51, 0x24, 0x1f, 0x79, 0x19, 0xc9, 0x71, 0x35, 0x1e, 0x85, 0x8b, 0x5d, 0xf5, 0x3f, 0x59, 0x34, - 0x0f, 0xd6, 0x0a, 0x3e, 0x27, 0x51, 0xb1, 0x4c, 0x21, 0x39, 0xd3, 0x31, 0x5c, 0x77, 0xfa, 0x4c, - 0x97, 0xfe, 0x9f, 0x63, 0x0b, 0xc7, 0xe8, 0x34, 0x69, 0x57, 0x06, 0xc1, 0x0d, 0xea, 0x4c, 0xec, - 0x31, 0x5b, 0xa7, 0x12, 0x17, 0x9a, 0x88, 0x93, 0x77, 0x29, 0x77, 0xa0, 0x66, 0xe2, 0x9a, 0x3e, - 0x9b, 0x4f, 0x03, 0xeb, 0xcc, 0x71, 0xd9, 0x68, 0x95, 0xfb, 0xd7, 0x62, 0x4d, 0x0c, 0xfe, 0x3d, - 0x90, 0xbb, 0xca, 0x07, 0xb0, 0xe1, 0x39, 0xf3, 0xc0, 0xd4, 0x51, 0x4b, 0x53, 0x73, 0x88, 0xf9, - 0x96, 0x0d, 0x52, 0xb9, 0xbf, 0x13, 0x53, 0x08, 0x01, 0xf4, 0xc3, 0x7d, 0x0c, 0xc4, 0xbc, 0x65, - 0x8f, 0x1d, 0x36, 0x53, 0x22, 0x19, 0x90, 0x0c, 0x9c, 0x10, 0xc8, 0x5f, 0x03, 0x6b, 0x66, 0xa2, - 0xdb, 0x55, 0x97, 0xfd, 0x75, 0xc0, 0xeb, 0xe4, 0xf9, 0x81, 0x67, 0xd8, 0x3e, 0xa7, 0xd9, 0xda, - 0x32, 0xa5, 0x41, 0xb8, 0x45, 0xda, 0x11, 0xf2, 0x71, 0x54, 0x7b, 0x3b, 0x1b, 0xcb, 0xda, 0x61, - 0xe1, 0x8e, 0x78, 0x53, 0xfd, 0x6b, 0x06, 0x2a, 0x71, 0x6d, 0xdd, 0x81, 0xb2, 0x65, 0x87, 0x7a, - 0xcd, 0xbc, 0x28, 0x52, 0x51, 0x17, 0x35, 0xf3, 0x29, 0x71, 0xd5, 0x13, 0xa9, 0xe8, 0x05, 0x28, - 0x18, 0x08, 0x31, 0x94, 0xdc, 0x0b, 0xf3, 0xc1, 0x9f, 0xb2, 0x50, 0x5a, 0x58, 0xeb, 0x2a, 0xd4, - 0x8c, 0x79, 0x70, 0xa6, 0xbb, 0x98, 0x52, 0x9e, 0x38, 0xde, 0x48, 0x3a, 0x37, 0xc6, 0x22, 0xfa, - 0xd6, 0xd0, 0xb3, 0x5c, 0x8e, 0xbb, 0x6c, 0x18, 0x22, 0x53, 0x67, 0x68, 0x4c, 0x31, 0x90, 0xa4, - 0x0b, 0x9e, 0xdb, 0x20, 0x50, 0x45, 0xa3, 0x86, 0x85, 0x40, 0x0b, 0x61, 0x18, 0xf2, 0xc2, 0x04, - 0xb5, 0x29, 0x7c, 0xa2, 0x4c, 0x61, 0xc8, 0x6b, 0x1c, 0x06, 0x6b, 0x0c, 0x76, 0x1d, 0x36, 0x3d, - 0x73, 0xe6, 0x60, 0xfe, 0x74, 0x3d, 0xeb, 0x31, 0x9a, 0x92, 0x28, 0x88, 0x40, 0x6e, 0x80, 0x22, - 0x2c, 0x31, 0x9e, 0x1a, 0xae, 0x3e, 0x32, 0x66, 0x2e, 0xe6, 0x60, 0x0e, 0xe8, 0x92, 0x72, 0x0d, - 0xd6, 0x7d, 0xd3, 0x1e, 0xe9, 0x43, 0x67, 0x36, 0x9b, 0x63, 0xd5, 0x7e, 0xc6, 0x4e, 0xc4, 0x5c, - 0x89, 0x1c, 0x22, 0x0d, 0x0d, 0x17, 0x1d, 0x86, 0x52, 0x10, 0x72, 0x15, 0xc7, 0xa0, 0xa5, 0x2a, - 0x2f, 0x01, 0x64, 0x31, 0x11, 0xd4, 0xb8, 0x1b, 0xf9, 0x18, 0xaa, 0x09, 0x07, 0xc5, 0x93, 0x60, - 0xb3, 0x82, 0x01, 0x2b, 0x74, 0x53, 0x52, 0xb6, 0xa1, 0x1a, 0xfa, 0xb6, 0x1e, 0x04, 0x22, 0x23, - 0xd6, 0xd4, 0x01, 0xac, 0x2f, 0xb9, 0xe9, 0x1b, 0x70, 0x6d, 0xc9, 0xb3, 0xf5, 0x21, 0x86, 0x1d, - 0xe6, 0x6c, 0x41, 0x47, 0x85, 0xc6, 0xea, 0xfe, 0xdc, 0xc7, 0x14, 0x44, 0x59, 0x49, 0x50, 0xfd, - 0x21, 0x07, 0xe5, 0xc8, 0xab, 0x7f, 0x9c, 0xb1, 0xb0, 0x2b, 0x9c, 0xa1, 0x81, 0x30, 0xfd, 0xfa, - 0xb2, 0x79, 0x8e, 0x85, 0xef, 0x81, 0xdc, 0x49, 0x35, 0x69, 0x61, 0xd9, 0xa4, 0xc5, 0x14, 0x93, - 0xae, 0xad, 0x9a, 0x54, 0xd8, 0x0d, 0x63, 0xf1, 0xfb, 0xb9, 0x39, 0x47, 0xae, 0xe5, 0xe5, 0x58, - 0xfc, 0x9a, 0xd7, 0xd3, 0x8d, 0x0e, 0xcf, 0x31, 0x7a, 0xe5, 0x1c, 0xa3, 0x57, 0x19, 0x07, 0xd5, - 0xe4, 0xa3, 0xd8, 0xa8, 0x0b, 0x51, 0x84, 0xd9, 0xb0, 0x35, 0xb2, 0x87, 0x3f, 0x77, 0x29, 0x56, - 0xcc, 0x11, 0xd9, 0xde, 0x38, 0xc5, 0x2c, 0x18, 0x50, 0x1e, 0x5c, 0x47, 0x27, 0x60, 0xd1, 0x29, - 0x6f, 0x09, 0x94, 0x8d, 0x50, 0xb3, 0xc6, 0x68, 0x66, 0x85, 0x74, 0xea, 0xa1, 0x66, 0x3d, 0x73, - 0x68, 0x5a, 0x8f, 0xd1, 0x23, 0x36, 0xc3, 0xce, 0xd9, 0x18, 0x0e, 0x4d, 0x17, 0x09, 0xef, 0x28, - 0xa1, 0x6a, 0x8c, 0x11, 0x66, 0x84, 0xc0, 0xfa, 0x2d, 0xae, 0x6d, 0xf1, 0x5a, 0x0d, 0x0a, 0x78, - 0x12, 0xfd, 0xfb, 0x9d, 0xed, 0xf0, 0x73, 0x3c, 0x75, 0x5c, 0x7f, 0xe7, 0x2a, 0x5b, 0xba, 0x07, - 0xa5, 0x85, 0x0d, 0x7e, 0x12, 0xe3, 0x20, 0xb2, 0xc6, 0xe6, 0x8a, 0xa5, 0x94, 0x37, 0x21, 0xef, - 0x47, 0x0d, 0xc0, 0x2a, 0x80, 0xfa, 0xfb, 0x0c, 0xac, 0x85, 0xc0, 0xe8, 0xb3, 0x87, 0xdd, 0x41, - 0xe7, 0x41, 0xa7, 0xd5, 0x1c, 0x74, 0xba, 0x87, 0x4c, 0x35, 0x4f, 0x15, 0xe5, 0xb8, 0xd7, 0x6e, - 0x0e, 0x34, 0x26, 0x92, 0xa7, 0x7a, 0xd3, 0xed, 0x69, 0x87, 0xb2, 0xfb, 0x47, 0x7d, 0x7c, 0xa5, - 0x69, 0xbd, 0xe6, 0x7e, 0xe7, 0x44, 0x63, 0x87, 0xc9, 0x93, 0x0b, 0xf4, 0xb5, 0x07, 0x7d, 0xed, - 0xe8, 0x11, 0xfb, 0x04, 0xc3, 0xb4, 0x3b, 0x47, 0xad, 0x66, 0xbf, 0xad, 0xb5, 0xd9, 0x2b, 0xf2, - 0x74, 0xae, 0x41, 0x77, 0xd0, 0xdc, 0x67, 0x87, 0xc8, 0xab, 0xb7, 0xa0, 0x28, 0xad, 0x8c, 0x1b, - 0x96, 0xed, 0xce, 0x85, 0xfb, 0xd7, 0x88, 0x39, 0xaa, 0x83, 0xbe, 0x85, 0xab, 0x9f, 0x40, 0x71, - 0x91, 0x9a, 0x8b, 0x43, 0xee, 0x53, 0xe4, 0xe1, 0xaf, 0x2d, 0x27, 0x6f, 0xd1, 0xc5, 0xa0, 0x43, - 0x17, 0x84, 0x5d, 0xb2, 0xcb, 0x39, 0x59, 0x80, 0x71, 0xd0, 0xa8, 0xbf, 0x83, 0x6a, 0x02, 0x0b, - 0xbd, 0x03, 0xa9, 0xdb, 0x18, 0x70, 0x18, 0x78, 0x81, 0xf7, 0x4c, 0xea, 0x02, 0x4f, 0x72, 0xe6, - 0x4c, 0x47, 0x3a, 0x95, 0x0d, 0xa9, 0x0e, 0xf4, 0xbd, 0xef, 0x4c, 0xd3, 0xc5, 0xf6, 0x03, 0x3d, - 0x73, 0x69, 0x34, 0xba, 0x09, 0x6f, 0xa0, 0x5f, 0x58, 0xb3, 0xf9, 0x4c, 0x97, 0x86, 0xf6, 0xb9, - 0xd9, 0x8b, 0xe0, 0x58, 0x63, 0xea, 0x3f, 0xb1, 0x22, 0xc4, 0xa4, 0xf9, 0xff, 0x72, 0xe7, 0x4e, - 0xc9, 0x9c, 0x38, 0x81, 0x65, 0x90, 0xcf, 0x47, 0x1c, 0x0a, 0xa1, 0xf9, 0xe7, 0x2e, 0x7f, 0x0b, - 0xcb, 0xa1, 0x1b, 0x8f, 0x9c, 0x27, 0x36, 0xaf, 0x08, 0xe3, 0xfd, 0x25, 0x03, 0xe5, 0xa8, 0x14, - 0xa2, 0xec, 0x32, 0xa5, 0xc8, 0xbc, 0x20, 0xd2, 0x0f, 0xfa, 0xba, 0x58, 0xe6, 0x52, 0x9a, 0x0d, - 0x43, 0x70, 0x16, 0xcc, 0xf5, 0x91, 0xe5, 0x0f, 0x31, 0xac, 0xbd, 0x67, 0xb2, 0x3f, 0x46, 0x37, - 0xa4, 0xdc, 0x45, 0x27, 0x9a, 0xd1, 0xfd, 0x46, 0x3e, 0x8c, 0x63, 0x99, 0xa4, 0x93, 0x09, 0x07, - 0xa3, 0x4f, 0xae, 0x33, 0x65, 0x91, 0x74, 0xd0, 0x05, 0x83, 0x21, 0x76, 0x17, 0x08, 0xc5, 0x15, - 0x43, 0xdd, 0x85, 0x4a, 0xac, 0x04, 0x53, 0x0b, 0x1e, 0xaf, 0xd7, 0x89, 0x94, 0xab, 0x1e, 0x40, - 0xb1, 0xc7, 0xdd, 0x18, 0x29, 0xdc, 0x72, 0xf5, 0x44, 0x43, 0x87, 0x1d, 0xdb, 0xcc, 0xf0, 0xbf, - 0xd3, 0x71, 0x36, 0x9d, 0x60, 0x92, 0x45, 0x05, 0xcb, 0xc3, 0x2c, 0x6f, 0x18, 0x4f, 0xe5, 0x5c, - 0xf6, 0x3d, 0x40, 0x34, 0xe9, 0x60, 0xd4, 0xc6, 0xfb, 0xb9, 0xab, 0x2b, 0xd3, 0xd0, 0x00, 0x37, - 0x97, 0x5a, 0x3a, 0xfc, 0x9a, 0xe2, 0x2c, 0xc1, 0x97, 0x06, 0x65, 0x2c, 0x08, 0xa5, 0x45, 0xaf, - 0x28, 0x9a, 0xb9, 0xf8, 0x10, 0xc2, 0x3b, 0xea, 0xe7, 0x98, 0x26, 0x8c, 0x60, 0x78, 0x46, 0x0c, - 0xdf, 0x4a, 0x30, 0x8c, 0x75, 0x2f, 0x0c, 0xb1, 0xca, 0x4e, 0x7d, 0x04, 0xd5, 0xa6, 0x4f, 0xdd, - 0xe9, 0x3e, 0x9f, 0x44, 0xb9, 0x9d, 0x20, 0x10, 0xeb, 0x19, 0xe2, 0x50, 0x4c, 0x07, 0x5d, 0x45, - 0x9c, 0x5e, 0x06, 0xeb, 0xdf, 0xb2, 0x00, 0x18, 0x4f, 0x23, 0x8b, 0x5b, 0x4f, 0xf4, 0x47, 0x10, - 0x92, 0xeb, 0x34, 0x0e, 0x66, 0x56, 0x8a, 0x4b, 0x28, 0xf1, 0x6d, 0xa8, 0x2e, 0x8a, 0x4b, 0x34, - 0x38, 0xa6, 0x41, 0xde, 0x85, 0x75, 0xc3, 0xd7, 0xa9, 0xc1, 0x96, 0x6a, 0x97, 0x8d, 0xcd, 0xb5, - 0x74, 0x21, 0x95, 0x5b, 0x98, 0xa9, 0x25, 0x3c, 0x11, 0xce, 0x9f, 0x4b, 0xf8, 0x1d, 0x0a, 0x40, - 0x59, 0x2f, 0x18, 0xb4, 0x70, 0x2e, 0xe8, 0x1d, 0xd8, 0x34, 0x9f, 0x06, 0x7a, 0x12, 0xbc, 0x78, - 0x2e, 0x38, 0xb9, 0x2b, 0x4e, 0xff, 0x18, 0xd7, 0x3e, 0xb6, 0x07, 0xec, 0x9d, 0x05, 0xf5, 0x08, - 0x36, 0x5a, 0x21, 0x7e, 0x73, 0xc8, 0x83, 0xc4, 0xbb, 0x09, 0xad, 0xbf, 0x1e, 0x51, 0x5a, 0x02, - 0x64, 0xc5, 0x23, 0xd1, 0x90, 0x7f, 0xd8, 0xb1, 0x97, 0xd5, 0x26, 0x94, 0x0f, 0xcc, 0x91, 0x24, - 0xf7, 0xd3, 0x04, 0xb9, 0x57, 0xe2, 0x75, 0x60, 0x14, 0x23, 0x84, 0xd9, 0x17, 0xf3, 0xc2, 0x5c, - 0xb8, 0x42, 0x4e, 0xd5, 0x60, 0x03, 0xf5, 0xe7, 0x99, 0x2e, 0x16, 0x50, 0x49, 0x88, 0x46, 0x33, - 0xdf, 0x8e, 0xb2, 0x33, 0x6d, 0x1a, 0xb1, 0x80, 0x9e, 0xfb, 0x26, 0xda, 0x62, 0x1c, 0x60, 0xe8, - 0xfa, 0x81, 0x1c, 0x66, 0x7e, 0xc0, 0x1a, 0x23, 0xd0, 0xfd, 0xa8, 0x53, 0x36, 0x86, 0xb1, 0x71, - 0x72, 0xb9, 0x53, 0x96, 0xcc, 0xde, 0x83, 0x72, 0x54, 0xb6, 0x85, 0x1b, 0x5c, 0x3f, 0x57, 0x13, - 0xd8, 0x42, 0xe4, 0x66, 0x58, 0x0b, 0x73, 0xcb, 0x6d, 0x7a, 0xa4, 0x85, 0x3b, 0x34, 0x14, 0x53, - 0x3c, 0xd3, 0x81, 0xa4, 0xf9, 0xaf, 0x27, 0x7c, 0x25, 0x71, 0xd6, 0x7b, 0xd4, 0x69, 0xc7, 0x4c, - 0x2b, 0xbd, 0xe0, 0x7c, 0x11, 0xd4, 0x09, 0x94, 0x17, 0x77, 0x0d, 0x8b, 0xb0, 0x12, 0x89, 0xe3, - 0x36, 0xc0, 0x70, 0x11, 0x0b, 0xab, 0x97, 0x21, 0xb1, 0x38, 0x51, 0x61, 0x4d, 0x28, 0xc7, 0x97, - 0x67, 0x89, 0x95, 0x6d, 0xa9, 0x46, 0xf5, 0x17, 0x98, 0xa3, 0xc4, 0xf4, 0x90, 0xe4, 0x72, 0x0b, - 0xe7, 0xd8, 0xe8, 0x4a, 0x41, 0x0c, 0x9d, 0xa9, 0x17, 0x21, 0xff, 0xc8, 0x40, 0x7d, 0x65, 0x4e, - 0x50, 0x13, 0x5e, 0xb2, 0xbd, 0x3c, 0x1e, 0xb0, 0x8b, 0xbc, 0xcc, 0x6d, 0x2c, 0xe5, 0x2c, 0xa2, - 0x60, 0xa5, 0xe6, 0x2c, 0x71, 0x8e, 0x9b, 0xb0, 0x36, 0x32, 0xc7, 0x06, 0x05, 0x45, 0xe1, 0x39, - 0x3e, 0xa1, 0x36, 0x00, 0x0e, 0xbc, 0x20, 0x6c, 0x59, 0x90, 0x0f, 0x4e, 0xfd, 0x86, 0xbc, 0xa8, - 0xbd, 0x07, 0xa5, 0x7e, 0xef, 0xab, 0x0e, 0xcf, 0x2c, 0xb1, 0xdb, 0xb2, 0x4c, 0x5a, 0xa1, 0x10, - 0x29, 0xea, 0x57, 0x50, 0x26, 0x0c, 0x51, 0x76, 0xa3, 0x52, 0x97, 0xe1, 0x9b, 0x87, 0x78, 0xa9, - 0xe3, 0x80, 0x20, 0x07, 0x0f, 0x7b, 0x2e, 0xdd, 0x72, 0x1f, 0x7f, 0x24, 0xaf, 0x28, 0x96, 0x96, - 0x3f, 0x61, 0xd7, 0xca, 0xa9, 0xfb, 0x90, 0x27, 0xe2, 0x8b, 0x71, 0x78, 0x25, 0xe5, 0x2d, 0x84, - 0x55, 0x93, 0x4d, 0xca, 0x56, 0x12, 0x44, 0xb4, 0x28, 0x63, 0xc8, 0xf5, 0xbb, 0x4d, 0x9a, 0x42, - 0x0c, 0x5f, 0xc6, 0x1f, 0xf5, 0xd1, 0x9c, 0x51, 0x31, 0xfb, 0xc9, 0x10, 0xc4, 0x33, 0x60, 0xe9, - 0xa1, 0xef, 0x5c, 0xf8, 0x2d, 0xeb, 0x97, 0x18, 0xb9, 0xce, 0x1d, 0xcd, 0x43, 0x59, 0xd4, 0x3f, - 0x64, 0x51, 0x27, 0xdd, 0x66, 0x9f, 0x13, 0x14, 0xb1, 0x70, 0x3c, 0x6b, 0x82, 0xdd, 0xed, 0x82, - 0x6b, 0x44, 0x52, 0xd4, 0xa7, 0x4f, 0x01, 0xa8, 0x67, 0x90, 0x19, 0x2d, 0xc7, 0xc6, 0x7b, 0x3b, - 0x46, 0x38, 0xa4, 0x75, 0xf7, 0x64, 0x71, 0x47, 0x23, 0x89, 0x23, 0xa6, 0x6d, 0x3e, 0x09, 0x31, - 0xf3, 0x97, 0xc0, 0x7c, 0x15, 0xf2, 0x9e, 0xc3, 0x63, 0x63, 0x2e, 0x79, 0x65, 0x89, 0x38, 0x6a, - 0x0b, 0xea, 0x2b, 0x08, 0x25, 0xc8, 0x1f, 0x76, 0x0f, 0xe9, 0x5a, 0xb6, 0x06, 0x65, 0xec, 0x72, - 0xf5, 0x07, 0xdd, 0xe3, 0xc3, 0x76, 0x3d, 0xa3, 0x94, 0xa1, 0x70, 0x82, 0xdd, 0x6b, 0xbb, 0x9e, - 0xa5, 0xd7, 0x90, 0xce, 0xa1, 0xf8, 0xa0, 0xdc, 0x97, 0x3b, 0xf1, 0xc6, 0x4b, 0xe1, 0x85, 0xca, - 0xf7, 0xc4, 0xd4, 0xc5, 0x13, 0xa2, 0x1c, 0xaa, 0x3d, 0x51, 0x9b, 0x79, 0x49, 0x8e, 0xe6, 0x5e, - 0xc0, 0x8e, 0x5e, 0x55, 0xbf, 0x80, 0xa2, 0xb8, 0xfb, 0x5a, 0x36, 0x1c, 0x67, 0xc1, 0xc5, 0x10, - 0xc7, 0xee, 0x49, 0x55, 0xde, 0xb4, 0xf5, 0xc5, 0x9d, 0x6e, 0x61, 0xb7, 0x85, 0x0e, 0x1d, 0x86, - 0x14, 0x20, 0xa5, 0xfd, 0xee, 0x5e, 0x73, 0x1f, 0xcf, 0x80, 0x42, 0xef, 0x77, 0x5b, 0xf8, 0x33, - 0x43, 0xcb, 0xcd, 0xf6, 0x97, 0x7a, 0xe7, 0x50, 0x1c, 0x80, 0x7e, 0x77, 0x8f, 0x07, 0xf5, 0x1c, - 0xdd, 0x43, 0x9f, 0xf4, 0x1f, 0xd4, 0xf3, 0xbb, 0xbf, 0x81, 0x72, 0x74, 0x47, 0x87, 0xab, 0xcd, - 0x76, 0x1b, 0x49, 0xe0, 0x8f, 0xb6, 0x46, 0x04, 0x10, 0x09, 0x7f, 0xe8, 0xcd, 0xfd, 0x7d, 0x41, - 0xa1, 0xaf, 0xf5, 0xf6, 0x9b, 0x2d, 0x0d, 0x29, 0x20, 0x69, 0xed, 0xb0, 0xb9, 0xb7, 0xaf, 0xd5, - 0xf3, 0x0c, 0xd5, 0x39, 0xe2, 0x8f, 0x02, 0xb1, 0xc7, 0xf6, 0x5e, 0x1b, 0xd4, 0x8b, 0xa4, 0xcd, - 0xa3, 0xee, 0x83, 0x81, 0xf8, 0x5c, 0xdb, 0xd5, 0xe9, 0x3a, 0x2c, 0x6a, 0x64, 0x90, 0x42, 0x0f, - 0x67, 0x81, 0xce, 0x37, 0xc8, 0xb0, 0x0a, 0xa5, 0x43, 0xad, 0xf3, 0xf0, 0xd1, 0x5e, 0xb7, 0x8f, - 0x5c, 0x91, 0xfd, 0xa0, 0xf9, 0x50, 0xca, 0x7c, 0xa4, 0xf7, 0x9a, 0x83, 0x47, 0xc8, 0x11, 0xa9, - 0xb5, 0xba, 0x07, 0x07, 0xc7, 0x87, 0x9d, 0xc1, 0xb7, 0x75, 0x6a, 0x78, 0x6b, 0xda, 0x37, 0x03, - 0x3d, 0x5a, 0x2a, 0xec, 0xbe, 0x83, 0x55, 0x6d, 0xd1, 0xb8, 0xd0, 0x61, 0x0e, 0xbf, 0x15, 0x87, - 0x21, 0xf9, 0x59, 0x1b, 0x68, 0x42, 0xad, 0x3f, 0xa8, 0x67, 0x77, 0x77, 0xa1, 0xbe, 0xd2, 0xa2, - 0x14, 0x21, 0xab, 0x7d, 0x8d, 0x08, 0xf8, 0xf7, 0xa1, 0x86, 0xf0, 0xf8, 0x17, 0x4f, 0x94, 0xdd, - 0x7d, 0x5f, 0xf6, 0x87, 0x32, 0xf3, 0x47, 0xde, 0x42, 0xea, 0x6d, 0xb5, 0xb4, 0xde, 0x40, 0x10, - 0xef, 0x6b, 0x5f, 0x6a, 0x2d, 0x22, 0x7e, 0x0c, 0x5b, 0x69, 0x95, 0x18, 0x25, 0x5e, 0x48, 0xab, - 0x0b, 0x45, 0x6f, 0x43, 0x3d, 0x5a, 0xea, 0x6b, 0x07, 0xdd, 0x13, 0x62, 0x7c, 0x15, 0x36, 0xe3, - 0xab, 0x42, 0xe5, 0xd9, 0xdd, 0x3b, 0x50, 0x4b, 0x56, 0x64, 0x54, 0xcf, 0x81, 0xd6, 0xd6, 0x0f, - 0xba, 0x44, 0x6a, 0x03, 0x2a, 0xf4, 0x11, 0x82, 0x67, 0x76, 0xdf, 0x03, 0x88, 0xa5, 0x66, 0x3c, - 0x0c, 0xba, 0x01, 0xcb, 0xdc, 0x39, 0xe8, 0x75, 0xfb, 0x52, 0x66, 0xed, 0x1b, 0xfe, 0x9d, 0xbd, - 0xff, 0xf7, 0x4d, 0x28, 0x3d, 0xa4, 0x40, 0x69, 0xba, 0x96, 0xf2, 0x19, 0x6c, 0x3c, 0x34, 0x83, - 0xf8, 0x85, 0xaf, 0x12, 0x4b, 0x3b, 0x8b, 0xcb, 0xdf, 0xc6, 0xea, 0x25, 0xee, 0x15, 0xe5, 0x11, - 0x3f, 0x35, 0x24, 0x70, 0xd5, 0xc4, 0xab, 0x49, 0xea, 0x3d, 0x72, 0x63, 0x63, 0xe9, 0x89, 0x12, - 0x29, 0xfd, 0x0c, 0xaa, 0x28, 0x45, 0xf8, 0xe4, 0xe5, 0xa7, 0x8b, 0xb0, 0xfc, 0x92, 0x75, 0xe5, - 0x5e, 0x46, 0xf9, 0x08, 0x2a, 0x31, 0xc4, 0x0b, 0xe2, 0x29, 0xbf, 0x44, 0x05, 0x46, 0x2f, 0x6c, - 0xca, 0x1b, 0x09, 0xa1, 0x57, 0x1e, 0xde, 0xd2, 0x04, 0x7e, 0x0f, 0xa3, 0xd0, 0x0c, 0xfa, 0xd6, - 0xa9, 0x12, 0xdb, 0xe4, 0xab, 0xda, 0xc6, 0xf2, 0x02, 0x42, 0xbf, 0x8f, 0x81, 0x62, 0xfa, 0xd4, - 0xf6, 0xa5, 0xc9, 0x97, 0x42, 0xfe, 0x43, 0x0c, 0x27, 0x67, 0x1c, 0x5c, 0x0e, 0xe9, 0x63, 0xa8, - 0x2c, 0x90, 0x3a, 0xf6, 0x85, 0xd1, 0x3e, 0x81, 0xea, 0x02, 0xad, 0x3b, 0xbf, 0x38, 0xbb, 0xfb, - 0x50, 0x3a, 0x3a, 0x9b, 0x07, 0x54, 0x1a, 0x2f, 0x8c, 0x73, 0x0f, 0xdd, 0x90, 0xef, 0xc7, 0x2e, - 0x8c, 0xf1, 0x01, 0x26, 0x1c, 0xcb, 0xbf, 0x14, 0xca, 0x1e, 0xc6, 0x8a, 0x78, 0xa7, 0x55, 0x1a, - 0x09, 0xcb, 0x26, 0xde, 0x9d, 0x1b, 0xd7, 0x57, 0xf6, 0xc2, 0x77, 0x5f, 0xa4, 0xf1, 0x05, 0x8e, - 0x4e, 0xf2, 0xad, 0x57, 0x79, 0x75, 0x05, 0xd0, 0x7f, 0x1e, 0xff, 0xdb, 0x19, 0xa5, 0x4d, 0xaf, - 0x4b, 0xfc, 0x1e, 0xb8, 0x67, 0xfa, 0x41, 0xeb, 0xcc, 0xb0, 0x27, 0xe6, 0x28, 0x5d, 0xfe, 0x73, - 0xae, 0xe0, 0xc9, 0xb7, 0x3f, 0x5f, 0xbc, 0x2a, 0x46, 0xb7, 0x7a, 0x17, 0x0e, 0x8c, 0x36, 0x3d, - 0x22, 0x33, 0x32, 0x96, 0xc2, 0xa8, 0x0c, 0xa6, 0x13, 0xd8, 0x4a, 0x29, 0xb6, 0x4c, 0xe5, 0x33, - 0x76, 0x73, 0x6c, 0xb4, 0x94, 0xd8, 0x2c, 0x15, 0x7f, 0xc9, 0x6d, 0x6c, 0x27, 0xd6, 0xc3, 0xeb, - 0x24, 0xc2, 0xfd, 0x04, 0x8a, 0xe2, 0xd9, 0x57, 0x49, 0x6a, 0x3a, 0x81, 0x9e, 0xea, 0x8f, 0x45, - 0xf1, 0xe0, 0xba, 0x84, 0x17, 0x7f, 0x82, 0x4d, 0xf7, 0xc7, 0x35, 0x0a, 0x49, 0xea, 0xb4, 0x5e, - 0xa4, 0x25, 0x02, 0x62, 0x19, 0x3f, 0x65, 0x57, 0x61, 0x9c, 0xa4, 0xab, 0x24, 0x9e, 0x66, 0xcf, - 0xf1, 0x64, 0xe2, 0x86, 0x9d, 0x58, 0x2a, 0xb3, 0xa5, 0x56, 0x84, 0x78, 0x7d, 0xc0, 0xf2, 0x61, - 0x33, 0xe1, 0xbf, 0x10, 0x85, 0x1e, 0x5c, 0x23, 0x15, 0x52, 0xff, 0x91, 0x54, 0x45, 0xfc, 0x75, - 0x37, 0x4d, 0xb8, 0x9f, 0x43, 0x0d, 0x59, 0xc5, 0xae, 0x1b, 0x52, 0x9f, 0x5b, 0x1b, 0xe9, 0x8f, - 0xb0, 0x94, 0x1e, 0xd7, 0x13, 0xe8, 0xfe, 0xe5, 0xf0, 0xd9, 0xfb, 0x6a, 0x89, 0xd7, 0x62, 0xe5, - 0x46, 0x42, 0xfe, 0x94, 0x67, 0xe4, 0xb4, 0x63, 0x7c, 0xc6, 0x55, 0x21, 0x9a, 0xa4, 0xd2, 0x26, - 0x98, 0x46, 0xea, 0x58, 0x13, 0xaa, 0x60, 0xb1, 0xe2, 0x5f, 0x06, 0x19, 0x0f, 0xb0, 0x07, 0xd5, - 0xf8, 0x4b, 0xb4, 0xf2, 0x66, 0x42, 0xfe, 0xd5, 0x17, 0xea, 0xf4, 0xd4, 0x55, 0x46, 0x11, 0xe4, - 0x5c, 0xb3, 0x32, 0xe9, 0x34, 0x56, 0x56, 0x44, 0x0a, 0x0f, 0x51, 0x70, 0x48, 0xba, 0x18, 0x12, - 0x4a, 0xfb, 0x05, 0x76, 0x43, 0xe1, 0x6b, 0xb1, 0xf2, 0x5a, 0x32, 0x5d, 0x25, 0x9f, 0xb8, 0xd3, - 0xe4, 0xec, 0xc2, 0xd6, 0x42, 0xce, 0xd8, 0x14, 0xf8, 0x9c, 0x67, 0xa1, 0xc6, 0xf3, 0x9e, 0x8c, - 0xae, 0x28, 0x3d, 0xd8, 0x4a, 0x79, 0xbc, 0x56, 0x6e, 0xa6, 0x09, 0xb6, 0xfa, 0xb6, 0x9d, 0x22, - 0xe2, 0x69, 0x91, 0xff, 0xf7, 0xd3, 0x87, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x62, 0x11, 0x2c, - 0xd3, 0x0c, 0x25, 0x00, 0x00, + 0xbf, 0xe8, 0x74, 0x3a, 0xd3, 0x2e, 0xba, 0xee, 0xaa, 0x9b, 0x4e, 0x57, 0xfd, 0x80, 0x7e, 0x44, + 0x17, 0xf9, 0x8d, 0x9e, 0x73, 0xee, 0x05, 0x01, 0x90, 0x90, 0x2d, 0x39, 0x9d, 0x6e, 0x2c, 0xe2, + 0xde, 0xf3, 0xba, 0xe7, 0x7d, 0xee, 0x35, 0x54, 0x26, 0xce, 0xe9, 0xc4, 0xbd, 0xeb, 0x7a, 0x4e, + 0xe0, 0x28, 0x25, 0xfe, 0x30, 0x5c, 0x4b, 0x35, 0xa0, 0xa0, 0x79, 0x9e, 0xe3, 0x29, 0xb7, 0x20, + 0x3f, 0x74, 0x46, 0xe6, 0x4e, 0xe6, 0x46, 0xe6, 0xf6, 0xfa, 0xfd, 0xeb, 0x77, 0x43, 0x88, 0xbb, + 0xbc, 0x2d, 0xfe, 0x6d, 0x21, 0x80, 0x52, 0x81, 0xdc, 0xcc, 0x9f, 0xec, 0x64, 0x11, 0xae, 0xac, + 0xaa, 0x50, 0x8e, 0xef, 0xac, 0x1d, 0x1d, 0xb7, 0x5a, 0xda, 0xd1, 0x51, 0xfd, 0x8a, 0x52, 0x82, + 0xfc, 0x83, 0x66, 0x67, 0xbf, 0x9e, 0x51, 0xbb, 0x50, 0x6e, 0x7a, 0x93, 0xf9, 0xcc, 0xb4, 0x03, + 0x5f, 0x79, 0x1b, 0x4a, 0x9e, 0xe9, 0x3b, 0x73, 0x6f, 0x18, 0xb2, 0x52, 0x22, 0x56, 0x7d, 0xb9, + 0xa3, 0xac, 0x43, 0x71, 0x6c, 0xcc, 0xac, 0xe9, 0x33, 0x66, 0x53, 0x53, 0xaa, 0x90, 0xb7, 0x8d, + 0x99, 0xb9, 0x93, 0x63, 0xa6, 0x7f, 0xc8, 0x40, 0xfd, 0xc0, 0x19, 0xf5, 0x8c, 0xe0, 0x2c, 0x22, + 0x7c, 0x13, 0xca, 0x8e, 0x6b, 0x7a, 0x46, 0x60, 0x39, 0xb6, 0xa4, 0xbc, 0x15, 0x51, 0xee, 0x86, + 0x5b, 0x09, 0x01, 0xb2, 0xe7, 0x0a, 0x90, 0x60, 0xa8, 0xbc, 0x06, 0x79, 0x17, 0x99, 0xed, 0xe4, + 0xf1, 0xab, 0x72, 0x7f, 0x3d, 0x82, 0x27, 0x11, 0x08, 0x76, 0x3e, 0xb7, 0x46, 0x3b, 0x05, 0xdc, + 0xad, 0xaa, 0x6f, 0xc2, 0x86, 0x94, 0x0d, 0x89, 0xb9, 0x8e, 0xed, 0x9b, 0x0b, 0x80, 0x0c, 0x03, + 0x8c, 0x61, 0x53, 0x02, 0xf8, 0x97, 0x55, 0x4b, 0x28, 0x15, 0xeb, 0x5e, 0x79, 0x1d, 0x0a, 0x24, + 0x95, 0x8f, 0x42, 0xe6, 0x56, 0xc5, 0x52, 0x7f, 0x0d, 0xdb, 0xc8, 0xe7, 0xd0, 0xb4, 0x26, 0x67, + 0xa7, 0x8e, 0x77, 0x79, 0x45, 0xd1, 0xa1, 0x4d, 0xd3, 0x63, 0x66, 0x49, 0xea, 0xb8, 0xaa, 0xba, + 0x50, 0x3d, 0xf0, 0x82, 0x1f, 0x6b, 0xd7, 0x3a, 0x94, 0x2c, 0x3b, 0x30, 0xbd, 0xc7, 0xc6, 0x94, + 0x55, 0x9d, 0x57, 0x76, 0xa0, 0x6e, 0x4b, 0x91, 0x75, 0x63, 0x34, 0x42, 0x9a, 0x3e, 0xab, 0xbd, + 0xac, 0x7e, 0xc5, 0x8a, 0x4d, 0x30, 0xbd, 0xe8, 0x51, 0x90, 0xcd, 0xd8, 0x9a, 0x9a, 0x91, 0xee, + 0xd4, 0x7f, 0x65, 0x98, 0xda, 0xde, 0xcc, 0xbd, 0x3c, 0xb5, 0x0d, 0x58, 0x0b, 0x25, 0x13, 0x86, + 0x40, 0xb3, 0xb8, 0x8e, 0x17, 0xf0, 0x09, 0x6a, 0xca, 0xa7, 0x90, 0x0f, 0x9e, 0xb9, 0x26, 0x4b, + 0xbd, 0x7e, 0x7f, 0x37, 0xa2, 0xb0, 0xc4, 0x0f, 0xbf, 0x6d, 0x2b, 0x70, 0x3c, 0xcb, 0x9e, 0xf4, + 0x9c, 0xa9, 0x35, 0x7c, 0xa6, 0xbe, 0x4f, 0x6e, 0x9d, 0x5c, 0x53, 0xd6, 0x20, 0xd7, 0xeb, 0x6b, + 0x22, 0x9e, 0x7a, 0xdd, 0xa3, 0x41, 0x3d, 0x43, 0xbf, 0xf6, 0xba, 0x83, 0x47, 0xf5, 0xac, 0xfa, + 0x2d, 0xc7, 0x41, 0xdf, 0xfd, 0xce, 0xfa, 0x5f, 0x9f, 0x42, 0x3d, 0x66, 0xfd, 0x9c, 0x78, 0xe3, + 0xcb, 0x53, 0x6e, 0x40, 0xee, 0xb1, 0x37, 0x96, 0x7e, 0x53, 0x8b, 0x20, 0x90, 0x98, 0x3a, 0x84, + 0x6b, 0x48, 0xb6, 0x6d, 0x8e, 0x2d, 0xdb, 0x1c, 0x1d, 0x99, 0x2f, 0x61, 0xcb, 0xb7, 0x20, 0xe7, + 0x9b, 0x81, 0xa4, 0xbe, 0x1d, 0x41, 0x44, 0x34, 0xd5, 0x09, 0x5c, 0x45, 0x26, 0x47, 0x81, 0x11, + 0x98, 0x44, 0xfb, 0xf2, 0x3c, 0x10, 0xce, 0x0f, 0xb1, 0x25, 0xa7, 0x18, 0xdc, 0x82, 0xb0, 0xfa, + 0xa7, 0x0c, 0x28, 0x14, 0xcb, 0x6c, 0xaa, 0xcb, 0xb3, 0xb9, 0x01, 0x45, 0x97, 0x51, 0x25, 0x8f, + 0x7a, 0x2c, 0xc6, 0x84, 0xf5, 0xdf, 0x82, 0xeb, 0x9e, 0x39, 0x36, 0x3d, 0xdd, 0x7c, 0x6a, 0xf9, + 0x01, 0x7a, 0x85, 0xbe, 0x90, 0xcb, 0x67, 0x43, 0x95, 0x94, 0x57, 0x61, 0xcb, 0x45, 0x2b, 0x62, + 0x0c, 0x99, 0xf1, 0x4d, 0xf2, 0xbe, 0x92, 0xfa, 0x18, 0x5e, 0x8b, 0xe4, 0xf3, 0x7d, 0x6b, 0x62, + 0xbf, 0x9c, 0x42, 0xee, 0x02, 0x18, 0x0b, 0x74, 0x29, 0x6d, 0x63, 0x59, 0xda, 0x88, 0x81, 0x3a, + 0x82, 0x1d, 0xe4, 0xfb, 0x70, 0xea, 0x9c, 0x1a, 0xd3, 0x96, 0x63, 0x8f, 0xad, 0xc9, 0x4b, 0x69, + 0x67, 0xc2, 0x04, 0x56, 0xb5, 0x23, 0x08, 0xab, 0xff, 0xce, 0x60, 0x4c, 0xc8, 0x0c, 0x6c, 0x4f, + 0x3d, 0x4b, 0x24, 0x58, 0x4a, 0x32, 0x98, 0x17, 0x03, 0x8f, 0x1c, 0x3b, 0x87, 0xdf, 0x58, 0xb0, + 0x8c, 0x89, 0x48, 0xe5, 0x39, 0x02, 0x3d, 0x35, 0xfd, 0x40, 0xe8, 0x47, 0xd9, 0x82, 0x8a, 0xe5, + 0xeb, 0x4f, 0xac, 0xe0, 0x6c, 0xe4, 0x19, 0x4f, 0x38, 0x83, 0x97, 0x14, 0x05, 0x00, 0xf3, 0x91, + 0x35, 0x12, 0x12, 0x16, 0x71, 0xad, 0x80, 0xc9, 0x70, 0xdb, 0x76, 0x74, 0x6b, 0xe6, 0xe2, 0x41, + 0xad, 0x20, 0xc2, 0x58, 0x63, 0x8c, 0x28, 0xad, 0x95, 0x38, 0x05, 0x20, 0x05, 0x91, 0xf0, 0x74, + 0xc3, 0xb7, 0x77, 0xca, 0xbc, 0xb6, 0x89, 0x3e, 0x25, 0xd6, 0xb0, 0x12, 0x00, 0x47, 0x9c, 0x48, + 0x4b, 0x98, 0xfe, 0xcc, 0xd1, 0x4e, 0x85, 0xed, 0x75, 0x0c, 0x95, 0xb6, 0x49, 0x86, 0x16, 0x2a, + 0xa0, 0x93, 0xa0, 0xfd, 0xad, 0xa7, 0x7c, 0xb2, 0x58, 0xc6, 0xcf, 0xa6, 0x65, 0x7c, 0xe5, 0x15, + 0xd8, 0x98, 0x3a, 0xf6, 0x04, 0xdd, 0x45, 0x60, 0x99, 0xd2, 0x47, 0xd4, 0x00, 0x0a, 0x03, 0xe3, + 0x74, 0x6a, 0xa2, 0x4e, 0x45, 0x6e, 0xba, 0x68, 0x89, 0x89, 0x0e, 0x26, 0x72, 0xdb, 0xbb, 0x50, + 0x1d, 0x45, 0xf2, 0x91, 0x97, 0x91, 0x1c, 0x57, 0xe3, 0x51, 0xb8, 0xd8, 0x55, 0xff, 0x93, 0x45, + 0xf3, 0x60, 0xad, 0xe0, 0x73, 0x12, 0x15, 0xcb, 0x14, 0x92, 0x33, 0x1d, 0xc3, 0x75, 0xa7, 0xcf, + 0x74, 0xe9, 0xff, 0x39, 0xb6, 0x70, 0x8c, 0x4e, 0x93, 0x76, 0x65, 0x10, 0xdc, 0xa0, 0xce, 0xc4, + 0x1e, 0xb3, 0x75, 0x2a, 0x71, 0xa1, 0x89, 0x38, 0x79, 0x97, 0x72, 0x07, 0x6a, 0x26, 0xae, 0xe9, + 0xb3, 0xf9, 0x34, 0xb0, 0xce, 0x1c, 0x97, 0x8d, 0x56, 0xb9, 0x7f, 0x2d, 0xd6, 0xc4, 0xe0, 0xdf, + 0x03, 0xb9, 0xab, 0x7c, 0x00, 0x1b, 0x9e, 0x33, 0x0f, 0x4c, 0x1d, 0xb5, 0x34, 0x35, 0x87, 0x98, + 0x6f, 0xd9, 0x20, 0x95, 0xfb, 0x3b, 0x31, 0x85, 0x10, 0x40, 0x3f, 0xdc, 0xc7, 0x40, 0xcc, 0x5b, + 0xf6, 0xd8, 0x61, 0x33, 0x25, 0x92, 0x01, 0xc9, 0xc0, 0x09, 0x81, 0xfc, 0x35, 0xb0, 0x66, 0x26, + 0xba, 0x5d, 0x75, 0xd9, 0x5f, 0x07, 0xbc, 0x4e, 0x9e, 0x1f, 0x78, 0x86, 0xed, 0x73, 0x9a, 0xad, + 0x2d, 0x53, 0x1a, 0x84, 0x5b, 0xa4, 0x1d, 0x21, 0x1f, 0x47, 0xb5, 0xb7, 0xb3, 0xb1, 0xac, 0x1d, + 0x16, 0xee, 0x88, 0x37, 0xd5, 0xbf, 0x64, 0xa0, 0x12, 0xd7, 0xd6, 0x1d, 0x28, 0x5b, 0x76, 0xa8, + 0xd7, 0xcc, 0x8b, 0x22, 0x15, 0x75, 0x51, 0x33, 0x9f, 0x12, 0x57, 0x3d, 0x91, 0x8a, 0x5e, 0x80, + 0x82, 0x81, 0x10, 0x43, 0xc9, 0xbd, 0x30, 0x1f, 0xfc, 0x31, 0x0b, 0xa5, 0x85, 0xb5, 0xae, 0x42, + 0xcd, 0x98, 0x07, 0x67, 0xba, 0x8b, 0x29, 0xe5, 0x89, 0xe3, 0x8d, 0xa4, 0x73, 0x63, 0x2c, 0xa2, + 0x6f, 0x0d, 0x3d, 0xcb, 0xe5, 0xb8, 0xcb, 0x86, 0x21, 0x32, 0x75, 0x86, 0xc6, 0x14, 0x03, 0x49, + 0xba, 0xe0, 0xb9, 0x0d, 0x02, 0x55, 0x34, 0x6a, 0x58, 0x08, 0xb4, 0x10, 0x86, 0x21, 0x2f, 0x4c, + 0x50, 0x9b, 0xc2, 0x27, 0xca, 0x14, 0x86, 0xbc, 0xc6, 0x61, 0xb0, 0xc6, 0x60, 0xd7, 0x61, 0xd3, + 0x33, 0x67, 0x0e, 0xe6, 0x4f, 0xd7, 0xb3, 0x1e, 0xa3, 0x29, 0x89, 0x82, 0x08, 0xe4, 0x06, 0x28, + 0xc2, 0x12, 0xe3, 0xa9, 0xe1, 0xea, 0x23, 0x63, 0xe6, 0x62, 0x0e, 0xe6, 0x80, 0x2e, 0x29, 0xd7, + 0x60, 0xdd, 0x37, 0xed, 0x91, 0x3e, 0x74, 0x66, 0xb3, 0x39, 0x56, 0xed, 0x67, 0xec, 0x44, 0xcc, + 0x95, 0xc8, 0x21, 0xd2, 0xd0, 0x70, 0xd1, 0x61, 0x28, 0x05, 0x21, 0x57, 0x71, 0x0c, 0x5a, 0xaa, + 0xf2, 0x12, 0x40, 0x16, 0x13, 0x41, 0x8d, 0xbb, 0x91, 0x8f, 0xa1, 0x9a, 0x70, 0x50, 0x3c, 0x09, + 0x36, 0x2b, 0x18, 0xb0, 0x42, 0x37, 0x25, 0x65, 0x1b, 0xaa, 0xa1, 0x6f, 0xeb, 0x41, 0x20, 0x32, + 0x62, 0x4d, 0x1d, 0xc0, 0xfa, 0x92, 0x9b, 0xbe, 0x01, 0xd7, 0x96, 0x3c, 0x5b, 0x1f, 0x62, 0xd8, + 0x61, 0xce, 0x16, 0x74, 0x54, 0x68, 0xac, 0xee, 0xcf, 0x7d, 0x4c, 0x41, 0x94, 0x95, 0x04, 0xd5, + 0x1f, 0x72, 0x50, 0x8e, 0xbc, 0xfa, 0xc7, 0x19, 0x0b, 0xbb, 0xc2, 0x19, 0x1a, 0x08, 0xd3, 0xaf, + 0x2f, 0x9b, 0xe7, 0x58, 0xf8, 0x1e, 0xc8, 0x9d, 0x54, 0x93, 0x16, 0x96, 0x4d, 0x5a, 0x4c, 0x31, + 0xe9, 0xda, 0xaa, 0x49, 0x85, 0xdd, 0x30, 0x16, 0xbf, 0x9f, 0x9b, 0x73, 0xe4, 0x5a, 0x5e, 0x8e, + 0xc5, 0xaf, 0x79, 0x3d, 0xdd, 0xe8, 0xf0, 0x1c, 0xa3, 0x57, 0xce, 0x31, 0x7a, 0x95, 0x71, 0x50, + 0x4d, 0x3e, 0x8a, 0x8d, 0xba, 0x10, 0x45, 0x98, 0x0d, 0x5b, 0x23, 0x7b, 0xf8, 0x73, 0x97, 0x62, + 0xc5, 0x1c, 0x91, 0xed, 0x8d, 0x53, 0xcc, 0x82, 0x01, 0xe5, 0xc1, 0x75, 0x74, 0x02, 0x16, 0x9d, + 0xf2, 0x96, 0x40, 0xd9, 0x08, 0x35, 0x6b, 0x8c, 0x66, 0x56, 0x48, 0xa7, 0x1e, 0x6a, 0xd6, 0x33, + 0x87, 0xa6, 0xf5, 0x18, 0x3d, 0x62, 0x33, 0xec, 0x9c, 0x8d, 0xe1, 0xd0, 0x74, 0x91, 0xf0, 0x8e, + 0x12, 0xaa, 0xc6, 0x18, 0x61, 0x46, 0x08, 0xac, 0xdf, 0xe2, 0xda, 0x16, 0xaf, 0xd5, 0xa0, 0x80, + 0x27, 0xd1, 0xbf, 0xdf, 0xd9, 0x0e, 0x3f, 0xc7, 0x53, 0xc7, 0xf5, 0x77, 0xae, 0xb2, 0xa5, 0x7b, + 0x50, 0x5a, 0xd8, 0xe0, 0x27, 0x31, 0x0e, 0x22, 0x6b, 0x6c, 0xae, 0x58, 0x4a, 0x79, 0x13, 0xf2, + 0x7e, 0xd4, 0x00, 0xac, 0x02, 0xa8, 0xbf, 0xcf, 0xc0, 0x5a, 0x08, 0x8c, 0x3e, 0x7b, 0xd8, 0x1d, + 0x74, 0x1e, 0x74, 0x5a, 0xcd, 0x41, 0xa7, 0x7b, 0xc8, 0x54, 0xf3, 0x54, 0x51, 0x8e, 0x7b, 0xed, + 0xe6, 0x40, 0x63, 0x22, 0x79, 0xaa, 0x37, 0xdd, 0x9e, 0x76, 0x28, 0xbb, 0x7f, 0xd4, 0xc7, 0x57, + 0x9a, 0xd6, 0x6b, 0xee, 0x77, 0x4e, 0x34, 0x76, 0x98, 0x3c, 0xb9, 0x40, 0x5f, 0x7b, 0xd0, 0xd7, + 0x8e, 0x1e, 0xb1, 0x4f, 0x30, 0x4c, 0xbb, 0x73, 0xd4, 0x6a, 0xf6, 0xdb, 0x5a, 0x9b, 0xbd, 0x22, + 0x4f, 0xe7, 0x1a, 0x74, 0x07, 0xcd, 0x7d, 0x76, 0x88, 0xbc, 0x7a, 0x0b, 0x8a, 0xd2, 0xca, 0xb8, + 0x61, 0xd9, 0xee, 0x5c, 0xb8, 0x7f, 0x8d, 0x98, 0xa3, 0x3a, 0xe8, 0x5b, 0xb8, 0xfa, 0x09, 0x14, + 0x17, 0xa9, 0xb9, 0x38, 0xe4, 0x3e, 0x45, 0x1e, 0xfe, 0xda, 0x72, 0xf2, 0x16, 0x5d, 0x0c, 0x3a, + 0x74, 0x41, 0xd8, 0x25, 0xbb, 0x9c, 0x93, 0x05, 0x18, 0x07, 0x8d, 0xfa, 0x3b, 0xa8, 0x26, 0xb0, + 0xd0, 0x3b, 0x90, 0xba, 0x8d, 0x01, 0x87, 0x81, 0x17, 0x78, 0xcf, 0xa4, 0x2e, 0xf0, 0x24, 0x67, + 0xce, 0x74, 0xa4, 0x53, 0xd9, 0x90, 0xea, 0x40, 0xdf, 0xfb, 0xce, 0x34, 0x5d, 0x6c, 0x3f, 0xd0, + 0x33, 0x97, 0x46, 0xa3, 0x9b, 0xf0, 0x06, 0xfa, 0x85, 0x35, 0x9b, 0xcf, 0x74, 0x69, 0x68, 0x9f, + 0x9b, 0xbd, 0x08, 0x8e, 0x35, 0xa6, 0xfe, 0x03, 0x2b, 0x42, 0x4c, 0x9a, 0xff, 0x2f, 0x77, 0xee, + 0x94, 0xcc, 0x89, 0x13, 0x58, 0x06, 0xf9, 0x7c, 0xc4, 0xa1, 0x10, 0x9a, 0x7f, 0xee, 0xf2, 0xb7, + 0xb0, 0x1c, 0xba, 0xf1, 0xc8, 0x79, 0x62, 0xf3, 0x8a, 0x30, 0xde, 0x9f, 0x33, 0x50, 0x8e, 0x4a, + 0x21, 0xca, 0x2e, 0x53, 0x8a, 0xcc, 0x0b, 0x22, 0xfd, 0xa0, 0xaf, 0x8b, 0x65, 0x2e, 0xa5, 0xd9, + 0x30, 0x04, 0x67, 0xc1, 0x5c, 0x1f, 0x59, 0xfe, 0x10, 0xc3, 0xda, 0x7b, 0x26, 0xfb, 0x63, 0x74, + 0x43, 0xca, 0x5d, 0x74, 0xa2, 0x19, 0xdd, 0x6f, 0xe4, 0xc3, 0x38, 0x96, 0x49, 0x3a, 0x99, 0x70, + 0x30, 0xfa, 0xe4, 0x3a, 0x53, 0x16, 0x49, 0x07, 0x5d, 0x30, 0x18, 0x62, 0x77, 0x81, 0x50, 0x5c, + 0x31, 0xd4, 0x5d, 0xa8, 0xc4, 0x4a, 0x30, 0xb5, 0xe0, 0xf1, 0x7a, 0x9d, 0x48, 0xb9, 0xea, 0x01, + 0x14, 0x7b, 0xdc, 0x8d, 0x91, 0xc2, 0x2d, 0x57, 0x4f, 0x34, 0x74, 0xd8, 0xb1, 0xcd, 0x0c, 0xff, + 0x3b, 0x1d, 0x67, 0xd3, 0x09, 0x26, 0x59, 0x54, 0xb0, 0x3c, 0xcc, 0xf2, 0x86, 0xf1, 0x54, 0xce, + 0x65, 0xdf, 0x03, 0x44, 0x93, 0x0e, 0x46, 0x6d, 0xbc, 0x9f, 0xbb, 0xba, 0x32, 0x0d, 0x0d, 0x70, + 0x73, 0xa9, 0xa5, 0xc3, 0xaf, 0x29, 0xce, 0x12, 0x7c, 0x69, 0x50, 0xc6, 0x82, 0x50, 0x5a, 0xf4, + 0x8a, 0xa2, 0x99, 0x8b, 0x0f, 0x21, 0xbc, 0xa3, 0x7e, 0x8e, 0x69, 0xc2, 0x08, 0x86, 0x67, 0xc4, + 0xf0, 0xad, 0x04, 0xc3, 0x58, 0xf7, 0xc2, 0x10, 0xab, 0xec, 0xd4, 0x47, 0x50, 0x6d, 0xfa, 0xd4, + 0x9d, 0xee, 0xf3, 0x49, 0x94, 0xdb, 0x09, 0x02, 0xb1, 0x9e, 0x21, 0x0e, 0xc5, 0x74, 0xd0, 0x55, + 0xc4, 0xe9, 0x65, 0xb0, 0xfe, 0x35, 0x0b, 0x80, 0xf1, 0x34, 0xb2, 0xb8, 0xf5, 0x44, 0x7f, 0x04, + 0x21, 0xb9, 0x4e, 0xe3, 0x60, 0x66, 0xa5, 0xb8, 0x84, 0x12, 0xdf, 0x86, 0xea, 0xa2, 0xb8, 0x44, + 0x83, 0x63, 0x1a, 0xe4, 0x5d, 0x58, 0x37, 0x7c, 0x9d, 0x1a, 0x6c, 0xa9, 0x76, 0xd9, 0xd8, 0x5c, + 0x4b, 0x17, 0x52, 0xb9, 0x85, 0x99, 0x5a, 0xc2, 0x13, 0xe1, 0xfc, 0xb9, 0x84, 0xdf, 0xa1, 0x00, + 0x94, 0xf5, 0x82, 0x41, 0x0b, 0xe7, 0x82, 0xde, 0x81, 0x4d, 0xf3, 0x69, 0xa0, 0x27, 0xc1, 0x8b, + 0xe7, 0x82, 0x93, 0xbb, 0xe2, 0xf4, 0x8f, 0x71, 0xed, 0x63, 0x7b, 0xc0, 0xde, 0x59, 0x50, 0x8f, + 0x60, 0xa3, 0x15, 0xe2, 0x37, 0x87, 0x3c, 0x48, 0xbc, 0x9b, 0xd0, 0xfa, 0xeb, 0x11, 0xa5, 0x25, + 0x40, 0x56, 0x3c, 0x12, 0x0d, 0xf9, 0x87, 0x1d, 0x7b, 0x59, 0x6d, 0x42, 0xf9, 0xc0, 0x1c, 0x49, + 0x72, 0x3f, 0x4d, 0x90, 0x7b, 0x25, 0x5e, 0x07, 0x46, 0x31, 0x42, 0x98, 0x7d, 0x31, 0x2f, 0xcc, + 0x85, 0x2b, 0xe4, 0x54, 0x0d, 0x36, 0x50, 0x7f, 0x9e, 0xe9, 0x62, 0x01, 0x95, 0x84, 0x68, 0x34, + 0xf3, 0xed, 0x28, 0x3b, 0xd3, 0xa6, 0x11, 0x0b, 0xe8, 0xb9, 0x6f, 0xa2, 0x2d, 0xc6, 0x01, 0x86, + 0xae, 0x1f, 0xc8, 0x61, 0xe6, 0x07, 0xac, 0x31, 0x02, 0xdd, 0x8f, 0x3a, 0x65, 0x63, 0x18, 0x1b, + 0x27, 0x97, 0x3b, 0x65, 0xc9, 0xec, 0x3d, 0x28, 0x47, 0x65, 0x5b, 0xb8, 0xc1, 0xf5, 0x73, 0x35, + 0x81, 0x2d, 0x44, 0x6e, 0x86, 0xb5, 0x30, 0xb7, 0xdc, 0xa6, 0x47, 0x5a, 0xb8, 0x43, 0x43, 0x31, + 0xc5, 0x33, 0x1d, 0x48, 0x9a, 0xff, 0x7a, 0xc2, 0x57, 0x12, 0x67, 0xbd, 0x47, 0x9d, 0x76, 0xcc, + 0xb4, 0xd2, 0x0b, 0xce, 0x17, 0x41, 0x9d, 0x40, 0x79, 0x71, 0xd7, 0xb0, 0x08, 0x2b, 0x91, 0x38, + 0x6e, 0x03, 0x0c, 0x17, 0xb1, 0xb0, 0x7a, 0x19, 0x12, 0x8b, 0x13, 0x15, 0xd6, 0x84, 0x72, 0x7c, + 0x79, 0x96, 0x58, 0xd9, 0x96, 0x6a, 0x54, 0x7f, 0x81, 0x39, 0x4a, 0x4c, 0x0f, 0x49, 0x2e, 0xb7, + 0x70, 0x8e, 0x8d, 0xae, 0x14, 0xc4, 0xd0, 0x99, 0x7a, 0x11, 0xf2, 0xf7, 0x0c, 0xd4, 0x57, 0xe6, + 0x04, 0x35, 0xe1, 0x25, 0xdb, 0xcb, 0xe3, 0x01, 0xbb, 0xc8, 0xcb, 0xdc, 0xc6, 0x52, 0xce, 0x22, + 0x0a, 0x56, 0x6a, 0xce, 0x12, 0xe7, 0xb8, 0x09, 0x6b, 0x23, 0x73, 0x6c, 0x50, 0x50, 0x14, 0x9e, + 0xe3, 0x13, 0x6a, 0x03, 0xe0, 0xc0, 0x0b, 0xc2, 0x96, 0x05, 0xf9, 0xe0, 0xd4, 0x6f, 0xc8, 0x8b, + 0xda, 0x7b, 0x50, 0xea, 0xf7, 0xbe, 0xea, 0xf0, 0xcc, 0x12, 0xbb, 0x2d, 0xcb, 0xa4, 0x15, 0x0a, + 0x91, 0xa2, 0x7e, 0x05, 0x65, 0xc2, 0x10, 0x65, 0x37, 0x2a, 0x75, 0x19, 0xbe, 0x79, 0x88, 0x97, + 0x3a, 0x0e, 0x08, 0x72, 0xf0, 0xb0, 0xe7, 0xd2, 0x2d, 0xf7, 0xf1, 0x47, 0xf2, 0x8a, 0x62, 0x69, + 0xf9, 0x13, 0x76, 0xad, 0x9c, 0xba, 0x0f, 0x79, 0x22, 0xbe, 0x18, 0x87, 0x57, 0x52, 0xde, 0x42, + 0x58, 0x35, 0xd9, 0xa4, 0x6c, 0x25, 0x41, 0x44, 0x8b, 0x32, 0x86, 0x5c, 0xbf, 0xdb, 0xa4, 0x29, + 0xc4, 0xf0, 0x65, 0xfc, 0x51, 0x1f, 0xcd, 0x19, 0x15, 0xb3, 0x9f, 0x0c, 0x41, 0x3c, 0x03, 0x96, + 0x1e, 0xfa, 0xce, 0x85, 0xdf, 0xb2, 0x7e, 0x89, 0x91, 0xeb, 0xdc, 0xd1, 0x3c, 0x94, 0x45, 0xfd, + 0x67, 0x16, 0x75, 0xd2, 0x6d, 0xf6, 0x39, 0x41, 0xad, 0xaa, 0x11, 0x79, 0x92, 0x42, 0x50, 0xdc, + 0x99, 0x2b, 0xb5, 0x42, 0x0d, 0xb0, 0xcf, 0x59, 0x95, 0x2e, 0x71, 0x98, 0x31, 0x0f, 0x50, 0x8e, + 0x67, 0x4d, 0xb0, 0x2d, 0x36, 0xc4, 0x24, 0x11, 0x97, 0x45, 0x94, 0xee, 0x4f, 0x01, 0xa8, 0xd9, + 0x90, 0xa9, 0xb0, 0xc8, 0x56, 0x7f, 0x3b, 0x26, 0x51, 0x28, 0xc4, 0xdd, 0x93, 0xc5, 0xe5, 0x8e, + 0x94, 0x0a, 0x31, 0x6d, 0xf3, 0x49, 0x3c, 0x89, 0x5e, 0x14, 0xf3, 0x55, 0xc8, 0x7b, 0x0e, 0x4f, + 0x8b, 0xb9, 0xe4, 0x5d, 0x27, 0xe2, 0xa8, 0x2d, 0xa8, 0xaf, 0x20, 0x94, 0x20, 0x7f, 0xd8, 0x3d, + 0xa4, 0xfb, 0xdc, 0x1a, 0x94, 0xb1, 0x3d, 0xd6, 0x1f, 0x74, 0x8f, 0x0f, 0xdb, 0xf5, 0x8c, 0x52, + 0x86, 0xc2, 0x09, 0xb6, 0xbd, 0xed, 0x7a, 0x96, 0x9e, 0x51, 0x3a, 0x87, 0xe2, 0x83, 0x92, 0x66, + 0xee, 0xc4, 0x1b, 0x2f, 0xc5, 0x25, 0x5a, 0xcd, 0x13, 0xe3, 0x1a, 0x6b, 0x46, 0x4e, 0xe3, 0x9e, + 0x28, 0xea, 0xbc, 0x24, 0x67, 0x7a, 0x2f, 0xe0, 0x08, 0xa9, 0xaa, 0x5f, 0x40, 0x51, 0x5c, 0x9a, + 0x2d, 0x5b, 0x9c, 0xd3, 0xe7, 0x62, 0xfa, 0x63, 0xbf, 0xa6, 0xf6, 0xc0, 0xb4, 0xf5, 0xc5, 0x65, + 0x70, 0x61, 0xb7, 0x85, 0x91, 0x10, 0xc6, 0x22, 0x20, 0xa5, 0xfd, 0xee, 0x5e, 0x73, 0x1f, 0xcf, + 0x80, 0x42, 0xef, 0x77, 0x5b, 0xf8, 0x33, 0x43, 0xcb, 0xcd, 0xf6, 0x97, 0x7a, 0xe7, 0x50, 0x1c, + 0x80, 0x7e, 0x77, 0x8f, 0x07, 0xf5, 0x1c, 0x5d, 0x60, 0x9f, 0xf4, 0x1f, 0xd4, 0xf3, 0xbb, 0xbf, + 0x81, 0x72, 0x74, 0xb9, 0x87, 0xab, 0xcd, 0x76, 0x1b, 0x49, 0xe0, 0x8f, 0xb6, 0x46, 0x04, 0x10, + 0x09, 0x7f, 0xe8, 0xcd, 0xfd, 0x7d, 0x41, 0xa1, 0xaf, 0xf5, 0xf6, 0x9b, 0x2d, 0x0d, 0x29, 0x20, + 0x69, 0xed, 0xb0, 0xb9, 0xb7, 0xaf, 0xd5, 0xf3, 0x0c, 0xd5, 0x39, 0xe2, 0x8f, 0x02, 0xb1, 0xc7, + 0xb9, 0x40, 0x1b, 0xd4, 0x8b, 0xa4, 0xcd, 0xa3, 0xee, 0x83, 0x81, 0xf8, 0x5c, 0xdb, 0xd5, 0xe9, + 0x1e, 0x2d, 0xea, 0x80, 0x90, 0x42, 0x0f, 0x87, 0x88, 0xce, 0x37, 0xc8, 0xb0, 0x0a, 0xa5, 0x43, + 0xad, 0xf3, 0xf0, 0xd1, 0x5e, 0xb7, 0x8f, 0x5c, 0x91, 0xfd, 0xa0, 0xf9, 0x50, 0xca, 0x7c, 0xa4, + 0xf7, 0x9a, 0x83, 0x47, 0xc8, 0x11, 0xa9, 0xb5, 0xba, 0x07, 0x07, 0xc7, 0x87, 0x9d, 0xc1, 0xb7, + 0x75, 0xea, 0x94, 0x6b, 0xda, 0x37, 0x03, 0x3d, 0x5a, 0x2a, 0xec, 0xbe, 0x83, 0xe5, 0x70, 0xd1, + 0xf1, 0xd0, 0x61, 0x0e, 0xbf, 0x15, 0x87, 0x21, 0xf9, 0x59, 0x1b, 0x68, 0x42, 0xad, 0x3f, 0xa8, + 0x67, 0x77, 0x77, 0xa1, 0xbe, 0xd2, 0xdb, 0x14, 0x21, 0xab, 0x7d, 0x8d, 0x08, 0xf8, 0xf7, 0xa1, + 0x86, 0xf0, 0xf8, 0x17, 0x4f, 0x94, 0xdd, 0x7d, 0x5f, 0x36, 0x96, 0xb2, 0x64, 0x44, 0xde, 0x42, + 0xea, 0x6d, 0xb5, 0xb4, 0xde, 0x40, 0x10, 0xef, 0x6b, 0x5f, 0x6a, 0x2d, 0x22, 0x7e, 0x0c, 0x5b, + 0x69, 0x25, 0x1c, 0x25, 0x5e, 0x48, 0xab, 0x0b, 0x45, 0x6f, 0x43, 0x3d, 0x5a, 0xea, 0x6b, 0x07, + 0xdd, 0x13, 0x62, 0x7c, 0x15, 0x36, 0xe3, 0xab, 0x42, 0xe5, 0xd9, 0xdd, 0x3b, 0x50, 0x4b, 0x96, + 0x72, 0x54, 0xcf, 0x81, 0xd6, 0xd6, 0x0f, 0xba, 0x44, 0x6a, 0x03, 0x2a, 0xf4, 0x11, 0x82, 0x67, + 0x76, 0xdf, 0x03, 0x88, 0xe5, 0x74, 0x3c, 0x0c, 0xba, 0x01, 0xcb, 0xdc, 0x39, 0xe8, 0x75, 0xfb, + 0x52, 0x66, 0xed, 0x1b, 0xfe, 0x9d, 0xbd, 0xff, 0xb7, 0x4d, 0x28, 0x3d, 0xa4, 0x40, 0x69, 0xba, + 0x96, 0xf2, 0x19, 0x6c, 0x3c, 0x34, 0x83, 0xf8, 0x4d, 0xb1, 0x12, 0xcb, 0x57, 0x8b, 0x5b, 0xe3, + 0xc6, 0xea, 0xed, 0xef, 0x15, 0xe5, 0x11, 0xbf, 0x51, 0x24, 0x70, 0xd5, 0xc4, 0x73, 0x4b, 0xea, + 0x05, 0x74, 0x63, 0x63, 0xe9, 0x6d, 0x13, 0x29, 0xfd, 0x0c, 0xaa, 0x28, 0x45, 0xf8, 0x56, 0xe6, + 0xa7, 0x8b, 0xb0, 0xfc, 0x04, 0x76, 0xe5, 0x5e, 0x46, 0xf9, 0x08, 0x2a, 0x31, 0xc4, 0x0b, 0xe2, + 0x29, 0xbf, 0x44, 0x05, 0x46, 0x4f, 0x73, 0xca, 0x1b, 0x09, 0xa1, 0x57, 0x5e, 0xec, 0xd2, 0x04, + 0x7e, 0x0f, 0xa3, 0xd0, 0x0c, 0xfa, 0xd6, 0xa9, 0x12, 0xdb, 0xe4, 0x3b, 0xde, 0xc6, 0xf2, 0x02, + 0x42, 0xbf, 0x8f, 0x81, 0x62, 0xfa, 0xd4, 0x2f, 0xa6, 0xc9, 0x97, 0x42, 0xfe, 0x43, 0x0c, 0x27, + 0x67, 0x1c, 0x5c, 0x0e, 0xe9, 0x63, 0xa8, 0x2c, 0x90, 0x3a, 0xf6, 0x85, 0xd1, 0x3e, 0x81, 0xea, + 0x02, 0xad, 0x3b, 0xbf, 0x38, 0xbb, 0xfb, 0x50, 0x3a, 0x3a, 0x9b, 0x07, 0x54, 0x53, 0x2f, 0x8c, + 0x73, 0x0f, 0xdd, 0x90, 0x2f, 0xd6, 0x2e, 0x8c, 0xf1, 0x01, 0x26, 0x1c, 0xcb, 0xbf, 0x14, 0xca, + 0x1e, 0xc6, 0x8a, 0x78, 0xe0, 0x55, 0x1a, 0x09, 0xcb, 0x26, 0x1e, 0xac, 0x1b, 0xd7, 0x57, 0xf6, + 0xc2, 0x07, 0x63, 0xa4, 0xf1, 0x05, 0xce, 0x5c, 0xf2, 0x91, 0x58, 0x79, 0x75, 0x05, 0xd0, 0x7f, + 0x1e, 0xff, 0xdb, 0x19, 0xa5, 0x4d, 0xcf, 0x52, 0xfc, 0x90, 0xb8, 0x87, 0xa5, 0xb5, 0x75, 0x66, + 0xd8, 0x13, 0x73, 0x94, 0x2e, 0xff, 0x39, 0x77, 0xf7, 0xe4, 0xdb, 0x9f, 0x2f, 0x9e, 0x23, 0xa3, + 0xeb, 0xc0, 0x0b, 0x07, 0x46, 0x9b, 0x5e, 0x9f, 0x19, 0x19, 0x4b, 0x61, 0x54, 0x06, 0xd3, 0x09, + 0x6c, 0xa5, 0x14, 0x5b, 0xa6, 0xf2, 0x19, 0xbb, 0x39, 0x76, 0x68, 0x4a, 0x6c, 0x08, 0x8b, 0x3f, + 0x01, 0x37, 0xb6, 0x13, 0xeb, 0xe1, 0x3d, 0x14, 0xe1, 0x7e, 0x02, 0x45, 0xf1, 0x5e, 0xac, 0x24, + 0x35, 0x9d, 0x40, 0x4f, 0xf5, 0xc7, 0xa2, 0x78, 0xa9, 0x5d, 0xc2, 0x8b, 0xbf, 0xdd, 0xa6, 0xfb, + 0xe3, 0x1a, 0x85, 0x24, 0xb5, 0x68, 0x2f, 0xd2, 0x12, 0x01, 0xb1, 0x8c, 0x9f, 0xb2, 0xab, 0x30, + 0x4e, 0xd2, 0x55, 0x12, 0x6f, 0xba, 0xe7, 0x78, 0x32, 0x71, 0xc3, 0x16, 0x2e, 0x95, 0xd9, 0x52, + 0x2b, 0x42, 0xbc, 0x3e, 0x60, 0xf9, 0xb0, 0x99, 0xf0, 0x5f, 0x88, 0x42, 0x2f, 0xb5, 0x91, 0x0a, + 0xa9, 0xff, 0x48, 0xaa, 0x22, 0xfe, 0x2c, 0x9c, 0x26, 0xdc, 0xcf, 0xa1, 0x86, 0xac, 0x62, 0xf7, + 0x14, 0xa9, 0xef, 0xb4, 0x8d, 0xf4, 0xd7, 0x5b, 0x4a, 0x8f, 0xeb, 0x09, 0x74, 0xff, 0x72, 0xf8, + 0xec, 0x7d, 0xb5, 0xc4, 0x33, 0xb3, 0x72, 0x23, 0x21, 0x7f, 0xca, 0xfb, 0x73, 0xda, 0x31, 0x3e, + 0xe3, 0xaa, 0x10, 0x8d, 0x60, 0x69, 0xa3, 0x4f, 0x23, 0x75, 0x1e, 0x0a, 0x55, 0xb0, 0x58, 0xf1, + 0x2f, 0x83, 0x8c, 0x07, 0xd8, 0x83, 0x6a, 0xfc, 0x09, 0x5b, 0x79, 0x33, 0x21, 0xff, 0xea, 0xd3, + 0x76, 0x7a, 0xea, 0x2a, 0xa3, 0x08, 0x72, 0x20, 0x5a, 0x19, 0x91, 0x1a, 0x2b, 0x2b, 0x22, 0x85, + 0x87, 0x28, 0x38, 0x5d, 0x5d, 0x0c, 0x09, 0xa5, 0xfd, 0x02, 0xbb, 0xa1, 0xf0, 0x99, 0x59, 0x79, + 0x2d, 0x99, 0xae, 0x92, 0x6f, 0xe3, 0x69, 0x72, 0x76, 0x61, 0x6b, 0x21, 0x67, 0x6c, 0x7c, 0x7c, + 0xce, 0x7b, 0x52, 0xe3, 0x79, 0x6f, 0x4d, 0x57, 0x94, 0x1e, 0x6c, 0xa5, 0xbc, 0x7a, 0x2b, 0x37, + 0xd3, 0x04, 0x5b, 0x7d, 0x14, 0x4f, 0x11, 0xf1, 0xb4, 0xc8, 0xff, 0x6d, 0xea, 0xc3, 0xff, 0x06, + 0x00, 0x00, 0xff, 0xff, 0xde, 0xb8, 0x72, 0x7e, 0x45, 0x25, 0x00, 0x00, } diff --git a/api/gobgp.proto b/api/gobgp.proto index fbc375fa..bfc63871 100644 --- a/api/gobgp.proto +++ b/api/gobgp.proto @@ -485,17 +485,20 @@ message ROA { } message ROAResult { - uint32 origin_as = 1; - string prefix = 2; + string address = 1; + int64 timestamp = 2; + bytes aspath_attr = 3; + uint32 origin_as = 4; + string prefix = 5; enum ValidationResult { NONE = 0; NOT_FOUND = 1; VALID = 2; INVALID = 3; } - ValidationResult old_result = 3; - ValidationResult new_result = 4; - repeated ROA roas = 5; + ValidationResult old_result = 6; + ValidationResult new_result = 7; + repeated ROA roas = 8; } message Vrf { diff --git a/server/rpki.go b/server/rpki.go index ed4af2ea..6a205aa3 100644 --- a/server/rpki.go +++ b/server/rpki.go @@ -462,12 +462,17 @@ func (c *roaManager) validate(pathList []*table.Path, isMonitor bool) []*api.ROA return apiRoaList }() rr := &api.ROAResult{ + Address: path.GetSource().Address.String(), + Timestamp: path.GetTimestamp().Unix(), OriginAs: path.GetSourceAs(), Prefix: path.GetNlri().String(), OldResult: api.ROAResult_ValidationResult(path.Validation().ToInt()), NewResult: api.ROAResult_ValidationResult(r.ToInt()), Roas: apiRoaList, } + if b := path.GetAsPath(); b != nil { + rr.AspathAttr, _ = b.Serialize() + } results = append(results, rr) } path.SetValidation(config.RpkiValidationResultType(r)) diff --git a/server/server.go b/server/server.go index bdf8988a..75f23ac8 100644 --- a/server/server.go +++ b/server/server.go @@ -564,6 +564,7 @@ func (server *BgpServer) dropPeerAllRoutes(peer *Peer) []*SenderMsg { for _, rf := range peer.configuredRFlist() { dsts := server.globalRib.DeletePathsByPeer(peer.fsm.peerInfo, rf) + server.validatePaths(dsts) if peer.isRouteServerClient() { pathList := make([]*table.Path, len(dsts)) for _, targetPeer := range server.neighborMap { @@ -761,6 +762,63 @@ func (server *BgpServer) RSimportPaths(peer *Peer, pathList []*table.Path) []*ta return moded } +func (server *BgpServer) validatePaths(dsts []*table.Destination) { + isMonitor := func() bool { + if len(server.broadcastReqs) > 0 { + for _, req := range server.broadcastReqs { + if req.RequestType == REQ_MONITOR_ROA_VALIDATION_RESULT { + return true + } + } + return false + } + return false + }() + for _, dst := range dsts { + if isMonitor { + rrList := make([]*api.ROAResult, 0, len(dst.WithdrawnList)) + for _, path := range dst.WithdrawnList { + if path.Validation() == config.RPKI_VALIDATION_RESULT_TYPE_INVALID { + rr := &api.ROAResult{ + Address: path.GetSource().Address.String(), + Timestamp: path.GetTimestamp().Unix(), + OriginAs: path.GetSourceAs(), + Prefix: path.GetNlri().String(), + OldResult: api.ROAResult_ValidationResult(path.Validation().ToInt()), + NewResult: api.ROAResult_ValidationResult(path.Validation().ToInt()), + } + if b := path.GetAsPath(); b != nil { + rr.AspathAttr, _ = b.Serialize() + } + rrList = append(rrList, rr) + } + } + server.broadcastValidationResults(rrList) + } + if vResults := server.roaManager.validate(dst.UpdatedPathList, isMonitor); isMonitor { + for i, path := range dst.UpdatedPathList { + old := func() config.RpkiValidationResultType { + for _, withdrawn := range dst.WithdrawnList { + if path.GetSource().Equal(withdrawn.GetSource()) { + return withdrawn.Validation() + } + } + return config.RPKI_VALIDATION_RESULT_TYPE_NONE + }() + vResults[i].OldResult = api.ROAResult_ValidationResult(old.ToInt()) + } + rrList := make([]*api.ROAResult, 0, len(vResults)) + for _, rr := range vResults { + invalid := api.ROAResult_ValidationResult(config.RPKI_VALIDATION_RESULT_TYPE_INVALID.ToInt()) + if rr.NewResult == invalid || rr.OldResult == invalid { + rrList = append(rrList, rr) + } + } + server.broadcastValidationResults(rrList) + } + } +} + func (server *BgpServer) propagateUpdate(peer *Peer, pathList []*table.Path) ([]*SenderMsg, []*table.Path) { msgs := make([]*SenderMsg, 0) rib := server.globalRib @@ -779,6 +837,7 @@ func (server *BgpServer) propagateUpdate(peer *Peer, pathList []*table.Path) ([] moded = append(moded, server.RSimportPaths(targetPeer, pathList)...) } dsts := rib.ProcessPaths(append(pathList, moded...)) + server.validatePaths(dsts) for _, targetPeer := range server.neighborMap { if !targetPeer.isRouteServerClient() || targetPeer.fsm.state != bgp.BGP_FSM_ESTABLISHED { continue @@ -801,6 +860,7 @@ func (server *BgpServer) propagateUpdate(peer *Peer, pathList []*table.Path) ([] } alteredPathList = pathList dsts := rib.ProcessPaths(pathList) + server.validatePaths(dsts) sendPathList := make([]*table.Path, 0, len(dsts)) for _, dst := range dsts { path := dst.NewFeed(table.GLOBAL_RIB_NAME) @@ -922,16 +982,6 @@ func (server *BgpServer) handleFSMMessage(peer *Peer, e *FsmMsg) []*SenderMsg { } if len(pathList) > 0 { - isMonitor := func() bool { - if len(server.broadcastReqs) > 0 { - return true - } - return false - }() - vResults := server.roaManager.validate(pathList, isMonitor) - if isMonitor { - server.broadcastValidationResults(vResults) - } m, altered := server.propagateUpdate(peer, pathList) msgs = append(msgs, m...) if server.watchers.watching(WATCHER_EVENT_POST_POLICY_UPDATE_MSG) { diff --git a/table/destination.go b/table/destination.go index 78c54ba0..b7a79788 100644 --- a/table/destination.go +++ b/table/destination.go @@ -111,13 +111,16 @@ func NewPeerInfo(g *config.Global, p *config.Neighbor) *PeerInfo { } type Destination struct { - routeFamily bgp.RouteFamily - nlri bgp.AddrPrefixInterface - oldKnownPathList paths - knownPathList paths - withdrawList paths - newPathList paths - RadixKey string + routeFamily bgp.RouteFamily + nlri bgp.AddrPrefixInterface + oldKnownPathList paths + knownPathList paths + withdrawList paths + newPathList paths + WithdrawnList paths + ImplicitWithdrawnList paths + UpdatedPathList paths + RadixKey string } func NewDestination(nlri bgp.AddrPrefixInterface) *Destination { @@ -236,10 +239,11 @@ func (dd *Destination) validatePath(path *Path) { // paths from known paths. Also, adds new paths to known paths. func (dest *Destination) Calculate() { dest.oldKnownPathList = dest.knownPathList + dest.UpdatedPathList = dest.newPathList // First remove the withdrawn paths. - dest.explicitWithdraw() + dest.WithdrawnList = dest.explicitWithdraw() // Do implicit withdrawal - dest.implicitWithdraw() + dest.ImplicitWithdrawnList = dest.implicitWithdraw() // Collect all new paths into known paths. dest.knownPathList = append(dest.knownPathList, dest.newPathList...) // Clear new paths as we copied them. @@ -352,8 +356,9 @@ func (dest *Destination) explicitWithdraw() paths { // // Known paths will no longer have paths whose new version is present in // new paths. -func (dest *Destination) implicitWithdraw() { +func (dest *Destination) implicitWithdraw() paths { newKnownPaths := make([]*Path, 0, len(dest.knownPathList)) + implicitWithdrawn := make([]*Path, 0, len(dest.knownPathList)) for _, path := range dest.knownPathList { found := false for _, newPath := range dest.newPathList { @@ -375,11 +380,14 @@ func (dest *Destination) implicitWithdraw() { break } } - if !found { + if found { + implicitWithdrawn = append(implicitWithdrawn, path) + } else { newKnownPaths = append(newKnownPaths, path) } } dest.knownPathList = newKnownPaths + return implicitWithdrawn } func (dest *Destination) computeKnownBestPath() (*Path, BestPathReason, error) { |