sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: pv: time PVs use the value from sip_msg_t structure
by Daniel-Constantin Mierla 18 Apr '12

18 Apr '12

Module: sip-router Branch: master Commit: 9654c70212db15f77beedbb874f3e153fdeaf41b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9654c70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 18 19:52:22 2012 +0200 pv: time PVs use the value from sip_msg_t structure - it solves the time of the message coherence, by returning same value, no matter where is used - reported by Klaus Darilion --- modules_k/pv/pv_time.c | 82 ++++++++++-------------------------------------- 1 files changed, 17 insertions(+), 65 deletions(-) diff --git a/modules_k/pv/pv_time.c b/modules_k/pv/pv_time.c index 9cbc375..80e6b31 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -35,26 +35,6 @@ #include "pv_time.h" -static msg_ctx_id_t _pv_time_msgid = { 0 }; -static time_t _pv_msg_tm = 0; - -static int pv_update_time(sip_msg_t *msg, time_t *t) -{ - if(msg_ctx_id_match(msg, &_pv_time_msgid)!=1 || _pv_msg_tm==0) - { - _pv_msg_tm = time(NULL); - msg_ctx_id_set(msg, &_pv_time_msgid); - - if(t!=NULL) - *t=_pv_msg_tm; - - return 1; - } - if(t!=NULL) - *t=_pv_msg_tm; - return 0; -} - int pv_parse_time_name(pv_spec_p sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) @@ -130,16 +110,14 @@ static msg_ctx_id_t _cfgutils_msgid = { 0 }; int pv_get_time(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - time_t t; - if(msg==NULL || param==NULL) return -1; if(msg_ctx_id_match(msg, &_cfgutils_msgid)!=1) { - pv_update_time(msg, &t); + msg_set_time(msg); msg_ctx_id_set(msg, &_cfgutils_msgid); - if(localtime_r(&t, &_cfgutils_ts) == NULL) + if(localtime_r(&msg->tval.tv_sec, &_cfgutils_ts) == NULL) { LM_ERR("unable to break time to attributes\n"); return -1; @@ -179,7 +157,6 @@ int pv_get_time(struct sip_msg *msg, pv_param_t *param, int pv_get_strftime(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - time_t t; str s; #define PV_STRFTIME_BUF_SIZE 64 static char _pv_strftime_buf[PV_STRFTIME_BUF_SIZE]; @@ -189,9 +166,9 @@ int pv_get_strftime(struct sip_msg *msg, pv_param_t *param, if(msg_ctx_id_match(msg, &_cfgutils_msgid)!=1) { - pv_update_time(msg, &t); + msg_set_time(msg); msg_ctx_id_set(msg, &_cfgutils_msgid); - if(localtime_r(&t, &_cfgutils_ts) == NULL) + if(localtime_r(&msg->tval.tv_sec, &_cfgutils_ts) == NULL) { LM_ERR("unable to break time to attributes\n"); return -1; @@ -230,13 +207,11 @@ int pv_get_timenowf(struct sip_msg *msg, pv_param_t *param, int pv_get_times(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - time_t t; if(msg==NULL) return -1; - pv_update_time(msg, &t); - - return pv_get_uintval(msg, param, res, (unsigned int)t); + msg_set_time(msg); + return pv_get_uintval(msg, param, res, (unsigned int)msg->tval.tv_sec); } @@ -244,16 +219,15 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; - time_t t; if(msg==NULL) return -1; - pv_update_time(msg, &t); + msg_set_time(msg); - s.s = ctime(&t); + s.s = ctime(&msg->tval.tv_sec); s.len = strlen(s.s)-1; - return pv_get_strintval(msg, param, res, &s, (int)t); + return pv_get_strintval(msg, param, res, &s, (int)msg->tval.tv_sec); } int pv_get_timeb(struct sip_msg *msg, pv_param_t *param, @@ -264,8 +238,7 @@ int pv_get_timeb(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, (unsigned int)up_since); } -static struct timeval _timeval_ts; -static msg_ctx_id_t _timeval_msgid = { 0 }; +static struct timeval _timeval_ts = {0}; static char _timeval_ts_buf[32]; int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, @@ -280,30 +253,17 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, switch(param->pvn.u.isname.name.n) { case 1: - if(msg_ctx_id_match(msg, &_timeval_msgid)!=1) - { - if(gettimeofday(&_timeval_ts, NULL)!=0) - { - LM_ERR("unable to get time val attributes\n"); - return -1; - } - msg_ctx_id_set(msg, &_timeval_msgid); - } - return pv_get_uintval(msg, param, res, (unsigned int)_timeval_ts.tv_usec); + msg_set_time(msg); + return pv_get_uintval(msg, param, res, (unsigned int)msg->tval.tv_usec); case 2: - if(gettimeofday(&tv, NULL)!=0) + if(gettimeofday(&_timeval_ts, NULL)!=0) { LM_ERR("unable to get time val attributes\n"); return pv_get_null(msg, param, res); } - return pv_get_uintval(msg, param, res, (unsigned int)tv.tv_sec); + return pv_get_uintval(msg, param, res, (unsigned int)_timeval_ts.tv_sec); case 3: - if(gettimeofday(&tv, NULL)!=0) - { - LM_ERR("unable to get time val attributes\n"); - return pv_get_null(msg, param, res); - } - return pv_get_uintval(msg, param, res, (unsigned int)tv.tv_usec); + return pv_get_uintval(msg, param, res, (unsigned int)_timeval_ts.tv_usec); case 4: if(gettimeofday(&tv, NULL)!=0) { @@ -317,16 +277,8 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, s.s = _timeval_ts_buf; return pv_get_strval(msg, param, res, &s); default: - if(msg_ctx_id_match(msg, &_timeval_msgid)!=1) - { - if(gettimeofday(&_timeval_ts, NULL)!=0) - { - LM_ERR("unable to get time val attributes\n"); - return -1; - } - msg_ctx_id_set(msg, &_timeval_msgid); - } - return pv_get_uintval(msg, param, res, (unsigned int)_timeval_ts.tv_sec); + msg_set_time(msg); + return pv_get_uintval(msg, param, res, (unsigned int)msg->tval.tv_sec); } }

