sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

git:4.4:5eabc7e5: ChangeLog: refreshed the relevant changelog content for v4.4.0

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 5eabc7e56bd32694438801cc7730109e8d4c2359 URL: https://github.com/kamailio/kamailio/commit/5eabc7e56bd32694438801cc7730109… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:56:12+02:00 ChangeLog: refreshed the relevant changelog content for v4.4.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/5eabc7e56bd32694438801cc7730109… Patch: https://github.com/kamailio/kamailio/commit/5eabc7e56bd32694438801cc7730109…

8 years, 9 months

git:4.4:82a7f3c0: pkg/rpm: version set to 4.4.0 in spec files

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 82a7f3c0f47d764ec734676c4da1a6a81ef81141 URL: https://github.com/kamailio/kamailio/commit/82a7f3c0f47d764ec734676c4da1a6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:50:06+02:00 pkg/rpm: version set to 4.4.0 in spec files --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/82a7f3c0f47d764ec734676c4da1a6a… Patch: https://github.com/kamailio/kamailio/commit/82a7f3c0f47d764ec734676c4da1a6a… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index fa3039a..7df1aed 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio -%define ver 4.2.0 -%define rel dev0.0%{dist} +%define ver 4.3.5 +%define rel 0.0%{dist} diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 2ceb8ea..4712350 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio -%define ver 4.1.0 -%define rel dev7.2%{dist} +%define ver 4.3.5 +%define rel 0%{dist} diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 12b02f0..dba4db9 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 1.2.0 +%define ver 4.4.0 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 6b396c7..9fe70f2 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.2.0 +%define ver 4.4.0 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 77af948..d9b08bc 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 1.2.0 +%define ver 4.4.0 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

8 years, 9 months

git:4.4:b235ca53: README.md: travis status moved next line to the title

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: b235ca538735bc0580193585a3c0a71edf1c813d URL: https://github.com/kamailio/kamailio/commit/b235ca538735bc0580193585a3c0a71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:46:49+02:00 README.md: travis status moved next line to the title --- Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/b235ca538735bc0580193585a3c0a71… Patch: https://github.com/kamailio/kamailio/commit/b235ca538735bc0580193585a3c0a71… --- diff --git a/README.md b/README.md index ac1f599..ffba21e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# Kamailio - The Open Source SIP Server [![Build Status](https://travis-ci.org/kamailio/kamailio.svg?branch=master)](https:/… +# Kamailio - The Open Source SIP Server + +[![Build Status](https://travis-ci.org/kamailio/kamailio.svg?branch=master)](https:/… Project Website:

8 years, 9 months

git:4.4:1c82c03c: INSTALL: small cleanup

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 1c82c03c64b62a4fcf409912c50859018f103fa5 URL: https://github.com/kamailio/kamailio/commit/1c82c03c64b62a4fcf409912c508590… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:44:17+02:00 INSTALL: small cleanup --- Modified: INSTALL --- Diff: https://github.com/kamailio/kamailio/commit/1c82c03c64b62a4fcf409912c508590… Patch: https://github.com/kamailio/kamailio/commit/1c82c03c64b62a4fcf409912c508590…

8 years, 9 months

