sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:master: rr: use sips to build RR headers of R-URI has sips

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1826a5f4e3a981e30956da61e11ea551aae0b714 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1826a5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 23 10:44:31 2013 +0100 rr: use sips to build RR headers of R-URI has sips - reported by Hugh James, FS#277 --- modules/rr/record.c | 94 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 72 insertions(+), 22 deletions(-) diff --git a/modules/rr/record.c b/modules/rr/record.c index f4a7810..e2beb19 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -43,8 +43,11 @@ #include "rr_mod.h" -#define RR_PREFIX "Record-Route: <sip:" -#define RR_PREFIX_LEN (sizeof(RR_PREFIX)-1) +#define RR_PREFIX_SIP "Record-Route: <sip:" +#define RR_PREFIX_SIP_LEN (sizeof(RR_PREFIX_SIP)-1) + +#define RR_PREFIX_SIPS "Record-Route: <sip:" +#define RR_PREFIX_SIPS_LEN (sizeof(RR_PREFIX_SIPS)-1) #define RR_LR ";lr" #define RR_LR_LEN (sizeof(RR_LR)-1) @@ -78,6 +81,15 @@ static unsigned int rr_param_msg; static pv_spec_t *custom_user_avp; /*!< AVP for custom_user setting */ +inline static int rr_is_sips(sip_msg_t *_m) +{ + if(parse_sip_msg_uri(_m)<0) + return 0; + if(_m->parsed_uri.type==SIPS_URI_T) + return 1; + return 0; +} + void init_custom_user(pv_spec_t *custom_user_avp_p) { custom_user_avp = custom_user_avp_p; @@ -187,13 +199,23 @@ static inline struct lump *insert_rr_param_lump(struct lump *before, * \return 0 on success, negative on failure */ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, - str *tag, str *params, int _inbound, int _use_ob) + str *tag, str *params, int _inbound, int _use_ob, int _sips) { char* prefix, *suffix, *term, *r2; int suffix_len, prefix_len; char *p; + char *rr_prefix; + int rr_prefix_len; + + if(_sips==0) { + rr_prefix = RR_PREFIX_SIP; + rr_prefix_len = RR_PREFIX_SIP_LEN; + } else { + rr_prefix = RR_PREFIX_SIPS; + rr_prefix_len = RR_PREFIX_SIPS_LEN; + } - prefix_len = RR_PREFIX_LEN + (user->len ? (user->len + 1) : 0); + prefix_len = rr_prefix_len + (user->len ? (user->len + 1) : 0); if (enable_full_lr) { suffix_len = RR_LR_FULL_LEN + (params?params->len:0) + ((tag && tag->len) ? (RR_FROMTAG_LEN + tag->len) : 0); @@ -216,21 +238,21 @@ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, return -3; } - memcpy(prefix, RR_PREFIX, RR_PREFIX_LEN); + memcpy(prefix, rr_prefix, rr_prefix_len); if (user->len) { - memcpy(prefix + RR_PREFIX_LEN, user->s, user->len); + memcpy(prefix + rr_prefix_len, user->s, user->len); #ifdef ENABLE_USER_CHECK /* don't add the ignored user into a RR */ if(i_user.len && i_user.len == user->len && !strncmp(i_user.s, user->s, i_user.len)) { - if(prefix[RR_PREFIX_LEN]=='x') - prefix[RR_PREFIX_LEN]='y'; + if(prefix[rr_prefix_len]=='x') + prefix[rr_prefix_len]='y'; else - prefix[RR_PREFIX_LEN]='x'; + prefix[rr_prefix_len]='x'; } #endif - prefix[RR_PREFIX_LEN + user->len] = '@'; + prefix[rr_prefix_len + user->len] = '@'; } p = suffix; @@ -311,6 +333,7 @@ int record_route(struct sip_msg* _m, str *params) struct to_body* from = NULL; str* tag; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; + int sips; user.len = 0; @@ -345,6 +368,8 @@ int record_route(struct sip_msg* _m, str *params) rr_param_buf.len = 0; } + sips = rr_is_sips(_m); + if (enable_double_rr && !use_ob) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); @@ -358,7 +383,7 @@ int record_route(struct sip_msg* _m, str *params) LM_ERR("failed to insert conditional lump\n"); return -6; } - if (build_rr(l, l2, &user, tag, params, OUTBOUND, 0) < 0) { + if (build_rr(l, l2, &user, tag, params, OUTBOUND, 0, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; } @@ -372,7 +397,7 @@ int record_route(struct sip_msg* _m, str *params) } if (build_rr(l, l2, &user, tag, params, use_ob ? OUTBOUND : INBOUND, - use_ob) < 0) { + use_ob, sips) < 0) { LM_ERR("failed to insert inbound Record-Route\n"); return -4; } @@ -401,7 +426,19 @@ int record_route_preset(struct sip_msg* _m, str* _data) char* hdr, *p; int hdr_len; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; - + char *rr_prefix; + int rr_prefix_len; + int sips; + + sips = rr_is_sips(_m); + if(sips==0) { + rr_prefix = RR_PREFIX_SIP; + rr_prefix_len = RR_PREFIX_SIP_LEN; + } else { + rr_prefix = RR_PREFIX_SIPS; + rr_prefix_len = RR_PREFIX_SIPS_LEN; + } + from = 0; user.len = 0; user.s = 0; @@ -432,7 +469,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) return -3; } - hdr_len = RR_PREFIX_LEN; + hdr_len = rr_prefix_len; if (user.len) hdr_len += user.len + 1; /* @ */ hdr_len += _data->len; @@ -456,8 +493,8 @@ int record_route_preset(struct sip_msg* _m, str* _data) } p = hdr; - memcpy(p, RR_PREFIX, RR_PREFIX_LEN); - p += RR_PREFIX_LEN; + memcpy(p, rr_prefix, rr_prefix_len); + p += rr_prefix_len; if (user.len) { memcpy(p, user.s, user.len); @@ -508,13 +545,23 @@ int record_route_preset(struct sip_msg* _m, str* _data) #define RR_TRANS_LEN 11 #define RR_TRANS ";transport=" static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_data, - str* user, str *tag, int _inbound, int _use_ob) + str* user, str *tag, int _inbound, int _use_ob, int _sips) { char *p; char *hdr, *trans, *r2, *suffix, *term; int hdr_len, suffix_len; + char *rr_prefix; + int rr_prefix_len; - hdr_len = RR_PREFIX_LEN; + if(_sips==0) { + rr_prefix = RR_PREFIX_SIP; + rr_prefix_len = RR_PREFIX_SIP_LEN; + } else { + rr_prefix = RR_PREFIX_SIPS; + rr_prefix_len = RR_PREFIX_SIPS_LEN; + } + + hdr_len = rr_prefix_len; if (user && user->len) hdr_len += user->len + 1; /* @ */ hdr_len += _data->len; @@ -546,8 +593,8 @@ static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_d } p = hdr; - memcpy(p, RR_PREFIX, RR_PREFIX_LEN); - p += RR_PREFIX_LEN; + memcpy(p, rr_prefix, rr_prefix_len); + p += rr_prefix_len; if (user->len) { memcpy(p, user->s, user->len); @@ -625,6 +672,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) struct lump* l; struct lump* l2; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; + int sips; user.len = 0; user.s = 0; @@ -649,6 +697,8 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) tag = &((struct to_body*)_m->from->parsed)->tag_value; } + sips = rr_is_sips(_m); + if (enable_double_rr && !use_ob) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); @@ -663,7 +713,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) return -4; } if (build_advertised_rr(l, l2, _data, &user, tag, OUTBOUND, - 0) < 0) { + 0, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -5; } @@ -678,7 +728,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) if (build_advertised_rr(l, l2, _data, &user, tag, use_ob ? OUTBOUND: INBOUND, - use_ob) < 0) { + use_ob, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; }