1 0

git:master: parser: removed accept_disposition hdr hook from sip_msg_t
by Daniel-Constantin Mierla 18 Apr '12

18 Apr '12

Module: sip-router Branch: master Commit: 0700573b500da94ca839c09f7c1f68768448114b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0700573… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 18 14:03:10 2012 +0200 parser: removed accept_disposition hdr hook from sip_msg_t - it was not used at all, just hooked and cloned for no good reason --- parser/case_acce.h | 35 ----------------------------------- parser/hf.c | 1 - parser/hf.h | 2 -- parser/msg_parser.c | 5 ----- parser/msg_parser.h | 1 - sip_msg_clone.c | 6 ------ 6 files changed, 0 insertions(+), 50 deletions(-) diff --git a/parser/case_acce.h b/parser/case_acce.h index 86750b5..a57ad9d 100644 --- a/parser/case_acce.h +++ b/parser/case_acce.h @@ -56,36 +56,6 @@ } -#define on_CASE \ - if (LOWER_BYTE(*p) == 'o') { \ - p++; \ - if (LOWER_BYTE(*p) == 'n') { \ - hdr->type = HDR_ACCEPTDISPOSITION_T; \ - p++; \ - goto dc_end; \ - } \ - } - - -#define siti_CASE \ - switch(LOWER_DWORD(val)) { \ - case _siti_: \ - p += 4; \ - val = READ(p); \ - on_CASE; \ - goto other; \ - } - - -#define ispo_CASE \ - switch(LOWER_DWORD(val)) { \ - case _ispo_: \ - p += 4; \ - val = READ(p); \ - siti_CASE; \ - goto other; \ - } - #define accept_contact_ct_CASE \ if (LOWER_BYTE(*p) == 'c') { \ p++; \ @@ -114,11 +84,6 @@ angu_CASE; \ goto other; \ \ - case _pt_d_: \ - p += 4; \ - val = READ(p); \ - ispo_CASE; \ - goto other; \ case _pt_c_: \ p += 4; \ val = READ(p); \ diff --git a/parser/hf.c b/parser/hf.c index 4d6de0b..4cf15a0 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -190,7 +190,6 @@ void clean_hdr_field(struct hdr_field* hf) case HDR_SUBJECT_T: case HDR_USERAGENT_T: case HDR_SERVER_T: - case HDR_ACCEPTDISPOSITION_T: case HDR_MIN_SE_T: case HDR_ACCEPTCONTACT_T: case HDR_ALLOWEVENTS_T: diff --git a/parser/hf.h b/parser/hf.h index a373836..83a9d3f 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -95,7 +95,6 @@ enum _hdr_types_t { HDR_SUBJECT_T /*!< Subject header field */, HDR_USERAGENT_T /*!< User-Agent header field */, HDR_SERVER_T /*!< Server header field */, - HDR_ACCEPTDISPOSITION_T /*!< Accept-Disposition hdr field */, HDR_CONTENTDISPOSITION_T /*!< Content-Disposition hdr field */, HDR_DIVERSION_T /*!< Diversion header field */, HDR_RPID_T /*!< Remote-Party-ID header field */, @@ -168,7 +167,6 @@ typedef unsigned long long hdr_flags_t; #define HDR_SUBJECT_F HDR_F_DEF(SUBJECT) #define HDR_USERAGENT_F HDR_F_DEF(USERAGENT) #define HDR_SERVER_F HDR_F_DEF(SERVER) -#define HDR_ACCEPTDISPOSITION_F HDR_F_DEF(ACCEPTDISPOSITION) #define HDR_CONTENTDISPOSITION_F HDR_F_DEF(CONTENTDISPOSITION) #define HDR_DIVERSION_F HDR_F_DEF(DIVERSION) #define HDR_RPID_F HDR_F_DEF(RPID) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index fdbbd09..29495d9 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -239,7 +239,6 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr) case HDR_USERAGENT_T: case HDR_SERVER_T: case HDR_CONTENTDISPOSITION_T: - case HDR_ACCEPTDISPOSITION_T: case HDR_DIVERSION_T: case HDR_RPID_T: case HDR_SIPIFMATCH_T: @@ -481,10 +480,6 @@ int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next) if (msg->content_disposition==0) msg->content_disposition = hf; msg->parsed_flag|=HDR_CONTENTDISPOSITION_F; break; - case HDR_ACCEPTDISPOSITION_T: - if (msg->accept_disposition==0) msg->accept_disposition = hf; - msg->parsed_flag|=HDR_ACCEPTDISPOSITION_F; - break; case HDR_DIVERSION_T: if (msg->diversion==0) msg->diversion = hf; msg->parsed_flag|=HDR_DIVERSION_F; diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 593c4b4..c633fed 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -298,7 +298,6 @@ typedef struct sip_msg { struct hdr_field* user_agent; struct hdr_field* server; struct hdr_field* content_disposition; - struct hdr_field* accept_disposition; struct hdr_field* diversion; struct hdr_field* rpid; struct hdr_field* refer_to; diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 5d859db..28933b2 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -463,7 +463,6 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, case HDR_SUBJECT_T: case HDR_USERAGENT_T: case HDR_SERVER_T: - case HDR_ACCEPTDISPOSITION_T: case HDR_CONTENTDISPOSITION_T: case HDR_DIVERSION_T: case HDR_RPID_T: @@ -836,11 +835,6 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, new_msg->server = new_hdr; } break; - case HDR_ACCEPTDISPOSITION_T: - if (!HOOK_SET(accept_disposition)) { - new_msg->accept_disposition = new_hdr; - } - break; case HDR_CONTENTDISPOSITION_T: if (!HOOK_SET(content_disposition)) { new_msg->content_disposition = new_hdr;

