sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
387 discussions

[kamailio] rtpengine: Add timestamp column to rtpengine table (#539)
by Stefan Mititelu 21 Mar '16

21 Mar '16

The rtpengine module is not affected by this change as it currently ignores the new column. Updated db scripts and documentations. Is it possible for the http://kamailio.org/docs/db-tables/kamailio-db-devel.html to be regenerated after this commit? You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/539 -- Commit Summary -- * rtpengine: Add timestamp column to rtpengine table -- File Changes -- M lib/srdb1/schema/rtpengine.xml (8) M modules/rtpengine/doc/rtpengine_admin.xml (29) M utils/kamctl/db_berkeley/kamailio/rtpengine (6) M utils/kamctl/db_sqlite/rtpengine-create.sql (1) M utils/kamctl/dbtext/kamailio/rtpengine (2) M utils/kamctl/mysql/rtpengine-create.sql (1) M utils/kamctl/oracle/rtpengine-create.sql (1) M utils/kamctl/postgres/rtpengine-create.sql (1) M utils/kamctl/xhttp_pi/rtpengine-mod (2) M utils/kamctl/xhttp_pi/rtpengine-table (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/539.patch https://github.com/kamailio/kamailio/pull/539.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/539

3 4

[kamailio] dialog module: dialog in 5 state is not removed (#545)
by Dmitri Savolainen 19 Mar '16

19 Mar '16

in v4.2 i made missconfiguration in kamailio.cfg, so kamailio send INVITE to itself: INVITE request: endpoint -> kamailio -> kamailio sip 407: kamailio -> kamailio -> endpoint alfter that, _dlg.profile_list _ return this dialog up to kamailio restart ``` "result": [{ "h_entry": 1185, "h_id": 1433, "call-id": "1372913901(a)192.168.5.52", "from_uri": "sip:000*094@xxxx:5068", "to_uri": "sip:00018966@xxxxxx:5068", "state": 5, "start_ts": 0, "init_ts": 1457963062, "timeout": 0, "lifetime": 43200, ...................... ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/545

3 10

git:master:956b5ae8: topos: added missing params to docs
by Daniel-Constantin Mierla 18 Mar '16

18 Mar '16

Module: kamailio Branch: master Commit: 956b5ae838b0627710473a15746ffd2cd96dfbc0 URL: https://github.com/kamailio/kamailio/commit/956b5ae838b0627710473a15746ffd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-18T18:05:02+01:00 topos: added missing params to docs --- Modified: modules/topos/README Modified: modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/956b5ae838b0627710473a15746ffd2… Patch: https://github.com/kamailio/kamailio/commit/956b5ae838b0627710473a15746ffd2…

1 0

git:master:7993b4a7: topos: don't store dialog data for message request
by Daniel-Constantin Mierla 18 Mar '16

18 Mar '16

Module: kamailio Branch: master Commit: 7993b4a7cf7281bc99bf1bae3777f3f0d18b24b1 URL: https://github.com/kamailio/kamailio/commit/7993b4a7cf7281bc99bf1bae3777f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-18T17:20:00+01:00 topos: don't store dialog data for message request - only branches are enough --- Modified: modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/7993b4a7cf7281bc99bf1bae3777f3f… Patch: https://github.com/kamailio/kamailio/commit/7993b4a7cf7281bc99bf1bae3777f3f… --- diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index a85c71b..e2b3adf 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -323,8 +323,10 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td) if(ret<0) goto error; ret = tps_storage_link_msg(msg, td, TPS_DIR_DOWNSTREAM); if(ret<0) goto error; - ret = tps_db_insert_dialog(td); - if(ret<0) goto error; + if(td->s_method_id!=METHOD_MESSAGE) { + ret = tps_db_insert_dialog(td); + if(ret<0) goto error; + } ret = tps_db_insert_branch(td); if(ret<0) goto error;

1 0

git:master:6885748a: topos: shortcut to handle forwarded MESSAGE replies
by Daniel-Constantin Mierla 18 Mar '16

18 Mar '16

Module: kamailio Branch: master Commit: 6885748a5146d4531a0e235e67621df49df67d97 URL: https://github.com/kamailio/kamailio/commit/6885748a5146d4531a0e235e67621df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-18T16:52:24+01:00 topos: shortcut to handle forwarded MESSAGE replies - no dialog created there --- Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/6885748a5146d4531a0e235e67621df… Patch: https://github.com/kamailio/kamailio/commit/6885748a5146d4531a0e235e67621df… --- diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index 5bdf20e..ac180e8 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -548,11 +548,8 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int direction, int local) return -1; } - if(direction==TPS_DIR_DOWNSTREAM) { - lkey = get_from(msg)->tag_value; - } else { - lkey = get_to(msg)->tag_value; - } + lkey = msg->callid->body; + tps_storage_lock_get(&lkey); if(dialog==0) { if(tps_storage_record(msg, ptsd)<0) { @@ -599,5 +596,42 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int direction, int local) */ int tps_response_sent(sip_msg_t *msg) { + tps_data_t mtsd; + tps_data_t stsd; + tps_data_t btsd; + str lkey; + + memset(&mtsd, 0, sizeof(tps_data_t)); + memset(&stsd, 0, sizeof(tps_data_t)); + memset(&btsd, 0, sizeof(tps_data_t)); + + if(tps_pack_request(msg, &mtsd)<0) { + LM_ERR("failed to extract and pack the headers\n"); + return -1; + } + + if(get_cseq(msg)->method_id==METHOD_MESSAGE) { + tps_remove_headers(msg, HDR_RECORDROUTE_T); + tps_remove_headers(msg, HDR_CONTACT_T); + return 0; + } + + lkey = msg->callid->body; + + tps_storage_lock_get(&lkey); + if(tps_storage_load_branch(msg, &mtsd, &btsd)<0) { + goto error; + } + LM_DBG("loaded dialog a_uuid [%.*s]\n", + btsd.a_uuid.len, ZSW(btsd.a_uuid.s)); + if(tps_storage_load_dialog(msg, &btsd, &stsd)<0) { + goto error; + } + tps_storage_lock_release(&lkey); + return 0; + +error: + tps_storage_lock_release(&lkey); + return -1; }

1 0

git:master:1c7f3938: topos: MESSAGE may be without Contact header
by Daniel-Constantin Mierla 18 Mar '16

18 Mar '16

Module: kamailio Branch: master Commit: 1c7f39389225ef5c1430bb8540b6fd9c249734bb URL: https://github.com/kamailio/kamailio/commit/1c7f39389225ef5c1430bb8540b6fd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-18T16:43:14+01:00 topos: MESSAGE may be without Contact header --- Modified: modules/topos/topos_mod.c 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/1c7f39389225ef5c1430bb8540b6fd9… Patch: https://github.com/kamailio/kamailio/commit/1c7f39389225ef5c1430bb8540b6fd9… --- diff --git a/modules/topos/topos_mod.c b/modules/topos/topos_mod.c index 4bdcbcf..6d56f09 100644 --- a/modules/topos/topos_mod.c +++ b/modules/topos/topos_mod.c @@ -228,6 +228,11 @@ int tps_prepare_msg(sip_msg_t *msg) LM_DBG("no second via in this message \n"); } + if(parse_headers(msg, HDR_CSEQ_F, 0)!=0 || msg->cseq==NULL) { + LM_ERR("cannot parse cseq header\n"); + return -1; + } + if(parse_from_header(msg)<0) { LM_ERR("cannot parse FROM header\n"); return 3; @@ -292,7 +297,7 @@ int tps_msg_received(void *data) } } else { /* reply */ - if(msg->first_line.u.reply.statuscode==100) { + if(msg.first_line.u.reply.statuscode==100) { /* nothing to do - it should be absorbed */ return 0; } diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index e6d02ce..5bdf20e 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -409,6 +409,7 @@ int tps_pack_request(sip_msg_t *msg, tps_data_t *ptsd) ptsd->as_contact.len, ZSW(ptsd->as_contact.s), ptsd->as_contact.len, ptsd->bs_contact.len, ZSW(ptsd->bs_contact.s), ptsd->bs_contact.len); ptsd->x_rr = ptsd->a_rr; + ptsd->s_method_id = get_cseq(msg)->method_id; return 0; } diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index c5a767b..a85c71b 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -275,8 +275,20 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) td->b_tag = td->a_tag; } + td->x_via = td->x_via2; + if(parse_headers(msg, HDR_CSEQ_F, 0)!=0 || msg->cseq==NULL) { + LM_ERR("cannot parse cseq header\n"); + return -1; /* should it be 0 ?!?! */ + } + td->s_method = get_cseq(msg)->method; + td->s_cseq = get_cseq(msg)->number; + /* extract the contact address */ if(parse_headers(msg, HDR_CONTACT_F, 0)<0 || msg->contact==NULL) { + if(td->s_method_id == METHOD_MESSAGE) { + /* no contact required for MESSAGE - done */ + return 0; + } LM_ERR("bad sip message or missing Contact hdr\n"); goto error; } @@ -291,13 +303,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) } else { td->b_contact = ((contact_body_t*)msg->contact->parsed)->contacts->uri; } - td->x_via = td->x_via2; - if(parse_headers(msg, HDR_CSEQ_F, 0)!=0 || msg->cseq==NULL) { - LM_ERR("cannot parse cseq header\n"); - return -1; /* should it be 0 ?!?! */ - } - td->s_method = get_cseq(msg)->method; - td->s_cseq = get_cseq(msg)->number; + return 0; error: diff --git a/modules/topos/tps_storage.h b/modules/topos/tps_storage.h index cd24fd9..400ee98 100644 --- a/modules/topos/tps_storage.h +++ b/modules/topos/tps_storage.h @@ -65,6 +65,7 @@ typedef struct tps_data { str s_cseq; int32_t iflags; int32_t direction; + uint32_t s_method_id; } tps_data_t; int tps_storage_dialog_find(sip_msg_t *msg, tps_data_t *td);

1 0

git:master:98f92714: topos: no processing needed for 100 responses
by Daniel-Constantin Mierla 18 Mar '16

18 Mar '16

Module: kamailio Branch: master Commit: 98f927149c2f6865dd6b709f4a3bb7be77e57f5c URL: https://github.com/kamailio/kamailio/commit/98f927149c2f6865dd6b709f4a3bb7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-18T16:05:18+01:00 topos: no processing needed for 100 responses --- Modified: modules/topos/topos_mod.c Modified: modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/98f927149c2f6865dd6b709f4a3bb7b… Patch: https://github.com/kamailio/kamailio/commit/98f927149c2f6865dd6b709f4a3bb7b… --- diff --git a/modules/topos/topos_mod.c b/modules/topos/topos_mod.c index 99267a1..4bdcbcf 100644 --- a/modules/topos/topos_mod.c +++ b/modules/topos/topos_mod.c @@ -292,6 +292,10 @@ int tps_msg_received(void *data) } } else { /* reply */ + if(msg->first_line.u.reply.statuscode==100) { + /* nothing to do - it should be absorbed */ + return 0; + } tps_response_received(&msg); } diff --git a/modules/topos/tps_msg.c b/modules/topos/tps_msg.c index eee546d..e6d02ce 100644 --- a/modules/topos/tps_msg.c +++ b/modules/topos/tps_msg.c @@ -491,6 +491,11 @@ int tps_response_received(sip_msg_t *msg) tps_data_t btsd; str lkey; + if(msg->first_line.u.reply.statuscode==100) { + /* nothing to do - it should be absorbed */ + return 0; + } + memset(&mtsd, 0, sizeof(tps_data_t)); memset(&stsd, 0, sizeof(tps_data_t)); memset(&btsd, 0, sizeof(tps_data_t));

1 0

git:master:f591b7e0: topos: cseq number and method linked to db
by Daniel-Constantin Mierla 18 Mar '16

18 Mar '16

Module: kamailio Branch: master Commit: f591b7e0b0c71648a9ac62dd9604955d7c2acb75 URL: https://github.com/kamailio/kamailio/commit/f591b7e0b0c71648a9ac62dd9604955… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-18T15:19:18+01:00 topos: cseq number and method linked to db --- Modified: modules/topos/tps_storage.c Modified: modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/f591b7e0b0c71648a9ac62dd9604955… Patch: https://github.com/kamailio/kamailio/commit/f591b7e0b0c71648a9ac62dd9604955… --- diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index d6dbabc..c5a767b 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -292,6 +292,12 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) td->b_contact = ((contact_body_t*)msg->contact->parsed)->contacts->uri; } td->x_via = td->x_via2; + if(parse_headers(msg, HDR_CSEQ_F, 0)!=0 || msg->cseq==NULL) { + LM_ERR("cannot parse cseq header\n"); + return -1; /* should it be 0 ?!?! */ + } + td->s_method = get_cseq(msg)->method; + td->s_cseq = get_cseq(msg)->number; return 0; error: @@ -477,8 +483,8 @@ int tps_db_insert_dialog(tps_data_t *td) nr_keys++; db_keys[nr_keys] = &td_col_s_cseq; - db_vals[nr_keys].type = DB1_INT; - db_vals[nr_keys].val.int_val = (int)td->s_cseq; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].val.str_val = TPS_STRZ(td->s_cseq); nr_keys++; if (_tpsdbf.use_table(_tps_db_handle, &td_table_name) < 0) { @@ -597,8 +603,8 @@ int tps_db_insert_branch(tps_data_t *td) nr_keys++; db_keys[nr_keys] = &tt_col_s_cseq; - db_vals[nr_keys].type = DB1_INT; - db_vals[nr_keys].val.int_val = (int)td->s_cseq; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].val.str_val = TPS_STRZ(td->s_cseq); nr_keys++; if (_tpsdbf.use_table(_tps_db_handle, &tt_table_name) < 0) { @@ -731,6 +737,8 @@ int tps_storage_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) db_cols[nr_cols++] = &tt_col_x_rr; db_cols[nr_cols++] = &tt_col_x_uri; db_cols[nr_cols++] = &tt_col_x_tag; + db_cols[nr_cols++] = &tt_col_s_method; + db_cols[nr_cols++] = &tt_col_s_cseq; if (_tpsdbf.use_table(_tps_db_handle, &tt_table_name) < 0) { LM_ERR("failed to perform use table\n"); @@ -762,6 +770,8 @@ int tps_storage_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) TPS_DATA_APPEND_DB(sd, db_res, n, &sd->x_rr); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->x_uri); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->x_tag); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_method); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) LM_ERR("failed to free result of query\n"); @@ -820,6 +830,8 @@ int tps_storage_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) db_cols[nr_cols++] = &td_col_r_uri; db_cols[nr_cols++] = &td_col_a_srcip; db_cols[nr_cols++] = &td_col_b_srcip; + db_cols[nr_cols++] = &td_col_s_method; + db_cols[nr_cols++] = &td_col_s_cseq; if (_tpsdbf.use_table(_tps_db_handle, &td_table_name) < 0) { @@ -860,6 +872,8 @@ int tps_storage_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) TPS_DATA_APPEND_DB(sd, db_res, n, &sd->r_uri); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->a_srcip); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->b_srcip); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_method); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) LM_ERR("failed to free result of query\n"); diff --git a/modules/topos/tps_storage.h b/modules/topos/tps_storage.h index 0fca469..cd24fd9 100644 --- a/modules/topos/tps_storage.h +++ b/modules/topos/tps_storage.h @@ -62,9 +62,9 @@ typedef struct tps_data { str x_rr; str x_uri; str s_method; + str s_cseq; int32_t iflags; int32_t direction; - int32_t s_cseq; } tps_data_t; int tps_storage_dialog_find(sip_msg_t *msg, tps_data_t *td);

1 0

git:master:0dd9c526: srdb1/schema: cseq stored as string for topos
by Daniel-Constantin Mierla 18 Mar '16

18 Mar '16

Module: kamailio Branch: master Commit: 0dd9c526f762974ceb397cc2c7862fa7ff122ebf URL: https://github.com/kamailio/kamailio/commit/0dd9c526f762974ceb397cc2c7862fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-18T15:15:21+01:00 srdb1/schema: cseq stored as string for topos - no conversion from sip header --- Modified: lib/srdb1/schema/topos_d.xml Modified: lib/srdb1/schema/topos_t.xml --- Diff: https://github.com/kamailio/kamailio/commit/0dd9c526f762974ceb397cc2c7862fa… Patch: https://github.com/kamailio/kamailio/commit/0dd9c526f762974ceb397cc2c7862fa… --- diff --git a/lib/srdb1/schema/topos_d.xml b/lib/srdb1/schema/topos_d.xml index dd19d85..46cb349 100644 --- a/lib/srdb1/schema/topos_d.xml +++ b/lib/srdb1/schema/topos_d.xml @@ -44,8 +44,9 @@ <column id="s_cseq"> <name>s_cseq</name> - <type>unsigned int</type> - <default>0</default> + <type>string</type> + <size>64</size> + <default/> <description>CSeq from SIP message</description> </column> diff --git a/lib/srdb1/schema/topos_t.xml b/lib/srdb1/schema/topos_t.xml index c21fb09..0dc626e 100644 --- a/lib/srdb1/schema/topos_t.xml +++ b/lib/srdb1/schema/topos_t.xml @@ -44,8 +44,9 @@ <column id="s_cseq"> <name>s_cseq</name> - <type>unsigned int</type> - <default>0</default> + <type>string</type> + <size>64</size> + <default/> <description>CSeq from SIP message</description> </column>

1 0

git:master:eb1e8e2f: kamctl: refreshed topos db scripts
by Daniel-Constantin Mierla 18 Mar '16

18 Mar '16

Module: kamailio Branch: master Commit: eb1e8e2ff46a1ecac81b05985dc09a37036ce1ab URL: https://github.com/kamailio/kamailio/commit/eb1e8e2ff46a1ecac81b05985dc09a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-18T15:15:57+01:00 kamctl: refreshed topos db scripts --- Modified: utils/kamctl/db_berkeley/kamailio/topos_d Modified: utils/kamctl/db_berkeley/kamailio/topos_t Modified: utils/kamctl/db_sqlite/topos-create.sql Modified: utils/kamctl/dbtext/kamailio/topos_d Modified: utils/kamctl/dbtext/kamailio/topos_t Modified: utils/kamctl/mysql/topos-create.sql Modified: utils/kamctl/oracle/topos-create.sql Modified: utils/kamctl/postgres/topos-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/topos-table --- Diff: https://github.com/kamailio/kamailio/commit/eb1e8e2ff46a1ecac81b05985dc09a3… Patch: https://github.com/kamailio/kamailio/commit/eb1e8e2ff46a1ecac81b05985dc09a3…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016