git:4.4:fd9bcba7: README: polishing for v4.4

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: fd9bcba70bd7ea14d6581ba011d06e3d043ac69c URL: https://github.com/kamailio/kamailio/commit/fd9bcba70bd7ea14d6581ba011d06e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:40:53+02:00 README: polishing for v4.4 --- Modified: README --- Diff: https://github.com/kamailio/kamailio/commit/fd9bcba70bd7ea14d6581ba011d06e3… Patch: https://github.com/kamailio/kamailio/commit/fd9bcba70bd7ea14d6581ba011d06e3… --- diff --git a/README b/README index bce8726..b23d85f 100644 --- a/README +++ b/README @@ -19,14 +19,14 @@ I. About Kamailio ================= Kamailio is an industrial-strength, free server for realtime communication, -based on the Session Initiation Protocol (SIP RFC3261). +based on the Session Initiation Protocol (SIP RFC3261). It is engineered to power Realtime Communications such as IP telephony and presence infrastructures up to large scale. With embedded support for WebSockets/WebRTC, HTTP, XSRP and XMLrpc as well as Json-rpc it's a modern server, up to date with current standards on IPv4/IPv6 and TLS security. -Kamailio keeps track of users, sets up multimedia sessions, relays instant +Kamailio keeps track of users, sets up multimedia sessions, relays instant messages and creates space for new plug-in applications. Its proven interoperability guarantees seamless integration with components from other vendors, eliminating the risk of a single-vendor trap. Kamailio has @@ -58,7 +58,7 @@ II. Feature List Please visit http://www.kamailio.org/ for the most up-to-date feature list. Note that as features easily are added as modules, changes can occur quickly. -Most of Kamailio's features are implemented as plug-in modules. See +Most of Kamailio's features are implemented as plug-in modules. See our web site for a current list. III. Getting started @@ -73,7 +73,7 @@ The INSTALL document provides more details and guidelines that will help with the installation. Kamailio is composed of a core and additional modules. For each module -there is a README with documentation on how to configure and use the +there is a README with documentation on how to configure and use the module. These are available in each modules source code directory as well as on the kamailio.org web site. @@ -86,7 +86,7 @@ IV. About kamailio.org The Kamailio project has roots in a line of projects starting with SIP Express Router, then OpenSER and now Kamailio. A merge project was started during the fall of 2008 by developers from the OpenSER project, recently renamed to -Kamailio.org and SIP Express Router (SER) from iptel.org. +Kamailio.org and SIP Express Router (SER) from iptel.org. Kamailio is the result of a merge of the code base and years of experience from both developer teams. During the development of the release 4.0, autumn-winter @@ -98,15 +98,16 @@ See http://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. V. Obtaining Help ================= -We offer best-effort free support for Kamailio. "best-effort" means -that we try to solve your problems via email as soon as we can, -subject to available manpower. +We offer best-effort free support for Kamailio. "best-effort" means +that we try to solve your problems via email as soon as we can, +subject to available manpower. -To receive feedback to your inquiries, we recommend you to subscribe -to the sr-users mailing list and post your queries there. This mailing -list is set up for mutual help by the community of Kamailio users and developers. -To participate in the mailing list, subscribe at the following web address: - http://lists.sip-router.org/mailman/listinfo/sr-users +To receive feedback to your inquiries, we recommend you to subscribe +to the sr-users mailing list and post your queries there. This mailing +list is set up for mutual help by the community of Kamailio users and developers. +To participate in the mailing list, subscribe at the following web address: + + http://lists.sip-router.org/mailman/listinfo/sr-users The IRC channel #kamailio on freenode.net is a place where to meet and discuss with other members of Kamailio community. @@ -130,8 +131,9 @@ project on Github: VII. More Information ===================== -Most up-to-date information is always available at our website, - http://www.kamailio.org/ +Most up-to-date information is always available at our website: + + http://www.kamailio.org/ Particularly, it includes: - administrator's guide

8 years, 9 months

git:4.4:090f0bf4: topos: remove unused variables

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 090f0bf45b955cff303472978f00053c5277bd10 URL: https://github.com/kamailio/kamailio/commit/090f0bf45b955cff303472978f00053… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:38:40+02:00 topos: remove unused variables (cherry picked from commit 9aeaf65b042b7e65d962a9949b9a56e60743d89a) --- Modified: modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/090f0bf45b955cff303472978f00053… Patch: https://github.com/kamailio/kamailio/commit/090f0bf45b955cff303472978f00053… --- diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index a78cca3..8951ee1 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -1000,7 +1000,6 @@ int tps_storage_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) db_val_t db_vals[4]; db_key_t db_ucols[TPS_NR_KEYS]; db_val_t db_uvals[TPS_NR_KEYS]; - db1_res_t* db_res = NULL; int nr_keys; int nr_ucols; int ret; @@ -1089,7 +1088,6 @@ int tps_storage_end_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) db_val_t db_vals[4]; db_key_t db_ucols[TPS_NR_KEYS]; db_val_t db_uvals[TPS_NR_KEYS]; - db1_res_t* db_res = NULL; int nr_keys; int nr_ucols;