11 years, 8 months

[tracker] Comment added: usrloc module stops updating some records in db_mode 2

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Daniel-Constantin Mierla (miconda) ---------- What is the output of 'kamailio -V'. Is 3.3 installed from packages or git? The bad contact is not expired yet, but I assume it will be removed from memory, but not from database, right? Can you watch the sql log to see if there is a sql delete statement? Also, is just expired records because of no re-registration, or also when the phone does un-register ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=278#comment792 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.

11 years, 8 months

[tracker] Task opened: usrloc module stops updating some records in db_mode 2 (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Jordan (jordan) Attached to Project - sip-router Summary - usrloc module stops updating some records in db_mode 2 Task Type - Bug Report Category - usrloc (k) Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - 3.3 Due in Version - Undecided Due Date - Undecided Details - I recently upgraded from 3.1 to 3.3 and noticed that usrloc is now leaving expired location records in the database. Only some location records are affected, but I don't yet know the pattern. The only usrloc modparams that I set are: modparam("usrloc", "nat_bflag", 6) modparam("usrloc", "db_mode", 2) modparam("usrloc", "matching_mode", 2) To possibly help identify a pattern, I compared a good record (updating) against a bad record (not updating) by capturing the output of "kamctl ul show" and the location DB table for each record. I've attached the results in files good.txt and bad.txt One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=278 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.

11 years, 8 months

New developer: Carlos Ruiz Díaz

by Daniel-Constantin Mierla

Hello, I want to announce that a new person got developer GIT write access to repository: Carlos Ruiz Díaz - he is going to add and maintain the credit control module, that was announced earlier this year on mailing list - the module is part of a framework that has three parts: - The module itself: https://github.com/caruizdiaz/cnxcc (to be added in Kamailio git repository) - The web interface: https://github.com/caruizdiaz/cnxcc-web - A helper script: https://github.com/caruizdiaz/cnxcc-db-sync His git commit id is: caruizdiaz My warm welcome and looking forward to future work within the project! Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, April 16-17, 2013, Berlin - http://conference.kamailio.com -

11 years, 8 months

New developer: Hugh Waite

by Daniel-Constantin Mierla

11 years, 8 months

git:master: p_usrloc: commenting out unused db_timer_udomain() to get rid of compiler warnings

by Ovidiu Sas

Module: sip-router Branch: master Commit: 4baf0389c57a7e705c5b01dd95da0e8978dc784a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4baf038… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:23:49 2013 -0400 p_usrloc: commenting out unused db_timer_udomain() to get rid of compiler warnings --- modules/p_usrloc/udomain.c | 2 ++ modules/p_usrloc/udomain.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/p_usrloc/udomain.c b/modules/p_usrloc/udomain.c index 73824d7..a1ab4d9 100644 --- a/modules/p_usrloc/udomain.c +++ b/modules/p_usrloc/udomain.c @@ -589,6 +589,7 @@ done: * \param _d cleaned domain * \return 0 on success, -1 on failure */ +/* int db_timer_udomain(udomain_t* _d) { db_key_t keys[2]; @@ -611,6 +612,7 @@ int db_timer_udomain(udomain_t* _d) //if (ul_db_layer_delete(_d, NULL, NULL, keys, ops, vals, 2) < 0) { //FIXME return 0; } +*/ diff --git a/modules/p_usrloc/udomain.h b/modules/p_usrloc/udomain.h index bbdda0f..c46a121 100644 --- a/modules/p_usrloc/udomain.h +++ b/modules/p_usrloc/udomain.h @@ -95,7 +95,9 @@ void print_udomain(FILE* _f, udomain_t* _d); * \param _d cleaned domain * \return 0 on success, -1 on failure */ +/* int db_timer_udomain(udomain_t* _d); +*/ /*!

11 years, 8 months

git:master: kamailio/utils/sercmd: remove unused but set variable

by Ovidiu Sas

Module: sip-router Branch: master Commit: 67609608aa4306de9a34a28a3a31880ad0d17e8e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6760960… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:16:27 2013 -0400 kamailio/utils/sercmd: remove unused but set variable --- utils/sercmd/sercmd.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 55ed3d4..90dfcb7 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -2159,14 +2159,12 @@ int main(int argc, char** argv) struct binrpc_cmd cmd; struct id_list* sock_id; char* format; - int interactive; char* line; char* l; quit=0; format=0; line=0; - interactive=0; s=-1; sock_name=0; sock_type=UNIXS_SOCK; @@ -2273,7 +2271,6 @@ int main(int argc, char** argv) sock_id=0; if (optind>=argc){ - interactive=1; /*fprintf(stderr, "ERROR: no command specified\n"); goto error; */ }else{

11 years, 8 months

git:master: kamailio/utils/sercmd: remove unused but set variable

by Ovidiu Sas

Module: sip-router Branch: master Commit: b7a41ef47ad5d7fa90e577673cc2f38ab5ef2237 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7a41ef… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:15:08 2013 -0400 kamailio/utils/sercmd: remove unused but set variable --- utils/sercmd/sercmd.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 49b76b5..55ed3d4 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -2154,7 +2154,6 @@ int main(int argc, char** argv) { int c; char* sock_name; - int port_no; int sock_type; int s; struct binrpc_cmd cmd; @@ -2170,7 +2169,6 @@ int main(int argc, char** argv) interactive=0; s=-1; sock_name=0; - port_no=0; sock_type=UNIXS_SOCK; opterr=0; while((c=getopt(argc, argv, "UVhs:D:R:vf:"))!=-1){

11 years, 8 months

git:master: kamailio/utils/sercmd: remove unused but set variable

by Ovidiu Sas

Module: sip-router Branch: master Commit: ff94115921a08ba4da29baf2761db47bd0b7f8f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff94115… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:13:27 2013 -0400 kamailio/utils/sercmd: remove unused but set variable --- utils/sercmd/sercmd.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 1e5606b..49b76b5 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -2158,7 +2158,6 @@ int main(int argc, char** argv) int sock_type; int s; struct binrpc_cmd cmd; - int rec; struct id_list* sock_id; char* format; int interactive; @@ -2169,7 +2168,6 @@ int main(int argc, char** argv) format=0; line=0; interactive=0; - rec=1; s=-1; sock_name=0; port_no=0;

11 years, 8 months

git:master: auth_diameter: remove unused but set variable

by Ovidiu Sas

Module: sip-router Branch: master Commit: 387adace552c22eaf15a049b23694bcd79cea3a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=387adac… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Mar 20 13:02:16 2013 -0400 auth_diameter: remove unused but set variable --- modules/auth_diameter/authorize.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/modules/auth_diameter/authorize.c b/modules/auth_diameter/authorize.c index 7b4f67c..6660057 100644 --- a/modules/auth_diameter/authorize.c +++ b/modules/auth_diameter/authorize.c @@ -295,7 +295,7 @@ int authorize(struct sip_msg* msg, pv_elem_t* realm, int hftype) int diameter_authorize(struct hdr_field* hdr, str* p_method, struct sip_uri uri, struct sip_uri ruri, unsigned int m_id, rd_buf_t* rb) { - str method, user_name; + str user_name; AAAMessage *req; AAA_AVP *avp, *position; int name_flag, port_flag; @@ -316,8 +316,6 @@ int diameter_authorize(struct hdr_field* hdr, str* p_method, struct sip_uri uri, else cred = NULL; - method = *p_method; - if(!cred) { /* Username AVP */

11 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013