Skip to content

Normalize the reason type. #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 15, 2025
Merged

Normalize the reason type. #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d6492b
Normalize the reason type.
dennwc Oct 15, 2025
94603c0
Fix refer tests (again).
dennwc Oct 14, 2025
a6fcddb
Support X.int reason type.
dennwc Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion pkg/sip/protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,16 @@
return true // assume there's no specific reason
}
switch r.Type {
case "Q.850":
case "q.850":
switch r.Cause {
case 16: // Normal call clearing
return true
}
case "x.int":
switch r.Cause {
case 0x00:
return true
}
}
return false
}
Expand All @@ -494,7 +499,9 @@
return ReasonHeader{}, errors.New("no fields in the reason")
}
typ := strings.TrimSpace(list[0])
typ = strings.ToLower(typ)
r := ReasonHeader{Type: typ}
var reasonCode string
for _, line := range list[1:] {
line = strings.TrimSpace(line)
i := strings.Index(line, "=")
Expand All @@ -508,6 +515,23 @@
r.Cause, _ = strconv.Atoi(val)
case "text":
r.Text, _ = strconv.Unquote(val)
case "reasoncode":
reasonCode = val
}
}
switch typ {
case "x.int":
if r.Cause == 0 {
if reasonCode != "" {
v, _ := strconv.ParseUint(reasonCode, 0, 64)
r.Cause = int(v)
} else if r.Text != "" {
v, err := strconv.ParseUint(r.Text, 0, 64)
r.Cause = int(v)
if err == nil {
r.Text = ""
}
}
}
}
return r, nil
Expand Down
35 changes: 33 additions & 2 deletions pkg/sip/protocol_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,31 +78,62 @@ func TestParseReason(t *testing.T) {
Name string
Header string
Reason ReasonHeader
Normal bool
}{
{
Name: "SIP",
Header: `SIP ;cause=200 ;text="Call completed elsewhere"`,
Reason: ReasonHeader{
Type: "SIP",
Type: "sip",
Cause: 200,
Text: "Call completed elsewhere",
},
Normal: false,
},
{
Name: "Q.850",
Header: `Q.850;cause=16;text="Terminated"`,
Reason: ReasonHeader{
Type: "Q.850",
Type: "q.850",
Cause: 16,
Text: "Terminated",
},
Normal: true,
},
{
Name: "X.int",
Header: `X.int;text="0x00000000";add-info=05CC.0001.0001`,
Reason: ReasonHeader{
Type: "x.int",
Cause: 0x00,
},
Normal: true,
},
{
Name: "X.int not ok text",
Header: `X.int;text="0x00000001";add-info=05CC.0001.0001`,
Reason: ReasonHeader{
Type: "x.int",
Cause: 0x01,
},
Normal: false,
},
{
Name: "X.int reason code",
Header: `X.int;reasoncode=0x0000032D;add-info=05CC.0001.0004`,
Reason: ReasonHeader{
Type: "x.int",
Cause: 0x32D,
},
Normal: false,
},
}
for _, c := range cases {
t.Run(c.Name, func(t *testing.T) {
r, err := ParseReasonHeader(c.Header)
require.NoError(t, err)
require.Equal(t, c.Reason, r)
require.Equal(t, c.Normal, r.IsNormal())
})
}
}
4 changes: 2 additions & 2 deletions test/integration/sip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ func TestSIPJoinOpenRoom(t *testing.T) {

require.Equal(t, sipgo.REFER, referRequest.Method)
transferTo := referRequest.GetHeader("Refer-To")
require.Equal(t, "<tel:"+transferNumber+">", transferTo.Value())
require.Equal(t, "tel:"+transferNumber, transferTo.Value())

time.Sleep(notifyIntervalDelay)
err = cli.SendNotify(referRequest, "SIP/2.0 100 Trying")
Expand Down Expand Up @@ -577,7 +577,7 @@ func TestSIPJoinPinRoom(t *testing.T) {

require.Equal(t, sipgo.REFER, referRequest.Method)
transferTo := referRequest.GetHeader("Refer-To")
require.Equal(t, "<tel:"+transferNumber+">", transferTo.Value())
require.Equal(t, "tel:"+transferNumber, transferTo.Value())

time.Sleep(notifyIntervalDelay)
err = cli.SendNotify(referRequest, "SIP/2.0 403 Fobidden")
Expand Down
Loading