18 Sep
2013
18 Sep
'13
11:54 a.m.
sca_call_info_uri_update() return value is passed directly as
return value of script function "sca_call_info_update". Return
value 0 means 'exit script' but that is unwanted. Fix it to
just continue with script execution normally.
---
Andrew, does this look ok? Can I push this, or will you do it?
Should go to master and 4.0 branch at least.
modules/sca/sca_call_info.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c
index 43c7f56..b71bed3 100644
--- a/modules/sca/sca_call_info.c
+++ b/modules/sca/sca_call_info.c
@@ -743,7 +743,7 @@ sca_call_info_uri_update( str *aor, sca_call_info *call_info,
STR_FMT( contact_uri ), STR_FMT( call_id ), call_info->index );
if ( !sca_uri_is_shared_appearance( sca, aor )) {
- return( 0 );
+ return( 1 );
}
dialog.id.s = dlg_buf;
--
1.8.4
18 Sep
18 Sep
5:41 p.m.
New subject: [PATCH] modules/sca: fix sca_call_info_uri_update() return value
On Sep 18, 2013, at 3:54 AM, Timo Teräs <timo.teras(a)iki.fi>
wrote:
sca_call_info_uri_update() return value is passed
directly as
return value of script function "sca_call_info_update". Return
value 0 means 'exit script' but that is unwanted. Fix it to
just continue with script execution normally.
---
Andrew, does this look ok? Can I push this, or will you do it?
Should go to master and 4.0 branch at least.
Looks good, thanks for finding it. I have a number of changes committed to the
admorten/sca branch, so if you don't mind I'll add the fix there, and cherry pick
it with the others into the 4.x and master branches.
Thanks again!
andrew
modules/sca/sca_call_info.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c
index 43c7f56..b71bed3 100644
--- a/modules/sca/sca_call_info.c
+++ b/modules/sca/sca_call_info.c
@@ -743,7 +743,7 @@ sca_call_info_uri_update( str *aor, sca_call_info *call_info,
STR_FMT( contact_uri ), STR_FMT( call_id ), call_info->index );
if ( !sca_uri_is_shared_appearance( sca, aor )) {
- return( 0 );
+ return( 1 );
}
dialog.id.s = dlg_buf;
--
1.8.4
6:03 p.m.
New subject: [PATCH] modules/sca: fix sca_call_info_uri_update() return value
On Wed, 18 Sep 2013 13:41:34 +0000
Andrew Mortensen <admorten(a)isc.upenn.edu> wrote:
On Sep 18, 2013, at 3:54 AM, Timo Teräs <timo.teras(a)iki.fi>
wrote:
Ok, great.
Relatedly, I found another issue, but am not sure what is really the
right fix.
It seems that even with Call-Info header, the AoR is checked against
From/To headers.
I have setup where the SCA number is routed via ENUM. So I have
remote-box doing ENUM lookup, and sending to ENUM number so the From
field is caller-id, and To is based on the ENUM number. Only R-URI and
Contact header are converted and canonicalized to the format of AoR.
So I'm wondering is it correct to use only From/To for AoR checks, or
should also R-URI and/or Contact be checked instead or in addition.
Alternative is that I need to somewhere always overwrite the To field
in kamailio script which sounds hacky.
I tried to read the specs, but didn't find any exact wording to this.
Any suggestions?
- Timo
sca_call_info_uri_update() return value is passed
directly as
return value of script function "sca_call_info_update". Return
value 0 means 'exit script' but that is unwanted. Fix it to
just continue with script execution normally.
---
Andrew, does this look ok? Can I push this, or will you do it?
Should go to master and 4.0 branch at least.
Looks good, thanks for finding it. I have a number of changes
committed to the admorten/sca branch, so if you don't mind I'll add
the fix there, and cherry pick it with the others into the 4.x and
master branches.
Thanks again!
4027
days inactive
4027
days old
2 comments
2 participants
participants (2)
-
Andrew Mortensen -
Timo Teräs