diff options
author | Tim Cooper <tim.cooper@layeh.com> | 2016-03-28 01:27:23 +0300 |
---|---|---|
committer | Tim Cooper <tim.cooper@layeh.com> | 2016-03-28 01:27:23 +0300 |
commit | 123c287eb72c59464935ade162f2868d6a386531 (patch) | |
tree | ad325b4921f5fbed0df746a01409963b1e47c38c /pkg | |
parent | 37f8d62319e4c14c3dad5efc26c8d0c58286c6f3 (diff) |
use go generate over Makefile
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/mumbleproto/Makefile | 6 | ||||
-rw-r--r-- | pkg/mumbleproto/Mumble.pb.go | 326 | ||||
-rw-r--r-- | pkg/mumbleproto/Mumble.proto | 3 | ||||
-rw-r--r-- | pkg/mumbleproto/generate.go | 3 | ||||
-rw-r--r-- | pkg/mumbleproto/generate_main.go | 49 |
5 files changed, 217 insertions, 170 deletions
diff --git a/pkg/mumbleproto/Makefile b/pkg/mumbleproto/Makefile deleted file mode 100644 index c8751b3..0000000 --- a/pkg/mumbleproto/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -Mumble.proto: - curl -O https://raw.githubusercontent.com/mumble-voip/mumble/master/src/Mumble.proto - sed -i -e 's,MumbleProto,mumbleproto,' $@ - -Mumble.pb.go: Mumble.proto - protoc --go_out=. $< diff --git a/pkg/mumbleproto/Mumble.pb.go b/pkg/mumbleproto/Mumble.pb.go index 31066c9..965c6a1 100644 --- a/pkg/mumbleproto/Mumble.pb.go +++ b/pkg/mumbleproto/Mumble.pb.go @@ -268,6 +268,7 @@ func (ContextActionModify_Operation) EnumDescriptor() ([]byte, []int) { } type Version struct { + CryptoModes []string `protobuf:"bytes,5,rep,name=crypto_modes,json=cryptoModes" json:"crypto_modes,omitempty"` // 2-byte Major, 1-byte Minor and 1-byte Patch version number. Version *uint32 `protobuf:"varint,1,opt,name=version" json:"version,omitempty"` // Client release name. @@ -275,9 +276,8 @@ type Version struct { // Client OS name. Os *string `protobuf:"bytes,3,opt,name=os" json:"os,omitempty"` // Client OS version. - OsVersion *string `protobuf:"bytes,4,opt,name=os_version,json=osVersion" json:"os_version,omitempty"` - CryptoModes []string `protobuf:"bytes,5,rep,name=crypto_modes,json=cryptoModes" json:"crypto_modes,omitempty"` - XXX_unrecognized []byte `json:"-"` + OsVersion *string `protobuf:"bytes,4,opt,name=os_version,json=osVersion" json:"os_version,omitempty"` + XXX_unrecognized []byte `json:"-"` } func (m *Version) Reset() { *m = Version{} } @@ -285,6 +285,13 @@ func (m *Version) String() string { return proto.CompactTextString(m) func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +func (m *Version) GetCryptoModes() []string { + if m != nil { + return m.CryptoModes + } + return nil +} + func (m *Version) GetVersion() uint32 { if m != nil && m.Version != nil { return *m.Version @@ -313,13 +320,6 @@ func (m *Version) GetOsVersion() string { return "" } -func (m *Version) GetCryptoModes() []string { - if m != nil { - return m.CryptoModes - } - return nil -} - // Not used. Not even for tunneling UDP through TCP. type UDPTunnel struct { // Not used. @@ -2201,157 +2201,157 @@ func init() { var fileDescriptor0 = []byte{ // 2439 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xdc, 0x58, 0x4b, 0x73, 0x24, 0x47, - 0x11, 0xa6, 0xe7, 0xa5, 0x99, 0x9c, 0x19, 0x69, 0xd4, 0xbb, 0x98, 0x41, 0x7e, 0xad, 0xdb, 0x60, - 0x16, 0x70, 0x08, 0xa3, 0xf0, 0xc5, 0x8e, 0xe0, 0xa0, 0xd5, 0x62, 0xb4, 0xc1, 0x6a, 0xbd, 0xb4, - 0xe4, 0xf5, 0x81, 0x43, 0xd3, 0xea, 0x2e, 0x8d, 0x1a, 0xf5, 0x74, 0x37, 0x5d, 0x3d, 0x5a, 0x4f, - 0x04, 0x47, 0xe0, 0x0a, 0x11, 0x1c, 0xb8, 0xf1, 0x03, 0x08, 0xc2, 0x11, 0xfc, 0x00, 0x2e, 0xfc, - 0x02, 0xfe, 0x00, 0x17, 0xae, 0xdc, 0x88, 0xe0, 0x4e, 0x3e, 0xaa, 0x5f, 0xd2, 0xac, 0xd7, 0x5c, - 0xb9, 0xcc, 0x54, 0x7e, 0x95, 0x5d, 0x8f, 0xac, 0xfc, 0x32, 0xb3, 0x0a, 0x26, 0x27, 0xab, 0xe5, - 0x79, 0xac, 0xf6, 0xb3, 0x3c, 0x2d, 0x52, 0x7b, 0xbc, 0x64, 0x89, 0x05, 0xe7, 0xb7, 0x16, 0x6c, - 0x3d, 0x53, 0xb9, 0x8e, 0xd2, 0xc4, 0x9e, 0xc3, 0xd6, 0xb5, 0x34, 0xe7, 0xd6, 0x3d, 0xeb, 0xfe, - 0xd4, 0x2d, 0x45, 0xea, 0xc9, 0x55, 0xac, 0x7c, 0xad, 0xe6, 0x1d, 0xec, 0x19, 0xb9, 0xa5, 0x68, - 0x6f, 0x43, 0x27, 0xd5, 0xf3, 0x2e, 0x83, 0xd8, 0xb2, 0x5f, 0x07, 0x48, 0xb5, 0x57, 0x0e, 0xd3, - 0x63, 0x7c, 0x94, 0xea, 0x72, 0x8a, 0xb7, 0x60, 0x12, 0xe4, 0xeb, 0xac, 0x48, 0xbd, 0x65, 0x1a, - 0x2a, 0x3d, 0xef, 0xdf, 0xeb, 0xa2, 0xc2, 0x58, 0xb0, 0x13, 0x82, 0x9c, 0xb7, 0x61, 0xf4, 0xc9, - 0xc3, 0xa7, 0x67, 0xab, 0x24, 0x51, 0xb1, 0xfd, 0x0a, 0x0c, 0x32, 0x3f, 0xb8, 0x52, 0x05, 0xae, - 0xa8, 0x73, 0x7f, 0xe2, 0x1a, 0xc9, 0xf9, 0xa3, 0x05, 0x93, 0xc3, 0x55, 0x71, 0xa9, 0x92, 0x22, - 0x0a, 0xfc, 0x42, 0xd9, 0x7b, 0x30, 0x5c, 0x69, 0x95, 0x27, 0xfe, 0x52, 0xf1, 0xe2, 0x47, 0x6e, - 0x25, 0x53, 0x5f, 0xe6, 0x6b, 0xfd, 0x3c, 0xcd, 0x43, 0xb3, 0xfc, 0x4a, 0xa6, 0x09, 0x8a, 0xf4, - 0x4a, 0x25, 0xb4, 0x07, 0x5a, 0x8a, 0x91, 0xec, 0xb7, 0x61, 0x1a, 0xa8, 0xb8, 0x28, 0x77, 0xa2, - 0x71, 0x2b, 0xdd, 0xfb, 0x7d, 0x77, 0x42, 0xa0, 0xd9, 0x8c, 0xb6, 0xbf, 0x0e, 0xbd, 0x34, 0x5b, - 0xd1, 0x2e, 0xac, 0xfb, 0xc3, 0x0f, 0xfb, 0x17, 0x7e, 0xac, 0x95, 0xcb, 0x90, 0xf3, 0xb7, 0x0e, - 0xf4, 0x9e, 0x46, 0xc9, 0xc2, 0x7e, 0x0d, 0x46, 0x45, 0xb4, 0x54, 0xba, 0xf0, 0x97, 0x19, 0xaf, - 0xac, 0xe7, 0xd6, 0x80, 0x6d, 0x43, 0x6f, 0x91, 0xa6, 0xb2, 0xac, 0xa9, 0xcb, 0x6d, 0xc2, 0x62, - 0xdc, 0x12, 0x1b, 0x15, 0x31, 0x6a, 0x33, 0x96, 0xea, 0x82, 0x0d, 0x4a, 0x18, 0xb6, 0x69, 0xe9, - 0xb9, 0xd2, 0xeb, 0x24, 0xe0, 0xf9, 0xa7, 0xae, 0x91, 0xec, 0x37, 0x61, 0xbc, 0x0a, 0x33, 0x4f, - 0x2c, 0xa5, 0xe7, 0x03, 0xee, 0x04, 0x84, 0x9e, 0x0a, 0x42, 0x0a, 0x45, 0x50, 0x2b, 0x6c, 0x89, - 0x02, 0x42, 0xa5, 0xc2, 0x3d, 0x98, 0xf0, 0x08, 0xb8, 0x7e, 0xcf, 0xbf, 0x5e, 0xcc, 0x87, 0xa8, - 0xd1, 0x91, 0x21, 0x10, 0x3a, 0xbc, 0x5e, 0xb4, 0x34, 0xae, 0xfd, 0x7c, 0x3e, 0x6a, 0x69, 0x3c, - 0xf3, 0x73, 0xd2, 0xe0, 0x49, 0xca, 0x31, 0x40, 0x34, 0x68, 0x96, 0x7a, 0x8c, 0x4a, 0x83, 0xc6, - 0x18, 0xb7, 0x34, 0x70, 0x0c, 0xe7, 0xd7, 0x1d, 0x18, 0xb8, 0xea, 0xe7, 0x2a, 0x28, 0xec, 0x03, - 0xe8, 0x15, 0xeb, 0x4c, 0xce, 0x76, 0xfb, 0xe0, 0x8d, 0xfd, 0x86, 0x0f, 0xef, 0x8b, 0x8a, 0xf9, - 0x3b, 0x43, 0x2d, 0x97, 0x75, 0xc5, 0x40, 0xbe, 0x46, 0x3f, 0x94, 0x53, 0x37, 0x92, 0xf3, 0xb9, - 0x05, 0x50, 0x2b, 0xdb, 0x43, 0xe8, 0x3d, 0x49, 0x13, 0x35, 0xfb, 0x8a, 0x3d, 0x83, 0xc9, 0xa7, - 0x79, 0x8a, 0x73, 0xcb, 0x01, 0xcf, 0x2c, 0xfb, 0x0e, 0xec, 0x3c, 0x4a, 0xae, 0xfd, 0x38, 0x0a, - 0x3f, 0x31, 0xde, 0x34, 0xeb, 0xd8, 0x3b, 0x30, 0x66, 0x35, 0x82, 0x9e, 0x7e, 0x3a, 0xeb, 0xda, - 0xbb, 0x30, 0x65, 0xe0, 0x54, 0xe5, 0xd7, 0x0c, 0xf5, 0x08, 0x2a, 0xbf, 0x78, 0x94, 0x60, 0x6b, - 0xd6, 0x47, 0xaa, 0x80, 0x28, 0x7c, 0xb4, 0x8a, 0xe3, 0xd9, 0x80, 0x54, 0x9e, 0xa4, 0x47, 0x2a, - 0x2f, 0xa2, 0x0b, 0xf6, 0xe1, 0xd9, 0x96, 0xfd, 0x55, 0xd8, 0x6d, 0x78, 0x75, 0x9a, 0x7f, 0xe4, - 0x47, 0xf1, 0x6c, 0xe8, 0xfc, 0xce, 0x2a, 0x3f, 0x3d, 0xa5, 0x03, 0x46, 0x36, 0x6a, 0xa5, 0x9b, - 0x3c, 0x35, 0x22, 0x79, 0xed, 0xd2, 0xff, 0xcc, 0x3b, 0xf7, 0x93, 0xf0, 0x79, 0x14, 0x16, 0x97, - 0xc6, 0xaf, 0x26, 0x08, 0x3e, 0x28, 0x31, 0xe2, 0xe0, 0x73, 0x15, 0x07, 0xe9, 0x52, 0x79, 0x85, - 0xfa, 0xac, 0x30, 0xe4, 0x1d, 0x1b, 0xec, 0x0c, 0x21, 0x3c, 0x9a, 0x71, 0xa6, 0xf2, 0x65, 0xa4, - 0x4b, 0xdf, 0x27, 0xb7, 0x6d, 0x42, 0xce, 0x3e, 0x4c, 0x8f, 0x2e, 0x7d, 0xe2, 0xa8, 0xab, 0x96, - 0xe9, 0xb5, 0x22, 0xe2, 0x07, 0x02, 0x78, 0x51, 0xc8, 0x6c, 0x9d, 0xba, 0x23, 0x83, 0x3c, 0x0a, - 0x9d, 0x7f, 0x74, 0x60, 0x62, 0x3e, 0x38, 0x2d, 0xc8, 0xa3, 0x6f, 0xea, 0x5b, 0x2d, 0x7d, 0x21, - 0x7e, 0x8e, 0x86, 0x30, 0x5b, 0x30, 0x12, 0x11, 0x81, 0x39, 0x2e, 0x8b, 0xe6, 0xb6, 0x7d, 0x17, - 0xfa, 0x71, 0x94, 0x5c, 0x09, 0x47, 0xa7, 0xae, 0x08, 0xb4, 0x07, 0x0c, 0x27, 0x41, 0x1e, 0x65, - 0x05, 0x59, 0xaa, 0x2f, 0xbb, 0x6c, 0x40, 0xf6, 0xab, 0x30, 0x62, 0x55, 0xcf, 0x0f, 0x43, 0xa4, - 0x09, 0x7d, 0x3b, 0x64, 0xe0, 0x30, 0x0c, 0xc9, 0x4a, 0xd2, 0x99, 0xf3, 0xfe, 0x90, 0x25, 0xd4, - 0x3f, 0x66, 0xcc, 0x6c, 0x19, 0x23, 0x55, 0xa1, 0x96, 0x59, 0x9a, 0xfb, 0xf9, 0x9a, 0x39, 0x52, - 0xc5, 0x80, 0x1a, 0xc7, 0x7d, 0x0e, 0xb3, 0x54, 0x47, 0xbc, 0x06, 0x62, 0x49, 0xff, 0x43, 0xeb, - 0x3d, 0xb7, 0x82, 0xec, 0x6f, 0xc3, 0xac, 0xb1, 0x24, 0xef, 0xd2, 0xd7, 0x97, 0x4c, 0x95, 0x89, - 0xbb, 0xd3, 0xc0, 0x8f, 0x11, 0xa6, 0xe5, 0xd2, 0xe1, 0x52, 0x58, 0xd3, 0x4c, 0x16, 0x5c, 0x2e, - 0x02, 0xe4, 0x66, 0xda, 0xb9, 0x00, 0xa0, 0x86, 0x59, 0x59, 0xcb, 0x43, 0x3a, 0x4d, 0x0f, 0x41, - 0x5b, 0xf9, 0x01, 0x7a, 0x96, 0x31, 0xab, 0x08, 0x0d, 0xa6, 0x74, 0x9b, 0x4c, 0x41, 0x42, 0x74, - 0xd1, 0x97, 0xf8, 0xfc, 0x87, 0x2e, 0x35, 0x9d, 0x3f, 0xf7, 0x30, 0x3c, 0xe3, 0x44, 0x72, 0x88, - 0x2f, 0xf6, 0xc4, 0xcd, 0xf3, 0x6c, 0x3a, 0xbd, 0xaf, 0xc1, 0x16, 0x6d, 0x89, 0xbc, 0x40, 0xa2, - 0xdb, 0x80, 0x44, 0x74, 0x81, 0xb6, 0x87, 0xf4, 0x6f, 0x7a, 0x08, 0x8e, 0xb5, 0x5c, 0x61, 0x98, - 0x1c, 0xf0, 0xe2, 0xb8, 0x4d, 0x58, 0xa8, 0xfc, 0x0b, 0x0e, 0x69, 0x88, 0x51, 0x9b, 0xa2, 0xbf, - 0x5e, 0x65, 0x19, 0x06, 0x47, 0x2d, 0x87, 0xe4, 0x56, 0x32, 0x99, 0x54, 0xab, 0xf8, 0xc2, 0xe3, - 0x81, 0x46, 0xa6, 0x13, 0x81, 0x13, 0x1a, 0xac, 0xec, 0xe4, 0x11, 0xa1, 0xee, 0x7c, 0x48, 0xa3, - 0xe2, 0xce, 0x89, 0x3c, 0xab, 0x5c, 0xf1, 0x51, 0x4c, 0xdc, 0x52, 0xb4, 0xbf, 0x09, 0xdb, 0x59, - 0xbc, 0x5a, 0x44, 0x89, 0x17, 0xa4, 0x09, 0x13, 0x6c, 0xc2, 0x0a, 0x53, 0x41, 0x8f, 0x04, 0xb4, - 0xbf, 0x05, 0x3b, 0x46, 0x2d, 0x0a, 0x89, 0xef, 0xc5, 0x7a, 0x3e, 0x65, 0xab, 0x98, 0xaf, 0x1f, - 0x19, 0x94, 0x66, 0x42, 0x5e, 0x2e, 0x89, 0x0a, 0xdb, 0x92, 0x7b, 0x8d, 0x48, 0xbb, 0x65, 0x7f, - 0xd9, 0x11, 0x6b, 0x52, 0x9b, 0x13, 0xac, 0x74, 0x8b, 0x2f, 0xcd, 0x78, 0xee, 0xb1, 0xc1, 0x8e, - 0x8d, 0x8a, 0x59, 0xab, 0xa8, 0xec, 0x8a, 0x8a, 0xc1, 0x58, 0x05, 0xbd, 0x32, 0xcb, 0xa3, 0x34, - 0xc7, 0xf9, 0x3d, 0x9d, 0x29, 0xff, 0x4a, 0xe5, 0x73, 0x9b, 0x2d, 0xb0, 0x53, 0xe2, 0xa7, 0x02, - 0x53, 0x7e, 0xcb, 0x55, 0x80, 0xa9, 0x14, 0x63, 0xf6, 0xfc, 0x0e, 0xeb, 0xd4, 0x80, 0xf3, 0x9b, - 0x0e, 0x6c, 0x61, 0xe4, 0x79, 0x1c, 0x61, 0xbe, 0xfa, 0x3e, 0xf4, 0xd0, 0x83, 0x34, 0x7a, 0x4a, - 0xf7, 0xfe, 0xf8, 0xe0, 0xf5, 0x56, 0x08, 0x37, 0x3a, 0xf4, 0xff, 0xc3, 0xa4, 0xc8, 0xd7, 0x2e, - 0xab, 0xe2, 0x11, 0xf4, 0x7f, 0xb1, 0x52, 0xc8, 0xae, 0x4e, 0x93, 0x5d, 0x82, 0xed, 0xfd, 0xc9, - 0x82, 0x61, 0xa9, 0x4f, 0x56, 0x42, 0x16, 0xf3, 0x21, 0x4b, 0xa5, 0x50, 0x8a, 0xec, 0x27, 0xbe, - 0xbe, 0xc2, 0x21, 0x88, 0x08, 0xdc, 0xde, 0xe8, 0x87, 0xa5, 0x35, 0x7b, 0x0d, 0x6b, 0xd6, 0xbc, - 0xe8, 0xb7, 0x78, 0x81, 0xde, 0x8d, 0xf9, 0x3b, 0x2f, 0xd8, 0xf9, 0x46, 0xae, 0x08, 0xe4, 0x69, - 0xe1, 0x2a, 0xf7, 0x99, 0xea, 0x92, 0x54, 0x2b, 0x99, 0xea, 0xac, 0x31, 0x85, 0xd6, 0x13, 0x5c, - 0x92, 0xbf, 0x50, 0x35, 0x3f, 0xac, 0x26, 0x3f, 0x1a, 0x7c, 0xea, 0x70, 0xbc, 0xa9, 0xf8, 0xd4, - 0x26, 0x43, 0x97, 0x3b, 0x1b, 0x64, 0x40, 0x12, 0x15, 0xb9, 0x52, 0x42, 0x22, 0xea, 0x1b, 0x90, - 0x88, 0x1d, 0x38, 0xe2, 0x52, 0xa6, 0xc4, 0x2d, 0x74, 0xc8, 0x7b, 0x8c, 0xe8, 0xfc, 0xbe, 0x0b, - 0xb3, 0xa7, 0x55, 0x44, 0x7f, 0xa8, 0x92, 0x48, 0x85, 0xf6, 0x1b, 0x00, 0x75, 0x94, 0x37, 0x6b, - 0x6b, 0x20, 0x37, 0x96, 0xd1, 0xb9, 0xc9, 0xc9, 0xc6, 0xfa, 0xbb, 0xed, 0x78, 0x50, 0x5b, 0xb2, - 0xd7, 0xb2, 0xe4, 0x87, 0x26, 0xaf, 0xf7, 0x39, 0xaf, 0xbf, 0xd3, 0x72, 0x8a, 0x9b, 0xab, 0xdb, - 0xc7, 0xbf, 0x75, 0x23, 0xbf, 0x97, 0xa7, 0x38, 0xa8, 0x4f, 0xd1, 0xf9, 0x2b, 0x3a, 0x45, 0xa9, - 0x46, 0x99, 0x9d, 0x6c, 0x8e, 0x99, 0x1d, 0x73, 0x6f, 0x3d, 0x1a, 0xe6, 0xf5, 0x29, 0x8c, 0x4e, - 0x57, 0xb8, 0x2f, 0x0a, 0x65, 0x92, 0xd1, 0x4d, 0x72, 0x7a, 0x42, 0x29, 0xbe, 0x4b, 0x00, 0x7d, - 0x79, 0x96, 0xa6, 0x8f, 0x31, 0xaf, 0x63, 0x3e, 0xdf, 0x82, 0xee, 0xf1, 0x07, 0x3f, 0xc6, 0x2c, - 0x7e, 0x17, 0x66, 0x67, 0x65, 0x70, 0x37, 0xdf, 0x60, 0x2e, 0x7f, 0x05, 0xec, 0x13, 0x1a, 0x3c, - 0x59, 0xb4, 0x13, 0xfa, 0x04, 0x86, 0x34, 0x05, 0x8f, 0x3a, 0x6c, 0x4c, 0xc3, 0x25, 0xc0, 0x88, - 0x0a, 0x8e, 0x27, 0x58, 0x09, 0xe2, 0x67, 0x8f, 0xa3, 0x65, 0x54, 0xcc, 0xc0, 0xf9, 0x55, 0x1f, - 0xba, 0x87, 0x47, 0x8f, 0x5f, 0x92, 0x4e, 0x31, 0x7a, 0x4c, 0xa2, 0xe4, 0x52, 0x21, 0x11, 0x3d, - 0x3f, 0x88, 0xb5, 0xe1, 0x47, 0xaf, 0xc8, 0x57, 0xca, 0x1d, 0x9b, 0x9e, 0x43, 0xec, 0xc0, 0xba, - 0x69, 0xb0, 0xc8, 0xd3, 0x55, 0x26, 0xf5, 0xed, 0xf8, 0x60, 0xaf, 0x65, 0x61, 0x9c, 0x69, 0x9f, - 0x56, 0xf4, 0x23, 0x52, 0x71, 0x8d, 0xa6, 0xfd, 0x2e, 0xf4, 0x78, 0xd0, 0x1e, 0x7f, 0x31, 0xdf, - 0xf8, 0x05, 0xfe, 0xbb, 0xac, 0x55, 0x73, 0xb4, 0xbf, 0x81, 0xa3, 0xff, 0xb4, 0x60, 0x54, 0x4d, - 0x50, 0x1d, 0x98, 0xc5, 0x9e, 0x28, 0xb4, 0x73, 0x60, 0x64, 0xd6, 0xab, 0xc2, 0xd6, 0x36, 0x6a, - 0x18, 0xbd, 0x72, 0xcb, 0x08, 0xec, 0x56, 0xa5, 0x46, 0x09, 0xda, 0xef, 0x40, 0xb9, 0x67, 0x1f, - 0x17, 0x2a, 0xe9, 0xea, 0x86, 0x31, 0xa8, 0x83, 0xd2, 0x19, 0xa5, 0xfa, 0x3e, 0x33, 0x84, 0x9a, - 0xe2, 0x96, 0x9c, 0xdf, 0x25, 0xff, 0x1b, 0xc9, 0xfe, 0x2e, 0xec, 0x56, 0xd3, 0x7b, 0x4b, 0xb5, - 0x3c, 0xa7, 0x9c, 0x2b, 0x25, 0xc0, 0xac, 0xea, 0x38, 0x11, 0x7c, 0xef, 0xef, 0x78, 0x87, 0x32, - 0x36, 0xc1, 0x9a, 0x00, 0xfc, 0x2c, 0x8b, 0xd7, 0x1e, 0xea, 0x48, 0xb5, 0x5a, 0xed, 0x87, 0xf1, - 0x63, 0x84, 0x6b, 0x25, 0xbd, 0x3a, 0x6f, 0x9f, 0x9d, 0x28, 0x9d, 0x22, 0xdc, 0x36, 0x4c, 0x77, - 0xb3, 0x61, 0x5e, 0x98, 0x3b, 0x31, 0xbc, 0xf0, 0x61, 0x9a, 0xb8, 0x25, 0x82, 0xa0, 0x7e, 0x52, - 0x98, 0x3b, 0x81, 0x08, 0x92, 0x34, 0x93, 0xb5, 0x09, 0x59, 0xdc, 0x76, 0xde, 0x07, 0xf8, 0x09, - 0x1d, 0x20, 0x17, 0x17, 0x64, 0xb7, 0x28, 0x94, 0xc0, 0x8d, 0x76, 0xc3, 0x26, 0x8d, 0x44, 0xa7, - 0xa7, 0x39, 0x4c, 0xe1, 0xf8, 0x2c, 0x38, 0x21, 0xc0, 0x11, 0xdd, 0xe4, 0x4e, 0x55, 0x81, 0xb3, - 0xe1, 0x57, 0x57, 0x6a, 0xcd, 0x36, 0x98, 0xb8, 0xd4, 0xe4, 0xe4, 0x14, 0x47, 0x94, 0x9b, 0x92, - 0x34, 0x09, 0xe4, 0x2e, 0x49, 0xc9, 0x89, 0xb1, 0x27, 0x04, 0x91, 0x8a, 0xe6, 0x4a, 0xd7, 0xa8, - 0x74, 0x45, 0x45, 0x30, 0x56, 0x71, 0xfe, 0x63, 0xc1, 0x1d, 0x93, 0x45, 0x0f, 0x03, 0x0a, 0xae, - 0x78, 0x6f, 0x8c, 0x2e, 0xd6, 0x74, 0x96, 0x3e, 0xcb, 0xc6, 0xbf, 0x8c, 0x44, 0xfb, 0xe3, 0x34, - 0x2c, 0x97, 0x00, 0x6e, 0x4b, 0x52, 0x4d, 0xaa, 0xf2, 0x77, 0xea, 0x96, 0xa2, 0x7d, 0x0c, 0xa3, - 0x14, 0x03, 0x83, 0x44, 0xf1, 0x1e, 0x47, 0xa5, 0xef, 0xb4, 0x18, 0xb0, 0x61, 0xea, 0xfd, 0x8f, - 0xcb, 0x2f, 0xdc, 0xfa, 0x63, 0xe7, 0x5d, 0xf4, 0x0a, 0x33, 0x28, 0xc0, 0x40, 0xea, 0x77, 0x0c, - 0x3d, 0x63, 0x71, 0x16, 0x8a, 0x1b, 0x1d, 0x8a, 0x50, 0x1c, 0x82, 0x7a, 0xce, 0x3d, 0x18, 0x55, - 0xa3, 0x50, 0xb4, 0xc1, 0x1a, 0x14, 0xe3, 0x16, 0xd0, 0x05, 0x88, 0x3c, 0x72, 0x66, 0x39, 0x3f, - 0xc3, 0x92, 0xbb, 0x39, 0xf7, 0x17, 0x54, 0x5f, 0x2f, 0x09, 0xd3, 0xb5, 0xa5, 0xba, 0x4d, 0x4b, - 0x39, 0x7f, 0xb1, 0x24, 0x5c, 0x71, 0xba, 0x7e, 0x0f, 0xfa, 0x52, 0x6a, 0x5a, 0x1b, 0x02, 0x47, - 0xa9, 0xc5, 0x0d, 0x57, 0x14, 0xf7, 0xb4, 0x6c, 0xa6, 0xe9, 0x95, 0x12, 0xb8, 0x4a, 0xaf, 0x2c, - 0xf9, 0xdf, 0x69, 0xa4, 0x5d, 0x2a, 0xc2, 0x7d, 0x5d, 0x78, 0x5a, 0xa9, 0xb2, 0xfa, 0x1c, 0x12, - 0x70, 0x8a, 0x32, 0x17, 0xe1, 0xd4, 0x69, 0x96, 0x6e, 0x9c, 0x7c, 0x4c, 0x98, 0xb1, 0xa1, 0xf3, - 0x6f, 0x4c, 0xac, 0xcf, 0xd2, 0x28, 0x50, 0x67, 0x7e, 0xbe, 0x50, 0x05, 0x3d, 0x48, 0x54, 0xf7, - 0x09, 0x6c, 0xd9, 0x1f, 0x60, 0x66, 0xe4, 0x1e, 0xf1, 0xd5, 0xf1, 0xc1, 0x9b, 0xad, 0x8d, 0x34, - 0x3e, 0xdd, 0x97, 0x3f, 0xb7, 0xd4, 0xdf, 0xfb, 0x83, 0x05, 0x03, 0x33, 0x6a, 0xcb, 0xd4, 0xdd, - 0xff, 0xc1, 0xd4, 0x15, 0x11, 0xbb, 0x4d, 0x22, 0xbe, 0x5a, 0xdf, 0x58, 0x9a, 0x31, 0x53, 0x2e, - 0x2e, 0x6f, 0xc1, 0x30, 0xb8, 0x8c, 0x62, 0xac, 0x5e, 0x92, 0x76, 0x4c, 0xad, 0x60, 0x27, 0x85, - 0x9d, 0x3a, 0x9d, 0x31, 0x51, 0x5f, 0x76, 0x9f, 0xba, 0x71, 0xa3, 0x93, 0x75, 0x36, 0x21, 0x5a, - 0xd3, 0x45, 0xbc, 0xc2, 0x02, 0xa8, 0xdb, 0x5a, 0x13, 0x63, 0xce, 0x2f, 0xf1, 0xf6, 0x96, 0x86, - 0x2a, 0x28, 0xdf, 0x71, 0xa8, 0x7c, 0x89, 0xb3, 0x4b, 0x9f, 0x0f, 0xb8, 0xef, 0x8a, 0x40, 0xe7, - 0x7b, 0xae, 0x0a, 0x9f, 0x4b, 0xad, 0xbe, 0xcb, 0x6d, 0xca, 0x54, 0x58, 0x6b, 0x5f, 0xa0, 0x3b, - 0xc8, 0x07, 0xe4, 0x71, 0x55, 0x70, 0x96, 0x9e, 0x43, 0xfe, 0xb8, 0x7c, 0x4c, 0xe9, 0xdd, 0x7e, - 0x4c, 0xf9, 0x7c, 0x50, 0x5f, 0x3a, 0xf4, 0x17, 0xb8, 0xfd, 0x37, 0x00, 0x34, 0xa9, 0x78, 0x69, - 0x12, 0xdf, 0xa8, 0x19, 0x47, 0xdc, 0xf1, 0x31, 0xe2, 0x18, 0x58, 0x27, 0x41, 0x9d, 0xa4, 0x25, - 0x31, 0x4e, 0xdc, 0x16, 0x66, 0xff, 0x00, 0xc6, 0x17, 0x79, 0xba, 0xf4, 0x24, 0x34, 0xf1, 0x9a, - 0xc6, 0x07, 0xaf, 0xdd, 0xa2, 0x00, 0x2f, 0x68, 0x9f, 0x7f, 0x5d, 0xa0, 0x0f, 0x8e, 0x58, 0xbf, - 0xfa, 0x5c, 0xc2, 0x16, 0x9f, 0xe2, 0x97, 0xfa, 0x5c, 0x82, 0xc4, 0xff, 0xcf, 0x0b, 0x8e, 0xbd, - 0x5f, 0x3f, 0x29, 0x4e, 0xd8, 0x08, 0x77, 0xdb, 0xec, 0x93, 0xbe, 0xfa, 0xa1, 0xf1, 0xd6, 0xb3, - 0xdb, 0x74, 0xc3, 0xb3, 0x5b, 0xa3, 0xd6, 0xdf, 0x96, 0xbb, 0x57, 0x59, 0xeb, 0xe3, 0x65, 0xa4, - 0x7e, 0xfb, 0xd8, 0x11, 0x0e, 0x54, 0x00, 0x15, 0xb7, 0xe8, 0x18, 0x51, 0xa2, 0xb4, 0x0a, 0x34, - 0xdf, 0x8c, 0xd0, 0x68, 0x35, 0x42, 0xf5, 0x7b, 0x14, 0xc6, 0xd2, 0xbb, 0x2b, 0xf5, 0x7b, 0x29, - 0xdb, 0xef, 0x83, 0xad, 0x0b, 0x7a, 0xe3, 0xf1, 0x1a, 0x7e, 0x22, 0x77, 0xa2, 0xd2, 0xc5, 0x76, - 0x45, 0xa1, 0x51, 0x00, 0x56, 0x3e, 0x7d, 0xe7, 0x96, 0x4f, 0xef, 0xfd, 0x14, 0xfa, 0xe2, 0xce, - 0xe5, 0x13, 0xa0, 0xb5, 0xe1, 0x09, 0xb0, 0xb3, 0xe1, 0x09, 0xb0, 0xbb, 0xf1, 0x09, 0xb0, 0xd7, - 0x7c, 0x02, 0xa4, 0x07, 0xa3, 0xb1, 0xab, 0xb0, 0x04, 0xd3, 0xc5, 0x83, 0x38, 0x3d, 0xa7, 0xcb, - 0xa6, 0xe1, 0x88, 0x57, 0xde, 0x5a, 0x25, 0x8c, 0x6d, 0x1b, 0xf8, 0xcc, 0x5c, 0x5e, 0x1b, 0x8a, - 0xe5, 0xa5, 0xb3, 0xd3, 0x52, 0x3c, 0x32, 0x77, 0xcf, 0xef, 0xc1, 0x9d, 0x32, 0xdc, 0x34, 0x5f, - 0x59, 0xe4, 0x62, 0x62, 0x9b, 0xae, 0x87, 0x75, 0x8f, 0xf3, 0x2f, 0x0b, 0x26, 0xe2, 0xde, 0x98, - 0xc4, 0x2e, 0xa2, 0xc5, 0xed, 0xb7, 0x2a, 0xeb, 0x4b, 0xbc, 0x55, 0x75, 0x6e, 0xbf, 0x55, 0x61, - 0xe0, 0xf3, 0xe3, 0x38, 0x7d, 0xee, 0x5d, 0x16, 0xcb, 0x58, 0x82, 0x17, 0x96, 0x51, 0x84, 0x1c, - 0x23, 0x40, 0xd7, 0x71, 0x73, 0xe3, 0xf1, 0x62, 0x95, 0x2c, 0x8a, 0x4b, 0x63, 0xaa, 0xa9, 0x41, - 0x1f, 0x33, 0x88, 0xd9, 0xee, 0x6e, 0xb4, 0x24, 0xa5, 0x1b, 0xca, 0xf2, 0xec, 0x60, 0x73, 0xdf, - 0x49, 0xeb, 0x8b, 0xd6, 0x73, 0xcc, 0xe0, 0xc6, 0x73, 0xcc, 0x15, 0x4c, 0x4f, 0x57, 0x8b, 0x05, - 0xda, 0xdf, 0xec, 0xf6, 0xc5, 0x6f, 0xeb, 0x74, 0xe5, 0x32, 0xaf, 0x41, 0x7e, 0x2c, 0x41, 0xcb, - 0x6d, 0x20, 0x44, 0x32, 0xf4, 0x97, 0x4b, 0xaf, 0x48, 0xbd, 0xc2, 0x8f, 0xaf, 0xcc, 0x0e, 0x81, - 0xb0, 0xb3, 0xf4, 0x0c, 0x91, 0x07, 0x9d, 0x63, 0xeb, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd2, - 0x28, 0x7a, 0x6e, 0xe3, 0x17, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xdc, 0x58, 0xcd, 0x73, 0x23, 0x47, + 0x15, 0x67, 0xf4, 0x65, 0xe9, 0x49, 0xb2, 0xe5, 0xd9, 0x25, 0x08, 0xe7, 0x6b, 0x33, 0x81, 0x60, + 0x20, 0x65, 0x82, 0x2b, 0x97, 0xa4, 0x8a, 0x83, 0xd7, 0x4b, 0xf0, 0x16, 0xeb, 0x8d, 0x19, 0x3b, + 0x9b, 0x03, 0x87, 0x61, 0xac, 0x69, 0x4b, 0x83, 0x47, 0x33, 0xc3, 0xf4, 0xc8, 0x1b, 0x55, 0x71, + 0x04, 0xae, 0x50, 0xc5, 0x81, 0x1b, 0x7f, 0x00, 0x45, 0xa5, 0x8a, 0x3f, 0x80, 0x0b, 0x7f, 0x01, + 0xff, 0x00, 0x17, 0xae, 0xdc, 0xa8, 0xe2, 0xce, 0xfb, 0xe8, 0xf9, 0xb2, 0xb5, 0xd9, 0x70, 0xe5, + 0x22, 0xcd, 0xfb, 0xf5, 0xeb, 0xee, 0xd7, 0xaf, 0xdf, 0x67, 0xc3, 0xe8, 0x74, 0xb5, 0xbc, 0x8c, + 0xd4, 0x41, 0x9a, 0x25, 0x79, 0x62, 0x0f, 0x97, 0x4c, 0x31, 0xe1, 0xfc, 0xd6, 0x82, 0xad, 0x67, + 0x2a, 0xd3, 0x61, 0x12, 0xdb, 0x6f, 0xc1, 0x68, 0x96, 0xad, 0xd3, 0x3c, 0xf1, 0x96, 0x49, 0xa0, + 0xf4, 0xb4, 0xfb, 0xa0, 0xbd, 0x3f, 0x70, 0x87, 0x82, 0x9d, 0x12, 0x64, 0x4f, 0x61, 0xeb, 0x46, + 0xb8, 0xa7, 0xd6, 0x03, 0x6b, 0x7f, 0xec, 0x16, 0x24, 0x8d, 0x64, 0x2a, 0x52, 0xbe, 0x56, 0xd3, + 0x16, 0x8e, 0x0c, 0xdc, 0x82, 0xb4, 0xb7, 0xa1, 0x95, 0xe8, 0x69, 0x9b, 0x41, 0xfc, 0xb2, 0x5f, + 0x07, 0x48, 0xb4, 0x57, 0x2c, 0xd3, 0x61, 0x7c, 0x90, 0x68, 0x23, 0x85, 0xf3, 0x36, 0x0c, 0x3e, + 0x79, 0x74, 0x76, 0xb1, 0x8a, 0x63, 0x15, 0xd9, 0xaf, 0x40, 0x2f, 0xf5, 0x67, 0xd7, 0x2a, 0xc7, + 0xed, 0x5a, 0xfb, 0x23, 0xd7, 0x50, 0xce, 0x1f, 0x2d, 0x18, 0x1d, 0xad, 0xf2, 0x85, 0x8a, 0xf3, + 0x70, 0xe6, 0xe7, 0xca, 0xde, 0x83, 0xfe, 0x4a, 0xab, 0x2c, 0xf6, 0x97, 0x8a, 0x25, 0x1b, 0xb8, + 0x25, 0x4d, 0x63, 0xa9, 0xaf, 0xf5, 0xf3, 0x24, 0x0b, 0x8c, 0x6c, 0x25, 0x4d, 0x1b, 0xe4, 0xc9, + 0xb5, 0x8a, 0x49, 0x40, 0x3a, 0xad, 0xa1, 0xec, 0xb7, 0x61, 0x3c, 0x53, 0x51, 0x5e, 0x88, 0xa9, + 0x51, 0xce, 0xf6, 0x7e, 0xd7, 0x1d, 0x11, 0x68, 0x24, 0xd5, 0xf6, 0xd7, 0xa1, 0x93, 0xa4, 0x2b, + 0x52, 0x94, 0xb5, 0xdf, 0xff, 0xb0, 0x7b, 0xe5, 0x47, 0x5a, 0xb9, 0x0c, 0x39, 0x7f, 0x6b, 0x41, + 0xe7, 0x2c, 0x8c, 0xe7, 0xf6, 0x6b, 0x30, 0xc8, 0xc3, 0xa5, 0xd2, 0xb9, 0xbf, 0x4c, 0x59, 0xb2, + 0x8e, 0x5b, 0x01, 0xb6, 0x0d, 0x9d, 0x79, 0x92, 0x88, 0x58, 0x63, 0x97, 0xbf, 0x09, 0x8b, 0xf0, + 0x48, 0xac, 0x31, 0xc4, 0xe8, 0x9b, 0xb1, 0x44, 0xe7, 0xac, 0x2d, 0xc2, 0xf0, 0x9b, 0x44, 0xcf, + 0x94, 0x5e, 0xc7, 0x33, 0xde, 0x7f, 0xec, 0x1a, 0xca, 0x7e, 0x13, 0x86, 0xab, 0x20, 0xf5, 0x44, + 0x53, 0x7a, 0xda, 0xe3, 0x41, 0x40, 0xe8, 0x4c, 0x10, 0x62, 0xc8, 0x67, 0x15, 0xc3, 0x96, 0x30, + 0x20, 0x54, 0x30, 0x3c, 0x80, 0x11, 0xaf, 0x80, 0xf2, 0x7b, 0xfe, 0xcd, 0x7c, 0xda, 0x47, 0x8e, + 0x96, 0x2c, 0x81, 0xd0, 0xd1, 0xcd, 0xbc, 0xc1, 0x71, 0xe3, 0x67, 0xd3, 0x41, 0x83, 0xe3, 0x99, + 0x9f, 0x11, 0x07, 0x6f, 0x52, 0xac, 0x01, 0xc2, 0x41, 0xbb, 0x54, 0x6b, 0x94, 0x1c, 0xb4, 0xc6, + 0xb0, 0xc1, 0x81, 0x6b, 0x38, 0xbf, 0x6e, 0x41, 0xcf, 0x55, 0x3f, 0x57, 0xb3, 0xdc, 0x3e, 0x84, + 0x4e, 0xbe, 0x4e, 0xe5, 0x6e, 0xb7, 0x0f, 0xdf, 0x38, 0xa8, 0xd9, 0xf0, 0x81, 0xb0, 0x98, 0xbf, + 0x0b, 0xe4, 0x72, 0x99, 0x57, 0x14, 0xe4, 0x6b, 0x34, 0x32, 0xb9, 0x75, 0x43, 0x39, 0x9f, 0x5b, + 0x00, 0x15, 0xb3, 0xdd, 0x87, 0xce, 0xd3, 0x24, 0x56, 0x93, 0xaf, 0xd8, 0x13, 0x18, 0x7d, 0x9a, + 0x25, 0xb8, 0xb7, 0x5c, 0xf0, 0xc4, 0xb2, 0xef, 0xc1, 0xce, 0xe3, 0xf8, 0xc6, 0x8f, 0xc2, 0xe0, + 0x13, 0x63, 0x4d, 0x93, 0x96, 0xbd, 0x03, 0x43, 0x66, 0x23, 0xe8, 0xec, 0xd3, 0x49, 0xdb, 0xde, + 0x85, 0x31, 0x03, 0xe7, 0x2a, 0xbb, 0x61, 0xa8, 0x43, 0x50, 0x31, 0xe3, 0x71, 0x8c, 0x5f, 0x93, + 0x2e, 0xfa, 0x01, 0x08, 0xc3, 0x47, 0xab, 0x28, 0x9a, 0xf4, 0x88, 0xe5, 0x69, 0x72, 0xac, 0xb2, + 0x3c, 0xbc, 0x62, 0x1b, 0x9e, 0x6c, 0xd9, 0x5f, 0x85, 0xdd, 0x9a, 0x55, 0x27, 0xd9, 0x47, 0x7e, + 0x18, 0x4d, 0xfa, 0xce, 0xef, 0xac, 0x62, 0xea, 0x39, 0x5d, 0x30, 0xba, 0x9a, 0x56, 0xba, 0xee, + 0x84, 0x86, 0x24, 0xab, 0x5d, 0xfa, 0x9f, 0x79, 0x97, 0x7e, 0x1c, 0x3c, 0x0f, 0x83, 0x7c, 0x61, + 0xec, 0x6a, 0x84, 0xe0, 0xc3, 0x02, 0x23, 0x37, 0x7f, 0xae, 0xa2, 0x59, 0xb2, 0x54, 0x5e, 0xae, + 0x3e, 0xcb, 0x8d, 0x67, 0x0e, 0x0d, 0x76, 0x81, 0x10, 0x5e, 0xcd, 0x30, 0x55, 0xd9, 0x32, 0xd4, + 0x85, 0xed, 0x93, 0xd9, 0xd6, 0x21, 0xe7, 0x00, 0xc6, 0xc7, 0x0b, 0x9f, 0x7c, 0xd4, 0x55, 0xcb, + 0xe4, 0x46, 0x91, 0x57, 0xcf, 0x04, 0xf0, 0xc2, 0x80, 0xbd, 0x75, 0xec, 0x0e, 0x0c, 0xf2, 0x38, + 0x70, 0xfe, 0xd1, 0x82, 0x91, 0x99, 0x70, 0x9e, 0x93, 0x45, 0xdf, 0xe6, 0xb7, 0x1a, 0xfc, 0xe2, + 0xf8, 0x19, 0x2a, 0xc2, 0x1c, 0xc1, 0x50, 0xe4, 0x08, 0xec, 0xe3, 0x22, 0x34, 0x7f, 0xdb, 0xf7, + 0xa1, 0x1b, 0x85, 0xf1, 0xb5, 0xf8, 0xe8, 0xd8, 0x15, 0x82, 0xce, 0x80, 0x11, 0x6b, 0x96, 0x85, + 0x69, 0x4e, 0x9a, 0xea, 0xca, 0x29, 0x6b, 0x90, 0xfd, 0x2a, 0x0c, 0x98, 0xd5, 0xf3, 0x83, 0x00, + 0xdd, 0x84, 0xe6, 0xf6, 0x19, 0x38, 0x0a, 0x02, 0xd2, 0x92, 0x0c, 0x66, 0x7c, 0x3e, 0xf4, 0x12, + 0x1a, 0x1f, 0x32, 0x66, 0x8e, 0x8c, 0x91, 0x2a, 0x57, 0xcb, 0x34, 0xc9, 0xfc, 0x6c, 0xcd, 0x3e, + 0x52, 0xc6, 0x80, 0x0a, 0xc7, 0x73, 0xf6, 0xd3, 0x44, 0x87, 0x2c, 0x03, 0x79, 0x49, 0xf7, 0x43, + 0xeb, 0x3d, 0xb7, 0x84, 0xec, 0x6f, 0xc3, 0xa4, 0x26, 0x92, 0xb7, 0xf0, 0xf5, 0x82, 0x5d, 0x65, + 0xe4, 0xee, 0xd4, 0xf0, 0x13, 0x84, 0x49, 0x5c, 0xba, 0x5c, 0x0a, 0x6b, 0x9a, 0x9d, 0x05, 0xc5, + 0x45, 0x80, 0xcc, 0x4c, 0x3b, 0x57, 0x00, 0xf4, 0x61, 0x24, 0x6b, 0x58, 0x48, 0xab, 0x6e, 0x21, + 0xa8, 0x2b, 0x7f, 0x86, 0x96, 0x65, 0xd4, 0x2a, 0x44, 0xcd, 0x53, 0xda, 0x75, 0x4f, 0x41, 0x87, + 0x68, 0xa3, 0x2d, 0xf1, 0xfd, 0xf7, 0x5d, 0xfa, 0x74, 0xfe, 0xdc, 0xc1, 0xf0, 0x8c, 0x1b, 0xc9, + 0x25, 0xbe, 0xd8, 0x12, 0x37, 0xef, 0xb3, 0xe9, 0xf6, 0xbe, 0x06, 0x5b, 0x74, 0x24, 0xb2, 0x02, + 0x89, 0x6e, 0x3d, 0x22, 0xd1, 0x04, 0x9a, 0x16, 0xd2, 0xbd, 0x6d, 0x21, 0xb8, 0xd6, 0x72, 0x85, + 0x61, 0xb2, 0xc7, 0xc2, 0xf1, 0x37, 0x61, 0x81, 0xf2, 0xaf, 0x38, 0xa4, 0x21, 0x46, 0xdf, 0x14, + 0xfd, 0xf5, 0x2a, 0x4d, 0x31, 0x38, 0x6a, 0xb9, 0x24, 0xb7, 0xa4, 0x49, 0xa5, 0x5a, 0x45, 0x57, + 0x1e, 0x2f, 0x34, 0x30, 0x83, 0x08, 0x9c, 0xd2, 0x62, 0xc5, 0x20, 0xaf, 0x08, 0xd5, 0xe0, 0x23, + 0x5a, 0x15, 0x4f, 0x4e, 0xce, 0xb3, 0xca, 0x14, 0x5f, 0xc5, 0xc8, 0x2d, 0x48, 0xfb, 0x9b, 0xb0, + 0x9d, 0x46, 0xab, 0x79, 0x18, 0x7b, 0xb3, 0x24, 0x66, 0x07, 0x1b, 0x31, 0xc3, 0x58, 0xd0, 0x63, + 0x01, 0xed, 0x6f, 0xc1, 0x8e, 0x61, 0x0b, 0x03, 0xf2, 0xf7, 0x7c, 0x3d, 0x1d, 0xb3, 0x56, 0xcc, + 0xec, 0xc7, 0x06, 0xa5, 0x9d, 0xd0, 0x2f, 0x97, 0xe4, 0x0a, 0xdb, 0x92, 0x58, 0x0d, 0x49, 0xa7, + 0x65, 0x7b, 0xd9, 0x11, 0x6d, 0xd2, 0x37, 0xe7, 0x70, 0x19, 0x16, 0x5b, 0x9a, 0xf0, 0xde, 0x43, + 0x83, 0x9d, 0x18, 0x16, 0x23, 0xab, 0xb0, 0xec, 0x0a, 0x8b, 0xc1, 0x98, 0x05, 0xad, 0x32, 0xcd, + 0xc2, 0x24, 0xc3, 0xfd, 0x3d, 0x9d, 0x2a, 0xff, 0x5a, 0x65, 0x53, 0x9b, 0x35, 0xb0, 0x53, 0xe0, + 0xe7, 0x02, 0x53, 0x7e, 0xcb, 0xd4, 0x0c, 0x53, 0x29, 0xc6, 0xec, 0xe9, 0x3d, 0xe6, 0xa9, 0x00, + 0xe7, 0x37, 0x2d, 0xd8, 0xc2, 0xc8, 0xf3, 0x24, 0xc4, 0x7c, 0xf5, 0x7d, 0xe8, 0xa0, 0x05, 0x69, + 0xb4, 0x94, 0xf6, 0xfe, 0xf0, 0xf0, 0xf5, 0x46, 0x08, 0x37, 0x3c, 0xf4, 0xff, 0xc3, 0x38, 0xcf, + 0xd6, 0x2e, 0xb3, 0xe2, 0x15, 0x74, 0x7f, 0xb1, 0x52, 0xe8, 0x5d, 0xad, 0xba, 0x77, 0x09, 0xb6, + 0xf7, 0x27, 0x0b, 0xfa, 0x05, 0x3f, 0x69, 0x09, 0xbd, 0x98, 0x2f, 0x59, 0x2a, 0x85, 0x82, 0x64, + 0x3b, 0xf1, 0xf5, 0x35, 0x2e, 0x41, 0x8e, 0xc0, 0xdf, 0x1b, 0xed, 0xb0, 0xd0, 0x66, 0xa7, 0xa6, + 0xcd, 0xca, 0x2f, 0xba, 0x0d, 0xbf, 0x40, 0xeb, 0xc6, 0xfc, 0x9d, 0xe5, 0x6c, 0x7c, 0x03, 0x57, + 0x08, 0xb2, 0xb4, 0x60, 0x95, 0xf9, 0xec, 0xea, 0x92, 0x54, 0x4b, 0x9a, 0xea, 0xac, 0x21, 0x85, + 0xd6, 0x53, 0x14, 0xc9, 0x9f, 0xab, 0xca, 0x3f, 0xac, 0xba, 0x7f, 0xd4, 0xfc, 0xa9, 0xc5, 0xf1, + 0xa6, 0xf4, 0xa7, 0xa6, 0x33, 0xb4, 0x79, 0xb0, 0xe6, 0x0c, 0xe8, 0x44, 0x79, 0xa6, 0x94, 0x38, + 0x11, 0x8d, 0xf5, 0x88, 0xc4, 0x01, 0x5c, 0x71, 0x29, 0x5b, 0xe2, 0x11, 0x5a, 0x64, 0x3d, 0x86, + 0x74, 0x7e, 0xdf, 0x86, 0xc9, 0x59, 0x19, 0xd1, 0x1f, 0xa9, 0x38, 0x54, 0x81, 0xfd, 0x06, 0x40, + 0x15, 0xe5, 0x8d, 0x6c, 0x35, 0xe4, 0x96, 0x18, 0xad, 0xdb, 0x3e, 0x59, 0x93, 0xbf, 0xdd, 0x8c, + 0x07, 0x95, 0x26, 0x3b, 0x0d, 0x4d, 0x7e, 0x68, 0xf2, 0x7a, 0x97, 0xf3, 0xfa, 0x3b, 0x0d, 0xa3, + 0xb8, 0x2d, 0xdd, 0x01, 0xfe, 0xad, 0x6b, 0xf9, 0xbd, 0xb8, 0xc5, 0x5e, 0x75, 0x8b, 0xce, 0x5f, + 0xd1, 0x28, 0x0a, 0x36, 0xca, 0xec, 0xa4, 0x73, 0xcc, 0xec, 0x98, 0x7b, 0xab, 0xd5, 0x30, 0xaf, + 0x8f, 0x61, 0x70, 0xbe, 0xc2, 0x73, 0x51, 0x28, 0x93, 0x8c, 0x6e, 0x92, 0xd3, 0x53, 0x4a, 0xf1, + 0x6d, 0x02, 0x68, 0xe6, 0x45, 0x92, 0x3c, 0xc1, 0xbc, 0x8e, 0xf9, 0x7c, 0x0b, 0xda, 0x27, 0x1f, + 0xfc, 0x18, 0xb3, 0xf8, 0x7d, 0x98, 0x5c, 0x14, 0xc1, 0xdd, 0xcc, 0xc1, 0x5c, 0xfe, 0x0a, 0xd8, + 0xa7, 0xb4, 0x78, 0x3c, 0x6f, 0x26, 0xf4, 0x11, 0xf4, 0x69, 0x0b, 0x5e, 0xb5, 0x5f, 0xdb, 0x86, + 0x4b, 0x80, 0x01, 0x15, 0x1c, 0x4f, 0xb1, 0x12, 0xc4, 0x69, 0x4f, 0xc2, 0x65, 0x98, 0x4f, 0xc0, + 0xf9, 0x55, 0x17, 0xda, 0x47, 0xc7, 0x4f, 0x5e, 0x92, 0x4e, 0x31, 0x7a, 0x8c, 0xc2, 0x78, 0xa1, + 0xd0, 0x11, 0x3d, 0x7f, 0x16, 0x69, 0xe3, 0x1f, 0x9d, 0x3c, 0x5b, 0x29, 0x77, 0x68, 0x46, 0x8e, + 0x70, 0x00, 0xeb, 0xa6, 0xde, 0x3c, 0x4b, 0x56, 0xa9, 0xd4, 0xb7, 0xc3, 0xc3, 0xbd, 0x86, 0x86, + 0x71, 0xa7, 0x03, 0x92, 0xe8, 0x47, 0xc4, 0xe2, 0x1a, 0x4e, 0xfb, 0x5d, 0xe8, 0xf0, 0xa2, 0x1d, + 0x9e, 0x31, 0xdd, 0x38, 0x03, 0xff, 0x5d, 0xe6, 0xaa, 0x7c, 0xb4, 0xbb, 0xc1, 0x47, 0xff, 0x69, + 0xc1, 0xa0, 0xdc, 0xa0, 0xbc, 0x30, 0x8b, 0x2d, 0x51, 0xdc, 0xce, 0x81, 0x81, 0x91, 0x57, 0x05, + 0x8d, 0x63, 0x54, 0x30, 0x5a, 0xe5, 0x96, 0x21, 0xd8, 0xac, 0x0a, 0x8e, 0x02, 0xb4, 0xdf, 0x81, + 0xe2, 0xcc, 0x3e, 0x0a, 0x2a, 0xe9, 0xea, 0x96, 0x32, 0x68, 0x80, 0xd2, 0x19, 0xa5, 0xfa, 0x2e, + 0x7b, 0x08, 0x7d, 0x8a, 0x59, 0x72, 0x7e, 0x97, 0xfc, 0x6f, 0x28, 0xfb, 0xbb, 0xb0, 0x5b, 0x6e, + 0xef, 0x2d, 0xd5, 0xf2, 0x92, 0x72, 0xae, 0x94, 0x00, 0x93, 0x72, 0xe0, 0x54, 0xf0, 0xbd, 0xbf, + 0x63, 0x0f, 0x65, 0x74, 0x82, 0x35, 0x01, 0xf8, 0x69, 0x1a, 0xad, 0x3d, 0xe4, 0x91, 0x6a, 0xb5, + 0x3c, 0x0f, 0xe3, 0x27, 0x08, 0x57, 0x4c, 0x7a, 0x75, 0xd9, 0xbc, 0x3b, 0x61, 0x3a, 0x47, 0xb8, + 0xa9, 0x98, 0xf6, 0x66, 0xc5, 0xbc, 0x30, 0x77, 0x62, 0x78, 0xe1, 0xcb, 0x34, 0x71, 0x4b, 0x08, + 0x41, 0xfd, 0x38, 0x37, 0x3d, 0x81, 0x10, 0x92, 0x34, 0xe3, 0xb5, 0x09, 0x59, 0xfc, 0xed, 0xbc, + 0x0f, 0xf0, 0x13, 0xba, 0x40, 0x2e, 0x2e, 0x48, 0x6f, 0x61, 0x20, 0x81, 0x1b, 0xf5, 0x86, 0x9f, + 0xb4, 0x12, 0xdd, 0x9e, 0xe6, 0x30, 0x85, 0xeb, 0x33, 0xe1, 0x04, 0x00, 0xc7, 0xd4, 0x2c, 0x9e, + 0xab, 0x1c, 0x77, 0xc3, 0x59, 0xd7, 0x6a, 0xcd, 0x3a, 0x18, 0xb9, 0xf4, 0xc9, 0xc9, 0x29, 0x0a, + 0x29, 0x37, 0xc5, 0x49, 0x3c, 0x93, 0x46, 0x91, 0x92, 0x13, 0x63, 0x4f, 0x09, 0x22, 0x16, 0xcd, + 0x95, 0xae, 0x61, 0x69, 0x0b, 0x8b, 0x60, 0xcc, 0xe2, 0xfc, 0xc7, 0x82, 0x7b, 0x26, 0x8b, 0x1e, + 0xcd, 0x28, 0xb8, 0x62, 0x6b, 0x1a, 0x5e, 0xad, 0xe9, 0x2e, 0x7d, 0xa6, 0x8d, 0x7d, 0x19, 0x8a, + 0xce, 0xc7, 0x69, 0x58, 0x9a, 0x00, 0xfe, 0x96, 0xa4, 0x1a, 0x97, 0xe5, 0xef, 0xd8, 0x2d, 0x48, + 0xfb, 0x04, 0x06, 0x09, 0x06, 0x06, 0x89, 0xe2, 0x1d, 0x8e, 0x4a, 0xdf, 0x69, 0x78, 0xc0, 0x86, + 0xad, 0x0f, 0x3e, 0x2e, 0x66, 0xb8, 0xd5, 0x64, 0xe7, 0x5d, 0xb4, 0x0a, 0xb3, 0x28, 0x40, 0x4f, + 0xea, 0x77, 0x0c, 0x3d, 0x43, 0x31, 0x16, 0x8a, 0x1b, 0x2d, 0x8a, 0x50, 0x1c, 0x82, 0x3a, 0xce, + 0x03, 0x18, 0x94, 0xab, 0x50, 0xb4, 0xc1, 0x1a, 0x14, 0xe3, 0x16, 0x50, 0x03, 0x44, 0x16, 0x39, + 0xb1, 0x9c, 0x9f, 0x61, 0xc9, 0x5d, 0xdf, 0xfb, 0x0b, 0xaa, 0xaf, 0x97, 0x84, 0xe9, 0x4a, 0x53, + 0xed, 0xba, 0xa6, 0x9c, 0xbf, 0x58, 0x12, 0xae, 0x38, 0x5d, 0xbf, 0x07, 0x5d, 0x29, 0x35, 0xad, + 0x0d, 0x81, 0xa3, 0xe0, 0xe2, 0x0f, 0x57, 0x18, 0xf7, 0xb4, 0x1c, 0xa6, 0x6e, 0x95, 0x12, 0xb8, + 0x0a, 0xab, 0x2c, 0xfc, 0xbf, 0x55, 0x4b, 0xbb, 0x54, 0x84, 0xfb, 0x3a, 0xf7, 0xb4, 0x52, 0x45, + 0xf5, 0xd9, 0x27, 0xe0, 0x1c, 0x69, 0x2e, 0xc2, 0x69, 0xd0, 0x88, 0x6e, 0x8c, 0x7c, 0x48, 0x98, + 0xd1, 0xa1, 0xf3, 0x6f, 0x4c, 0xac, 0xcf, 0x92, 0x70, 0xa6, 0x2e, 0xfc, 0x6c, 0xae, 0x72, 0x7a, + 0x6d, 0x28, 0xfb, 0x09, 0xfc, 0xb2, 0x3f, 0xc0, 0xcc, 0xc8, 0x23, 0x62, 0xab, 0xc3, 0xc3, 0x37, + 0x1b, 0x07, 0xa9, 0x4d, 0x3d, 0x90, 0x3f, 0xb7, 0xe0, 0xdf, 0xfb, 0x83, 0x05, 0x3d, 0xb3, 0x6a, + 0x43, 0xd5, 0xed, 0xff, 0x41, 0xd5, 0xa5, 0x23, 0xb6, 0xeb, 0x8e, 0xf8, 0x6a, 0xd5, 0xb1, 0xd4, + 0x63, 0xa6, 0x34, 0x2e, 0x6f, 0x41, 0x7f, 0xb6, 0x08, 0x23, 0xac, 0x5e, 0xe2, 0x66, 0x4c, 0x2d, + 0x61, 0x27, 0x81, 0x9d, 0x2a, 0x9d, 0xb1, 0xa3, 0xbe, 0xac, 0x9f, 0xba, 0xd5, 0xd1, 0x89, 0x9c, + 0x75, 0x88, 0x64, 0xba, 0x8a, 0x56, 0x58, 0x00, 0xb5, 0x1b, 0x32, 0x31, 0xe6, 0xfc, 0x12, 0xbb, + 0xb7, 0x24, 0x50, 0xb3, 0xe2, 0xa9, 0x88, 0xca, 0x97, 0x28, 0x5d, 0xf8, 0x7c, 0xc1, 0x5d, 0x57, + 0x08, 0xba, 0xdf, 0x4b, 0x95, 0xfb, 0x5c, 0x6a, 0x75, 0x5d, 0xfe, 0xa6, 0x4c, 0x85, 0xb5, 0xf6, + 0x15, 0x9a, 0x83, 0x4c, 0x20, 0x8b, 0x2b, 0x83, 0xb3, 0x8c, 0x1c, 0xf1, 0xe4, 0xe2, 0x31, 0xa5, + 0x73, 0xf7, 0x31, 0xe5, 0xf3, 0x5e, 0xd5, 0x74, 0xe8, 0x2f, 0x30, 0xfb, 0x6f, 0x00, 0x68, 0x62, + 0xf1, 0x92, 0x38, 0xba, 0x55, 0x33, 0x0e, 0x78, 0xe0, 0x63, 0xc4, 0x31, 0xb0, 0x8e, 0x66, 0x55, + 0x92, 0x96, 0xc4, 0x38, 0x72, 0x1b, 0x98, 0xfd, 0x03, 0x18, 0x5e, 0x65, 0xc9, 0xd2, 0x93, 0xd0, + 0xc4, 0x32, 0x0d, 0x0f, 0x5f, 0xbb, 0xe3, 0x02, 0x2c, 0xd0, 0x01, 0xff, 0xba, 0x40, 0x13, 0x8e, + 0x99, 0xbf, 0x9c, 0x2e, 0x61, 0x8b, 0x6f, 0xf1, 0x4b, 0x4d, 0x97, 0x20, 0xf1, 0xff, 0xf3, 0x82, + 0x63, 0x1f, 0x54, 0xef, 0x85, 0x23, 0x56, 0xc2, 0xfd, 0xa6, 0xf7, 0xc9, 0x58, 0xf5, 0x8a, 0x78, + 0xe7, 0xd9, 0x6d, 0xbc, 0xe1, 0xd9, 0xad, 0x56, 0xeb, 0x6f, 0x4b, 0xef, 0x55, 0xd4, 0xfa, 0xd8, + 0x8c, 0x54, 0x6f, 0x1f, 0x3b, 0xe2, 0x03, 0x25, 0x40, 0xc5, 0x2d, 0x1a, 0x46, 0x18, 0x2b, 0xad, + 0x66, 0x9a, 0x3b, 0x23, 0x54, 0x5a, 0x85, 0x50, 0xfd, 0x1e, 0x06, 0x91, 0x8c, 0xee, 0x4a, 0xfd, + 0x5e, 0xd0, 0xf6, 0xfb, 0x60, 0xeb, 0x9c, 0xde, 0x78, 0xbc, 0x9a, 0x9d, 0x48, 0x4f, 0x54, 0x98, + 0xd8, 0xae, 0x30, 0xd4, 0x0a, 0xc0, 0xd2, 0xa6, 0xef, 0xdd, 0xb1, 0xe9, 0xbd, 0x9f, 0x42, 0x57, + 0xcc, 0xb9, 0x78, 0x02, 0xb4, 0x36, 0x3c, 0x01, 0xb6, 0x36, 0x3c, 0x01, 0xb6, 0x37, 0x3e, 0x01, + 0x76, 0xea, 0x4f, 0x80, 0xf4, 0x60, 0x34, 0x74, 0x15, 0x96, 0x60, 0x3a, 0x7f, 0x18, 0x25, 0x97, + 0xd4, 0x6c, 0x1a, 0x1f, 0xf1, 0x8a, 0xae, 0x55, 0xc2, 0xd8, 0xb6, 0x81, 0x2f, 0x4c, 0xf3, 0x5a, + 0x63, 0x2c, 0x9a, 0xce, 0x56, 0x83, 0xf1, 0xd8, 0xf4, 0x9e, 0xdf, 0x83, 0x7b, 0x45, 0xb8, 0xa9, + 0xbf, 0xb2, 0x48, 0x63, 0x62, 0x9b, 0xa1, 0x47, 0xd5, 0x88, 0xf3, 0x2f, 0x0b, 0x46, 0x62, 0xde, + 0x98, 0xc4, 0xae, 0xc2, 0xf9, 0xdd, 0xb7, 0x2a, 0xeb, 0x4b, 0xbc, 0x55, 0xb5, 0xee, 0xbe, 0x55, + 0x61, 0xe0, 0xf3, 0xa3, 0x28, 0x79, 0xee, 0x2d, 0xf2, 0x65, 0x24, 0xc1, 0x0b, 0xcb, 0x28, 0x42, + 0x4e, 0x10, 0xa0, 0x76, 0xdc, 0x74, 0x3c, 0x5e, 0xa4, 0xe2, 0x79, 0xbe, 0x30, 0xaa, 0x1a, 0x1b, + 0xf4, 0x09, 0x83, 0x98, 0xed, 0xee, 0x87, 0x4b, 0x62, 0xba, 0xc5, 0x2c, 0xcf, 0x0e, 0x36, 0x8f, + 0x9d, 0x36, 0x66, 0x34, 0x9e, 0x63, 0x7a, 0xb7, 0x9e, 0x63, 0xae, 0x61, 0x7c, 0xbe, 0x9a, 0xcf, + 0x51, 0xff, 0xe6, 0xb4, 0x2f, 0x7e, 0x38, 0xa7, 0x96, 0xcb, 0xbc, 0x06, 0xf9, 0x91, 0x04, 0x2d, + 0xb7, 0x86, 0x90, 0x93, 0xa1, 0xbd, 0x2c, 0xbc, 0x3c, 0xf1, 0x72, 0x3f, 0xba, 0x36, 0x27, 0x04, + 0xc2, 0x2e, 0x92, 0x0b, 0x44, 0x1e, 0xb6, 0x4e, 0xac, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x32, + 0xa6, 0x1d, 0x72, 0xe3, 0x17, 0x00, 0x00, } diff --git a/pkg/mumbleproto/Mumble.proto b/pkg/mumbleproto/Mumble.proto index 8e262ba..0233117 100644 --- a/pkg/mumbleproto/Mumble.proto +++ b/pkg/mumbleproto/Mumble.proto @@ -3,6 +3,8 @@ package mumbleproto; option optimize_for = SPEED; message Version { + repeated string crypto_modes = 5; + // 2-byte Major, 1-byte Minor and 1-byte Patch version number. optional uint32 version = 1; // Client release name. @@ -11,7 +13,6 @@ message Version { optional string os = 3; // Client OS version. optional string os_version = 4; - repeated string crypto_modes = 5; } // Not used. Not even for tunneling UDP through TCP. diff --git a/pkg/mumbleproto/generate.go b/pkg/mumbleproto/generate.go new file mode 100644 index 0000000..c2f9c4b --- /dev/null +++ b/pkg/mumbleproto/generate.go @@ -0,0 +1,3 @@ +//go:generate go run generate_main.go + +package mumbleproto diff --git a/pkg/mumbleproto/generate_main.go b/pkg/mumbleproto/generate_main.go new file mode 100644 index 0000000..326616f --- /dev/null +++ b/pkg/mumbleproto/generate_main.go @@ -0,0 +1,49 @@ +// +build ignore + +package main + +import ( + "io/ioutil" + "log" + "net/http" + "os/exec" + "regexp" +) + +var replacements = []string{ + `(?m)^package MumbleProto;$`, `package mumbleproto;`, + `(?m)^(message Version {)$`, "$1\n\trepeated string crypto_modes = 5;\n", +} + +func main() { + // Fetch Mumble.proto + resp, err := http.Get("https://raw.githubusercontent.com/mumble-voip/mumble/master/src/Mumble.proto") + if err != nil { + log.Fatal(err) + } + defer resp.Body.Close() + data, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Fatal(err) + } + + // Perform replacements + for i := 0; i < len(replacements); i += 2 { + re, rp := replacements[i], replacements[i+1] + regex, err := regexp.Compile(re) + if err != nil { + log.Fatal(err) + } + data = regex.ReplaceAll(data, []byte(rp)) + } + + // Write Mumble.proto + if err := ioutil.WriteFile("Mumble.proto", data, 0644); err != nil { + log.Fatal(err) + } + + // Run protobuf compiler + if err := exec.Command("protoc", "--go_out=.", "Mumble.proto").Run(); err != nil { + log.Fatal(err) + } +} |