sr-dev August 2020

sr-dev@lists.kamailio.org

17 participants
248 discussions

[kamailio/kamailio] Error when upgrading MySQL database schema during v.5.3 to v.5.4 upgrading. (#2424)
by leonid-xorcom 03 Aug '20

03 Aug '20

The recommended My SQL quires for database schema change during Kamailio upgrading from v.5.3 to 5.4 fails: ``` mysql> ALTER TABLE version ADD COLUMN `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT; ERROR 1075 (42000): Incorrect table definition; there can be only one auto column and it must be defined as a key ``` The correct command is: ``` mysql> ALTER TABLE `version` ADD COLUMN `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, ADD PRIMARY KEY (`id`); Query OK, 0 rows affected (0.80 sec) ``` In this case the second recommended command ``` ALTER TABLE version ADD PRIMARY KEY (`id`); ``` is not needed. Tested on Ubuntu 18.04, with mysql v.5.7.31 Best regards, Leonid Fainshtein -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2424

2 2

git:5.2:e6c91219: pua: update_version_puadb() use pres_id to select record
by Victor Seva 03 Aug '20

03 Aug '20

Module: kamailio Branch: 5.2 Commit: e6c91219fd8202f0b1a2dd368537f3eb3516882b URL: https://github.com/kamailio/kamailio/commit/e6c91219fd8202f0b1a2dd368537f3e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-03T09:25:00+02:00 pua: update_version_puadb() use pres_id to select record * only relevant when db_mode is PUA_DB_ONLY * call_id/to_tag/from_tag values can be "", for instance with DIALOG_PUBLISH.* records. Then **ALL** records get version field update * update_vesion_puadb() is called from send_publish() and pres->id value is valid after a call to get_record_puadb() related to #2414 (cherry picked from commit 733f5f240b4cf0c6e951257dc344d9b2c885331f) --- Modified: src/modules/pua/pua_db.c --- Diff: https://github.com/kamailio/kamailio/commit/e6c91219fd8202f0b1a2dd368537f3e… Patch: https://github.com/kamailio/kamailio/commit/e6c91219fd8202f0b1a2dd368537f3e… --- diff --git a/src/modules/pua/pua_db.c b/src/modules/pua/pua_db.c index fda1a6ce5b..3e3147ce1e 100644 --- a/src/modules/pua/pua_db.c +++ b/src/modules/pua/pua_db.c @@ -1485,8 +1485,8 @@ int update_contact_puadb(ua_pres_t *pres, str *contact) int update_version_puadb(ua_pres_t *pres) { - db_key_t q_cols[3], db_cols[1]; - db_val_t q_vals[3], db_vals[1]; + db_key_t q_cols[1], db_cols[1]; + db_val_t q_vals[1], db_vals[1]; int n_query_cols= 0, n_update_cols=0; if (pres==NULL) @@ -1496,22 +1496,10 @@ int update_version_puadb(ua_pres_t *pres) } /* cols and values used for search query */ - q_cols[n_query_cols] = &str_call_id_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->call_id; - n_query_cols++; - - q_cols[n_query_cols] = &str_to_tag_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->to_tag; - n_query_cols++; - - q_cols[n_query_cols] = &str_from_tag_col; + q_cols[n_query_cols] = &str_pres_id_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->from_tag; + q_vals[n_query_cols].val.str_val = pres->id; n_query_cols++; /* we overwrite contact even if not changed */

1 0

git:5.2:7b7602ac: pua: fix send_publish() behavior on PUA_DB_ONLY
by Victor Seva 03 Aug '20

03 Aug '20

Module: kamailio Branch: 5.2 Commit: 7b7602ac795cdf0f1302cca39b1648f47c8cc7da URL: https://github.com/kamailio/kamailio/commit/7b7602ac795cdf0f1302cca39b1648f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-03T09:24:02+02:00 pua: fix send_publish() behavior on PUA_DB_ONLY * dialog PUBLISH was missing SIP-If-Mach * pua was inserting a new record for every dialog state fixes #2414 (cherry picked from commit da7f7ef082e28f81893ec06081358a9f88571bcc) --- Modified: src/modules/pua/send_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/7b7602ac795cdf0f1302cca39b1648f… Patch: https://github.com/kamailio/kamailio/commit/7b7602ac795cdf0f1302cca39b1648f… --- diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 1c9d8ed12b..fc9af799f8 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -516,14 +516,11 @@ int send_publish( publ_info_t* publ ) if (dbmode==PUA_DB_ONLY) { - if (publ->etag) { - memset(&dbpres, 0, sizeof(dbpres)); - dbpres.pres_uri = &pres_uri; - dbpres.watcher_uri = &watcher_uri; - dbpres.extra_headers = &extra_headers; - presentity = get_record_puadb(publ->id, publ->etag, - &dbpres, &res); - } + memset(&dbpres, 0, sizeof(dbpres)); + dbpres.pres_uri = &pres_uri; + dbpres.watcher_uri = &watcher_uri; + dbpres.extra_headers = &extra_headers; + presentity = get_record_puadb(publ->id, publ->etag, &dbpres, &res); } else {

1 0

[kamailio/kamailio] pua: different behavior depending on db_mode (#2414)
by Victor Seva 03 Aug '20

03 Aug '20

### Description If db_mode == 2 (PUA_DB_ONLY) ``SIP-If-Match`` header doesn't exists on dialog event ``` PUBLISH sip:testuser1003@spce.test SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:5062;branch=z9hG4bKcc38.e1cf4686000000000000000000000000.0 To: <sip:testuser1003@spce.test> From: <sip:testuser1003@spce.test>;tag=40bd18ec79e1d8f7e9c3f54805d1ecb3-86dabd12 CSeq: 10 PUBLISH Call-ID: 200464472a3c6cfc-497(a)127.0.0.1 Content-Length: 709 User-Agent: Sipwise NGCP Proxy 8.X Max-Forwards: 70 Event: dialog Expires: 23761 Content-Type: application/dialog-info+xml ``` same escenario but with db_mode == 0 ``` PUBLISH sip:testuser1002@spce.test SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:5062;branch=z9hG4bK5e55.d35147e4000000000000000000000000.0 To: <sip:testuser1002@spce.test> From: <sip:testuser1002@spce.test>;tag=40bd18ec79e1d8f7e9c3f54805d1ecb3-84a3a447 CSeq: 10 PUBLISH Call-ID: 3cce05ee326f011b-24523(a)127.0.0.1 Content-Length: 682 User-Agent: Sipwise NGCP Proxy 8.X Max-Forwards: 70 Event: dialog Expires: 23761 SIP-If-Match: a.1596025051.24523.1.0 Content-Type: application/dialog-info+xml ``` #### Log Messages with db_mode == 0 ``` Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:406]: dialog_publish_multi(): CALLING dialog_publish for URI sip:testuser1002@spce.test Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:255]: build_dialoginfo(): new_body:#012<?xml version="1.0"?>#012<dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="0" state="full" entity="sip:testuser1002@spce.test">#012 <dialog id="NGCP%invite_shared_line%///1-26774(a)127.126.0.1" call-id="NGCP%invite_shared_line%///1-26774(a)127.126.0.1" local-tag="26774SIPpTag001" remote-tag="51E6E31F-5F2168FA000B8FF4-430B7700" direction="initiator">#012 <state>early</state>#012 <remote>#012 <identity>sip:testuser1003@spce.test</identity>#012 <target uri="sip:127.0.0.1:5085;transport=udp"/>#012 </remote>#012 <local>#012 <identity>sip:testuser1002@spce.test</identity>#012 <target uri="sip:testuser1002@127.126.0.1:51602"/>#012 </local>#012 </dialog>#012</dialog-info>#012 Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:315]: dialog_publish(): publish uri= sip:testuser1002@spce.test Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:50]: print_publ(): publ: Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:51]: print_publ(): uri= sip:testuser1002@spce.test Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:52]: print_publ(): id= DIALOG_PUBLISH.NGCP%invite_shared_line%///1-26774(a)127.126.0.1 Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:53]: print_publ(): expires= 23760 Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua [send_publish.c:498]: send_publish(): pres_uri=sip:testuser1002@spce.test Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua [hash.c:132]: search_htable(): core_hash= 322 Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua [hash.c:174]: search_htable(): no etag restriction Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua [hash.c:183]: search_htable(): found record Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua [send_publish.c:587]: send_publish(): record found Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua [send_publish.c:673]: send_publish(): etag:a.1596025051.24523.1.0 Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua [send_publish.c:106]: publ_build_hdr(): UPDATE_TYPE [etag]= a.1596025051.24523.1.0 Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua [send_publish.c:683]: send_publish(): publ->pres_uri:#012sip:testuser1002@spce.test#012 Jul 29 14:18:03 sp1 proxy[24523]: DEBUG: <null> pua [send_publish.c:684]: send_publish(): str_hdr:#012Max-Forwards: 70#015#012Event: dialog#015#012Expires: 23761#015#012SIP-If-Match: a.1596025051.24523.1.0#015#012Content-Type: application/dialog-info+xml#015#012 130#012 ``` with db_mode == 2 ``` Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:406]: dialog_publish_multi(): CALLING dialog_publish for URI sip:testuser1002@spce.test Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:255]: build_dialoginfo(): new_body:#012<?xml version="1.0"?>#012<dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="0" state="full" entity="sip:testuser1002@spce.test">#012 <dialog id="NGCP%invite_shared_line%///1-8362(a)127.126.0.1" call-id="NGCP%invite_shared_line%///1-8362(a)127.126.0.1" local-tag="8362SIPpTag001" remote-tag="18DEC3EE-5F2165A30000D6FF-42FB6700" direction="initiator">#012 <state>early</state>#012 <remote>#012 <identity>sip:testuser1003@spce.test</identity>#012 <target uri="sip:127.0.0.1:5085;transport=udp"/>#012 </remote>#012 <local>#012 <identity>sip:testuser1002@spce.test</identity>#012 <target uri="sip:testuser1002@127.126.0.1:51602"/>#012 </local>#012 </dialog>#012</dialog-info>#012 Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:315]: dialog_publish(): publish uri= sip:testuser1002@spce.test Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:50]: print_publ(): publ: Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:51]: print_publ(): uri= sip:testuser1002@spce.test Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:52]: print_publ(): id= DIALOG_PUBLISH.NGCP%invite_shared_line%///1-8362(a)127.126.0.1 Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua_dialoginfo [dialog_publish.c:53]: print_publ(): expires= 23760 Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua [send_publish.c:498]: send_publish(): pres_uri=sip:testuser1002@spce.test Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua [send_publish.c:564]: send_publish(): insert type Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua [send_publish.c:568]: send_publish(): UPDATE_TYPE and no record found Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua [send_publish.c:683]: send_publish(): publ->pres_uri:#012sip:testuser1002@spce.test#012 Jul 29 14:03:47 sp1 proxy[5714]: DEBUG: <null> pua [send_publish.c:684]: send_publish(): str_hdr:#012Max-Forwards: 70#015#012Event: dialog#015#012Expires: 23761#015#012Content-Type: application/dialog-info+xml#015#012 92#012 ``` ### Possible Solutions I think the problem here is that on db_mode == 2 pua never search for the pua record if no etag is set change introduced at https://github.com/kamailio/kamailio/commit/6822ff45e931ad3e93b22ebf7d1beb3… ### Additional Information * **Kamailio Version** - output of `kamailio -v` This is Sipwise's kamailio version based on 5.3.5 ``` version: kamailio 5.3.5 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2414

3 21

git:master:5ea7ca4d: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 02 Aug '20

02 Aug '20

Module: kamailio Branch: master Commit: 5ea7ca4d6408f0bdb10afe12ece44d8b51dd1514 URL: https://github.com/kamailio/kamailio/commit/5ea7ca4d6408f0bdb10afe12ece44d8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-08-02T17:16:16+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/5ea7ca4d6408f0bdb10afe12ece44d8… Patch: https://github.com/kamailio/kamailio/commit/5ea7ca4d6408f0bdb10afe12ece44d8…

1 0

git:master:dfa16778: textopsx: docs for change_reply_status_code() function
by Daniel-Constantin Mierla 02 Aug '20

02 Aug '20

Module: kamailio Branch: master Commit: dfa1677800a6b78aabaa1217869d23fac5e1a345 URL: https://github.com/kamailio/kamailio/commit/dfa1677800a6b78aabaa1217869d23f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-02T17:08:49+02:00 textopsx: docs for change_reply_status_code() function --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/dfa1677800a6b78aabaa1217869d23f… Patch: https://github.com/kamailio/kamailio/commit/dfa1677800a6b78aabaa1217869d23f… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 717b8ddb40..0ef8dab411 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -82,6 +82,38 @@ reply_route { exit; } } +... + </programlisting> + </example> + </section> + + <section id="textopsx.f.change_reply_status_code"> + <title> + <function>change_reply_status_code(vcode)</function> + </title> + <para> + Change the status code for a SIP reply . + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>vcode</emphasis> - the new status code. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ONREPLY_ROUTE. + </para> + <example> + <title><function>change_reply_status_code</function> usage</title> + <programlisting> +... +reply_route { + if (status == "604") { + change_reply_status_code("404"); + exit; + } +} ... </programlisting> </example>

1 0

git:master:7b95ddda: textopsx: added change_reply_status_code(vcode)
by Daniel-Constantin Mierla 02 Aug '20

02 Aug '20

Module: kamailio Branch: master Commit: 7b95ddda1346faea64a85c2593a9a579ea46a5da URL: https://github.com/kamailio/kamailio/commit/7b95ddda1346faea64a85c2593a9a57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-02T17:08:49+02:00 textopsx: added change_reply_status_code(vcode) - function to change only the status code for non-2xx replies --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7b95ddda1346faea64a85c2593a9a57… Patch: https://github.com/kamailio/kamailio/commit/7b95ddda1346faea64a85c2593a9a57… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 1452e1c3d1..4602977264 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -50,6 +50,8 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2); static int change_reply_status_f(sip_msg_t *, char *, char *); static int change_reply_status_fixup(void **param, int param_no); +static int change_reply_status_code_f(sip_msg_t *, char *, char *); + static int w_keep_hf_f(sip_msg_t *, char *, char *); static int w_fnmatch2_f(sip_msg_t *, char *, char *); @@ -84,6 +86,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE | ONREPLY_ROUTE}, {"change_reply_status", change_reply_status_f, 2, change_reply_status_fixup, 0, ONREPLY_ROUTE}, + {"change_reply_status_code", change_reply_status_code_f, 1, + fixup_igp_null, 0, ONREPLY_ROUTE}, {"remove_body", (cmd_function)w_remove_body_f, 0, 0, 0, ANY_ROUTE}, {"keep_hf", (cmd_function)w_keep_hf_f, 0, fixup_regexp_null, 0, ANY_ROUTE}, {"keep_hf", (cmd_function)w_keep_hf_f, 1, fixup_regexp_null, 0, ANY_ROUTE}, @@ -275,6 +279,49 @@ static int change_reply_status_f( } +/** + * + */ +static int ki_change_reply_status_code(sip_msg_t *msg, int code) +{ + if((code < 100) || (code > 699)) { + LM_ERR("wrong status code: %d\n", code); + return -1; + } + + if(((code < 300) || (msg->REPLY_STATUS < 300)) + && (code / 100 != msg->REPLY_STATUS / 100)) { + LM_ERR("the class of provisional or " + "positive final replies cannot be changed\n"); + return -1; + } + + /* rewrite the status code directly in the message buffer */ + msg->first_line.u.reply.statuscode = code; + msg->first_line.u.reply.status.s[2] = code % 10 + '0'; + code /= 10; + msg->first_line.u.reply.status.s[1] = code % 10 + '0'; + code /= 10; + msg->first_line.u.reply.status.s[0] = code + '0'; + + return 1l; +} + +/** + * + */ +static int change_reply_status_code_f(sip_msg_t *msg, char *pcode, char *p2) +{ + int code; + + if(fixup_get_ivalue(msg, (gparam_t*)pcode, &code)<0) { + LM_ERR("cannot get parameters\n"); + return -1; + } + + return ki_change_reply_status_code(msg, code); +} + /** * */ @@ -2195,6 +2242,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("change_reply_status_code"), + SR_KEMIP_INT, ki_change_reply_status_code, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textopsx"), str_init("keep_hf"), SR_KEMIP_INT, ki_keep_hf, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:bddf16db: db_text: free pointer in case of error
by Daniel-Constantin Mierla 02 Aug '20

02 Aug '20

Module: kamailio Branch: master Commit: bddf16db74ea779bb01805fc2cbabfdaf8f4d62b URL: https://github.com/kamailio/kamailio/commit/bddf16db74ea779bb01805fc2cbabfd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-02T17:08:49+02:00 db_text: free pointer in case of error --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/bddf16db74ea779bb01805fc2cbabfd… Patch: https://github.com/kamailio/kamailio/commit/bddf16db74ea779bb01805fc2cbabfd… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index d6d9d73f21..1e5dd01514 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -100,6 +100,7 @@ db1_con_t* dbt_init(const str* _sqlurl) if (!DBT_CON_CONNECTION(_res)) { LM_ERR("cannot get the link to database\n"); + pkg_free(_res); return NULL; }

1 0

git:master:6ce5c0bd: xcap_server: check before going to the end of the buffer
by Daniel-Constantin Mierla 02 Aug '20

02 Aug '20

Module: kamailio Branch: master Commit: 6ce5c0bdf136ecffd7917f2d60093e1b2c49fa54 URL: https://github.com/kamailio/kamailio/commit/6ce5c0bdf136ecffd7917f2d60093e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-02T17:08:49+02:00 xcap_server: check before going to the end of the buffer - use marcros to set and restore char for ending 0 --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/6ce5c0bdf136ecffd7917f2d60093e1… Patch: https://github.com/kamailio/kamailio/commit/6ce5c0bdf136ecffd7917f2d60093e1… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index ec4a3d1975..1556aa14b9 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -321,14 +321,12 @@ int xcaps_xpath_hack(str *buf, int type) } start = buf->s; - c = buf->s[buf->len-1]; - buf->s[buf->len-1] = '\0'; - while((p = strstr(start, match))!=NULL) - { + STR_VTOZ(buf->s[buf->len-1], c); + while((start < buf->s + buf->len - 8) && (p = strstr(start, match))!=NULL) { memcpy(p, repl, 7); start = p + 7; } - buf->s[buf->len-1] = c; + STR_ZTOV(buf->s[buf->len-1], c); return 0; }

1 0

git:5.4:73c97ee8: pua: update_version_puadb() use pres_id to select record
by Victor Seva 01 Aug '20

01 Aug '20

Module: kamailio Branch: 5.4 Commit: 73c97ee8ca89bea202b09f6b75722396fbe05ba6 URL: https://github.com/kamailio/kamailio/commit/73c97ee8ca89bea202b09f6b7572239… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:44:00+02:00 pua: update_version_puadb() use pres_id to select record * only relevant when db_mode is PUA_DB_ONLY * call_id/to_tag/from_tag values can be "", for instance with DIALOG_PUBLISH.* records. Then **ALL** records get version field update * update_vesion_puadb() is called from send_publish() and pres->id value is valid after a call to get_record_puadb() related to #2414 (cherry picked from commit e4aed5c272c8144dd1ddf58163c3ba501bb46a5b) --- Modified: src/modules/pua/pua_db.c --- Diff: https://github.com/kamailio/kamailio/commit/73c97ee8ca89bea202b09f6b7572239… Patch: https://github.com/kamailio/kamailio/commit/73c97ee8ca89bea202b09f6b7572239… --- diff --git a/src/modules/pua/pua_db.c b/src/modules/pua/pua_db.c index 9a5c34b8ec..9f9b36cab4 100644 --- a/src/modules/pua/pua_db.c +++ b/src/modules/pua/pua_db.c @@ -1485,8 +1485,8 @@ int update_contact_puadb(ua_pres_t *pres, str *contact) int update_version_puadb(ua_pres_t *pres) { - db_key_t q_cols[3], db_cols[1]; - db_val_t q_vals[3], db_vals[1]; + db_key_t q_cols[1], db_cols[1]; + db_val_t q_vals[1], db_vals[1]; int n_query_cols= 0, n_update_cols=0; if (pres==NULL) @@ -1496,22 +1496,10 @@ int update_version_puadb(ua_pres_t *pres) } /* cols and values used for search query */ - q_cols[n_query_cols] = &str_call_id_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->call_id; - n_query_cols++; - - q_cols[n_query_cols] = &str_to_tag_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->to_tag; - n_query_cols++; - - q_cols[n_query_cols] = &str_from_tag_col; + q_cols[n_query_cols] = &str_pres_id_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->from_tag; + q_vals[n_query_cols].val.str_val = pres->id; n_query_cols++; /* we overwrite contact even if not changed */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2020