Skip to content

Commit f5afbf6

Browse files
Utilising the provider Info from GetSipTrunkAuthentication to set it … (#476)
* Utilising the provider Info from GetSipTrunkAuthentication to set it in SipCallInfo * Updating protocol to the final landed version * tidy
1 parent 35eeaa3 commit f5afbf6

File tree

5 files changed

+24
-19
lines changed

5 files changed

+24
-19
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ toolchain go1.24.3
77
require (
88
github.com/at-wat/ebml-go v0.17.1
99
github.com/frostbyte73/core v0.1.1
10+
github.com/hashicorp/golang-lru/v2 v2.0.7
1011
github.com/icholy/digest v1.1.0
1112
github.com/jfreymuth/oggvorbis v1.0.5
1213
github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731
1314
github.com/livekit/media-sdk v0.0.0-20250918175425-11d305ef5503
1415
github.com/livekit/mediatransportutil v0.0.0-20250519131108-fb90f5acfded
15-
github.com/livekit/protocol v1.41.1-0.20250919162624-3476f457ed91
16+
github.com/livekit/protocol v1.42.1-0.20251012093153-c84cf2c2802b
1617
github.com/livekit/psrpc v0.7.0
1718
github.com/livekit/server-sdk-go/v2 v2.11.1
1819
github.com/livekit/sipgo v0.13.2-0.20250601220430-a77cc3f220fb
@@ -33,7 +34,6 @@ require (
3334
)
3435

3536
require (
36-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
3737
github.com/nyaruka/phonenumbers v1.6.5 // indirect
3838
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
3939
go.opentelemetry.io/otel v1.37.0 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ github.com/livekit/media-sdk v0.0.0-20250918175425-11d305ef5503 h1:zQsJzxh3Xzg+L
129129
github.com/livekit/media-sdk v0.0.0-20250918175425-11d305ef5503/go.mod h1:7ssWiG+U4xnbvLih9WiZbhQP6zIKMjgXdUtIE1bm/E8=
130130
github.com/livekit/mediatransportutil v0.0.0-20250519131108-fb90f5acfded h1:ylZPdnlX1RW9Z15SD4mp87vT2D2shsk0hpLJwSPcq3g=
131131
github.com/livekit/mediatransportutil v0.0.0-20250519131108-fb90f5acfded/go.mod h1:mSNtYzSf6iY9xM3UX42VEI+STHvMgHmrYzEHPcdhB8A=
132-
github.com/livekit/protocol v1.41.1-0.20250919162624-3476f457ed91 h1:XoxTN5GkqZCrUz02bTxQQhB34yDgSWnmVv12oQJgpuo=
133-
github.com/livekit/protocol v1.41.1-0.20250919162624-3476f457ed91/go.mod h1:vhMS30QoEyH2p34vi6X1eWkC4EMV72ZGZwQb74ajY7A=
132+
github.com/livekit/protocol v1.42.1-0.20251012093153-c84cf2c2802b h1:yy10iTBHZV+fECKlAolZyrc/lBBf1a7mwipNOR9Dc7A=
133+
github.com/livekit/protocol v1.42.1-0.20251012093153-c84cf2c2802b/go.mod h1:vhMS30QoEyH2p34vi6X1eWkC4EMV72ZGZwQb74ajY7A=
134134
github.com/livekit/psrpc v0.7.0 h1:rtfqfjYN06WJYloE/S0nmkJ/Y04x4pxLQLe8kQ4FVHU=
135135
github.com/livekit/psrpc v0.7.0/go.mod h1:AuDC5uOoEjQJEc69v4Li3t77Ocz0e0NdjQEuFfO+vfk=
136136
github.com/livekit/server-sdk-go/v2 v2.11.1 h1:mBRlkstQxueAl+2BHqQad1wTzbyyC4DYbA6VE1UUajw=

pkg/service/psrpc.go

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,26 @@ func GetAuthCredentials(ctx context.Context, psrpcClient rpc.IOInfoClient, call
2929
}
3030
if resp.Drop {
3131
return sip.AuthInfo{
32-
ProjectID: resp.ProjectId,
33-
Result: sip.AuthDrop,
32+
ProjectID: resp.ProjectId,
33+
Result: sip.AuthDrop,
34+
ProviderInfo: resp.ProviderInfo,
3435
}, nil
3536
}
3637
if resp.Username != "" && resp.Password != "" {
3738
return sip.AuthInfo{
38-
ProjectID: resp.ProjectId,
39-
TrunkID: resp.SipTrunkId,
40-
Result: sip.AuthPassword,
41-
Username: resp.Username,
42-
Password: resp.Password,
39+
ProjectID: resp.ProjectId,
40+
TrunkID: resp.SipTrunkId,
41+
Result: sip.AuthPassword,
42+
Username: resp.Username,
43+
Password: resp.Password,
44+
ProviderInfo: resp.ProviderInfo,
4345
}, nil
4446
}
4547
return sip.AuthInfo{
46-
ProjectID: resp.ProjectId,
47-
TrunkID: resp.SipTrunkId,
48-
Result: sip.AuthAccept,
48+
ProjectID: resp.ProjectId,
49+
TrunkID: resp.SipTrunkId,
50+
Result: sip.AuthAccept,
51+
ProviderInfo: resp.ProviderInfo,
4952
}, nil
5053
}
5154

pkg/sip/inbound.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ func (s *Server) processInvite(req *sip.Request, tx sip.ServerTransaction) (retE
401401
CallDirection: livekit.SIPCallDirection_SCD_INBOUND,
402402
CreatedAtNs: time.Now().UnixNano(),
403403
TrunkId: r.TrunkID,
404+
ProviderInfo: r.ProviderInfo,
404405
})
405406
state.Flush(ctx)
406407

pkg/sip/server.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,12 @@ const (
7373
)
7474

7575
type AuthInfo struct {
76-
Result AuthResult
77-
ProjectID string
78-
TrunkID string
79-
Username string
80-
Password string
76+
Result AuthResult
77+
ProjectID string
78+
TrunkID string
79+
Username string
80+
Password string
81+
ProviderInfo *livekit.ProviderInfo
8182
}
8283

8384
type DispatchResult int

0 commit comments

Comments
 (0)