sr-dev August 2014

sr-dev@lists.kamailio.org

25 participants
195 discussions

[tracker] Comment added: sca_call_info_update() function for 180 responses

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#446 - sca_call_info_update() function for 180 responses User who did this - Jorj Bauer (jorj) ---------- Commit 82e67c07eebe9f7277156a6a6d87ffd5e04c892d. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=446#comment1573 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 9 months

git:master: modules/sca: fix 180 replies in sca_call_info_invite_reply_18x_handler()

by Jorj Bauer

Module: sip-router Branch: master Commit: 82e67c07eebe9f7277156a6a6d87ffd5e04c892d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82e67c0… Author: Jorj Bauer <jorj(a)isc.upenn.edu> Committer: Jorj Bauer <jorj(a)isc.upenn.edu> Date: Fri Aug 8 09:26:21 2014 -0400 modules/sca: fix 180 replies in sca_call_info_invite_reply_18x_handler() - Per Broadworks Release 13.0v1 documentation, 180s should produce "appearance-state=progressing" just like 183s do; Polycom OS 3.3.4 doesn't care, but 4.x swaps leg information when it hears "appearance-state=alerting" - report and patch from Joao Vitor Arruda --- modules/sca/sca_call_info.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index f0cab7e..066834c 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1072,9 +1072,6 @@ sca_call_info_invite_reply_18x_handler( sip_msg_t *msg, switch ( msg->REPLY_STATUS ) { case 180: - state = SCA_APPEARANCE_STATE_ALERTING; - break; - case 183: state = SCA_APPEARANCE_STATE_PROGRESSING; break;

9 years, 9 months