1 0

git:master: core: added timeval field inside sip_msg_t
by Daniel-Constantin Mierla 18 Apr '12

18 Apr '12

Module: sip-router Branch: master Commit: d4ed4771938ac490a4df2b320236b7b0d462a636 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4ed477… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 18 19:54:41 2012 +0200 core: added timeval field inside sip_msg_t - new parameter msg_time to set the timeval value at receive time (1 (on) by default, set to 0 to disable) - the value is set automatically at received time based if msg_time=1 or first time when it is accessed - the field should bring coherence regarting time of the message - it should be the same no matter where is processed --- cfg.lex | 3 +++ cfg.y | 3 +++ globals.h | 1 + main.c | 3 +++ parser/msg_parser.c | 13 +++++++++++++ parser/msg_parser.h | 9 +++++++++ receive.c | 2 ++ 7 files changed, 34 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index 8769cfc..a626c8c 100644 --- a/cfg.lex +++ b/cfg.lex @@ -510,6 +510,8 @@ LATENCY_LOG latency_log LATENCY_LIMIT_DB latency_limit_db LATENCY_LIMIT_ACTION latency_limit_action +MSG_TIME msg_time + CFG_DESCRIPTION "description"|"descr"|"desc" LOADMODULE loadmodule @@ -976,6 +978,7 @@ IMPORTFILE "import_file" return HTTP_REPLY_HACK; } <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} <INITIAL>{LATENCY_LOG} { count(); yylval.strval=yytext; return LATENCY_LOG;} +<INITIAL>{MSG_TIME} { count(); yylval.strval=yytext; return MSG_TIME;} <INITIAL>{LATENCY_LIMIT_DB} { count(); yylval.strval=yytext; return LATENCY_LIMIT_DB;} <INITIAL>{LATENCY_LIMIT_ACTION} { count(); yylval.strval=yytext; return LATENCY_LIMIT_ACTION;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } diff --git a/cfg.y b/cfg.y index 1c62c10..cdd03fc 100644 --- a/cfg.y +++ b/cfg.y @@ -565,6 +565,7 @@ extern char *finame; %token LATENCY_LOG %token LATENCY_LIMIT_DB %token LATENCY_LIMIT_ACTION +%token MSG_TIME %token FLAGS_DECL %token AVPFLAGS_DECL @@ -1701,6 +1702,8 @@ assign_stm: | LATENCY_LIMIT_DB EQUAL error { yyerror("number expected"); } | LATENCY_LIMIT_ACTION EQUAL NUMBER { default_core_cfg.latency_limit_action=$3; } | LATENCY_LIMIT_ACTION EQUAL error { yyerror("number expected"); } + | MSG_TIME EQUAL NUMBER { sr_msg_time=$3; } + | MSG_TIME EQUAL error { yyerror("number expected"); } | UDP_MTU EQUAL NUMBER { default_core_cfg.udp_mtu=$3; } | UDP_MTU EQUAL error { yyerror("number expected"); } | FORCE_RPORT EQUAL NUMBER diff --git a/globals.h b/globals.h index 49b8345..6793aff 100644 --- a/globals.h +++ b/globals.h @@ -128,6 +128,7 @@ extern int sock_mode; extern char* chroot_dir; extern char* working_dir; extern int sr_auto_aliases; +extern int sr_msg_time; #ifdef USE_MCAST extern int mcast_loopback; diff --git a/main.c b/main.c index 07be3c1..306e409 100644 --- a/main.c +++ b/main.c @@ -418,6 +418,9 @@ int sock_mode= S_IRUSR| S_IWUSR| S_IRGRP| S_IWGRP; /* rw-rw---- */ int server_id = 0; /* Configurable unique ID of the server */ +/* set timeval for each received sip message */ +int sr_msg_time = 1; + /* more config stuff */ int disable_core_dump=0; /* by default enabled */ int open_files_limit=-1; /* don't touch it by default */ diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 29495d9..929d69d 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -55,6 +55,7 @@ #include <string.h> #include <stdlib.h> +#include <sys/time.h> #include "../comp_defs.h" #include "msg_parser.h" @@ -892,3 +893,15 @@ int msg_ctx_id_match(sip_msg_t *msg, msg_ctx_id_t *mid) return 0; return 1; } + +/** + * set msg time value + */ +int msg_set_time(sip_msg_t *msg) +{ + if(unlikely(msg==NULL)) + return -2; + if(msg->tval.tv_sec!=0) + return 0; + return gettimeofday(&msg->tval, NULL); +} diff --git a/parser/msg_parser.h b/parser/msg_parser.h index c633fed..6718b7a 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -251,10 +251,14 @@ typedef struct msg_body { } msg_body_t; +/* pre-declaration, to include sys/time.h in .c */ +struct timeval; + /*! \brief The SIP message */ typedef struct sip_msg { unsigned int id; /*!< message id, unique/process*/ int pid; /*!< process id */ + struct timeval tval; /*!< time value associated to message */ snd_flags_t fwd_send_flags; /*!< send flags for forwarding */ snd_flags_t rpl_send_flags; /*!< send flags for replies */ struct msg_start first_line; /*!< Message first line */ @@ -483,4 +487,9 @@ int msg_ctx_id_set(sip_msg_t *msg, msg_ctx_id_t *mid); */ int msg_ctx_id_match(sip_msg_t *msg, msg_ctx_id_t *mid); +/** + * set msg time value + */ +int msg_set_time(sip_msg_t *msg); + #endif diff --git a/receive.c b/receive.c index c701dd8..4426b6d 100644 --- a/receive.c +++ b/receive.c @@ -139,6 +139,8 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) msg->set_global_address=default_global_address; msg->set_global_port=default_global_port; + if(likely(sr_msg_time==1)) msg_set_time(msg); + if (parse_msg(buf,len, msg)!=0){ LOG(cfg_get(core, core_cfg, corelog), "ERROR: receive_msg: parse_msg failed\n");