8 years, 9 months

git:4.4:3d3a255f: topos: swapping direction handling for contact in response

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 3d3a255f4f34b765a835d94721d10aa6db3dda4b URL: https://github.com/kamailio/kamailio/commit/3d3a255f4f34b765a835d94721d10aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:33:58+02:00 topos: swapping direction handling for contact in response (cherry picked from commit 7c48b0fce5d59f237103cd26a61e616d74cabcb3) --- Modified: modules/topos/tps_msg.c Modified: modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/3d3a255f4f34b765a835d94721d10aa… Patch: https://github.com/kamailio/kamailio/commit/3d3a255f4f34b765a835d94721d10aa… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index 4d747cd..2f398e8 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -624,7 +624,7 @@ int tps_reappend_route(sip_msg_t *msg, tps_data_t *ptsd, str *hbody, int rev) if(rev==1) { c = 0; sb.len = 1; - for(i=hbody->len-2; i>=0; i++) { + for(i=hbody->len-2; i>=0; i--) { if(hbody->s[i]==',') { c = 1; if(sb.len>0) { @@ -707,7 +707,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(stsd.a_tag.len!=ftag.len) { direction = TPS_DIR_UPSTREAM; } else { - if(memcpy(stsd.a_tag.s, ftag.s, ftag.len)==0) { + if(memcmp(stsd.a_tag.s, ftag.s, ftag.len)==0) { direction = TPS_DIR_DOWNSTREAM; } else { direction = TPS_DIR_UPSTREAM; @@ -718,9 +718,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) tps_storage_lock_release(&lkey); if(direction == TPS_DIR_UPSTREAM) { - nuri = stsd.b_contact; - } else { nuri = stsd.a_contact; + } else { + nuri = stsd.b_contact; } if(nuri.len>0) { if(rewrite_uri(msg, &nuri)<0) { @@ -804,7 +804,7 @@ int tps_response_received(sip_msg_t *msg) if(stsd.a_tag.len!=ftag.len) { direction = TPS_DIR_UPSTREAM; } else { - if(memcpy(stsd.a_tag.s, ftag.s, ftag.len)==0) { + if(memcmp(stsd.a_tag.s, ftag.s, ftag.len)==0) { direction = TPS_DIR_DOWNSTREAM; } else { direction = TPS_DIR_UPSTREAM; diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index 8852369..a78cca3 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -311,10 +311,18 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) LM_ERR("bad Contact header\n"); return -1; } - if(dir==TPS_DIR_DOWNSTREAM) { - td->a_contact = ((contact_body_t*)msg->contact->parsed)->contacts->uri; + if(msg->first_line.type==SIP_REQUEST) { + if(dir==TPS_DIR_DOWNSTREAM) { + td->a_contact = ((contact_body_t*)msg->contact->parsed)->contacts->uri; + } else { + td->b_contact = ((contact_body_t*)msg->contact->parsed)->contacts->uri; + } } else { - td->b_contact = ((contact_body_t*)msg->contact->parsed)->contacts->uri; + if(dir==TPS_DIR_DOWNSTREAM) { + td->b_contact = ((contact_body_t*)msg->contact->parsed)->contacts->uri; + } else { + td->a_contact = ((contact_body_t*)msg->contact->parsed)->contacts->uri; + } } return 0; @@ -862,21 +870,38 @@ int tps_storage_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) return -1; + if(md->a_uuid.len<=0 && md->b_uuid.len<=0) { + LM_ERR("no dlg uuid provided\n"); + return -1; + } + nr_keys = 0; nr_cols = 0; - db_keys[nr_keys]=&td_col_a_uuid; db_ops[nr_keys]=OP_EQ; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; - if(md->a_uuid.len>0 && md->a_uuid.s[0]=='a') { - db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + db_vals[nr_keys].val.str_val.len = 0; + if(md->a_uuid.len>0) { + if(md->a_uuid.s[0]=='a') { + db_keys[nr_keys]=&td_col_a_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + } else if(md->a_uuid.s[0]=='b') { + db_keys[nr_keys]=&td_col_b_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->a_uuid); + } } else { - if(md->b_uuid.len<=0) { - LM_ERR("no valid dlg uuid\n"); - return -1; + if(md->b_uuid.s[0]=='a') { + db_keys[nr_keys]=&td_col_a_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + } else if(md->b_uuid.s[0]=='b') { + db_keys[nr_keys]=&td_col_b_uuid; + db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); } - db_vals[nr_keys].val.str_val = TPS_STRZ(md->b_uuid); + } + if(db_vals[nr_keys].val.str_val.len<=0) { + LM_ERR("invalid dlg uuid provided\n"); + return -1; } nr_keys++;

