diff --git a/.changeset/violet-avocados-leave.md b/.changeset/violet-avocados-leave.md new file mode 100644 index 00000000..1231daf8 --- /dev/null +++ b/.changeset/violet-avocados-leave.md @@ -0,0 +1,6 @@ +--- +"@livekit/protocol": patch +"github.com/livekit/protocol": patch +--- + +Fix port type for SIPUri. diff --git a/livekit/livekit_sip.pb.go b/livekit/livekit_sip.pb.go index 01f97396..1d5c5eb0 100644 --- a/livekit/livekit_sip.pb.go +++ b/livekit/livekit_sip.pb.go @@ -2404,7 +2404,7 @@ type SIPUri struct { User string `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"` Host string `protobuf:"bytes,2,opt,name=host,proto3" json:"host,omitempty"` Ip string `protobuf:"bytes,3,opt,name=ip,proto3" json:"ip,omitempty"` - Port string `protobuf:"bytes,4,opt,name=port,proto3" json:"port,omitempty"` + Port uint32 `protobuf:"varint,4,opt,name=port,proto3" json:"port,omitempty"` Transport SIPTransport `protobuf:"varint,5,opt,name=transport,proto3,enum=livekit.SIPTransport" json:"transport,omitempty"` } @@ -2459,11 +2459,11 @@ func (x *SIPUri) GetIp() string { return "" } -func (x *SIPUri) GetPort() string { +func (x *SIPUri) GetPort() uint32 { if x != nil { return x.Port } - return "" + return 0 } func (x *SIPUri) GetTransport() SIPTransport { @@ -2899,7 +2899,7 @@ var file_livekit_sip_proto_rawDesc = []byte{ 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x33, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x6e, + 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x33, 0x0a, 0x09, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x6c, 0x69, 0x76, 0x65, 0x6b, 0x69, 0x74, 0x2e, 0x53, 0x49, 0x50, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x09, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2a, 0x6b, 0x0a, diff --git a/livekit/livekit_sip.twirp.go b/livekit/livekit_sip.twirp.go index 5cfe0f38..b70aa7fe 100644 --- a/livekit/livekit_sip.twirp.go +++ b/livekit/livekit_sip.twirp.go @@ -3985,31 +3985,31 @@ var twirpFileDescriptor4 = []byte{ 0xa9, 0xe8, 0x21, 0x0a, 0x4b, 0x2d, 0x6c, 0xdb, 0xa6, 0xcd, 0x2b, 0x50, 0x51, 0x11, 0x2f, 0xf5, 0x3f, 0xa4, 0x20, 0x27, 0x3c, 0xc0, 0xea, 0xdc, 0xdc, 0xc1, 0xb6, 0x0c, 0x34, 0x7f, 0x66, 0xb4, 0x0b, 0xd3, 0xa1, 0xee, 0xd5, 0x0a, 0x7b, 0x46, 0x65, 0x48, 0x13, 0x4b, 0x06, 0x36, 0x4d, 0x2c, - 0x26, 0xc3, 0xef, 0x4b, 0xe4, 0xa9, 0x8e, 0xdf, 0x89, 0xbc, 0xcf, 0x45, 0xca, 0x93, 0x4b, 0xf9, - 0xe3, 0x82, 0x7b, 0xb1, 0xb2, 0xc7, 0x33, 0x5e, 0x1d, 0x2b, 0xad, 0xfe, 0x68, 0x38, 0x50, 0xc6, - 0x6a, 0xeb, 0x64, 0x3c, 0xa8, 0xdc, 0x41, 0xbb, 0xb0, 0x15, 0xa4, 0x9f, 0x74, 0x86, 0x95, 0xd4, - 0x32, 0x79, 0xdc, 0x1e, 0x56, 0xd2, 0x11, 0xe4, 0xe3, 0x51, 0x25, 0xf3, 0xe4, 0x2d, 0x6c, 0x04, - 0x82, 0xc9, 0xe5, 0xda, 0x23, 0xb5, 0xdd, 0x3a, 0x3e, 0x56, 0x7b, 0xfd, 0xf6, 0xe0, 0x8b, 0x5e, - 0xff, 0x55, 0xe5, 0x0e, 0xaa, 0xc1, 0x1e, 0x23, 0x0f, 0x5b, 0xca, 0xb8, 0xd7, 0xee, 0x0d, 0x5b, - 0xfd, 0xb1, 0xfa, 0xa3, 0x41, 0xaf, 0xdf, 0xed, 0x54, 0x52, 0xa8, 0x0c, 0xc0, 0x78, 0xad, 0xf6, - 0xb8, 0xf7, 0x93, 0x6e, 0x25, 0x8d, 0x76, 0xa0, 0xc2, 0xde, 0x3b, 0xbd, 0x51, 0x7b, 0xd0, 0xef, - 0x77, 0xdb, 0xe3, 0x6e, 0xa7, 0x92, 0x41, 0x1b, 0x50, 0x64, 0xd4, 0xae, 0xa2, 0x0c, 0x94, 0xca, - 0x5a, 0xf3, 0x1f, 0x45, 0xc8, 0x8c, 0x7a, 0x43, 0x34, 0x84, 0x75, 0xff, 0x70, 0x8d, 0x16, 0x87, - 0x8c, 0x88, 0x71, 0xbc, 0x76, 0x14, 0xc3, 0x15, 0x07, 0x96, 0x7a, 0xe6, 0xf7, 0xe9, 0x14, 0xfa, - 0xca, 0xf7, 0xe3, 0x9b, 0x7f, 0x30, 0x46, 0x0f, 0x96, 0x3b, 0x63, 0xc4, 0x1c, 0x5e, 0x4b, 0x9c, - 0xac, 0x91, 0x0a, 0x7b, 0xd1, 0xd7, 0x7e, 0xe8, 0xe3, 0x65, 0xf5, 0x51, 0x53, 0x77, 0x2d, 0x79, - 0x8c, 0x46, 0x3f, 0x07, 0xb4, 0x7c, 0xdd, 0x82, 0x16, 0xe3, 0x58, 0xec, 0x55, 0x4e, 0xed, 0x7e, - 0xa2, 0x8c, 0x3c, 0xd3, 0xfd, 0x12, 0xb6, 0x23, 0xee, 0x4e, 0x50, 0x78, 0x6d, 0xa4, 0xe5, 0x1f, - 0x25, 0x0b, 0x2d, 0x76, 0x88, 0xb8, 0xc7, 0xf0, 0xed, 0x10, 0x7f, 0x07, 0xe2, 0xdb, 0x21, 0xe9, - 0x2a, 0x64, 0xe2, 0x5d, 0xc8, 0x04, 0x3f, 0x62, 0x69, 0x75, 0xe4, 0x57, 0x3c, 0xb8, 0x41, 0x4a, - 0x6e, 0xf2, 0x0a, 0xca, 0xc1, 0x7b, 0x0c, 0xb4, 0x18, 0x5b, 0x23, 0x2f, 0x38, 0x6a, 0xd1, 0x17, - 0x40, 0x01, 0x3c, 0x06, 0x06, 0xfb, 0x07, 0x2b, 0xcd, 0x70, 0xb5, 0xc4, 0x63, 0xb7, 0xcf, 0xdb, - 0x01, 0xdd, 0x4b, 0xde, 0x8e, 0xd2, 0xfc, 0x51, 0xb2, 0x90, 0x74, 0xc4, 0x57, 0xbe, 0x0b, 0x9d, - 0x18, 0xfb, 0x93, 0x4e, 0xfc, 0x37, 0xd8, 0xff, 0x25, 0xec, 0x44, 0x9d, 0x53, 0x7d, 0xb1, 0x4c, - 0x38, 0xc6, 0xd6, 0x0e, 0xfc, 0xba, 0xc3, 0x87, 0xa2, 0x9f, 0xc2, 0x5e, 0xf4, 0xe1, 0xc3, 0x97, - 0xaa, 0x89, 0xa7, 0x93, 0xda, 0xde, 0xd2, 0x31, 0xb0, 0x3b, 0xb3, 0xe8, 0xf5, 0x8b, 0x97, 0x3f, - 0xbb, 0x7f, 0x4e, 0xe8, 0xc5, 0xfc, 0xb4, 0x31, 0x31, 0x67, 0x4f, 0xa5, 0x2e, 0xf1, 0x0f, 0x81, - 0x89, 0x39, 0x75, 0x09, 0x7f, 0x4d, 0x6f, 0x1c, 0x93, 0x2b, 0xfc, 0x86, 0xd0, 0xc6, 0x90, 0xb1, - 0xfe, 0x9d, 0x2e, 0xcb, 0xf7, 0xe7, 0xcf, 0x39, 0xe1, 0x34, 0xc7, 0x97, 0x3c, 0xfb, 0x6f, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x04, 0x8a, 0xd6, 0x42, 0xa0, 0x20, 0x00, 0x00, + 0x26, 0xc3, 0xef, 0x4b, 0x58, 0x3c, 0x37, 0x14, 0xfe, 0xfc, 0x5e, 0x17, 0x29, 0x4f, 0x2e, 0xe5, + 0x8f, 0x0b, 0xee, 0xc5, 0xca, 0x1e, 0xcf, 0x78, 0x75, 0xac, 0xb4, 0xfa, 0xa3, 0xe1, 0x40, 0x19, + 0xab, 0xad, 0x93, 0xf1, 0xa0, 0x72, 0x07, 0xed, 0xc2, 0x56, 0x90, 0x7e, 0xd2, 0x19, 0x56, 0x52, + 0xcb, 0xe4, 0x71, 0x7b, 0x58, 0x49, 0x47, 0x90, 0x8f, 0x47, 0x95, 0xcc, 0x93, 0xb7, 0xb0, 0x11, + 0x08, 0x26, 0x97, 0x6b, 0x8f, 0xd4, 0x76, 0xeb, 0xf8, 0x58, 0xed, 0xf5, 0xdb, 0x83, 0x2f, 0x7a, + 0xfd, 0x57, 0x95, 0x3b, 0xa8, 0x06, 0x7b, 0x8c, 0x3c, 0x6c, 0x29, 0xe3, 0x5e, 0xbb, 0x37, 0x6c, + 0xf5, 0xc7, 0xea, 0x8f, 0x06, 0xbd, 0x7e, 0xb7, 0x53, 0x49, 0xa1, 0x32, 0x00, 0xe3, 0xb5, 0xda, + 0xe3, 0xde, 0x4f, 0xba, 0x95, 0x34, 0xda, 0x81, 0x0a, 0x7b, 0xef, 0xf4, 0x46, 0xed, 0x41, 0xbf, + 0xdf, 0x6d, 0x8f, 0xbb, 0x9d, 0x4a, 0x06, 0x6d, 0x40, 0x91, 0x51, 0xbb, 0x8a, 0x32, 0x50, 0x2a, + 0x6b, 0xcd, 0x7f, 0x14, 0x21, 0x33, 0xea, 0x0d, 0xd1, 0x10, 0xd6, 0xfd, 0xc3, 0x35, 0x5a, 0x1c, + 0x32, 0x22, 0xc6, 0xf1, 0xda, 0x51, 0x0c, 0x57, 0x1c, 0x58, 0xea, 0x99, 0xdf, 0xa7, 0x53, 0xe8, + 0x2b, 0xdf, 0x8f, 0x6f, 0xfe, 0xc1, 0x18, 0x3d, 0x58, 0xee, 0x8c, 0x11, 0x73, 0x78, 0x2d, 0x71, + 0xb2, 0x46, 0x2a, 0xec, 0x45, 0x5f, 0xfb, 0xa1, 0x8f, 0x97, 0xd5, 0x47, 0x4d, 0xdd, 0xb5, 0xe4, + 0x31, 0x1a, 0xfd, 0x1c, 0xd0, 0xf2, 0x75, 0x0b, 0x5a, 0x8c, 0x63, 0xb1, 0x57, 0x39, 0xb5, 0xfb, + 0x89, 0x32, 0xf2, 0x4c, 0xf7, 0x4b, 0xd8, 0x8e, 0xb8, 0x3b, 0x41, 0xe1, 0xb5, 0x91, 0x96, 0x7f, + 0x94, 0x2c, 0xb4, 0xd8, 0x21, 0xe2, 0x1e, 0xc3, 0xb7, 0x43, 0xfc, 0x1d, 0x88, 0x6f, 0x87, 0xa4, + 0xab, 0x90, 0x89, 0x77, 0x21, 0x13, 0xfc, 0x88, 0xa5, 0xd5, 0x91, 0x5f, 0xf1, 0xe0, 0x06, 0x29, + 0xb9, 0xc9, 0x2b, 0x28, 0x07, 0xef, 0x31, 0xd0, 0x62, 0x6c, 0x8d, 0xbc, 0xe0, 0xa8, 0x45, 0x5f, + 0x00, 0x05, 0xf0, 0x18, 0x18, 0xec, 0x1f, 0xac, 0x34, 0xc3, 0xd5, 0x12, 0x8f, 0xdd, 0x3e, 0x6f, + 0x07, 0x74, 0x2f, 0x79, 0x3b, 0x4a, 0xf3, 0x47, 0xc9, 0x42, 0xd2, 0x11, 0x5f, 0xf9, 0x2e, 0x74, + 0x62, 0xec, 0x4f, 0x3a, 0xf1, 0xdf, 0x60, 0xff, 0x97, 0xb0, 0x13, 0x75, 0x4e, 0xf5, 0xc5, 0x32, + 0xe1, 0x18, 0x5b, 0x3b, 0xf0, 0xeb, 0x0e, 0x1f, 0x8a, 0x7e, 0x0a, 0x7b, 0xd1, 0x87, 0x0f, 0x5f, + 0xaa, 0x26, 0x9e, 0x4e, 0x6a, 0x7b, 0x4b, 0xc7, 0xc0, 0xee, 0xcc, 0xa2, 0xd7, 0x2f, 0x5e, 0xfe, + 0xec, 0xfe, 0x39, 0xa1, 0x17, 0xf3, 0xd3, 0xc6, 0xc4, 0x9c, 0x3d, 0x95, 0xba, 0xc4, 0x3f, 0x04, + 0x26, 0xe6, 0xd4, 0x25, 0xfc, 0x35, 0xbd, 0x71, 0x4c, 0xae, 0xf0, 0x1b, 0x42, 0x1b, 0x43, 0xc6, + 0xfa, 0x77, 0xba, 0x2c, 0xdf, 0x9f, 0x3f, 0xe7, 0x84, 0xd3, 0x1c, 0x5f, 0xf2, 0xec, 0xbf, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x8e, 0xf4, 0x5f, 0x7e, 0xa0, 0x20, 0x00, 0x00, } diff --git a/protobufs/livekit_sip.proto b/protobufs/livekit_sip.proto index b617174f..e8372605 100644 --- a/protobufs/livekit_sip.proto +++ b/protobufs/livekit_sip.proto @@ -457,7 +457,7 @@ message SIPUri { string user = 1; string host = 2; string ip = 3; - string port = 4; + uint32 port = 4; SIPTransport transport = 5; }