1 0

git:master: usrloc(k): use correct domain column index
by Daniel-Constantin Mierla 18 Apr '12

18 Apr '12

Module: sip-router Branch: master Commit: c3f2b636716928ca234541a5a0835ccb6ca7b302 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3f2b63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 18 19:49:55 2012 +0200 usrloc(k): use correct domain column index - issue added by previous commit, reported by Juha Heinanen --- modules_k/usrloc/udomain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/usrloc/udomain.c b/modules_k/usrloc/udomain.c index 4dab65a..ca2b256 100644 --- a/modules_k/usrloc/udomain.c +++ b/modules_k/usrloc/udomain.c @@ -454,8 +454,8 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) } if (use_domain) { - domain = (char*)VAL_STRING(ROW_VALUES(row) + 16); - if (VAL_NULL(ROW_VALUES(row)+16) || domain==0 || domain[0]==0){ + domain = (char*)VAL_STRING(ROW_VALUES(row) + 17); + if (VAL_NULL(ROW_VALUES(row)+17) || domain==0 || domain[0]==0){ LM_CRIT("empty domain record for user %.*s...skipping\n", user.len, user.s); continue; @@ -718,7 +718,7 @@ urecord_t* db_load_urecord_by_ruid(db1_con_t* _c, udomain_t* _d, str *_ruid) if (use_domain) { domain.s = (char*)VAL_STRING(ROW_VALUES(row) + 17); - if (VAL_NULL(ROW_VALUES(row)+16) || domain.s==0 || domain.s[0]==0){ + if (VAL_NULL(ROW_VALUES(row)+17) || domain.s==0 || domain.s[0]==0){ LM_CRIT("empty domain record for user %.*s...skipping\n", aor.len, aor.s); goto done;

1 0

git:3.2: modules_k/rls: Fixed memory leak
by Peter Dunkley 18 Apr '12

18 Apr '12

Module: sip-router Branch: 3.2 Commit: 203b10340dcf1ba34a1fe8ad6ae588c1341c0083 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=203b103… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 18 17:15:10 2012 +0100 modules_k/rls: Fixed memory leak - The pkg memory allocated for route-sets when sendin NOTIFY requests was never freed. - Fixed by Paul Pankhurst @ Crocodile RCS (cherry picked from commit 1b87bac8d5c56909ee4ae10f88dd8c6292b53e8a) --- modules_k/rls/notify.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 4a0e9b3..8cf8b0e 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -714,11 +714,22 @@ error: return NULL; } + void rls_free_td(dlg_t* td) { - pkg_free(td->loc_uri.s); - pkg_free(td->rem_uri.s); + if(td) + { + if(td->loc_uri.s) + pkg_free(td->loc_uri.s); + + if(td->rem_uri.s) + pkg_free(td->rem_uri.s); + + if(td->route_set) + pkg_free(td->route_set); + pkg_free(td); + } } int rls_send_notify(subs_t* subs, str* body, char* start_cid, @@ -875,15 +886,7 @@ dlg_t* rls_notify_dlg(subs_t* subs) return td; error: - if(td) - { - if(td->loc_uri.s) - pkg_free(td->loc_uri.s); - - if(td->rem_uri.s) - pkg_free(td->rem_uri.s); - pkg_free(td); - } + if(td) rls_free_td(td); return NULL;

1 0

git:3.2: modules_k/rls: srand() called frequently
by Peter Dunkley 18 Apr '12

18 Apr '12

Module: sip-router Branch: 3.2 Commit: 4e0865a9fa502b8e93cbb7b9c3fb07dd3e38bf8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e0865a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 18 17:18:45 2012 +0100 modules_k/rls: srand() called frequently - srand() was used to ensure that the instance IDs for use in RLS NOTIFY bodies were random, but consistent. - The instance ID needs to be unique within a resource node in the NOTIFY body. It does not have to be unique locally. Although it needs to be unique it also needs to be repeatable as the same resource instance needs the same ID in subsequent NOTIFY requests. - You will only get multiple instances for a resource when the back-end SUBSCRIBEs from RLS are forked. Kamailio does not support this at the moment (the callback function in pua/send_subscribe.c is only called for the first final response) so we will only ever have one instance per resource. - Because there is only one instance per resource the instance ID can just be a fixed string. This will need to be changed if/when forking of back-end SUBSCRIBEs from PUA is supported. (cherry picked from commit c4a4a94065374fd182fc13374a0c520afa410f45) --- modules_k/rls/notify.c | 74 +++++++++++++++++++++------------------ modules_k/rls/notify.h | 4 ++- modules_k/rls/resource_notify.c | 18 +++++++--- 3 files changed, 56 insertions(+), 40 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index 6cc3226..4a0e9b3 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -83,6 +83,8 @@ int rls_get_resource_list(str *rl_uri, str *username, str *domain, int add_resource_to_list(char* uri, void* param); int add_resource(char* uri, xmlNodePtr list_node, char * boundary_string, db1_res_t *result, int *len_est); +char *instance_id = "Scf8UhwQ"; + int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, unsigned int hash_code) { @@ -165,7 +167,7 @@ int send_full_notify(subs_t* subs, xmlNodePtr rl_node, str* rl_uri, goto error; } - boundary_string= generate_string((int)time(NULL), BOUNDARY_STRING_LEN); + boundary_string= generate_string(BOUNDARY_STRING_LEN); while (uri_list_head) { @@ -371,12 +373,11 @@ int add_resource_instance(char* uri, xmlNodePtr resource_node, db_val_t *row_vals; int i, cmp_code; char* auth_state= NULL; - int contor= 0; int auth_state_flag; - int boundary_len = strlen(boundary_string); - str cid; - str content_type= {0, 0}; - str body= {0, 0}; + int boundary_len = strlen(boundary_string); + str cid; + str content_type= {0, 0}; + str body= {0, 0}; for(i= 0; i< result->n; i++) { @@ -390,8 +391,6 @@ int add_resource_instance(char* uri, xmlNodePtr resource_node, if(cmp_code== 0) { - contor++; - auth_state_flag= row_vals[auth_state_col].val.int_val; auth_state= get_auth_string(auth_state_flag ); if(auth_state== NULL) @@ -399,17 +398,17 @@ int add_resource_instance(char* uri, xmlNodePtr resource_node, LM_ERR("bad authorization status flag\n"); goto error; } - *len_est += strlen(auth_state) + 38; /* <instance id="12345678" state="[auth_state]" />r/n */ + *len_est += strlen(auth_state) + 38; /* <instance id="12345678" state="[auth_state]" />r/n */ if(auth_state_flag & ACTIVE_STATE) { cid.s= generate_cid(uri, strlen(uri)); cid.len= strlen(cid.s); - body.s= (char*)row_vals[pres_state_col].val.string_val; - body.len= strlen(body.s); - trim(&body); + body.s= (char*)row_vals[pres_state_col].val.string_val; + body.len= strlen(body.s); + trim(&body); - *len_est += cid.len + 8; /* cid="[cid]" */ + *len_est += cid.len + 8; /* cid="[cid]" */ content_type.s = (char*)row_vals[content_type_col].val.string_val; content_type.len = strlen(content_type.s); *len_est += 4 + boundary_len @@ -418,18 +417,17 @@ int add_resource_instance(char* uri, xmlNodePtr resource_node, + 18 + content_type.len + 4 + body.len + 8; } - else - if(auth_state_flag & TERMINATED_STATE) - { - *len_est += strlen(row_vals[resource_uri_col].val.string_val) + 10; /* reason="[resaon]" */ + else if(auth_state_flag & TERMINATED_STATE) + { + *len_est += strlen(row_vals[resource_uri_col].val.string_val) + 10; /* reason="[resaon]" */ } - if (rls_max_notify_body_len > 0 && *len_est > rls_max_notify_body_len) - { - /* We have a limit on body length set, and we were about to exceed it */ - return *len_est; + if (rls_max_notify_body_len > 0 && *len_est > rls_max_notify_body_len) + { + /* We have a limit on body length set, and we were about to exceed it */ + return *len_est; } - instance_node= xmlNewChild(resource_node, NULL, + instance_node= xmlNewChild(resource_node, NULL, BAD_CAST "instance", NULL); if(instance_node== NULL) { @@ -437,15 +435,24 @@ int add_resource_instance(char* uri, xmlNodePtr resource_node, goto error; } - /* OK, we are happy this will fit */ + /* OK, we are happy this will fit */ + /* Instance ID should be unique for each instance node + within a resource node. The same instance ID can be + used in different resource nodes. Instance ID needs + to remain the same for each resource instance in + future updates. We can just use a common string + here because you will only get multiple instances + for a resource when the back-end SUBSCRIBE is forked + and pua does not support this. If/when pua supports + forking of the SUBSCRIBEs it sends this will need to + be fixed properly. */ xmlNewProp(instance_node, BAD_CAST "id", - BAD_CAST generate_string(contor, 8)); + BAD_CAST instance_id); xmlNewProp(instance_node, BAD_CAST "state", BAD_CAST auth_state); if(auth_state_flag & ACTIVE_STATE) { - constr_multipart_body (&content_type, &body, &cid, boundary_len, boundary_string); - + constr_multipart_body (&content_type, &body, &cid, boundary_len, boundary_string); xmlNewProp(instance_node, BAD_CAST "cid", BAD_CAST cid.s); } else @@ -1029,26 +1036,25 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, return res; } -char* generate_string(int seed, int length) +char* generate_string(int length) { static char buf[128]; - int r,i; + int r,i; - if(length>= 128) + if(length>= 128) { LM_ERR("requested length exceeds buffer size\n"); return NULL; } - srand(seed); for(i=0; i<length; i++) { r= rand() % ('z'- 'A') + 'A'; - if(r>'Z' && r< 'a') - r= '0'+ (r- 'Z'); + if(r>'Z' && r< 'a') + r= '0'+ (r- 'Z'); - sprintf(buf+i, "%c", r); - } + sprintf(buf+i, "%c", r); + } buf[length]= '\0'; return buf; diff --git a/modules_k/rls/notify.h b/modules_k/rls/notify.h index c5c2ac4..04a3e80 100644 --- a/modules_k/rls/notify.h +++ b/modules_k/rls/notify.h @@ -53,11 +53,13 @@ typedef int (*list_func_t)(char* uri, void* param); int process_list_and_exec(xmlNodePtr list, str username, str domain, list_func_t function, void* param); -char* generate_string(int seed, int length); +char* generate_string(int length); char* generate_cid(char* uri, int uri_len); char* get_auth_string(int flag); int agg_body_sendn_update(str* rl_uri, char* boundary_string, str* rlmi_body, str* multipart_body, subs_t* subs, unsigned int hash_code); int rls_send_notify(subs_t* subs,str* body,char* start_cid,char* boundary_string); int create_empty_rlmi_doc(xmlDocPtr *rlmi_doc, xmlNodePtr *list_node, str *uri, int version, int full_state); + +extern char *instance_id; #endif diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index b63aca8..0ab3bbf 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -152,7 +152,7 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, char* buf= NULL, *auth_state= NULL, *boundary_string= NULL; str cid = {0,0}; str content_type= {0, 0}; - int contor= 0, auth_state_flag; + int auth_state_flag; int chunk_len=0; str bstr= {0, 0}; subs_t* dialog= NULL; @@ -160,7 +160,7 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, int resource_added = 0; /* Flag to indicate that we have added at least one resource */ /* generate the boundary string */ - boundary_string= generate_string((int)time(NULL), BOUNDARY_STRING_LEN); + boundary_string= generate_string(BOUNDARY_STRING_LEN); bstr.len= strlen(boundary_string); bstr.s= (char*)pkg_malloc((bstr.len+ 1)* sizeof(char)); if(bstr.s== NULL) @@ -242,10 +242,8 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, /* there might be more records with the same uri- more instances- * search and add them all */ - contor= 0; while(1) { - contor++; cid.s= NULL; cid.len= 0; @@ -311,8 +309,18 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, goto error; } + /* Instance ID should be unique for each instance node + within a resource node. The same instance ID can be + used in different resource nodes. Instance ID needs + to remain the same for each resource instance in + future updates. We can just use a common string + here because you will only get multiple instances + for a resource when the back-end SUBSCRIBE is forked + and pua does not support this. If/when pua supports + forking of the SUBSCRIBEs it sends this will need to + be fixed properly. */ xmlNewProp(instance_node, BAD_CAST "id", - BAD_CAST generate_string(contor, 8)); + BAD_CAST instance_id); if(auth_state_flag & ACTIVE_STATE) { xmlNewProp(instance_node, BAD_CAST "state", BAD_CAST auth_state);

1 0

git:3.2: modules_k/rls: Some diagnostics at the wrong level
by Peter Dunkley 18 Apr '12

18 Apr '12

Module: sip-router Branch: 3.2 Commit: fd93460c8766f255d118dc3e29a201ff1a0c4056 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd93460… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 18 17:23:59 2012 +0100 modules_k/rls: Some diagnostics at the wrong level (cherry picked from commit fb6308b6cfc558190fac67050b65f3a6fcc73cdb) --- modules_k/rls/resource_notify.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 762be0c..b63aca8 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -283,7 +283,7 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, if (resource_added == 1) { /* We added at least one resource. */ - LM_ERR("timer_send_notify hit the size limit. len_est = %d\n", len_est); + LM_DBG("timer_send_notify hit the size limit. len_est = %d\n", len_est); if (send_notify(&rlmi_doc, buf, buf_len, bstr, dialog, hash_code)) { LM_ERR("in send_notify\n"); @@ -293,7 +293,7 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, } else { - LM_ERR("timer_send_notify hit the size limit. NO RESOURCE ADDED len_est = %d\n", len_est); + LM_DBG("timer_send_notify hit the size limit. NO RESOURCE ADDED len_est = %d\n", len_est); } len_est = 0;

1 0

git:master: lib/srdb1, utils/kamctl: Updated rls_watchers table schema for RLS notifier changes
by Peter Dunkley 18 Apr '12

18 Apr '12

Module: sip-router Branch: master Commit: 402fa77ed738e938c49ddf044feb98bc70b8c16c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=402fa77… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 18 17:36:02 2012 +0100 lib/srdb1, utils/kamctl: Updated rls_watchers table schema for RLS notifier changes --- lib/srdb1/schema/rls_watchers.xml | 13 ++++++++++++- utils/kamctl/db_sqlite/rls-create.sql | 4 +++- utils/kamctl/mysql/rls-create.sql | 4 +++- utils/kamctl/oracle/rls-create.sql | 4 +++- utils/kamctl/postgres/rls-create.sql | 4 +++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/lib/srdb1/schema/rls_watchers.xml b/lib/srdb1/schema/rls_watchers.xml index 5db70b0..bb56209 100644 --- a/lib/srdb1/schema/rls_watchers.xml +++ b/lib/srdb1/schema/rls_watchers.xml @@ -9,7 +9,7 @@ <table id="rls_watchers" xmlns:db="http://docbook.org/ns/docbook"> <name>rls_watchers</name> - <version>1</version> + <version>2</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Table for RLS module used for storing resource lists subscribe @@ -173,6 +173,13 @@ <description>Local contact</description> </column> + <column id="updated"> + <name>updated</name> + <type>int</type> + <size>&expires_len;</size> + <description>Update flag</description> + </column> + <index> <name>rls_watcher_idx</name> <colref linkend="callid"/> @@ -199,4 +206,8 @@ <colref linkend="expires"/> </index> + <index> + <name>updated_idx</name> + <colref linkend="updated"/> + </index> </table> diff --git a/utils/kamctl/db_sqlite/rls-create.sql b/utils/kamctl/db_sqlite/rls-create.sql index ad6aa78..b8317a0 100644 --- a/utils/kamctl/db_sqlite/rls-create.sql +++ b/utils/kamctl/db_sqlite/rls-create.sql @@ -16,7 +16,7 @@ CREATE INDEX rls_presentity_rlsubs_idx ON rls_presentity (rlsubs_did); CREATE INDEX rls_presentity_updated_idx ON rls_presentity (updated); CREATE INDEX rls_presentity_expires_idx ON rls_presentity (expires); -INSERT INTO version (table_name, table_version) values ('rls_watchers','1'); +INSERT INTO version (table_name, table_version) values ('rls_watchers','2'); CREATE TABLE rls_watchers ( id INTEGER PRIMARY KEY NOT NULL, presentity_uri VARCHAR(128) NOT NULL, @@ -39,10 +39,12 @@ CREATE TABLE rls_watchers ( version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, + updated INTEGER NOT NULL, CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag) ); CREATE INDEX rls_watchers_rls_watchers_delete ON rls_watchers (callid, to_tag); CREATE INDEX rls_watchers_rls_watchers_update ON rls_watchers (watcher_username, watcher_domain, event); CREATE INDEX rls_watchers_rls_watchers_expires ON rls_watchers (expires); +CREATE INDEX rls_watchers_updated_idx ON rls_watchers (updated); diff --git a/utils/kamctl/mysql/rls-create.sql b/utils/kamctl/mysql/rls-create.sql index aa6d675..252a92a 100644 --- a/utils/kamctl/mysql/rls-create.sql +++ b/utils/kamctl/mysql/rls-create.sql @@ -16,7 +16,7 @@ CREATE INDEX rlsubs_idx ON rls_presentity (rlsubs_did); CREATE INDEX updated_idx ON rls_presentity (updated); CREATE INDEX expires_idx ON rls_presentity (expires); -INSERT INTO version (table_name, table_version) values ('rls_watchers','1'); +INSERT INTO version (table_name, table_version) values ('rls_watchers','2'); CREATE TABLE rls_watchers ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, presentity_uri VARCHAR(128) NOT NULL, @@ -39,10 +39,12 @@ CREATE TABLE rls_watchers ( version INT(11) DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, + updated INT(11) NOT NULL, CONSTRAINT rls_watcher_idx UNIQUE (callid, to_tag, from_tag) ) ENGINE=MyISAM; CREATE INDEX rls_watchers_delete ON rls_watchers (callid, to_tag); CREATE INDEX rls_watchers_update ON rls_watchers (watcher_username, watcher_domain, event); CREATE INDEX rls_watchers_expires ON rls_watchers (expires); +CREATE INDEX updated_idx ON rls_watchers (updated); diff --git a/utils/kamctl/oracle/rls-create.sql b/utils/kamctl/oracle/rls-create.sql index 8507f81..63deff4 100644 --- a/utils/kamctl/oracle/rls-create.sql +++ b/utils/kamctl/oracle/rls-create.sql @@ -24,7 +24,7 @@ CREATE INDEX rls_presentity_rlsubs_idx ON rls_presentity (rlsubs_did); CREATE INDEX rls_presentity_updated_idx ON rls_presentity (updated); CREATE INDEX rls_presentity_expires_idx ON rls_presentity (expires); -INSERT INTO version (table_name, table_version) values ('rls_watchers','1'); +INSERT INTO version (table_name, table_version) values ('rls_watchers','2'); CREATE TABLE rls_watchers ( id NUMBER(10) PRIMARY KEY, presentity_uri VARCHAR2(128), @@ -47,6 +47,7 @@ CREATE TABLE rls_watchers ( version NUMBER(10) DEFAULT 0 NOT NULL, socket_info VARCHAR2(64), local_contact VARCHAR2(128), + updated NUMBER(10), CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag) ); @@ -61,4 +62,5 @@ BEGIN map2users('rls_watchers'); END; CREATE INDEX ORA_rls_watchers_delete ON rls_watchers (callid, to_tag); CREATE INDEX ORA_rls_watchers_update ON rls_watchers (watcher_username, watcher_domain, event); CREATE INDEX ORA_rls_watchers_expires ON rls_watchers (expires); +CREATE INDEX rls_watchers_updated_idx ON rls_watchers (updated); diff --git a/utils/kamctl/postgres/rls-create.sql b/utils/kamctl/postgres/rls-create.sql index 550f615..3d961ac 100644 --- a/utils/kamctl/postgres/rls-create.sql +++ b/utils/kamctl/postgres/rls-create.sql @@ -16,7 +16,7 @@ CREATE INDEX rls_presentity_rlsubs_idx ON rls_presentity (rlsubs_did); CREATE INDEX rls_presentity_updated_idx ON rls_presentity (updated); CREATE INDEX rls_presentity_expires_idx ON rls_presentity (expires); -INSERT INTO version (table_name, table_version) values ('rls_watchers','1'); +INSERT INTO version (table_name, table_version) values ('rls_watchers','2'); CREATE TABLE rls_watchers ( id SERIAL PRIMARY KEY NOT NULL, presentity_uri VARCHAR(128) NOT NULL, @@ -39,10 +39,12 @@ CREATE TABLE rls_watchers ( version INTEGER DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, + updated INTEGER NOT NULL, CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag) ); CREATE INDEX rls_watchers_rls_watchers_delete ON rls_watchers (callid, to_tag); CREATE INDEX rls_watchers_rls_watchers_update ON rls_watchers (watcher_username, watcher_domain, event); CREATE INDEX rls_watchers_rls_watchers_expires ON rls_watchers (expires); +CREATE INDEX rls_watchers_updated_idx ON rls_watchers (updated);

1 0

git:master: modules_k/presence: Added new field to subs_t structure for the RLS notifier changes
by Peter Dunkley 18 Apr '12

18 Apr '12

Module: sip-router Branch: master Commit: 08decddbc35a3f50d757e20f1ef40ee2301560d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08decdd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 18 17:35:23 2012 +0100 modules_k/presence: Added new field to subs_t structure for the RLS notifier changes --- modules_k/presence/subscribe.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/subscribe.h b/modules_k/presence/subscribe.h index 8ba3893..9e74702 100644 --- a/modules_k/presence/subscribe.h +++ b/modules_k/presence/subscribe.h @@ -82,6 +82,7 @@ struct subscription str* auth_rules_doc; int recv_event; int internal_update_flag; + int updated; struct subscription* next; };

1 0

git:master: modules_k/rls: rls_presentity table version checked on wrong DB connection
by Peter Dunkley 18 Apr '12

18 Apr '12

Module: sip-router Branch: master Commit: 909c6401eab124789b13c09954c33f0ce628678f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=909c640… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 18 17:24:48 2012 +0100 modules_k/rls: rls_presentity table version checked on wrong DB connection --- modules_k/rls/rls.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index a3fc27b..39ddf9b 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -492,7 +492,7 @@ static int mod_init(void) } /* verify table version */ - if(db_check_table_version(&rls_dbf, rls_db, &rlpres_table, P_TABLE_VERSION) < 0) { + if(db_check_table_version(&rlpres_dbf, rls_db, &rlpres_table, P_TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); return -1; }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012