Cancel register-refresh goroutine after un-registered.

cloudwebrtc · cloudwebrtc · commit cb97c3651b0e · 2021-03-20T09:40:47.000+08:00
diff --git a/examples/register/main.go b/examples/register/main.go
@@ -53,7 +53,7 @@ func main() {
 			Password: "100",
 			Realm:    "b2bua",
 		},
-		30,
+		1800,
 		stack,
 	)
 
diff --git a/pkg/ua/register.go b/pkg/ua/register.go
@@ -50,7 +50,7 @@ func (r *Register) SendRegister(expires uint32) error {
 
 	contact := profile.Contact()
 
-	if r.request == nil {
+	if r.request == nil || expires == 0 {
 		request, err := ua.buildRequest(sip.REGISTER, from, to, contact, recipient, nil)
 		if err != nil {
 			ua.Log().Errorf("Register: err = %v", err)
@@ -138,6 +138,7 @@ func (r *Register) SendRegister(expires uint32) error {
 					r.timer.Stop()
 					r.timer = nil
 				}
+				r.cancel()
 			}
 			ua.RegisterStateHandler(state)
 		}

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func (r *Register) SendRegister(expires uint32) error {`
`50`	`50`
`51`	`51`	`contact := profile.Contact()`
`52`	`52`
`53`		`- if r.request == nil {`
	`53`	`+ if r.request == nil \|\| expires == 0 {`
`54`	`54`	`request, err := ua.buildRequest(sip.REGISTER, from, to, contact, recipient, nil)`
`55`	`55`	`if err != nil {`
`56`	`56`	`ua.Log().Errorf("Register: err = %v", err)`
`@@ -138,6 +138,7 @@ func (r *Register) SendRegister(expires uint32) error {`
`138`	`138`	`r.timer.Stop()`
`139`	`139`	`r.timer = nil`
`140`	`140`	`}`
	`141`	`+ r.cancel()`
`141`	`142`	`}`
`142`	`143`	`ua.RegisterStateHandler(state)`
`143`	`144`	`}`