8 years, 9 months

git:4.4:53a6e254: topos: reset the flags of dlg storage record on bye

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 53a6e2542118fc268d4b6333bf741c8287ad22ff URL: https://github.com/kamailio/kamailio/commit/53a6e2542118fc268d4b6333bf741c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:33:50+02:00 topos: reset the flags of dlg storage record on bye (cherry picked from commit ee67b5ee18dbd791f898ad5f472715b7bf818cfc) --- Modified: modules/topos/tps_msg.c Modified: modules/topos/tps_storage.c Modified: modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/53a6e2542118fc268d4b6333bf741c8… Patch: https://github.com/kamailio/kamailio/commit/53a6e2542118fc268d4b6333bf741c8… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index c350db5..4d747cd 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -908,6 +908,10 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) tps_reinsert_contact(msg, ptsd, &ptsd->bs_contact); } + if(dialog!=0) { + tps_storage_end_dialog(msg, &mtsd, ptsd); + } + done: tps_storage_lock_release(&lkey); return 0; diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index 3eb2b2d..8852369 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -978,7 +978,6 @@ int tps_storage_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) db1_res_t* db_res = NULL; int nr_keys; int nr_ucols; - int n; int ret; if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) @@ -1058,6 +1057,72 @@ int tps_storage_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) /** * */ +int tps_storage_end_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) +{ + db_key_t db_keys[4]; + db_op_t db_ops[4]; + db_val_t db_vals[4]; + db_key_t db_ucols[TPS_NR_KEYS]; + db_val_t db_uvals[TPS_NR_KEYS]; + db1_res_t* db_res = NULL; + int nr_keys; + int nr_ucols; + + if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) + return -1; + + if(md->s_method_id != METHOD_BYE) { + return 0; + } + + memset(db_ucols, 0, TPS_NR_KEYS*sizeof(db_key_t)); + memset(db_uvals, 0, TPS_NR_KEYS*sizeof(db_val_t)); + + nr_keys = 0; + nr_ucols = 0; + + db_keys[nr_keys]=&td_col_a_uuid; + db_ops[nr_keys]=OP_EQ; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].nul = 0; + if(sd->a_uuid.len>0 && sd->a_uuid.s[0]=='a') { + db_vals[nr_keys].val.str_val = TPS_STRZ(sd->a_uuid); + } else { + if(sd->b_uuid.len<=0) { + LM_ERR("no valid dlg uuid\n"); + return -1; + } + db_vals[nr_keys].val.str_val = TPS_STRZ(sd->b_uuid); + } + nr_keys++; + + db_ucols[nr_ucols] = &td_col_rectime; + db_uvals[nr_ucols].type = DB1_DATETIME; + db_uvals[nr_ucols].val.time_val = time(NULL); + nr_ucols++; + + db_ucols[nr_ucols] = &td_col_iflags; + db_uvals[nr_ucols].type = DB1_INT; + db_uvals[nr_ucols].val.int_val = 0; + nr_ucols++; + + if (_tpsdbf.use_table(_tps_db_handle, &td_table_name) < 0) { + LM_ERR("failed to perform use table\n"); + return -1; + } + + if(_tpsdbf.update(_tps_db_handle, db_keys, db_ops, db_vals, + db_ucols, db_uvals, nr_keys, nr_ucols)!=0) { + LM_ERR("failed to do db update for [%.*s]!\n", + md->a_uuid.len, md->a_uuid.s); + return -1; + } + return 0; +} + +/** + * + */ void tps_storage_clean(unsigned int ticks, void* param) { tps_db_clean_branches(); diff --git a/modules/topos/tps_storage.h b/modules/topos/tps_storage.h index 4fb7e04..63793db 100644 --- a/modules/topos/tps_storage.h +++ b/modules/topos/tps_storage.h @@ -85,6 +85,7 @@ int tps_storage_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); int tps_storage_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); int tps_storage_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); int tps_storage_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); +int tps_storage_end_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd); int tps_storage_lock_set_init(void); int tps_storage_lock_get(str *lkey);

