diff options
-rw-r--r-- | api/gobgp.pb.go | 440 | ||||
-rw-r--r-- | api/gobgp.proto | 2 | ||||
-rw-r--r-- | openswitch/openswitch.go | 6 | ||||
-rw-r--r-- | server/server.go | 7 | ||||
-rw-r--r-- | server/zclient.go | 4 | ||||
-rw-r--r-- | server/zclient_test.go | 8 | ||||
-rw-r--r-- | table/destination_test.go | 2 | ||||
-rw-r--r-- | table/path.go | 36 | ||||
-rw-r--r-- | table/path_test.go | 20 | ||||
-rw-r--r-- | table/policy_test.go | 2 | ||||
-rw-r--r-- | table/table_manager.go | 10 | ||||
-rw-r--r-- | table/table_test.go | 2 |
12 files changed, 269 insertions, 270 deletions
diff --git a/api/gobgp.pb.go b/api/gobgp.pb.go index 8452693d..f4118ba1 100644 --- a/api/gobgp.pb.go +++ b/api/gobgp.pb.go @@ -687,7 +687,7 @@ type Path struct { SourceId string `protobuf:"bytes,10,opt,name=source_id" json:"source_id,omitempty"` Filtered bool `protobuf:"varint,11,opt,name=filtered" json:"filtered,omitempty"` Stale bool `protobuf:"varint,12,opt,name=stale" json:"stale,omitempty"` - IsFromOps bool `protobuf:"varint,13,opt,name=is_from_ops" json:"is_from_ops,omitempty"` + IsFromExternal bool `protobuf:"varint,13,opt,name=is_from_external" json:"is_from_external,omitempty"` } func (m *Path) Reset() { *m = Path{} } @@ -2989,226 +2989,226 @@ var _GobgpApi_serviceDesc = grpc.ServiceDesc{ } var fileDescriptor0 = []byte{ - // 3526 bytes of a gzipped FileDescriptorProto + // 3533 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x3a, 0x4d, 0x73, 0xdb, 0xd6, - 0xb5, 0xe6, 0xa7, 0xc8, 0x43, 0x52, 0xa2, 0x20, 0xd9, 0xa1, 0x99, 0x2f, 0x07, 0x2f, 0xcf, 0x76, + 0xb5, 0xe6, 0xa7, 0xc8, 0x43, 0x52, 0xa2, 0x20, 0xd9, 0x91, 0x95, 0x2f, 0x07, 0x2f, 0xcf, 0x76, 0x94, 0xd8, 0x71, 0x9c, 0xc4, 0x2f, 0x93, 0xe4, 0xcd, 0x7b, 0x14, 0x09, 0xdb, 0x8c, 0x25, 0x91, - 0xa1, 0x28, 0x25, 0x99, 0x79, 0x33, 0x18, 0x88, 0x04, 0x29, 0x3c, 0x93, 0x04, 0x02, 0x80, 0xb6, + 0xa1, 0x28, 0x25, 0x99, 0x79, 0x33, 0x18, 0x88, 0x04, 0x29, 0x3c, 0x93, 0x00, 0x02, 0x80, 0xb6, 0x35, 0xd3, 0x5d, 0x57, 0xfd, 0x0f, 0x9d, 0xce, 0xb4, 0x8b, 0x2e, 0xfa, 0x03, 0xba, 0xe9, 0xa6, - 0x33, 0xfd, 0x1f, 0xdd, 0x74, 0x91, 0x99, 0x6e, 0xfb, 0x07, 0x7a, 0xce, 0xb9, 0x17, 0x04, 0x40, - 0x42, 0xb6, 0xe4, 0x74, 0xba, 0x91, 0x88, 0x8b, 0xf3, 0x75, 0xcf, 0xf7, 0xb9, 0x17, 0x50, 0x1a, - 0xdb, 0x27, 0x63, 0xe7, 0xae, 0xe3, 0xda, 0xbe, 0xad, 0x14, 0xf8, 0xc1, 0x70, 0x2c, 0xd5, 0x80, - 0x9c, 0xe6, 0xba, 0xb6, 0xab, 0xdc, 0x82, 0xec, 0xc0, 0x1e, 0x9a, 0xb5, 0xd4, 0x8d, 0xd4, 0xed, - 0xf5, 0xfb, 0xd7, 0xef, 0x06, 0x10, 0x77, 0xf9, 0xb5, 0xf8, 0xdb, 0x44, 0x00, 0xa5, 0x04, 0x99, - 0xa9, 0x37, 0xae, 0xa5, 0x11, 0xae, 0xa8, 0xaa, 0x50, 0x8c, 0xbe, 0x59, 0x3b, 0x3c, 0x6a, 0x36, - 0xb5, 0xc3, 0xc3, 0xea, 0x15, 0xa5, 0x00, 0xd9, 0x87, 0x8d, 0xf6, 0x5e, 0x35, 0xa5, 0x76, 0xa0, - 0xd8, 0x70, 0xc7, 0xf3, 0xa9, 0x39, 0xf3, 0x3d, 0xe5, 0x7d, 0x28, 0xb8, 0xa6, 0x67, 0xcf, 0xdd, - 0x41, 0xc0, 0x4a, 0x09, 0x59, 0xf5, 0xe4, 0x1b, 0x65, 0x1d, 0xf2, 0x23, 0x63, 0x6a, 0x4d, 0xce, - 0x98, 0x4d, 0x45, 0x29, 0x43, 0x76, 0x66, 0x4c, 0xcd, 0x5a, 0x86, 0x99, 0xfe, 0x21, 0x05, 0xd5, - 0x7d, 0x7b, 0xd8, 0x35, 0xfc, 0xd3, 0x90, 0xf0, 0x4d, 0x28, 0xda, 0x8e, 0xe9, 0x1a, 0xbe, 0x65, - 0xcf, 0x24, 0xe5, 0xad, 0x90, 0x72, 0x27, 0x78, 0x15, 0x13, 0x20, 0x7d, 0xae, 0x00, 0x31, 0x86, - 0xca, 0x5b, 0x90, 0x75, 0x90, 0x59, 0x2d, 0x8b, 0x4f, 0xa5, 0xfb, 0xeb, 0x21, 0x3c, 0x89, 0x40, - 0xb0, 0xf3, 0xb9, 0x35, 0xac, 0xe5, 0xf0, 0x6d, 0x39, 0x22, 0x7a, 0x9e, 0x44, 0x57, 0xdf, 0x85, - 0x0d, 0x29, 0x2b, 0x12, 0x77, 0xec, 0x99, 0x67, 0x2e, 0x10, 0x48, 0xca, 0xb2, 0x3a, 0x82, 0x4d, - 0x09, 0xe0, 0x5d, 0x56, 0x4d, 0x81, 0x94, 0x6c, 0x0b, 0xe5, 0x6d, 0xc8, 0x91, 0x94, 0x1e, 0x0a, - 0x9d, 0x59, 0x15, 0x53, 0xfd, 0x3f, 0xd8, 0x46, 0x3e, 0x07, 0xa6, 0x35, 0x3e, 0x3d, 0xb1, 0xdd, - 0xcb, 0x2b, 0x8e, 0x94, 0x60, 0x9a, 0x2e, 0x33, 0x8b, 0x53, 0xc7, 0x55, 0xd5, 0x81, 0xf2, 0xbe, - 0xeb, 0xff, 0x5c, 0x3b, 0x57, 0xa1, 0x60, 0xcd, 0x7c, 0xd3, 0x7d, 0x66, 0x4c, 0x58, 0xf5, 0x59, - 0xa5, 0x06, 0xd5, 0x99, 0x14, 0x59, 0x37, 0x86, 0x43, 0xa4, 0xe9, 0xb1, 0x19, 0x8a, 0xea, 0x13, - 0x56, 0x6c, 0x8c, 0xe9, 0x45, 0xb7, 0x82, 0x6c, 0x46, 0xd6, 0xc4, 0x0c, 0x75, 0xa7, 0xfe, 0x25, - 0xc5, 0xd4, 0x76, 0xa7, 0xce, 0xe5, 0xa9, 0x6d, 0xc0, 0x5a, 0x20, 0x99, 0x30, 0x04, 0x9a, 0xc5, - 0xb1, 0x5d, 0x9f, 0x77, 0x50, 0x51, 0xbe, 0x80, 0xac, 0x7f, 0xe6, 0x98, 0x2c, 0xf5, 0xfa, 0xfd, - 0x9d, 0x90, 0xc2, 0x12, 0x3f, 0x7c, 0x9e, 0x59, 0xbe, 0xed, 0x5a, 0xb3, 0x71, 0xd7, 0x9e, 0x58, - 0x83, 0x33, 0xf5, 0x63, 0x72, 0xf3, 0xf8, 0x9a, 0xb2, 0x06, 0x99, 0x6e, 0x4f, 0x13, 0xf1, 0xd5, - 0xed, 0x1c, 0xf6, 0xab, 0x29, 0xfa, 0xb5, 0xdb, 0xe9, 0x3f, 0xae, 0xa6, 0xd5, 0x1f, 0x38, 0x2e, - 0x7a, 0xce, 0x53, 0xeb, 0x5f, 0xbd, 0x0b, 0xf5, 0x88, 0xf5, 0x73, 0xec, 0x8e, 0x2e, 0x4f, 0xb9, - 0x0e, 0x99, 0x67, 0xee, 0x48, 0xfa, 0x4d, 0x25, 0x84, 0x40, 0x62, 0xea, 0x00, 0xae, 0x21, 0xd9, - 0x96, 0x39, 0xb2, 0x66, 0xe6, 0xf0, 0xd0, 0x7c, 0x0d, 0x5b, 0xbe, 0x07, 0x19, 0xcf, 0xf4, 0x25, - 0xf5, 0xed, 0x10, 0x22, 0xa4, 0xa9, 0x8e, 0xe1, 0x2a, 0x32, 0x39, 0xf4, 0x0d, 0xdf, 0x24, 0xda, - 0x97, 0xe7, 0x81, 0x70, 0x5e, 0x80, 0x2d, 0x39, 0x45, 0xe0, 0x16, 0x84, 0xd5, 0xdf, 0xa4, 0x40, - 0xa1, 0x58, 0x66, 0x53, 0x5d, 0x9e, 0xcd, 0x0d, 0xc8, 0x3b, 0x8c, 0x2a, 0x79, 0x54, 0x23, 0x31, - 0x26, 0xac, 0xff, 0x1e, 0x5c, 0x77, 0xcd, 0x91, 0xe9, 0xea, 0xe6, 0x0b, 0xcb, 0xf3, 0xd1, 0x2b, - 0xf4, 0x85, 0x5c, 0x1e, 0x1b, 0xaa, 0xa0, 0xbc, 0x09, 0x5b, 0x0e, 0x5a, 0x11, 0x63, 0xc8, 0x8c, - 0xbe, 0x24, 0xef, 0x2b, 0xa8, 0xcf, 0xe0, 0xad, 0x50, 0x3e, 0xcf, 0xb3, 0xc6, 0xb3, 0xd7, 0x53, - 0xc8, 0x5d, 0x00, 0x63, 0x81, 0x2e, 0xa5, 0xad, 0x2f, 0x4b, 0x1b, 0x32, 0x50, 0x87, 0x50, 0x43, - 0xbe, 0x8f, 0x26, 0xf6, 0x89, 0x31, 0x69, 0xda, 0xb3, 0x91, 0x35, 0x7e, 0x2d, 0xed, 0x8c, 0x99, - 0xc0, 0xaa, 0x76, 0x04, 0x61, 0xf5, 0x1f, 0x29, 0x8c, 0x09, 0x99, 0x91, 0x67, 0x13, 0xd7, 0x12, - 0x09, 0x96, 0x92, 0x0c, 0xe6, 0x45, 0xdf, 0x25, 0xc7, 0xce, 0xe0, 0x33, 0x16, 0x30, 0x63, 0x2c, - 0x52, 0x7b, 0x86, 0x40, 0x4f, 0x4c, 0xcf, 0x17, 0xfa, 0x51, 0xb6, 0xa0, 0x64, 0x79, 0xfa, 0x73, - 0xcb, 0x3f, 0x1d, 0xba, 0xc6, 0x73, 0xce, 0xe8, 0x05, 0x45, 0x01, 0xc0, 0x7c, 0x64, 0x0d, 0x85, - 0x84, 0x94, 0xd5, 0x73, 0x98, 0x0c, 0xb7, 0x67, 0xb6, 0x6e, 0x4d, 0x1d, 0xdc, 0xa8, 0xe5, 0x87, - 0x18, 0x6b, 0x8c, 0x11, 0xa6, 0xb5, 0x02, 0xa7, 0x00, 0xa4, 0x20, 0x12, 0x9e, 0x6e, 0x78, 0xb3, - 0x5a, 0x91, 0xd7, 0x36, 0xd1, 0xa7, 0xc4, 0x1a, 0x56, 0x02, 0xe0, 0x88, 0x13, 0x69, 0x09, 0xd3, - 0x9f, 0x39, 0xac, 0x95, 0x98, 0x50, 0x05, 0x72, 0x68, 0xc3, 0x89, 0x59, 0x2b, 0x47, 0xc4, 0x1b, - 0xb9, 0xf6, 0x54, 0xb7, 0x1d, 0xaf, 0x56, 0x61, 0x9b, 0x1e, 0x41, 0xa9, 0x65, 0x92, 0x33, 0x08, - 0x35, 0xd1, 0x6e, 0xd1, 0x47, 0xac, 0x17, 0xbc, 0xfb, 0x48, 0x55, 0x48, 0x27, 0x55, 0x05, 0xe5, - 0x0d, 0xd8, 0x98, 0xd8, 0xb3, 0x31, 0xba, 0x94, 0xc0, 0x32, 0xa5, 0x1f, 0xa9, 0xbf, 0x4a, 0x41, - 0xae, 0x6f, 0x9c, 0x4c, 0x4c, 0x54, 0xbc, 0x48, 0x60, 0x17, 0xad, 0x43, 0xe1, 0xee, 0x45, 0x02, - 0xfc, 0x10, 0xca, 0xc3, 0x50, 0x40, 0x72, 0x45, 0x12, 0xe4, 0x6a, 0x34, 0x54, 0x43, 0xf1, 0x71, - 0x8b, 0x8e, 0xed, 0xf9, 0xba, 0x0c, 0x04, 0xb6, 0x80, 0xfa, 0xb7, 0x34, 0x1a, 0x16, 0xab, 0x0c, - 0x6b, 0x88, 0x48, 0x5b, 0xa6, 0xd8, 0x0f, 0x13, 0x37, 0x1c, 0x67, 0x72, 0x16, 0x20, 0x64, 0xd8, - 0x37, 0x22, 0xc4, 0x1b, 0xf4, 0x56, 0x86, 0xcf, 0x0d, 0xea, 0x71, 0x66, 0x23, 0xa6, 0x5a, 0x8a, - 0xee, 0x84, 0x88, 0x93, 0x5f, 0x2a, 0x77, 0xa0, 0x62, 0xe2, 0x9a, 0x3e, 0x9d, 0x4f, 0x7c, 0xeb, - 0xd4, 0x76, 0xd8, 0xdc, 0xa5, 0xfb, 0xd7, 0x22, 0xed, 0x10, 0xfe, 0xdf, 0x97, 0x6f, 0x95, 0x4f, - 0x60, 0xc3, 0xb5, 0xe7, 0xbe, 0xa9, 0xa3, 0xee, 0x26, 0xe6, 0x00, 0x33, 0x35, 0x9b, 0xb2, 0x74, - 0xbf, 0x16, 0xd1, 0x12, 0x01, 0xf4, 0x82, 0xf7, 0x18, 0xc2, 0x59, 0x6b, 0x36, 0xb2, 0xd9, 0xc0, - 0xb1, 0x34, 0x42, 0x32, 0x70, 0x2a, 0x21, 0x4f, 0xf7, 0xad, 0xa9, 0x89, 0x0e, 0x5b, 0x5e, 0xf6, - 0xf4, 0x3e, 0xaf, 0x53, 0xcc, 0xf8, 0xae, 0x31, 0xf3, 0x38, 0x41, 0x57, 0x96, 0x29, 0xf5, 0x83, - 0x57, 0xa4, 0x1d, 0x21, 0x1f, 0xe7, 0x03, 0xb7, 0xb6, 0xb1, 0xac, 0x1d, 0x16, 0xee, 0x90, 0x5f, - 0xaa, 0xbf, 0x4b, 0x41, 0x29, 0xaa, 0xad, 0x3b, 0x50, 0xb4, 0x66, 0x81, 0x5e, 0x53, 0xaf, 0x8a, - 0x71, 0xd4, 0x45, 0xc5, 0x7c, 0x41, 0x5c, 0xf5, 0x58, 0x12, 0x7b, 0x05, 0x0a, 0x86, 0x50, 0x04, - 0x25, 0xf3, 0xca, 0x4c, 0xf2, 0xeb, 0x34, 0x14, 0x16, 0xd6, 0xba, 0x0a, 0x15, 0x63, 0xee, 0x9f, - 0xea, 0x0e, 0x26, 0xa3, 0xe7, 0xb6, 0x3b, 0x94, 0x2e, 0x8f, 0x3e, 0x84, 0x0e, 0x37, 0x70, 0x2d, - 0x87, 0x23, 0x36, 0x1d, 0x04, 0xd7, 0xc4, 0x1e, 0x18, 0x13, 0x0c, 0x41, 0xe9, 0x97, 0xe7, 0xb6, - 0x16, 0x54, 0x0b, 0xa9, 0xd5, 0x21, 0xd0, 0x5c, 0x10, 0xc0, 0xbc, 0x30, 0x46, 0x6d, 0x0a, 0x9f, - 0x28, 0x52, 0x00, 0xf3, 0x1a, 0xc7, 0xc6, 0x1a, 0x83, 0x5d, 0x87, 0x4d, 0xd7, 0x9c, 0xda, 0x98, - 0x79, 0x1d, 0xd7, 0x7a, 0x86, 0xa6, 0x24, 0x0a, 0x22, 0x05, 0xd4, 0x41, 0x11, 0x96, 0x18, 0x4d, - 0x0c, 0x47, 0x1f, 0x1a, 0x53, 0x07, 0xb3, 0x37, 0xa7, 0x82, 0x82, 0x72, 0x0d, 0xd6, 0x3d, 0x73, - 0x36, 0xd4, 0x07, 0xf6, 0x74, 0x3a, 0xc7, 0x7a, 0x7f, 0xc6, 0x4e, 0xc4, 0x5c, 0x89, 0x1c, 0x22, - 0x0d, 0x0c, 0x07, 0x1d, 0x86, 0x92, 0x17, 0x72, 0x15, 0xdb, 0xa0, 0xa5, 0x32, 0x2f, 0x01, 0xa4, - 0x31, 0x85, 0x54, 0xb8, 0x8f, 0xf9, 0x1c, 0xca, 0x31, 0x07, 0xc5, 0x9d, 0x60, 0x9b, 0x83, 0x51, - 0x2c, 0x74, 0x53, 0x50, 0xb6, 0xa1, 0x1c, 0xf8, 0xb6, 0xee, 0xfb, 0x22, 0x97, 0x56, 0xd4, 0x3e, - 0xac, 0x2f, 0xb9, 0xe9, 0x3b, 0x70, 0x6d, 0xc9, 0xb3, 0xf5, 0x01, 0x86, 0x1d, 0x66, 0x7b, 0x41, - 0x47, 0x85, 0xfa, 0xea, 0xfb, 0xb9, 0x87, 0xc9, 0x8b, 0xf2, 0x99, 0xa0, 0xfa, 0x53, 0x06, 0x8a, - 0xa1, 0x57, 0xff, 0x3c, 0x63, 0x61, 0x3f, 0x39, 0x45, 0x03, 0x61, 0xe2, 0xf6, 0x64, 0x1b, 0x1e, - 0x09, 0xdf, 0x7d, 0xf9, 0x26, 0xd1, 0xa4, 0xb9, 0x65, 0x93, 0xe6, 0x13, 0x4c, 0xba, 0xb6, 0x6a, - 0x52, 0x61, 0x37, 0x8c, 0xc5, 0x1f, 0xe7, 0xe6, 0x1c, 0xb9, 0x16, 0x97, 0x63, 0xf1, 0x5b, 0x5e, - 0x4f, 0x36, 0x3a, 0xbc, 0xc4, 0xe8, 0xa5, 0x73, 0x8c, 0x5e, 0x66, 0x1c, 0x54, 0x93, 0x87, 0x62, - 0xa3, 0x2e, 0x44, 0xf9, 0x66, 0xc3, 0x56, 0xc8, 0x1e, 0xde, 0xdc, 0xa1, 0x58, 0x31, 0x87, 0x64, - 0x7b, 0xe3, 0x04, 0xb3, 0xa0, 0x4f, 0x79, 0x70, 0x1d, 0x9d, 0x80, 0x45, 0xa7, 0xbc, 0x25, 0x50, - 0x36, 0x02, 0xcd, 0x1a, 0xc3, 0xa9, 0x15, 0xd0, 0xa9, 0x06, 0x9a, 0x75, 0xcd, 0x81, 0x69, 0x3d, - 0x43, 0x8f, 0xd8, 0x0c, 0x7a, 0x6e, 0x63, 0x30, 0x30, 0x1d, 0x24, 0x5c, 0x53, 0x02, 0xd5, 0x18, - 0x43, 0xcc, 0x08, 0xbe, 0xe5, 0xe1, 0xda, 0x16, 0xaf, 0x61, 0x25, 0xc2, 0x9d, 0xe8, 0x3f, 0xd6, - 0xb6, 0x83, 0xc7, 0xd1, 0x84, 0x6a, 0xd0, 0x55, 0xb6, 0x74, 0x17, 0x0a, 0x0b, 0x1b, 0xfc, 0x47, - 0x84, 0x83, 0xc8, 0x1a, 0x9b, 0x2b, 0x96, 0x52, 0xde, 0x85, 0xac, 0x17, 0xb6, 0x0e, 0xab, 0x00, - 0xea, 0x2f, 0x53, 0xb0, 0x16, 0x00, 0xa3, 0xcf, 0x1e, 0x74, 0xfa, 0xed, 0x87, 0xed, 0x66, 0xa3, - 0xdf, 0xee, 0x1c, 0x30, 0xd5, 0x2c, 0x95, 0x99, 0xa3, 0x6e, 0xab, 0xd1, 0xd7, 0x98, 0x48, 0x96, - 0x8a, 0x50, 0xa7, 0xab, 0x1d, 0xc8, 0xb9, 0x01, 0xf5, 0xf1, 0x44, 0xd3, 0xba, 0x8d, 0xbd, 0xf6, - 0xb1, 0xc6, 0x0e, 0x93, 0x25, 0x17, 0xe8, 0x69, 0x0f, 0x7b, 0xda, 0xe1, 0x63, 0xf6, 0x09, 0x86, - 0x69, 0xb5, 0x0f, 0x9b, 0x8d, 0x5e, 0x4b, 0x6b, 0xb1, 0x57, 0x64, 0x69, 0x5f, 0xfd, 0x4e, 0xbf, - 0xb1, 0xc7, 0x0e, 0x91, 0x55, 0x6f, 0x41, 0x5e, 0x5a, 0x19, 0x5f, 0x58, 0x33, 0x67, 0x2e, 0xdc, - 0xbf, 0x42, 0xcc, 0x51, 0x1d, 0xf4, 0x2c, 0x5c, 0xfd, 0x18, 0xf2, 0x8b, 0xd4, 0x9c, 0x1f, 0x70, - 0x87, 0x23, 0x37, 0x7f, 0x6d, 0x39, 0x79, 0x8b, 0xfe, 0x07, 0x1d, 0x3a, 0x27, 0xec, 0x92, 0x5e, - 0xce, 0xc9, 0x02, 0x8c, 0x83, 0x46, 0xfd, 0x05, 0x94, 0x63, 0x58, 0xe8, 0x1d, 0x48, 0x7d, 0x86, - 0x01, 0x87, 0x81, 0xe7, 0xbb, 0x67, 0x52, 0x17, 0xb8, 0x93, 0x53, 0x7b, 0x32, 0xd4, 0xa9, 0x6c, - 0x48, 0x75, 0xa0, 0xef, 0x3d, 0x35, 0x4d, 0x07, 0x1b, 0x17, 0xf4, 0xcc, 0xa5, 0xa1, 0xea, 0x26, - 0xbc, 0x83, 0x7e, 0x61, 0x4d, 0xe7, 0x53, 0x7d, 0x61, 0x68, 0xca, 0xae, 0x21, 0x1c, 0x6b, 0x4c, - 0xfd, 0x13, 0x56, 0x84, 0x88, 0x34, 0xff, 0x5e, 0xee, 0xdc, 0x63, 0x99, 0x63, 0xdb, 0xb7, 0x0c, - 0xf2, 0xf9, 0x90, 0x43, 0x2e, 0x30, 0xff, 0xdc, 0xe1, 0x67, 0x61, 0x39, 0x74, 0xe3, 0xa1, 0xfd, - 0x7c, 0xc6, 0x2b, 0xc2, 0x78, 0xbf, 0x4d, 0x41, 0x31, 0x2c, 0x85, 0x28, 0xbb, 0x4c, 0x29, 0x32, - 0x2f, 0x88, 0xf4, 0x83, 0xbe, 0x2e, 0x96, 0xb9, 0x94, 0xa6, 0x83, 0x10, 0x9c, 0xfa, 0x73, 0x7d, - 0x68, 0x79, 0x03, 0x0c, 0x6b, 0xf7, 0x4c, 0x76, 0xd6, 0xe8, 0x86, 0x94, 0xbb, 0x68, 0x47, 0x53, - 0x3a, 0x29, 0xc9, 0x06, 0x71, 0x2c, 0x93, 0x74, 0x3c, 0xe1, 0x60, 0xf4, 0xc9, 0x75, 0xa6, 0x2c, - 0x92, 0x0e, 0xba, 0xa0, 0x3f, 0xc0, 0xee, 0x02, 0xa1, 0xb8, 0x62, 0xa8, 0x3b, 0x50, 0x8a, 0x94, - 0x60, 0x6a, 0xde, 0xa3, 0xf5, 0x3a, 0x96, 0x72, 0xd5, 0x7d, 0xc8, 0x77, 0xb9, 0x47, 0x23, 0x85, - 0x5b, 0x8e, 0x1e, 0x6b, 0xf3, 0xb0, 0x8f, 0x9b, 0x1a, 0xde, 0x53, 0x1d, 0xa7, 0xda, 0x31, 0x26, - 0x59, 0x54, 0xb0, 0xdc, 0xcc, 0xf2, 0x0b, 0xe3, 0x85, 0x9c, 0xe8, 0x7e, 0x04, 0x08, 0x67, 0x24, - 0x8c, 0xda, 0x68, 0x93, 0x77, 0x75, 0x65, 0x8e, 0xea, 0xe3, 0xcb, 0xa5, 0x3e, 0x0f, 0x9f, 0x26, - 0x38, 0x85, 0xf0, 0x71, 0x43, 0x11, 0x0b, 0x42, 0x61, 0xd1, 0x41, 0x8a, 0x0e, 0x2f, 0x3a, 0xbe, - 0xf0, 0x1b, 0xf5, 0x2b, 0x4c, 0x13, 0x86, 0x3f, 0x38, 0x25, 0x86, 0xef, 0xc5, 0x18, 0x46, 0xba, - 0x17, 0x86, 0x58, 0x65, 0xa7, 0x3e, 0x86, 0x72, 0xc3, 0xa3, 0x9e, 0x75, 0x8f, 0x77, 0xa2, 0xdc, - 0x8e, 0x11, 0x88, 0xf4, 0x0c, 0x51, 0x28, 0xa6, 0x83, 0xae, 0x22, 0x76, 0x2f, 0x83, 0xf5, 0xf7, - 0x69, 0x00, 0x8c, 0xa7, 0xa1, 0xc5, 0xfd, 0x28, 0xfa, 0x23, 0x08, 0xc9, 0x75, 0x1a, 0x24, 0x53, - 0x2b, 0xc5, 0x25, 0x90, 0xf8, 0x36, 0x94, 0x17, 0xc5, 0x25, 0x1c, 0x39, 0x93, 0x20, 0xef, 0xc2, - 0xba, 0xe1, 0xe9, 0xd4, 0x76, 0x4b, 0xb5, 0xcb, 0xc6, 0xe6, 0x5a, 0xb2, 0x90, 0xca, 0x2d, 0xcc, - 0xd4, 0x12, 0x9e, 0x08, 0x67, 0xcf, 0x25, 0xfc, 0x01, 0x05, 0xa0, 0xac, 0x17, 0x0c, 0x9a, 0x3b, - 0x17, 0xf4, 0x0e, 0x6c, 0x9a, 0x2f, 0x7c, 0x3d, 0x0e, 0x9e, 0x3f, 0x17, 0x9c, 0xdc, 0xd5, 0x79, - 0x6a, 0x61, 0x5c, 0x7b, 0xd8, 0x1e, 0xb0, 0x77, 0xe6, 0xd4, 0x43, 0xd8, 0x68, 0x06, 0xf8, 0x8d, - 0x01, 0xf7, 0xe7, 0x1f, 0xc6, 0xb4, 0xfe, 0x76, 0x48, 0x69, 0x09, 0x90, 0x15, 0x8f, 0x44, 0x03, - 0xfe, 0x41, 0xc7, 0x5e, 0x54, 0x1b, 0x50, 0xdc, 0x37, 0x87, 0x92, 0xdc, 0x7f, 0xc6, 0xc8, 0xbd, - 0x11, 0xad, 0x03, 0xc3, 0x08, 0x21, 0xcc, 0xbe, 0x98, 0x17, 0xe6, 0xc2, 0x15, 0x32, 0xaa, 0x06, - 0x1b, 0xa8, 0x3f, 0xd7, 0x74, 0xb0, 0x80, 0x4a, 0x42, 0x34, 0xd4, 0x79, 0xb3, 0x30, 0x3b, 0xd3, - 0x4b, 0x23, 0x12, 0xd0, 0x73, 0xcf, 0x44, 0x5b, 0x8c, 0x7c, 0x0c, 0x5d, 0xcf, 0x97, 0x23, 0xce, - 0x4f, 0x58, 0x63, 0x04, 0xba, 0x17, 0x76, 0xca, 0xc6, 0x20, 0x32, 0x88, 0x2e, 0x77, 0xca, 0x92, - 0xd9, 0x47, 0x50, 0x0c, 0xcb, 0xb6, 0x70, 0x83, 0xeb, 0xe7, 0x6a, 0x02, 0x5b, 0x88, 0xcc, 0x14, - 0x6b, 0x61, 0x66, 0xb9, 0x4d, 0x0f, 0xb5, 0x70, 0x87, 0xc6, 0x69, 0x8a, 0x67, 0xda, 0x90, 0x34, - 0xff, 0xf5, 0x98, 0xaf, 0xc4, 0xf6, 0x7a, 0x8f, 0x3a, 0xed, 0x88, 0x69, 0xa5, 0x17, 0x9c, 0x2f, - 0x82, 0x3a, 0x86, 0xe2, 0xe2, 0x94, 0x62, 0x11, 0x56, 0x22, 0x71, 0xdc, 0x06, 0x18, 0x2c, 0x62, - 0x61, 0xf5, 0x18, 0x25, 0x12, 0x27, 0x2a, 0xac, 0x09, 0xe5, 0x78, 0x72, 0x2f, 0x91, 0xb2, 0x2d, - 0xd5, 0xa8, 0xfe, 0x0f, 0xe6, 0x28, 0x31, 0x3d, 0xc4, 0xb9, 0xdc, 0xc2, 0x09, 0x38, 0x3c, 0x8c, - 0x10, 0xa3, 0x68, 0xe2, 0x11, 0xca, 0x1f, 0x53, 0x50, 0x5d, 0x99, 0x13, 0xd4, 0x98, 0x97, 0x6c, - 0x2f, 0x8f, 0x07, 0xec, 0x22, 0xaf, 0x73, 0xae, 0x4b, 0x39, 0x8b, 0x28, 0x58, 0x89, 0x39, 0x4b, - 0xec, 0xe3, 0x26, 0xac, 0x0d, 0xcd, 0x91, 0x41, 0x41, 0x91, 0x7b, 0x89, 0x4f, 0xa8, 0x75, 0x80, - 0x7d, 0xd7, 0x0f, 0x5a, 0x16, 0xe4, 0x33, 0x34, 0x7c, 0x43, 0x1e, 0xf1, 0xde, 0x83, 0x42, 0xaf, - 0xfb, 0xa4, 0xcd, 0x33, 0x4b, 0xe4, 0x9c, 0x2d, 0x95, 0x54, 0x28, 0x44, 0xb2, 0xfb, 0x6b, 0x1a, - 0x8a, 0x84, 0x22, 0xea, 0x6e, 0x58, 0xeb, 0x52, 0x7c, 0x68, 0x11, 0xad, 0x75, 0x1c, 0x11, 0x34, - 0x03, 0x60, 0x17, 0x9b, 0x09, 0x4e, 0x09, 0xb0, 0x01, 0xc3, 0x0e, 0x5b, 0xb7, 0x9c, 0x67, 0x9f, - 0xb1, 0x3b, 0x55, 0xe2, 0x8b, 0x0f, 0xe4, 0x58, 0x43, 0xc3, 0xb6, 0xc8, 0x7c, 0x0c, 0x99, 0x5f, - 0x5d, 0x7c, 0x20, 0x27, 0x1b, 0x94, 0x00, 0x4b, 0x92, 0x85, 0xb5, 0xb9, 0x10, 0x44, 0x54, 0xd0, - 0xe4, 0x09, 0xdc, 0x22, 0x8b, 0xb1, 0xb4, 0xfc, 0x80, 0xfb, 0xe0, 0x8c, 0xe8, 0x69, 0x09, 0x5b, - 0x9f, 0x61, 0x39, 0x1f, 0x9d, 0x71, 0x0b, 0x9c, 0xe1, 0xf4, 0x60, 0x0c, 0x4e, 0x69, 0x86, 0xa0, - 0xe4, 0x54, 0xe6, 0x45, 0xac, 0xa7, 0x8b, 0x45, 0x3e, 0x2e, 0xe7, 0x06, 0x98, 0x81, 0xa9, 0x5d, - 0xb6, 0x47, 0x3a, 0x2b, 0x76, 0x9d, 0x17, 0x31, 0x2f, 0x98, 0x74, 0xfd, 0xc0, 0x1d, 0x6f, 0x86, - 0x2a, 0xb4, 0xe4, 0x83, 0x3d, 0x3b, 0xd6, 0xed, 0x6a, 0x80, 0xc9, 0x0c, 0xe4, 0xe2, 0x26, 0xa7, - 0x90, 0x3d, 0xc8, 0x92, 0x7e, 0x17, 0x47, 0x02, 0x2b, 0x69, 0x7f, 0x61, 0x30, 0x35, 0xde, 0xa8, - 0x6d, 0xc5, 0x41, 0x44, 0x9b, 0x36, 0x82, 0x4c, 0xaf, 0xd3, 0x20, 0x2b, 0x18, 0x9e, 0xcc, 0x41, - 0x34, 0x4b, 0xb0, 0x1a, 0xb1, 0x02, 0xc8, 0x34, 0x84, 0x4a, 0xc4, 0xf2, 0x4b, 0xcf, 0x99, 0xe0, - 0x59, 0xd6, 0x70, 0x31, 0x76, 0x9e, 0x7b, 0x3c, 0x11, 0xc8, 0xa2, 0xfe, 0x19, 0x27, 0x2a, 0x64, - 0xd4, 0xe3, 0x24, 0xad, 0x7c, 0x46, 0x69, 0xce, 0xf0, 0x16, 0xd9, 0xea, 0xfd, 0x08, 0x46, 0x00, - 0x74, 0xf7, 0x78, 0x71, 0x74, 0xd5, 0x63, 0xd8, 0xd5, 0x83, 0x5e, 0x94, 0x94, 0x3c, 0x09, 0x37, - 0x39, 0x75, 0xe4, 0xa9, 0x18, 0x8d, 0x0e, 0x1e, 0xd7, 0x23, 0x3a, 0x38, 0x63, 0xf1, 0x78, 0xf4, - 0xb4, 0x5d, 0x6b, 0x8c, 0x03, 0xc5, 0x62, 0x2e, 0x0e, 0x77, 0x20, 0x66, 0xe2, 0x2f, 0x00, 0xa8, - 0x4d, 0x8b, 0x14, 0x91, 0x0b, 0x48, 0xc5, 0x7b, 0x41, 0xcc, 0x99, 0xf9, 0x3c, 0xc0, 0x2c, 0x5c, - 0x02, 0xf3, 0x4d, 0xc8, 0xba, 0xb6, 0x41, 0xf3, 0x59, 0x26, 0x7e, 0xbe, 0x8c, 0x38, 0xea, 0x13, - 0xa8, 0xae, 0x28, 0x00, 0x82, 0xc1, 0xa1, 0x7a, 0x05, 0xe3, 0xb4, 0xf0, 0x5d, 0xbb, 0xff, 0xb8, - 0xd5, 0x6b, 0x7c, 0x57, 0x4d, 0xa1, 0x3b, 0x15, 0xbb, 0x9a, 0xd6, 0xd3, 0x5b, 0x9d, 0xef, 0x0e, - 0xaa, 0x69, 0xdc, 0x1d, 0xf4, 0xb4, 0x63, 0x1c, 0x21, 0x18, 0x38, 0xa3, 0x36, 0xe3, 0xc4, 0x98, - 0x7b, 0x01, 0xb2, 0x07, 0x9d, 0x03, 0x22, 0x85, 0xc8, 0x38, 0xa5, 0xe8, 0x0f, 0x3b, 0x47, 0x07, - 0x2d, 0xa4, 0x55, 0x84, 0x1c, 0xa3, 0x22, 0x9d, 0x12, 0xac, 0xb5, 0x0f, 0xc4, 0x03, 0xd5, 0xae, - 0xcc, 0xb1, 0x3b, 0x5a, 0x4a, 0x8f, 0xe8, 0x38, 0xae, 0x98, 0x9a, 0x59, 0xcd, 0xf2, 0x50, 0xc4, - 0x15, 0xbd, 0x15, 0x2f, 0xc9, 0xa3, 0x15, 0xd7, 0xe7, 0x44, 0x55, 0x56, 0xbf, 0x86, 0xbc, 0x38, - 0xf5, 0x5c, 0x76, 0x3a, 0xae, 0x62, 0x8b, 0x21, 0x9c, 0xd3, 0x0b, 0x75, 0x69, 0xe6, 0x4c, 0x5f, - 0x9c, 0xe6, 0xe7, 0x76, 0x9a, 0x98, 0x90, 0x82, 0x94, 0x88, 0xea, 0x78, 0xb4, 0xd7, 0xd9, 0x6d, - 0xec, 0xe1, 0x1e, 0x50, 0xe8, 0xbd, 0x4e, 0x13, 0x7f, 0xa6, 0x68, 0xb9, 0xd1, 0xfa, 0x46, 0x6f, - 0x1f, 0x88, 0x0d, 0xd0, 0xef, 0xce, 0x51, 0xbf, 0x9a, 0xa1, 0x1b, 0x88, 0xe3, 0xde, 0xc3, 0x6a, - 0x76, 0xe7, 0xff, 0xa1, 0x18, 0x9e, 0xce, 0xe2, 0x6a, 0xa3, 0xd5, 0x42, 0x12, 0xf8, 0xa3, 0xa5, - 0x11, 0x01, 0x44, 0xc2, 0x1f, 0x7a, 0x63, 0x6f, 0x4f, 0x50, 0xe8, 0x69, 0xdd, 0xbd, 0x46, 0x13, - 0xf5, 0x48, 0xa4, 0xb5, 0x83, 0xc6, 0xee, 0x9e, 0x56, 0xcd, 0x32, 0x54, 0xfb, 0x90, 0x1f, 0x72, - 0xc4, 0x1e, 0xc7, 0x33, 0xad, 0x5f, 0xcd, 0x93, 0x36, 0x0f, 0x3b, 0x0f, 0xfb, 0xe2, 0x71, 0x6d, - 0x47, 0xa7, 0x43, 0xce, 0xb0, 0x11, 0x45, 0x0a, 0x5d, 0x9c, 0xe5, 0xda, 0xdf, 0x0b, 0x13, 0x1e, - 0x68, 0xed, 0x47, 0x8f, 0x77, 0x3b, 0x3d, 0xe4, 0x8a, 0xec, 0xfb, 0x8d, 0x47, 0x52, 0xe6, 0x43, - 0xbd, 0xdb, 0xe8, 0x3f, 0xae, 0x52, 0x9e, 0x28, 0x36, 0x3b, 0xfb, 0xfb, 0x47, 0x07, 0xed, 0xfe, - 0x0f, 0x55, 0x1a, 0x58, 0x2a, 0xda, 0xf7, 0x7d, 0x3d, 0x5c, 0xca, 0xed, 0x7c, 0x80, 0x5d, 0xc9, - 0xa2, 0xf1, 0xa4, 0xcd, 0x1c, 0xfc, 0x20, 0x36, 0x43, 0xf2, 0xb3, 0x36, 0xd0, 0x84, 0x5a, 0xaf, - 0x5f, 0x4d, 0xef, 0xec, 0x40, 0x75, 0xa5, 0xc5, 0xcc, 0x43, 0x5a, 0xfb, 0x16, 0x11, 0xf0, 0xff, - 0x23, 0x0d, 0xe1, 0xf1, 0x3f, 0xee, 0x28, 0xbd, 0xf3, 0xb1, 0xec, 0xef, 0x65, 0xe5, 0x0e, 0xbd, - 0x85, 0xd4, 0xdb, 0x6c, 0x6a, 0xdd, 0xbe, 0x20, 0xde, 0xd3, 0xbe, 0xd1, 0x9a, 0x44, 0xfc, 0x08, - 0xb6, 0x92, 0x3a, 0x29, 0x94, 0x78, 0x21, 0xad, 0x2e, 0x14, 0xbd, 0x0d, 0xd5, 0x70, 0xa9, 0xa7, - 0xed, 0x77, 0x8e, 0x89, 0xf1, 0x55, 0xd8, 0x8c, 0xae, 0x0a, 0x95, 0xa7, 0x77, 0xee, 0x40, 0x25, - 0xde, 0x51, 0xa1, 0x7a, 0xf6, 0xb5, 0x96, 0xbe, 0xdf, 0x21, 0x52, 0x1b, 0x50, 0xa2, 0x87, 0x00, - 0x3c, 0xb5, 0xf3, 0x11, 0x40, 0xa4, 0xb4, 0xe2, 0x66, 0xd0, 0x0d, 0x58, 0xe6, 0xf6, 0x7e, 0xb7, - 0xd3, 0x93, 0x32, 0x6b, 0xdf, 0xf3, 0xef, 0xf4, 0xfd, 0xbf, 0x6f, 0x42, 0xe1, 0x11, 0x45, 0x5d, - 0xc3, 0xb1, 0x94, 0x2f, 0x61, 0xe3, 0x91, 0xe9, 0x47, 0x8f, 0xfa, 0x95, 0x48, 0xca, 0x5c, 0x1c, - 0xfb, 0xd7, 0x57, 0x8f, 0xef, 0xaf, 0x28, 0x8f, 0xf9, 0x92, 0x29, 0x86, 0xab, 0xc6, 0xee, 0xcb, - 0x12, 0x6f, 0x10, 0xea, 0x1b, 0x4b, 0x97, 0xd5, 0x48, 0xe9, 0xbf, 0xa0, 0x8c, 0x52, 0x04, 0x97, - 0x9d, 0x5e, 0xb2, 0x08, 0xcb, 0x77, 0x98, 0x57, 0xee, 0xa5, 0x30, 0xa7, 0x96, 0x22, 0x88, 0x17, - 0xc4, 0x53, 0xfe, 0x17, 0x15, 0x18, 0xde, 0xad, 0x2a, 0xef, 0xc4, 0x84, 0x5e, 0xb9, 0x72, 0x4d, - 0x12, 0xf8, 0x23, 0x8c, 0x42, 0xd3, 0xef, 0x59, 0x27, 0x4a, 0xe4, 0x25, 0x9f, 0xbf, 0xd7, 0x97, - 0x17, 0x10, 0xfa, 0x63, 0x0c, 0x14, 0x2a, 0x69, 0xc9, 0xf2, 0x25, 0x90, 0xff, 0x14, 0xc3, 0xc9, - 0x1e, 0xf9, 0x97, 0x43, 0xfa, 0x1c, 0x4a, 0x0b, 0xa4, 0xf6, 0xec, 0xc2, 0x68, 0x0f, 0xa0, 0xbc, - 0x40, 0xeb, 0xcc, 0x2f, 0xce, 0xee, 0x3e, 0x14, 0x0e, 0x4f, 0xe7, 0x3e, 0x75, 0x36, 0x17, 0xc6, - 0xb9, 0x87, 0x6e, 0xc8, 0xe7, 0x9b, 0x17, 0xc6, 0xf8, 0x04, 0x13, 0x8e, 0xe5, 0x5d, 0x0a, 0x65, - 0x17, 0x63, 0x45, 0xdc, 0xd0, 0x2b, 0xf5, 0x98, 0x65, 0x63, 0x5f, 0x20, 0xd4, 0xaf, 0xaf, 0xbc, - 0x0b, 0x6e, 0xfc, 0x91, 0xc6, 0xd7, 0x38, 0xfa, 0xca, 0x5b, 0x7e, 0xe5, 0xcd, 0x15, 0x40, 0xef, - 0x65, 0xfc, 0x6f, 0xa7, 0xa8, 0x3a, 0xca, 0x9b, 0xe0, 0x44, 0x0f, 0x49, 0xbe, 0x4b, 0x61, 0x7f, - 0x6e, 0xd1, 0x8d, 0x24, 0x63, 0xee, 0xe2, 0x9b, 0xe6, 0xa9, 0x31, 0x1b, 0x9b, 0xc3, 0xe4, 0x9d, - 0xbf, 0x84, 0xca, 0x57, 0x8b, 0x9b, 0xe8, 0xf0, 0x3c, 0xf7, 0xc2, 0x21, 0xd5, 0xa2, 0x0f, 0x0f, - 0x84, 0xf0, 0x9d, 0x46, 0x58, 0x40, 0x93, 0x09, 0x6c, 0x25, 0xd4, 0x7c, 0xa6, 0xf2, 0x25, 0x07, - 0x08, 0xb6, 0xd8, 0x4a, 0x64, 0x8a, 0x8e, 0xde, 0xfe, 0xd7, 0xb7, 0x63, 0xeb, 0xc1, 0x41, 0x22, - 0xe1, 0x3e, 0x80, 0xbc, 0xf8, 0x54, 0x40, 0x89, 0xdb, 0x28, 0x86, 0x9e, 0xe8, 0xc9, 0x79, 0x71, - 0x49, 0xbf, 0x84, 0x17, 0xbd, 0xb6, 0x4f, 0xf6, 0xe4, 0x35, 0x0a, 0x66, 0xea, 0x2f, 0x5f, 0xa5, - 0x25, 0x02, 0x62, 0x19, 0xbf, 0x60, 0x27, 0x63, 0x9c, 0xb8, 0x93, 0xc5, 0xae, 0xf3, 0xcf, 0x89, - 0x01, 0xe2, 0x86, 0xfd, 0x67, 0x22, 0xb3, 0xa5, 0x8e, 0x88, 0x78, 0x7d, 0xc2, 0xf2, 0x61, 0x1b, - 0xe2, 0xbd, 0x12, 0x85, 0x2e, 0xe9, 0x43, 0x15, 0x52, 0xe7, 0x12, 0x57, 0x45, 0xf4, 0x8b, 0x80, - 0x24, 0xe1, 0xfe, 0x1b, 0x2a, 0xc8, 0x2a, 0x72, 0xd0, 0x94, 0x78, 0x45, 0x5f, 0x4f, 0xbe, 0xb8, - 0xa7, 0xc4, 0xba, 0x1e, 0x43, 0xf7, 0x2e, 0x87, 0xcf, 0xde, 0x57, 0x89, 0x7d, 0x61, 0xa0, 0xdc, - 0x88, 0xc9, 0x9f, 0xf0, 0xe9, 0x41, 0xd2, 0x36, 0xbe, 0xe4, 0x7a, 0x12, 0xce, 0xd0, 0x49, 0xb3, - 0x6b, 0x3d, 0x71, 0xa0, 0x0d, 0x54, 0xb0, 0x58, 0xf1, 0x2e, 0x83, 0x8c, 0x1b, 0xd8, 0x85, 0x72, - 0xf4, 0xeb, 0x05, 0xe5, 0xdd, 0x98, 0xfc, 0xab, 0x5f, 0x35, 0x24, 0x27, 0xbd, 0x22, 0x8a, 0x20, - 0x27, 0xda, 0x95, 0x19, 0xb7, 0xbe, 0xb2, 0x22, 0x92, 0x7f, 0x80, 0x82, 0xe3, 0xf1, 0xc5, 0x90, - 0x50, 0xda, 0xaf, 0xb1, 0x8f, 0x0a, 0xbe, 0x30, 0x50, 0xde, 0x8a, 0x27, 0xba, 0xf8, 0x67, 0x11, - 0x49, 0x72, 0x76, 0x60, 0x6b, 0x21, 0x67, 0x64, 0xfe, 0x7f, 0xc9, 0x85, 0x60, 0xfd, 0x65, 0x97, - 0x85, 0x57, 0x94, 0x2e, 0x6c, 0x25, 0x7c, 0xf0, 0xa0, 0xdc, 0x4c, 0x12, 0x6c, 0xf5, 0x7b, 0x88, - 0x04, 0x11, 0x4f, 0xf2, 0xfc, 0x05, 0xdd, 0xa7, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x21, - 0x2f, 0xae, 0x50, 0x27, 0x00, 0x00, + 0x33, 0xfd, 0x1f, 0xdd, 0x74, 0x91, 0x99, 0xfe, 0x82, 0x2e, 0x7b, 0xce, 0xb9, 0x17, 0x04, 0x40, + 0x42, 0xb6, 0xe4, 0x74, 0xba, 0x91, 0x88, 0x8b, 0xf3, 0x75, 0xcf, 0xf7, 0xb9, 0x17, 0x50, 0x19, + 0x3b, 0x27, 0x63, 0xf7, 0xae, 0xeb, 0x39, 0x81, 0xa3, 0x94, 0xf8, 0xc1, 0x70, 0x2d, 0xd5, 0x80, + 0x82, 0xe6, 0x79, 0x8e, 0xa7, 0xdc, 0x82, 0xfc, 0xc0, 0x19, 0x9a, 0x5b, 0x99, 0x1b, 0x99, 0xdb, + 0xab, 0xf7, 0xaf, 0xdf, 0x0d, 0x21, 0xee, 0xf2, 0x6b, 0xf1, 0xb7, 0x89, 0x00, 0x4a, 0x05, 0x72, + 0x53, 0x7f, 0xbc, 0x95, 0x45, 0xb8, 0xb2, 0xaa, 0x42, 0x39, 0xfe, 0x66, 0xe5, 0xf0, 0xa8, 0xd9, + 0xd4, 0x0e, 0x0f, 0xeb, 0x57, 0x94, 0x12, 0xe4, 0x1f, 0x36, 0xda, 0x7b, 0xf5, 0x8c, 0xda, 0x81, + 0x72, 0xc3, 0x1b, 0xcf, 0xa6, 0xa6, 0x1d, 0xf8, 0xca, 0xfb, 0x50, 0xf2, 0x4c, 0xdf, 0x99, 0x79, + 0x83, 0x90, 0x95, 0x12, 0xb1, 0xea, 0xc9, 0x37, 0xca, 0x2a, 0x14, 0x47, 0xc6, 0xd4, 0x9a, 0x9c, + 0x31, 0x9b, 0x9a, 0x52, 0x85, 0xbc, 0x6d, 0x4c, 0xcd, 0xad, 0x1c, 0x33, 0xfd, 0x43, 0x06, 0xea, + 0xfb, 0xce, 0xb0, 0x6b, 0x04, 0xa7, 0x11, 0xe1, 0x9b, 0x50, 0x76, 0x5c, 0xd3, 0x33, 0x02, 0xcb, + 0xb1, 0x25, 0xe5, 0x8d, 0x88, 0x72, 0x27, 0x7c, 0x95, 0x10, 0x20, 0x7b, 0xae, 0x00, 0x09, 0x86, + 0xca, 0x5b, 0x90, 0x77, 0x91, 0xd9, 0x56, 0x1e, 0x9f, 0x2a, 0xf7, 0x57, 0x23, 0x78, 0x12, 0x81, + 0x60, 0x67, 0x33, 0x6b, 0xb8, 0x55, 0xc0, 0xb7, 0xd5, 0x98, 0xe8, 0x45, 0x12, 0x5d, 0x7d, 0x17, + 0xd6, 0xa4, 0xac, 0x48, 0xdc, 0x75, 0x6c, 0xdf, 0x9c, 0x23, 0x90, 0x94, 0x55, 0x75, 0x04, 0xeb, + 0x12, 0xc0, 0xbf, 0xac, 0x9a, 0x42, 0x29, 0xd9, 0x16, 0xca, 0xdb, 0x50, 0x20, 0x29, 0x7d, 0x14, + 0x3a, 0xb7, 0x2c, 0xa6, 0xfa, 0x7f, 0xb0, 0x89, 0x7c, 0x0e, 0x4c, 0x6b, 0x7c, 0x7a, 0xe2, 0x78, + 0x97, 0x57, 0x1c, 0x29, 0xc1, 0x34, 0x3d, 0x66, 0x96, 0xa4, 0x8e, 0xab, 0xaa, 0x0b, 0xd5, 0x7d, + 0x2f, 0xf8, 0xb9, 0x76, 0xae, 0x43, 0xc9, 0xb2, 0x03, 0xd3, 0x7b, 0x66, 0x4c, 0x58, 0xf5, 0x79, + 0x65, 0x0b, 0xea, 0xb6, 0x14, 0x59, 0x37, 0x86, 0x43, 0xa4, 0xe9, 0xb3, 0x19, 0xca, 0xea, 0x13, + 0x56, 0x6c, 0x82, 0xe9, 0x45, 0xb7, 0x82, 0x6c, 0x46, 0xd6, 0xc4, 0x8c, 0x74, 0xa7, 0xfe, 0x25, + 0xc3, 0xd4, 0x76, 0xa7, 0xee, 0xe5, 0xa9, 0xad, 0xc1, 0x4a, 0x28, 0x99, 0x30, 0x04, 0x9a, 0xc5, + 0x75, 0xbc, 0x80, 0x77, 0x50, 0x53, 0xbe, 0x80, 0x7c, 0x70, 0xe6, 0x9a, 0x2c, 0xf5, 0xea, 0xfd, + 0x9d, 0x88, 0xc2, 0x02, 0x3f, 0x7c, 0xb6, 0xad, 0xc0, 0xf1, 0x2c, 0x7b, 0xdc, 0x75, 0x26, 0xd6, + 0xe0, 0x4c, 0xfd, 0x98, 0xdc, 0x3c, 0xb9, 0xa6, 0xac, 0x40, 0xae, 0xdb, 0xd3, 0x44, 0x7c, 0x75, + 0x3b, 0x87, 0xfd, 0x7a, 0x86, 0x7e, 0xed, 0x76, 0xfa, 0x8f, 0xeb, 0x59, 0xf5, 0x07, 0x8e, 0x8b, + 0x9e, 0xfb, 0xd4, 0xfa, 0x57, 0xef, 0x42, 0x3d, 0x62, 0xfd, 0x1c, 0x7b, 0xa3, 0xcb, 0x53, 0xde, + 0x86, 0xdc, 0x33, 0x6f, 0x24, 0xfd, 0xa6, 0x16, 0x41, 0x20, 0x31, 0x75, 0x00, 0xd7, 0x90, 0x6c, + 0xcb, 0x1c, 0x59, 0xb6, 0x39, 0x3c, 0x34, 0x5f, 0xc3, 0x96, 0xef, 0x41, 0xce, 0x37, 0x03, 0x49, + 0x7d, 0x33, 0x82, 0x88, 0x68, 0xaa, 0x63, 0xb8, 0x8a, 0x4c, 0x0e, 0x03, 0x23, 0x30, 0x89, 0xf6, + 0xe5, 0x79, 0x20, 0x9c, 0x1f, 0x62, 0x4b, 0x4e, 0x31, 0xb8, 0x39, 0x61, 0xf5, 0x37, 0x19, 0x50, + 0x28, 0x96, 0xd9, 0x54, 0x97, 0x67, 0x73, 0x03, 0x8a, 0x2e, 0xa3, 0x4a, 0x1e, 0xf5, 0x58, 0x8c, + 0x09, 0xeb, 0xbf, 0x07, 0xd7, 0x3d, 0x73, 0x64, 0x7a, 0xba, 0xf9, 0xc2, 0xf2, 0x03, 0xf4, 0x0a, + 0x7d, 0x2e, 0x97, 0xcf, 0x86, 0x2a, 0x29, 0x6f, 0xc2, 0x86, 0x8b, 0x56, 0xc4, 0x18, 0x32, 0xe3, + 0x2f, 0xc9, 0xfb, 0x4a, 0xea, 0x33, 0x78, 0x2b, 0x92, 0xcf, 0xf7, 0xad, 0xb1, 0xfd, 0x7a, 0x0a, + 0xb9, 0x0b, 0x60, 0xcc, 0xd1, 0xa5, 0xb4, 0xdb, 0x8b, 0xd2, 0x46, 0x0c, 0xd4, 0x21, 0x6c, 0x21, + 0xdf, 0x47, 0x13, 0xe7, 0xc4, 0x98, 0x34, 0x1d, 0x7b, 0x64, 0x8d, 0x5f, 0x4b, 0x3b, 0x63, 0x26, + 0xb0, 0xac, 0x1d, 0x41, 0x58, 0xfd, 0x47, 0x06, 0x63, 0x42, 0x66, 0x64, 0x7b, 0xe2, 0x59, 0x22, + 0xc1, 0x52, 0x92, 0xc1, 0xbc, 0x18, 0x78, 0xe4, 0xd8, 0x39, 0x7c, 0xc6, 0x02, 0x66, 0x8c, 0x45, + 0x6a, 0xcf, 0x11, 0xe8, 0x89, 0xe9, 0x07, 0x42, 0x3f, 0xca, 0x06, 0x54, 0x2c, 0x5f, 0x7f, 0x6e, + 0x05, 0xa7, 0x43, 0xcf, 0x78, 0xce, 0x19, 0xbd, 0xa4, 0x28, 0x00, 0x98, 0x8f, 0xac, 0xa1, 0x90, + 0x90, 0xb2, 0x7a, 0x01, 0x93, 0xe1, 0xa6, 0xed, 0xe8, 0xd6, 0xd4, 0xc5, 0x8d, 0x5a, 0x41, 0x84, + 0xb1, 0xc2, 0x18, 0x51, 0x5a, 0x2b, 0x71, 0x0a, 0x40, 0x0a, 0x22, 0xe1, 0xe9, 0x86, 0x6f, 0x6f, + 0x95, 0x79, 0x6d, 0x1d, 0x7d, 0x4a, 0xac, 0x61, 0x25, 0x00, 0x8e, 0x38, 0x91, 0x96, 0x30, 0xfd, + 0x99, 0xc3, 0xad, 0x0a, 0x13, 0xaa, 0x41, 0x01, 0x6d, 0x38, 0x31, 0xb7, 0xaa, 0xfc, 0x88, 0xc9, + 0x10, 0xc5, 0x1b, 0x79, 0xce, 0x14, 0x1d, 0x00, 0xe1, 0x6c, 0x54, 0x46, 0x8d, 0x0d, 0x7b, 0x04, + 0x95, 0x96, 0x49, 0x1e, 0x21, 0x74, 0x45, 0x5b, 0x46, 0x47, 0xb1, 0x5e, 0xb0, 0x0a, 0x62, 0xa5, + 0x21, 0x9b, 0x56, 0x1a, 0x94, 0x37, 0x60, 0x6d, 0xe2, 0xd8, 0x63, 0xf4, 0x2b, 0x81, 0x65, 0x4a, + 0x67, 0x52, 0x7f, 0x95, 0x81, 0x42, 0xdf, 0x38, 0x99, 0x98, 0xa8, 0x7d, 0x91, 0xc5, 0x2e, 0x5a, + 0x8c, 0x22, 0x15, 0x88, 0x2c, 0xf8, 0x21, 0x54, 0x87, 0x91, 0x80, 0xe4, 0x8f, 0x24, 0xc8, 0xd5, + 0x78, 0xbc, 0x46, 0xe2, 0xa3, 0x19, 0x5c, 0xc7, 0x0f, 0x74, 0x19, 0x0d, 0x6c, 0x06, 0xf5, 0x6f, + 0x59, 0xb4, 0x2e, 0x96, 0x1a, 0x56, 0x13, 0x91, 0xb6, 0x4c, 0xb1, 0x1f, 0x26, 0x6e, 0xb8, 0xee, + 0xe4, 0x2c, 0x44, 0xc8, 0xb1, 0x83, 0xc4, 0x88, 0x37, 0xe8, 0xad, 0x8c, 0xa1, 0x1b, 0xd4, 0xe8, + 0xd8, 0x23, 0xa6, 0x5a, 0x89, 0xef, 0x84, 0x88, 0x93, 0x73, 0x2a, 0x77, 0xa0, 0x66, 0xe2, 0x9a, + 0x3e, 0x9d, 0x4d, 0x02, 0xeb, 0xd4, 0x71, 0xd9, 0xe6, 0x95, 0xfb, 0xd7, 0x62, 0x3d, 0x11, 0xfe, + 0xdf, 0x97, 0x6f, 0x95, 0x4f, 0x60, 0xcd, 0x73, 0x66, 0x81, 0xa9, 0xa3, 0xee, 0x26, 0xe6, 0x00, + 0xd3, 0x35, 0xdb, 0xb3, 0x72, 0x7f, 0x2b, 0xa6, 0x25, 0x02, 0xe8, 0x85, 0xef, 0x31, 0x8e, 0xf3, + 0x96, 0x3d, 0x72, 0xd8, 0xca, 0x89, 0x5c, 0x42, 0x32, 0x70, 0x3e, 0x21, 0x77, 0x0f, 0xac, 0xa9, + 0x89, 0x5e, 0x5b, 0x5d, 0x74, 0xf7, 0x3e, 0xaf, 0x53, 0xe0, 0x04, 0x9e, 0x61, 0xfb, 0x9c, 0xa5, + 0x6b, 0x8b, 0x94, 0xfa, 0xe1, 0x2b, 0xd2, 0x8e, 0x90, 0x8f, 0x93, 0x82, 0xb7, 0xb5, 0xb6, 0xa8, + 0x1d, 0x16, 0xee, 0x90, 0x5f, 0xaa, 0xbf, 0xcb, 0x40, 0x25, 0xae, 0xad, 0x3b, 0x50, 0xb6, 0xec, + 0x50, 0xaf, 0x99, 0x57, 0x05, 0x3a, 0xea, 0xa2, 0x66, 0xbe, 0x20, 0xae, 0x7a, 0x22, 0x93, 0xbd, + 0x02, 0x05, 0xe3, 0x28, 0x86, 0x92, 0x7b, 0x65, 0x3a, 0xf9, 0x75, 0x16, 0x4a, 0x73, 0x6b, 0x5d, + 0x85, 0x9a, 0x31, 0x0b, 0x4e, 0x75, 0x17, 0x33, 0xd2, 0x73, 0xc7, 0x1b, 0x4a, 0x97, 0x47, 0x1f, + 0x42, 0x87, 0x1b, 0x78, 0x96, 0xcb, 0x61, 0x9b, 0x0d, 0x23, 0x6c, 0xe2, 0x0c, 0x8c, 0x09, 0xc6, + 0xa1, 0xf4, 0xcb, 0x73, 0xfb, 0x0b, 0x2a, 0x88, 0xd4, 0xef, 0x10, 0x68, 0x21, 0x8c, 0x62, 0x5e, + 0x18, 0xa3, 0x36, 0x85, 0x4f, 0x94, 0x29, 0x8a, 0x79, 0x8d, 0x63, 0x63, 0x85, 0xc1, 0xae, 0xc3, + 0xba, 0x67, 0x4e, 0x1d, 0x4c, 0xbf, 0xae, 0x67, 0x3d, 0x43, 0x53, 0x12, 0x05, 0x91, 0x07, 0xb6, + 0x41, 0x11, 0x96, 0x18, 0x4d, 0x0c, 0x57, 0x1f, 0x1a, 0x53, 0x17, 0x53, 0x38, 0xe7, 0x83, 0x92, + 0x72, 0x0d, 0x56, 0x7d, 0xd3, 0x1e, 0xea, 0x03, 0x67, 0x3a, 0x9d, 0x61, 0xd1, 0x3f, 0x63, 0x27, + 0x62, 0xae, 0x44, 0x0e, 0x91, 0x06, 0x86, 0x8b, 0x0e, 0x43, 0x19, 0x0c, 0xb9, 0x8a, 0x6d, 0xd0, + 0x52, 0x95, 0x97, 0x00, 0xb2, 0x98, 0x47, 0x6a, 0xdc, 0xcc, 0x7c, 0x0e, 0xd5, 0x84, 0x83, 0xe2, + 0x4e, 0xb0, 0xd7, 0xc1, 0x28, 0x16, 0xba, 0x29, 0x29, 0x9b, 0x50, 0x0d, 0x7d, 0x5b, 0x0f, 0x02, + 0x91, 0x50, 0x6b, 0x6a, 0x1f, 0x56, 0x17, 0xdc, 0xf4, 0x1d, 0xb8, 0xb6, 0xe0, 0xd9, 0xfa, 0x00, + 0xc3, 0x0e, 0x53, 0xbe, 0xa0, 0xa3, 0xc2, 0xf6, 0xf2, 0xfb, 0x99, 0x8f, 0x99, 0x89, 0x92, 0x9a, + 0xa0, 0xfa, 0x53, 0x0e, 0xca, 0x91, 0x57, 0xff, 0x3c, 0x63, 0x61, 0x53, 0x39, 0x45, 0x03, 0x61, + 0xf6, 0xf6, 0x65, 0x2f, 0x1e, 0x0b, 0xdf, 0x7d, 0xf9, 0x26, 0xd5, 0xa4, 0x85, 0x45, 0x93, 0x16, + 0x53, 0x4c, 0xba, 0xb2, 0x6c, 0x52, 0x61, 0x37, 0x8c, 0xc5, 0x1f, 0x67, 0xe6, 0x0c, 0xb9, 0x96, + 0x17, 0x63, 0xf1, 0x5b, 0x5e, 0x4f, 0x37, 0x3a, 0xbc, 0xc4, 0xe8, 0x95, 0x73, 0x8c, 0x5e, 0x65, + 0x1c, 0x54, 0x93, 0x8f, 0x62, 0xa3, 0x2e, 0x44, 0x0d, 0x67, 0xc3, 0xd6, 0xc8, 0x1e, 0xfe, 0xcc, + 0xa5, 0x58, 0x31, 0x87, 0x64, 0x7b, 0xe3, 0x04, 0xb3, 0x60, 0x40, 0x79, 0x70, 0x15, 0x9d, 0x80, + 0x45, 0xa7, 0xbc, 0x25, 0x50, 0xd6, 0x42, 0xcd, 0x1a, 0xc3, 0xa9, 0x15, 0xd2, 0xa9, 0x87, 0x9a, + 0xf5, 0xcc, 0x81, 0x69, 0x3d, 0x43, 0x8f, 0x58, 0x0f, 0x1b, 0x6f, 0x63, 0x30, 0x30, 0x5d, 0x24, + 0xbc, 0xa5, 0x84, 0xaa, 0x31, 0x86, 0x98, 0x11, 0x02, 0xcb, 0xc7, 0xb5, 0x0d, 0x5e, 0xc3, 0x72, + 0x84, 0x3b, 0xd1, 0x7f, 0xdc, 0xda, 0x0c, 0x1f, 0x47, 0x13, 0xc7, 0xf5, 0xb7, 0xae, 0xb2, 0xa5, + 0xbb, 0x50, 0x9a, 0xdb, 0xe0, 0x3f, 0x62, 0x1c, 0x44, 0xd6, 0x58, 0x5f, 0xb2, 0x94, 0xf2, 0x2e, + 0xe4, 0xfd, 0xa8, 0x7f, 0x58, 0x06, 0x50, 0x7f, 0x99, 0x81, 0x95, 0x10, 0x18, 0x7d, 0xf6, 0xa0, + 0xd3, 0x6f, 0x3f, 0x6c, 0x37, 0x1b, 0xfd, 0x76, 0xe7, 0x80, 0xa9, 0xe6, 0xa9, 0xcc, 0x1c, 0x75, + 0x5b, 0x8d, 0xbe, 0xc6, 0x44, 0xf2, 0x54, 0x84, 0x3a, 0x5d, 0xed, 0x40, 0x0e, 0x0f, 0xa8, 0x8f, + 0x27, 0x9a, 0xd6, 0x6d, 0xec, 0xb5, 0x8f, 0x35, 0x76, 0x98, 0x3c, 0xb9, 0x40, 0x4f, 0x7b, 0xd8, + 0xd3, 0x0e, 0x1f, 0xb3, 0x4f, 0x30, 0x4c, 0xab, 0x7d, 0xd8, 0x6c, 0xf4, 0x5a, 0x5a, 0x8b, 0xbd, + 0x22, 0x4f, 0xfb, 0xea, 0x77, 0xfa, 0x8d, 0x3d, 0x76, 0x88, 0xbc, 0x7a, 0x0b, 0x8a, 0xd2, 0xca, + 0xf8, 0xc2, 0xb2, 0xdd, 0x99, 0x70, 0xff, 0x1a, 0x31, 0x47, 0x75, 0xd0, 0xb3, 0x70, 0xf5, 0x63, + 0x28, 0xce, 0x53, 0x73, 0x71, 0xc0, 0x6d, 0x8e, 0xdc, 0xfc, 0xb5, 0xc5, 0xe4, 0x2d, 0x9a, 0x20, + 0x74, 0xe8, 0x82, 0xb0, 0x4b, 0x76, 0x31, 0x27, 0x0b, 0x30, 0x0e, 0x1a, 0xf5, 0x17, 0x50, 0x4d, + 0x60, 0xa1, 0x77, 0x20, 0x75, 0x1b, 0x03, 0x0e, 0x03, 0x2f, 0xf0, 0xce, 0xa4, 0x2e, 0x70, 0x27, + 0xa7, 0xce, 0x64, 0xa8, 0x53, 0xd9, 0x90, 0xea, 0x40, 0xdf, 0x7b, 0x6a, 0x9a, 0x2e, 0x76, 0x2f, + 0xe8, 0x99, 0x0b, 0x93, 0xd5, 0x4d, 0x78, 0x07, 0xfd, 0xc2, 0x9a, 0xce, 0xa6, 0xfa, 0xdc, 0xd0, + 0x94, 0x5d, 0x23, 0x38, 0xd6, 0x98, 0xfa, 0x27, 0xac, 0x08, 0x31, 0x69, 0xfe, 0xbd, 0xdc, 0xb9, + 0xd1, 0x32, 0xc7, 0x4e, 0x60, 0x19, 0xe4, 0xf3, 0x11, 0x87, 0x42, 0x68, 0xfe, 0x99, 0xcb, 0xcf, + 0xc2, 0x72, 0xe8, 0xc6, 0x43, 0xe7, 0xb9, 0xcd, 0x2b, 0xc2, 0x78, 0xbf, 0xcd, 0x40, 0x39, 0x2a, + 0x85, 0x28, 0xbb, 0x4c, 0x29, 0x32, 0x2f, 0x88, 0xf4, 0x83, 0xbe, 0x2e, 0x96, 0xb9, 0x94, 0x66, + 0xc3, 0x10, 0x9c, 0x06, 0x33, 0x7d, 0x68, 0xf9, 0x03, 0x0c, 0x6b, 0xef, 0x4c, 0xb6, 0xd7, 0xe8, + 0x86, 0x94, 0xbb, 0x68, 0x47, 0x53, 0x3a, 0x2e, 0xc9, 0x87, 0x71, 0x2c, 0x93, 0x74, 0x32, 0xe1, + 0x60, 0xf4, 0xc9, 0x75, 0xa6, 0x2c, 0x92, 0x0e, 0xba, 0x60, 0x30, 0xc0, 0xee, 0x02, 0xa1, 0xb8, + 0x62, 0xa8, 0x3b, 0x50, 0x89, 0x95, 0x60, 0xea, 0xe0, 0xe3, 0xf5, 0x3a, 0x91, 0x72, 0xd5, 0x7d, + 0x28, 0x76, 0xb9, 0x47, 0x23, 0x85, 0x5b, 0xae, 0x9e, 0x68, 0xf3, 0xb0, 0x8f, 0x9b, 0x1a, 0xfe, + 0x53, 0x1d, 0x47, 0xdb, 0x31, 0x26, 0x59, 0x54, 0xb0, 0xdc, 0xcc, 0xe2, 0x0b, 0xe3, 0x85, 0x1c, + 0xeb, 0x7e, 0x04, 0x88, 0x06, 0x25, 0x8c, 0xda, 0x78, 0x93, 0x77, 0x75, 0x69, 0x98, 0xea, 0xe3, + 0xcb, 0x85, 0x3e, 0x0f, 0x9f, 0x26, 0x38, 0x8a, 0xf0, 0x99, 0x43, 0x19, 0x0b, 0x42, 0x69, 0xde, + 0x41, 0x8a, 0x0e, 0x2f, 0x3e, 0xc3, 0xf0, 0x1b, 0xf5, 0x2b, 0x4c, 0x13, 0x46, 0x30, 0x38, 0x25, + 0x86, 0xef, 0x25, 0x18, 0xc6, 0xba, 0x17, 0x86, 0x58, 0x66, 0xa7, 0x3e, 0x86, 0x6a, 0xc3, 0xa7, + 0x9e, 0x75, 0x8f, 0x77, 0xa2, 0xdc, 0x4e, 0x10, 0x88, 0xf5, 0x0c, 0x71, 0x28, 0xa6, 0x83, 0xae, + 0x22, 0x76, 0x2f, 0x83, 0xf5, 0xf7, 0x59, 0x00, 0x8c, 0xa7, 0xa1, 0xc5, 0xfd, 0x28, 0xfa, 0x23, + 0x08, 0xc9, 0x75, 0x9a, 0x26, 0x33, 0x4b, 0xc5, 0x25, 0x94, 0xf8, 0x36, 0x54, 0xe7, 0xc5, 0x25, + 0x9a, 0x3b, 0xd3, 0x20, 0xef, 0xc2, 0xaa, 0xe1, 0xeb, 0xd4, 0x76, 0x4b, 0xb5, 0xcb, 0xc6, 0xe6, + 0x5a, 0xba, 0x90, 0xca, 0x2d, 0xcc, 0xd4, 0x12, 0x9e, 0x08, 0xe7, 0xcf, 0x25, 0xfc, 0x01, 0x05, + 0xa0, 0xac, 0x17, 0x0c, 0x5a, 0x38, 0x17, 0xf4, 0x0e, 0xac, 0xe3, 0xa0, 0xa0, 0x27, 0xc1, 0x8b, + 0xe7, 0x82, 0x93, 0xbb, 0xba, 0x4f, 0x2d, 0x8c, 0x6b, 0x1f, 0xdb, 0x03, 0xf6, 0xce, 0x82, 0x7a, + 0x08, 0x6b, 0xcd, 0x10, 0xbf, 0x31, 0xe0, 0xfe, 0xfc, 0xc3, 0x84, 0xd6, 0xdf, 0x8e, 0x28, 0x2d, + 0x00, 0xb2, 0xe2, 0x91, 0x68, 0xc8, 0x3f, 0xec, 0xd8, 0xcb, 0x6a, 0x03, 0xca, 0xfb, 0xe6, 0x50, + 0x92, 0xfb, 0xcf, 0x04, 0xb9, 0x37, 0xe2, 0x75, 0x60, 0x18, 0x23, 0x84, 0xd9, 0x17, 0xf3, 0xc2, + 0x4c, 0xb8, 0x42, 0x4e, 0xd5, 0x60, 0x0d, 0xf5, 0xe7, 0x99, 0x2e, 0x16, 0x50, 0x49, 0x88, 0x26, + 0x3b, 0xdf, 0x8e, 0xb2, 0x33, 0xbd, 0x34, 0x62, 0x01, 0x3d, 0xf3, 0x4d, 0xb4, 0xc5, 0x28, 0xc0, + 0xd0, 0xf5, 0x03, 0x39, 0xe2, 0xfc, 0x84, 0x35, 0x46, 0xa0, 0xfb, 0x51, 0xa7, 0x6c, 0x0c, 0x62, + 0xd3, 0xe8, 0x62, 0xa7, 0x2c, 0x99, 0x7d, 0x04, 0xe5, 0xa8, 0x6c, 0x0b, 0x37, 0xb8, 0x7e, 0xae, + 0x26, 0xb0, 0x85, 0xc8, 0x4d, 0xb1, 0x16, 0xe6, 0x16, 0xdb, 0xf4, 0x48, 0x0b, 0x77, 0x68, 0xa6, + 0xa6, 0x78, 0xa6, 0x0d, 0x49, 0xf3, 0x5f, 0x4f, 0xf8, 0x4a, 0x62, 0xaf, 0xf7, 0xa8, 0xd3, 0x8e, + 0x99, 0x56, 0x7a, 0xc1, 0xf9, 0x22, 0xa8, 0x63, 0x28, 0xcf, 0x8f, 0x2a, 0xe6, 0x61, 0x25, 0x12, + 0xc7, 0x6d, 0x80, 0xc1, 0x3c, 0x16, 0x96, 0xcf, 0x52, 0x62, 0x71, 0xa2, 0xc2, 0x8a, 0x50, 0x8e, + 0x2f, 0xf7, 0x12, 0x2b, 0xdb, 0x52, 0x8d, 0xea, 0xff, 0x60, 0x8e, 0x12, 0xd3, 0x43, 0x92, 0xcb, + 0x2d, 0x1c, 0x83, 0xa3, 0x13, 0x09, 0x31, 0x8a, 0xa6, 0x9e, 0xa3, 0xfc, 0x31, 0x03, 0xf5, 0xa5, + 0x39, 0x41, 0x4d, 0x78, 0xc9, 0xe6, 0xe2, 0x78, 0xc0, 0x2e, 0xf2, 0x3a, 0x87, 0xbb, 0x94, 0xb3, + 0x88, 0x82, 0x95, 0x9a, 0xb3, 0xc4, 0x3e, 0x6e, 0xc2, 0xca, 0xd0, 0x1c, 0x19, 0x14, 0x14, 0x85, + 0x97, 0xf8, 0x84, 0xba, 0x0d, 0xb0, 0xef, 0x05, 0x61, 0xcb, 0x82, 0x7c, 0x86, 0x46, 0x60, 0xc8, + 0x73, 0xde, 0x7b, 0x50, 0xea, 0x75, 0x9f, 0xb4, 0x79, 0x66, 0x89, 0x1d, 0xb6, 0x65, 0xd2, 0x0a, + 0x85, 0x48, 0x76, 0x7f, 0xcd, 0x42, 0x99, 0x50, 0x44, 0xdd, 0x8d, 0x6a, 0x5d, 0x86, 0x4f, 0x2e, + 0xe2, 0xb5, 0x8e, 0x23, 0x82, 0x66, 0x00, 0xec, 0x62, 0x73, 0xe1, 0x49, 0x06, 0x36, 0x60, 0xd8, + 0x61, 0xeb, 0x96, 0xfb, 0xec, 0x33, 0x76, 0xa7, 0x5a, 0x72, 0xf1, 0x81, 0x1c, 0x6b, 0x68, 0xd8, + 0x16, 0x99, 0x8f, 0x21, 0x8b, 0xcb, 0x8b, 0x0f, 0xe4, 0x64, 0x83, 0x12, 0x60, 0x49, 0xb2, 0xb0, + 0x36, 0x97, 0xc2, 0x88, 0x0a, 0x9b, 0x3c, 0x81, 0x5b, 0x66, 0x31, 0x16, 0x96, 0x1f, 0x70, 0x1f, + 0x9c, 0x13, 0x3d, 0x2d, 0x61, 0xeb, 0x36, 0x96, 0xf3, 0xd1, 0x19, 0xb7, 0xc0, 0x39, 0x4e, 0x0f, + 0xc6, 0xe0, 0x94, 0x66, 0x08, 0x4a, 0x4e, 0x55, 0x5e, 0xc4, 0x7a, 0x3a, 0x5f, 0xe4, 0x33, 0x73, + 0x6e, 0x80, 0x19, 0x98, 0xda, 0x65, 0x67, 0xa4, 0xb3, 0x62, 0x57, 0x79, 0x11, 0xf3, 0x82, 0x49, + 0x77, 0x10, 0xdc, 0xf1, 0xe6, 0xa8, 0x42, 0x4b, 0x3e, 0xd8, 0xb3, 0x63, 0xdd, 0xae, 0x87, 0x98, + 0xcc, 0x40, 0x2e, 0xae, 0x73, 0x0a, 0xd9, 0x83, 0x3c, 0xe9, 0x77, 0x7e, 0x24, 0xb0, 0x94, 0xf6, + 0xe7, 0x06, 0x53, 0x93, 0x8d, 0xda, 0x46, 0x12, 0x44, 0xb4, 0x69, 0x23, 0xc8, 0xf5, 0x3a, 0x0d, + 0xb2, 0x82, 0xe1, 0xcb, 0x1c, 0x44, 0xb3, 0x04, 0xab, 0x11, 0x2b, 0x80, 0x4c, 0x43, 0xa8, 0x44, + 0x2c, 0xbf, 0xf4, 0x9c, 0x0b, 0x9f, 0x65, 0x0d, 0x17, 0x63, 0xe7, 0xb9, 0xc7, 0x13, 0xa1, 0x2c, + 0xea, 0x9f, 0x71, 0xa2, 0x42, 0x46, 0x3d, 0x4e, 0xd2, 0xca, 0x67, 0x94, 0xe6, 0x0c, 0x7f, 0x9e, + 0xad, 0xde, 0x8f, 0x61, 0x84, 0x40, 0x77, 0x8f, 0xe7, 0xe7, 0x57, 0x3d, 0x86, 0x5d, 0x3e, 0xed, + 0x45, 0x49, 0xc9, 0x93, 0x70, 0x93, 0x53, 0x57, 0x1e, 0x8d, 0xd1, 0xe8, 0xe0, 0x73, 0x3d, 0xa2, + 0xd3, 0x33, 0x16, 0x8f, 0x47, 0x4f, 0xc7, 0xb3, 0xc6, 0x38, 0x50, 0xcc, 0xe7, 0xe2, 0x68, 0x07, + 0x62, 0x26, 0xfe, 0x02, 0x80, 0xda, 0xb4, 0x58, 0x11, 0xb9, 0x80, 0x54, 0xbc, 0x17, 0xc4, 0xb4, + 0xcd, 0xe7, 0x21, 0x66, 0xe9, 0x12, 0x98, 0x6f, 0x42, 0xde, 0x73, 0x0c, 0x9a, 0xcf, 0x72, 0xc9, + 0x43, 0x66, 0xc4, 0x51, 0x9f, 0x40, 0x7d, 0x49, 0x01, 0x10, 0x0e, 0x0e, 0xf5, 0x2b, 0x18, 0xa7, + 0xa5, 0xef, 0xda, 0xfd, 0xc7, 0xad, 0x5e, 0xe3, 0xbb, 0x7a, 0x06, 0xdd, 0xa9, 0xdc, 0xd5, 0xb4, + 0x9e, 0xde, 0xea, 0x7c, 0x77, 0x50, 0xcf, 0xe2, 0xee, 0xa0, 0xa7, 0x1d, 0xe3, 0x08, 0xc1, 0xc0, + 0x39, 0xb5, 0x99, 0x24, 0xc6, 0xdc, 0x4b, 0x90, 0x3f, 0xe8, 0x1c, 0x10, 0x29, 0x44, 0xc6, 0x29, + 0x45, 0x7f, 0xd8, 0x39, 0x3a, 0x68, 0x21, 0xad, 0x32, 0x14, 0x18, 0x15, 0xe9, 0x54, 0x60, 0xa5, + 0x7d, 0x20, 0x1e, 0xa8, 0x76, 0xe5, 0x8e, 0xbd, 0xd1, 0x42, 0x7a, 0x44, 0xc7, 0xf1, 0xc4, 0xd4, + 0xcc, 0x6a, 0x96, 0x87, 0x22, 0x9e, 0xe8, 0xad, 0x78, 0x49, 0x1e, 0xad, 0x78, 0x01, 0x27, 0xaa, + 0xaa, 0xfa, 0x35, 0x14, 0xc5, 0xd1, 0xe7, 0xa2, 0xd3, 0x71, 0x15, 0x9b, 0x0f, 0xe1, 0x9c, 0x5e, + 0xa8, 0x4b, 0x33, 0x6d, 0x7d, 0x7e, 0xa4, 0x5f, 0xd8, 0x69, 0x62, 0x42, 0x0a, 0x53, 0x22, 0xaa, + 0xe3, 0xd1, 0x5e, 0x67, 0xb7, 0xb1, 0x87, 0x7b, 0x40, 0xa1, 0xf7, 0x3a, 0x4d, 0xfc, 0x99, 0xa1, + 0xe5, 0x46, 0xeb, 0x1b, 0xbd, 0x7d, 0x20, 0x36, 0x40, 0xbf, 0x3b, 0x47, 0xfd, 0x7a, 0x8e, 0xae, + 0x21, 0x8e, 0x7b, 0x0f, 0xeb, 0xf9, 0x9d, 0xff, 0x87, 0x72, 0x74, 0x44, 0x8b, 0xab, 0x8d, 0x56, + 0x0b, 0x49, 0xe0, 0x8f, 0x96, 0x46, 0x04, 0x10, 0x09, 0x7f, 0xe8, 0x8d, 0xbd, 0x3d, 0x41, 0xa1, + 0xa7, 0x75, 0xf7, 0x1a, 0x4d, 0xd4, 0x23, 0x91, 0xd6, 0x0e, 0x1a, 0xbb, 0x7b, 0x5a, 0x3d, 0xcf, + 0x50, 0xed, 0x43, 0x7e, 0x28, 0x10, 0x7b, 0x1c, 0xcf, 0xb4, 0x7e, 0xbd, 0x48, 0xda, 0x3c, 0xec, + 0x3c, 0xec, 0x8b, 0xc7, 0x95, 0x1d, 0x9d, 0x0e, 0x39, 0xa3, 0x46, 0x14, 0x29, 0x74, 0x71, 0x96, + 0x6b, 0x7f, 0x2f, 0x4c, 0x78, 0xa0, 0xb5, 0x1f, 0x3d, 0xde, 0xed, 0xf4, 0x90, 0x2b, 0xb2, 0xef, + 0x37, 0x1e, 0x49, 0x99, 0x0f, 0xf5, 0x6e, 0xa3, 0xff, 0xb8, 0x4e, 0x79, 0xa2, 0xdc, 0xec, 0xec, + 0xef, 0x1f, 0x1d, 0xb4, 0xfb, 0x3f, 0xd4, 0x69, 0x60, 0xa9, 0x69, 0xdf, 0xf7, 0xf5, 0x68, 0xa9, + 0xb0, 0xf3, 0x01, 0x76, 0x25, 0xf3, 0xc6, 0x93, 0x36, 0x73, 0xf0, 0x83, 0xd8, 0x0c, 0xc9, 0xcf, + 0xda, 0x40, 0x13, 0x6a, 0xbd, 0x7e, 0x3d, 0xbb, 0xb3, 0x03, 0xf5, 0xa5, 0x16, 0xb3, 0x08, 0x59, + 0xed, 0x5b, 0x44, 0xc0, 0xff, 0x8f, 0x34, 0x84, 0xc7, 0xff, 0xb8, 0xa3, 0xec, 0xce, 0xc7, 0xb2, + 0xbf, 0x97, 0x95, 0x3b, 0xf2, 0x16, 0x52, 0x6f, 0xb3, 0xa9, 0x75, 0xfb, 0x82, 0x78, 0x4f, 0xfb, + 0x46, 0x6b, 0x12, 0xf1, 0x23, 0xd8, 0x48, 0xeb, 0xa4, 0x50, 0xe2, 0xb9, 0xb4, 0xba, 0x50, 0xf4, + 0x26, 0xd4, 0xa3, 0xa5, 0x9e, 0xb6, 0xdf, 0x39, 0x26, 0xc6, 0x57, 0x61, 0x3d, 0xbe, 0x2a, 0x54, + 0x9e, 0xdd, 0xb9, 0x03, 0xb5, 0x64, 0x47, 0x85, 0xea, 0xd9, 0xd7, 0x5a, 0xfa, 0x7e, 0x87, 0x48, + 0xad, 0x41, 0x85, 0x1e, 0x42, 0xf0, 0xcc, 0xce, 0x47, 0x00, 0xb1, 0xd2, 0x8a, 0x9b, 0x41, 0x37, + 0x60, 0x99, 0xdb, 0xfb, 0xdd, 0x4e, 0x4f, 0xca, 0xac, 0x7d, 0xcf, 0xbf, 0xb3, 0xf7, 0xff, 0xbe, + 0x0e, 0xa5, 0x47, 0x14, 0x75, 0x0d, 0xd7, 0x52, 0xbe, 0x84, 0xb5, 0x47, 0x66, 0x10, 0x3f, 0xef, + 0x57, 0x62, 0x29, 0x73, 0x7e, 0xf6, 0xbf, 0xbd, 0x7c, 0x86, 0x7f, 0x45, 0x79, 0xcc, 0x37, 0x4d, + 0x09, 0x5c, 0x35, 0x71, 0x69, 0x96, 0x7a, 0x8d, 0xb0, 0xbd, 0xb6, 0x70, 0x63, 0x8d, 0x94, 0xfe, + 0x0b, 0xaa, 0x28, 0x45, 0x78, 0xe3, 0xe9, 0xa7, 0x8b, 0xb0, 0x78, 0x91, 0x79, 0xe5, 0x5e, 0x06, + 0x73, 0x6a, 0x25, 0x86, 0x78, 0x41, 0x3c, 0xe5, 0x7f, 0x51, 0x81, 0xd1, 0x05, 0xab, 0xf2, 0x4e, + 0x42, 0xe8, 0xa5, 0x7b, 0xd7, 0x34, 0x81, 0x3f, 0xc2, 0x28, 0x34, 0x83, 0x9e, 0x75, 0xa2, 0xc4, + 0x5e, 0xf2, 0xf9, 0xfb, 0xf6, 0xe2, 0x02, 0x42, 0x7f, 0x8c, 0x81, 0x42, 0x25, 0x2d, 0x5d, 0xbe, + 0x14, 0xf2, 0x9f, 0x62, 0x38, 0x39, 0xa3, 0xe0, 0x72, 0x48, 0x9f, 0x43, 0x65, 0x8e, 0xd4, 0xb6, + 0x2f, 0x8c, 0xf6, 0x00, 0xaa, 0x73, 0xb4, 0xce, 0xec, 0xe2, 0xec, 0xee, 0x43, 0xe9, 0xf0, 0x74, + 0x16, 0x50, 0x67, 0x73, 0x61, 0x9c, 0x7b, 0xe8, 0x86, 0x7c, 0xbe, 0x79, 0x61, 0x8c, 0x4f, 0x30, + 0xe1, 0x58, 0xfe, 0xa5, 0x50, 0x76, 0x31, 0x56, 0xc4, 0x35, 0xbd, 0xb2, 0x9d, 0xb0, 0x6c, 0xe2, + 0x33, 0x84, 0xed, 0xeb, 0x4b, 0xef, 0xc2, 0x6b, 0x7f, 0xa4, 0xf1, 0x35, 0x8e, 0xbe, 0xf2, 0xaa, + 0x5f, 0x79, 0x73, 0x09, 0xd0, 0x7f, 0x19, 0xff, 0xdb, 0x19, 0xaa, 0x8e, 0xf2, 0x3a, 0x38, 0xd5, + 0x43, 0xd2, 0xef, 0x52, 0xd8, 0x9f, 0x5b, 0x74, 0x2d, 0xc9, 0x98, 0xbb, 0xf8, 0xa6, 0x79, 0x6a, + 0xd8, 0x63, 0x73, 0x98, 0xbe, 0xf3, 0x97, 0x50, 0xf9, 0x6a, 0x7e, 0x1d, 0x1d, 0x9d, 0xe7, 0x5e, + 0x38, 0xa4, 0x5a, 0xf4, 0xf5, 0x81, 0x10, 0xbe, 0xd3, 0x88, 0x0a, 0x68, 0x3a, 0x81, 0x8d, 0x94, + 0x9a, 0xcf, 0x54, 0xbe, 0xe4, 0x00, 0xc1, 0x16, 0x5b, 0x89, 0x4d, 0xd1, 0xf1, 0x4f, 0x00, 0xb6, + 0x37, 0x13, 0xeb, 0xe1, 0x41, 0x22, 0xe1, 0x3e, 0x80, 0xa2, 0xf8, 0x5e, 0x40, 0x49, 0xda, 0x28, + 0x81, 0x9e, 0xea, 0xc9, 0x45, 0x71, 0x53, 0xbf, 0x80, 0x17, 0xbf, 0xbb, 0x4f, 0xf7, 0xe4, 0x15, + 0x0a, 0x66, 0xea, 0x2f, 0x5f, 0xa5, 0x25, 0x02, 0x62, 0x19, 0xbf, 0x60, 0x27, 0x63, 0x9c, 0xa4, + 0x93, 0x25, 0xee, 0xf4, 0xcf, 0x89, 0x01, 0xe2, 0x86, 0xfd, 0x67, 0x2a, 0xb3, 0x85, 0x8e, 0x88, + 0x78, 0x7d, 0xc2, 0xf2, 0x61, 0x1b, 0xe2, 0xbf, 0x12, 0x85, 0x6e, 0xea, 0x23, 0x15, 0x52, 0xe7, + 0x92, 0x54, 0x45, 0xfc, 0xb3, 0x80, 0x34, 0xe1, 0xfe, 0x1b, 0x6a, 0xc8, 0x2a, 0x76, 0xd0, 0x94, + 0x7a, 0x4f, 0xbf, 0x9d, 0x7e, 0x7b, 0x4f, 0x89, 0x75, 0x35, 0x81, 0xee, 0x5f, 0x0e, 0x9f, 0xbd, + 0xaf, 0x96, 0xf8, 0xcc, 0x40, 0xb9, 0x91, 0x90, 0x3f, 0xe5, 0xfb, 0x83, 0xb4, 0x6d, 0x7c, 0xc9, + 0xf5, 0x24, 0x9a, 0xa1, 0xd3, 0x66, 0xd7, 0xed, 0xd4, 0x81, 0x36, 0x54, 0xc1, 0x7c, 0xc5, 0xbf, + 0x0c, 0x32, 0x6e, 0x60, 0x17, 0xaa, 0xf1, 0x4f, 0x18, 0x94, 0x77, 0x13, 0xf2, 0x2f, 0x7f, 0xda, + 0x90, 0x9e, 0xf4, 0xca, 0x28, 0x82, 0x9c, 0x68, 0x97, 0x66, 0xdc, 0xed, 0xa5, 0x15, 0x91, 0xfc, + 0x43, 0x14, 0x1c, 0x8f, 0x2f, 0x86, 0x84, 0xd2, 0x7e, 0x8d, 0x7d, 0x54, 0xf8, 0x99, 0x81, 0xf2, + 0x56, 0x32, 0xd1, 0x25, 0xbf, 0x8d, 0x48, 0x93, 0xb3, 0x03, 0x1b, 0x73, 0x39, 0x63, 0xf3, 0xff, + 0x4b, 0x2e, 0x04, 0xb7, 0x5f, 0x76, 0x59, 0x78, 0x45, 0xe9, 0xc2, 0x46, 0xca, 0x57, 0x0f, 0xca, + 0xcd, 0x34, 0xc1, 0x96, 0x3f, 0x8a, 0x48, 0x11, 0xf1, 0xa4, 0xc8, 0x9f, 0xd1, 0x7d, 0xfa, 0xcf, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0x88, 0x4a, 0x25, 0x55, 0x27, 0x00, 0x00, } diff --git a/api/gobgp.proto b/api/gobgp.proto index 6b4f4c82..e64482e6 100644 --- a/api/gobgp.proto +++ b/api/gobgp.proto @@ -201,7 +201,7 @@ message Path { string source_id = 10; bool filtered = 11; bool stale = 12; - bool is_from_ops = 13; + bool is_from_external = 13; } message Destination { diff --git a/openswitch/openswitch.go b/openswitch/openswitch.go index cdb1cb17..36d3c689 100644 --- a/openswitch/openswitch.go +++ b/openswitch/openswitch.go @@ -138,8 +138,8 @@ func (m *OpsManager) getBGPRouterUUID() (uint32, uuid.UUID, error) { func parseRouteToGobgp(route ovsdb.RowUpdate, nexthops map[string]ovsdb.Row) (*api.Path, bool, bool, error) { var nlri bgp.AddrPrefixInterface path := &api.Path{ - IsFromOps: true, - Pattrs: make([][]byte, 0), + IsFromExternal: true, + Pattrs: make([][]byte, 0), } isWithdraw := false isFromGobgp := false @@ -597,7 +597,7 @@ func (m *OpsManager) GobgpMonitor(ready *bool) { } d := res.Data.(*api.Destination) bPath := d.Paths[0] - if bPath.IsFromOps && !bPath.IsWithdraw { + if bPath.IsFromExternal && !bPath.IsWithdraw { continue } p, err := cmd.ApiStruct2Path(bPath) diff --git a/server/server.go b/server/server.go index 70cafeaa..8a3b8f83 100644 --- a/server/server.go +++ b/server/server.go @@ -673,7 +673,7 @@ func (server *BgpServer) broadcastValidationResults(results []*api.ROAResult) { func (server *BgpServer) broadcastBests(bests []*table.Path) { for _, path := range bests { - if !path.IsFromZebra() { + if !path.IsFromExternal() { z := newBroadcastZapiBestMsg(server.zclient, path) if z != nil { server.broadcastMsgs = append(server.broadcastMsgs, z) @@ -1437,8 +1437,9 @@ func (server *BgpServer) Api2PathList(resource api.Resource, name string, ApiPat if len(extcomms) > 0 { pattr = append(pattr, bgp.NewPathAttributeExtendedCommunities(extcomms)) } - - paths = append(paths, table.NewPath(pi, nlri, path.IsWithdraw, pattr, time.Now(), path.NoImplicitWithdraw, path.IsFromOps)) + newPath := table.NewPath(pi, nlri, path.IsWithdraw, pattr, time.Now(), path.NoImplicitWithdraw) + newPath.SetIsFromExternal(path.IsFromExternal) + paths = append(paths, newPath) } return paths, nil diff --git a/server/zclient.go b/server/zclient.go index a6427781..6cf0af4f 100644 --- a/server/zclient.go +++ b/server/zclient.go @@ -127,8 +127,8 @@ func createPathFromIPRouteMessage(m *zebra.Message, peerInfo *table.PeerInfo) *t med := bgp.NewPathAttributeMultiExitDisc(body.Metric) pattr = append(pattr, med) - p := table.NewPath(peerInfo, nlri, isWithdraw, pattr, time.Now(), false, false) - p.SetIsFromZebra(true) + p := table.NewPath(peerInfo, nlri, isWithdraw, pattr, time.Now(), false) + p.SetIsFromExternal(true) return p } diff --git a/server/zclient_test.go b/server/zclient_test.go index 2fbd7554..a09b59e6 100644 --- a/server/zclient_test.go +++ b/server/zclient_test.go @@ -59,7 +59,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) { assert.NotEqual(nil, p) assert.Equal("0.0.0.0", p.GetNexthop().String()) assert.Equal("192.168.100.0/24", p.GetNlri().String()) - assert.True(p.IsFromZebra()) + assert.True(p.IsFromExternal()) assert.False(p.IsWithdraw) // withdraw @@ -71,7 +71,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) { assert.Equal("192.168.100.0/24", p.GetNlri().String()) med, _ := p.GetMed() assert.Equal(uint32(100), med) - assert.True(p.IsFromZebra()) + assert.True(p.IsFromExternal()) assert.True(p.IsWithdraw) // IPv6 @@ -88,7 +88,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) { assert.Equal("2001:db8:0:f101::/64", p.GetNlri().String()) med, _ = p.GetMed() assert.Equal(uint32(100), med) - assert.True(p.IsFromZebra()) + assert.True(p.IsFromExternal()) assert.False(p.IsWithdraw) // withdraw @@ -98,7 +98,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) { assert.NotEqual(nil, p) assert.Equal("::", p.GetNexthop().String()) assert.Equal("2001:db8:0:f101::/64", p.GetNlri().String()) - assert.True(p.IsFromZebra()) + assert.True(p.IsFromExternal()) assert.True(p.IsWithdraw) } diff --git a/table/destination_test.go b/table/destination_test.go index 1bd6c944..f5556175 100644 --- a/table/destination_test.go +++ b/table/destination_test.go @@ -81,7 +81,7 @@ func DestCreatePath(peerD []*PeerInfo) []*Path { nlriList := updateMsgD.NLRI pathAttributes := updateMsgD.PathAttributes nlri_info := nlriList[0] - pathD[i] = NewPath(peerD[i], nlri_info, false, pathAttributes, time.Now(), false, false) + pathD[i] = NewPath(peerD[i], nlri_info, false, pathAttributes, time.Now(), false) } return pathD } diff --git a/table/path.go b/table/path.go index 498e19cf..9d1b00b1 100644 --- a/table/path.go +++ b/table/path.go @@ -52,8 +52,7 @@ type originInfo struct { timestamp time.Time noImplicitWithdraw bool validation config.RpkiValidationResultType - isFromZebra bool - isFromOps bool + isFromExternal bool key string uuid []byte eor bool @@ -84,7 +83,7 @@ type Path struct { filtered map[string]PolicyDirection } -func NewPath(source *PeerInfo, nlri bgp.AddrPrefixInterface, isWithdraw bool, pattrs []bgp.PathAttributeInterface, timestamp time.Time, noImplicitWithdraw bool, isFromOps bool) *Path { +func NewPath(source *PeerInfo, nlri bgp.AddrPrefixInterface, isWithdraw bool, pattrs []bgp.PathAttributeInterface, timestamp time.Time, noImplicitWithdraw bool) *Path { if !isWithdraw && pattrs == nil { log.WithFields(log.Fields{ "Topic": "Table", @@ -119,7 +118,6 @@ func NewPath(source *PeerInfo, nlri bgp.AddrPrefixInterface, isWithdraw bool, pa source: source, timestamp: timestamp, noImplicitWithdraw: noImplicitWithdraw, - isFromOps: isFromOps, }, IsWithdraw: isWithdraw, pathAttrs: pattrs, @@ -266,17 +264,17 @@ func (path *Path) ToApiStruct(id string) *api.Path { return ret }(path.GetPathAttrs()) return &api.Path{ - Nlri: n, - Pattrs: pattrs, - Age: int64(time.Now().Sub(path.OriginInfo().timestamp).Seconds()), - IsWithdraw: path.IsWithdraw, - Validation: int32(path.OriginInfo().validation.ToInt()), - Filtered: path.Filtered(id) == POLICY_DIRECTION_IN, - Family: family, - SourceAsn: path.OriginInfo().source.AS, - SourceId: path.OriginInfo().source.ID.String(), - Stale: path.IsStale(), - IsFromOps: path.OriginInfo().isFromOps, + Nlri: n, + Pattrs: pattrs, + Age: int64(time.Now().Sub(path.OriginInfo().timestamp).Seconds()), + IsWithdraw: path.IsWithdraw, + Validation: int32(path.OriginInfo().validation.ToInt()), + Filtered: path.Filtered(id) == POLICY_DIRECTION_IN, + Family: family, + SourceAsn: path.OriginInfo().source.AS, + SourceId: path.OriginInfo().source.ID.String(), + Stale: path.IsStale(), + IsFromExternal: path.OriginInfo().isFromExternal, } } @@ -313,12 +311,12 @@ func (path *Path) SetValidation(r config.RpkiValidationResultType) { path.OriginInfo().validation = r } -func (path *Path) IsFromZebra() bool { - return path.OriginInfo().isFromZebra +func (path *Path) IsFromExternal() bool { + return path.OriginInfo().isFromExternal } -func (path *Path) SetIsFromZebra(y bool) { - path.OriginInfo().isFromZebra = y +func (path *Path) SetIsFromExternal(y bool) { + path.OriginInfo().isFromExternal = y } func (path *Path) UUID() []byte { diff --git a/table/path_test.go b/table/path_test.go index 5f625785..e12640e2 100644 --- a/table/path_test.go +++ b/table/path_test.go @@ -13,14 +13,14 @@ import ( func TestPathNewIPv4(t *testing.T) { peerP := PathCreatePeer() pathP := PathCreatePath(peerP) - ipv4p := NewPath(pathP[0].GetSource(), pathP[0].GetNlri(), true, pathP[0].GetPathAttrs(), time.Now(), false, false) + ipv4p := NewPath(pathP[0].GetSource(), pathP[0].GetNlri(), true, pathP[0].GetPathAttrs(), time.Now(), false) assert.NotNil(t, ipv4p) } func TestPathNewIPv6(t *testing.T) { peerP := PathCreatePeer() pathP := PathCreatePath(peerP) - ipv6p := NewPath(pathP[0].GetSource(), pathP[0].GetNlri(), true, pathP[0].GetPathAttrs(), time.Now(), false, false) + ipv6p := NewPath(pathP[0].GetSource(), pathP[0].GetNlri(), true, pathP[0].GetPathAttrs(), time.Now(), false) assert.NotNil(t, ipv6p) } @@ -42,7 +42,7 @@ func TestPathCreatePath(t *testing.T) { nlriList := updateMsgP.NLRI pathAttributes := updateMsgP.PathAttributes nlri_info := nlriList[0] - path := NewPath(peerP[0], nlri_info, false, pathAttributes, time.Now(), false, false) + path := NewPath(peerP[0], nlri_info, false, pathAttributes, time.Now(), false) assert.NotNil(t, path) } @@ -88,7 +88,7 @@ func TestASPathLen(t *testing.T) { update := bgpmsg.Body.(*bgp.BGPUpdate) UpdatePathAttrs4ByteAs(update) peer := PathCreatePeer() - p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false, false) + p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false) assert.Equal(10, p.GetAsPathLen()) } @@ -114,7 +114,7 @@ func TestPathPrependAsnToExistingSeqAttr(t *testing.T) { update := bgpmsg.Body.(*bgp.BGPUpdate) UpdatePathAttrs4ByteAs(update) peer := PathCreatePeer() - p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false, false) + p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false) p.PrependAsn(65000, 1) assert.Equal([]uint32{65000, 65001, 65002, 65003, 65004, 65005, 0, 0, 0}, p.GetAsSeqList()) @@ -136,7 +136,7 @@ func TestPathPrependAsnToNewAsPathAttr(t *testing.T) { update := bgpmsg.Body.(*bgp.BGPUpdate) UpdatePathAttrs4ByteAs(update) peer := PathCreatePeer() - p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false, false) + p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false) asn := uint32(65000) p.PrependAsn(asn, 1) @@ -164,7 +164,7 @@ func TestPathPrependAsnToNewAsPathSeq(t *testing.T) { update := bgpmsg.Body.(*bgp.BGPUpdate) UpdatePathAttrs4ByteAs(update) peer := PathCreatePeer() - p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false, false) + p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false) asn := uint32(65000) p.PrependAsn(asn, 1) @@ -194,7 +194,7 @@ func TestPathPrependAsnToEmptyAsPathAttr(t *testing.T) { update := bgpmsg.Body.(*bgp.BGPUpdate) UpdatePathAttrs4ByteAs(update) peer := PathCreatePeer() - p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false, false) + p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false) asn := uint32(65000) p.PrependAsn(asn, 1) @@ -230,7 +230,7 @@ func TestPathPrependAsnToFullPathAttr(t *testing.T) { update := bgpmsg.Body.(*bgp.BGPUpdate) UpdatePathAttrs4ByteAs(update) peer := PathCreatePeer() - p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false, false) + p := NewPath(peer[0], update.NLRI[0], false, update.PathAttributes, time.Now(), false) expected := []uint32{65000, 65000} for _, v := range asns { @@ -269,7 +269,7 @@ func PathCreatePath(peerP []*PeerInfo) []*Path { nlriList := updateMsgP.NLRI pathAttributes := updateMsgP.PathAttributes nlri_info := nlriList[0] - pathP[i] = NewPath(peerP[i], nlri_info, false, pathAttributes, time.Now(), false, false) + pathP[i] = NewPath(peerP[i], nlri_info, false, pathAttributes, time.Now(), false) } return pathP } diff --git a/table/policy_test.go b/table/policy_test.go index 8874a2f6..38b55794 100644 --- a/table/policy_test.go +++ b/table/policy_test.go @@ -876,7 +876,7 @@ func TestAsPathCondition(t *testing.T) { bgp.NewAs4PathParam(asPathAttrType, ases), } pathAttributes := []bgp.PathAttributeInterface{bgp.NewPathAttributeAsPath(aspathParam)} - p := NewPath(nil, nil, false, pathAttributes, time.Time{}, false, false) + p := NewPath(nil, nil, false, pathAttributes, time.Time{}, false) return astest{ path: p, result: result, diff --git a/table/table_manager.go b/table/table_manager.go index 119b81b2..afb4deac 100644 --- a/table/table_manager.go +++ b/table/table_manager.go @@ -33,7 +33,7 @@ func nlri2Path(m *bgp.BGPMessage, p *PeerInfo, now time.Time) []*Path { pathAttributes := updateMsg.PathAttributes pathList := make([]*Path, 0) for _, nlri := range updateMsg.NLRI { - path := NewPath(p, nlri, false, pathAttributes, now, false, false) + path := NewPath(p, nlri, false, pathAttributes, now, false) pathList = append(pathList, path) } return pathList @@ -44,7 +44,7 @@ func withdraw2Path(m *bgp.BGPMessage, p *PeerInfo, now time.Time) []*Path { pathAttributes := updateMsg.PathAttributes pathList := make([]*Path, 0) for _, nlri := range updateMsg.WithdrawnRoutes { - path := NewPath(p, nlri, true, pathAttributes, now, false, false) + path := NewPath(p, nlri, true, pathAttributes, now, false) pathList = append(pathList, path) } return pathList @@ -67,7 +67,7 @@ func mpreachNlri2Path(m *bgp.BGPMessage, p *PeerInfo, now time.Time) []*Path { for _, mp := range attrList { nlri_info := mp.Value for _, nlri := range nlri_info { - path := NewPath(p, nlri, false, pathAttributes, now, false, false) + path := NewPath(p, nlri, false, pathAttributes, now, false) pathList = append(pathList, path) } } @@ -92,7 +92,7 @@ func mpunreachNlri2Path(m *bgp.BGPMessage, p *PeerInfo, now time.Time) []*Path { nlri_info := mp.Value for _, nlri := range nlri_info { - path := NewPath(p, nlri, true, pathAttributes, now, false, false) + path := NewPath(p, nlri, true, pathAttributes, now, false) pathList = append(pathList, path) } } @@ -189,7 +189,7 @@ func (manager *TableManager) AddVrf(name string, rd bgp.RouteDistinguisherInterf pattr := make([]bgp.PathAttributeInterface, 0, 2) pattr = append(pattr, bgp.NewPathAttributeOrigin(bgp.BGP_ORIGIN_ATTR_TYPE_IGP)) pattr = append(pattr, bgp.NewPathAttributeMpReachNLRI(nexthop, []bgp.AddrPrefixInterface{nlri})) - msgs = append(msgs, NewPath(info, nlri, false, pattr, time.Now(), false, false)) + msgs = append(msgs, NewPath(info, nlri, false, pattr, time.Now(), false)) } return msgs, nil } diff --git a/table/table_test.go b/table/table_test.go index b38d11a9..9cec4133 100644 --- a/table/table_test.go +++ b/table/table_test.go @@ -107,7 +107,7 @@ func TableCreatePath(peerT []*PeerInfo) []*Path { nlriList := updateMsgT.NLRI pathAttributes := updateMsgT.PathAttributes nlri_info := nlriList[0] - pathT[i] = NewPath(peerT[i], nlri_info, false, pathAttributes, time.Now(), false, false) + pathT[i] = NewPath(peerT[i], nlri_info, false, pathAttributes, time.Now(), false) } return pathT } |