[tracker] Comment added: rtpproxy_manage with "l" option returns wrong ports (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#451 - rtpproxy_manage with "l" option returns wrong ports User who did this - Sebastian Damm (sdamm) ---------- This is a patch which reverses the from and to tags if it is a SIP request. Running in our setup for quite a while now. Can you include this into the rtpproxy module? Thanks. ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=451#comment1572 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 9 months

[tracker] Comment added: sca_call_info_update() function for 180 responses

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#446 - sca_call_info_update() function for 180 responses User who did this - Jorj Bauer (jorj) ---------- Provisionally committed to branch jorj/sca, now that I have write access. Will push to master upon review by miconda (just to be sure I'm following protocol). ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=446#comment1571 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 9 months

[tracker] User took ownership: sca_call_info_update() function for 180 responses

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Jorj Bauer has taken ownership of the following task: FS#446 - sca_call_info_update() function for 180 responses More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=446 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 9 months

git:jorj/sca: modules/sca: fix 180 replies in sca_call_info_invite_reply_18x_handler()

by Jorj Bauer

Module: sip-router Branch: jorj/sca Commit: 7b0f5a39881b49529078ff740640a2aeee078df2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b0f5a3… Author: Jorj Bauer <jorj(a)isc.upenn.edu> Committer: Jorj Bauer <jorj(a)isc.upenn.edu> Date: Fri Aug 8 09:26:21 2014 -0400 modules/sca: fix 180 replies in sca_call_info_invite_reply_18x_handler() - Per Broadworks Release 13.0v1 documentation, 180s should produce "appearance-state=progressing" just like 183s do; Polycom OS 3.3.4 doesn't care, but 4.x swaps leg information when it hears "appearance-state=alerting" - report and patch from Joao Vitor Arruda --- modules/sca/sca_call_info.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index f0cab7e..066834c 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -1072,9 +1072,6 @@ sca_call_info_invite_reply_18x_handler( sip_msg_t *msg, switch ( msg->REPLY_STATUS ) { case 180: - state = SCA_APPEARANCE_STATE_ALERTING; - break; - case 183: state = SCA_APPEARANCE_STATE_PROGRESSING; break;

9 years, 9 months

git:master: modules/ims_auth: use IMS lib for getting IMPI/IMPUs (cleanup)

by Jason Penton

Module: sip-router Branch: master Commit: 451cce6b5a4edada89a05f80e220b08be58a56a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=451cce6… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 8 08:34:48 2014 +0200 modules/ims_auth: use IMS lib for getting IMPI/IMPUs (cleanup) --- modules/ims_auth/authorize.c | 12 +++--- modules/ims_auth/cxdx_mar.c | 4 +- modules/ims_auth/utils.c | 84 ------------------------------------------ modules/ims_auth/utils.h | 2 - 4 files changed, 8 insertions(+), 94 deletions(-) diff --git a/modules/ims_auth/authorize.c b/modules/ims_auth/authorize.c index 90d35c3..c409b4a 100644 --- a/modules/ims_auth/authorize.c +++ b/modules/ims_auth/authorize.c @@ -329,14 +329,14 @@ int challenge(struct sip_msg* msg, char* str1, char* str2, int is_proxy_auth, ch } /* get the private_identity */ - private_identity = get_private_identity(msg, realm, is_proxy_auth); + private_identity = cscf_get_private_identity(msg, realm); if (!private_identity.len) { LM_ERR("No private identity specified (Authorization: username)\n"); stateful_request_reply(msg, 403, MSG_403_NO_PRIVATE); return CSCF_RETURN_BREAK; } /* get the public_identity */ - public_identity = get_public_identity(msg); + public_identity = cscf_get_public_identity(msg); if (!public_identity.len) { LM_ERR("No public identity specified (To:)\n"); stateful_request_reply(msg, 403, MSG_403_NO_PUBLIC); @@ -517,14 +517,14 @@ int www_resync_auth(struct sip_msg* msg, char* _route, char* str1, char* str2) { } /* get the private_identity */ - private_identity = get_private_identity(msg, realm, is_proxy_auth); + private_identity = cscf_get_private_identity(msg, realm); if (!private_identity.len) { LM_ERR("No private identity specified (Authorization: username)\n"); stateful_request_reply(msg, 403, MSG_403_NO_PRIVATE); return CSCF_RETURN_BREAK; } /* get the public_identity */ - public_identity = get_public_identity(msg); + public_identity = cscf_get_public_identity(msg); if (!public_identity.len) { LM_ERR("No public identity specified (To:)\n"); stateful_request_reply(msg, 403, MSG_403_NO_PUBLIC); @@ -743,13 +743,13 @@ int authenticate(struct sip_msg* msg, char* _realm, char* str2, int is_proxy_aut return 0; //CSCF_RETURN_BREAK; } - private_identity = get_private_identity(msg, realm, is_proxy_auth); + private_identity = cscf_get_private_identity(msg, realm); if (!private_identity.len) { LM_ERR("private identity missing\n"); return AUTH_NO_CREDENTIALS; } - public_identity = get_public_identity(msg); + public_identity = cscf_get_public_identity(msg); if (!public_identity.len) { LM_ERR("public identity missing\n"); return AUTH_NO_CREDENTIALS; diff --git a/modules/ims_auth/cxdx_mar.c b/modules/ims_auth/cxdx_mar.c index cdff800..f075821 100644 --- a/modules/ims_auth/cxdx_mar.c +++ b/modules/ims_auth/cxdx_mar.c @@ -138,7 +138,7 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *maa, long elaps } /* get the private_identity */ - private_identity = get_private_identity(t->uas.request, data->realm, data->is_proxy_auth); + private_identity = cscf_get_private_identity(t->uas.request, data->realm); if (!private_identity.len) { LM_ERR("No private identity specified (Authorization: username)\n"); stateful_request_reply_async(t, t->uas.request, 403, MSG_403_NO_PRIVATE); @@ -146,7 +146,7 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *maa, long elaps goto error; } /* get the public_identity */ - public_identity = get_public_identity(t->uas.request); + public_identity = cscf_get_public_identity(t->uas.request); if (!public_identity.len) { LM_ERR("No public identity specified (To:)\n"); stateful_request_reply_async(t, t->uas.request, 403, MSG_403_NO_PUBLIC); diff --git a/modules/ims_auth/utils.c b/modules/ims_auth/utils.c index 0548391..ff1ef5b 100644 --- a/modules/ims_auth/utils.c +++ b/modules/ims_auth/utils.c @@ -141,90 +141,6 @@ inline int ims_find_credentials(struct sip_msg* _m, str* _realm, return 1; } - -/** - * Returns the Private Identity extracted from the Authorization header. - * If none found there takes the SIP URI in To without the "sip:" prefix - * \todo - remove the fallback case to the To header - * @param msg - the SIP message - * @param realm - the realm to match in an Authorization header - * @param is_proxy_auth 0 if the header is Authorization, anything else for Proxy-Authorization - * @returns the str containing the private id, no mem dup - */ -str get_private_identity(struct sip_msg *msg, str realm, int is_proxy_auth) -{ - str pi={0,0}; - struct hdr_field* h=0; - int ret,i; - - if (parse_headers(msg, is_proxy_auth ? HDR_PROXYAUTH_F : HDR_AUTHORIZATION_F,0)!=0) { - return pi; - } - - if (!(is_proxy_auth ? msg->proxy_auth : msg->authorization)){ - goto fallback; - } - - ret = find_credentials(msg, &realm, is_proxy_auth ? HDR_PROXYAUTH_F : HDR_AUTHORIZATION_F, &h); - if (ret < 0) { - goto fallback; - } else - if (ret > 0) { - goto fallback; - } - - if (h) pi=((auth_body_t*)h->parsed)->digest.username.whole; - - goto done; - -fallback: - pi = get_public_identity(msg); - if (pi.len>4&&strncasecmp(pi.s,"sip:",4)==0) {pi.s+=4;pi.len-=4;} - for(i=0;i<pi.len;i++) - if (pi.s[i]==';') { - pi.len=i; - break; - } -done: - return pi; -} - -/** - * Returns the Public Identity extracted from the From header - * @param msg - the SIP message - * @returns the str containing the public id, no mem dup - */ -str get_public_identity(struct sip_msg *msg) -{ - str pu={0,0}; - struct to_body *from; - int i; - - if (parse_headers(msg,HDR_TO_F,0)!=0) { - return pu; - } - - if ( get_from(msg) == NULL ) { - from = (struct to_body*) pkg_malloc(sizeof(struct to_body)); - if (!from) { - LM_ERR("out of pkg memory\n"); - return pu; - } - parse_to( msg->from->body.s, msg->from->body.s + msg->from->body.len, from ); - msg->from->parsed = from; - } - else from=(struct to_body *) msg->from->parsed; - - pu = from->uri; - - /* truncate to sip:username@host or tel:number */ - for(i=4;i<pu.len;i++) - if (pu.s[i]==';' || pu.s[i]=='?' ||pu.s[i]==':'){ - pu.len = i; - } - return pu; -} - /** * Looks for the nonce and response parameters in the Authorization header and returns them * @param msg - the SIP message diff --git a/modules/ims_auth/utils.h b/modules/ims_auth/utils.h index f16ebc1..6412a37 100644 --- a/modules/ims_auth/utils.h +++ b/modules/ims_auth/utils.h @@ -54,8 +54,6 @@ #include "../../parser/parse_content.h" #include "../../data_lump_rpl.h" -str get_private_identity(struct sip_msg *msg, str realm, int is_proxy_auth); -str get_public_identity(struct sip_msg *msg); int get_nonce_response(struct sip_msg *msg, str realm,str *nonce,str *response, enum qop_type *qop,str *qop_str,str *nc,str *cnonce,str *uri, int is_proxy_auth); str ims_get_body(struct sip_msg * msg);

9 years, 9 months

git:master: modules/ims_icscf: for UAR pass in empty realm instead of RURI domain

by Jason Penton

Module: sip-router Branch: master Commit: d8d7f13e073dc00532326433c689030f6950e26d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8d7f13… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 8 08:36:13 2014 +0200 modules/ims_icscf: for UAR pass in empty realm instead of RURI domain - this allows for authenticating against different domain from the domain in RURI --- modules/ims_icscf/registration.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ims_icscf/registration.c b/modules/ims_icscf/registration.c index 41a9eb9..8940dc8 100644 --- a/modules/ims_icscf/registration.c +++ b/modules/ims_icscf/registration.c @@ -62,7 +62,7 @@ int I_perform_user_authorization_request(struct sip_msg* msg, char* route, char* int authorization_type = AVP_IMS_UAR_REGISTRATION; int expires = 3600; struct hdr_field *hdr; - str realm; + str realm={0,0}; contact_t *c; int sos_reg = 0; contact_body_t *b = 0; @@ -95,8 +95,8 @@ int I_perform_user_authorization_request(struct sip_msg* msg, char* route, char* return -1; } - - realm = cscf_get_realm_from_ruri(msg); + /*This should be configurable and not hardwired to RURI domain*/ + //realm = cscf_get_realm_from_ruri(msg); //check if we received what we should, we do this even though it should be done in cfg file - double checking! if (msg->first_line.type != SIP_REQUEST) {

9 years, 9 months

git:master: lib/ims: When getting IMPI, only check check realm credentials if a realm is passed in

by Jason Penton

Module: sip-router Branch: master Commit: d6b98639bd6f11661d61060c58597d53b01dadd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6b9863… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 8 08:33:56 2014 +0200 lib/ims: When getting IMPI, only check check realm credentials if a realm is passed in --- lib/ims/ims_getters.c | 66 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 9 deletions(-) diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index 00151f7..1751641 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -122,23 +122,32 @@ str cscf_get_private_identity(struct sip_msg *msg, str realm) { str pi={0,0}; struct hdr_field* h=0; - int ret,i; + int ret,i,res; if (parse_headers(msg,HDR_AUTHORIZATION_F,0)!=0) { return pi; } - + + h = msg->authorization; if (!msg->authorization){ goto fallback; } + + if (realm.len && realm.s) { + ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); + if (ret < 0) { + goto fallback; + } else + if (ret > 0) { + goto fallback; + } + } - ret = find_credentials(msg, &realm, HDR_AUTHORIZATION_F, &h); - if (ret < 0) { - goto fallback; - } else - if (ret > 0) { - goto fallback; - } + res = parse_credentials(h); + if (res != 0) { + LOG(L_ERR, "Error while parsing credentials\n"); + return pi; + } if (h) pi=((auth_body_t*)h->parsed)->digest.username.whole; @@ -157,6 +166,45 @@ str cscf_get_private_identity(struct sip_msg *msg, str realm) } /** + * Returns the Private Identity extracted from the Authorization header. + * If none found there takes the SIP URI in To without the "sip:" prefix + * \todo - remove the fallback case to the To header + * @param msg - the SIP message + * @param realm - the realm to match in an Authorization header + * @returns the str containing the private id, no mem dup + */ +str cscf_get_private_identity_no_realm(struct sip_msg *msg, str realm) +{ + str pi={0,0}; + struct hdr_field* h=0; + int ret,i; + + if (parse_headers(msg,HDR_AUTHORIZATION_F,0)!=0) { + return pi; + } + + if (!msg->authorization){ + goto fallback; + } + + h = msg->authorization; + if (h) pi=((auth_body_t*)h->parsed)->digest.username.whole; + + goto done; + + fallback: + pi = cscf_get_public_identity(msg); + if (pi.len>4&&strncasecmp(pi.s,"sip:",4)==0) {pi.s+=4;pi.len-=4;} + for(i=0;i<pi.len;i++) + if (pi.s[i]==';') { + pi.len=i; + break; + } + done: + return pi; +} + +/** * Returns the Public Identity extracted from the To header * @param msg - the SIP message * @returns the str containing the public id, no mem dup

9 years, 9 months

git:master: p_usrloc: Updated 1&1 module maintainers

by Lucian Balaceanu

Module: sip-router Branch: master Commit: 2c8e0297c3558b1b6823c8efe806ffae0ff2a609 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c8e029… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: Thu Aug 7 16:56:07 2014 +0300 p_usrloc: Updated 1&1 module maintainers --- modules/p_usrloc/README | 90 ++++++++++++++++++------------------- modules/p_usrloc/doc/p_usrloc.xml | 15 ++---- 2 files changed, 49 insertions(+), 56 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2c8…

9 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2014