8 years, 9 months

git:4.4:1d71e863: topos: clean not confrmed dialogs from db storage based on branch expires

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 1d71e863f52ba9cc5dc050d8db1d2b3c91d1bb07 URL: https://github.com/kamailio/kamailio/commit/1d71e863f52ba9cc5dc050d8db1d2b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:33:43+02:00 topos: clean not confrmed dialogs from db storage based on branch expires (cherry picked from commit 0103cc98b80a16081c1da39d6d674e9eba98f91b) --- Modified: modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/1d71e863f52ba9cc5dc050d8db1d2b3… Patch: https://github.com/kamailio/kamailio/commit/1d71e863f52ba9cc5dc050d8db1d2b3… --- diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index 632d2ca..3eb2b2d 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -539,17 +539,18 @@ int tps_db_clean_dialogs(void) { db_key_t db_keys[2]; db_val_t db_vals[2]; - db_op_t db_ops[2] = { OP_LEQ }; + db_op_t db_ops[2]; int nr_keys; nr_keys = 0; LM_DBG("cleaning expired dialog records\n"); - db_keys[0] = &td_col_rectime; - db_vals[0].type = DB1_DATETIME; - db_vals[0].nul = 0; - db_vals[0].val.time_val = time(NULL) - _tps_dialog_expire; + db_keys[nr_keys] = &td_col_rectime; + db_ops[nr_keys] = OP_LEQ; + db_vals[nr_keys].type = DB1_DATETIME; + db_vals[nr_keys].nul = 0; + db_vals[nr_keys].val.time_val = time(NULL) - _tps_dialog_expire; nr_keys++; if (_tpsdbf.use_table(_tps_db_handle, &td_table_name) < 0) { @@ -560,6 +561,21 @@ int tps_db_clean_dialogs(void) if (_tpsdbf.delete(_tps_db_handle, db_keys, db_ops, db_vals, nr_keys) < 0) { LM_DBG("failed to clean expired dialog records\n"); } + + /* dialog not confirmed - delete dlg after branch expires */ + db_vals[0].val.time_val = time(NULL) - _tps_branch_expire; + + db_keys[nr_keys] = &td_col_iflags; + db_ops[nr_keys] = OP_EQ; + db_vals[nr_keys].type = DB1_INT; + db_vals[nr_keys].nul = 0; + db_vals[nr_keys].val.int_val = 0; + nr_keys++; + + if (_tpsdbf.delete(_tps_db_handle, db_keys, db_ops, db_vals, nr_keys) < 0) { + LM_DBG("failed to clean expired dialog records\n"); + } + return 0; } @@ -670,17 +686,18 @@ int tps_db_clean_branches(void) { db_key_t db_keys[2]; db_val_t db_vals[2]; - db_op_t db_ops[2] = { OP_LEQ }; + db_op_t db_ops[2]; int nr_keys; nr_keys = 0; LM_DBG("cleaning expired branch records\n"); - db_keys[0] = &tt_col_rectime; - db_vals[0].type = DB1_DATETIME; - db_vals[0].nul = 0; - db_vals[0].val.time_val = time(NULL) - _tps_branch_expire; + db_keys[nr_keys] = &tt_col_rectime; + db_ops[nr_keys] = OP_LEQ; + db_vals[nr_keys].type = DB1_DATETIME; + db_vals[nr_keys].nul = 0; + db_vals[nr_keys].val.time_val = time(NULL) - _tps_branch_expire; nr_keys++; if (_tpsdbf.use_table(_tps_db_handle, &tt_table_name) < 0) {

