From 3339f97722e35d5ff351ef500de1e61344cbd33d Mon Sep 17 00:00:00 2001 From: Milan Lenco Date: Thu, 21 Jan 2021 13:53:33 +0100 Subject: feat: add option to bind listener to a (VRF) device Signed-off-by: Milan Lenco --- api/gobgp.pb.go | 219 ++++++++++++++++++++++-------------------- api/gobgp.proto | 1 + pkg/server/server.go | 52 +++++++--- pkg/server/sockopt.go | 9 +- pkg/server/sockopt_bsd.go | 9 -- pkg/server/sockopt_darwin.go | 9 -- pkg/server/sockopt_linux.go | 16 +-- pkg/server/sockopt_openbsd.go | 13 +-- pkg/server/util.go | 8 -- 9 files changed, 164 insertions(+), 172 deletions(-) diff --git a/api/gobgp.pb.go b/api/gobgp.pb.go index df97552b..7201ad7f 100644 --- a/api/gobgp.pb.go +++ b/api/gobgp.pb.go @@ -5314,6 +5314,7 @@ type Global struct { Confederation *Confederation `protobuf:"bytes,9,opt,name=confederation" json:"confederation,omitempty"` GracefulRestart *GracefulRestart `protobuf:"bytes,10,opt,name=graceful_restart,json=gracefulRestart" json:"graceful_restart,omitempty"` ApplyPolicy *ApplyPolicy `protobuf:"bytes,11,opt,name=apply_policy,json=applyPolicy" json:"apply_policy,omitempty"` + BindToDevice string `protobuf:"bytes,12,opt,name=bind_to_device,json=bindToDevice" json:"bind_to_device,omitempty"` } func (m *Global) Reset() { *m = Global{} } @@ -5398,6 +5399,13 @@ func (m *Global) GetApplyPolicy() *ApplyPolicy { return nil } +func (m *Global) GetBindToDevice() string { + if m != nil { + return m.BindToDevice + } + return "" +} + type Confederation struct { Enabled bool `protobuf:"varint,1,opt,name=enabled" json:"enabled,omitempty"` Identifier uint32 `protobuf:"varint,2,opt,name=identifier" json:"identifier,omitempty"` @@ -7897,14 +7905,14 @@ var _GobgpApi_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gobgp.proto", fileDescriptor2) } var fileDescriptor2 = []byte{ - // 8106 bytes of a gzipped FileDescriptorProto + // 8126 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7d, 0x4b, 0x6c, 0x23, 0x49, 0x96, 0x58, 0xf3, 0x23, 0x8a, 0x7c, 0x24, 0xc5, 0x54, 0x48, 0x25, 0xa9, 0x54, 0x5d, 0x9f, 0xce, 0xe9, 0xee, 0xaa, 0xae, 0xae, 0xae, 0xae, 0xaa, 0xee, 0xa9, 0xee, 0xa9, 0xde, 0xfe, 0xb0, 0x24, 0x96, 0x8a, 0x53, 0x14, 0xc9, 0x0e, 0x52, 0xd5, 0xd5, 0x63, 0x8f, 0x73, 0x53, 0xcc, 0x20, 0x95, 0xee, 0x64, 0x66, 0x4e, 0x66, 0x52, 0x25, 0xed, 0xc5, 0xb3, 0xb3, 0xeb, 0x31, 0x0c, 0xc3, 0x80, - 0x61, 0x1f, 0xf6, 0xe0, 0x31, 0x6c, 0xd8, 0x17, 0xc3, 0xb0, 0x7d, 0xb2, 0x0f, 0x86, 0x0f, 0x36, - 0x0c, 0x1f, 0x0c, 0x2f, 0xe0, 0x93, 0xcf, 0x36, 0x60, 0xf8, 0x6c, 0xc0, 0x17, 0x9f, 0x8d, 0xf8, + 0x61, 0x1f, 0xf6, 0xe0, 0x31, 0x6c, 0xd8, 0x17, 0xc3, 0xb0, 0x7d, 0xb2, 0x0f, 0x86, 0x2f, 0x86, + 0xe1, 0x83, 0xe1, 0x05, 0x7c, 0xf2, 0xd9, 0x06, 0x0c, 0xfb, 0x6a, 0xc0, 0x17, 0x9f, 0x8d, 0xf8, 0x64, 0x66, 0x64, 0x26, 0x29, 0xa9, 0xaa, 0x7b, 0x66, 0x77, 0x81, 0x3d, 0x89, 0xf1, 0xde, 0x8b, 0x17, 0xbf, 0x17, 0xef, 0xbd, 0x78, 0x11, 0xf9, 0x04, 0xd5, 0x89, 0x73, 0x38, 0x71, 0xef, 0xba, 0x9e, 0x13, 0x38, 0xa8, 0xcc, 0x0a, 0xba, 0x6b, 0x6e, 0x5f, 0x9e, 0x38, 0xce, 0xc4, 0x22, 0x1f, @@ -7923,7 +7931,7 @@ var fileDescriptor2 = []byte{ 0x22, 0xa3, 0xfb, 0x7d, 0x58, 0x3d, 0x70, 0x0d, 0x3d, 0x39, 0xba, 0x0b, 0x54, 0x44, 0x37, 0x41, 0x31, 0x1c, 0xcd, 0x77, 0xc6, 0x81, 0xe6, 0x11, 0x9f, 0x04, 0x9a, 0x69, 0x8b, 0xce, 0xd5, 0x0d, 0x67, 0xe0, 0x8c, 0x03, 0x4c, 0xa1, 0x6d, 0x5b, 0xdd, 0x01, 0x24, 0xb7, 0x20, 0xfa, 0xf6, 0x01, - 0xac, 0xd9, 0x84, 0x18, 0x7e, 0x8a, 0x43, 0x8e, 0x0f, 0x8f, 0xa1, 0x64, 0x26, 0xff, 0x3b, 0x07, + 0xac, 0xd9, 0x84, 0x18, 0x7e, 0x8a, 0x43, 0x8e, 0x0f, 0x8f, 0xa1, 0x64, 0x26, 0xff, 0x2b, 0x07, 0x0a, 0xfb, 0x7d, 0xb1, 0x99, 0x7b, 0x1b, 0xea, 0x23, 0x67, 0x3a, 0x9d, 0xd9, 0xe6, 0x48, 0x0f, 0x4c, 0xc7, 0x16, 0x0b, 0x91, 0x04, 0x22, 0x04, 0x45, 0xda, 0xfa, 0x56, 0x81, 0x35, 0xca, 0x7e, 0xa3, 0x67, 0x50, 0x31, 0x4c, 0x8f, 0x8c, 0x58, 0xad, 0xe2, 0x8d, 0xdc, 0xad, 0x95, 0x07, 0x1f, @@ -7944,7 +7952,7 @@ var fileDescriptor2 = []byte{ 0x33, 0xa4, 0xb8, 0xe1, 0xa9, 0x4b, 0x70, 0x25, 0x08, 0x7f, 0xa2, 0x4b, 0x50, 0x3a, 0xf6, 0xc6, 0x9a, 0x69, 0x08, 0x31, 0x5c, 0x3a, 0xf6, 0xc6, 0x6d, 0x83, 0x49, 0x87, 0x1e, 0x1c, 0xb1, 0xcd, 0x9e, 0x94, 0x0e, 0xda, 0x1e, 0xc3, 0xa9, 0xef, 0x40, 0x23, 0xea, 0x80, 0x98, 0x25, 0x04, 0xc5, - 0xd9, 0xcc, 0x34, 0x58, 0xdb, 0x35, 0xcc, 0x7e, 0xab, 0xff, 0x31, 0x17, 0x99, 0x84, 0xdf, 0x4e, + 0xd9, 0xcc, 0x34, 0x58, 0xdb, 0x35, 0xcc, 0x7e, 0xab, 0xff, 0x21, 0x17, 0x99, 0x84, 0xdf, 0x4e, 0x5f, 0x6f, 0x41, 0x69, 0xac, 0x4f, 0x4d, 0xeb, 0x54, 0xf4, 0x56, 0x32, 0x69, 0x4f, 0x18, 0x1c, 0x0b, 0x7c, 0x34, 0xaa, 0xe2, 0xe2, 0x51, 0x45, 0x43, 0x58, 0x92, 0x86, 0xf0, 0xaf, 0x0b, 0xc2, 0x10, 0x7d, 0xcf, 0x01, 0x84, 0xa2, 0x9e, 0x8f, 0x45, 0xfd, 0x15, 0x7a, 0xff, 0x09, 0x94, 0x5d, @@ -7965,7 +7973,7 @@ var fileDescriptor2 = []byte{ 0xb9, 0x37, 0xa1, 0x61, 0xcf, 0xa6, 0x5a, 0x7a, 0x82, 0x8b, 0x78, 0xc5, 0x9e, 0x4d, 0xa5, 0x99, 0x45, 0x97, 0xa1, 0x4c, 0x09, 0xd9, 0x36, 0xcc, 0x33, 0x8a, 0x65, 0x7b, 0x36, 0xa5, 0x83, 0x44, 0x6f, 0x41, 0x8d, 0xa2, 0xf4, 0xd1, 0x88, 0xb8, 0x01, 0x31, 0x58, 0x9b, 0x45, 0x5c, 0xb5, 0x67, - 0xd3, 0xa6, 0x00, 0xa9, 0xff, 0x29, 0x17, 0x19, 0xb3, 0xef, 0x3d, 0x09, 0xdf, 0x6f, 0x33, 0x4a, + 0xd3, 0xa6, 0x00, 0xa9, 0xff, 0x31, 0x17, 0x19, 0xb3, 0xef, 0x3d, 0x09, 0xdf, 0x6f, 0x33, 0x4a, 0xf6, 0xb6, 0x98, 0xb0, 0xb7, 0xe8, 0x3a, 0x54, 0x5d, 0xc7, 0x0f, 0x34, 0xd7, 0xb1, 0xcc, 0xd1, 0x29, 0xdb, 0x6f, 0x65, 0x0c, 0x14, 0xd4, 0x67, 0x10, 0xf5, 0x11, 0xac, 0x27, 0xc7, 0x20, 0x59, 0x64, 0x3a, 0x2d, 0xb9, 0x33, 0x74, 0xee, 0x3d, 0xa8, 0x37, 0x0d, 0xe3, 0xb9, 0x37, 0x0e, 0x47, @@ -8052,7 +8060,7 @@ var fileDescriptor2 = []byte{ 0x77, 0x95, 0x1c, 0x95, 0x6f, 0x0e, 0x7c, 0xde, 0xec, 0xb4, 0x77, 0x95, 0x3c, 0x5a, 0x85, 0x3a, 0x07, 0xb4, 0xbb, 0x1c, 0x54, 0x50, 0x3f, 0x83, 0x12, 0x1f, 0x38, 0xa5, 0xc6, 0xad, 0xe6, 0xa0, 0x37, 0x0c, 0x79, 0xd6, 0xa1, 0xc2, 0x00, 0x5d, 0xad, 0x39, 0x50, 0x72, 0xb4, 0xb2, 0x28, 0x76, - 0x5a, 0xdd, 0x3d, 0x76, 0x41, 0xf3, 0x3f, 0x97, 0xa0, 0xc8, 0x42, 0x3b, 0xb7, 0xa0, 0x68, 0x5b, + 0x5a, 0xdd, 0x3d, 0x76, 0x41, 0xf3, 0x3f, 0x96, 0xa0, 0xc8, 0x42, 0x3b, 0xb7, 0xa0, 0x68, 0x5b, 0x9e, 0x29, 0x9d, 0x51, 0x9c, 0x89, 0x45, 0xee, 0x86, 0xf7, 0xa2, 0x77, 0x9b, 0xf6, 0x29, 0x66, 0x14, 0xe8, 0x0e, 0x94, 0x5c, 0x3d, 0x08, 0xbc, 0xf0, 0xc8, 0x39, 0x9f, 0x56, 0xd0, 0xa0, 0x3b, 0x50, 0xd0, 0x27, 0x44, 0x04, 0x6b, 0xb6, 0x33, 0xa4, 0xc3, 0xf0, 0xba, 0x15, 0x53, 0x32, 0xaa, @@ -8092,7 +8100,7 @@ var fileDescriptor2 = []byte{ 0x84, 0x9c, 0x6c, 0xce, 0xb9, 0xaf, 0xfd, 0x73, 0x24, 0x2c, 0x77, 0xa0, 0x68, 0xda, 0x63, 0x47, 0xc8, 0xca, 0xd6, 0x9c, 0xce, 0x72, 0x81, 0x61, 0x54, 0x7f, 0x29, 0x2f, 0xb2, 0xbc, 0x3c, 0x85, 0x46, 0xea, 0xde, 0x7a, 0xa1, 0xfe, 0xba, 0x9a, 0xb8, 0xc8, 0x17, 0x4f, 0x7f, 0xe2, 0xf7, 0x02, - 0xff, 0x25, 0x07, 0x55, 0x49, 0x9c, 0xd0, 0x27, 0x50, 0x31, 0xed, 0xa4, 0xe0, 0x9d, 0x15, 0xe4, + 0xff, 0x39, 0x07, 0x55, 0x49, 0x9c, 0xd0, 0x27, 0x50, 0x31, 0xed, 0xa4, 0xe0, 0x9d, 0x15, 0xe4, 0x29, 0x9b, 0xb6, 0xa8, 0xf8, 0x25, 0xd4, 0xc9, 0x09, 0x9d, 0xcc, 0xb0, 0x72, 0xfe, 0xdc, 0xca, 0x35, 0x5e, 0x21, 0x66, 0x60, 0x4e, 0x65, 0x06, 0x85, 0xf3, 0x19, 0xf0, 0x0a, 0xe2, 0xbe, 0xe7, 0xef, 0xe5, 0xa0, 0xca, 0x95, 0x79, 0xc7, 0x9c, 0x9a, 0xaf, 0x10, 0x67, 0x40, 0x6f, 0x41, 0x6d, @@ -8166,7 +8174,7 @@ var fileDescriptor2 = []byte{ 0x35, 0x6d, 0x73, 0x3a, 0x9b, 0x6a, 0x7a, 0xf8, 0xf5, 0x08, 0x3d, 0xe1, 0xa5, 0xaf, 0x08, 0xdf, 0x14, 0x54, 0x4d, 0x99, 0x28, 0xe2, 0xf2, 0x08, 0xb6, 0x4d, 0xc3, 0x22, 0x5a, 0xd4, 0x2d, 0x4d, 0x1f, 0xd3, 0x9d, 0xca, 0x5e, 0x91, 0x0b, 0xc9, 0xd8, 0xa0, 0x14, 0x4f, 0x45, 0x37, 0x9b, 0x14, - 0xcd, 0x6e, 0xbe, 0xd5, 0xff, 0x95, 0x87, 0xaa, 0x34, 0x35, 0x7f, 0x51, 0xa7, 0xe0, 0x1e, 0xac, + 0xcd, 0x6e, 0xbe, 0xd5, 0xff, 0x99, 0x87, 0xaa, 0x34, 0x35, 0x7f, 0x51, 0xa7, 0xe0, 0x1e, 0xac, 0xdb, 0x64, 0xe2, 0x04, 0xa6, 0x1e, 0x10, 0x23, 0x9e, 0x08, 0x31, 0x78, 0x14, 0xe3, 0xc2, 0x29, 0x40, 0x0f, 0xe8, 0x2e, 0x64, 0x34, 0xa5, 0x73, 0xa3, 0xfb, 0x82, 0x12, 0x3d, 0x84, 0x32, 0x3d, 0xb1, 0xb0, 0x5a, 0xcb, 0xe7, 0xd6, 0x8a, 0x68, 0xd5, 0x7f, 0x9c, 0x87, 0x4a, 0x14, 0x7f, 0xa1, @@ -8190,7 +8198,7 @@ var fileDescriptor2 = []byte{ 0x61, 0x69, 0xf4, 0x37, 0xc5, 0xc9, 0x49, 0xd0, 0xc6, 0x51, 0x8a, 0x15, 0x89, 0x92, 0x3a, 0x60, 0xd1, 0xc5, 0x89, 0x44, 0x09, 0x8c, 0x92, 0x5f, 0x9c, 0x48, 0xa4, 0x08, 0x8a, 0x4c, 0x5a, 0x79, 0x64, 0x82, 0xfd, 0x56, 0x3f, 0x82, 0xcd, 0x7d, 0x37, 0xb5, 0x6e, 0x42, 0x67, 0x2f, 0x5c, 0x3d, - 0xf5, 0x3f, 0xe7, 0x60, 0x23, 0x53, 0x8b, 0x6b, 0xb9, 0xc5, 0x4b, 0xbe, 0x2d, 0xb9, 0x08, 0x5c, + 0xf5, 0x3f, 0xe5, 0x60, 0x23, 0x53, 0x8b, 0x6b, 0xb9, 0xc5, 0x4b, 0xbe, 0x2d, 0xb9, 0x08, 0x5c, 0x84, 0x62, 0x7f, 0xe0, 0x1a, 0x80, 0x1e, 0x7f, 0xfb, 0x27, 0x96, 0x3a, 0x86, 0xa0, 0x0f, 0x60, 0x8d, 0x3a, 0x99, 0xce, 0x58, 0xf3, 0xcc, 0x43, 0x2d, 0x62, 0x53, 0x0c, 0x3f, 0x4f, 0x30, 0x7a, 0x63, 0x6c, 0x1e, 0xe2, 0xd8, 0xbd, 0x68, 0x48, 0xe4, 0xcc, 0xd3, 0xe0, 0xeb, 0x5d, 0x0b, 0x49, @@ -8229,7 +8237,7 @@ var fileDescriptor2 = []byte{ 0xe9, 0xc3, 0xe6, 0xb2, 0x3e, 0xac, 0xda, 0x14, 0x5a, 0x38, 0xcd, 0x23, 0x5a, 0xb5, 0xf3, 0x59, 0x44, 0x4a, 0x23, 0xcd, 0xe3, 0x5c, 0xa5, 0x31, 0xbf, 0xe3, 0x17, 0x55, 0x1a, 0x73, 0xbb, 0x1c, 0xae, 0xf4, 0xcf, 0xe1, 0x5a, 0xc7, 0xb1, 0x27, 0x1d, 0xea, 0x3d, 0xbc, 0xa2, 0x0b, 0x7a, 0x81, - 0x03, 0x84, 0xfa, 0x3f, 0x72, 0x70, 0x75, 0x11, 0xff, 0xdf, 0xa6, 0xb3, 0x3a, 0xd7, 0xcd, 0x2f, + 0x03, 0x84, 0xfa, 0xdf, 0x73, 0x70, 0x75, 0x11, 0xff, 0xdf, 0xa6, 0xb3, 0x3a, 0xd7, 0xcd, 0x2f, 0xce, 0x77, 0xf3, 0x3f, 0x83, 0xed, 0x0c, 0xad, 0xa7, 0x91, 0x13, 0xd7, 0xf4, 0xa2, 0x43, 0xca, 0x66, 0xaa, 0x92, 0xd7, 0xe2, 0x68, 0xf5, 0x1f, 0xe6, 0x60, 0x6b, 0xd1, 0x00, 0xd1, 0x57, 0xa9, 0x75, 0x95, 0xae, 0x4a, 0xce, 0x9e, 0xf4, 0x68, 0x69, 0x3f, 0x4f, 0x2e, 0xed, 0xcd, 0xf3, 0x19, @@ -8257,7 +8265,7 @@ var fileDescriptor2 = []byte{ 0xb7, 0x07, 0x00, 0xec, 0xf1, 0xf6, 0x82, 0x6f, 0xd6, 0x19, 0x1d, 0xff, 0x66, 0x7d, 0x1a, 0xfe, 0x9c, 0xfb, 0x81, 0xe8, 0x08, 0x6a, 0xa9, 0xe3, 0x4e, 0x55, 0xcc, 0x92, 0xc4, 0x58, 0xda, 0xdf, 0x32, 0x31, 0xe3, 0x0f, 0x56, 0xf4, 0x1b, 0x6d, 0x40, 0x49, 0x3a, 0x4f, 0xd5, 0xb1, 0x28, 0xa9, - 0xff, 0x75, 0x09, 0x60, 0xc7, 0xb1, 0x0d, 0x93, 0xab, 0x92, 0xfb, 0x00, 0x42, 0x01, 0xc4, 0x5f, + 0xff, 0x65, 0x09, 0x60, 0xc7, 0xb1, 0x0d, 0x93, 0xab, 0x92, 0xfb, 0x00, 0x42, 0x01, 0xc4, 0x5f, 0x9e, 0xa2, 0x54, 0xdf, 0x07, 0x24, 0xc0, 0x15, 0x4e, 0x45, 0x87, 0xfb, 0x63, 0xa8, 0x45, 0xd7, 0x9c, 0xb4, 0x52, 0x7e, 0x61, 0xa5, 0xe8, 0x15, 0x31, 0xad, 0xf6, 0x7b, 0xb0, 0x92, 0x3a, 0xe8, 0x65, 0xd5, 0xaf, 0x34, 0x20, 0x5c, 0xd3, 0xe5, 0xb9, 0x78, 0x00, 0xd5, 0xb0, 0x36, 0x6d, 0xb3, @@ -8281,7 +8289,7 @@ var fileDescriptor2 = []byte{ 0x3c, 0x5e, 0x42, 0x2a, 0xd4, 0xa9, 0x5f, 0x60, 0x91, 0x71, 0xa0, 0x4d, 0x1d, 0x3f, 0xfc, 0x58, 0xb2, 0x3a, 0xf3, 0x49, 0x87, 0x8c, 0x83, 0x7d, 0xc7, 0x0f, 0xd4, 0xcf, 0xa1, 0x2e, 0x9e, 0xe2, 0x0b, 0xf6, 0x67, 0x7e, 0xae, 0xe5, 0x13, 0x6b, 0x2c, 0x1c, 0x5e, 0xf6, 0x5b, 0xbd, 0x09, 0x8d, - 0x0e, 0xbb, 0x1b, 0xf1, 0xc8, 0x58, 0x30, 0x88, 0x06, 0x22, 0x6e, 0x1c, 0xf9, 0x40, 0xfe, 0x5b, + 0x0e, 0xbb, 0x1b, 0xf1, 0xc8, 0x58, 0x30, 0x88, 0x06, 0x22, 0x6e, 0x1c, 0xf9, 0x40, 0xfe, 0x6b, 0x01, 0x96, 0x39, 0x81, 0x1f, 0x3f, 0x7e, 0xe5, 0xc3, 0xcf, 0x2a, 0x6f, 0x26, 0x2e, 0x9c, 0x5a, 0x3c, 0x7e, 0x15, 0xbc, 0x3f, 0x81, 0x4a, 0xfc, 0x92, 0x20, 0x9f, 0x7e, 0xf5, 0x9a, 0x5a, 0x4b, 0x1c, 0xd3, 0xa2, 0x77, 0xa0, 0x30, 0x15, 0xde, 0x78, 0xe2, 0x78, 0x19, 0xad, 0x07, 0xa6, 0x78, @@ -8306,7 +8314,7 @@ var fileDescriptor2 = []byte{ 0x2a, 0x9c, 0x0c, 0x07, 0x74, 0xb6, 0x44, 0x82, 0xb2, 0x3a, 0xce, 0x9b, 0x86, 0xfa, 0xeb, 0x1c, 0xac, 0xef, 0xf2, 0xf5, 0x64, 0x6b, 0xbc, 0x6b, 0xfa, 0x81, 0x6e, 0x8f, 0x08, 0x4b, 0xb0, 0x15, 0x46, 0xbe, 0xb9, 0x2a, 0x35, 0x04, 0x4a, 0xcc, 0xf5, 0xa5, 0x10, 0x9d, 0xa9, 0xc7, 0xee, 0x83, - 0xe7, 0xd4, 0xe3, 0x8b, 0x71, 0x29, 0x44, 0x27, 0xea, 0xa9, 0xff, 0xa1, 0x08, 0x25, 0x9e, 0x45, + 0xe7, 0xd4, 0xe3, 0x8b, 0x71, 0x29, 0x44, 0x27, 0xea, 0xa9, 0xff, 0xbb, 0x08, 0x25, 0x9e, 0x45, 0x34, 0xb3, 0xa2, 0x89, 0xf7, 0x49, 0xf9, 0xe4, 0xfb, 0x24, 0xea, 0xf9, 0x50, 0x4f, 0x82, 0xd8, 0xfc, 0xfa, 0xba, 0xc0, 0x3d, 0x1f, 0x0e, 0x62, 0xd7, 0xd7, 0xef, 0x81, 0x22, 0x08, 0x84, 0x95, 0x11, 0x7b, 0xa2, 0x82, 0x1b, 0x1c, 0xde, 0x0c, 0xc1, 0xec, 0x0b, 0x37, 0xea, 0x5b, 0x50, 0x01, @@ -8314,95 +8322,96 @@ var fileDescriptor2 = []byte{ 0xfe, 0x7c, 0xf1, 0x41, 0x7c, 0xf9, 0x55, 0x22, 0xe3, 0x0b, 0x8e, 0xe3, 0x43, 0xd8, 0x08, 0x77, 0x6c, 0x6a, 0x8e, 0xb9, 0x92, 0xbd, 0x96, 0xd8, 0x6c, 0x99, 0xc5, 0xc5, 0xeb, 0xc6, 0xbc, 0x25, 0xff, 0x9c, 0xbd, 0x0f, 0x19, 0x13, 0x83, 0x78, 0xfc, 0x85, 0x53, 0x25, 0x6d, 0x26, 0x76, 0x64, - 0x34, 0x4e, 0x52, 0xcf, 0xfd, 0x6c, 0x04, 0x5e, 0xf9, 0xb3, 0x91, 0x74, 0xf0, 0xa3, 0x7a, 0xd1, - 0xe0, 0x87, 0xea, 0x40, 0x3d, 0xd1, 0xbf, 0x33, 0x82, 0x6b, 0xc9, 0x6f, 0x01, 0xf3, 0x99, 0x6f, - 0x01, 0xdf, 0x86, 0x15, 0x1e, 0x5b, 0xd0, 0x74, 0x5f, 0x8b, 0xce, 0x6d, 0x75, 0x5c, 0xe3, 0xd0, - 0xa6, 0x4f, 0xfd, 0x54, 0xb5, 0x05, 0xe5, 0x50, 0x0b, 0x9c, 0xe1, 0xd3, 0xa4, 0xde, 0x57, 0xe4, - 0xd3, 0xef, 0x2b, 0xd4, 0xff, 0x5e, 0x84, 0x0a, 0xe5, 0xc3, 0x8f, 0xe7, 0xf1, 0xdb, 0x95, 0xdc, - 0x6b, 0xbd, 0x5d, 0xc9, 0x5f, 0xfc, 0xed, 0x0a, 0xdd, 0x68, 0x33, 0x57, 0xb8, 0x6c, 0xf9, 0x99, - 0xcb, 0xbb, 0x3a, 0x72, 0x3c, 0x43, 0x33, 0xdd, 0xe3, 0x8f, 0x45, 0xc4, 0x10, 0x38, 0xa8, 0xed, - 0x1e, 0x7f, 0x9c, 0x24, 0x78, 0x28, 0xd4, 0x48, 0x4c, 0xf0, 0x90, 0x25, 0x30, 0xe3, 0x87, 0x3b, - 0xc6, 0x41, 0x3c, 0x26, 0xe1, 0xa0, 0x90, 0x43, 0x4c, 0xf0, 0x50, 0xbc, 0x53, 0x88, 0x09, 0x1e, - 0x52, 0x45, 0xec, 0x13, 0xcf, 0xd4, 0x2d, 0xf1, 0x2e, 0x41, 0x94, 0xd0, 0x8f, 0xa0, 0x1e, 0xc6, - 0x3f, 0x39, 0xef, 0x0a, 0x73, 0x62, 0x6b, 0x21, 0x90, 0x71, 0x4f, 0x11, 0x3d, 0x64, 0xf2, 0x97, - 0x24, 0x7a, 0xc8, 0xd2, 0x48, 0x30, 0x9e, 0x1a, 0x7b, 0x7b, 0xc1, 0x45, 0xac, 0x80, 0x6b, 0x1c, - 0xd8, 0x65, 0x30, 0xda, 0xcf, 0x91, 0x3e, 0x3a, 0x22, 0xe2, 0xa1, 0x55, 0x8d, 0x91, 0x00, 0x03, - 0xb1, 0xc7, 0x55, 0xe8, 0x1d, 0x58, 0x89, 0x08, 0x58, 0x02, 0x0f, 0xf6, 0xa0, 0xb4, 0x80, 0xeb, - 0x21, 0x0d, 0xcf, 0xea, 0x71, 0x0d, 0xaa, 0xe2, 0x21, 0x80, 0xa1, 0x07, 0x3a, 0xfb, 0x64, 0xa2, - 0x80, 0x2b, 0xec, 0x11, 0xc0, 0xae, 0x1e, 0xe8, 0xd4, 0x95, 0x25, 0x9e, 0xe7, 0x78, 0xec, 0x25, - 0x69, 0x01, 0xf3, 0x02, 0x7a, 0x0b, 0x44, 0x6f, 0xb4, 0x5f, 0xcc, 0x88, 0x77, 0xca, 0xde, 0x8a, - 0x16, 0x70, 0x95, 0xc3, 0xbe, 0xa6, 0x20, 0xbe, 0x14, 0x3e, 0x09, 0x04, 0xc5, 0x2a, 0xef, 0x20, - 0x03, 0x31, 0x02, 0xf5, 0x5b, 0x28, 0x62, 0xf7, 0x3b, 0x33, 0xb2, 0x60, 0xb9, 0xb3, 0x2d, 0xd8, - 0x19, 0x17, 0x24, 0x91, 0x70, 0x86, 0x01, 0x9a, 0x7f, 0xca, 0xb3, 0x85, 0x75, 0x9c, 0x49, 0x87, - 0x1c, 0x13, 0x2b, 0x4e, 0x5e, 0xb5, 0x64, 0xd1, 0xb2, 0xf0, 0xb6, 0xa5, 0x78, 0x59, 0x96, 0xf8, - 0x2e, 0x2f, 0xf0, 0x0a, 0x2a, 0x86, 0x25, 0x56, 0x46, 0x15, 0x58, 0xea, 0x37, 0xbb, 0xed, 0x1d, - 0xe5, 0x0d, 0xfa, 0xf3, 0x49, 0x73, 0xc8, 0xce, 0x68, 0x15, 0x58, 0x6a, 0x61, 0xdc, 0xc3, 0x4a, - 0x1e, 0x95, 0xa1, 0xf8, 0x4d, 0x13, 0x77, 0x95, 0x02, 0x7b, 0x7b, 0xda, 0x7d, 0xd2, 0x53, 0x8a, - 0x14, 0xbd, 0xdb, 0x7a, 0x7c, 0xb0, 0xa7, 0x2c, 0xd1, 0x9f, 0x43, 0xdc, 0xdc, 0x69, 0x29, 0xa5, - 0xdb, 0xbb, 0x50, 0x89, 0x72, 0xf7, 0x21, 0x80, 0xd2, 0x5e, 0xa7, 0xf7, 0xb8, 0xd9, 0xe1, 0x8c, - 0xf9, 0x69, 0x8e, 0x3d, 0x26, 0x6d, 0xee, 0xfe, 0x54, 0x6b, 0x77, 0x95, 0x3c, 0x4b, 0xca, 0xb0, - 0xfb, 0x53, 0xad, 0x77, 0x30, 0xe4, 0xe9, 0x26, 0x9e, 0xe3, 0x27, 0x4a, 0xf1, 0x76, 0x27, 0xf1, - 0x5d, 0x2d, 0xd7, 0xbf, 0x48, 0x81, 0x5a, 0xa7, 0xd7, 0x7b, 0x76, 0xd0, 0xd7, 0x5a, 0x2f, 0x9a, - 0x3b, 0x43, 0xe5, 0x0d, 0xb4, 0x0a, 0x75, 0x01, 0xe9, 0xf4, 0xba, 0x7b, 0x2d, 0xcc, 0x73, 0x2f, - 0x08, 0xd0, 0xe0, 0x69, 0x0f, 0x0f, 0x5b, 0x58, 0xc9, 0xdf, 0xfe, 0x55, 0x0e, 0xaa, 0x52, 0xd8, - 0x48, 0xca, 0x3b, 0xf9, 0x06, 0xaa, 0x41, 0xb9, 0xdb, 0x6a, 0xef, 0x3d, 0x7d, 0xdc, 0xa3, 0xb5, - 0x97, 0xa1, 0x30, 0x6c, 0xee, 0x89, 0x6e, 0x0d, 0xb4, 0x7e, 0x73, 0xf8, 0x54, 0x29, 0xa0, 0x3a, - 0x54, 0x76, 0x7a, 0xfb, 0xfb, 0x07, 0xdd, 0xf6, 0xf0, 0x5b, 0xa5, 0x48, 0x5b, 0x6d, 0xbd, 0x18, - 0x6a, 0x31, 0x68, 0x89, 0x1e, 0x7e, 0x3b, 0x4d, 0xbc, 0xd7, 0x92, 0x80, 0x25, 0xce, 0xfa, 0xc5, - 0x50, 0x7b, 0xda, 0xeb, 0x2b, 0xcb, 0xb7, 0xdf, 0x83, 0x4a, 0x14, 0x20, 0x62, 0x4f, 0xf9, 0xbb, - 0xdf, 0xca, 0x6f, 0xfa, 0x01, 0x4a, 0xed, 0xee, 0xf3, 0x16, 0x1e, 0x2a, 0xf9, 0xdb, 0xb7, 0x41, - 0x49, 0x87, 0x7c, 0x50, 0x09, 0xf2, 0xad, 0xaf, 0x95, 0x37, 0xe8, 0xdf, 0xbd, 0x96, 0x92, 0xa3, - 0x7f, 0x3b, 0x2d, 0x25, 0x7f, 0xfb, 0x43, 0xf1, 0xcc, 0x4b, 0x9c, 0xa3, 0x12, 0xc9, 0x35, 0x9b, - 0x3b, 0x3b, 0xad, 0xfe, 0x90, 0x33, 0xc7, 0xad, 0x9f, 0xb2, 0x57, 0xc2, 0xb7, 0x0f, 0x60, 0x6d, - 0xce, 0xd1, 0x98, 0x0e, 0x2a, 0xea, 0xbb, 0xd6, 0xdc, 0xdd, 0x55, 0xde, 0xa0, 0x47, 0xf1, 0x18, - 0x84, 0x5b, 0xfb, 0xbd, 0xe7, 0xb4, 0xe1, 0x4b, 0xb0, 0x2a, 0x43, 0xc5, 0x67, 0x08, 0xb7, 0x3f, - 0x80, 0x7a, 0xe2, 0x08, 0x4c, 0x67, 0x70, 0xbf, 0xb5, 0xab, 0xed, 0xf7, 0x28, 0xab, 0x06, 0x54, - 0x69, 0x21, 0x24, 0xcf, 0xdd, 0x7e, 0x08, 0x8d, 0x94, 0x23, 0x9d, 0x7c, 0xe2, 0x4c, 0xa7, 0x63, - 0xbf, 0xdf, 0xc3, 0xa2, 0xf7, 0xad, 0x17, 0xec, 0x77, 0xfe, 0xc1, 0x6f, 0xae, 0x42, 0x79, 0x8f, - 0xca, 0x77, 0xd3, 0x35, 0xd1, 0xe7, 0x50, 0x0e, 0x73, 0xb1, 0xa3, 0xcb, 0x09, 0xf7, 0x5f, 0xce, - 0xcf, 0xbe, 0xbd, 0x91, 0xd1, 0xca, 0xad, 0xa9, 0x1b, 0x9c, 0xa2, 0xcf, 0x60, 0x59, 0x64, 0x63, - 0x47, 0x5b, 0x72, 0x6d, 0x39, 0x41, 0xfb, 0x19, 0x95, 0x4b, 0x3c, 0x4f, 0x3b, 0x92, 0x0c, 0x75, - 0x22, 0x95, 0xfb, 0xf6, 0x56, 0x16, 0x21, 0xd4, 0xd3, 0x67, 0xb0, 0x2c, 0xb2, 0x34, 0xa3, 0x54, - 0x18, 0x37, 0xce, 0x1c, 0xbd, 0xb0, 0xe5, 0x26, 0x40, 0x9c, 0x97, 0x19, 0x5d, 0x91, 0x7d, 0x8e, - 0x54, 0x16, 0xf7, 0x85, 0x2c, 0x76, 0xa0, 0x1c, 0x26, 0x53, 0x97, 0x27, 0x2e, 0x95, 0xb9, 0x7d, - 0x7b, 0x7b, 0x1e, 0x8a, 0x0f, 0xe1, 0x5e, 0x0e, 0xed, 0x01, 0xc4, 0xa9, 0x97, 0xe5, 0x7e, 0x64, - 0xf2, 0xad, 0x6f, 0xbf, 0x39, 0x1f, 0x29, 0x66, 0xe3, 0x4b, 0xa8, 0x44, 0x79, 0xc7, 0xd1, 0xf6, - 0xe2, 0x64, 0xe4, 0x0b, 0x87, 0xd3, 0x82, 0x9a, 0x9c, 0x55, 0x1c, 0x49, 0x51, 0xa0, 0x39, 0xd9, - 0xc6, 0xcf, 0x9a, 0xd8, 0x38, 0x8b, 0xb8, 0x3c, 0xa0, 0x4c, 0x6e, 0xf1, 0x33, 0x26, 0xb6, 0x2a, - 0x65, 0x16, 0x47, 0xd2, 0xb8, 0xb3, 0x09, 0xc7, 0x17, 0x32, 0xe9, 0x40, 0x55, 0x4a, 0xff, 0x2d, - 0x33, 0xc9, 0xe6, 0x17, 0xdf, 0xbe, 0xba, 0x00, 0x1b, 0x2d, 0x53, 0x0b, 0x6a, 0x72, 0x46, 0x70, - 0x79, 0x72, 0xe6, 0x64, 0x0a, 0x5f, 0xd8, 0xa9, 0x67, 0xd0, 0x48, 0x65, 0x03, 0x47, 0x37, 0xe6, - 0x89, 0xde, 0x85, 0x98, 0x3d, 0x87, 0x46, 0x2a, 0x6b, 0xb7, 0xcc, 0x6c, 0x7e, 0x1e, 0xf1, 0xed, - 0xb7, 0xce, 0xa0, 0x10, 0x92, 0xf4, 0x35, 0xa0, 0x6c, 0x0e, 0x6f, 0xf4, 0xa3, 0xc4, 0x88, 0xe7, - 0x67, 0xf8, 0x5e, 0xd8, 0xd5, 0x2f, 0xf8, 0x56, 0xd5, 0x83, 0x23, 0x94, 0xbd, 0x71, 0x09, 0x2b, - 0x5f, 0x9e, 0x83, 0x11, 0x5d, 0x8a, 0x77, 0x2b, 0x65, 0x91, 0xdd, 0xad, 0x12, 0x97, 0xf3, 0x76, - 0x2b, 0x65, 0x70, 0x79, 0x61, 0x16, 0xe8, 0xcc, 0x6e, 0x95, 0x7a, 0x71, 0x2f, 0x87, 0xda, 0xd1, - 0x85, 0x14, 0xcf, 0x88, 0x8c, 0xae, 0x65, 0xfa, 0x9c, 0x48, 0x95, 0xbc, 0xa8, 0x37, 0xb7, 0x72, - 0xa8, 0x09, 0xe5, 0x30, 0x9b, 0xb0, 0xdc, 0x9f, 0x54, 0x9a, 0x63, 0xb9, 0x3f, 0x99, 0xe4, 0xc3, - 0x3d, 0xa8, 0xc9, 0x09, 0x75, 0x51, 0x56, 0x8a, 0x13, 0xac, 0xae, 0x2d, 0x42, 0x47, 0xc3, 0xfb, - 0x09, 0x94, 0x78, 0x96, 0x5d, 0x94, 0xbc, 0xe6, 0x8a, 0x93, 0xe3, 0x2e, 0x9c, 0xde, 0x2f, 0xa1, - 0x12, 0xa5, 0xdb, 0x95, 0xd5, 0x4f, 0x3a, 0x07, 0xef, 0x42, 0x06, 0x5f, 0xc1, 0xb2, 0xc8, 0xb0, - 0x2b, 0x8b, 0x48, 0x32, 0x35, 0xef, 0xf6, 0xe5, 0x39, 0x98, 0xa8, 0xf7, 0x5f, 0x42, 0x25, 0xca, - 0x5f, 0x29, 0x77, 0x21, 0x9d, 0x84, 0xf7, 0x2c, 0x0d, 0x28, 0xa7, 0xa9, 0x94, 0xe7, 0x73, 0x4e, - 0x36, 0xdd, 0x85, 0x6c, 0xda, 0x00, 0x71, 0x4a, 0x48, 0x59, 0x58, 0x33, 0xe9, 0x70, 0x65, 0x95, - 0x9e, 0x4d, 0x81, 0x7b, 0x2f, 0x47, 0x35, 0xa1, 0x94, 0xd9, 0x56, 0x56, 0x62, 0xd9, 0x84, 0xb7, - 0x0b, 0xfb, 0xb3, 0xc7, 0x84, 0x56, 0xba, 0x1d, 0x4c, 0x0a, 0x6d, 0x26, 0x91, 0xeb, 0x42, 0x46, - 0xfb, 0x61, 0xfa, 0x32, 0x89, 0xd7, 0x5b, 0xe9, 0x39, 0xba, 0x38, 0xbb, 0x03, 0x9e, 0x79, 0x59, - 0x62, 0x76, 0x3d, 0x39, 0x1d, 0x59, 0x56, 0x37, 0x16, 0x13, 0xa4, 0x54, 0x75, 0x1c, 0x7b, 0x4d, - 0xaa, 0xea, 0x74, 0x56, 0xd5, 0xf3, 0x55, 0x75, 0xcc, 0x29, 0xa3, 0xaa, 0x2f, 0xcc, 0x0c, 0x43, - 0x3d, 0x91, 0xa6, 0x55, 0x5e, 0x82, 0x79, 0xb9, 0x5e, 0xb7, 0xaf, 0x2f, 0xc4, 0x47, 0xe3, 0x1c, - 0xf0, 0x7f, 0x52, 0x91, 0x8e, 0xc5, 0xbe, 0x3d, 0x47, 0xf0, 0x33, 0xc9, 0x43, 0x17, 0x76, 0xf4, - 0xdb, 0xe8, 0xdf, 0x55, 0xa4, 0xf9, 0xde, 0x9c, 0xbf, 0x19, 0x2e, 0xce, 0x7a, 0xc2, 0xd3, 0x4f, - 0x66, 0x18, 0xbf, 0x33, 0x6f, 0x0f, 0x64, 0xd9, 0xbe, 0x7b, 0x1e, 0x99, 0x3c, 0x31, 0x73, 0xd2, - 0xa6, 0xca, 0x13, 0xb3, 0x38, 0xab, 0xea, 0x59, 0x6e, 0xae, 0xc8, 0x98, 0x9a, 0xb2, 0x60, 0x52, - 0x8e, 0xce, 0xf3, 0x9d, 0x4d, 0x56, 0x3f, 0x63, 0xbe, 0x2e, 0xc2, 0x42, 0x98, 0x2f, 0xc6, 0x20, - 0xa5, 0x05, 0xe5, 0xea, 0xdb, 0xf3, 0x50, 0xd1, 0xcc, 0x44, 0xbe, 0x59, 0xba, 0x1f, 0x99, 0xa4, - 0xa7, 0x17, 0xf0, 0xcd, 0x18, 0x8f, 0xac, 0x6f, 0x76, 0x11, 0x26, 0xa1, 0xaf, 0xca, 0x58, 0xa4, - 0x7d, 0xd5, 0x8b, 0x30, 0x10, 0xfb, 0x29, 0x4a, 0x44, 0x9a, 0xde, 0x4f, 0xe9, 0x1c, 0xa7, 0xe9, - 0xfd, 0x94, 0xc9, 0x60, 0xca, 0x75, 0xad, 0x94, 0xa1, 0x54, 0x1e, 0x59, 0x36, 0x71, 0xe9, 0x59, - 0x23, 0x8b, 0x12, 0x78, 0xca, 0x23, 0x4b, 0x67, 0xf5, 0x3c, 0x53, 0x54, 0xa2, 0x14, 0x9b, 0x09, - 0x51, 0x49, 0x27, 0xde, 0x5c, 0xc8, 0x82, 0x5b, 0xf1, 0xc7, 0x53, 0x37, 0x65, 0xc5, 0xe3, 0xa4, - 0x93, 0xe7, 0x5b, 0x71, 0x5a, 0x3b, 0x63, 0xc5, 0x2f, 0xc0, 0x80, 0x1b, 0xac, 0x30, 0x5e, 0x92, - 0x32, 0x58, 0xa9, 0x30, 0xca, 0x22, 0x26, 0x87, 0x25, 0x56, 0xfe, 0xe8, 0xff, 0x07, 0x00, 0x00, - 0xff, 0xff, 0x6b, 0x5b, 0xb1, 0x5e, 0x96, 0x6c, 0x00, 0x00, + 0x34, 0x4e, 0x52, 0xcf, 0xfd, 0x6c, 0x04, 0x5e, 0xf9, 0xb3, 0x91, 0x74, 0xf0, 0xa3, 0x7a, 0xe1, + 0xe0, 0xc7, 0xdb, 0xe2, 0x39, 0x42, 0xe0, 0x68, 0x06, 0x39, 0x36, 0x47, 0x44, 0x3c, 0x70, 0xaf, + 0x51, 0xe8, 0xd0, 0xd9, 0x65, 0x30, 0xd5, 0x81, 0x7a, 0x62, 0x14, 0x67, 0x84, 0xe0, 0x92, 0x5f, + 0x0c, 0xe6, 0x33, 0x5f, 0x0c, 0xbe, 0x0d, 0x2b, 0x3c, 0x02, 0xa1, 0xe9, 0xbe, 0x16, 0x9d, 0xee, + 0xea, 0xb8, 0xc6, 0xa1, 0x4d, 0x9f, 0x7a, 0xb3, 0x6a, 0x0b, 0xca, 0xa1, 0xae, 0x38, 0xc3, 0xf3, + 0x49, 0xbd, 0xc2, 0xc8, 0xa7, 0x5f, 0x61, 0xa8, 0xff, 0xad, 0x08, 0x15, 0xca, 0x87, 0x1f, 0xe2, + 0xe3, 0x17, 0x2e, 0xb9, 0xd7, 0x7a, 0xe1, 0x92, 0xbf, 0xf8, 0x0b, 0x17, 0xba, 0x1d, 0x67, 0xae, + 0x70, 0xec, 0xf2, 0x33, 0x97, 0x77, 0x75, 0xe4, 0x78, 0x86, 0x66, 0xba, 0xc7, 0x1f, 0x8b, 0xb8, + 0x22, 0x70, 0x50, 0xdb, 0x3d, 0xfe, 0x38, 0x49, 0xf0, 0x50, 0x28, 0x9b, 0x98, 0xe0, 0x21, 0x4b, + 0x73, 0xc6, 0x8f, 0x80, 0x8c, 0x83, 0x78, 0x72, 0xc2, 0x41, 0x21, 0x87, 0x98, 0xe0, 0xa1, 0x78, + 0xcd, 0x10, 0x13, 0x3c, 0xa4, 0xea, 0xda, 0x27, 0x9e, 0xa9, 0x5b, 0xe2, 0xf5, 0x82, 0x28, 0xa1, + 0x1f, 0x41, 0x3d, 0x8c, 0x92, 0x72, 0xde, 0x15, 0xe6, 0xea, 0xd6, 0x42, 0x20, 0xe3, 0x9e, 0x22, + 0x7a, 0xc8, 0xa4, 0x34, 0x49, 0xf4, 0x90, 0x25, 0x9b, 0x60, 0x3c, 0x35, 0xf6, 0x42, 0x83, 0x0b, + 0x62, 0x01, 0xd7, 0x38, 0xb0, 0xcb, 0x60, 0xb4, 0x9f, 0x23, 0x7d, 0x74, 0x44, 0xc4, 0x73, 0xac, + 0x1a, 0x23, 0x01, 0x06, 0x62, 0x4f, 0xb0, 0xd0, 0x3b, 0xb0, 0x12, 0x11, 0xb0, 0x34, 0x1f, 0xec, + 0xd9, 0x69, 0x01, 0xd7, 0x43, 0x1a, 0x9e, 0xfb, 0xe3, 0x1a, 0x54, 0xc5, 0x73, 0x01, 0x43, 0x0f, + 0x74, 0xf6, 0x61, 0x45, 0x01, 0x57, 0xd8, 0x53, 0x81, 0x5d, 0x3d, 0xd0, 0xa9, 0xc3, 0x4b, 0x3c, + 0xcf, 0xf1, 0xd8, 0x7b, 0xd3, 0x02, 0xe6, 0x05, 0xf4, 0x16, 0x88, 0xde, 0x68, 0xbf, 0x98, 0x11, + 0xef, 0x94, 0xbd, 0x28, 0x2d, 0xe0, 0x2a, 0x87, 0x7d, 0x4d, 0x41, 0x7c, 0x29, 0x7c, 0x12, 0x08, + 0x8a, 0x55, 0xde, 0x41, 0x06, 0x62, 0x04, 0xea, 0xb7, 0x50, 0xc4, 0xee, 0x77, 0x66, 0x64, 0xe7, + 0x72, 0x67, 0xdb, 0xb9, 0x33, 0xae, 0x51, 0x22, 0xe1, 0x0c, 0xc3, 0x38, 0xff, 0x94, 0xe7, 0x14, + 0xeb, 0x38, 0x93, 0x0e, 0x39, 0x26, 0x56, 0x9c, 0xe2, 0x6a, 0xc9, 0xa2, 0x65, 0xe1, 0x93, 0x4b, + 0x51, 0xb5, 0x2c, 0xf1, 0x5d, 0x5e, 0xe0, 0x15, 0x54, 0x0c, 0x4b, 0xac, 0x8c, 0x2a, 0xb0, 0xd4, + 0x6f, 0x76, 0xdb, 0x3b, 0xca, 0x1b, 0xf4, 0xe7, 0x93, 0xe6, 0x90, 0x9d, 0xe4, 0x2a, 0xb0, 0xd4, + 0xc2, 0xb8, 0x87, 0x95, 0x3c, 0x2a, 0x43, 0xf1, 0x9b, 0x26, 0xee, 0x2a, 0x05, 0xf6, 0x42, 0xb5, + 0xfb, 0xa4, 0xa7, 0x14, 0x29, 0x7a, 0xb7, 0xf5, 0xf8, 0x60, 0x4f, 0x59, 0xa2, 0x3f, 0x87, 0xb8, + 0xb9, 0xd3, 0x52, 0x4a, 0xb7, 0x77, 0xa1, 0x12, 0x65, 0xf8, 0x43, 0x00, 0xa5, 0xbd, 0x4e, 0xef, + 0x71, 0xb3, 0xc3, 0x19, 0xf3, 0x33, 0x1f, 0x7b, 0x72, 0xda, 0xdc, 0xfd, 0xa9, 0xd6, 0xee, 0x2a, + 0x79, 0x96, 0xba, 0x61, 0xf7, 0xa7, 0x5a, 0xef, 0x60, 0xc8, 0x93, 0x52, 0x3c, 0xc7, 0x4f, 0x94, + 0xe2, 0xed, 0x4e, 0xe2, 0xeb, 0x5b, 0xae, 0xa5, 0x91, 0x02, 0xb5, 0x4e, 0xaf, 0xf7, 0xec, 0xa0, + 0xaf, 0xb5, 0x5e, 0x34, 0x77, 0x86, 0xca, 0x1b, 0x68, 0x15, 0xea, 0x02, 0xd2, 0xe9, 0x75, 0xf7, + 0x5a, 0x98, 0x67, 0x68, 0x10, 0xa0, 0xc1, 0xd3, 0x1e, 0x1e, 0xb6, 0xb0, 0x92, 0xbf, 0xfd, 0xab, + 0x1c, 0x54, 0xa5, 0xe0, 0x92, 0x94, 0x9d, 0xf2, 0x0d, 0x54, 0x83, 0x72, 0xb7, 0xd5, 0xde, 0x7b, + 0xfa, 0xb8, 0x47, 0x6b, 0x2f, 0x43, 0x61, 0xd8, 0xdc, 0x13, 0xdd, 0x1a, 0x68, 0xfd, 0xe6, 0xf0, + 0xa9, 0x52, 0x40, 0x75, 0xa8, 0xec, 0xf4, 0xf6, 0xf7, 0x0f, 0xba, 0xed, 0xe1, 0xb7, 0x4a, 0x91, + 0xb6, 0xda, 0x7a, 0x31, 0xd4, 0x62, 0xd0, 0x12, 0x3d, 0x22, 0x77, 0x9a, 0x78, 0xaf, 0x25, 0x01, + 0x4b, 0x9c, 0xf5, 0x8b, 0xa1, 0xf6, 0xb4, 0xd7, 0x57, 0x96, 0x6f, 0xbf, 0x07, 0x95, 0x28, 0x8c, + 0xc4, 0x1e, 0xfc, 0x77, 0xbf, 0x95, 0x5f, 0xfe, 0x03, 0x94, 0xda, 0xdd, 0xe7, 0x2d, 0x3c, 0x54, + 0xf2, 0xb7, 0x6f, 0x83, 0x92, 0x0e, 0x0c, 0xa1, 0x12, 0xe4, 0x5b, 0x5f, 0x2b, 0x6f, 0xd0, 0xbf, + 0x7b, 0x2d, 0x25, 0x47, 0xff, 0x76, 0x5a, 0x4a, 0xfe, 0xf6, 0x87, 0xe2, 0x31, 0x98, 0x38, 0x6d, + 0x25, 0x52, 0x70, 0x36, 0x77, 0x76, 0x5a, 0xfd, 0x21, 0x67, 0x8e, 0x5b, 0x3f, 0x65, 0x6f, 0x89, + 0x6f, 0x1f, 0xc0, 0xda, 0x9c, 0x03, 0x34, 0x1d, 0x54, 0xd4, 0x77, 0xad, 0xb9, 0xbb, 0xab, 0xbc, + 0x41, 0x0f, 0xec, 0x31, 0x08, 0xb7, 0xf6, 0x7b, 0xcf, 0x69, 0xc3, 0x97, 0x60, 0x55, 0x86, 0x8a, + 0x8f, 0x15, 0x6e, 0x7f, 0x00, 0xf5, 0xc4, 0x41, 0x99, 0xce, 0xe0, 0x7e, 0x6b, 0x57, 0xdb, 0xef, + 0x51, 0x56, 0x0d, 0xa8, 0xd2, 0x42, 0x48, 0x9e, 0xbb, 0xfd, 0x10, 0x1a, 0x29, 0x77, 0x3b, 0xf9, + 0x10, 0x9a, 0x4e, 0xc7, 0x7e, 0xbf, 0x87, 0x45, 0xef, 0x5b, 0x2f, 0xd8, 0xef, 0xfc, 0x83, 0xdf, + 0x5c, 0x85, 0xf2, 0x1e, 0x95, 0xef, 0xa6, 0x6b, 0xa2, 0xcf, 0xa1, 0x1c, 0x66, 0x6c, 0x47, 0x97, + 0x13, 0x87, 0x04, 0x39, 0x8b, 0xfb, 0xf6, 0x46, 0x46, 0x2b, 0xb7, 0xa6, 0x6e, 0x70, 0x8a, 0x3e, + 0x83, 0x65, 0x91, 0xb3, 0x1d, 0x6d, 0xc9, 0xb5, 0xe5, 0x34, 0xee, 0x67, 0x54, 0x2e, 0xf1, 0x6c, + 0xee, 0x48, 0x32, 0xe7, 0x89, 0x84, 0xef, 0xdb, 0x5b, 0x59, 0x84, 0x50, 0x4f, 0x9f, 0xc1, 0xb2, + 0xc8, 0xe5, 0x8c, 0x52, 0xc1, 0xde, 0x38, 0xbf, 0xf4, 0xc2, 0x96, 0x9b, 0x00, 0x71, 0xf6, 0x66, + 0x74, 0x45, 0xf6, 0x4c, 0x52, 0xb9, 0xde, 0x17, 0xb2, 0xd8, 0x81, 0x72, 0x98, 0x72, 0x5d, 0x9e, + 0xb8, 0x54, 0x7e, 0xf7, 0xed, 0xed, 0x79, 0x28, 0x3e, 0x84, 0x7b, 0x39, 0xb4, 0x07, 0x10, 0x27, + 0x68, 0x96, 0xfb, 0x91, 0xc9, 0xca, 0xbe, 0xfd, 0xe6, 0x7c, 0xa4, 0x98, 0x8d, 0x2f, 0xa1, 0x12, + 0x65, 0x27, 0x47, 0xdb, 0x8b, 0x53, 0x96, 0x2f, 0x1c, 0x4e, 0x0b, 0x6a, 0x72, 0xee, 0x71, 0x24, + 0xc5, 0x8a, 0xe6, 0xe4, 0x24, 0x3f, 0x6b, 0x62, 0xe3, 0x5c, 0xe3, 0xf2, 0x80, 0x32, 0x19, 0xc8, + 0xcf, 0x98, 0xd8, 0xaa, 0x94, 0x7f, 0x1c, 0x49, 0xe3, 0xce, 0xa6, 0x25, 0x5f, 0xc8, 0xa4, 0x03, + 0x55, 0x29, 0x49, 0xb8, 0xcc, 0x24, 0x9b, 0x85, 0x7c, 0xfb, 0xea, 0x02, 0x6c, 0xb4, 0x4c, 0x2d, + 0xa8, 0xc9, 0x79, 0xc3, 0xe5, 0xc9, 0x99, 0x93, 0x4f, 0x7c, 0x61, 0xa7, 0x9e, 0x41, 0x23, 0x95, + 0x33, 0x1c, 0xdd, 0x98, 0x27, 0x7a, 0x17, 0x62, 0xf6, 0x1c, 0x1a, 0xa9, 0xdc, 0xde, 0x32, 0xb3, + 0xf9, 0xd9, 0xc6, 0xb7, 0xdf, 0x3a, 0x83, 0x42, 0x48, 0xd2, 0xd7, 0x80, 0xb2, 0x99, 0xbe, 0xd1, + 0x8f, 0x12, 0x23, 0x9e, 0x9f, 0x07, 0x7c, 0x61, 0x57, 0xbf, 0xe0, 0x5b, 0x55, 0x0f, 0x8e, 0x50, + 0xf6, 0x5e, 0x26, 0xac, 0x7c, 0x79, 0x0e, 0x46, 0x74, 0x29, 0xde, 0xad, 0x94, 0x45, 0x76, 0xb7, + 0x4a, 0x5c, 0xce, 0xdb, 0xad, 0x94, 0xc1, 0xe5, 0x85, 0xb9, 0xa2, 0x33, 0xbb, 0x55, 0xea, 0xc5, + 0xbd, 0x1c, 0x6a, 0x47, 0xd7, 0x56, 0x3c, 0x6f, 0x32, 0xba, 0x96, 0xe9, 0x73, 0x22, 0xa1, 0xf2, + 0xa2, 0xde, 0xdc, 0xca, 0xa1, 0x26, 0x94, 0xc3, 0x9c, 0xc3, 0x72, 0x7f, 0x52, 0xc9, 0x90, 0xe5, + 0xfe, 0x64, 0x52, 0x14, 0xf7, 0xa0, 0x26, 0xa7, 0xdd, 0x45, 0x59, 0x29, 0x4e, 0xb0, 0xba, 0xb6, + 0x08, 0x1d, 0x0d, 0xef, 0x27, 0x50, 0xe2, 0xb9, 0x78, 0x51, 0xf2, 0x32, 0x2c, 0x4e, 0xa1, 0xbb, + 0x70, 0x7a, 0xbf, 0x84, 0x4a, 0x94, 0x94, 0x57, 0x56, 0x3f, 0xe9, 0x4c, 0xbd, 0x0b, 0x19, 0x7c, + 0x05, 0xcb, 0x22, 0x0f, 0xaf, 0x2c, 0x22, 0xc9, 0x04, 0xbe, 0xdb, 0x97, 0xe7, 0x60, 0xa2, 0xde, + 0x7f, 0x09, 0x95, 0x28, 0xcb, 0xa5, 0xdc, 0x85, 0x74, 0xaa, 0xde, 0xb3, 0x34, 0xa0, 0x9c, 0xcc, + 0x52, 0x9e, 0xcf, 0x39, 0x39, 0x77, 0x17, 0xb2, 0x69, 0x03, 0xc4, 0x89, 0x23, 0x65, 0x61, 0xcd, + 0x24, 0xcd, 0x95, 0x55, 0x7a, 0x36, 0x51, 0xee, 0xbd, 0x1c, 0xd5, 0x84, 0x52, 0xfe, 0x5b, 0x59, + 0x89, 0x65, 0xd3, 0xe2, 0x2e, 0xec, 0xcf, 0x1e, 0x13, 0x5a, 0xe9, 0x0e, 0x31, 0x29, 0xb4, 0x99, + 0x74, 0xaf, 0x0b, 0x19, 0xed, 0x87, 0x49, 0xce, 0x24, 0x5e, 0x6f, 0xa5, 0xe7, 0xe8, 0xe2, 0xec, + 0x0e, 0x78, 0x7e, 0x66, 0x89, 0xd9, 0xf5, 0xe4, 0x74, 0x64, 0x59, 0xdd, 0x58, 0x4c, 0x90, 0x52, + 0xd5, 0x71, 0x84, 0x36, 0xa9, 0xaa, 0xd3, 0xb9, 0x57, 0xcf, 0x57, 0xd5, 0x31, 0xa7, 0x8c, 0xaa, + 0xbe, 0x30, 0x33, 0x0c, 0xf5, 0x44, 0x32, 0x57, 0x79, 0x09, 0xe6, 0x65, 0x84, 0xdd, 0xbe, 0xbe, + 0x10, 0x1f, 0x8d, 0x73, 0xc0, 0xff, 0x95, 0x45, 0x3a, 0x62, 0xfb, 0xf6, 0x1c, 0xc1, 0xcf, 0xa4, + 0x18, 0x5d, 0xd8, 0xd1, 0x6f, 0xa3, 0x7f, 0x6a, 0x91, 0xe6, 0x7b, 0x73, 0xfe, 0x66, 0xb8, 0x38, + 0xeb, 0x09, 0x4f, 0x52, 0x99, 0x61, 0xfc, 0xce, 0xbc, 0x3d, 0x90, 0x65, 0xfb, 0xee, 0x79, 0x64, + 0xf2, 0xc4, 0xcc, 0x49, 0xae, 0x2a, 0x4f, 0xcc, 0xe2, 0xdc, 0xab, 0x67, 0xb9, 0xb9, 0x22, 0xaf, + 0x6a, 0xca, 0x82, 0x49, 0x99, 0x3c, 0xcf, 0x77, 0x36, 0x59, 0xfd, 0x8c, 0xf9, 0xba, 0x08, 0x0b, + 0x61, 0xbe, 0x18, 0x83, 0x94, 0x16, 0x94, 0xab, 0x6f, 0xcf, 0x43, 0x45, 0x33, 0x13, 0xf9, 0x66, + 0xe9, 0x7e, 0x64, 0x52, 0xa3, 0x5e, 0xc0, 0x37, 0x63, 0x3c, 0xb2, 0xbe, 0xd9, 0x45, 0x98, 0x84, + 0xbe, 0x2a, 0x63, 0x91, 0xf6, 0x55, 0x2f, 0xc2, 0x40, 0xec, 0xa7, 0x28, 0x5d, 0x69, 0x7a, 0x3f, + 0xa5, 0x33, 0xa1, 0xa6, 0xf7, 0x53, 0x26, 0xcf, 0x29, 0xd7, 0xb5, 0x52, 0x1e, 0x53, 0x79, 0x64, + 0xd9, 0xf4, 0xa6, 0x67, 0x8d, 0x2c, 0x4a, 0xf3, 0x29, 0x8f, 0x2c, 0x9d, 0xfb, 0xf3, 0x4c, 0x51, + 0x89, 0x12, 0x71, 0x26, 0x44, 0x25, 0x9d, 0x9e, 0x73, 0x21, 0x0b, 0x6e, 0xc5, 0x1f, 0x4f, 0xdd, + 0x94, 0x15, 0x8f, 0x53, 0x53, 0x9e, 0x6f, 0xc5, 0x69, 0xed, 0x8c, 0x15, 0xbf, 0x00, 0x03, 0x6e, + 0xb0, 0xc2, 0x78, 0x49, 0xca, 0x60, 0xa5, 0xc2, 0x28, 0x8b, 0x98, 0x1c, 0x96, 0x58, 0xf9, 0xa3, + 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x12, 0xa5, 0x7c, 0xf0, 0xbc, 0x6c, 0x00, 0x00, } diff --git a/api/gobgp.proto b/api/gobgp.proto index 655fdf8f..3b9f18e9 100644 --- a/api/gobgp.proto +++ b/api/gobgp.proto @@ -1006,6 +1006,7 @@ message Global { Confederation confederation = 9; GracefulRestart graceful_restart = 10; ApplyPolicy apply_policy = 11; + string bind_to_device = 12; } message Confederation { diff --git a/pkg/server/server.go b/pkg/server/server.go index d9a65c0f..c5b2b0ff 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -23,6 +23,7 @@ import ( "reflect" "strconv" "sync" + "syscall" "time" "github.com/eapache/channels" @@ -52,35 +53,56 @@ func (l *tcpListener) Close() error { } // avoid mapped IPv6 address -func newTCPListener(address string, port uint32, ch chan *net.TCPConn) (*tcpListener, error) { +func newTCPListener(address string, port uint32, bindToDev string, ch chan *net.TCPConn) (*tcpListener, error) { proto := "tcp4" + family := syscall.AF_INET if ip := net.ParseIP(address); ip == nil { return nil, fmt.Errorf("can't listen on %s", address) } else if ip.To4() == nil { proto = "tcp6" + family = syscall.AF_INET6 } - addr, err := net.ResolveTCPAddr(proto, net.JoinHostPort(address, strconv.Itoa(int(port)))) - if err != nil { - return nil, err + addr := net.JoinHostPort(address, strconv.Itoa(int(port))) + + var lc net.ListenConfig + lc.Control = func(network, address string, c syscall.RawConn) error { + if bindToDev != "" { + err := setBindToDevSockopt(c, bindToDev) + if err != nil { + log.WithFields(log.Fields{ + "Topic": "Peer", + "Key": addr, + "BindToDev": bindToDev, + }).Warnf("failed to bind Listener to device (%s): %s", bindToDev, err) + return err + } + } + // Note: Set TTL=255 for incoming connection listener in order to accept + // connection in case for the neighbor has TTL Security settings. + err := setsockoptIpTtl(c, family, 255) + if err != nil { + log.WithFields(log.Fields{ + "Topic": "Peer", + "Key": addr, + }).Warnf("cannot set TTL(=%d) for TCPListener: %s", 255, err) + } + return nil } - l, err := net.ListenTCP(proto, addr) + l, err := lc.Listen(context.Background(), proto, addr) if err != nil { return nil, err } - // Note: Set TTL=255 for incoming connection listener in order to accept - // connection in case for the neighbor has TTL Security settings. - if err := setListenTCPTTLSockopt(l, 255); err != nil { - log.WithFields(log.Fields{ - "Topic": "Peer", - "Key": addr, - }).Warnf("cannot set TTL(=%d) for TCPListener: %s", 255, err) + listener, ok := l.(*net.TCPListener) + if !ok { + err = fmt.Errorf("unexpected connection listener (not for TCP)") + return nil, err } closeCh := make(chan struct{}) go func() error { for { - conn, err := l.AcceptTCP() + conn, err := listener.AcceptTCP() if err != nil { close(closeCh) log.WithFields(log.Fields{ @@ -93,7 +115,7 @@ func newTCPListener(address string, port uint32, ch chan *net.TCPConn) (*tcpList } }() return &tcpListener{ - l: l, + l: listener, ch: closeCh, }, nil } @@ -2101,7 +2123,7 @@ func (s *BgpServer) StartBgp(ctx context.Context, r *api.StartBgpRequest) error if c.Config.Port > 0 { acceptCh := make(chan *net.TCPConn, 4096) for _, addr := range c.Config.LocalAddressList { - l, err := newTCPListener(addr, uint32(c.Config.Port), acceptCh) + l, err := newTCPListener(addr, uint32(c.Config.Port), g.BindToDevice, acceptCh) if err != nil { return err } diff --git a/pkg/server/sockopt.go b/pkg/server/sockopt.go index 0aab0ba9..235bbbb9 100644 --- a/pkg/server/sockopt.go +++ b/pkg/server/sockopt.go @@ -17,6 +17,7 @@ package server import ( + "fmt" "net" "syscall" @@ -27,10 +28,6 @@ func setTCPMD5SigSockopt(l *net.TCPListener, address string, key string) error { return setTcpMD5SigSockopt(l, address, key) } -func setListenTCPTTLSockopt(l *net.TCPListener, ttl int) error { - return setListenTcpTTLSockopt(l, ttl) -} - func setTCPTTLSockopt(conn *net.TCPConn, ttl int) error { return setTcpTTLSockopt(conn, ttl) } @@ -39,6 +36,10 @@ func setTCPMinTTLSockopt(conn *net.TCPConn, ttl int) error { return setTcpMinTTLSockopt(conn, ttl) } +func setBindToDevSockopt(sc syscall.RawConn, device string) error { + return fmt.Errorf("binding connection to a device is not supported") +} + func dialerControl(network, address string, c syscall.RawConn, ttl, ttlMin uint8, password string, bindInterface string) error { if password != "" { log.WithFields(log.Fields{ diff --git a/pkg/server/sockopt_bsd.go b/pkg/server/sockopt_bsd.go index fe7a6134..942e1289 100644 --- a/pkg/server/sockopt_bsd.go +++ b/pkg/server/sockopt_bsd.go @@ -35,15 +35,6 @@ func setTcpMD5SigSockopt(l *net.TCPListener, address string, key string) error { return setsockOptInt(sc, syscall.IPPROTO_TCP, tcpMD5SIG, 1) } -func setListenTcpTTLSockopt(l *net.TCPListener, ttl int) error { - family := extractFamilyFromTCPListener(l) - sc, err := l.SyscallConn() - if err != nil { - return err - } - return setsockoptIpTtl(sc, family, ttl) -} - func setTcpTTLSockopt(conn *net.TCPConn, ttl int) error { family := extractFamilyFromTCPConn(conn) sc, err := conn.SyscallConn() diff --git a/pkg/server/sockopt_darwin.go b/pkg/server/sockopt_darwin.go index abb69d35..30220952 100644 --- a/pkg/server/sockopt_darwin.go +++ b/pkg/server/sockopt_darwin.go @@ -27,15 +27,6 @@ func setTcpMD5SigSockopt(l *net.TCPListener, address string, key string) error { return fmt.Errorf("setting md5 is not supported") } -func setListenTcpTTLSockopt(l *net.TCPListener, ttl int) error { - family := extractFamilyFromTCPListener(l) - sc, err := l.SyscallConn() - if err != nil { - return err - } - return setsockoptIpTtl(sc, family, ttl) -} - func setTcpTTLSockopt(conn *net.TCPConn, ttl int) error { family := syscall.AF_INET if strings.Contains(conn.RemoteAddr().String(), "[") { diff --git a/pkg/server/sockopt_linux.go b/pkg/server/sockopt_linux.go index 203087ab..55d27bd4 100644 --- a/pkg/server/sockopt_linux.go +++ b/pkg/server/sockopt_linux.go @@ -70,13 +70,8 @@ func setTCPMD5SigSockopt(l *net.TCPListener, address string, key string) error { return setsockOptString(sc, syscall.IPPROTO_TCP, tcpMD5SIG, string(b[:])) } -func setListenTCPTTLSockopt(l *net.TCPListener, ttl int) error { - family := extractFamilyFromTCPListener(l) - sc, err := l.SyscallConn() - if err != nil { - return err - } - return setsockoptIpTtl(sc, family, ttl) +func setBindToDevSockopt(sc syscall.RawConn, device string) error { + return setsockOptString(sc, syscall.SOL_SOCKET, syscall.SO_BINDTODEVICE, device) } func setTCPTTLSockopt(conn *net.TCPConn, ttl int) error { @@ -162,14 +157,9 @@ func dialerControl(network, address string, c syscall.RawConn, ttl, minTtl uint8 } } if bindInterface != "" { - if err := c.Control(func(fd uintptr) { - sockerr = os.NewSyscallError("setsockopt", syscall.SetsockoptString(int(fd), syscall.SOL_SOCKET, syscall.SO_BINDTODEVICE, bindInterface)) - }); err != nil { + if err := setBindToDevSockopt(c, bindInterface); err != nil { return err } - if sockerr != nil { - return sockerr - } } return nil } diff --git a/pkg/server/sockopt_openbsd.go b/pkg/server/sockopt_openbsd.go index 3d6825e2..612047ca 100644 --- a/pkg/server/sockopt_openbsd.go +++ b/pkg/server/sockopt_openbsd.go @@ -370,15 +370,6 @@ func setTCPMD5SigSockopt(l *net.TCPListener, address string, key string) error { return setsockoptTcpMD5Sig(sc, address, key) } -func setListenTCPTTLSockopt(l *net.TCPListener, ttl int) error { - family := extractFamilyFromTCPListener(l) - sc, err := l.SyscallConn() - if err != nil { - return err - } - return setsockoptIpTtl(sc, family, ttl) -} - func setTCPTTLSockopt(conn *net.TCPConn, ttl int) error { family := extractFamilyFromTCPConn(conn) sc, err := conn.SyscallConn() @@ -403,6 +394,10 @@ func setTCPMinTTLSockopt(conn *net.TCPConn, ttl int) error { return setsockOptInt(sc, level, name, ttl) } +func setBindToDevSockopt(sc syscall.RawConn, device string) error { + return fmt.Errorf("binding connection to a device is not supported") +} + func dialerControl(network, address string, c syscall.RawConn, ttl, minTtl uint8, password string, bindInterface string) error { if password != "" { log.WithFields(log.Fields{ diff --git a/pkg/server/util.go b/pkg/server/util.go index c774c6dd..e4abbed0 100644 --- a/pkg/server/util.go +++ b/pkg/server/util.go @@ -65,14 +65,6 @@ func decodeAdministrativeCommunication(data []byte) (string, []byte) { return string(data[1 : communicationLen+1]), data[communicationLen+1:] } -func extractFamilyFromTCPListener(l *net.TCPListener) int { - family := syscall.AF_INET - if strings.Contains(l.Addr().String(), "[") { - family = syscall.AF_INET6 - } - return family -} - func extractFamilyFromTCPConn(conn *net.TCPConn) int { family := syscall.AF_INET if strings.Contains(conn.RemoteAddr().String(), "[") { -- cgit v1.2.3