@@ -412,17 +412,21 @@ func (c *inboundCall) handleInvite(ctx context.Context, req *sip.Request, trunkI
412412 pinPrompt = true
413413 }
414414
415- // We need to start media first, otherwise we won't be able to send audio prompts to the caller, or receive DTMF.
416- answerData , err := c .runMediaConn (req .Body (), conf , disp .EnabledFeatures )
417- if err != nil {
418- c .log .Errorw ("Cannot start media" , err )
419- c .cc .RespondAndDrop (sip .StatusInternalServerError , "" )
420- c .close (true , callDropped , "media-failed" )
421- return err
415+ runMedia := func (enc livekit.SIPMediaEncryption ) ([]byte , error ) {
416+ answerData , err := c .runMediaConn (req .Body (), enc , conf , disp .EnabledFeatures )
417+ if err != nil {
418+ c .log .Errorw ("Cannot start media" , err )
419+ c .cc .RespondAndDrop (sip .StatusInternalServerError , "" )
420+ c .close (true , callDropped , "media-failed" )
421+ return nil , err
422+ }
423+ return answerData , nil
422424 }
423- acceptCall := func () (bool , error ) {
425+
426+ // We need to start media first, otherwise we won't be able to send audio prompts to the caller, or receive DTMF.
427+ acceptCall := func (answerData []byte ) (bool , error ) {
424428 c .log .Infow ("Accepting the call" , "headers" , disp .Headers )
425- if err = c .cc .Accept (ctx , answerData , disp .Headers ); err != nil {
429+ if err : =c .cc .Accept (ctx , answerData , disp .Headers ); err != nil {
426430 c .log .Errorw ("Cannot respond to INVITE" , err )
427431 return false , err
428432 }
@@ -435,15 +439,30 @@ func (c *inboundCall) handleInvite(ctx context.Context, req *sip.Request, trunkI
435439 }
436440
437441 ok := false
442+ var answerData []byte
438443 if pinPrompt {
444+ var err error
439445 // Accept the call first on the SIP side, so that we can send audio prompts.
440- if ok , err = acceptCall (); ! ok {
446+ // This also means we have to pick encryption setting early, before room is selected.
447+ // Backend must explicitly enable encryption for pin prompts.
448+ answerData , err = runMedia (disp .MediaEncryption )
449+ if err != nil {
450+ return err // already sent a response
451+ }
452+ if ok , err = acceptCall (answerData ); ! ok {
441453 return err // could be success if the caller hung up
442454 }
443455 disp , ok , err = c .pinPrompt (ctx , trunkID )
444456 if ! ok {
445457 return err // already sent a response. Could be success if user hung up
446458 }
459+ } else {
460+ // Start media with given encryption settings.
461+ var err error
462+ answerData , err = runMedia (disp .MediaEncryption )
463+ if err != nil {
464+ return err // already sent a response
465+ }
447466 }
448467 if len (disp .HeadersToAttributes ) != 0 {
449468 p := & disp .Room .Participant
@@ -486,7 +505,7 @@ func (c *inboundCall) handleInvite(ctx context.Context, req *sip.Request, trunkI
486505 if ok , err := c .waitSubscribe (ctx , disp .RingingTimeout ); ! ok {
487506 return err // already sent a response. Could be success if caller hung up
488507 }
489- if ok , err := acceptCall (); ! ok {
508+ if ok , err := acceptCall (answerData ); ! ok {
490509 return err // already sent a response. Could be success if caller hung up
491510 }
492511 }
@@ -518,11 +537,16 @@ func (c *inboundCall) handleInvite(ctx context.Context, req *sip.Request, trunkI
518537 }
519538}
520539
521- func (c * inboundCall ) runMediaConn (offerData []byte , conf * config.Config , features []livekit.SIPFeature ) (answerData []byte , _ error ) {
540+ func (c * inboundCall ) runMediaConn (offerData []byte , enc livekit. SIPMediaEncryption , conf * config.Config , features []livekit.SIPFeature ) (answerData []byte , _ error ) {
522541 c .mon .SDPSize (len (offerData ), true )
523542 c .log .Debugw ("SDP offer" , "sdp" , string (offerData ))
543+ e , err := sdpEncryption (enc )
544+ if err != nil {
545+ c .log .Errorw ("Cannot parse encryption" , err )
546+ return nil , err
547+ }
524548
525- mp , err := NewMediaPort (c .log , c .mon , & MediaConfig {
549+ mp , err := NewMediaPort (c .log , c .mon , & MediaOptions {
526550 IP : c .s .sconf .SignalingIP ,
527551 Ports : conf .RTPPort ,
528552 MediaTimeoutInitial : c .s .conf .MediaTimeoutInitial ,
@@ -535,7 +559,7 @@ func (c *inboundCall) runMediaConn(offerData []byte, conf *config.Config, featur
535559 c .media .EnableTimeout (false ) // enabled once we accept the call
536560 c .media .SetDTMFAudio (conf .AudioDTMF )
537561
538- answer , mconf , err := mp .SetOffer (offerData )
562+ answer , mconf , err := mp .SetOffer (offerData , e )
539563 if err != nil {
540564 return nil , err
541565 }
0 commit comments