8 years, 9 months

git:4.4:dc6de500: topos: update the db storeage for confirmed dialogs

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: dc6de500a862748463c8e3755b813b8c07ee68cb URL: https://github.com/kamailio/kamailio/commit/dc6de500a862748463c8e3755b813b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-30T14:33:35+02:00 topos: update the db storeage for confirmed dialogs (cherry picked from commit ed262dfb056f94e2fc81bcb59cd744f4924a76ef) --- Modified: modules/topos/tps_msg.c Modified: modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/dc6de500a862748463c8e3755b813b8… Patch: https://github.com/kamailio/kamailio/commit/dc6de500a862748463c8e3755b813b8… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index f11c0bb..c350db5 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -668,6 +668,8 @@ int tps_request_received(sip_msg_t *msg, int dialog) uint32_t direction = TPS_DIR_DOWNSTREAM; int ret; + LM_DBG("handling incoming request\n"); + if(dialog==0) { /* nothing to do for initial request */ return 0; @@ -765,6 +767,8 @@ int tps_response_received(sip_msg_t *msg) str ftag; uint32_t direction; + LM_DBG("handling incoming response\n"); + if(msg->first_line.u.reply.statuscode==100) { /* nothing to do - it should be absorbed */ return 0; @@ -840,6 +844,8 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) str xuuid; int direction = TPS_DIR_DOWNSTREAM; + LM_DBG("handling outgoing request\n"); + memset(&mtsd, 0, sizeof(tps_data_t)); memset(&btsd, 0, sizeof(tps_data_t)); memset(&stsd, 0, sizeof(tps_data_t)); @@ -872,7 +878,7 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) } if(dialog!=0) { - if(tps_storage_load_dialog(msg, &btsd, &stsd)==0) { + if(tps_storage_load_dialog(msg, &mtsd, &stsd)==0) { ptsd = &stsd; } } @@ -923,6 +929,8 @@ int tps_response_sent(sip_msg_t *msg) int direction = TPS_DIR_UPSTREAM; str xvbranch = {0, 0}; + LM_DBG("handling outgoing response\n"); + memset(&mtsd, 0, sizeof(tps_data_t)); memset(&stsd, 0, sizeof(tps_data_t)); memset(&btsd, 0, sizeof(tps_data_t)); diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index 4fb7cd6..632d2ca 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -1009,6 +1009,21 @@ int tps_storage_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) db_uvals[nr_ucols].val.str_val = TPS_STRZ(md->b_rr); nr_ucols++; + if(msg->first_line.type==SIP_REPLY) { + if(sd->b_tag.len<=0 + && msg->first_line.u.reply.statuscode>=200 + && msg->first_line.u.reply.statuscode<300) { + db_ucols[nr_ucols] = &td_col_b_tag; + db_uvals[nr_ucols].type = DB1_STR; + db_uvals[nr_ucols].val.str_val = TPS_STRZ(md->b_tag); + nr_ucols++; + + db_ucols[nr_ucols] = &td_col_iflags; + db_uvals[nr_ucols].type = DB1_INT; + db_uvals[nr_ucols].val.int_val = 1; + nr_ucols++; + } + } if (_tpsdbf.use_table(_tps_db_handle, &td_table_name) < 0) { LM_ERR("failed to perform use table\n"); return -1;

8 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016