- sr-dev - kamailio.org

Still Failing: kamailio/kamailio#6670 (master - c571efe)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6670 Status: Still Failing Duration: 6 mins and 3 secs Commit: c571efe (master) Author: Daniel-Constantin Mierla Message: smsops: free after error log message printing a field View the changeset: https://github.com/kamailio/kamailio/compare/372993c82d2e...c571efefebc3 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456861437?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:c571efef: smsops: free after error log message printing a field
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: c571efefebc305b2049eb55458cb0ac1dc3202bb URL: https://github.com/kamailio/kamailio/commit/c571efefebc305b2049eb55458cb0ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:47:58+01:00 smsops: free after error log message printing a field --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/c571efefebc305b2049eb55458cb0ac… Patch: https://github.com/kamailio/kamailio/commit/c571efefebc305b2049eb55458cb0ac… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 8150d081d6..8df667bb77 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -564,9 +564,9 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Check for malicious length, which might cause buffer overflow if(udh_read + ie->data.len + 2 /* two octets are read so far */ > udh_len) { - pkg_free(ie); LM_ERR("IE Lenght for IE id %d is bigger than the remaining User-Data element!\n", ie->identifier); + pkg_free(ie); return -1; }

1 0

Still Failing: kamailio/kamailio#6668 (master - 372993c)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6668 Status: Still Failing Duration: 5 mins and 56 secs Commit: 372993c (master) Author: Daniel-Constantin Mierla Message: tm: t_serial - safety check for searched xavps View the changeset: https://github.com/kamailio/kamailio/compare/78225d064a76...372993c82d2e View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456854246?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:cb8d366d: db_redis: log message if failure to get reply
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: cb8d366d6c5cc9a0af7159e8be65444ac23f47a1 URL: https://github.com/kamailio/kamailio/commit/cb8d366d6c5cc9a0af7159e8be65444… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:19:58+01:00 db_redis: log message if failure to get reply --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/cb8d366d6c5cc9a0af7159e8be65444… Patch: https://github.com/kamailio/kamailio/commit/cb8d366d6c5cc9a0af7159e8be65444… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index e030472d9e..6743a97cf1 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -394,7 +394,9 @@ void db_redis_consume_replies(km_redis_con_t *con) { redis_key_t *query; while (con->append_counter > 0 && con->con && !con->con->err) { LM_DBG("consuming outstanding reply %u", con->append_counter); - db_redis_get_reply(con, (void**)&reply); + if(db_redis_get_reply(con, (void**)&reply) != REDIS_OK) { + LM_DBG("failure to get the reply\n"); + } if (reply) { freeReplyObject(reply); reply = NULL;

1 0

git:master:372993c8: tm: t_serial - safety check for searched xavps
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 372993c82d2ebdafe9f7e1a672a3e3141a8ae2f5 URL: https://github.com/kamailio/kamailio/commit/372993c82d2ebdafe9f7e1a672a3e31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:24:39+01:00 tm: t_serial - safety check for searched xavps --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/372993c82d2ebdafe9f7e1a672a3e31… Patch: https://github.com/kamailio/kamailio/commit/372993c82d2ebdafe9f7e1a672a3e31… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index 8f8ee0646d..68b8afc1c3 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -599,10 +599,18 @@ int ki_t_next_contacts(struct sip_msg* msg) xavp_rm(prev_xavp, NULL); vavp = xavp_get(&q_flag_name, xavp->val.v.xavp); - q_flag = vavp->val.v.i; + if(vavp) { + q_flag = vavp->val.v.i; + } else { + q_flag = 0; + } vavp = xavp_get(&uri_name, xavp->val.v.xavp); - uri = vavp->val.v.s; + if(vavp) { + uri = vavp->val.v.s; + } else { + uri.len = 0; + } vavp = xavp_get(&dst_uri_name, xavp->val.v.xavp); if (vavp != NULL) {

1 0

Still Failing: kamailio/kamailio#6667 (master - 78225d0)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6667 Status: Still Failing Duration: 6 mins and 16 secs Commit: 78225d0 (master) Author: Daniel-Constantin Mierla Message: htable: use local variable for name in log message instead of null htable pointer View the changeset: https://github.com/kamailio/kamailio/compare/f465d2410084...78225d064a76 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456850836?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:78225d06: htable: use local variable for name in log message instead of null htable pointer
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 78225d064a76a5d5a3dbd198a4ae38f6423dd272 URL: https://github.com/kamailio/kamailio/commit/78225d064a76a5d5a3dbd198a4ae38f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:10:46+01:00 htable: use local variable for name in log message instead of null htable pointer --- Modified: src/modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/78225d064a76a5d5a3dbd198a4ae38f… Patch: https://github.com/kamailio/kamailio/commit/78225d064a76a5d5a3dbd198a4ae38f… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 33dd72e8d4..d5ff1af645 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -576,11 +576,15 @@ int ht_dmq_handle_sync(srjson_doc_t* jdoc) { } ht = ht_get_table(&htname); - if(ht==NULL) - LM_WARN("unable to get table %.*s\n", ht->name.len, ht->name.s); + if(ht==NULL) { + LM_WARN("unable to get table %.*s\n", + htname.len, (htname.s)?htname.s:""); + } - if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) - LM_WARN("unable to set cell %.*s in table %.*s\n", cname.len, cname.s, ht->name.len, ht->name.s); + if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { + LM_WARN("unable to set cell %.*s in table %.*s\n", + cname.len, cname.s, ht->name.len, ht->name.s); + } cell = cell->next; }

1 0

git:master:e0256096: htable: init vars in ht_dmq_handle_sync() to avoid compile warnings
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: e0256096742a1f86e571949a5ffcf5e453401977 URL: https://github.com/kamailio/kamailio/commit/e0256096742a1f86e571949a5ffcf5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:07:33+01:00 htable: init vars in ht_dmq_handle_sync() to avoid compile warnings --- Modified: src/modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e0256096742a1f86e571949a5ffcf5e… Patch: https://github.com/kamailio/kamailio/commit/e0256096742a1f86e571949a5ffcf5e… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index f1fe069f17..33dd72e8d4 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -537,17 +537,16 @@ int ht_dmq_send_sync(dmq_node_t* node) { int ht_dmq_handle_sync(srjson_doc_t* jdoc) { LM_DBG("handling sync\n"); - srjson_t* cells; - srjson_t* cell; - srjson_t* it; - str htname; - str cname; - int type; - int_str val; - int expire; - ht_t* ht; - time_t now; - + srjson_t* cells = NULL; + srjson_t* cell = NULL; + srjson_t* it = NULL; + str htname = STR_NULL; + str cname = STR_NULL; + int type = 0; + int_str val = {0}; + int expire = 0; + ht_t* ht = NULL; + time_t now = 0; cells = jdoc->root->child; cell = cells->child;

1 0

[kamailio/kamailio] dispatcher : xavp_get fix in ds_update_dst (#1725)
by lazedo 17 Nov '18

17 Nov '18

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1725 -- Commit Summary -- * dispatcher : xavp_get fix in ds_update_dst -- File Changes -- M src/modules/dispatcher/dispatch.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1725.patch https://github.com/kamailio/kamailio/pull/1725.diff -- 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/pull/1725

3 5

Still Failing: kamailio/kamailio#6665 (master - f465d24)
by Travis CI 16 Nov '18

16 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6665 Status: Still Failing Duration: 6 mins and 25 secs Commit: f465d24 (master) Author: Daniel-Constantin Mierla Message: dispatcher: search in xavp sublist for ds_update_dst() attributes - safety checks for type of the value for root xavp - related to GH #1725 View the changeset: https://github.com/kamailio/kamailio/compare/aaabbc1adbd1...f465d2410084 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456029532?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:d33ee59b: websocket: aligned example statements
by Daniel-Constantin Mierla 16 Nov '18

16 Nov '18

Module: kamailio Branch: master Commit: d33ee59bc807acf95b07838d24b888b14a286ddd URL: https://github.com/kamailio/kamailio/commit/d33ee59bc807acf95b07838d24b888b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-16T10:37:19+01:00 websocket: aligned example statements - few more details about return code of handshake process --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d33ee59bc807acf95b07838d24b888b… Patch: https://github.com/kamailio/kamailio/commit/d33ee59bc807acf95b07838d24b888b… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 055498862e..338d37ef22 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -90,13 +90,13 @@ event_route[xhttp:request] { # Optional... perform HTTP authentication # ws_handle_handshake() exits (no further configuration file - # processing of the request) when complete. + # processing of the request) when complete in case of failure. if (ws_handle_handshake()) - { - # Optional... cache some information about the - # successful connection - exit; - } + { + # Optional... cache some information about the + # successful connection + exit; + } } xhttp_reply("404", "Not found", "", ""); @@ -181,9 +181,9 @@ route[WITHINDLG] { onreply_route[WS_REPLY] { if (nat_uac_test(64)) { # Do NAT traversal stuff for replies to a WebSocket connection - # - even if it is not behind a NAT! + # - even if it is not behind a NAT! # This won't be needed in the future if Kamailio and the - # WebSocket client support Outbound and Path. + # WebSocket client support Outbound and Path. add_contact_alias(); } } @@ -491,7 +491,8 @@ end <para>This function can be used from ANY_ROUTE (but will only work in <emphasis>event_route[xhttp:request]</emphasis>).</para> <note><para>This function returns 0, stopping all further - processing of the request, when there is a problem.</para></note> + processing of the request, when there is a problem. Otherwise, it + returns 1 (or positive number) in case of success.</para></note> <example> <title><function>ws_handle_handshake</function> usage</title> <programlisting format="linespecific">

1 0

git:master:f465d241: dispatcher: search in xavp sublist for ds_update_dst() attributes
by Daniel-Constantin Mierla 16 Nov '18

16 Nov '18

Module: kamailio Branch: master Commit: f465d2410084ba9118c1f2610fbefa6989974ce9 URL: https://github.com/kamailio/kamailio/commit/f465d2410084ba9118c1f2610fbefa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-16T16:37:06+01:00 dispatcher: search in xavp sublist for ds_update_dst() attributes - safety checks for type of the value for root xavp - related to GH #1725 --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f465d2410084ba9118c1f2610fbefa6… Patch: https://github.com/kamailio/kamailio/commit/f465d2410084ba9118c1f2610fbefa6… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b5677af058..80540ee6ba 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2286,7 +2286,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } rxavp = xavp_get(&ds_xavp_dst, NULL); - if(rxavp == NULL) { + if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); return -1; } @@ -2297,12 +2297,14 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) xavp_rm(rxavp, NULL); rxavp = xavp_get(&ds_xavp_dst, NULL); - if(rxavp == NULL) { + if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with next destination record\n"); return -1; } } + /* retrieve attributes from sub list */ + rxavp = rxavp->val.v.xavp; lxavp = xavp_get(&ds_xavp_dst_sock, rxavp); if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_VPTR) { LM_DBG("socket enforced in next destination record\n");

1 0

[CRON] Broken: dbank888/kamailio#6 (master - 491e19e)
by Travis CI 15 Nov '18

15 Nov '18

Build Update for dbank888/kamailio ------------------------------------- Build: #6 Status: Broken Duration: 7 mins and 18 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/dbank888/kamailio/builds/455683268?utm_medium=notific… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[kamailio/kamailio] OBS Kamailio 5.0.7 RPM dependency on lib ims (#1721)
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

### Description It was reported that using the RPM for v5.0.7 from opensuse build service is getting an error on dependency for internal lib ims. Getting the rpm from: * http://download.opensuse.org/repositories/home:/kamailio:/v5.0.x-rpms/RHEL_… Then: ``` rpm -ivh kamailio-5.0.7-8.el7.x86_64.rpm warning: kamailio-5.0.7-8.el7.x86_64.rpm: Header V3 DSA/SHA1 Signature, key ID 941fdbdd: NOKEY error: Failed dependencies: libkamailio_ims.so.0()(64bit) is needed by kamailio-5.0.7-8.el7.x86_64 ``` ### Troubleshooting #### Reproduction See above. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.0.7, but can be the same for 5.1 or newer. ``` * **Operating System**: ``` RHEL 7, but can be the same for other OSes ``` -- 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/1721

2 9

Broken: sergey-safarov/kamailio#80 (master - aaabbc1)
by Travis CI 15 Nov '18

15 Nov '18

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #80 Status: Broken Duration: 6 mins and 12 secs Commit: aaabbc1 (master) Author: Daniel-Constantin Mierla Message: kamctl: new update to the sql creation scripts View the changeset: https://github.com/sergey-safarov/kamailio/compare/331f55077a24...aaabbc1ad… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/455427908?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:5.0:1d8e51cb: pkg/kamailio/obs: relocated ims_ocs moddule into kamailio-ims rpm package #1721
by Sergey Safarov 15 Nov '18

15 Nov '18

Module: kamailio Branch: 5.0 Commit: 1d8e51cb544d18e4d8810aee56ab9cac2c8f3e4f URL: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9ca… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-14T23:40:19+03:00 pkg/kamailio/obs: relocated ims_ocs moddule into kamailio-ims rpm package #1721 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9ca… Patch: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9ca… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7cc9fcf700..44cf481f66 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1110,7 +1110,6 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc -%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1248,7 +1247,6 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so -%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -1461,6 +1459,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_dialog %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf @@ -1477,6 +1476,7 @@ fi %{_libdir}/kamailio/modules/ims_dialog.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so

2 2

Broken: kamailio/kamailio#6661 (master - aaabbc1)
by Travis CI 15 Nov '18

15 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6661 Status: Broken Duration: 8 mins and 46 secs Commit: aaabbc1 (master) Author: Daniel-Constantin Mierla Message: kamctl: new update to the sql creation scripts View the changeset: https://github.com/kamailio/kamailio/compare/89fcea29b43b...aaabbc1adbd1 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/455386941?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Broken: kamailio/kamailio#6660 (master - 89fcea2)
by Travis CI 15 Nov '18

15 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6660 Status: Broken Duration: 6 mins and 9 secs Commit: 89fcea2 (master) Author: Daniel-Constantin Mierla Message: kamctl: regenerated the sql creation scripts View the changeset: https://github.com/kamailio/kamailio/compare/2abaab52b94b...89fcea29b43b View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/455385969?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:aaabbc1a: kamctl: new update to the sql creation scripts
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

Module: kamailio Branch: master Commit: aaabbc1adbd11724031c54137cd00ef01af3962a URL: https://github.com/kamailio/kamailio/commit/aaabbc1adbd11724031c54137cd00ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-15T09:37:04+01:00 kamctl: new update to the sql creation scripts --- Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/aaabbc1adbd11724031c54137cd00ef… Patch: https://github.com/kamailio/kamailio/commit/aaabbc1adbd11724031c54137cd00ef… --- diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index 3ee28edca6..97cac9d6d4 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -77,7 +77,7 @@ CREATE TABLE xcap ( domain VARCHAR(64) NOT NULL, doc BLOB NOT NULL, doc_type INTEGER NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, source INTEGER NOT NULL, doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, @@ -98,7 +98,7 @@ CREATE TABLE pua ( expires INTEGER NOT NULL, desired_expires INTEGER NOT NULL, flag INTEGER NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, tuple_id VARCHAR(64), watcher_uri VARCHAR(128) NOT NULL, call_id VARCHAR(255) NOT NULL, diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 9fe9f1c732..a0b4097523 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -77,7 +77,7 @@ CREATE TABLE `xcap` ( `domain` VARCHAR(64) NOT NULL, `doc` MEDIUMBLOB NOT NULL, `doc_type` INT(11) NOT NULL, - `etag` VARCHAR(64) NOT NULL, + `etag` VARCHAR(128) NOT NULL, `source` INT(11) NOT NULL, `doc_uri` VARCHAR(255) NOT NULL, `port` INT(11) NOT NULL, @@ -98,7 +98,7 @@ CREATE TABLE `pua` ( `expires` INT(11) NOT NULL, `desired_expires` INT(11) NOT NULL, `flag` INT(11) NOT NULL, - `etag` VARCHAR(64) NOT NULL, + `etag` VARCHAR(128) NOT NULL, `tuple_id` VARCHAR(64), `watcher_uri` VARCHAR(128) NOT NULL, `call_id` VARCHAR(255) NOT NULL, diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 46361da72e..35a6f062ea 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -101,7 +101,7 @@ CREATE TABLE xcap ( domain VARCHAR2(64), doc BLOB, doc_type NUMBER(10), - etag VARCHAR2(64), + etag VARCHAR2(128), source NUMBER(10), doc_uri VARCHAR2(255), port NUMBER(10), @@ -130,7 +130,7 @@ CREATE TABLE pua ( expires NUMBER(10), desired_expires NUMBER(10), flag NUMBER(10), - etag VARCHAR2(64), + etag VARCHAR2(128), tuple_id VARCHAR2(64), watcher_uri VARCHAR2(128), call_id VARCHAR2(255), diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index b0c7939868..729fb6a37e 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -77,7 +77,7 @@ CREATE TABLE xcap ( domain VARCHAR(64) NOT NULL, doc BYTEA NOT NULL, doc_type INTEGER NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, source INTEGER NOT NULL, doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, @@ -98,7 +98,7 @@ CREATE TABLE pua ( expires INTEGER NOT NULL, desired_expires INTEGER NOT NULL, flag INTEGER NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, tuple_id VARCHAR(64), watcher_uri VARCHAR(128) NOT NULL, call_id VARCHAR(255) NOT NULL,

1 0

git:master:01ba0f33: lib/srdb1: schema - use etag size entity also for pua and xcap tables
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

Module: kamailio Branch: master Commit: 01ba0f334b5a3c2f9cbd5c746c18ac65ecdf44be URL: https://github.com/kamailio/kamailio/commit/01ba0f334b5a3c2f9cbd5c746c18ac6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-15T09:36:32+01:00 lib/srdb1: schema - use etag size entity also for pua and xcap tables --- Modified: src/lib/srdb1/schema/pr_pua.xml Modified: src/lib/srdb1/schema/pr_xcap.xml --- Diff: https://github.com/kamailio/kamailio/commit/01ba0f334b5a3c2f9cbd5c746c18ac6… Patch: https://github.com/kamailio/kamailio/commit/01ba0f334b5a3c2f9cbd5c746c18ac6… --- diff --git a/src/lib/srdb1/schema/pr_pua.xml b/src/lib/srdb1/schema/pr_pua.xml index 2a1c471f3b..1a0e8a6189 100644 --- a/src/lib/srdb1/schema/pr_pua.xml +++ b/src/lib/srdb1/schema/pr_pua.xml @@ -80,7 +80,7 @@ <column id="etag"> <name>etag</name> <type>string</type> - <size>&domain_len;</size> + <size>&etag_len;</size> <description>Etag</description> </column> diff --git a/src/lib/srdb1/schema/pr_xcap.xml b/src/lib/srdb1/schema/pr_xcap.xml index df54fc0bff..2eb1fc1a90 100644 --- a/src/lib/srdb1/schema/pr_xcap.xml +++ b/src/lib/srdb1/schema/pr_xcap.xml @@ -64,7 +64,7 @@ <column id="etag"> <name>etag</name> <type>string</type> - <size>&user_len;</size> + <size>&etag_len;</size> <description>Document Etag</description> </column>

1 0

git:master:117051c6: lib/srdb1: added entities to define the size for event and etag columns
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

Module: kamailio Branch: master Commit: 117051c695c815ab40b34c21c852a34386022116 URL: https://github.com/kamailio/kamailio/commit/117051c695c815ab40b34c21c852a34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-15T09:34:26+01:00 lib/srdb1: added entities to define the size for event and etag columns - etag column size set to 128 (it was 64, but some UAs generate a longer one) --- Modified: src/lib/srdb1/schema/entities.xml Modified: src/lib/srdb1/schema/pr_presentity.xml --- Diff: https://github.com/kamailio/kamailio/commit/117051c695c815ab40b34c21c852a34… Patch: https://github.com/kamailio/kamailio/commit/117051c695c815ab40b34c21c852a34… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 506771361b..819fa74c3a 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -22,6 +22,8 @@ <!ENTITY expires_len "11"> <!ENTITY flag_len "11"> <!ENTITY description_len "255"> +<!ENTITY event_len "64"> +<!ENTITY etag_len "128"> <!ENTITY MYSQL_TABLE_TYPE ""> <!ENTITY USERCOL "username"> <!ENTITY DEFAULT_ALIASES_EXPIRES "2030-05-28 21:32:15"> diff --git a/src/lib/srdb1/schema/pr_presentity.xml b/src/lib/srdb1/schema/pr_presentity.xml index d06a1361e4..56a8044c23 100644 --- a/src/lib/srdb1/schema/pr_presentity.xml +++ b/src/lib/srdb1/schema/pr_presentity.xml @@ -51,7 +51,7 @@ <column id="event"> <name>event</name> <type>string</type> - <size>&user_len;</size> + <size>&event_len;</size> <description>Event</description> <natural/> </column> @@ -59,8 +59,8 @@ <column id="etag"> <name>etag</name> <type>string</type> - <size>&user_len;</size> - <description>User name</description> + <size>&etag_len;</size> + <description>Etag attribute</description> </column> <column id="expires">

1 0

git:master:89fcea29: kamctl: regenerated the sql creation scripts
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

Module: kamailio Branch: master Commit: 89fcea29b43b3d456ce23ba31bf902add070c223 URL: https://github.com/kamailio/kamailio/commit/89fcea29b43b3d456ce23ba31bf902a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-15T09:34:26+01:00 kamctl: regenerated the sql creation scripts --- Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/89fcea29b43b3d456ce23ba31bf902a… Patch: https://github.com/kamailio/kamailio/commit/89fcea29b43b3d456ce23ba31bf902a… --- diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index df121b96d5..3ee28edca6 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -3,7 +3,7 @@ CREATE TABLE presentity ( username VARCHAR(64) NOT NULL, domain VARCHAR(64) NOT NULL, event VARCHAR(64) NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, expires INTEGER NOT NULL, received_time INTEGER NOT NULL, body BLOB NOT NULL, diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index d5fcc72770..9fe9f1c732 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -3,7 +3,7 @@ CREATE TABLE `presentity` ( `username` VARCHAR(64) NOT NULL, `domain` VARCHAR(64) NOT NULL, `event` VARCHAR(64) NOT NULL, - `etag` VARCHAR(64) NOT NULL, + `etag` VARCHAR(128) NOT NULL, `expires` INT(11) NOT NULL, `received_time` INT(11) NOT NULL, `body` BLOB NOT NULL, diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index ddcf6dcb63..46361da72e 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -3,7 +3,7 @@ CREATE TABLE presentity ( username VARCHAR2(64), domain VARCHAR2(64), event VARCHAR2(64), - etag VARCHAR2(64), + etag VARCHAR2(128), expires NUMBER(10), received_time NUMBER(10), body BLOB, diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 943aac0bd6..b0c7939868 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -3,7 +3,7 @@ CREATE TABLE presentity ( username VARCHAR(64) NOT NULL, domain VARCHAR(64) NOT NULL, event VARCHAR(64) NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, expires INTEGER NOT NULL, received_time INTEGER NOT NULL, body BYTEA NOT NULL,

1 0

git:master:5ecd43c1: rtp_media_server: add missing external dependence bcunit to doc
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: 5ecd43c19e5d3a41c33fe93c69616d26d0779c57 URL: https://github.com/kamailio/kamailio/commit/5ecd43c19e5d3a41c33fe93c69616d2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:17:51+01:00 rtp_media_server: add missing external dependence bcunit to doc --- Modified: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5ecd43c19e5d3a41c33fe93c69616d2… Patch: https://github.com/kamailio/kamailio/commit/5ecd43c19e5d3a41c33fe93c69616d2… --- diff --git a/src/modules/rtp_media_server/doc/rtp_media_server_admin.xml b/src/modules/rtp_media_server/doc/rtp_media_server_admin.xml index 8ce4c97997..ce9f175344 100644 --- a/src/modules/rtp_media_server/doc/rtp_media_server_admin.xml +++ b/src/modules/rtp_media_server/doc/rtp_media_server_admin.xml @@ -67,6 +67,15 @@ Mediastreamer2 is a powerful and lightweight streaming engine specialized for voice/video telephony applications. </para> </listitem> + <listitem> + <para> + <emphasis>bcunit</emphasis> git clone https://github.com/BelledonneCommunications/bcunit.git + </para> + <para> + fork of the defunct project CUnit, with several fixes and patches applied. + CUnit is a Unit testing framework for C. + </para> + </listitem> </itemizedlist> </section> </section>

2 1

git:master:b4aef50e: rtp_media_server: initial creation of README file
by Henning Westerholt 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: b4aef50ef2386e92c8c0bb1ad6232ae009d6621c URL: https://github.com/kamailio/kamailio/commit/b4aef50ef2386e92c8c0bb1ad6232ae… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-13T21:47:56+01:00 rtp_media_server: initial creation of README file --- Added: src/modules/rtp_media_server/README --- Diff: https://github.com/kamailio/kamailio/commit/b4aef50ef2386e92c8c0bb1ad6232ae… Patch: https://github.com/kamailio/kamailio/commit/b4aef50ef2386e92c8c0bb1ad6232ae…

3 10

[kamailio/kamailio] erlang: build fails on alpha (#1373)
by Victor Seva 14 Nov '18

14 Nov '18

>From 5.1.0 official Debian build ``` /usr/bin/make every-module group_include="kerlang" quiet=verbose make[1]: Entering directory '/<<PKGBUILDDIR>>' /usr/bin/make -C src/ every-module make[2]: Entering directory '/<<PKGBUILDDIR>>/src' config.mak loaded Makefile.defs defs skipped Makefile.defs defs skipped Makefile.defs defs skipped beam.smp: allocatestack.c:480: allocate_stack: Assertion `size != 0' failed. Aborted beam.smp: allocatestack.c:480: allocate_stack: Assertion `size != 0' failed. Aborted Makefile:16: *** Not found Erlang. Stop. ``` -- 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/1373

3 3

git:5.2:ee66571f: pkg/kamailio/obs: Fixed build on OpenSUSE dists
by Sergey Safarov 14 Nov '18

14 Nov '18

Module: kamailio Branch: 5.2 Commit: ee66571fe0556f6800629310507831acd6992911 URL: https://github.com/kamailio/kamailio/commit/ee66571fe0556f6800629310507831a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-14T14:31:11+03:00 pkg/kamailio/obs: Fixed build on OpenSUSE dists (cherry picked from commit af59382f6cb356087efd6eded5c28e2d228a7032) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ee66571fe0556f6800629310507831a… Patch: https://github.com/kamailio/kamailio/commit/ee66571fe0556f6800629310507831a… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6538f46c7d..c8327dd3d4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -184,12 +184,20 @@ %define _sharedstatedir /var/lib %endif +# Defining missing macros on OpenSUSE Leap +%if 0%{?suse_version} == 1315 +%define _fillupdir /var/adm/fillup-templates +%endif +%if 0%{?suse_version} == 1330 +%define _fillupdir /var/adm/fillup-templates +%endif + Summary: Kamailio (former OpenSER) - the Open Source SIP Server Name: %name Version: %ver Release: %rel Packager: Peter Dunkley <peter(a)dunkley.me.uk> -License: GPL +License: GPL-2.0 Group: System Environment/Daemons Source: http://kamailio.org/pub/kamailio/%{ver}/src/%{name}-%{ver}_src.tar.gz URL: http://kamailio.org/ @@ -219,6 +227,7 @@ Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver BuildRequires: bison, flex %if 0%{?suse_version} +Requires: filesystem BuildRequires: systemd-mini, shadow %endif %if 0%{?fedora} == 27 @@ -339,7 +348,7 @@ CPL (Call Processing Language) interpreter for Kamailio. %package crypto -Summary: Module to support cryptographic extensions for use in the Kamailio configuration +Summary: Module to support cryptographic extensions Group: System Environment/Daemons Requires: kamailio = %ver %if 0%{?rhel} == 6 @@ -735,9 +744,12 @@ SCTP transport for Kamailio. %package sipcapture-daemon-config -Summary: reference config for sipcapture daemon +Summary: Reference config for sipcapture daemon Group: System Environment/Daemons Requires: kamailio-sipcapture = %ver +%if 0%{?suse_version} +Requires: filesystem +%endif %description sipcapture-daemon-config reference config for sipcapture daemon. @@ -1140,11 +1152,11 @@ install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %endif %if 0%{?suse_version} -install -d %{buildroot}/var/adm/fillup-templates/ +install -d %{buildroot}%{_fillupdir} install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ - %{buildroot}/var/adm/fillup-templates/sysconfig.kamailio + %{buildroot}%{_fillupdir}/sysconfig.kamailio install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ - %{buildroot}/var/adm/fillup-templates/sysconfig.sipcapture + %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ @@ -1164,7 +1176,7 @@ install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ rm -f %{buildroot}%{_libdir}/kamailio/lib*.so %pre -%if 0%{?suse_version} == 1330 +%if 0%{?suse_version} if ! /usr/bin/getent group daemon &>/dev/null; then /usr/sbin/groupadd --gid 2 daemon &> /dev/null fi @@ -1342,7 +1354,7 @@ fi %config(noreplace) %{_sysconfdir}/kamailio/tls.cfg %dir %attr(-,kamailio,kamailio) %{_sharedstatedir}/kamailio %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.kamailio +%{_fillupdir}/sysconfig.kamailio %else %config %{_sysconfdir}/sysconfig/kamailio %endif @@ -1884,7 +1896,7 @@ fi %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/kamailio/kamailio-sipcapture.cfg %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.sipcapture +%{_fillupdir}/sysconfig.sipcapture %else %config(noreplace) %{_sysconfdir}/sysconfig/sipcapture %endif @@ -2016,7 +2028,7 @@ fi %changelog -* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> +* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-0 - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov <s.safarov(a)gmail.com> - added packaging for Fedora 26 and openSUSE Leap 42.3

1 0

git:5.2:3986987d: pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist
by Sergey Safarov 14 Nov '18

14 Nov '18

Module: kamailio Branch: 5.2 Commit: 3986987d97f34a0ffb11909a947f95dd25a2eabc URL: https://github.com/kamailio/kamailio/commit/3986987d97f34a0ffb11909a947f95d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-14T14:31:19+03:00 pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist (cherry picked from commit e2ef2309aa5ca13b5650d0703f85a02d2846c976) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3986987d97f34a0ffb11909a947f95d… Patch: https://github.com/kamailio/kamailio/commit/3986987d97f34a0ffb11909a947f95d…

1 0

[kamailio/kamailio] RPM spec update (#1715)
by sergey-safarov 14 Nov '18

14 Nov '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Required backport to `5.2` branch. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1715 -- Commit Summary -- * pkg/kamailio/obs: Fixed build on OpenSUSE dists * pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist -- File Changes -- M pkg/kamailio/obs/kamailio.spec (158) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1715.patch https://github.com/kamailio/kamailio/pull/1715.diff -- 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/pull/1715

3 6

git:master:2abaab52: Merge pull request #1715 from sergey-safarov/spec_update11
by GitHub 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: 2abaab52b94b0d3119a2f99f393218cf1d1d4d5b URL: https://github.com/kamailio/kamailio/commit/2abaab52b94b0d3119a2f99f393218c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-14T11:22:08+01:00 Merge pull request #1715 from sergey-safarov/spec_update11 RPM spec update --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2abaab52b94b0d3119a2f99f393218c… Patch: https://github.com/kamailio/kamailio/commit/2abaab52b94b0d3119a2f99f393218c…

1 0

git:master:af59382f: pkg/kamailio/obs: Fixed build on OpenSUSE dists
by Sergey Safarov 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: af59382f6cb356087efd6eded5c28e2d228a7032 URL: https://github.com/kamailio/kamailio/commit/af59382f6cb356087efd6eded5c28e2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-08T12:49:45Z pkg/kamailio/obs: Fixed build on OpenSUSE dists --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/af59382f6cb356087efd6eded5c28e2… Patch: https://github.com/kamailio/kamailio/commit/af59382f6cb356087efd6eded5c28e2… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6538f46c7d..c8327dd3d4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -184,12 +184,20 @@ %define _sharedstatedir /var/lib %endif +# Defining missing macros on OpenSUSE Leap +%if 0%{?suse_version} == 1315 +%define _fillupdir /var/adm/fillup-templates +%endif +%if 0%{?suse_version} == 1330 +%define _fillupdir /var/adm/fillup-templates +%endif + Summary: Kamailio (former OpenSER) - the Open Source SIP Server Name: %name Version: %ver Release: %rel Packager: Peter Dunkley <peter(a)dunkley.me.uk> -License: GPL +License: GPL-2.0 Group: System Environment/Daemons Source: http://kamailio.org/pub/kamailio/%{ver}/src/%{name}-%{ver}_src.tar.gz URL: http://kamailio.org/ @@ -219,6 +227,7 @@ Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver BuildRequires: bison, flex %if 0%{?suse_version} +Requires: filesystem BuildRequires: systemd-mini, shadow %endif %if 0%{?fedora} == 27 @@ -339,7 +348,7 @@ CPL (Call Processing Language) interpreter for Kamailio. %package crypto -Summary: Module to support cryptographic extensions for use in the Kamailio configuration +Summary: Module to support cryptographic extensions Group: System Environment/Daemons Requires: kamailio = %ver %if 0%{?rhel} == 6 @@ -735,9 +744,12 @@ SCTP transport for Kamailio. %package sipcapture-daemon-config -Summary: reference config for sipcapture daemon +Summary: Reference config for sipcapture daemon Group: System Environment/Daemons Requires: kamailio-sipcapture = %ver +%if 0%{?suse_version} +Requires: filesystem +%endif %description sipcapture-daemon-config reference config for sipcapture daemon. @@ -1140,11 +1152,11 @@ install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %endif %if 0%{?suse_version} -install -d %{buildroot}/var/adm/fillup-templates/ +install -d %{buildroot}%{_fillupdir} install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ - %{buildroot}/var/adm/fillup-templates/sysconfig.kamailio + %{buildroot}%{_fillupdir}/sysconfig.kamailio install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ - %{buildroot}/var/adm/fillup-templates/sysconfig.sipcapture + %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ @@ -1164,7 +1176,7 @@ install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ rm -f %{buildroot}%{_libdir}/kamailio/lib*.so %pre -%if 0%{?suse_version} == 1330 +%if 0%{?suse_version} if ! /usr/bin/getent group daemon &>/dev/null; then /usr/sbin/groupadd --gid 2 daemon &> /dev/null fi @@ -1342,7 +1354,7 @@ fi %config(noreplace) %{_sysconfdir}/kamailio/tls.cfg %dir %attr(-,kamailio,kamailio) %{_sharedstatedir}/kamailio %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.kamailio +%{_fillupdir}/sysconfig.kamailio %else %config %{_sysconfdir}/sysconfig/kamailio %endif @@ -1884,7 +1896,7 @@ fi %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/kamailio/kamailio-sipcapture.cfg %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.sipcapture +%{_fillupdir}/sysconfig.sipcapture %else %config(noreplace) %{_sysconfdir}/sysconfig/sipcapture %endif @@ -2016,7 +2028,7 @@ fi %changelog -* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> +* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-0 - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov <s.safarov(a)gmail.com> - added packaging for Fedora 26 and openSUSE Leap 42.3

1 0

git:master:e2ef2309: pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist
by Sergey Safarov 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: e2ef2309aa5ca13b5650d0703f85a02d2846c976 URL: https://github.com/kamailio/kamailio/commit/e2ef2309aa5ca13b5650d0703f85a02… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-08T12:49:54Z pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e2ef2309aa5ca13b5650d0703f85a02… Patch: https://github.com/kamailio/kamailio/commit/e2ef2309aa5ca13b5650d0703f85a02…

1 0

git:5.2:b2b8bc03: kazoo: fix compilation warnings
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: 5.2 Commit: b2b8bc03d0658b0786a72e1e589b8b129ee7599e URL: https://github.com/kamailio/kamailio/commit/b2b8bc03d0658b0786a72e1e589b8b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:58:17+01:00 kazoo: fix compilation warnings > kz_amqp.c:1884:5: warning: variable 'binding' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(bind == NULL) { > ^~~~~~~~~~~~ > kz_amqp.c:1919:5: note: uninitialized use occurs here > if(binding != NULL) > ^~~~~~~ > kz_amqp.c:1884:2: note: remove the 'if' if its condition is always false > if(bind == NULL) { > ^~~~~~~~~~~~~~~~~~ > kz_amqp.c:1896:2: note: variable 'binding' is declared here > kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); > ^ > kz_amqp.c:1965:5: warning: variable 'binding' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(bind == NULL) { > ^~~~~~~~~~~~ > kz_amqp.c:1992:8: note: uninitialized use occurs here > if(binding != NULL) > ^~~~~~~ > kz_amqp.c:1965:2: note: remove the 'if' if its condition is always false > if(bind == NULL) { > ^~~~~~~~~~~~~~~~~~ > kz_amqp.c:1972:2: note: variable 'binding' is declared here > kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); > ^ > kz_amqp.c:2875:5: warning: variable 'json_obj' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(payload == NULL) { > ^~~~~~~~~~~~~~~ > kz_amqp.c:2927:5: note: uninitialized use occurs here > if(json_obj) > ^~~~~~~~ > kz_amqp.c:2875:2: note: remove the 'if' if its condition is always false > if(payload == NULL) { > ^~~~~~~~~~~~~~~~~~~~~ > kz_amqp.c:2880:2: note: variable 'json_obj' is declared here > json_obj_ptr json_obj = kz_json_parse(payload ); > ^ > 3 warnings generated. (cherry picked from commit 232e8400caf7173e73229627af0270a704824f62) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/b2b8bc03d0658b0786a72e1e589b8b1… Patch: https://github.com/kamailio/kamailio/commit/b2b8bc03d0658b0786a72e1e589b8b1… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 36e7ea0843..00c8f3fb77 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1802,10 +1802,10 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) str* event_key = NULL; str* event_subkey = NULL; - - json_obj_ptr json_obj = NULL; struct json_object* tmpObj = NULL; + kz_amqp_bind_ptr bind = NULL; + kz_amqp_binding_ptr binding = NULL; if (fixup_get_svalue(msg, (gparam_p)payload, &payload_s) != 0) { LM_ERR("cannot get payload value\n"); @@ -1880,7 +1880,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) } queue = kz_amqp_queue_from_json(&queue_s, tmpObj); - kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); + bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); if(bind == NULL) { LM_ERR("Could not allocate bind struct\n"); goto error; @@ -1893,7 +1893,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) bind->consistent_worker_key = consistent_worker_key; - kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); + binding = shm_malloc(sizeof(kz_amqp_binding)); if(binding == NULL) { LM_ERR("Could not allocate binding struct\n"); goto error; @@ -1935,7 +1935,8 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange kz_amqp_exchange_ptr exchange_ptr = NULL; kz_amqp_queue_ptr queue_ptr = NULL; kz_amqp_routings_ptr routing_ptr = NULL; - + kz_amqp_bind_ptr bind = NULL; + kz_amqp_binding_ptr binding = NULL; if (fixup_get_svalue(msg, (gparam_p)exchange, &exchange_s) != 0) { LM_ERR("cannot get exchange string value\n"); @@ -1961,7 +1962,7 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange queue_ptr = kz_amqp_queue_new(&queue_s); routing_ptr = kz_amqp_routing_new(routing_key_s.s); - kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange_ptr, NULL, queue_ptr, routing_ptr, NULL, NULL); + bind = kz_amqp_bind_alloc(exchange_ptr, NULL, queue_ptr, routing_ptr, NULL, NULL); if(bind == NULL) { LM_ERR("Could not allocate bind struct\n"); goto error; @@ -1969,7 +1970,7 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange bind->no_ack = 1; - kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); + binding = shm_malloc(sizeof(kz_amqp_binding)); if(binding == NULL) { LM_ERR("Could not allocate binding struct\n"); goto error; @@ -2870,6 +2871,7 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) char* server_id_str = NULL; kz_amqp_cmd_ptr cmd = NULL; json_object* JObj = NULL; + json_obj_ptr json_obj = NULL; char* payload = kz_local_amqp_bytes_dup(body); if(payload == NULL) { @@ -2877,7 +2879,7 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) goto error; } - json_obj_ptr json_obj = kz_json_parse(payload ); + json_obj = kz_json_parse(payload ); if (json_obj == NULL) { LM_ERR("error parsing json payload\n"); goto error;

1 0

git:5.2:e377ec1f: db_berkeley: fix compilation warning
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: 5.2 Commit: e377ec1fb2ce841b0b96c7f9c4cea935ad6f10f6 URL: https://github.com/kamailio/kamailio/commit/e377ec1fb2ce841b0b96c7f9c4cea93… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:58:17+01:00 db_berkeley: fix compilation warning > CC (clang) [M db_berkeley.so] db_berkeley.o > db_berkeley.c:916:5: warning: variable 'dbcp' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if((ret = bdb_get_columns(_tp, _r, 0, 0)) != 0) { > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > db_berkeley.c:966:5: note: uninitialized use occurs here > if(dbcp) > ^~~~ > db_berkeley.c:916:2: note: remove the 'if' if its condition is always false > if((ret = bdb_get_columns(_tp, _r, 0, 0)) != 0) { > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > db_berkeley.c:901:6: warning: variable 'dbcp' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(!lkey) { > ^~~~~ > db_berkeley.c:966:5: note: uninitialized use occurs here > if(dbcp) > ^~~~ > db_berkeley.c:901:3: note: remove the 'if' if its condition is always false > if(!lkey) { > ^~~~~~~~~~~ > db_berkeley.c:875:11: note: initialize the variable 'dbcp' to silence this warning > DBC *dbcp; > ^ > = NULL > 2 warnings generated. (cherry picked from commit 93e0b7e7bcefa900e8686e7e60f1a59cc32f9b39) --- Modified: src/modules/db_berkeley/db_berkeley.c --- Diff: https://github.com/kamailio/kamailio/commit/e377ec1fb2ce841b0b96c7f9c4cea93… Patch: https://github.com/kamailio/kamailio/commit/e377ec1fb2ce841b0b96c7f9c4cea93… --- diff --git a/src/modules/db_berkeley/db_berkeley.c b/src/modules/db_berkeley/db_berkeley.c index c3ea90fc16..80c9aefac0 100644 --- a/src/modules/db_berkeley/db_berkeley.c +++ b/src/modules/db_berkeley/db_berkeley.c @@ -872,7 +872,7 @@ int _bdb_delete_cursor( int ret, klen = MAX_ROW_SIZE; DBT key, data; DB *db; - DBC *dbcp; + DBC *dbcp = NULL; int *lkey = NULL; ret = 0;

1 0

git:master:232e8400: kazoo: fix compilation warnings
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: 232e8400caf7173e73229627af0270a704824f62 URL: https://github.com/kamailio/kamailio/commit/232e8400caf7173e73229627af0270a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:53:06+01:00 kazoo: fix compilation warnings > kz_amqp.c:1884:5: warning: variable 'binding' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(bind == NULL) { > ^~~~~~~~~~~~ > kz_amqp.c:1919:5: note: uninitialized use occurs here > if(binding != NULL) > ^~~~~~~ > kz_amqp.c:1884:2: note: remove the 'if' if its condition is always false > if(bind == NULL) { > ^~~~~~~~~~~~~~~~~~ > kz_amqp.c:1896:2: note: variable 'binding' is declared here > kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); > ^ > kz_amqp.c:1965:5: warning: variable 'binding' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(bind == NULL) { > ^~~~~~~~~~~~ > kz_amqp.c:1992:8: note: uninitialized use occurs here > if(binding != NULL) > ^~~~~~~ > kz_amqp.c:1965:2: note: remove the 'if' if its condition is always false > if(bind == NULL) { > ^~~~~~~~~~~~~~~~~~ > kz_amqp.c:1972:2: note: variable 'binding' is declared here > kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); > ^ > kz_amqp.c:2875:5: warning: variable 'json_obj' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(payload == NULL) { > ^~~~~~~~~~~~~~~ > kz_amqp.c:2927:5: note: uninitialized use occurs here > if(json_obj) > ^~~~~~~~ > kz_amqp.c:2875:2: note: remove the 'if' if its condition is always false > if(payload == NULL) { > ^~~~~~~~~~~~~~~~~~~~~ > kz_amqp.c:2880:2: note: variable 'json_obj' is declared here > json_obj_ptr json_obj = kz_json_parse(payload ); > ^ > 3 warnings generated. --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/232e8400caf7173e73229627af0270a… Patch: https://github.com/kamailio/kamailio/commit/232e8400caf7173e73229627af0270a… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 36e7ea0843..00c8f3fb77 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1802,10 +1802,10 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) str* event_key = NULL; str* event_subkey = NULL; - - json_obj_ptr json_obj = NULL; struct json_object* tmpObj = NULL; + kz_amqp_bind_ptr bind = NULL; + kz_amqp_binding_ptr binding = NULL; if (fixup_get_svalue(msg, (gparam_p)payload, &payload_s) != 0) { LM_ERR("cannot get payload value\n"); @@ -1880,7 +1880,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) } queue = kz_amqp_queue_from_json(&queue_s, tmpObj); - kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); + bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); if(bind == NULL) { LM_ERR("Could not allocate bind struct\n"); goto error; @@ -1893,7 +1893,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) bind->consistent_worker_key = consistent_worker_key; - kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); + binding = shm_malloc(sizeof(kz_amqp_binding)); if(binding == NULL) { LM_ERR("Could not allocate binding struct\n"); goto error; @@ -1935,7 +1935,8 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange kz_amqp_exchange_ptr exchange_ptr = NULL; kz_amqp_queue_ptr queue_ptr = NULL; kz_amqp_routings_ptr routing_ptr = NULL; - + kz_amqp_bind_ptr bind = NULL; + kz_amqp_binding_ptr binding = NULL; if (fixup_get_svalue(msg, (gparam_p)exchange, &exchange_s) != 0) { LM_ERR("cannot get exchange string value\n"); @@ -1961,7 +1962,7 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange queue_ptr = kz_amqp_queue_new(&queue_s); routing_ptr = kz_amqp_routing_new(routing_key_s.s); - kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange_ptr, NULL, queue_ptr, routing_ptr, NULL, NULL); + bind = kz_amqp_bind_alloc(exchange_ptr, NULL, queue_ptr, routing_ptr, NULL, NULL); if(bind == NULL) { LM_ERR("Could not allocate bind struct\n"); goto error; @@ -1969,7 +1970,7 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange bind->no_ack = 1; - kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); + binding = shm_malloc(sizeof(kz_amqp_binding)); if(binding == NULL) { LM_ERR("Could not allocate binding struct\n"); goto error; @@ -2870,6 +2871,7 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) char* server_id_str = NULL; kz_amqp_cmd_ptr cmd = NULL; json_object* JObj = NULL; + json_obj_ptr json_obj = NULL; char* payload = kz_local_amqp_bytes_dup(body); if(payload == NULL) { @@ -2877,7 +2879,7 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) goto error; } - json_obj_ptr json_obj = kz_json_parse(payload ); + json_obj = kz_json_parse(payload ); if (json_obj == NULL) { LM_ERR("error parsing json payload\n"); goto error;

1 0

git:master:93e0b7e7: db_berkeley: fix compilation warning
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: 93e0b7e7bcefa900e8686e7e60f1a59cc32f9b39 URL: https://github.com/kamailio/kamailio/commit/93e0b7e7bcefa900e8686e7e60f1a59… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:41:08+01:00 db_berkeley: fix compilation warning > CC (clang) [M db_berkeley.so] db_berkeley.o > db_berkeley.c:916:5: warning: variable 'dbcp' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if((ret = bdb_get_columns(_tp, _r, 0, 0)) != 0) { > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > db_berkeley.c:966:5: note: uninitialized use occurs here > if(dbcp) > ^~~~ > db_berkeley.c:916:2: note: remove the 'if' if its condition is always false > if((ret = bdb_get_columns(_tp, _r, 0, 0)) != 0) { > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > db_berkeley.c:901:6: warning: variable 'dbcp' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(!lkey) { > ^~~~~ > db_berkeley.c:966:5: note: uninitialized use occurs here > if(dbcp) > ^~~~ > db_berkeley.c:901:3: note: remove the 'if' if its condition is always false > if(!lkey) { > ^~~~~~~~~~~ > db_berkeley.c:875:11: note: initialize the variable 'dbcp' to silence this warning > DBC *dbcp; > ^ > = NULL > 2 warnings generated. --- Modified: src/modules/db_berkeley/db_berkeley.c --- Diff: https://github.com/kamailio/kamailio/commit/93e0b7e7bcefa900e8686e7e60f1a59… Patch: https://github.com/kamailio/kamailio/commit/93e0b7e7bcefa900e8686e7e60f1a59… --- diff --git a/src/modules/db_berkeley/db_berkeley.c b/src/modules/db_berkeley/db_berkeley.c index c3ea90fc16..80c9aefac0 100644 --- a/src/modules/db_berkeley/db_berkeley.c +++ b/src/modules/db_berkeley/db_berkeley.c @@ -872,7 +872,7 @@ int _bdb_delete_cursor( int ret, klen = MAX_ROW_SIZE; DBT key, data; DB *db; - DBC *dbcp; + DBC *dbcp = NULL; int *lkey = NULL; ret = 0;

1 0

[kamailio/kamailio] rtp_media_server: adding module (#1701)
by Julien Chavanton 13 Nov '18

13 Nov '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] New module #### Checklist: Tested with various sofphones : Ekiga, Linphone, CSipSimple #### Description By combining Kamailio, oRTP and mediastreamer2 this module is providing some very good foundation to support RTP endpoint and various media processing features. This seems like a great idea for various use cases like IoT, IVR or other specific needs. Kamailio is handling everything related to SIP/SDP (the module is adding some SDP parsing) as well as providing a scripting engine. oRTP is providing RTP endpoints compliant with (RFC 3550) MediaStreamer2, even if written in C is quite a high level library, because it is implementing a framework for audio processing using graphs of filters, filters can be to do various things. Similar to playing with lego blocks :) * Support for most free and some non free codecs can be added easily. * Work to bridge calls is already in progress in the module. * Mobile phone support ARM CPU * other embedded scenario should be supported * much more ... Mediastream2 is creating one thread per call "msticker", this can work smoothly in Kamailio even if it is forking processes. Shared memory allocation is supported using wrapper around malloc/free used by the libraries. Some extra work that needs to be done shorty * Syncronization with locks is not completed (minor task, only access to a linked list needs to be syncronized properly) * Memory leak not tested properly (not take the time to test with valgrind yet) This project was started last year, I think it is time to submit it, I will surely find the time to do the extra work needed shortly. Example config using the features already implemented ``` event_route[rms:start] { xnotice("[rms:start] play ...\n"); rms_play("/tmp/reference_8000.wav", "rms:after_play"); }; event_route[rms:after_play] { xnotice("[rms:after_play] play done...\n"); rms_hangup(); }; route { if (t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); if (is_method("INVITE") && !has_totag()) { if (!rms_answer()) { t_reply("503", "server error"); } } if (is_method("BYE")){ rms_media_stop(); } } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1701 -- Commit Summary -- * rtp_media_server: adding module -- File Changes -- M src/Makefile.groups (6) A src/modules/rtp_media_server/Makefile (13) A src/modules/rtp_media_server/config_example/kamailio.cfg (56) A src/modules/rtp_media_server/doc/Makefile (4) A src/modules/rtp_media_server/doc/rtp_media_server.xml (42) A src/modules/rtp_media_server/doc/rtp_media_server_admin.xml (193) A src/modules/rtp_media_server/install_bc.sh (45) A src/modules/rtp_media_server/rms_media.c (320) A src/modules/rtp_media_server/rms_media.h (103) A src/modules/rtp_media_server/rms_sdp.c (301) A src/modules/rtp_media_server/rms_sdp.h (45) A src/modules/rtp_media_server/rtp_media_server.c (718) A src/modules/rtp_media_server/rtp_media_server.h (91) A src/modules/rtp_media_server/voice_file/Bach_10s_8000.wav (0) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1701.patch https://github.com/kamailio/kamailio/pull/1701.diff -- 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/pull/1701

4 26

git:master:1d89c0e5: Makefile.groups: added k group for rtp_media_server
by Daniel-Constantin Mierla 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: 1d89c0e5310a4a0d64f9149f4131b45d001cea36 URL: https://github.com/kamailio/kamailio/commit/1d89c0e5310a4a0d64f9149f4131b45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-13T11:15:08+01:00 Makefile.groups: added k group for rtp_media_server - use full module name for list variable --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/1d89c0e5310a4a0d64f9149f4131b45… Patch: https://github.com/kamailio/kamailio/commit/1d89c0e5310a4a0d64f9149f4131b45… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 1e8227dadc..9729cdd1b5 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -208,7 +208,7 @@ mod_list_rabbitmq=rabbitmq mod_list_phonenum=phonenum # - modules depending on oRTP and mediastreamer2 libraries -mod_list_rtp_media=rtp_media_server +mod_list_rtp_media_server=rtp_media_server # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ @@ -243,7 +243,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_http_async) $(mod_list_nsq) \ $(mod_list_rabbitmq) $(mod_list_jsdt)) \ $(mod_list_phonenum) \ - $(mod_list_rtp_media) + $(mod_list_rtp_media_server) @@ -457,6 +457,9 @@ module_group_krabbitmq=$(mod_list_rabbitmq) # K phonenumber modules module_group_kphonenum=$(mod_list_phonenum) +# K rtp_media_server modules +module_group_krtp_media_server=$(mod_list_rtp_media_server) + # list of static modules # static_modules:=

1 0

git:master:32c363e1: Merge pull request #1701 from jchavanton/rtp_media_server
by GitHub 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: 32c363e1053d423bbc13c5d4e87a02097964ac7c URL: https://github.com/kamailio/kamailio/commit/32c363e1053d423bbc13c5d4e87a020… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-13T00:34:58-08:00 Merge pull request #1701 from jchavanton/rtp_media_server rtp_media_server: adding module --- Added: src/modules/rtp_media_server/Makefile Added: src/modules/rtp_media_server/config_example/kamailio.cfg Added: src/modules/rtp_media_server/doc/Makefile Added: src/modules/rtp_media_server/doc/rtp_media_server.xml Added: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml Added: src/modules/rtp_media_server/install_bc.sh Added: src/modules/rtp_media_server/rms_media.c Added: src/modules/rtp_media_server/rms_media.h Added: src/modules/rtp_media_server/rms_sdp.c Added: src/modules/rtp_media_server/rms_sdp.h Added: src/modules/rtp_media_server/rms_util.h Added: src/modules/rtp_media_server/rtp_media_server.c Added: src/modules/rtp_media_server/rtp_media_server.h Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/32c363e1053d423bbc13c5d4e87a020… Patch: https://github.com/kamailio/kamailio/commit/32c363e1053d423bbc13c5d4e87a020…

1 0

git:master:47e35db0: rtp_media_server: adding module
by Julien Chavanton 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: 47e35db05c5da1b2b2a24ae36b7b63d0625060c9 URL: https://github.com/kamailio/kamailio/commit/47e35db05c5da1b2b2a24ae36b7b63d… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-11-13T07:23:46Z rtp_media_server: adding module --- Added: src/modules/rtp_media_server/Makefile Added: src/modules/rtp_media_server/config_example/kamailio.cfg Added: src/modules/rtp_media_server/doc/Makefile Added: src/modules/rtp_media_server/doc/rtp_media_server.xml Added: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml Added: src/modules/rtp_media_server/install_bc.sh Added: src/modules/rtp_media_server/rms_media.c Added: src/modules/rtp_media_server/rms_media.h Added: src/modules/rtp_media_server/rms_sdp.c Added: src/modules/rtp_media_server/rms_sdp.h Added: src/modules/rtp_media_server/rms_util.h Added: src/modules/rtp_media_server/rtp_media_server.c Added: src/modules/rtp_media_server/rtp_media_server.h Added: src/modules/rtp_media_server/voice_file/Bach_10s_8000.wav Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/47e35db05c5da1b2b2a24ae36b7b63d… Patch: https://github.com/kamailio/kamailio/commit/47e35db05c5da1b2b2a24ae36b7b63d…

1 0

git:master:2a76fdd4: rtp_media_server: support for multiple actions
by Julien Chavanton 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: 2a76fdd4336039da2df4db4459e6db4b5e3ba364 URL: https://github.com/kamailio/kamailio/commit/2a76fdd4336039da2df4db4459e6db4… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-11-13T08:20:45Z rtp_media_server: support for multiple actions --- Modified: src/modules/rtp_media_server/config_example/kamailio.cfg Modified: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml Modified: src/modules/rtp_media_server/install_bc.sh Modified: src/modules/rtp_media_server/rms_media.c Modified: src/modules/rtp_media_server/rms_media.h Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h Removed: src/modules/rtp_media_server/voice_file/Bach_10s_8000.wav --- Diff: https://github.com/kamailio/kamailio/commit/2a76fdd4336039da2df4db4459e6db4… Patch: https://github.com/kamailio/kamailio/commit/2a76fdd4336039da2df4db4459e6db4…

1 0

git:master:e2ca5516: tmx: use branch index for $T_rpl() cache invalidation
by Daniel-Constantin Mierla 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: e2ca5516ae086cf33c61dbb9e653a5484cca2074 URL: https://github.com/kamailio/kamailio/commit/e2ca5516ae086cf33c61dbb9e653a54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-13T08:59:43+01:00 tmx: use branch index for $T_rpl() cache invalidation --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/e2ca5516ae086cf33c61dbb9e653a54… Patch: https://github.com/kamailio/kamailio/commit/e2ca5516ae086cf33c61dbb9e653a54… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 47e300af11..9fd28ee44b 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -34,6 +34,7 @@ struct _pv_tmx_data { unsigned int index; unsigned int label; + int branch; struct sip_msg msg; struct sip_msg *tmsgp; char *buf; @@ -175,7 +176,8 @@ int pv_t_update_rpl(struct sip_msg *msg) if(t->uac[branch].reply==NULL || t->uac[branch].reply==FAKED_REPLY) return 1; - if (_pv_trpl.label == t->label && _pv_trpl.index == t->hash_index) + if (_pv_trpl.label == t->label && _pv_trpl.index == t->hash_index + && _pv_trpl.branch == branch) return 0; /* make a copy */ @@ -188,6 +190,7 @@ int pv_t_update_rpl(struct sip_msg *msg) _pv_trpl.tmsgp = NULL; _pv_trpl.index = 0; _pv_trpl.label = 0; + _pv_trpl.branch = 0; _pv_trpl.buf_size = t->uac[branch].reply->len+1; _pv_trpl.buf = (char*)pkg_malloc(_pv_trpl.buf_size*sizeof(char)); if(_pv_trpl.buf==NULL) @@ -207,6 +210,7 @@ int pv_t_update_rpl(struct sip_msg *msg) _pv_trpl.tmsgp = t->uac[branch].reply; _pv_trpl.index = t->hash_index; _pv_trpl.label = t->label; + _pv_trpl.branch = branch; if(pv_t_copy_msg(t->uac[branch].reply, &_pv_trpl.msg)!=0) { @@ -216,6 +220,7 @@ int pv_t_update_rpl(struct sip_msg *msg) _pv_trpl.tmsgp = NULL; _pv_trpl.index = 0; _pv_trpl.label = 0; + _pv_trpl.branch = 0; return -1; }

1 0

[kamailio/kamailio] Fixed alpine docker on master branch after switching from libress to openssl (#1718)
by sergey-safarov 09 Nov '18

09 Nov '18

Fixed alpine docker packaging on master branch after switching from libress to openssl This need only into master branch. (not backport) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1718 -- Commit Summary -- * pkg/kamailio/alpine: Update APKBUILD * pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container -- File Changes -- M pkg/docker (2) D pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch (20) M pkg/kamailio/alpine/APKBUILD (12) M pkg/kamailio/alpine/kamailio.initd (2) D pkg/kamailio/alpine/kamctl_build.patch (236) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1718.patch https://github.com/kamailio/kamailio/pull/1718.diff -- 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/pull/1718

2 1

git:master:37bff458: pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container
by Victor Seva 09 Nov '18

09 Nov '18

Module: kamailio Branch: master Commit: 37bff4588803a70873babdb483804e3734b42900 URL: https://github.com/kamailio/kamailio/commit/37bff4588803a70873babdb483804e3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-09T17:38:21+01:00 pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container --- Modified: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD Removed: pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch --- Diff: https://github.com/kamailio/kamailio/commit/37bff4588803a70873babdb483804e3… Patch: https://github.com/kamailio/kamailio/commit/37bff4588803a70873babdb483804e3… --- diff --git a/pkg/docker b/pkg/docker index 3c8a156abe..6a18819230 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 3c8a156abef2a034d9a21df5bf73f4b5cc4d3e05 +Subproject commit 6a18819230742860f6db6996cda593f55f63cd8c diff --git a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch b/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch deleted file mode 100644 index 08308f77b1..0000000000 --- a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_core_tcp_read_c,v 1.1 2017/07/03 22:14:20 sthen Exp $ - -Index: a/src/core/tcp_read.c ---- a/src/core/tcp_read.c.orig -+++ a/src/core/tcp_read.c -@@ -1497,6 +1497,14 @@ void release_tcpconn(struct tcp_connection* c, long st - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); - LM_DBG("extra_data %p\n", c->extra_data); -+ -+ /* experimental fix tls crash with libressl */ -+ /* add cleanup SSL structure in child process, in parent process SSL structure is empty */ -+ if ((c->type==PROTO_TLS || c->type==PROTO_WSS) && (c->extra_data) && c->fd != -1) { -+ tls_close(c, c->fd); -+ tls_tcpconn_clean(c); -+ } -+ - /* release req & signal the parent */ - c->reader_pid=0; /* reset it */ - if (c->fd!=-1){ diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 2b77da2a3d..96eb89c25e 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -27,7 +27,7 @@ depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python2-dev pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev - lua-dev openldap-dev libressl-dev net-snmp-dev libuuid libev-dev + lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev libmaxminddb-dev libunistring-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -251,7 +251,6 @@ done source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz 0001-kamdbctl.base.patch - 0004-src_core_tcp_read_c.patch kamailio.initd " @@ -551,5 +550,4 @@ sipdump() { sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz 6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch -af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd"

1 0

git:master:6aca6c0d: pkg/kamailio/alpine: Update APKBUILD
by Victor Seva 09 Nov '18

09 Nov '18

Module: kamailio Branch: master Commit: 6aca6c0ddc201882d1ab75e662299450f578aa32 URL: https://github.com/kamailio/kamailio/commit/6aca6c0ddc201882d1ab75e66229945… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-09T17:38:21+01:00 pkg/kamailio/alpine: Update APKBUILD --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/alpine/kamailio.initd Removed: pkg/kamailio/alpine/kamctl_build.patch --- Diff: https://github.com/kamailio/kamailio/commit/6aca6c0ddc201882d1ab75e66229945… Patch: https://github.com/kamailio/kamailio/commit/6aca6c0ddc201882d1ab75e66229945…

1 0

error in Makefile.modules
by Juha Heinanen 09 Nov '18

09 Nov '18

When building debian package from master, I noticed this kind of error message: s ../../../doc/stylesheets/serdoc2man.xsl auth.xml make[3]: s: Command not found ../../Makefile.modules:283: recipe for target 'auth.7' failed The line in Makefile.modules is here: $(MOD_NAME).7: $(MOD_NAME).xml $(DOCBOOK) -s ../../../doc/stylesheets/serdoc2man.xsl $< Could it be that variable $(DOCBOOK) has not been defined? -- Juha

3 4

log_custom module - LC_LOG_MSG_MAX_SIZE
by Luis Martin Gil 09 Nov '18

09 Nov '18

Hi all, Is there any strong reason to set LC_LOG_MSG_MAX_SIZE to 16384 in the log_custom module? Any thoughts / undesired effects if changed to 32768 or higher? ``` $ grep -R 'define LC_LOG_MSG_MAX_SIZE' * src/modules/log_custom/log_custom_mod.c:#define LC_LOG_MSG_MAX_SIZE 16384 src/modules/log_systemd/log_systemd_mod.c:#define LC_LOG_MSG_MAX_SIZE 16384 ``` Thanks. Luis

2 1

[kamailio/kamailio] RPM spec update (#1711)
by sergey-safarov 09 Nov '18

09 Nov '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to `5.2` branche - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Need back port to 5.2 branch. For 5.1 branch also wanted but will be merged with conflict. Backport into 5.1 is optional. Then i will create dedicated PR You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1711 -- Commit Summary -- * pkg/kamailio/obs: update spec to mach currently used * pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists * pkg/kamailio/obs: smsops module relocated into main rpm package -- File Changes -- M pkg/kamailio/obs/kamailio.service (3) M pkg/kamailio/obs/kamailio.spec (51) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1711.patch https://github.com/kamailio/kamailio/pull/1711.diff -- 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/pull/1711

3 3

git:5.2:87759978: pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists
by Henning Westerholt 09 Nov '18

09 Nov '18

Module: kamailio Branch: 5.2 Commit: 87759978d3997f26fb935a95eed1342ffa079473 URL: https://github.com/kamailio/kamailio/commit/87759978d3997f26fb935a95eed1342… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-09T10:42:31+01:00 pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists (cherry picked from commit 68646c6fff4a06fa949296d1a41483ff51fc9389) --- Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/87759978d3997f26fb935a95eed1342… Patch: https://github.com/kamailio/kamailio/commit/87759978d3997f26fb935a95eed1342… --- diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index 0be0dc0e63..237ad10ef5 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=simple diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8fc518fb0b..7c9dcc6905 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -9,6 +9,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -30,6 +31,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -51,6 +53,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -72,6 +75,7 @@ %bcond_without dnssec %bcond_without geoip %bcond_with http_async_client +%bcond_without ims %bcond_with jansson %bcond_with json %bcond_without lua @@ -94,6 +98,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -115,6 +120,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -136,6 +142,7 @@ %bcond_without dnssec %bcond_with geoip %bcond_with http_async_client +%bcond_with ims %bcond_with jansson %bcond_with json %bcond_with lua @@ -157,6 +164,7 @@ %bcond_with dnssec %bcond_with geoip %bcond_with http_async_client +%bcond_with ims %bcond_with jansson %bcond_with json %bcond_with lua @@ -164,7 +172,7 @@ %bcond_with memcached %bcond_without mongodb %bcond_without perl -%bcond_without rabbitmq +%bcond_with rabbitmq %bcond_without redis %bcond_with sctp %bcond_with websocket @@ -442,6 +450,7 @@ BuildRequires: libxml2-devel, libcurl-devel, zlib-devel This module implements protocol functions that use the libcurl to communicate with HTTP servers. +%if %{with ims} %package ims Summary: IMS modules and extensions module for Kamailio Group: System Environment/Daemons @@ -450,6 +459,7 @@ BuildRequires: libxml2-devel libmnl-devel %description ims IMS modules and extensions module for Kamailio. +%endif %if %{with jansson} @@ -967,7 +977,6 @@ make cfg prefix=/usr \ basedir=%{buildroot} \ cfg_prefix=%{buildroot} \ doc_prefix=%{buildroot} \ - share_prefix=%{_prefix} \ doc_dir=%{_docdir}/kamailio/ \ cfg_target=%{_sysconfdir}/kamailio/ modules_dirs="modules" make @@ -991,7 +1000,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with http_async_client} khttp_async \ %endif +%if %{with ims} kims \ +%endif %if %{with jansson} kjansson \ %endif @@ -1063,7 +1074,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with http_async_client} khttp_async \ %endif +%if %{with ims} kims \ +%endif %if %{with jansson} kjansson \ %endif @@ -1602,6 +1615,7 @@ fi %doc %{_docdir}/kamailio/modules/README.http_client %{_libdir}/kamailio/modules/http_client.so +%if %{with ims} %files ims %defattr(-,root,root) %{_libdir}/kamailio/libkamailio_ims.so.0 @@ -1638,6 +1652,7 @@ fi %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so %{_libdir}/kamailio/modules/smsops.so +%endif %if %{with jansson}

1 0

git:5.2:d9551180: pkg/kamailio/obs: smsops module relocated into main rpm package
by Henning Westerholt 09 Nov '18

09 Nov '18

Module: kamailio Branch: 5.2 Commit: d9551180fe9ae93f013d5ca3d4bdd2bf4f69640d URL: https://github.com/kamailio/kamailio/commit/d9551180fe9ae93f013d5ca3d4bdd2b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-09T10:42:43+01:00 pkg/kamailio/obs: smsops module relocated into main rpm package (cherry picked from commit b0e814315a196cb6b1e8eca453cf6e4eea26dca4) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d9551180fe9ae93f013d5ca3d4bdd2b… Patch: https://github.com/kamailio/kamailio/commit/d9551180fe9ae93f013d5ca3d4bdd2b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7c9dcc6905..6538f46c7d 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1295,6 +1295,7 @@ fi %doc %{_docdir}/kamailio/modules/README.siputils %doc %{_docdir}/kamailio/modules/README.sl %doc %{_docdir}/kamailio/modules/README.sms +%doc %{_docdir}/kamailio/modules/README.smsops %doc %{_docdir}/kamailio/modules/README.speeddial %doc %{_docdir}/kamailio/modules/README.sqlops %doc %{_docdir}/kamailio/modules/README.ss7ops @@ -1445,6 +1446,7 @@ fi %{_libdir}/kamailio/modules/siputils.so %{_libdir}/kamailio/modules/sl.so %{_libdir}/kamailio/modules/sms.so +%{_libdir}/kamailio/modules/smsops.so %{_libdir}/kamailio/modules/speeddial.so %{_libdir}/kamailio/modules/sqlops.so %{_libdir}/kamailio/modules/ss7ops.so @@ -1635,7 +1637,6 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf -%doc %{_docdir}/kamailio/modules/README.smsops %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so %{_libdir}/kamailio/modules/ims_auth.so @@ -1651,7 +1652,6 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so -%{_libdir}/kamailio/modules/smsops.so %endif

1 0

git:5.2:5177db61: pkg/kamailio/obs: update spec to mach currently used
by Henning Westerholt 09 Nov '18

09 Nov '18

Module: kamailio Branch: 5.2 Commit: 5177db61931d7a9ca966dba7f38aa8087b45ff65 URL: https://github.com/kamailio/kamailio/commit/5177db61931d7a9ca966dba7f38aa80… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-09T10:42:09+01:00 pkg/kamailio/obs: update spec to mach currently used (cherry picked from commit 3dade81da58adb40b039a23dcaf67795e41ccebe) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/5177db61931d7a9ca966dba7f38aa80… Patch: https://github.com/kamailio/kamailio/commit/5177db61931d7a9ca966dba7f38aa80… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index c0356d8f73..8fc518fb0b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -527,15 +527,6 @@ BuildRequires: openldap-devel LDAP search interface for Kamailio. -%package log_custom -Summary: Logging to custom backends from Kamailio -Group: System Environment/Daemons -Requires: kamailio = %ver - -%description log_custom -This module provides logging to custom systems, replacing the default core logging to syslog. - - %if %{with lua} %package lua Summary: Lua extensions for Kamailio @@ -1324,7 +1315,10 @@ fi %doc %{_docdir}/kamailio/modules/README.call_obj %doc %{_docdir}/kamailio/modules/README.evrexec %doc %{_docdir}/kamailio/modules/README.keepalive - +%doc %{_docdir}/kamailio/modules/README.log_custom +%doc %{_docdir}/kamailio/modules/README.statsc +%doc %{_docdir}/kamailio/modules/README.topos +%doc %{_docdir}/kamailio/modules/README.cfgt %dir %attr(-,kamailio,kamailio) %{_sysconfdir}/kamailio %config(noreplace) %{_sysconfdir}/kamailio/dictionary.kamailio @@ -1471,7 +1465,10 @@ fi %{_libdir}/kamailio/modules/call_obj.so %{_libdir}/kamailio/modules/evrexec.so %{_libdir}/kamailio/modules/keepalive.so - +%{_libdir}/kamailio/modules/log_custom.so +%{_libdir}/kamailio/modules/statsc.so +%{_libdir}/kamailio/modules/topos.so +%{_libdir}/kamailio/modules/cfgt.so %{_sbindir}/kamailio %{_sbindir}/kamctl @@ -1612,7 +1609,6 @@ fi %doc %{_docdir}/kamailio/modules/README.cdp %doc %{_docdir}/kamailio/modules/README.cdp_avp -%doc %{_docdir}/kamailio/modules/README.cfgt %doc %{_docdir}/kamailio/modules/README.ims_auth %doc %{_docdir}/kamailio/modules/README.ims_charging %doc %{_docdir}/kamailio/modules/README.ims_dialog @@ -1625,13 +1621,9 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf -%doc %{_docdir}/kamailio/modules/README.log_custom %doc %{_docdir}/kamailio/modules/README.smsops -%doc %{_docdir}/kamailio/modules/README.statsc -%doc %{_docdir}/kamailio/modules/README.topos %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so -%{_libdir}/kamailio/modules/cfgt.so %{_libdir}/kamailio/modules/ims_auth.so %{_libdir}/kamailio/modules/ims_charging.so %{_libdir}/kamailio/modules/ims_dialog.so @@ -1645,10 +1637,8 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so -%{_libdir}/kamailio/modules/log_custom.so %{_libdir}/kamailio/modules/smsops.so -%{_libdir}/kamailio/modules/statsc.so -%{_libdir}/kamailio/modules/topos.so + %if %{with jansson} %files jansson

1 0

git:5.2:9bc520a0: pkg/kamailio/oracle: wait for network to be up
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: 5.2 Commit: 9bc520a02428656c8eb0a5d875c950298ceaf2e7 URL: https://github.com/kamailio/kamailio/commit/9bc520a02428656c8eb0a5d875c9502… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:05:28+01:00 pkg/kamailio/oracle: wait for network to be up Units that strictly require a configured network connection should pull in network-online.target (via a Wants= type dependency) and order themselves after it. This target unit is intended to pull in a service that delays further execution until the network is sufficiently set up. What precisely this requires is left to the implementation of the network managing service. https://www.freedesktop.org/software/systemd/man/systemd.special.html https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> (cherry picked from commit 37c2e5ca25cb3396d2ac969271f9f9330d88fd63) --- Modified: pkg/kamailio/oracle/el7/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/9bc520a02428656c8eb0a5d875c9502… Patch: https://github.com/kamailio/kamailio/commit/9bc520a02428656c8eb0a5d875c9502… --- diff --git a/pkg/kamailio/oracle/el7/kamailio.service b/pkg/kamailio/oracle/el7/kamailio.service index 63d6da747c..8192488b53 100644 --- a/pkg/kamailio/oracle/el7/kamailio.service +++ b/pkg/kamailio/oracle/el7/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio SIP router server daemon -After=syslog.target network.target auditd.service +Wants=network-online.target +After=syslog.target network-online.target auditd.service [Service] EnvironmentFile=/etc/sysconfig/kamailio

1 0

git:5.2:33fb7ac2: pkg/kamailio/deb: also restart service if unclean exit code
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: 5.2 Commit: 33fb7ac2b367b4145815ed6e6919deb8d7c8631d URL: https://github.com/kamailio/kamailio/commit/33fb7ac2b367b4145815ed6e6919deb… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:04:54+01:00 pkg/kamailio/deb: also restart service if unclean exit code New: If set to on-failure, the service will be restarted when the process exits with a non-zero exit code, is terminated by a signal (including on core dump, but excluding the aforementioned four signals), when an operation (such as service reload) times out, and when the configured watchdog timeout is triggered. Old: If set to on-abort, the service will be restarted only if the service process exits due to an uncaught signal not specified as a clean exit status. https://www.freedesktop.org/software/systemd/man/systemd.service.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> (cherry picked from commit a5c45d1af4bf31e872963a954c43b8ee5618a90a) --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/33fb7ac2b367b4145815ed6e6919deb… Patch: https://github.com/kamailio/kamailio/commit/33fb7ac2b367b4145815ed6e6919deb…

1 0

git:5.2:fb9dee9e: pkg/kamailio/deb: wait for network to be up
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: 5.2 Commit: fb9dee9efee7f832c7c95fab2d066fb3606b1fa8 URL: https://github.com/kamailio/kamailio/commit/fb9dee9efee7f832c7c95fab2d066fb… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:04:49+01:00 pkg/kamailio/deb: wait for network to be up Units that strictly require a configured network connection should pull in network-online.target (via a Wants= type dependency) and order themselves after it. This target unit is intended to pull in a service that delays further execution until the network is sufficiently set up. What precisely this requires is left to the implementation of the network managing service. https://www.freedesktop.org/software/systemd/man/systemd.special.html https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> (cherry picked from commit f7867838eb8a68a9ae4c00f2487bdec078b94c88) --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/fb9dee9efee7f832c7c95fab2d066fb… Patch: https://github.com/kamailio/kamailio/commit/fb9dee9efee7f832c7c95fab2d066fb… --- diff --git a/pkg/kamailio/deb/bionic/kamailio.service b/pkg/kamailio/deb/bionic/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/bionic/kamailio.service +++ b/pkg/kamailio/deb/bionic/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/buster/kamailio.service +++ b/pkg/kamailio/deb/buster/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/debian/kamailio.service +++ b/pkg/kamailio/deb/debian/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/jessie/kamailio.service +++ b/pkg/kamailio/deb/jessie/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/sid/kamailio.service +++ b/pkg/kamailio/deb/sid/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/stretch/kamailio.service +++ b/pkg/kamailio/deb/stretch/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/xenial/kamailio.service +++ b/pkg/kamailio/deb/xenial/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking

1 0

[kamailio/kamailio] Optimize systemd units (#1716)
by Kevin Olbrich 08 Nov '18

08 Nov '18

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Please see conversation on ML for reference: https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1716 -- Commit Summary -- * Wait for network to be up before starting kamailio.service * Restart service if it fails with unclean exit code instead of only unclean signal -- File Changes -- M pkg/kamailio/deb/bionic/kamailio.service (5) M pkg/kamailio/deb/buster/kamailio.service (5) M pkg/kamailio/deb/debian/kamailio.service (5) M pkg/kamailio/deb/jessie/kamailio.service (5) M pkg/kamailio/deb/sid/kamailio.service (5) M pkg/kamailio/deb/stretch/kamailio.service (5) M pkg/kamailio/deb/xenial/kamailio.service (5) M pkg/kamailio/oracle/el7/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1716.patch https://github.com/kamailio/kamailio/pull/1716.diff -- 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/pull/1716

2 7

git:master:37c2e5ca: pkg/kamailio/oracle: wait for network to be up
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: master Commit: 37c2e5ca25cb3396d2ac969271f9f9330d88fd63 URL: https://github.com/kamailio/kamailio/commit/37c2e5ca25cb3396d2ac969271f9f93… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:02:32+01:00 pkg/kamailio/oracle: wait for network to be up Units that strictly require a configured network connection should pull in network-online.target (via a Wants= type dependency) and order themselves after it. This target unit is intended to pull in a service that delays further execution until the network is sufficiently set up. What precisely this requires is left to the implementation of the network managing service. https://www.freedesktop.org/software/systemd/man/systemd.special.html https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> --- Modified: pkg/kamailio/oracle/el7/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/37c2e5ca25cb3396d2ac969271f9f93… Patch: https://github.com/kamailio/kamailio/commit/37c2e5ca25cb3396d2ac969271f9f93… --- diff --git a/pkg/kamailio/oracle/el7/kamailio.service b/pkg/kamailio/oracle/el7/kamailio.service index 63d6da747c..8192488b53 100644 --- a/pkg/kamailio/oracle/el7/kamailio.service +++ b/pkg/kamailio/oracle/el7/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio SIP router server daemon -After=syslog.target network.target auditd.service +Wants=network-online.target +After=syslog.target network-online.target auditd.service [Service] EnvironmentFile=/etc/sysconfig/kamailio

1 0

git:master:f7867838: pkg/kamailio/deb: wait for network to be up
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: master Commit: f7867838eb8a68a9ae4c00f2487bdec078b94c88 URL: https://github.com/kamailio/kamailio/commit/f7867838eb8a68a9ae4c00f2487bdec… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:02:32+01:00 pkg/kamailio/deb: wait for network to be up Units that strictly require a configured network connection should pull in network-online.target (via a Wants= type dependency) and order themselves after it. This target unit is intended to pull in a service that delays further execution until the network is sufficiently set up. What precisely this requires is left to the implementation of the network managing service. https://www.freedesktop.org/software/systemd/man/systemd.special.html https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/f7867838eb8a68a9ae4c00f2487bdec… Patch: https://github.com/kamailio/kamailio/commit/f7867838eb8a68a9ae4c00f2487bdec… --- diff --git a/pkg/kamailio/deb/bionic/kamailio.service b/pkg/kamailio/deb/bionic/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/bionic/kamailio.service +++ b/pkg/kamailio/deb/bionic/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/buster/kamailio.service +++ b/pkg/kamailio/deb/buster/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/debian/kamailio.service +++ b/pkg/kamailio/deb/debian/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/jessie/kamailio.service +++ b/pkg/kamailio/deb/jessie/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/sid/kamailio.service +++ b/pkg/kamailio/deb/sid/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/stretch/kamailio.service +++ b/pkg/kamailio/deb/stretch/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/xenial/kamailio.service +++ b/pkg/kamailio/deb/xenial/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking

1 0

git:master:a5c45d1a: pkg/kamailio/deb: also restart service if unclean exit code
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: master Commit: a5c45d1af4bf31e872963a954c43b8ee5618a90a URL: https://github.com/kamailio/kamailio/commit/a5c45d1af4bf31e872963a954c43b8e… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:02:32+01:00 pkg/kamailio/deb: also restart service if unclean exit code New: If set to on-failure, the service will be restarted when the process exits with a non-zero exit code, is terminated by a signal (including on core dump, but excluding the aforementioned four signals), when an operation (such as service reload) times out, and when the configured watchdog timeout is triggered. Old: If set to on-abort, the service will be restarted only if the service process exits due to an uncaught signal not specified as a clean exit status. https://www.freedesktop.org/software/systemd/man/systemd.service.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/a5c45d1af4bf31e872963a954c43b8e… Patch: https://github.com/kamailio/kamailio/commit/a5c45d1af4bf31e872963a954c43b8e…

1 0

git:master:55347626: cfgutils: error log message mentioning the param lock_set_size
by Daniel-Constantin Mierla 08 Nov '18

08 Nov '18

Module: kamailio Branch: master Commit: 55347626b189cd009c29b0e058949ed7671ae0d0 URL: https://github.com/kamailio/kamailio/commit/55347626b189cd009c29b0e058949ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-08T08:24:59+01:00 cfgutils: error log message mentioning the param lock_set_size --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/55347626b189cd009c29b0e058949ed… Patch: https://github.com/kamailio/kamailio/commit/55347626b189cd009c29b0e058949ed… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 17cf6bfacc..e62012cd14 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -702,7 +702,8 @@ static int cfg_lock_helper(str *lkey, int mode) unsigned int pos; if(_cfg_lock_set==NULL) { - LM_ERR("lock set not initialized (attempt to do op: %d on: %.*s)\n", + LM_ERR("lock set not initialized (attempt to do op: %d on: %.*s) -" + " see param lock_set_size\n", mode, lkey->len, lkey->s); return -1; } @@ -897,6 +898,7 @@ static void mod_destroy(void) { lock_set_destroy(_cfg_lock_set); lock_set_dealloc(_cfg_lock_set); + _cfg_lock_set = NULL; } }

1 0

git:master:c61d3bf5: Merge pull request #1711 from sergey-safarov/spec_update11
by GitHub 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: c61d3bf53b18118030590a1f5066f66eb7da7ac4 URL: https://github.com/kamailio/kamailio/commit/c61d3bf53b18118030590a1f5066f66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-07T20:52:33+01:00 Merge pull request #1711 from sergey-safarov/spec_update11 RPM spec update --- Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c61d3bf53b18118030590a1f5066f66… Patch: https://github.com/kamailio/kamailio/commit/c61d3bf53b18118030590a1f5066f66…

1 0

git:master:b0e81431: pkg/kamailio/obs: smsops module relocated into main rpm package
by Sergey Safarov 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: b0e814315a196cb6b1e8eca453cf6e4eea26dca4 URL: https://github.com/kamailio/kamailio/commit/b0e814315a196cb6b1e8eca453cf6e4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-07T16:07:41Z pkg/kamailio/obs: smsops module relocated into main rpm package --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b0e814315a196cb6b1e8eca453cf6e4… Patch: https://github.com/kamailio/kamailio/commit/b0e814315a196cb6b1e8eca453cf6e4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7c9dcc6905..6538f46c7d 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1295,6 +1295,7 @@ fi %doc %{_docdir}/kamailio/modules/README.siputils %doc %{_docdir}/kamailio/modules/README.sl %doc %{_docdir}/kamailio/modules/README.sms +%doc %{_docdir}/kamailio/modules/README.smsops %doc %{_docdir}/kamailio/modules/README.speeddial %doc %{_docdir}/kamailio/modules/README.sqlops %doc %{_docdir}/kamailio/modules/README.ss7ops @@ -1445,6 +1446,7 @@ fi %{_libdir}/kamailio/modules/siputils.so %{_libdir}/kamailio/modules/sl.so %{_libdir}/kamailio/modules/sms.so +%{_libdir}/kamailio/modules/smsops.so %{_libdir}/kamailio/modules/speeddial.so %{_libdir}/kamailio/modules/sqlops.so %{_libdir}/kamailio/modules/ss7ops.so @@ -1635,7 +1637,6 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf -%doc %{_docdir}/kamailio/modules/README.smsops %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so %{_libdir}/kamailio/modules/ims_auth.so @@ -1651,7 +1652,6 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so -%{_libdir}/kamailio/modules/smsops.so %endif

1 0

git:master:68646c6f: pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists
by Sergey Safarov 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: 68646c6fff4a06fa949296d1a41483ff51fc9389 URL: https://github.com/kamailio/kamailio/commit/68646c6fff4a06fa949296d1a41483f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-07T16:07:10Z pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists --- Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/68646c6fff4a06fa949296d1a41483f… Patch: https://github.com/kamailio/kamailio/commit/68646c6fff4a06fa949296d1a41483f… --- diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index 0be0dc0e63..237ad10ef5 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=simple diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8fc518fb0b..7c9dcc6905 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -9,6 +9,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -30,6 +31,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -51,6 +53,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -72,6 +75,7 @@ %bcond_without dnssec %bcond_without geoip %bcond_with http_async_client +%bcond_without ims %bcond_with jansson %bcond_with json %bcond_without lua @@ -94,6 +98,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -115,6 +120,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -136,6 +142,7 @@ %bcond_without dnssec %bcond_with geoip %bcond_with http_async_client +%bcond_with ims %bcond_with jansson %bcond_with json %bcond_with lua @@ -157,6 +164,7 @@ %bcond_with dnssec %bcond_with geoip %bcond_with http_async_client +%bcond_with ims %bcond_with jansson %bcond_with json %bcond_with lua @@ -164,7 +172,7 @@ %bcond_with memcached %bcond_without mongodb %bcond_without perl -%bcond_without rabbitmq +%bcond_with rabbitmq %bcond_without redis %bcond_with sctp %bcond_with websocket @@ -442,6 +450,7 @@ BuildRequires: libxml2-devel, libcurl-devel, zlib-devel This module implements protocol functions that use the libcurl to communicate with HTTP servers. +%if %{with ims} %package ims Summary: IMS modules and extensions module for Kamailio Group: System Environment/Daemons @@ -450,6 +459,7 @@ BuildRequires: libxml2-devel libmnl-devel %description ims IMS modules and extensions module for Kamailio. +%endif %if %{with jansson} @@ -967,7 +977,6 @@ make cfg prefix=/usr \ basedir=%{buildroot} \ cfg_prefix=%{buildroot} \ doc_prefix=%{buildroot} \ - share_prefix=%{_prefix} \ doc_dir=%{_docdir}/kamailio/ \ cfg_target=%{_sysconfdir}/kamailio/ modules_dirs="modules" make @@ -991,7 +1000,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with http_async_client} khttp_async \ %endif +%if %{with ims} kims \ +%endif %if %{with jansson} kjansson \ %endif @@ -1063,7 +1074,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with http_async_client} khttp_async \ %endif +%if %{with ims} kims \ +%endif %if %{with jansson} kjansson \ %endif @@ -1602,6 +1615,7 @@ fi %doc %{_docdir}/kamailio/modules/README.http_client %{_libdir}/kamailio/modules/http_client.so +%if %{with ims} %files ims %defattr(-,root,root) %{_libdir}/kamailio/libkamailio_ims.so.0 @@ -1638,6 +1652,7 @@ fi %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so %{_libdir}/kamailio/modules/smsops.so +%endif %if %{with jansson}

1 0

git:master:3dade81d: pkg/kamailio/obs: update spec to mach currently used
by Sergey Safarov 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: 3dade81da58adb40b039a23dcaf67795e41ccebe URL: https://github.com/kamailio/kamailio/commit/3dade81da58adb40b039a23dcaf6779… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-07T11:42:20Z pkg/kamailio/obs: update spec to mach currently used --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3dade81da58adb40b039a23dcaf6779… Patch: https://github.com/kamailio/kamailio/commit/3dade81da58adb40b039a23dcaf6779… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index c0356d8f73..8fc518fb0b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -527,15 +527,6 @@ BuildRequires: openldap-devel LDAP search interface for Kamailio. -%package log_custom -Summary: Logging to custom backends from Kamailio -Group: System Environment/Daemons -Requires: kamailio = %ver - -%description log_custom -This module provides logging to custom systems, replacing the default core logging to syslog. - - %if %{with lua} %package lua Summary: Lua extensions for Kamailio @@ -1324,7 +1315,10 @@ fi %doc %{_docdir}/kamailio/modules/README.call_obj %doc %{_docdir}/kamailio/modules/README.evrexec %doc %{_docdir}/kamailio/modules/README.keepalive - +%doc %{_docdir}/kamailio/modules/README.log_custom +%doc %{_docdir}/kamailio/modules/README.statsc +%doc %{_docdir}/kamailio/modules/README.topos +%doc %{_docdir}/kamailio/modules/README.cfgt %dir %attr(-,kamailio,kamailio) %{_sysconfdir}/kamailio %config(noreplace) %{_sysconfdir}/kamailio/dictionary.kamailio @@ -1471,7 +1465,10 @@ fi %{_libdir}/kamailio/modules/call_obj.so %{_libdir}/kamailio/modules/evrexec.so %{_libdir}/kamailio/modules/keepalive.so - +%{_libdir}/kamailio/modules/log_custom.so +%{_libdir}/kamailio/modules/statsc.so +%{_libdir}/kamailio/modules/topos.so +%{_libdir}/kamailio/modules/cfgt.so %{_sbindir}/kamailio %{_sbindir}/kamctl @@ -1612,7 +1609,6 @@ fi %doc %{_docdir}/kamailio/modules/README.cdp %doc %{_docdir}/kamailio/modules/README.cdp_avp -%doc %{_docdir}/kamailio/modules/README.cfgt %doc %{_docdir}/kamailio/modules/README.ims_auth %doc %{_docdir}/kamailio/modules/README.ims_charging %doc %{_docdir}/kamailio/modules/README.ims_dialog @@ -1625,13 +1621,9 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf -%doc %{_docdir}/kamailio/modules/README.log_custom %doc %{_docdir}/kamailio/modules/README.smsops -%doc %{_docdir}/kamailio/modules/README.statsc -%doc %{_docdir}/kamailio/modules/README.topos %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so -%{_libdir}/kamailio/modules/cfgt.so %{_libdir}/kamailio/modules/ims_auth.so %{_libdir}/kamailio/modules/ims_charging.so %{_libdir}/kamailio/modules/ims_dialog.so @@ -1645,10 +1637,8 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so -%{_libdir}/kamailio/modules/log_custom.so %{_libdir}/kamailio/modules/smsops.so -%{_libdir}/kamailio/modules/statsc.so -%{_libdir}/kamailio/modules/topos.so + %if %{with jansson} %files jansson

1 0

[kamailio/kamailio] pkg/kamailio/alpine: Fixed docker image build for 5.2 branch (#1713)
by sergey-safarov 07 Nov '18

07 Nov '18

This PR is need for `5.2` branch. On next stable Alpine release this will be fixed and we revert back this PR You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1713 -- Commit Summary -- * pkg/kamailio/alpine: Fixed docker image build for 5.2 branch -- File Changes -- M pkg/kamailio/alpine/APKBUILD (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1713.patch https://github.com/kamailio/kamailio/pull/1713.diff -- 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/pull/1713

2 1

git:5.2:f436f07e: Merge pull request #1713 from sergey-safarov/spec_update9
by GitHub 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: f436f07eb34e73b27c8b0d86100eaccffc0869ce URL: https://github.com/kamailio/kamailio/commit/f436f07eb34e73b27c8b0d86100eacc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-07T20:52:11+01:00 Merge pull request #1713 from sergey-safarov/spec_update9 pkg/kamailio/alpine: Fixed docker image build for 5.2 branch --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/f436f07eb34e73b27c8b0d86100eacc… Patch: https://github.com/kamailio/kamailio/commit/f436f07eb34e73b27c8b0d86100eacc… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 4333ad90c6..0afec7e886 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -271,6 +271,12 @@ snapshot() { } prepare() { + # Workarround for broken hiredis-devel package (0.13.3-r1) + sudo sed -i -e 's:prefix=/usr/local:prefix=/usr:' \ + -e 's:^libdir.*$:libdir=${exec_prefix}/lib:' \ + -e 's:^includedir.*:includedir=${prefix}/include/hiredis:' \ + /usr/lib/pkgconfig/hiredis.pc + default_prepare cd "$builddir"

1 0

git:5.2:e5bc89e1: pkg/kamailio/alpine: Fixed docker image build for 5.2 branch
by Sergey Safarov 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: e5bc89e1dffc548e3d309f45b291c87c39f6fb4b URL: https://github.com/kamailio/kamailio/commit/e5bc89e1dffc548e3d309f45b291c87… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-07T18:28:31Z pkg/kamailio/alpine: Fixed docker image build for 5.2 branch --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/e5bc89e1dffc548e3d309f45b291c87… Patch: https://github.com/kamailio/kamailio/commit/e5bc89e1dffc548e3d309f45b291c87… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 4333ad90c6..0afec7e886 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -271,6 +271,12 @@ snapshot() { } prepare() { + # Workarround for broken hiredis-devel package (0.13.3-r1) + sudo sed -i -e 's:prefix=/usr/local:prefix=/usr:' \ + -e 's:^libdir.*$:libdir=${exec_prefix}/lib:' \ + -e 's:^includedir.*:includedir=${prefix}/include/hiredis:' \ + /usr/lib/pkgconfig/hiredis.pc + default_prepare cd "$builddir"

1 0

[kamailio/kamailio] Cannot build ims module on OpenSUSE (#1710)
by sergey-safarov 07 Nov '18

07 Nov '18

### Description `libmnl-devel` is present in OpenSUSE but build of ims module is failed. This because headers files is located on other path then kamailio expects. `libmnl-devel` package is designed to use pkgconfig. I checked on CentOS dist `libmnl-devel` also have files for pkgconfig. ### Troubleshooting #### Reproduction need to build ims module on openSUSE_Leap_42.3 #### Debugging Data NA #### Log Messages ``` [ 333s] make[3]: 'libkamailio_ims.so.0.1' is up to date. [ 333s] LD (gcc) [M ims_ocs.so] ims_ocs.so [ 333s] CC (gcc) [M ims_diameter_server.so] ims_diameter_server.o [ 333s] CC (gcc) [M ims_diameter_server.so] cJSON.o [ 333s] CC (gcc) [M ims_diameter_server.so] avp_helper.o [ 334s] make[3]: 'libkamailio_ims.so.0.1' is up to date. [ 334s] LD (gcc) [M ims_diameter_server.so] ims_diameter_server.so [ 334s] CC (gcc) [M ims_ipsec_pcscf.so] ims_ipsec_pcscf_mod.o [ 334s] CC (gcc) [M ims_ipsec_pcscf.so] ipsec.o [ 334s] ipsec.c:32:27: fatal error: libmnl/libmnl.h: No such file or directory [ 334s] #include <libmnl/libmnl.h> [ 334s] ^ [ 334s] compilation terminated. [ 334s] ../../Makefile.rules:100: recipe for target 'ipsec.o' failed [ 334s] make[2]: *** [ipsec.o] Error 1 [ 334s] Makefile:511: recipe for target 'modules' failed [ 334s] make[1]: *** [modules] Error 1 [ 334s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/kamailio-5.2.0/src' [ 334s] Makefile:27: recipe for target 'every-module' failed [ 334s] make: *** [every-module] Error 2 [ 334s] error: Bad exit status from /var/tmp/rpm-tmp.Yi6mZQ (%build) [ 334s] ``` #### SIP Traffic NA ### Possible Solutions Not known ### Additional Information master branch * **Operating System**: openSUSE_Leap_42.3 -- 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/1710

2 5

git:5.2:3843c4c8: ims_ipsec_pcscf: Makefile - use pkg-config to get compile flags for libmnl
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: 3843c4c8c086f31f6126f0659c732141681229b9 URL: https://github.com/kamailio/kamailio/commit/3843c4c8c086f31f6126f0659c73214… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T13:22:58+01:00 ims_ipsec_pcscf: Makefile - use pkg-config to get compile flags for libmnl - GH #1710 (cherry picked from commit af7db21e401f9cfc776944693a85d38498ce421a) --- Modified: src/modules/ims_ipsec_pcscf/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3843c4c8c086f31f6126f0659c73214… Patch: https://github.com/kamailio/kamailio/commit/3843c4c8c086f31f6126f0659c73214… --- diff --git a/src/modules/ims_ipsec_pcscf/Makefile b/src/modules/ims_ipsec_pcscf/Makefile index 4e4e43d14c..055e8b80ca 100644 --- a/src/modules/ims_ipsec_pcscf/Makefile +++ b/src/modules/ims_ipsec_pcscf/Makefile @@ -8,10 +8,25 @@ include ../../Makefile.defs auto_gen= NAME=ims_ipsec_pcscf.so +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBMNL = $(shell $(BUILDER) --exists libmnl > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBMNL),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + DEFS += $(shell $(BUILDER) --cflags libmnl) + LIBS += $(shell $(BUILDER) --libs libmnl) +else ifneq ($(OS),darwin) LIBS += -lpthread LIBS += -lmnl endif +endif SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims

1 0

git:5.2:0eb813ee: evapi: convert return code for kemi functions to match the ones from cfg equivalents
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: 0eb813ee88c03ecc5e6fb35d2a2b3225716b2fc0 URL: https://github.com/kamailio/kamailio/commit/0eb813ee88c03ecc5e6fb35d2a2b322… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T13:22:49+01:00 evapi: convert return code for kemi functions to match the ones from cfg equivalents (cherry picked from commit 6675a960490c9c72e69aab7a676a3012da2999b2) --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0eb813ee88c03ecc5e6fb35d2a2b322… Patch: https://github.com/kamailio/kamailio/commit/0eb813ee88c03ecc5e6fb35d2a2b322… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index c8d32ac9cb..7d3a4ecf36 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -586,7 +586,13 @@ static int w_evapi_set_tag(sip_msg_t* msg, char* ptag, char* p2) */ static int ki_evapi_relay(sip_msg_t *msg, str *sdata) { - return evapi_relay(sdata); + int ret; + + ret = evapi_relay(sdata); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -598,7 +604,6 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) unsigned int tlabel; tm_cell_t *t = 0; - if(tmb.t_suspend==NULL) { LM_ERR("evapi async relay is disabled - tm module not loaded\n"); return -1; @@ -644,7 +649,13 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) */ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_unicast(sdata, stag); + int ret; + + ret = evapi_relay_unicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -652,7 +663,13 @@ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) */ static int ki_evapi_relay_multicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_multicast(sdata, stag); + int ret; + + ret = evapi_relay_multicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /**

1 0

git:master:af7db21e: ims_ipsec_pcscf: Makefile - use pkg-config to get compile flags for libmnl
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: af7db21e401f9cfc776944693a85d38498ce421a URL: https://github.com/kamailio/kamailio/commit/af7db21e401f9cfc776944693a85d38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T09:30:35+01:00 ims_ipsec_pcscf: Makefile - use pkg-config to get compile flags for libmnl - GH #1710 --- Modified: src/modules/ims_ipsec_pcscf/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/af7db21e401f9cfc776944693a85d38… Patch: https://github.com/kamailio/kamailio/commit/af7db21e401f9cfc776944693a85d38… --- diff --git a/src/modules/ims_ipsec_pcscf/Makefile b/src/modules/ims_ipsec_pcscf/Makefile index 4e4e43d14c..055e8b80ca 100644 --- a/src/modules/ims_ipsec_pcscf/Makefile +++ b/src/modules/ims_ipsec_pcscf/Makefile @@ -8,10 +8,25 @@ include ../../Makefile.defs auto_gen= NAME=ims_ipsec_pcscf.so +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBMNL = $(shell $(BUILDER) --exists libmnl > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBMNL),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + DEFS += $(shell $(BUILDER) --cflags libmnl) + LIBS += $(shell $(BUILDER) --libs libmnl) +else ifneq ($(OS),darwin) LIBS += -lpthread LIBS += -lmnl endif +endif SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims

1 0

git:master:6675a960: evapi: convert return code for kemi functions to match the ones from cfg equivalents
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: 6675a960490c9c72e69aab7a676a3012da2999b2 URL: https://github.com/kamailio/kamailio/commit/6675a960490c9c72e69aab7a676a301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T08:34:13+01:00 evapi: convert return code for kemi functions to match the ones from cfg equivalents --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6675a960490c9c72e69aab7a676a301… Patch: https://github.com/kamailio/kamailio/commit/6675a960490c9c72e69aab7a676a301… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index c8d32ac9cb..7d3a4ecf36 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -586,7 +586,13 @@ static int w_evapi_set_tag(sip_msg_t* msg, char* ptag, char* p2) */ static int ki_evapi_relay(sip_msg_t *msg, str *sdata) { - return evapi_relay(sdata); + int ret; + + ret = evapi_relay(sdata); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -598,7 +604,6 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) unsigned int tlabel; tm_cell_t *t = 0; - if(tmb.t_suspend==NULL) { LM_ERR("evapi async relay is disabled - tm module not loaded\n"); return -1; @@ -644,7 +649,13 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) */ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_unicast(sdata, stag); + int ret; + + ret = evapi_relay_unicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -652,7 +663,13 @@ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) */ static int ki_evapi_relay_multicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_multicast(sdata, stag); + int ret; + + ret = evapi_relay_multicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /**

1 0

[kamailio/kamailio] Cannot be packaged into RPM master and 5.2 branch (#1709)
by sergey-safarov 07 Nov '18

07 Nov '18

### Description I testing package `master` and `5.2` branch int RPM. but cannot. Build and packaging logs is [here](https://build.opensuse.org/build/home:sergey-safarov:v5.2.x-rpms/Cent… Is happens because `make install-share` goal is try create folder `/usr/share/kamailio/` instead of `/home/build/rpmbuild/BUILDROOT/kamailio-5.2.0-0.el7.centos.x86_64/usr/share/kamailio/`. ### Troubleshooting #### Reproduction please look above #### Debugging Data NA. #### Log Messages ``` [build@node0 kamailio-5.2.0]$ pwd /home/build/rpmbuild/BUILD/kamailio-5.2.0 [build@node0 kamailio-5.2.0]$ make -C src install-share make: Entering directory `/home/build/rpmbuild/BUILD/kamailio-5.2.0/src' mkdir -p /usr/share/kamailio/ mkdir: cannot create directory ‘/usr/share/kamailio/’: Permission denied make: *** [/usr/share/kamailio/] Error 1 make: Leaving directory `/home/build/rpmbuild/BUILD/kamailio-5.2.0/src' [build@node0 kamailio-5.2.0]$ ``` #### SIP Traffic NA ### Possible Solutions Not known ### Additional Information tested current master and 5.2 branch * **Operating System**: CentOS 7 ``` Linux node0.docker.rcsnet.ru 4.14.13-300.fc27.x86_64 #1 SMP Thu Jan 11 04:00:01 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1709

3 12

git:5.2:2a91ca46: Makefile.defs: use $(prefix) for setting share_target
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: 2a91ca46d8f05fde52869bd9434897ad5d76625b URL: https://github.com/kamailio/kamailio/commit/2a91ca46d8f05fde52869bd9434897a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T08:24:07+01:00 Makefile.defs: use $(prefix) for setting share_target - GH #1709 (cherry picked from commit 2b295f83e1c40637012633b6cab2ad86415d4623) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2a91ca46d8f05fde52869bd9434897a… Patch: https://github.com/kamailio/kamailio/commit/2a91ca46d8f05fde52869bd9434897a… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 13ff1b0188..bcf69ffb09 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -497,7 +497,7 @@ bin_target = $(prefix)/$(bin_dir) #modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) run_target = $(run_prefix)/$(run_dir) -share_target = $(share_prefix)/$(share_dir) +share_target = $(prefix)/$(share_dir) doc_target = $(prefix)/$(doc_dir) data_target = $(prefix)/$(data_dir) @@ -2095,7 +2095,8 @@ saved_chg_vars:=\ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \ - cfg_target lib_target data_target run_prefix run_dir run_target + cfg_target lib_target data_target run_prefix run_dir run_target \ + share_target #export relevant variables to the sub-makes

1 0

5.2.x OBS: CentOS/RHEL RPMs build app_python3.so with Software Collections?
by Anthony Alba 06 Nov '18

06 Nov '18

Sorry for the fat finger and earlier incomplete message... Although RHEL 7/CentOS 7 don't come with python3 in the base OS, it would be nice to have app_python3.so packaged for more extensive exposure in the wild. Can I suggest that kamailio OBS be built against the python3 packages in Software Collections? Currently rh-python36 is on RHEL and Software Collections for CentOS. Cheers Anthony Alba

2 1

Evapi not in 5.1
by bill＠telopar.net 06 Nov '18

06 Nov '18

Just installed 5.1 and see that the evapi module is no longer included. Has this been replaced by something new? Bill

3 3

[kamailio/kamailio] RPM spec update for 5.1 branch (#1708)
by sergey-safarov 06 Nov '18

06 Nov '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1702 #### Description RPM spec update for 5.1 branch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1708 -- Commit Summary -- * pkg/kamailio/ops: Added MongoDB rpm package * pkg/kamailio/obs: Updated obs meta * pkg/kamailio/obs: Removed end of life dist * pkg/kamailio/obs: Fixed bdb module build on fedora dists * [5.1] pkg/kamailio/obs: update spec to mach currently used -- File Changes -- M pkg/kamailio/obs/kamailio.spec (132) M pkg/kamailio/obs/meta (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1708.patch https://github.com/kamailio/kamailio/pull/1708.diff -- 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/pull/1708

2 1

git:5.1:84f00468: Merge pull request #1708 from sergey-safarov/spec_update10
by GitHub 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 84f004689c4f78260592a38009665a591cc117df URL: https://github.com/kamailio/kamailio/commit/84f004689c4f78260592a38009665a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-06T16:19:09+01:00 Merge pull request #1708 from sergey-safarov/spec_update10 RPM spec update for 5.1 branch --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/84f004689c4f78260592a38009665a5… Patch: https://github.com/kamailio/kamailio/commit/84f004689c4f78260592a38009665a5…

1 0

git:5.1:094f5849: pkg/kamailio/obs: Fixed bdb module build on fedora dists
by Sergey Safarov 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 094f584901ff4a4c60b6119b3fd7563472b2f88f URL: https://github.com/kamailio/kamailio/commit/094f584901ff4a4c60b6119b3fd7563… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:36Z pkg/kamailio/obs: Fixed bdb module build on fedora dists (cherry picked from commit 2c077b0434037f1b0f6b37d6026235b206ddbbb2) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/094f584901ff4a4c60b6119b3fd7563… Patch: https://github.com/kamailio/kamailio/commit/094f584901ff4a4c60b6119b3fd7563… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 85f8e4359f..57c3122257 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -212,6 +212,12 @@ BuildRequires: bison, flex %if 0%{?suse_version} BuildRequires: systemd-mini, shadow %endif +%if 0%{?fedora} == 27 +BuildRequires: python3-devel +%endif +%if 0%{?fedora} == 28 +BuildRequires: python3-devel +%endif %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -253,8 +259,13 @@ Requires: kamailio = %ver Requires: libdb-4_8 BuildRequires: libdb-4_8-devel %else +%if 0%{?rhel} == 6 Requires: db4 BuildRequires: db4-devel +%else +Requires: libdb +BuildRequires: libdb-devel +%endif %endif %description bdb @@ -1121,6 +1132,9 @@ install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ %if 0%{?suse_version} %py_compile -O %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb %endif +%if 0%{?fedora} +%py_byte_compile %{__python2} %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb +%endif # Removing devel files rm -f %{buildroot}%{_libdir}/kamailio/lib*.so

1 0

git:5.1:8f6d085c: pkg/kamailio/obs: Updated obs meta
by Sergey Safarov 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 8f6d085cda34dc6d9edb043f8c8eb548af0090cb URL: https://github.com/kamailio/kamailio/commit/8f6d085cda34dc6d9edb043f8c8eb54… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:35Z pkg/kamailio/obs: Updated obs meta (cherry picked from commit 3c9547334166d43aa1e2cba8b9dab6e78dfed66a) --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/8f6d085cda34dc6d9edb043f8c8eb54… Patch: https://github.com/kamailio/kamailio/commit/8f6d085cda34dc6d9edb043f8c8eb54… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 32e9e9ffb7..452d5d764d 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -1,6 +1,6 @@ -<project name="home:kamailio:v5.0.x-rpms"> - <title>RPM Packages for Kamailio v5.0.x</title> - <description>RPM Packages for Kamailio v5.0.x</description> +<project name="home:kamailio:v5.1.x-rpms"> + <title>RPM Packages for Kamailio v5.1.x</title> + <description>RPM Packages for Kamailio v5.1.x</description> <person userid="kamailio" role="maintainer"/> <repository name="openSUSE_Tumbleweed"> <path project="openSUSE:Factory" repository="snapshot"/> @@ -24,20 +24,19 @@ <path project="Fedora:EPEL:6" repository="RHEL"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_27"> - <path project="Fedora:27" repository="update"/> - <path project="Fedora:27" repository="standard"/> + <repository name="Fedora_29"> + <path project="Fedora:29" repository="update"/> + <path project="Fedora:29" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_26"> - <path project="Fedora:26" repository="update"/> - <path project="Fedora:26" repository="standard"/> + <repository name="Fedora_28"> + <path project="Fedora:28" repository="update"/> + <path project="Fedora:28" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_25"> - <path project="Fedora:25" repository="update"/> - <path project="Fedora:25" repository="standard"/> - <arch>i586</arch> + <repository name="Fedora_27"> + <path project="Fedora:27" repository="update"/> + <path project="Fedora:27" repository="standard"/> <arch>x86_64</arch> </repository> <repository name="CentOS_7">

1 0

git:5.1:18bf0d3a: pkg/kamailio/ops: Added MongoDB rpm package
by Sergey Safarov 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 18bf0d3a34794606f06e9740d881badca50cfd5a URL: https://github.com/kamailio/kamailio/commit/18bf0d3a34794606f06e9740d881bad… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:35Z pkg/kamailio/ops: Added MongoDB rpm package (cherry picked from commit 702bfff175efaf25202e1644e39d143886ce7886) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/18bf0d3a34794606f06e9740d881bad… Patch: https://github.com/kamailio/kamailio/commit/18bf0d3a34794606f06e9740d881bad… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 56c6208a28..85f8e4359f 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rebbitmq %bcond_without redis @@ -34,6 +35,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -54,6 +56,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -74,6 +77,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rebbitmq %bcond_with redis @@ -95,6 +99,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rebbitmq %bcond_without redis @@ -115,6 +120,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rebbitmq %bcond_without redis @@ -135,6 +141,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_with mongodb %bcond_with perl %bcond_with rebbitmq %bcond_with redis @@ -155,6 +162,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_without mongodb %bcond_without perl %bcond_without rebbitmq %bcond_without redis @@ -187,7 +195,7 @@ Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver Conflicts: kamailio-rabbitmq < %ver -Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver +Conflicts: kamailio-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver @@ -530,6 +538,19 @@ Memcached configuration file support for Kamailio. %endif +%if %{with mongodb} +%package mongodb +Summary: MongoDB database connectivity for Kamailio +Group: System Environment/Daemons +Requires: kamailio = %ver +Requires: mongo-c-driver +BuildRequires: mongo-c-driver-devel + +%description mongodb +MongoDB database connectivity for Kamailio. +%endif + + %package mysql Summary: MySQL database connectivity for Kamailio Group: System Environment/Daemons @@ -971,6 +992,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1040,6 +1064,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1638,6 +1665,16 @@ fi %endif +%if %{with mongodb} +%files mongodb +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.db_mongodb +%doc %{_docdir}/kamailio/modules/README.ndb_mongodb +%{_libdir}/kamailio/modules/db_mongodb.so +%{_libdir}/kamailio/modules/ndb_mongodb.so +%endif + + %files mysql %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_mysql

1 0

git:5.1:8ebb8932: pkg/kamailio/obs: Removed end of life dist
by Sergey Safarov 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 8ebb8932c43ccbe1693062058bf779591eb84360 URL: https://github.com/kamailio/kamailio/commit/8ebb8932c43ccbe1693062058bf7795… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:35Z pkg/kamailio/obs: Removed end of life dist (cherry picked from commit 9aa98b12b3b7f3841facc20fee4873d8b3dc5fff) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/8ebb8932c43ccbe1693062058bf7795… Patch: https://github.com/kamailio/kamailio/commit/8ebb8932c43ccbe1693062058bf7795… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index fb3ae45af3..56c6208a28 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2,46 +2,6 @@ %define ver 5.1.6 %define rel 0%{dist} -%if 0%{?fedora} == 25 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without perl -%bcond_without rebbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 26 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without perl -%bcond_without rebbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - %if 0%{?fedora} == 27 %define dist_name fedora %define dist_version %{?fedora} @@ -944,19 +904,14 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} -ln -s ../obs pkg/kamailio/fedora/24 -ln -s ../obs pkg/kamailio/fedora/25 -ln -s ../obs pkg/kamailio/fedora/26 ln -s ../obs pkg/kamailio/fedora/27 ln -s ../obs pkg/kamailio/fedora/28 ln -s ../obs pkg/kamailio/fedora/29 -mkdir -p pkg/kamailio/rhel ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 -mkdir -p pkg/kamailio/opensuse ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 -mkdir -p pkg/kamailio/centos +ln -s ../obs pkg/kamailio/opensuse/1550 ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7 @@ -1959,6 +1914,8 @@ fi %changelog +* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> + - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov <s.safarov(a)gmail.com> - added packaging for Fedora 26 and openSUSE Leap 42.3 - removed packaging for Fedora 24 and openSUSE Leap 42.1 as End Of Life

1 0

git:master:2b295f83: Makefile.defs: use $(prefix) for setting share_target
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Module: kamailio Branch: master Commit: 2b295f83e1c40637012633b6cab2ad86415d4623 URL: https://github.com/kamailio/kamailio/commit/2b295f83e1c40637012633b6cab2ad8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-06T16:17:58+01:00 Makefile.defs: use $(prefix) for setting share_target - GH #1709 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2b295f83e1c40637012633b6cab2ad8… Patch: https://github.com/kamailio/kamailio/commit/2b295f83e1c40637012633b6cab2ad8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 86c9fafce9..8097402231 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -497,7 +497,7 @@ bin_target = $(prefix)/$(bin_dir) #modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) run_target = $(run_prefix)/$(run_dir) -share_target = $(share_prefix)/$(share_dir) +share_target = $(prefix)/$(share_dir) doc_target = $(prefix)/$(doc_dir) data_target = $(prefix)/$(data_dir) @@ -2095,7 +2095,8 @@ saved_chg_vars:=\ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \ - cfg_target lib_target data_target run_prefix run_dir run_target + cfg_target lib_target data_target run_prefix run_dir run_target \ + share_target #export relevant variables to the sub-makes

1 0

git:5.2:249e019d: pkg/kamailio/deb: version set 5.2.0~rc0
by Victor Seva 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.2 Commit: 249e019d555387e49bf8641b32caa4f24fbb26ee URL: https://github.com/kamailio/kamailio/commit/249e019d555387e49bf8641b32caa4f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-06T10:36:04+01:00 pkg/kamailio/deb: version set 5.2.0~rc0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/249e019d555387e49bf8641b32caa4f… Patch: https://github.com/kamailio/kamailio/commit/249e019d555387e49bf8641b32caa4f…

1 0

git:master:81b4855e: pkg/kamailio/deb: version set 5.3.0~dev0
by Victor Seva 06 Nov '18

06 Nov '18

Module: kamailio Branch: master Commit: 81b4855e38796b2339a6f3602c6a55d26555bcc6 URL: https://github.com/kamailio/kamailio/commit/81b4855e38796b2339a6f3602c6a55d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-06T10:33:58+01:00 pkg/kamailio/deb: version set 5.3.0~dev0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/81b4855e38796b2339a6f3602c6a55d… Patch: https://github.com/kamailio/kamailio/commit/81b4855e38796b2339a6f3602c6a55d…

1 0

Development is open for future release v5.3.x series
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Hello, with the creation of branch 5.2 done this morning, the master branch is from now on open for adding new features, to be part of future release series v5.3.x. Any bug fix committed to master that applies to 5.2.x or older stable branches should be backported as usual with git cherry-pick to appropriate branches like 5.2 or 5.1. Expect that v5.2.0 will be released in about 2-3 weeks from now. Based on the workflow used during the past years, the next future release v5.3.0 should be out after another 8-10 months of development, plus 1-2 months of testing, so sometime in the summer or autumn of 2019. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 0

Branch 5.2 has been created
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Hello, the branch 5.2 has been created, to be used for releasing v5.2.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.2 cd kamailio-5.2 git checkout -b 5.2 origin/5.2 Pushing commits in this branch: git push origin 5.2:5.2 Note that 5.2 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.2 branch. In few weeks, the first release from branch 5.2 will be out, respectively Kamailio v5.2.0. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 0

git:5.2:646b00c7: Makefile.defs: version set to 5.2.0-rc0
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.2 Commit: 646b00c76bab0b1c3d6ffc2d755aeae70e45c45e URL: https://github.com/kamailio/kamailio/commit/646b00c76bab0b1c3d6ffc2d755aeae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-06T08:56:11+01:00 Makefile.defs: version set to 5.2.0-rc0 - branch for v5.2 release series has been created - branch name 5.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/646b00c76bab0b1c3d6ffc2d755aeae… Patch: https://github.com/kamailio/kamailio/commit/646b00c76bab0b1c3d6ffc2d755aeae… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index fb8820cb4c..13ff1b0188 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre3 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

Failed: kamailio/kamailio#6618 (5.3 - 707d7cd)
by Travis CI 06 Nov '18

06 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6618 Status: Failed Duration: 10 mins and 35 secs Commit: 707d7cd (5.3) Author: Daniel-Constantin Mierla Message: Makefile.defs: version set to 5.2.0-pre3 View the changeset: https://github.com/kamailio/kamailio/compare/5.3 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/451247164?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:133b7e32: Makefile.defs: version set to 5.3.0-dev0
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Module: kamailio Branch: master Commit: 133b7e327519790221be3fd1e87f204aaf8c9100 URL: https://github.com/kamailio/kamailio/commit/133b7e327519790221be3fd1e87f204… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-06T08:54:36+01:00 Makefile.defs: version set to 5.3.0-dev0 - master branch is open for new features to be part of v5.3 release series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/133b7e327519790221be3fd1e87f204… Patch: https://github.com/kamailio/kamailio/commit/133b7e327519790221be3fd1e87f204… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index fb8820cb4c..86c9fafce9 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 2 +PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -pre3 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:707d7cdc: Makefile.defs: version set to 5.2.0-pre3
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Module: kamailio Branch: master Commit: 707d7cdcb971b77b96ac854aa1432abae04ec7a8 URL: https://github.com/kamailio/kamailio/commit/707d7cdcb971b77b96ac854aa1432ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-06T08:44:46+01:00 Makefile.defs: version set to 5.2.0-pre3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/707d7cdcb971b77b96ac854aa1432ab… Patch: https://github.com/kamailio/kamailio/commit/707d7cdcb971b77b96ac854aa1432ab… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 19e7d87e72..fb8820cb4c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -pre3 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] ims_diameter_server: fixing avp nested list #1686 (#1707)
by Rick 05 Nov '18

05 Nov '18

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1686 (replace XXXX with an open issue number) #### Description  Fixes nested lists avp You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1707 -- Commit Summary -- * ims_diameter_server: fixing avp nested list #1686 -- File Changes -- M src/modules/ims_diameter_server/avp_helper.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1707.patch https://github.com/kamailio/kamailio/pull/1707.diff -- 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/pull/1707

2 1

git:master:54f71b4d: Merge pull request #1707 from dunst0/fix/ims_diameter_server
by GitHub 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 54f71b4df5e64a87463098a081b1014458637766 URL: https://github.com/kamailio/kamailio/commit/54f71b4df5e64a87463098a081b1014… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-05T14:49:05+01:00 Merge pull request #1707 from dunst0/fix/ims_diameter_server ims_diameter_server: fixing avp nested list #1686 --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/54f71b4df5e64a87463098a081b1014… Patch: https://github.com/kamailio/kamailio/commit/54f71b4df5e64a87463098a081b1014… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index ab3974ac1f..04e2d6d967 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -342,8 +342,17 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level avp_list_s = cdpb.AAAGroupAVPS(avp_list); cdpb.AAAFreeAVPList(&avp_list); - diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, - cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_FREE_DATA, __FUNCTION__); + if(list) { + diameterserver_add_avp_list(list, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } else { + diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } } else if (cJSON_GetObjectItem(item,"int32")) { set_4bytes(x, cJSON_GetObjectItem(item,"int32")->valueint); if (list) {

1 0

git:master:7925c374: ims_diameter_server: fixing avp nested list #1686
by Rick Barenthin 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 7925c3749b36a24615695b026983862ba03301b0 URL: https://github.com/kamailio/kamailio/commit/7925c3749b36a24615695b026983862… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Rick Barenthin <rick(a)ng-voice.com> Date: 2018-11-04T10:48:17+01:00 ims_diameter_server: fixing avp nested list #1686 --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/7925c3749b36a24615695b026983862… Patch: https://github.com/kamailio/kamailio/commit/7925c3749b36a24615695b026983862… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 9f6b67cf2e..9bfde85571 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -338,8 +338,17 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level avp_list_s = cdpb.AAAGroupAVPS(avp_list); cdpb.AAAFreeAVPList(&avp_list); - diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, - cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_FREE_DATA, __FUNCTION__); + if(list) { + diameterserver_add_avp_list(list, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } else { + diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } } else if (cJSON_GetObjectItem(item,"int32")) { set_4bytes(x, cJSON_GetObjectItem(item,"int32")->valueint); if (list) {

1 0

git:master:e8aec6d1: regex: fixed section ids for functions
by Daniel-Constantin Mierla 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: e8aec6d15bcef95f628108398e682571763464c5 URL: https://github.com/kamailio/kamailio/commit/e8aec6d15bcef95f628108398e68257… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T12:53:06+01:00 regex: fixed section ids for functions - removed trailing whitespaces --- Modified: src/modules/regex/doc/regex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e8aec6d15bcef95f628108398e68257… Patch: https://github.com/kamailio/kamailio/commit/e8aec6d15bcef95f628108398e68257…

1 0

[kamailio/kamailio] Crash ims_diameter_server module (#1686)
by iman432 05 Nov '18

05 Nov '18

Hi dears When the below format from restful is sent, kamailio crashes List List List (Json with 3 lists), With 2 lists it works properly, When diameter is translated to json with 3 lists by this module it also works properly, Json format is correct too. Where is problem? Thanks -- 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/1686

3 7

git:master:c9845c33: ims_diameter_server: safety check for diameter message parameter
by Daniel-Constantin Mierla 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: c9845c330ec0ed323d6dd098a746a7374642f1c6 URL: https://github.com/kamailio/kamailio/commit/c9845c330ec0ed323d6dd098a746a73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T10:45:38+01:00 ims_diameter_server: safety check for diameter message parameter - GH #1686 --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/c9845c330ec0ed323d6dd098a746a73… Patch: https://github.com/kamailio/kamailio/commit/c9845c330ec0ed323d6dd098a746a73… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 9f6b67cf2e..ab3974ac1f 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -200,6 +200,10 @@ int pv_get_request(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { */ int diameterserver_add_avp(AAAMessage *m, char *d, int len, int avp_code, int flags, int vendorid, int data_do, const char *func) { AAA_AVP *avp; + if(m==NULL) { + LM_ERR("invalid diamemter message parameter\n"); + return 0; + } if (vendorid != 0) flags |= AAA_AVP_FLAG_VENDOR_SPECIFIC; avp = cdpb.AAACreateAVP(avp_code, flags, vendorid, d, len, data_do); if (!avp) {

1 0

[kamailio/kamailio] [CentOS 7] Kamailio 5.1.x mongodb package missing in OpenSUSE repo (#1702)
by denyspozniak 05 Nov '18

05 Nov '18

Hello! @sergey-safarov, please add module DB_MONGODB to the OpenSUSE repo (home:kamailio:v5.1.x-rpms.repo). -- 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/1702

3 3

git:master:a1672d29: Merge pull request #1705 from sergey-safarov/mongodb
by GitHub 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: a1672d2903c581ff5ae462f6db55979bedbde809 URL: https://github.com/kamailio/kamailio/commit/a1672d2903c581ff5ae462f6db55979… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-05T10:28:51+01:00 Merge pull request #1705 from sergey-safarov/mongodb pkg/kamailio/ops: Added MongoDB rpm package --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/a1672d2903c581ff5ae462f6db55979… Patch: https://github.com/kamailio/kamailio/commit/a1672d2903c581ff5ae462f6db55979…

1 0

git:master:2c077b04: pkg/kamailio/obs: Fixed bdb module build on fedora dists
by Sergey Safarov 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 2c077b0434037f1b0f6b37d6026235b206ddbbb2 URL: https://github.com/kamailio/kamailio/commit/2c077b0434037f1b0f6b37d6026235b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-04T11:25:12Z pkg/kamailio/obs: Fixed bdb module build on fedora dists --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2c077b0434037f1b0f6b37d6026235b… Patch: https://github.com/kamailio/kamailio/commit/2c077b0434037f1b0f6b37d6026235b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d5b4dafd9e..c0356d8f73 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -213,6 +213,12 @@ BuildRequires: bison, flex %if 0%{?suse_version} BuildRequires: systemd-mini, shadow %endif +%if 0%{?fedora} == 27 +BuildRequires: python3-devel +%endif +%if 0%{?fedora} == 28 +BuildRequires: python3-devel +%endif %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -271,8 +277,13 @@ Requires: kamailio = %ver Requires: libdb-4_8 BuildRequires: libdb-4_8-devel %else +%if 0%{?rhel} == 6 Requires: db4 BuildRequires: db4-devel +%else +Requires: libdb +BuildRequires: libdb-devel +%endif %endif %description bdb @@ -1141,6 +1152,9 @@ install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ %if 0%{?suse_version} %py_compile -O %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb %endif +%if 0%{?fedora} +%py_byte_compile %{__python2} %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb +%endif # Removing devel files rm -f %{buildroot}%{_libdir}/kamailio/lib*.so

1 0

[kamailio/kamailio] pkg/kamailio/ops: Added MongoDB rpm package (#1705)
by sergey-safarov 05 Nov '18

05 Nov '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1702 #### Description You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1705 -- Commit Summary -- * pkg/kamailio/ops: Added MongoDB rpm package -- File Changes -- M pkg/kamailio/obs/kamailio.spec (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1705.patch https://github.com/kamailio/kamailio/pull/1705.diff -- 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/pull/1705

2 2

git:master:3c954733: pkg/kamailio/obs: Updated obs meta
by Sergey Safarov 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 3c9547334166d43aa1e2cba8b9dab6e78dfed66a URL: https://github.com/kamailio/kamailio/commit/3c9547334166d43aa1e2cba8b9dab6e… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-04T07:34:34Z pkg/kamailio/obs: Updated obs meta --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/3c9547334166d43aa1e2cba8b9dab6e… Patch: https://github.com/kamailio/kamailio/commit/3c9547334166d43aa1e2cba8b9dab6e… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 46eeb8c182..41bf5745bd 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -1,6 +1,6 @@ -<project name="home:kamailio:v5.0.x-rpms"> - <title>RPM Packages for Kamailio v5.0.x</title> - <description>RPM Packages for Kamailio v5.0.x</description> +<project name="home:kamailio:v5.2.x-rpms"> + <title>RPM Packages for Kamailio v5.2.x</title> + <description>RPM Packages for Kamailio v5.2.x</description> <person userid="kamailio" role="maintainer"/> <repository name="openSUSE_Tumbleweed"> <path project="openSUSE:Factory" repository="snapshot"/> @@ -24,15 +24,19 @@ <path project="Fedora:EPEL:6" repository="RHEL"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_26"> - <path project="Fedora:26" repository="update"/> - <path project="Fedora:26" repository="standard"/> + <repository name="Fedora_29"> + <path project="Fedora:29" repository="update"/> + <path project="Fedora:29" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_25"> - <path project="Fedora:25" repository="update"/> - <path project="Fedora:25" repository="standard"/> - <arch>i586</arch> + <repository name="Fedora_28"> + <path project="Fedora:28" repository="update"/> + <path project="Fedora:28" repository="standard"/> + <arch>x86_64</arch> + </repository> + <repository name="Fedora_27"> + <path project="Fedora:27" repository="update"/> + <path project="Fedora:27" repository="standard"/> <arch>x86_64</arch> </repository> <repository name="CentOS_7">

1 0

git:master:702bfff1: pkg/kamailio/ops: Added MongoDB rpm package
by Sergey Safarov 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 702bfff175efaf25202e1644e39d143886ce7886 URL: https://github.com/kamailio/kamailio/commit/702bfff175efaf25202e1644e39d143… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-04T07:34:34Z pkg/kamailio/ops: Added MongoDB rpm package --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/702bfff175efaf25202e1644e39d143… Patch: https://github.com/kamailio/kamailio/commit/702bfff175efaf25202e1644e39d143… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index db0a6971c6..d5b4dafd9e 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -34,6 +35,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -54,6 +56,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -74,6 +77,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rabbitmq %bcond_with redis @@ -95,6 +99,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -115,6 +120,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rabbitmq %bcond_without redis @@ -135,6 +141,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_with mongodb %bcond_with perl %bcond_with rabbitmq %bcond_with redis @@ -155,6 +162,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -188,7 +196,7 @@ Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver Conflicts: kamailio-rabbitmq < %ver -Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver +Conflicts: kamailio-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver @@ -541,6 +549,19 @@ Memcached configuration file support for Kamailio. %endif +%if %{with mongodb} +%package mongodb +Summary: MongoDB database connectivity for Kamailio +Group: System Environment/Daemons +Requires: kamailio = %ver +Requires: mongo-c-driver +BuildRequires: mongo-c-driver-devel + +%description mongodb +MongoDB database connectivity for Kamailio. +%endif + + %package mysql Summary: MySQL database connectivity for Kamailio Group: System Environment/Daemons @@ -991,6 +1012,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1060,6 +1084,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1668,6 +1695,16 @@ fi %endif +%if %{with mongodb} +%files mongodb +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.db_mongodb +%doc %{_docdir}/kamailio/modules/README.ndb_mongodb +%{_libdir}/kamailio/modules/db_mongodb.so +%{_libdir}/kamailio/modules/ndb_mongodb.so +%endif + + %files mysql %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_mysql

1 0

git:master:9aa98b12: pkg/kamailio/obs: Removed end of life dist
by Sergey Safarov 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 9aa98b12b3b7f3841facc20fee4873d8b3dc5fff URL: https://github.com/kamailio/kamailio/commit/9aa98b12b3b7f3841facc20fee4873d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-04T07:34:16Z pkg/kamailio/obs: Removed end of life dist --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9aa98b12b3b7f3841facc20fee4873d… Patch: https://github.com/kamailio/kamailio/commit/9aa98b12b3b7f3841facc20fee4873d… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index eef0d607d4..db0a6971c6 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2,66 +2,6 @@ %define ver 5.2.0 %define rel dev1.0%{dist} -%if 0%{?fedora} == 24 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without perl -%bcond_without rabbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 25 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without perl -%bcond_without rabbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 26 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without perl -%bcond_without rabbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - %if 0%{?fedora} == 27 %define dist_name fedora %define dist_version %{?fedora} @@ -984,19 +924,14 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} -ln -s ../obs pkg/kamailio/fedora/24 -ln -s ../obs pkg/kamailio/fedora/25 -ln -s ../obs pkg/kamailio/fedora/26 ln -s ../obs pkg/kamailio/fedora/27 ln -s ../obs pkg/kamailio/fedora/28 ln -s ../obs pkg/kamailio/fedora/29 -mkdir -p pkg/kamailio/rhel ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 -mkdir -p pkg/kamailio/opensuse ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 -mkdir -p pkg/kamailio/centos +ln -s ../obs pkg/kamailio/opensuse/1550 ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7 @@ -2025,6 +1960,8 @@ fi %changelog +* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> + - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov <s.safarov(a)gmail.com> - added packaging for Fedora 26 and openSUSE Leap 42.3 - removed packaging for Fedora 24 and openSUSE Leap 42.1 as End Of Life

1 0

git:master:88ebe33b: rabbitmq: call function to release the amqp buffers
by Daniel-Constantin Mierla 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 88ebe33b6f8a21df6fa0720fef62dabe6b089c87 URL: https://github.com/kamailio/kamailio/commit/88ebe33b6f8a21df6fa0720fef62dab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T10:20:02+01:00 rabbitmq: call function to release the amqp buffers --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/88ebe33b6f8a21df6fa0720fef62dab… Patch: https://github.com/kamailio/kamailio/commit/88ebe33b6f8a21df6fa0720fef62dab… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index a5982608d3..373b5dd036 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -238,6 +238,7 @@ static int ki_rabbitmq_publish(sip_msg_t *msg, str *exchange, str *routingkey, LM_ERR("FAIL: amqp_basic_publish()\n"); // cleanup + amqp_maybe_release_buffers(amqp_conn); amqp_channel_close(amqp_conn, 1, AMQP_REPLY_SUCCESS); // error @@ -248,6 +249,7 @@ static int ki_rabbitmq_publish(sip_msg_t *msg, str *exchange, str *routingkey, LM_DBG("SUCCESS: amqp_basic_publish()\n"); // cleanup + amqp_maybe_release_buffers(amqp_conn); amqp_channel_close(amqp_conn, 1, AMQP_REPLY_SUCCESS); // success

1 0

git:master:4f303b6f: rabbitmq: renamed global variable, same name being used in some functions
by Daniel-Constantin Mierla 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 4f303b6fd548e89c59b074db94656f58aaff6adf URL: https://github.com/kamailio/kamailio/commit/4f303b6fd548e89c59b074db94656f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T09:29:01+01:00 rabbitmq: renamed global variable, same name being used in some functions - global variables made static --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/4f303b6fd548e89c59b074db94656f5… Patch: https://github.com/kamailio/kamailio/commit/4f303b6fd548e89c59b074db94656f5…

1 0

git:master:0d869c90: misc/examples: check return code for has_totag() in kemi lua script
by Daniel-Constantin Mierla 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 0d869c90eff536aea0f42c7e368535fec344f2f2 URL: https://github.com/kamailio/kamailio/commit/0d869c90eff536aea0f42c7e368535f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T08:17:01+01:00 misc/examples: check return code for has_totag() in kemi lua script --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/0d869c90eff536aea0f42c7e368535f… Patch: https://github.com/kamailio/kamailio/commit/0d869c90eff536aea0f42c7e368535f… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index 295d502aa1..3c67942cf0 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -299,7 +299,7 @@ function ksr_route_natmanage() KSR.rtpproxy.rtpproxy_manage("co"); if KSR.siputils.is_request()>0 then - if not KSR.siputils.has_totag() then + if KSR.siputils.has_totag()<0 then if KSR.tmx.t_is_branch_route()>0 then KSR.rr.add_rr_param(";nat=yes"); end

1 0

git:master:3afc0351: misc/examples: use dedicated functions to test method types in kemi lua script
by Daniel-Constantin Mierla 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 3afc03510fd1d6a9e2865059ce3c4f38efd14af7 URL: https://github.com/kamailio/kamailio/commit/3afc03510fd1d6a9e2865059ce3c4f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T08:56:34+01:00 misc/examples: use dedicated functions to test method types in kemi lua script --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/3afc03510fd1d6a9e2865059ce3c4f3… Patch: https://github.com/kamailio/kamailio/commit/3afc03510fd1d6a9e2865059ce3c4f3…

1 0

5.2.x OBS: CentOS/RHEL RPMs build app_python3.so with Software Collections?
by Anthony Alba 05 Nov '18

05 Nov '18

Hi kamailio devs, Looking forward to 5.2.x builds: unfortunately

1 0

[kamailio/kamailio] Issues with single Kamailio process in two networks/vlans (#1703)
by Thomas Lobker 04 Nov '18

04 Nov '18

To start off. Please forgive me, I'm not completely sure if this is an issue in Kamailio, or an issue in Linux that I'm overseeing. But I could really use a helping hand. ### Description I have a setup with a Kamailio load-balancer and a secondary proxy that is handling all the complex work, let's call them balancer and core proxy. The core proxy is only listening on a private network, that's a separate VLAN with an rfc1918 IP address. The balancer is listening on that network too, but it has also a listening socket on a different VLAN with a public internet IP address. ``` Balancer: - Public IP : 150.0.0.51 (interface ens9, vlan 150) ---- - Private IP : 10.0.0.51 (interface ens3, vlan 10) | | Core: | - Private IP : 10.0.0.52 (interface ens3, vlan 10) <------ ```` When I'm sending an INVITE I see the balancer receiving the UDP packet on `150.0.0.51` and relaying it from the same address to `10.0.0.52`. On the core proxy (different server) I can see the packet coming in with tcpdump or ngrep. Kamailio seems to completely ignore this packet. Bumping up the debug level to the maximum still results in no logging at all when I send the SIP packet. Now I can work around this issue by forcing the send socket to use the private IP on the balancer. But this introduces new problems in my environment, because I have actually many balancers and core proxies in a high availability setup and the return path to the user should always remain the same. We can also work around this issue by exposing a public IP to the core proxy (and other internal proxies). But I really would like to keep only the load-balancer exposed to the internet. I have this working with Kamailio `5.1.1` in an existing environment, but now we are moving from Ubuntu `16.04` to Ubuntu `18.04` and updating Kamailio to `5.1.6` and it's not working anymore. ### Additional Information * **Kamailio Version**: ``` Tested with 5.1.6 and 5.1.2 ``` * **Operating System**: ``` Ubuntu 18.04.1 LTS 4.15.0-33-generic #36-Ubuntu SMP Wed Aug 15 16:00:05 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` ### Logging I can see a `REGISTER` packet like this coming in on the core proxy (with many retransmissions), here is the `ngrep` output captured on the core proxy on interface `ens3`: Not working: ``` # U 2018/11/01 18:57:55.548408 150.0.0.51:5060 -> 10.0.0.52:5060 REGISTER sip:my.domain SIP/2.0. Via: SIP/2.0/UDP 150.0.0.51;branch=xxx. Via: SIP/2.0/UDP 10.x.x.x:34904;received=x.x.x.x;branch=xxx;rport=34904. From: "200" <sip:200@my.domain>;tag=xxx. To: "200" <sip:200@my.domain>. Call-ID: xxx. CSeq: 565 REGISTER. Max-Forwards: 69. User-Agent: snomD345/8.9.3.33. [...] ``` But when I force the source socket to be the private address: Working: ``` # U 2018/11/01 19:03:42.914001 10.0.0.51:5060 -> 10.0.0.52:5060 REGISTER sip:my.domain SIP/2.0. Via: SIP/2.0/UDP 150.0.0.51;branch=xxx. Via: SIP/2.0/UDP 10.x.x.x:34904;received=x.x.x.x;branch=xxx;rport=34904. From: "200" <sip:200@my.domain>;tag=xxx. To: "200" <sip:200@my.domain>. Call-ID: xxx. CSeq: 587 REGISTER. Max-Forwards: 69. User-Agent: snomD345/8.9.3.33. [...] ``` Now Kamailio is processing the request normally for some reason. Any help or suggestions will be appreciated. -- 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/1703

4 8

report about kamailio developer meeting
by Henning Westerholt 03 Nov '18

03 Nov '18

Hello, I've published a small report about the results of the developer meeting in Düsseldorf about one month ago. 256 commits in two days! https://skalatan.de/blog/kamailio-hackathon-2018 Best regards, Henning

1 0

git:master:e8b90500: kazoo: add kz prefix to str_split utility function
by Henning Westerholt 02 Nov '18

02 Nov '18

Module: kamailio Branch: master Commit: e8b905006e1a768cd8e328bd836ac43e5a2bc2f2 URL: https://github.com/kamailio/kamailio/commit/e8b905006e1a768cd8e328bd836ac43… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-02T19:27:27+01:00 kazoo: add kz prefix to str_split utility function - add kz prefix to str_split utility function, to prevent overlapping with a function with similar name in the json module --- Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/e8b905006e1a768cd8e328bd836ac43… Patch: https://github.com/kamailio/kamailio/commit/e8b905006e1a768cd8e328bd836ac43… --- diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 4fd30998f6..5ab8f68c79 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -49,7 +49,7 @@ enum json_type kz_json_get_type(struct json_object *jso) typedef str* json_key; typedef json_key* json_keys; -json_keys str_split(char* a_str, const char a_delim, int* c) +json_keys kz_str_split(char* a_str, const char a_delim, int* c) { json_keys result = 0; int count = 0; @@ -145,7 +145,7 @@ struct json_object * kz_json_get_field_object(str* json, str* field) dup = pkg_malloc(field->len+1); memcpy(dup, field->s, field->len); dup[field->len] = '\0'; - keys = str_split(dup, '.', &parts); + keys = kz_str_split(dup, '.', &parts); pkg_free(dup); if (keys)

1 0

Build failed in Jenkins: kamailio44-nightly-binaries » i386,squeeze,slave #128
by kamailio＠sipwise.com 02 Nov '18

02 Nov '18

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> ------------------------------------------ [...truncated 360.27 KB...] + '[' 3600 -eq 0 ']' + touch /var/run/lock/squeeze-i386.building.3467 + case "$architecture" in + linux32 sudo DIST=squeeze ARCH=i386 cowbuilder --buildresult <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> --build <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> --basepath /var/cache/pbuilder/base-squeeze-i386.cow --debbuildopts -B --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts '/tmp/apt-jdg_cwE6xn ' --configfile=/tmp/tmp.9M3renpBjV -> Copying COW directory forking: rm -rf /var/cache/pbuilder/build//cow.11132 forking: cp -al /var/cache/pbuilder/base-squeeze-i386.cow /var/cache/pbuilder/build//cow.11132 I: removed stale ilistfile /var/cache/pbuilder/build//cow.11132/.ilist forking: chroot /var/cache/pbuilder/build//cow.11132 cowdancer-ilistcreate /.ilist find . -xdev -path ./home -prune -o $ \( -type l -o -type f $ -a -links +1 -print0 \) | xargs -0 stat --format '%d %i ' -> Invoking pbuilder forking: pbuilder build --debbuildopts -B --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts /tmp/apt-jdg_cwE6xn --configfile /tmp/tmp.9M3renpBjV --buildplace /var/cache/pbuilder/build//cow.11132 --buildresult <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> --debbuildopts -B --no-targz --internal-chrootexec chroot /var/cache/pbuilder/build//cow.11132 cow-shell <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> W: /root/.pbuilderrc does not exist I: Running in no-targz mode I: using fakeroot in build. I: pbuilder: network access will be disabled during build I: Current time: Tue Oct 30 04:27:20 UTC 2018 I: pbuilder-time-stamp: 1540873640 I: copying local configuration I: mounting /proc filesystem I: mounting /run/shm filesystem I: mounting /dev/pts filesystem I: Mounting /tmp/apt-jdg_cwE6xn I: policy-rc.d already exists I: Obtaining the cached apt archive contents I: Installing the build-deps I: user script /var/cache/pbuilder/build/cow.11132/tmp/hooks/D10-man-db starting I: Preseed man-db/auto-update to false I: user script /var/cache/pbuilder/build/cow.11132/tmp/hooks/D10-man-db finished I: user script /var/cache/pbuilder/build/cow.11132/tmp/hooks/D20releaserepo starting + set -- /tmp/apt-jdg_cwE6xn/ + TMPAPT=/tmp/apt-jdg_cwE6xn/ + [ -d /tmp/apt-jdg_cwE6xn/ ] + UPDATE_PKGLIST=0 + ls /tmp/apt-jdg_cwE6xn/*.list + [ -e /tmp/apt-jdg_cwE6xn//keyring.gpg ] + [ 0 = 1 ] I: user script /var/cache/pbuilder/build/cow.11132/tmp/hooks/D20releaserepo finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy Version: 0.invalid.0 Architecture: i386 Maintainer: Debian Pbuilder Team <pbuilder-maint(a)lists.alioth.debian.org> Description: Dummy package to satisfy dependencies with aptitude - created by pbuilder This package was created automatically by pbuilder to satisfy the build-dependencies of the package being currently built. Depends: bison, debhelper (>= 8), libmysqlclient-dev, docbook-xml, erlang-dev, flex, libconfuse-dev, libcurl4-openssl-dev, libdb-dev (>= 4.6.19), libev-dev, libevent-dev, libexpat1-dev, libgeoip-dev (>= 1.4.5), libjson0-dev, libldap2-dev, liblua5.1-0-dev, libmemcached-dev, libncurses5-dev, libpcre3-dev, libperl-dev, libpq-dev, libradiusclient-ng-dev, libreadline-dev, libsasl2-dev, libsnmp-dev, libsqlite3-dev, libunistring-dev, libxml2-dev, libxmlrpc-c3-dev, openssl, pkg-config, python, python-dev, unixodbc-dev, uuid-dev, xsltproc, zlib1g-dev dpkg-deb: building package `pbuilder-satisfydepends-dummy' in `/tmp/satisfydepends-aptitude/pbuilder-satisfydepends-dummy.deb'. Selecting previously deselected package pbuilder-satisfydepends-dummy. (Reading database ... 10562 files and directories currently installed.) Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ... dpkg: pbuilder-satisfydepends-dummy: dependency problems, but configuring anyway as you requested: pbuilder-satisfydepends-dummy depends on bison; however: Package bison is not installed. pbuilder-satisfydepends-dummy depends on debhelper (>= 8); however: Package debhelper is not installed. pbuilder-satisfydepends-dummy depends on libmysqlclient-dev; however: Package libmysqlclient-dev is not installed. pbuilder-satisfydepends-dummy depends on docbook-xml; however: Package docbook-xml is not installed. pbuilder-satisfydepends-dummy depends on erlang-dev; however: Package erlang-dev is not installed. pbuilder-satisfydepends-dummy depends on flex; however: Package flex is not installed. pbuilder-satisfydepends-dummy depends on libconfuse-dev; however: Package libconfuse-dev is not installed. pbuilder-satisfydepends-dummy depends on libcurl4-openssl-dev; however: Package libcurl4-openssl-dev is not installed. pbuilder-satisfydepends-dummy depends on libdb-dev (>= 4.6.19); however: Package libdb-dev is not installed. pbuilder-satisfydepends-dummy depends on libev-dev; however: Package libev-dev is not installed. pbuilder-satisfydepends-dummy depends on libevent-dev; however: Package libevent-dev is not installed. pbuilder-satisfydepends-dummy depends on libexpat1-dev; however: Package libexpat1-dev is not installed. pbuilder-satisfydepends-dummy depends on libgeoip-dev (>= 1.4.5); however: Package libgeoip-dev is not installed. pbuilder-satisfydepends-dummy depends on libjson0-dev; however: Package libjson0-dev is not installed. pbuilder-satisfydepends-dummy depends on libldap2-dev; however: Package libldap2-dev is not installed. pbuilder-satisfydepends-dummy depends on liblua5.1-0-dev; however: Package liblua5.1-0-dev is not installed. pbuilder-satisfydepends-dummy depends on libmemcached-dev; however: Package libmemcached-dev is not installed. pbuilder-satisfydepends-dummy depends on libncurses5-dev; however: Package libncurses5-dev is not installed. pbuilder-satisfydepends-dummy depends on libpcre3-dev; however: Package libpcre3-dev is not installed. pbuilder-satisfydepends-dummy depends on libperl-dev; however: Package libperl-dev is not installed. pbuilder-satisfydepends-dummy depends on libpq-dev; however: Package libpq-dev is not installed. pbuilder-satisfydepends-dummy depends on libradiusclient-ng-dev; however: Package libradiusclient-ng-dev is not installed. pbuilder-satisfydepends-dummy depends on libreadline-dev; however: Package libreadline-dev is not installed. pbuilder-satisfydepends-dummy depends on libsasl2-dev; however: Package libsasl2-dev is not installed. pbuilder-satisfydepends-dummy depends on libsnmp-dev; however: Package libsnmp-dev is not installed. pbuilder-satisfydepends-dummy depends on libsqlite3-dev; however: Package libsqlite3-dev is not installed. pbuilder-satisfydepends-dummy depends on libunistring-dev; however: Package libunistring-dev is not installed. pbuilder-satisfydepends-dummy depends on libxml2-dev; however: Package libxml2-dev is not installed. pbuilder-satisfydepends-dummy depends on libxmlrpc-c3-dev; however: Package libxmlrpc-c3-dev is not installed. pbuilder-satisfydepends-dummy depends on openssl; however: Package openssl is not installed. pbuilder-satisfydepends-dummy depends on pkg-config; however: Package pkg-config is not installed. pbuilder-satisfydepends-dummy depends on python; however: Package python is not installed. pbuilder-satisfydepends-dummy depends on python-dev; however: Package python-dev is not installed. pbuilder-satisfydepends-dummy depends on unixodbc-dev; however: Package unixodbc-dev is not installed. pbuilder-satisfydepends-dummy depends on uuid-dev; however: Package uuid-dev is not installed. pbuilder-satisfydepends-dummy depends on xsltproc; however: Package xsltproc is not installed. pbuilder-satisfydepends-dummy depends on zlib1g-dev; however: Package zlib1g-dev is not installed. Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ... Reading package lists... Building dependency tree... Reading state information... Initializing package states... Writing extended state information... The following NEW packages will be installed: bison{a} bsdmainutils{a} ca-certificates{a} comerr-dev{a} debhelper{a} docbook-xml{a} erlang-base{a} erlang-dev{a} file{a} flex{a} fontconfig{a} fontconfig-config{a} gettext{a} gettext-base{a} groff-base{a} html2text{a} intltool-debian{a} krb5-multidev{a} libaudio2{a} libconfuse-dev{a} libconfuse0{a} libcroco3{a} libcurl3{a} libcurl4-openssl-dev{a} libdb-dev{a} libdb4.8-dev{a} libev-dev{a} libev3{a} libevent-1.4-2{a} libevent-core-1.4-2{a} libevent-dev{a} libevent-extra-1.4-2{a} libexpat1{a} libexpat1-dev{a} libfontconfig1{a} libfreetype6{a} libgcrypt11{a} libgeoip-dev{a} libgeoip1{a} libglib2.0-0{a} libgnutls26{a} libgpg-error0{a} libgssapi-krb5-2{a} libgssrpc4{a} libhashkit0{a} libice6{a} libidn11{a} libidn11-dev{a} libjpeg62{a} libjson0{a} libjson0-dev{a} libk5crypto3{a} libkadm5clnt-mit7{a} libkadm5srv-mit7{a} libkdb5-4{a} libkeyutils1{a} libkrb5-3{a} libkrb5-dev{a} libkrb5support0{a} liblcms1{a} libldap-2.4-2{a} libldap2-dev{a} libltdl-dev{a} libltdl7{a} liblua5.1-0{a} liblua5.1-0-dev{a} libmagic1{a} libmemcached-dev{a} libmemcached5{a} libmemcachedprotocol0{a} libmemcachedutil0{a} libmng1{a} libmysqlclient-dev{a} libmysqlclient16{a} libncurses5-dev{a} libodbcinstq1c2{a} libpcre3{a} libpcre3-dev{a} libpcrecpp0{a} libperl-dev{a} libperl5.10{a} libpng12-0{a} libpopt0{a} libpq-dev{a} libpq5{a} libpython2.6{a} libqt3-mt{a} libradiusclient-ng-dev{a} libradiusclient-ng2{a} libreadline-dev{a} libreadline6-dev{a} libsasl2-2{a} libsasl2-dev{a} libsasl2-modules{a} libsensors4{a} libsensors4-dev{a} libsm6{a} libsnmp-base{a} libsnmp-dev{a} libsnmp-perl{a} libsnmp15{a} libsqlite3-dev{a} libssh2-1{a} libssh2-1-dev{a} libssl-dev{a} libtasn1-3{a} libunistring-dev{a} libunistring0{a} libwrap0{a} libwrap0-dev{a} libx11-6{a} libx11-data{a} libxau6{a} libxcb1{a} libxcursor1{a} libxdmcp6{a} libxext6{a} libxfixes3{a} libxft2{a} libxi6{a} libxinerama1{a} libxml2{a} libxml2-dev{a} libxmlrpc-c3{a} libxmlrpc-c3-dev{a} libxrandr2{a} libxrender1{a} libxslt1.1{a} libxt6{a} m4{a} makedev{a} man-db{a} mime-support{a} mysql-common{a} odbcinst{a} odbcinst1debian2{a} openssl{a} pkg-config{a} po-debconf{a} procps{a} python{a} python-dev{a} python-minimal{a} python2.6{a} python2.6-dev{a} python2.6-minimal{a} sgml-base{a} sgml-data{a} ttf-dejavu-core{a} ucf{a} unixodbc{a} unixodbc-dev{a} uuid-dev{a} x11-common{a} xml-core{a} xsltproc{a} zlib1g-dev{a} 0 packages upgraded, 157 newly installed, 0 to remove and 0 not upgraded. Need to get 68.8 MB/69.0 MB of archives. After unpacking 190 MB will be used. WARNING: untrusted versions of the following packages will be installed! Untrusted packages could compromise your system's security. You should only proceed with the installation if you are certain that this is what you want to do. libkeyutils1 libconfuse-dev libkrb5-3 libodbcinstq1c2 libpopt0 ttf-dejavu-core libxfixes3 xsltproc libkrb5support0 libperl-dev libevent-1.4-2 liblcms1 python2.6-minimal mime-support procps libidn11 debhelper libsensors4 libwrap0 libhashkit0 pkg-config intltool-debian libsnmp15 libevent-core-1.4-2 libkadm5clnt-mit7 libradiusclient-ng2 bison libx11-data comerr-dev libssh2-1-dev libpcre3-dev libgeoip-dev libxmlrpc-c3 libevent-dev docbook-xml libsasl2-modules m4 libsqlite3-dev libxslt1.1 po-debconf libpcre3 mysql-common groff-base python-dev libfontconfig1 fontconfig-config libgnutls26 unixodbc-dev libkrb5-dev odbcinst libsasl2-dev libmysqlclient-dev xml-core libradiusclient-ng-dev python2.6 libtasn1-3 libmemcachedutil0 python-minimal libdb-dev libldap2-dev libexpat1 libk5crypto3 libgssrpc4 libpcrecpp0 unixodbc fontconfig libjson0 libxmlrpc-c3-dev gettext libxcb1 libunistring-dev libsensors4-dev libxau6 libcurl3 libreadline-dev odbcinst1debian2 libjson0-dev krb5-multidev python libxft2 libssl-dev libssh2-1 libcroco3 libice6 ca-certificates libxdmcp6 libgcrypt11 makedev libpython2.6 libxml2 erlang-dev zlib1g-dev libmemcached5 file libxml2-dev libwrap0-dev bsdmainutils libgpg-error0 python2.6-dev libxrender1 flex sgml-base ucf libsnmp-perl libev3 gettext-base libsnmp-dev uuid-dev libpng12-0 libjpeg62 libgeoip1 libperl5.10 liblua5.1-0-dev libconfuse0 libpq-dev libkadm5srv-mit7 libmysqlclient16 libldap-2.4-2 libfreetype6 libmemcachedprotocol0 libexpat1-dev libreadline6-dev libunistring0 libglib2.0-0 liblua5.1-0 libmemcached-dev x11-common libncurses5-dev sgml-data libsnmp-base libx11-6 libsasl2-2 libpq5 man-db html2text libdb4.8-dev openssl libev-dev libsm6 libkdb5-4 libqt3-mt libgssapi-krb5-2 libevent-extra-1.4-2 libxi6 libaudio2 libxcursor1 libxt6 libxinerama1 libltdl-dev libxext6 libxrandr2 libmng1 libidn11-dev libltdl7 libmagic1 libcurl4-openssl-dev erlang-base Do you want to ignore this warning and proceed anyway? To continue, enter "Yes"; to abort, enter "No": Abort. E: pbuilder-satisfydepends failed. I: Copying back the cached apt archive contents I: unmounting /tmp/apt-jdg_cwE6xn filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.11132 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/squeeze-i386.building.3467 + '[' -r /var/run/lock/squeeze-i386.update.3467 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=i…'> + '[' -n /tmp/tmp.9M3renpBjV ']' + rm -rf /tmp/tmp.9M3renpBjV + '[' -n /tmp/apt-jdg_cwE6xn ']' + sudo rm -rf /tmp/apt-jdg_cwE6xn + '[' -n 12477 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=25 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Oct 30 04:27:32 UTC 2018 [running 25 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Oct 30 04:27:32 UTC 2018 [running 25 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

3 4

git:master:3605e28a: pkg/kamailio/deb: version set to 5.2.0~pre2
by Victor Seva 02 Nov '18

02 Nov '18

Module: kamailio Branch: master Commit: 3605e28af86ec3db1aba215891de3d96e41ba3ad URL: https://github.com/kamailio/kamailio/commit/3605e28af86ec3db1aba215891de3d9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-02T15:25:49+01:00 pkg/kamailio/deb: version set to 5.2.0~pre2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/3605e28af86ec3db1aba215891de3d9… Patch: https://github.com/kamailio/kamailio/commit/3605e28af86ec3db1aba215891de3d9…

1 0

Branching GIT repository for 5.2.x release series
by Daniel-Constantin Mierla 02 Nov '18

02 Nov '18

Hello, if there is no other opinion, I am considering to create git branch 5.2 at the beginning of next week (likely on Monday evening), to be used for 5.2.x release series. >From that moment, the master branch can get new features and the appropriate bug fixes have to be backported to branch 5.2 as well. With this step, the first release in 5.2.x series, respectively v5.2.0, should be out in about 2-3 weeks. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 0

git:master:0580ad2e: Merge pull request #1704 from micmac1/dp_replace
by GitHub 02 Nov '18

02 Nov '18

Module: kamailio Branch: master Commit: 0580ad2eb7f5fd829a2c7c7394ffadc0ca7f85a9 URL: https://github.com/kamailio/kamailio/commit/0580ad2eb7f5fd829a2c7c7394ffadc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-02T11:11:49+01:00 Merge pull request #1704 from micmac1/dp_replace dialplan: fix dp_replace() in cmd_export_t struct --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/0580ad2eb7f5fd829a2c7c7394ffadc… Patch: https://github.com/kamailio/kamailio/commit/0580ad2eb7f5fd829a2c7c7394ffadc… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 39ba1ceeff..a96b246b72 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -115,7 +115,7 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"dp_match",(cmd_function)w_dp_match, 2, fixup_igp_spve, fixup_free_igp_spve, ANY_ROUTE}, - {"dp_replace",(cmd_function)w_dp_replace, 2, dp_replace_fixup, + {"dp_replace",(cmd_function)w_dp_replace, 3, dp_replace_fixup, dp_replace_fixup_free, ANY_ROUTE}, {0,0,0,0,0,0} };

1 0

[kamailio/kamailio] dialplan: fix dp_replace() in cmd_export_t struct (#1704)
by micmac1 02 Nov '18

02 Nov '18

In the struct `int param_no` is set to `2`. But `dp_replace()` has actually three parameters `(dpid, inval, outvar)`, so kamailio's cfg parser fails when `dp_replace()` is called: ``` yyparse(): cfg. parser: failed to find command dp_replace (params 3) yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 366, column 45: unknown command, missing loadmodule? ``` This commit fixes `int param_no` to address this. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### Pre-Submission Checklist    - [+] Commit message has the format required by CONTRIBUTING guide - [+] Commits are split per component (core, individual modules, libs, utils, ...) - [+] Each component has a single commit (if not, squash them into one commit) - [+] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [+] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [+] PR should be backported to stable branches - [+] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hi all, When trying out dp_replace() kamailio (5.1.6) wouldn't start. It was expecting 2 parameters instead of 3. This PR fixes that. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1704 -- Commit Summary -- * dialplan: fix dp_replace() in cmd_export_t struct -- File Changes -- M src/modules/dialplan/dialplan.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1704.patch https://github.com/kamailio/kamailio/pull/1704.diff -- 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/pull/1704

2 2

git:master:cbff3590: dialplan: fix dp_replace() in cmd_export_t struct
by Sebastian Kemper 02 Nov '18

02 Nov '18

Module: kamailio Branch: master Commit: cbff35909edccffe778d04f3871d880195d82b7a URL: https://github.com/kamailio/kamailio/commit/cbff35909edccffe778d04f3871d880… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2018-11-02T10:10:46+01:00 dialplan: fix dp_replace() in cmd_export_t struct In the struct 'int param_no' is set to '2'. But dp_replace() has actually three parameters (dpid, inval, outvar), so kamailio's cfg parser fails when dp_replace() is called: yyparse(): cfg. parser: failed to find command dp_replace (params 3) yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 366, column 45: unknown command, missing loadmodule? This commit fixes 'int param_no' to address this. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/cbff35909edccffe778d04f3871d880… Patch: https://github.com/kamailio/kamailio/commit/cbff35909edccffe778d04f3871d880… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 39ba1ceeff..a96b246b72 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -115,7 +115,7 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"dp_match",(cmd_function)w_dp_match, 2, fixup_igp_spve, fixup_free_igp_spve, ANY_ROUTE}, - {"dp_replace",(cmd_function)w_dp_replace, 2, dp_replace_fixup, + {"dp_replace",(cmd_function)w_dp_replace, 3, dp_replace_fixup, dp_replace_fixup_free, ANY_ROUTE}, {0,0,0,0,0,0} };

1 0

git:master:05846d00: Makefile.defs: version set to 5.2.0-pre2
by Daniel-Constantin Mierla 02 Nov '18

02 Nov '18

Module: kamailio Branch: master Commit: 05846d00a063c069ec4b2c9bf589af111cd7992f URL: https://github.com/kamailio/kamailio/commit/05846d00a063c069ec4b2c9bf589af1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-02T10:27:58+01:00 Makefile.defs: version set to 5.2.0-pre2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/05846d00a063c069ec4b2c9bf589af1… Patch: https://github.com/kamailio/kamailio/commit/05846d00a063c069ec4b2c9bf589af1… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 52167a5899..19e7d87e72 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -pre2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:2159e7b2: modules: readme files regenerated - db_redis ... [skip ci]
by Kamailio Dev 02 Nov '18

02 Nov '18

Module: kamailio Branch: master Commit: 2159e7b2af772beebe3af290c92f8e88ed864daf URL: https://github.com/kamailio/kamailio/commit/2159e7b2af772beebe3af290c92f8e8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-02T09:16:27+01:00 modules: readme files regenerated - db_redis ... [skip ci] --- Modified: src/modules/db_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/2159e7b2af772beebe3af290c92f8e8… Patch: https://github.com/kamailio/kamailio/commit/2159e7b2af772beebe3af290c92f8e8… --- diff --git a/src/modules/db_redis/README b/src/modules/db_redis/README index 75f31cf213..1a5c33caef 100644 --- a/src/modules/db_redis/README +++ b/src/modules/db_redis/README @@ -134,6 +134,12 @@ nce/string,server_id/int,connection_id/int,keepalive/int,partition/int 'address:entry::1', address:entry::2', address:entry::3', ... No 'keys' modparam of 'db_redis' for 'address' table needs to be defined. + Important Note: at this moment the module requires at least one 'keys' + parameter, but it does not need to be related to the table loaded from + Redis server -- for example, if used only for permissions module with + 'address' table, then the 'keys' parameter can be specified for + 'version' table. + The mappings can be freely defined in the "keys" module parameter, which is composed of a semi-colon separated list of definitions in the format @@ -231,6 +237,7 @@ loadmodule "db_redis.so" #!define DBURL_PERM "redis://127.0.0.1:6379/8" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") +modparam("db_redis", "keys", "version=entry:table_name") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:p artition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid")

1 0

git:master:47a22c49: db_redis: docs - added note that keys parameter must be specified
by Daniel-Constantin Mierla 02 Nov '18

02 Nov '18

Module: kamailio Branch: master Commit: 47a22c49a84941c8065c0dfa91fb0d07716126c1 URL: https://github.com/kamailio/kamailio/commit/47a22c49a84941c8065c0dfa91fb0d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-02T09:11:11+01:00 db_redis: docs - added note that keys parameter must be specified --- Modified: src/modules/db_redis/doc/db_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/47a22c49a84941c8065c0dfa91fb0d0… Patch: https://github.com/kamailio/kamailio/commit/47a22c49a84941c8065c0dfa91fb0d0… --- diff --git a/src/modules/db_redis/doc/db_redis_admin.xml b/src/modules/db_redis/doc/db_redis_admin.xml index 9e5a7a2cbd..9c147a022b 100644 --- a/src/modules/db_redis/doc/db_redis_admin.xml +++ b/src/modules/db_redis/doc/db_redis_admin.xml @@ -76,6 +76,13 @@ username/string,domain/string,contact/string,received/string,path/string,expires records can be: 'address:entry::1', address:entry::2', address:entry::3', ... No 'keys' modparam of 'db_redis' for 'address' table needs to be defined. </para> + <para> + Important Note: at this moment the module requires at least one 'keys' + parameter, but it does not need to be related to the table loaded + from Redis server -- for example, if used only for permissions module with + 'address' table, then the 'keys' parameter can be specified for + 'version' table. + </para> <para> The mappings can be freely defined in the "keys" module parameter, which is composed of a semi-colon separated list of definitions in the format @@ -219,6 +226,7 @@ loadmodule "db_redis.so" #!define DBURL_PERM "redis://127.0.0.1:6379/8" ... modparam("db_redis", "schema_path", "/usr/share/kamailio/db_redis/kamailio") +modparam("db_redis", "keys", "version=entry:table_name") modparam("db_redis", "keys", "location=entry:ruid&usrdom:username,domain&timer:partition,keepalive") modparam("db_redis", "keys", "acc=entry:callid,time_hires&cid:callid") modparam("db_redis", "keys", "subscriber=entry:username,domain")

1 0

New module proposal : RTP Media Server
by Julien Chavanton 01 Nov '18

01 Nov '18

Dear Kamailians, I just opened a merge request for a new module called RTP Media Server I understand that integrating an RTP/Media endpoint directly in Kamailio may seems strange at first. Let me share my thoughts ... By combining Kamailio, oRTP and mediastreamer2 this module is providing some very good foundation to support RTP endpoint and various media processing features. This seems like a great idea for various use cases like IoT, IVR or other specific needs. Kamailio is still handling everything related to SIP/SDP (the module is adding some SDP parsing, they could be integrated in the core if this seems fit). By doing integration with a library we can benefit from the scripting engine and probably KEMI. This does not means that everyone should run this module on a Kamailio sever acting as a load balancer, of course CPU intensive operations like resampling and encoding may be taking place on the server. oRTP is providing RTP endpoints compliant with (RFC 3550) MediaStreamer2, even if written in C is quite a high level library, because it is implementing a framework for audio processing using graphs of filters, filters can be to do various things. Similar to playing with lego blocks :) - Support for most free and some non free codecs can be added easily. - Work to bridge calls is already in progress in the module. - Mobile phone support ARM CPU and other embedded scenario should be supported Mediastream2 is creating one thread per call "msticker", this can work smoothly in Kamailio even if it is forking processes. Shared memory allocation is supported using wrapper around malloc/free used by the libraries. This project was started last year, I exposed the idea at KamailioWorld2017, the feedbacks I god where not all positives :) But we did speak about it again at ClueCon2018 and I was encouraged to complete the work and propose a MR. The module is not working and was tested with several softphones. I think it is time to submit it ... before considering adding more features or investing more time in it. Julien Example config using the features already implemented event_route[rms:start] { xnotice("[rms:start] play ...\n"); rms_play("/tmp/reference_8000.wav", "rms:after_play"); }; event_route[rms:after_play] { xnotice("[rms:after_play] play done...\n"); rms_hangup(); }; route { if (t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); if (is_method("INVITE") && !has_totag()) { if (!rms_answer()) { t_reply("503", "server error"); } } if (is_method("BYE")){ rms_media_stop(); } }

1 1

[kamailio/kamailio] acc: generating duplicates on missed / failed calls (#1673)
by Julien Chavanton 01 Nov '18

01 Nov '18

### Description I am looking at how to properly handle a problem with duplicate ACC This is when `TMCB_ON_FAILURE` and `TMCB_RESPONSE_OUT` are both called, they are not using the same version of the message. `TMCB_ON_FAILURE` is using the cloned version `TMCB_RESPONSE_OUT` is using the original version They are not sharing the message flags and 2 ACC events are generated. Since this is very sensitive, I want to make sure I can trace the real root cause. Not sure if this is a regression ... #### Reproduction Any failed call #### Debugging Data ``` 0(4603) NOTICE: acc [acc_logic.c:686]: tmcb_func(): acc callback called for t(0x7f768b6dac08) event type 2, reply code 404 reqmsg[0x7f768b6dc840] rplmsg[0x7f76d096dee8] 0(4603) ERROR: acc [acc_logic.c:697]: tmcb_func(): [TMCB_RESPONSE_IN][0x7f768b6dc840][0x7f76d096dee8] // reply route execution 0(4603) ERROR: <core> [core/sip_msg_clone.c:504]: sip_msg_shm_clone(): sip_msg_shm_clone[0x7f768b6dc840]>>[0x7f768b6de738] 0(4603) NOTICE: acc [acc_logic.c:686]: tmcb_func(): acc callback called for t(0x7f768b6dac08) event type 128, reply code 404 reqmsg[0x7f768b6de738] rplmsg[0x7f76d096dee8] 0(4603) ERROR: acc [acc_logic.c:694]: tmcb_func(): [TMCB_ON_FAILURE] run on_missed [0x7f768b6de738][0x7f76d096dee8] // working with the cloned message 0(4603) ERROR: <core> [core/flags.c:59]: isflagset(): isflagset[0x7f768b6de738] 0(4603) ERROR: acc_json [acc_json_mod.c:189]: acc_json_send_request(): missed call flag [7] for this transaction [on] // failure route execution, we are working with the cloned message 0(4603) NOTICE: <script>: [FAILURE] 0(4603) ERROR: <core> [core/flags.c:46]: setflag(): setflag[0x7f768b6de738] // failure 0(4603) NOTICE: acc [acc_logic.c:686]: tmcb_func(): acc callback called for t(0x7f768b6dac08) event type 512, reply code 404 reqmsg[0x7f768b6dc840] rplmsg[0x7f76d096dee8] 0(4603) ERROR: acc [acc_logic.c:689]: tmcb_func(): [TMCB_RESPONSE_OUT][0x7f768b6dc840][0x7f76d096dee8] // working with the original message 0(4603) ERROR: <core> [core/flags.c:59]: isflagset(): isflagset[0x7f768b6dc840] 0(4603) ERROR: acc_json [acc_json_mod.c:189]: acc_json_send_request(): missed call flag [7] for this transaction [on] ``` -- 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/1673

2 5

[kamailio/kamailio] acc: generating duplicates (#1674)
by Julien Chavanton 01 Nov '18

01 Nov '18

on missed / failed calls issue #1673 #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (not tested with all scenarios, review could confirm that this is not introducing regressions) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1673 #### Description problem with confusion when using flags (integer value vs bit position value) proposed solution is using the flags helpers functions `isflagset`, etc. where possible. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1674 -- Commit Summary -- * acc: generating duplicates -- File Changes -- M src/modules/acc/acc.c (8) M src/modules/acc/acc_logic.c (5) M src/modules/acc_diameter/acc_diameter_mod.c (4) M src/modules/acc_json/acc_json_mod.c (4) M src/modules/acc_radius/acc_radius_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1674.patch https://github.com/kamailio/kamailio/pull/1674.diff -- 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/pull/1674

3 15

git:master:8d80f16f: acc_json: fix generating duplicates for missed calls
by Henning Westerholt 01 Nov '18

01 Nov '18

Module: kamailio Branch: master Commit: 8d80f16fc19036d64f917740417a65139b1dd7ae URL: https://github.com/kamailio/kamailio/commit/8d80f16fc19036d64f917740417a651… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 acc_json: fix generating duplicates for missed calls - fix generating duplicates for missed calls (#GH1674) - patch from Julien Chavanton jchavanton at gmail dot com --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8d80f16fc19036d64f917740417a651… Patch: https://github.com/kamailio/kamailio/commit/8d80f16fc19036d64f917740417a651… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index d1549c7b86..908d7d0eb9 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -129,9 +129,9 @@ static int mod_init(void) memset(&_acc_json_engine, 0, sizeof(acc_engine_t)); if(acc_flag != -1) - _acc_json_engine.acc_flag = 1 << acc_flag; + _acc_json_engine.acc_flag = acc_flag; if(acc_missed_flag != -1) - _acc_json_engine.missed_flag = 1 << acc_missed_flag; + _acc_json_engine.missed_flag = acc_missed_flag; _acc_json_engine.acc_req = acc_json_send_request; _acc_json_engine.acc_init = acc_json_init; memcpy(_acc_json_engine.name, "json", 4);

1 0

git:master:8cce4f24: acc_radius: fix generating duplicates for missed calls
by Henning Westerholt 01 Nov '18

01 Nov '18

Module: kamailio Branch: master Commit: 8cce4f243bc00f243671da7349edd3a11d5dc2ec URL: https://github.com/kamailio/kamailio/commit/8cce4f243bc00f243671da7349edd3a… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 acc_radius: fix generating duplicates for missed calls - fix generating duplicates for missed calls (#GH1674) - patch from Julien Chavanton jchavanton at gmail dot com --- Modified: src/modules/acc_radius/acc_radius_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8cce4f243bc00f243671da7349edd3a… Patch: https://github.com/kamailio/kamailio/commit/8cce4f243bc00f243671da7349edd3a… --- diff --git a/src/modules/acc_radius/acc_radius_mod.c b/src/modules/acc_radius/acc_radius_mod.c index 54f5c15217..adbfe18b00 100644 --- a/src/modules/acc_radius/acc_radius_mod.c +++ b/src/modules/acc_radius/acc_radius_mod.c @@ -142,9 +142,9 @@ static int mod_init(void) memset(&_acc_radius_engine, 0, sizeof(acc_engine_t)); if(radius_flag != -1) - _acc_radius_engine.acc_flag = 1 << radius_flag; + _acc_radius_engine.acc_flag = radius_flag; if(radius_missed_flag != -1) - _acc_radius_engine.missed_flag = 1 << radius_missed_flag; + _acc_radius_engine.missed_flag = radius_missed_flag; _acc_radius_engine.acc_req = acc_radius_send_request; _acc_radius_engine.acc_init = acc_radius_init; memcpy(_acc_radius_engine.name, "radius", 6);

1 0

git:master:a7525829: acc: fix generating duplicates for missed calls
by Henning Westerholt 01 Nov '18

01 Nov '18

Module: kamailio Branch: master Commit: a7525829309427fbb9357e0104b9dba1016f6777 URL: https://github.com/kamailio/kamailio/commit/a7525829309427fbb9357e0104b9dba… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 acc: fix generating duplicates for missed calls - fix generating duplicates for missed calls (#GH1674) - patch from Julien Chavanton jchavanton at gmail dot com --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/a7525829309427fbb9357e0104b9dba… Patch: https://github.com/kamailio/kamailio/commit/a7525829309427fbb9357e0104b9dba… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 24d26304e5..9879e697ff 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -526,7 +526,7 @@ int is_eng_acc_on(sip_msg_t *msg) } while(e) { if(e->flags & 1) { - if(msg->flags & e->acc_flag) { + if(isflagset(msg, e->acc_flag) == 1) { return 1; } } @@ -549,7 +549,7 @@ int is_eng_mc_on(sip_msg_t *msg) } while(e) { if(e->flags & 1) { - if(msg->flags & e->missed_flag) { + if(isflagset(msg, e->missed_flag) == 1) { return 1; } } @@ -579,15 +579,15 @@ int acc_run_engines(struct sip_msg *msg, int type, int *reset) inf.leg_info = leg_info; while(e) { if(e->flags & 1) { - if((type==0) && (msg->flags&(e->acc_flag))) { + if((type==0) && isflagset(msg, e->acc_flag) == 1) { LM_DBG("acc event for engine: %s\n", e->name); e->acc_req(msg, &inf); - if(reset) *reset |= e->acc_flag; + if(reset) *reset |= 1 << e->acc_flag; } - if((type==1) && (msg->flags&(e->missed_flag))) { + if((type==1) && isflagset(msg, e->missed_flag) == 1) { LM_DBG("missed event for engine: %s\n", e->name); e->acc_req(msg, &inf); - if(reset) *reset |= e->missed_flag; + if(reset) *reset |= 1 << e->missed_flag; } } e = e->next; diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index e0443ce906..cc66bc67df 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -55,7 +55,6 @@ struct acc_enviroment acc_env; #define is_acc_flag_set(_rq,_flag) (((_flag) != -1) && (isflagset((_rq), (_flag)) == 1)) -#define reset_acc_flag(_rq,_flag) (resetflag((_rq), (_flag))) #define is_failed_acc_on(_rq) is_acc_flag_set(_rq,failed_transaction_flag) @@ -465,7 +464,6 @@ static inline void acc_onreply_in(struct cell *t, struct sip_msg *req, } - /* initiate a report if we previously enabled MC accounting for this t */ static inline void on_missed(struct cell *t, struct sip_msg *req, struct sip_msg *reply, int code) @@ -501,11 +499,10 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, * forwarding attempt fails; we do not wish to * report on every attempt; so we clear the flags; */ - if (is_log_mc_on(req)) { env_set_text( ACC_MISSED, ACC_MISSED_LEN); acc_log_request( req ); - flags_to_reset |= log_missed_flag; + flags_to_reset |= 1 << log_missed_flag; } if (is_db_mc_on(req)) { if(acc_db_set_table_name(req, db_table_mc_data, &db_table_mc)<0) { @@ -513,7 +510,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, return; } acc_db_request( req ); - flags_to_reset |= db_missed_flag; + flags_to_reset |= 1 << db_missed_flag; } /* run extra acc engines */ @@ -523,7 +520,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, * These can't be reset in the blocks above, because * it would skip accounting if the flags are identical */ - reset_acc_flag( req, flags_to_reset ); + resetflags(req, flags_to_reset); if (new_uri_bk.len>=0) { req->new_uri = new_uri_bk;

1 0

git:master:3a471af7: acc_diameter: fix generating duplicates for missed calls
by Henning Westerholt 01 Nov '18

01 Nov '18

Module: kamailio Branch: master Commit: 3a471af738c6b8f7e717b7f2f4c6f9c579a2d9c8 URL: https://github.com/kamailio/kamailio/commit/3a471af738c6b8f7e717b7f2f4c6f9c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 acc_diameter: fix generating duplicates for missed calls - fix generating duplicates for missed calls (#GH1674) - patch from Julien Chavanton jchavanton at gmail dot com --- Modified: src/modules/acc_diameter/acc_diameter_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3a471af738c6b8f7e717b7f2f4c6f9c… Patch: https://github.com/kamailio/kamailio/commit/3a471af738c6b8f7e717b7f2f4c6f9c… --- diff --git a/src/modules/acc_diameter/acc_diameter_mod.c b/src/modules/acc_diameter/acc_diameter_mod.c index 02ac75dc98..3a35fe7e93 100644 --- a/src/modules/acc_diameter/acc_diameter_mod.c +++ b/src/modules/acc_diameter/acc_diameter_mod.c @@ -143,9 +143,9 @@ static int mod_init( void ) memset(&_acc_diameter_engine, 0, sizeof(acc_engine_t)); if(diameter_flag != -1) - _acc_diameter_engine.acc_flag = 1<<diameter_flag; + _acc_diameter_engine.acc_flag = diameter_flag; if(diameter_missed_flag != -1) - _acc_diameter_engine.missed_flag = 1<<diameter_missed_flag; + _acc_diameter_engine.missed_flag = diameter_missed_flag; _acc_diameter_engine.acc_req = acc_diameter_send_request; _acc_diameter_engine.acc_init = acc_diameter_init; memcpy(_acc_diameter_engine.name, "diameter", 8);

1 0

git:master:253d35c8: core: add helper function for flag reset
by Henning Westerholt 01 Nov '18

01 Nov '18

Module: kamailio Branch: master Commit: 253d35c84bc1886c9eae774a731452f5d2f521cd URL: https://github.com/kamailio/kamailio/commit/253d35c84bc1886c9eae774a731452f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-01T21:27:28+01:00 core: add helper function for flag reset - add helper function for flag reset (needed for bugfix in #GH1674) - patch from: Julien Chavanton jchavanton at gmail dot com --- Modified: src/core/flags.c Modified: src/core/flags.h --- Diff: https://github.com/kamailio/kamailio/commit/253d35c84bc1886c9eae774a731452f… Patch: https://github.com/kamailio/kamailio/commit/253d35c84bc1886c9eae774a731452f… --- diff --git a/src/core/flags.c b/src/core/flags.c index 5b603706e3..c20f45f67f 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -52,6 +52,11 @@ int resetflag( struct sip_msg* msg, flag_t flag ) { return 1; } +int resetflags( struct sip_msg* msg, flag_t flags ) { + msg->flags &= ~ flags; + return 1; +} + int isflagset( struct sip_msg* msg, flag_t flag ) { return (msg->flags & (1<<flag)) ? 1 : -1; } diff --git a/src/core/flags.h b/src/core/flags.h index e1186dbf79..9f521c8e5f 100644 --- a/src/core/flags.h +++ b/src/core/flags.h @@ -44,6 +44,7 @@ struct sip_msg; int setflag( struct sip_msg* msg, flag_t flag ); int resetflag( struct sip_msg* msg, flag_t flag ); +int resetflags( struct sip_msg* msg, flag_t flags ); int isflagset( struct sip_msg* msg, flag_t flag );

1 0

git:master:96aa7990: ims_ipsec_pcscf: Fix a memory leak in add_security_server_header()
by Tsvetomir Dimitrov 31 Oct '18

31 Oct '18

Module: kamailio Branch: master Commit: 96aa799065d45a48e00a3efff252aa9bb473e355 URL: https://github.com/kamailio/kamailio/commit/96aa799065d45a48e00a3efff252aa9… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-10-31T18:43:34+02:00 ims_ipsec_pcscf: Fix a memory leak in add_security_server_header() --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/96aa799065d45a48e00a3efff252aa9… Patch: https://github.com/kamailio/kamailio/commit/96aa799065d45a48e00a3efff252aa9… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 17e6c7b000..a662f0c2e4 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -410,6 +410,8 @@ int add_security_server_header(struct sip_msg* m, ipsec_t* s) return -1; } + pkg_free(sec_header); + return 0; }

1 0

Build failed in Jenkins: kamailio44-nightly-binaries » amd64,squeeze,slave #128
by kamailio＠sipwise.com 31 Oct '18

31 Oct '18

See <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…> ------------------------------------------ [...truncated 358.90 KB...] + '[' 3600 -eq 0 ']' + touch /var/run/lock/squeeze-amd64.building.16309 + case "$architecture" in + sudo DIST=squeeze ARCH=amd64 cowbuilder --buildresult <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…> --build <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…> --basepath /var/cache/pbuilder/base-squeeze-amd64.cow --debbuildopts -sa --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts '/tmp/apt-jdg_kDNY0m ' --configfile=/tmp/tmp.3UgvqGiG9D -> Copying COW directory forking: rm -rf /var/cache/pbuilder/build//cow.23949 forking: cp -al /var/cache/pbuilder/base-squeeze-amd64.cow /var/cache/pbuilder/build//cow.23949 I: removed stale ilistfile /var/cache/pbuilder/build//cow.23949/.ilist forking: chroot /var/cache/pbuilder/build//cow.23949 cowdancer-ilistcreate /.ilist find . -xdev -path ./home -prune -o $ \( -type l -o -type f $ -a -links +1 -print0 \) | xargs -0 stat --format '%d %i ' -> Invoking pbuilder forking: pbuilder build --debbuildopts -sa --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts /tmp/apt-jdg_kDNY0m --configfile /tmp/tmp.3UgvqGiG9D --buildplace /var/cache/pbuilder/build//cow.23949 --buildresult <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…> --debbuildopts -sa --no-targz --internal-chrootexec chroot /var/cache/pbuilder/build//cow.23949 cow-shell <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…> W: /root/.pbuilderrc does not exist I: Running in no-targz mode I: using fakeroot in build. I: pbuilder: network access will be disabled during build I: Current time: Tue Oct 30 04:26:48 UTC 2018 I: pbuilder-time-stamp: 1540873608 I: copying local configuration I: mounting /proc filesystem I: mounting /run/shm filesystem I: mounting /dev/pts filesystem I: Mounting /tmp/apt-jdg_kDNY0m I: policy-rc.d already exists I: Obtaining the cached apt archive contents I: Installing the build-deps I: user script /var/cache/pbuilder/build/cow.23949/tmp/hooks/D10-man-db starting I: Preseed man-db/auto-update to false I: user script /var/cache/pbuilder/build/cow.23949/tmp/hooks/D10-man-db finished I: user script /var/cache/pbuilder/build/cow.23949/tmp/hooks/D20releaserepo starting + set -- /tmp/apt-jdg_kDNY0m/ + TMPAPT=/tmp/apt-jdg_kDNY0m/ + [ -d /tmp/apt-jdg_kDNY0m/ ] + UPDATE_PKGLIST=0 + ls /tmp/apt-jdg_kDNY0m/*.list + [ -e /tmp/apt-jdg_kDNY0m//keyring.gpg ] + [ 0 = 1 ] I: user script /var/cache/pbuilder/build/cow.23949/tmp/hooks/D20releaserepo finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy Version: 0.invalid.0 Architecture: amd64 Maintainer: Debian Pbuilder Team <pbuilder-maint(a)lists.alioth.debian.org> Description: Dummy package to satisfy dependencies with aptitude - created by pbuilder This package was created automatically by pbuilder to satisfy the build-dependencies of the package being currently built. Depends: bison, debhelper (>= 8), libmysqlclient-dev, docbook-xml, erlang-dev, flex, libconfuse-dev, libcurl4-openssl-dev, libdb-dev (>= 4.6.19), libev-dev, libevent-dev, libexpat1-dev, libgeoip-dev (>= 1.4.5), libjson0-dev, libldap2-dev, liblua5.1-0-dev, libmemcached-dev, libncurses5-dev, libpcre3-dev, libperl-dev, libpq-dev, libradiusclient-ng-dev, libreadline-dev, libsasl2-dev, libsnmp-dev, libsqlite3-dev, libunistring-dev, libxml2-dev, libxmlrpc-c3-dev, openssl, pkg-config, python, python-dev, unixodbc-dev, uuid-dev, xsltproc, zlib1g-dev dpkg-deb: building package `pbuilder-satisfydepends-dummy' in `/tmp/satisfydepends-aptitude/pbuilder-satisfydepends-dummy.deb'. Selecting previously deselected package pbuilder-satisfydepends-dummy. (Reading database ... 10514 files and directories currently installed.) Unpacking pbuilder-satisfydepends-dummy (from .../pbuilder-satisfydepends-dummy.deb) ... dpkg: pbuilder-satisfydepends-dummy: dependency problems, but configuring anyway as you requested: pbuilder-satisfydepends-dummy depends on bison; however: Package bison is not installed. pbuilder-satisfydepends-dummy depends on debhelper (>= 8); however: Package debhelper is not installed. pbuilder-satisfydepends-dummy depends on libmysqlclient-dev; however: Package libmysqlclient-dev is not installed. pbuilder-satisfydepends-dummy depends on docbook-xml; however: Package docbook-xml is not installed. pbuilder-satisfydepends-dummy depends on erlang-dev; however: Package erlang-dev is not installed. pbuilder-satisfydepends-dummy depends on flex; however: Package flex is not installed. pbuilder-satisfydepends-dummy depends on libconfuse-dev; however: Package libconfuse-dev is not installed. pbuilder-satisfydepends-dummy depends on libcurl4-openssl-dev; however: Package libcurl4-openssl-dev is not installed. pbuilder-satisfydepends-dummy depends on libdb-dev (>= 4.6.19); however: Package libdb-dev is not installed. pbuilder-satisfydepends-dummy depends on libev-dev; however: Package libev-dev is not installed. pbuilder-satisfydepends-dummy depends on libevent-dev; however: Package libevent-dev is not installed. pbuilder-satisfydepends-dummy depends on libexpat1-dev; however: Package libexpat1-dev is not installed. pbuilder-satisfydepends-dummy depends on libgeoip-dev (>= 1.4.5); however: Package libgeoip-dev is not installed. pbuilder-satisfydepends-dummy depends on libjson0-dev; however: Package libjson0-dev is not installed. pbuilder-satisfydepends-dummy depends on libldap2-dev; however: Package libldap2-dev is not installed. pbuilder-satisfydepends-dummy depends on liblua5.1-0-dev; however: Package liblua5.1-0-dev is not installed. pbuilder-satisfydepends-dummy depends on libmemcached-dev; however: Package libmemcached-dev is not installed. pbuilder-satisfydepends-dummy depends on libncurses5-dev; however: Package libncurses5-dev is not installed. pbuilder-satisfydepends-dummy depends on libpcre3-dev; however: Package libpcre3-dev is not installed. pbuilder-satisfydepends-dummy depends on libperl-dev; however: Package libperl-dev is not installed. pbuilder-satisfydepends-dummy depends on libpq-dev; however: Package libpq-dev is not installed. pbuilder-satisfydepends-dummy depends on libradiusclient-ng-dev; however: Package libradiusclient-ng-dev is not installed. pbuilder-satisfydepends-dummy depends on libreadline-dev; however: Package libreadline-dev is not installed. pbuilder-satisfydepends-dummy depends on libsasl2-dev; however: Package libsasl2-dev is not installed. pbuilder-satisfydepends-dummy depends on libsnmp-dev; however: Package libsnmp-dev is not installed. pbuilder-satisfydepends-dummy depends on libsqlite3-dev; however: Package libsqlite3-dev is not installed. pbuilder-satisfydepends-dummy depends on libunistring-dev; however: Package libunistring-dev is not installed. pbuilder-satisfydepends-dummy depends on libxml2-dev; however: Package libxml2-dev is not installed. pbuilder-satisfydepends-dummy depends on libxmlrpc-c3-dev; however: Package libxmlrpc-c3-dev is not installed. pbuilder-satisfydepends-dummy depends on openssl; however: Package openssl is not installed. pbuilder-satisfydepends-dummy depends on pkg-config; however: Package pkg-config is not installed. pbuilder-satisfydepends-dummy depends on python; however: Package python is not installed. pbuilder-satisfydepends-dummy depends on python-dev; however: Package python-dev is not installed. pbuilder-satisfydepends-dummy depends on unixodbc-dev; however: Package unixodbc-dev is not installed. pbuilder-satisfydepends-dummy depends on uuid-dev; however: Package uuid-dev is not installed. pbuilder-satisfydepends-dummy depends on xsltproc; however: Package xsltproc is not installed. pbuilder-satisfydepends-dummy depends on zlib1g-dev; however: Package zlib1g-dev is not installed. Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ... Reading package lists... Building dependency tree... Reading state information... Initializing package states... Writing extended state information... The following NEW packages will be installed: bison{a} bsdmainutils{a} ca-certificates{a} comerr-dev{a} debhelper{a} docbook-xml{a} erlang-base{a} erlang-dev{a} file{a} flex{a} fontconfig{a} fontconfig-config{a} gettext{a} gettext-base{a} groff-base{a} html2text{a} intltool-debian{a} krb5-multidev{a} libaudio2{a} libconfuse-dev{a} libconfuse0{a} libcroco3{a} libcurl3{a} libcurl4-openssl-dev{a} libdb-dev{a} libdb4.8-dev{a} libev-dev{a} libev3{a} libevent-1.4-2{a} libevent-core-1.4-2{a} libevent-dev{a} libevent-extra-1.4-2{a} libexpat1{a} libexpat1-dev{a} libfontconfig1{a} libfreetype6{a} libgcrypt11{a} libgeoip-dev{a} libgeoip1{a} libglib2.0-0{a} libgnutls26{a} libgpg-error0{a} libgssapi-krb5-2{a} libgssrpc4{a} libhashkit0{a} libice6{a} libidn11{a} libidn11-dev{a} libjpeg62{a} libjson0{a} libjson0-dev{a} libk5crypto3{a} libkadm5clnt-mit7{a} libkadm5srv-mit7{a} libkdb5-4{a} libkeyutils1{a} libkrb5-3{a} libkrb5-dev{a} libkrb5support0{a} liblcms1{a} libldap-2.4-2{a} libldap2-dev{a} libltdl-dev{a} libltdl7{a} liblua5.1-0{a} liblua5.1-0-dev{a} libmagic1{a} libmemcached-dev{a} libmemcached5{a} libmemcachedprotocol0{a} libmemcachedutil0{a} libmng1{a} libmysqlclient-dev{a} libmysqlclient16{a} libncurses5-dev{a} libodbcinstq1c2{a} libpcre3{a} libpcre3-dev{a} libpcrecpp0{a} libperl-dev{a} libperl5.10{a} libpng12-0{a} libpopt0{a} libpq-dev{a} libpq5{a} libpython2.6{a} libqt3-mt{a} libradiusclient-ng-dev{a} libradiusclient-ng2{a} libreadline-dev{a} libreadline6-dev{a} libsasl2-2{a} libsasl2-dev{a} libsasl2-modules{a} libsensors4{a} libsensors4-dev{a} libsm6{a} libsnmp-base{a} libsnmp-dev{a} libsnmp-perl{a} libsnmp15{a} libsqlite3-dev{a} libssh2-1{a} libssh2-1-dev{a} libssl-dev{a} libtasn1-3{a} libunistring-dev{a} libunistring0{a} libwrap0{a} libwrap0-dev{a} libx11-6{a} libx11-data{a} libxau6{a} libxcb1{a} libxcursor1{a} libxdmcp6{a} libxext6{a} libxfixes3{a} libxft2{a} libxi6{a} libxinerama1{a} libxml2{a} libxml2-dev{a} libxmlrpc-c3{a} libxmlrpc-c3-dev{a} libxrandr2{a} libxrender1{a} libxslt1.1{a} libxt6{a} m4{a} makedev{a} man-db{a} mime-support{a} mysql-common{a} odbcinst{a} odbcinst1debian2{a} openssl{a} pkg-config{a} po-debconf{a} procps{a} python{a} python-dev{a} python-minimal{a} python2.6{a} python2.6-dev{a} python2.6-minimal{a} sgml-base{a} sgml-data{a} ttf-dejavu-core{a} ucf{a} unixodbc{a} unixodbc-dev{a} uuid-dev{a} x11-common{a} xml-core{a} xsltproc{a} zlib1g-dev{a} 0 packages upgraded, 157 newly installed, 0 to remove and 0 not upgraded. Need to get 72.0 MB/72.0 MB of archives. After unpacking 212 MB will be used. WARNING: untrusted versions of the following packages will be installed! Untrusted packages could compromise your system's security. You should only proceed with the installation if you are certain that this is what you want to do. libkrb5-3 libk5crypto3 libpopt0 libxfixes3 libradiusclient-ng2 xsltproc libperl-dev libldap-2.4-2 liblcms1 libexpat1-dev libunistring0 procps libxmlrpc-c3-dev libidn11 debhelper libsensors4 libwrap0 python-minimal libhashkit0 pkg-config libunistring-dev libsnmp15 libjson0-dev ttf-dejavu-core bison libx11-data comerr-dev odbcinst1debian2 liblua5.1-0-dev libpython2.6 docbook-xml libwrap0-dev bsdmainutils libncurses5-dev m4 libxslt1.1 po-debconf libsnmp-perl libpcre3 groff-base gettext-base python-dev libmysqlclient-dev libgnutls26 libkrb5-dev odbcinst xml-core python2.6 intltool-debian libtasn1-3 libfreetype6 libdb-dev libglib2.0-0 libmysqlclient16 libexpat1 libcurl4-openssl-dev libreadline6-dev libgssrpc4 libsnmp-base libpcrecpp0 libmemcached-dev python2.6-minimal unixodbc fontconfig libdb4.8-dev libjson0 gettext libxcb1 libxau6 libodbcinstq1c2 libconfuse-dev libcurl3 libssh2-1-dev libxinerama1 libkrb5support0 python libxft2 fontconfig-config libssl-dev libradiusclient-ng-dev libssh2-1 libcroco3 libmemcachedutil0 libevent-1.4-2 libidn11-dev libice6 libmemcachedprotocol0 libxdmcp6 libgcrypt11 makedev python2.6-dev libxml2 erlang-dev libkeyutils1 zlib1g-dev file libxml2-dev libxrender1 flex sgml-base ucf libevent-core-1.4-2 libev3 libsnmp-dev mime-support uuid-dev libpng12-0 libkadm5clnt-mit7 libjpeg62 libgeoip1 libperl5.10 libconfuse0 libpq-dev libkadm5srv-mit7 liblua5.1-0 libsqlite3-dev x11-common sgml-data libx11-6 libsasl2-2 libpq5 man-db libpcre3-dev libfontconfig1 html2text openssl libev-dev libsm6 libkdb5-4 libqt3-mt libgeoip-dev libxmlrpc-c3 libevent-extra-1.4-2 krb5-multidev libevent-dev libgssapi-krb5-2 libxi6 libaudio2 libxcursor1 libxt6 libltdl-dev libxext6 libsasl2-modules mysql-common libxrandr2 ca-certificates libmng1 libmemcached5 unixodbc-dev libsensors4-dev libsasl2-dev libltdl7 libmagic1 libgpg-error0 erlang-base libldap2-dev libreadline-dev Do you want to ignore this warning and proceed anyway? To continue, enter "Yes"; to abort, enter "No": Abort. E: pbuilder-satisfydepends failed. I: Copying back the cached apt archive contents I: unmounting /tmp/apt-jdg_kDNY0m filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.23949 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/squeeze-amd64.building.16309 + '[' -r /var/run/lock/squeeze-amd64.update.16309 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailio44-nightly-binaries/architecture=a…'> + '[' -n /tmp/tmp.3UgvqGiG9D ']' + rm -rf /tmp/tmp.3UgvqGiG9D + '[' -n /tmp/apt-jdg_kDNY0m ']' + sudo rm -rf /tmp/apt-jdg_kDNY0m + '[' -n 12447 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=23 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Oct 30 04:27:00 UTC 2018 [running 23 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Oct 30 04:27:00 UTC 2018 [running 23 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

[kamailio/kamailio] usrloc: call contact expired call back for a domain with db_mode: DB_ONLY (#1683)
by adil-mafzool 30 Oct '18

30 Oct '18

usrloc: call contact expired call back for a domain with db_mode: DB_ONLY; database rows are removed by the timer function: db_timer_udomain   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Currently call contact expired call back for a domain with db_mode: DB_ONLY doesn't callback function for "usrloc:contact-expired" to carry out call back application actions since database rows are removed by the timer function: db_timer_udomain. There is addition of new function udomain_contact_expired_cb which will only call the call back function when contact are being removed from the database. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1683 -- Commit Summary -- * usrloc: call contact expired call back for a domain with db_mode: DB_ONLY -- File Changes -- M src/modules/usrloc/udomain.c (172) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1683.patch https://github.com/kamailio/kamailio/pull/1683.diff -- 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/pull/1683

3 12

git:master:9757bb8c: usrloc: call contact expired call back for a domain with db_mode: DB_ONLY (#1683)
by Henning Westerholt 30 Oct '18

30 Oct '18

Module: kamailio Branch: master Commit: 9757bb8c0e2fea5173f4fa3dd7798d61759f04af URL: https://github.com/kamailio/kamailio/commit/9757bb8c0e2fea5173f4fa3dd7798d6… Author: adil-mafzool <36664780+adil-mafzool(a)users.noreply.github.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-10-30T21:23:23+01:00 usrloc: call contact expired call back for a domain with db_mode: DB_ONLY (#1683) * usrloc: call contact expired call back for a domain with db_mode: DB_ONLY * usrloc: only execute funtion udomain_contact_expired_cb when db_mode is set as DB_ONLY * usrloc: removed redundant function call mem_insert_urecord from udomain_contact_expired_cb --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/9757bb8c0e2fea5173f4fa3dd7798d6… Patch: https://github.com/kamailio/kamailio/commit/9757bb8c0e2fea5173f4fa3dd7798d6…

1 0

[kamailio/kamailio] pdb: fix SIGABRT in case of too long uris (#1693)
by Lucian Balaceanu 30 Oct '18

30 Oct '18

buf in pdb_msg_dbg should correctly accomodate for pdb_bdy size pdb_hdr + pdb_bdy should add to pdb_hdr.length (max 255)   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x ] PR should be backported to stable branches - [x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Can I also port this back to 4.4? Thank you. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1693 -- Commit Summary -- * pdb: fix SIGABRT in case of too long uris -- File Changes -- M src/modules/pdb/common.h (3) M src/modules/pdb/pdb.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1693.patch https://github.com/kamailio/kamailio/pull/1693.diff -- 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/pull/1693

2 3

git:4.4:77706a1f: pdb: fix SIGABRT in case of too long uris
by Lucian Balaceanu 30 Oct '18

30 Oct '18

Module: kamailio Branch: 4.4 Commit: 77706a1f45ce83e43c04883a230a41d0a10b70d1 URL: https://github.com/kamailio/kamailio/commit/77706a1f45ce83e43c04883a230a41d… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2018-10-30T10:44:11+02:00 pdb: fix SIGABRT in case of too long uris kudos for this one go to Verena Kahmann buf in pdb_msg_dbg should correctly accomodate for pdb_bdy size pdb_hdr + pdb_bdy should add to pdb_hdr.length (max 255) --- Modified: modules/pdb/common.h Modified: modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/77706a1f45ce83e43c04883a230a41d… Patch: https://github.com/kamailio/kamailio/commit/77706a1f45ce83e43c04883a230a41d… --- diff --git a/modules/pdb/common.h b/modules/pdb/common.h index cd4932958b..026c8bc488 100644 --- a/modules/pdb/common.h +++ b/modules/pdb/common.h @@ -41,7 +41,8 @@ #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000 #define NULL_CARRIERID -1001 -#define PAYLOADSIZE 256 +/* hdr size + PAYLOADSIZE must add to 255 (uint8_t pdb_hdr.length) */ +#define PAYLOADSIZE 249 #define IS_VALID_PDB_CARRIERID(id) ((id>=MIN_PDB_CARRIERID) && (id<=MAX_PDB_CARRIERID)) diff --git a/modules/pdb/pdb.c b/modules/pdb/pdb.c index 6feb3098c2..9ea05d34d6 100644 --- a/modules/pdb/pdb.c +++ b/modules/pdb/pdb.c @@ -160,7 +160,7 @@ static struct server_list_t *server_list; /* debug function for the new client <-> server protocol */ static void pdb_msg_dbg(struct pdb_msg msg, char *dbg_msg) { int i; - char buf[PAYLOADSIZE]; + char buf[PAYLOADSIZE*3+1]; char *ptr = buf; for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { @@ -279,7 +279,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct /* prepare request */ reqlen = number.len + 1; /* include null termination */ - if (reqlen > sizeof(struct pdb_bdy)) { + if (reqlen > PAYLOADSIZE) { LM_ERR("number too long '%.*s'.\n", number.len, number.s); return -1; } @@ -319,6 +319,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct break; } + memset(&msg,0,sizeof(struct pdb_msg)); /* wait for response */ for (;;) { if (gettimeofday(&tnow, NULL) != 0) {

1 0

git:master:e29c90ca: Merge pull request #1693 from lbalaceanu/pdb_fixabrt
by GitHub 30 Oct '18

30 Oct '18

Module: kamailio Branch: master Commit: e29c90ca1a7e604a3a86d508e4ac0c7b57f382e8 URL: https://github.com/kamailio/kamailio/commit/e29c90ca1a7e604a3a86d508e4ac0c7… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2018-10-30T01:38:29-07:00 Merge pull request #1693 from lbalaceanu/pdb_fixabrt pdb: fix SIGABRT in case of too long uris --- Modified: src/modules/pdb/common.h Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/e29c90ca1a7e604a3a86d508e4ac0c7… Patch: https://github.com/kamailio/kamailio/commit/e29c90ca1a7e604a3a86d508e4ac0c7… --- diff --git a/src/modules/pdb/common.h b/src/modules/pdb/common.h index 1ba16cdf98..7c52c97ce0 100644 --- a/src/modules/pdb/common.h +++ b/src/modules/pdb/common.h @@ -35,7 +35,8 @@ #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000 #define NULL_CARRIERID -1001 -#define PAYLOADSIZE 256 +/* hdr size + PAYLOADSIZE must add to 255 (uint8_t pdb_hdr.length) */ +#define PAYLOADSIZE 249 #define IS_VALID_PDB_CARRIERID(id) ((id>=MIN_PDB_CARRIERID) && (id<=MAX_PDB_CARRIERID)) diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 8f2f80c326..eb59656734 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -145,7 +145,7 @@ static struct server_list_t *server_list; /* debug function for the new client <-> server protocol */ static void pdb_msg_dbg(struct pdb_msg msg, char *dbg_msg) { int i; - char buf[PAYLOADSIZE]; + char buf[PAYLOADSIZE * 3 + 1]; char *ptr = buf; for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { @@ -265,7 +265,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct /* prepare request */ reqlen = number.len + 1; /* include null termination */ - if (reqlen > sizeof(struct pdb_bdy)) { + if (reqlen > PAYLOADSIZE) { LM_ERR("number too long '%.*s'.\n", number.len, number.s); return -1; } @@ -305,6 +305,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct break; } + memset(&msg, 0, sizeof(struct pdb_msg)); /* wait for response */ for (;;) { if (gettimeofday(&tnow, NULL) != 0) {

1 0

git:master:783763e8: pdb: fix SIGABRT in case of too long uris
by Lucian Balaceanu 30 Oct '18

30 Oct '18

Module: kamailio Branch: master Commit: 783763e8accef47aa563cd17d1e170250268751c URL: https://github.com/kamailio/kamailio/commit/783763e8accef47aa563cd17d1e1702… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2018-10-29T11:54:45+02:00 pdb: fix SIGABRT in case of too long uris buf in pdb_msg_dbg should correctly accomodate for pdb_bdy size pdb_hdr + pdb_bdy should add to pdb_hdr.length (max 255) --- Modified: src/modules/pdb/common.h Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/783763e8accef47aa563cd17d1e1702… Patch: https://github.com/kamailio/kamailio/commit/783763e8accef47aa563cd17d1e1702… --- diff --git a/src/modules/pdb/common.h b/src/modules/pdb/common.h index 1ba16cdf98..7c52c97ce0 100644 --- a/src/modules/pdb/common.h +++ b/src/modules/pdb/common.h @@ -35,7 +35,8 @@ #define OTHER_CARRIERID 1000 #define MAX_CARRIERID 1000 #define NULL_CARRIERID -1001 -#define PAYLOADSIZE 256 +/* hdr size + PAYLOADSIZE must add to 255 (uint8_t pdb_hdr.length) */ +#define PAYLOADSIZE 249 #define IS_VALID_PDB_CARRIERID(id) ((id>=MIN_PDB_CARRIERID) && (id<=MAX_PDB_CARRIERID)) diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 8f2f80c326..eb59656734 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -145,7 +145,7 @@ static struct server_list_t *server_list; /* debug function for the new client <-> server protocol */ static void pdb_msg_dbg(struct pdb_msg msg, char *dbg_msg) { int i; - char buf[PAYLOADSIZE]; + char buf[PAYLOADSIZE * 3 + 1]; char *ptr = buf; for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { @@ -265,7 +265,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct /* prepare request */ reqlen = number.len + 1; /* include null termination */ - if (reqlen > sizeof(struct pdb_bdy)) { + if (reqlen > PAYLOADSIZE) { LM_ERR("number too long '%.*s'.\n", number.len, number.s); return -1; } @@ -305,6 +305,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct break; } + memset(&msg, 0, sizeof(struct pdb_msg)); /* wait for response */ for (;;) { if (gettimeofday(&tnow, NULL) != 0) {

1 0

git:master:6745a6c7: rabbitmq: use fixup spve all
by Daniel-Constantin Mierla 30 Oct '18

30 Oct '18

Module: kamailio Branch: master Commit: 6745a6c784218130a28896cbfa4ea520047d8fc6 URL: https://github.com/kamailio/kamailio/commit/6745a6c784218130a28896cbfa4ea52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-30T07:21:48+01:00 rabbitmq: use fixup spve all - allow tracking parameter number - prefix to avoid conflict of common name function --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/6745a6c784218130a28896cbfa4ea52… Patch: https://github.com/kamailio/kamailio/commit/6745a6c784218130a28896cbfa4ea52… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 45556ef196..d5eedbdbf4 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -85,7 +85,7 @@ static int rabbitmq_disconnect(amqp_connection_state_t *conn); static int rabbitmq_reconnect(amqp_connection_state_t *conn); /* module fixup functions */ -static int fixup_params(void **param, int param_no) +static int rbmq_fixup_params(void **param, int param_no) { if(param_no == 5) { if(fixup_pvar_null(param, 1) != 0) { @@ -98,18 +98,18 @@ static int fixup_params(void **param, int param_no) } return 0; } else { - return fixup_spve_null(param, 1); + return fixup_spve_all(param, param_no); } return -1; } -static int fixup_free_params(void **param, int param_no) +static int rbmq_fixup_free_params(void **param, int param_no) { if(param_no == 5) { return fixup_free_pvar_null(param, 1); } else { - return fixup_free_spve_null(param, 1); + return fixup_free_spve_all(param, param_no); } return -1; @@ -117,10 +117,10 @@ static int fixup_free_params(void **param, int param_no) /* module commands */ static cmd_export_t cmds[] = { - {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, fixup_params, - fixup_free_params, REQUEST_ROUTE}, + {"rabbitmq_publish", (cmd_function)rabbitmq_publish, 4, fixup_spve_all, + fixup_free_spve_all, REQUEST_ROUTE}, {"rabbitmq_publish_consume", (cmd_function)rabbitmq_publish_consume, 5, - fixup_params, fixup_free_params, REQUEST_ROUTE}, + rbmq_fixup_params, rbmq_fixup_free_params, REQUEST_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 0

[kamailio/kamailio] when using terminate_dlg via xmlrpc, not able to generate proper bye message, if request is behind nat. (#1689)
by Surendra Tiwari 29 Oct '18

29 Oct '18

### Description Using xmlrpc command to generate the bye using terminate_dlg request:  ### Troubleshooting #### Reproduction use xmlrpc request to terminate the dialog ``` curl --data @xmlrpc http://13.57.122.212:8080/RPC ``` xmlrpc file will have following things ``` <?xml version="1.0"?> <methodCall> <methodName>dlg.terminate_dlg</methodName> <params> <param><value><string>fe6361a2-52f0-1237-e5a2-06119108e458</string></value></param> <param><value><string>07322vj6a8taa</string></value></param> <param><value><string>gK09f669d8</string></value></param> </params> </methodCall> ```  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` **Bye message without xmlrpc** BYE sip:gw+plivo.com@13.57.90.158:5080;transport=tcp;transport=tcp;gw=plivo.com;alias=13.57.90.158~49325~2 SIP/2.0. Record-Route: <sip:13.57.122.212;lr;ftag=gK07d4ffc2>. Record-Route: <sip:18.214.109.132:5060;lr;ftag=gK07d4ffc2>. Via: SIP/2.0/UDP 13.57.122.212:5060;branch=z9hG4bK154c.8fa2a8729a68989c41230f0906bcd2bd.0. Via: SIP/2.0/UDP 18.214.109.132:5060;rport=5060;branch=z9hG4bK154c.44759fe4.0. Via: SIP/2.0/UDP 81.52.176.68:5060;branch=z9hG4bK07Badb05d2bebab0ac9. From: <sip:+919967609476@81.52.176.68>;tag=gK07d4ffc2. To: "919967609476" <sip:+919967609476@54.183.206.134>;tag=5SDBNUapcZv5m. Call-ID: 237f21f0-52db-1237-e5a2-06119108e458. CSeq: 29061 BYE. Max-Forwards: 68. Route: <sip:54.183.206.134:5060;r2=on;lr;ftag=5SDBNUapcZv5m;nat=yes>. Route: <sip:54.183.206.134:5060;transport=tcp;r2=on;lr;ftag=5SDBNUapcZv5m;nat=yes>. Reason: Q.850;cause=16. Content-Length: 0. .. **Bye message using xmlrpc request** U 172.31.4.160:5060 -> 54.183.206.134:5060 BYE sip:gw+plivo.com@13.57.90.158:5080;transport=tcp;transport=tcp;gw=plivo.com SIP/2.0. Via: SIP/2.0/UDP 13.57.122.212:5060;branch=z9hG4bK7841.79765615000000000000000000000000.0. To: <sip:suren1002170622114516@54.183.206.134>;tag=Hv494Z9D8D9rH. From: <sip:919967609476@54.183.206.134>;tag=gK0cf13bdd. CSeq: 1 BYE. Call-ID: 56783745-52ef-1237-e5a2-06119108e458. Route: <sip:54.183.206.134:5060;r2=on;lr;ftag=Hv494Z9D8D9rH;nat=yes>, <sip:54.183.206.134;transport=tcp;r2=on;lr;ftag=Hv494Z9D8D9rH;nat=yes>. Content-Length: 0. User-Agent: kamailio (5.1.4 (x86_64/linux)). Max-Forwards: 70. .. ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-172-31-4-160:/etc/kamailio# kamailio -version version: kamailio 5.1.4 (x86_64/linux) 6ebfda flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 6ebfda compiled on 11:48:26 Sep 7 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` root@ip-172-31-4-160:/etc/kamailio# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 14.04.5 LTS Release: 14.04 Codename: trusty root@ip-172-31-4-160:/etc/kamailio# uname -a Linux ip-172-31-4-160 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1689

2 10

[kamailio/kamailio] Dialog: generating the request uri with alias when route header present (#1695)
by Surendra Tiwari 29 Oct '18

29 Oct '18

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1689 (replace XXXX with an open issue number) #### Description Using contact as request uri when there is route header present in the dialog  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1695 -- Commit Summary -- * Dialog: generating the request uri with alias when route header present -- File Changes -- M src/modules/dialog/dlg_req_within.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1695.patch https://github.com/kamailio/kamailio/pull/1695.diff -- 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/pull/1695

1 3

git:master:810d8498: dialog: handle alias in contact address for local bye only when no route headers
by Daniel-Constantin Mierla 29 Oct '18

29 Oct '18

Module: kamailio Branch: master Commit: 810d84981b4ed83b11e4090740a36653ec10ef16 URL: https://github.com/kamailio/kamailio/commit/810d84981b4ed83b11e4090740a3665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-29T07:27:58+01:00 dialog: handle alias in contact address for local bye only when no route headers - GH #1689 --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/810d84981b4ed83b11e4090740a3665… Patch: https://github.com/kamailio/kamailio/commit/810d84981b4ed83b11e4090740a3665… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index d37bbbf514..62693808c8 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -77,8 +77,8 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ unsigned int loc_seq; char nbuf[MAX_URI_SIZE]; char dbuf[80]; - str nuri; - str duri; + str nuri = STR_NULL; + str duri = STR_NULL; size_t sz; char *p; @@ -87,14 +87,16 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ LM_ERR("no contact available\n"); goto error; } - /*restore alias parameter*/ - nuri.s = nbuf; - nuri.len = MAX_URI_SIZE; - duri.s = dbuf; - duri.len = 80; - if(uri_restore_rcv_alias(&cell->contact[dir], &nuri, &duri)<0) { - nuri.len = 0; - duri.len = 0; + if(cell->route_set[dir].s==NULL || cell->route_set[dir].len<=0){ + /*try to restore alias parameter if no route set */ + nuri.s = nbuf; + nuri.len = MAX_URI_SIZE; + duri.s = dbuf; + duri.len = 80; + if(uri_restore_rcv_alias(&cell->contact[dir], &nuri, &duri)<0) { + nuri.len = 0; + duri.len = 0; + } } if(nuri.len>0 && duri.len>0) { sz = sizeof(dlg_t) + (nuri.len+duri.len+2)*sizeof(char); @@ -103,7 +105,6 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ } td = (dlg_t*)pkg_malloc(sz); if(!td){ - LM_ERR("out of pkg memory\n"); return NULL; } @@ -122,13 +123,12 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ /*route set*/ if( cell->route_set[dir].s && cell->route_set[dir].len){ - - if( parse_rr_body(cell->route_set[dir].s, cell->route_set[dir].len, + if( parse_rr_body(cell->route_set[dir].s, cell->route_set[dir].len, &td->route_set) !=0){ LM_ERR("failed to parse route set\n"); goto error; } - } + } if(nuri.len>0 && duri.len>0) { /* req uri */ @@ -153,7 +153,7 @@ dlg_t * build_dlg_t(struct dlg_cell * cell, int dir){ td->id.rem_tag = cell->tag[dir]; td->id.loc_tag = (dir == DLG_CALLER_LEG) ? cell->tag[DLG_CALLEE_LEG]: cell->tag[DLG_CALLER_LEG]; - + td->state= DLG_CONFIRMED; td->send_sock = cell->bind_addr[dir];

1 0

[kamailio/kamailio] Dialog : Handling Alias in the request uri when having route header (#1694)
by Surendra Tiwari 29 Oct '18

29 Oct '18

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1689 (replace XXXX with an open issue number) #### Description Copying the contact header to request uri , when we have route header present in the dialog. This is basically needed for generating the call termination request using XMLRPC.  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1694 -- Commit Summary -- * Modules: Handling Alias in the request uri when having route header -- File Changes -- M src/modules/dialog/dlg_req_within.c (875) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1694.patch https://github.com/kamailio/kamailio/pull/1694.diff -- 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/pull/1694

1 1

compile source file in subdirectory of module
by Mojtaba 28 Oct '18

28 Oct '18

Hi, Let me know how i could add subdirectory in Makefile for module? I am developing new module for kamailio. Some source files pasted in subdirectory of main module. I need to compile them when i run make -C command. But know it just compile all source file that exist in current directory of module. With best regards -- --Mojtaba Esfandiari.S

2 1

git:master:98ee25c6: modules: readme files regenerated - nsq ... [skip ci]
by Kamailio Dev 27 Oct '18

27 Oct '18

Module: kamailio Branch: master Commit: 98ee25c6da118cadedd98621c580ed4df3a7e860 URL: https://github.com/kamailio/kamailio/commit/98ee25c6da118cadedd98621c580ed4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-10-27T15:46:44+02:00 modules: readme files regenerated - nsq ... [skip ci] --- Modified: src/modules/nsq/README --- Diff: https://github.com/kamailio/kamailio/commit/98ee25c6da118cadedd98621c580ed4… Patch: https://github.com/kamailio/kamailio/commit/98ee25c6da118cadedd98621c580ed4…

1 0

git:master:549106f5: Merge pull request #1685 from kamailio/nsq-deprecate-duplicate-func
by GitHub 27 Oct '18

27 Oct '18

Module: kamailio Branch: master Commit: 549106f591fc33bdc1e1aec26bd765d1ee4376ce URL: https://github.com/kamailio/kamailio/commit/549106f591fc33bdc1e1aec26bd765d… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-27T09:37:33-04:00 Merge pull request #1685 from kamailio/nsq-deprecate-duplicate-func nsq: deprecate json and pua funcs for json api and pua_json modules --- Modified: src/modules/nsq/Makefile Modified: src/modules/nsq/doc/nsq_admin.xml Modified: src/modules/nsq/nsq_mod.c Modified: src/modules/nsq/nsq_mod.h Modified: src/modules/nsq/nsq_reader.c Modified: src/modules/nsq/nsq_reader.h Removed: src/modules/nsq/nsq_json.c Removed: src/modules/nsq/nsq_json.h Removed: src/modules/nsq/nsq_pua.c Removed: src/modules/nsq/nsq_pua.h Removed: src/modules/nsq/nsq_trans.c Removed: src/modules/nsq/nsq_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/549106f591fc33bdc1e1aec26bd765d… Patch: https://github.com/kamailio/kamailio/commit/549106f591fc33bdc1e1aec26bd765d…

1 0

git:master:1f09a389: nsq: deprecate json and pua funcs for json api and pua_json modules
by Emmanuel Schmidbauer 27 Oct '18

27 Oct '18

Module: kamailio Branch: master Commit: 1f09a38982a64e0d6031d9e55e27e81e5f934c24 URL: https://github.com/kamailio/kamailio/commit/1f09a38982a64e0d6031d9e55e27e81… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2018-10-24T11:20:19-04:00 nsq: deprecate json and pua funcs for json api and pua_json modules --- Modified: src/modules/nsq/Makefile Modified: src/modules/nsq/doc/nsq_admin.xml Modified: src/modules/nsq/nsq_mod.c Modified: src/modules/nsq/nsq_mod.h Modified: src/modules/nsq/nsq_reader.c Modified: src/modules/nsq/nsq_reader.h Removed: src/modules/nsq/nsq_json.c Removed: src/modules/nsq/nsq_json.h Removed: src/modules/nsq/nsq_pua.c Removed: src/modules/nsq/nsq_pua.h Removed: src/modules/nsq/nsq_trans.c Removed: src/modules/nsq/nsq_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1f09a38982a64e0d6031d9e55e27e81… Patch: https://github.com/kamailio/kamailio/commit/1f09a38982a64e0d6031d9e55e27e81…

1 0

[kamailio/kamailio] nsq: deprecate json and pua funcs for json api and pua_json modules (#1685)
by Emmanuel Schmidbauer 27 Oct '18

27 Oct '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1685 -- Commit Summary -- * nsq: deprecate json and pua funcs for json api and pua_json modules -- File Changes -- M src/modules/nsq/Makefile (3) M src/modules/nsq/doc/nsq_admin.xml (131) D src/modules/nsq/nsq_json.c (308) D src/modules/nsq/nsq_json.h (59) M src/modules/nsq/nsq_mod.c (96) M src/modules/nsq/nsq_mod.h (23) D src/modules/nsq/nsq_pua.c (537) D src/modules/nsq/nsq_pua.h (34) M src/modules/nsq/nsq_reader.c (18) M src/modules/nsq/nsq_reader.h (3) D src/modules/nsq/nsq_trans.c (452) D src/modules/nsq/nsq_trans.h (42) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1685.patch https://github.com/kamailio/kamailio/pull/1685.diff -- 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/pull/1685

2 2

[kamailio/kamailio] pv: pv_time minor fix (#1691)
by dnadares 26 Oct '18

26 Oct '18

Pseudo variable $TV(un) - microseconds (not cached) wasn't working. Calling gettimeofday function fixes it.   #### Pre-Submission Checklist    - [X ] Commit message has the format required by CONTRIBUTING guide - [X ] Commits are split per component (core, individual modules, libs, utils, ...) - [X ] Each component has a single commit (if not, squash them into one commit) - [X ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X ] PR should be backported to stable branches - [X ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Pseudo variable $TV(un) - microseconds (not cached) wasn't working. Calling gettimeofday function fixes it. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1691 -- Commit Summary -- * pv: pv_time minor fix -- File Changes -- M src/modules/pv/pv_time.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1691.patch https://github.com/kamailio/kamailio/pull/1691.diff -- 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/pull/1691

3 3

[kamailio/kamailio] Core generated by Kamailio when a bad char is found in header (#1687)
by Joel Serrano 26 Oct '18

26 Oct '18

### Description Kamailio dies complaining about a bad char in some header. I can say that I just updated from the nightly-devel apt repo, this problem never happened in latest v5.1 release. ### Troubleshooting #### Reproduction I don't know how to reproduce yet. #### Debugging Data  [BT-FULL_core.kamailio.3329.1540415468.txt](https://github.com/kamailio/kama… [BT-FULL_core.kamailio.3330.1540415471.txt](https://github.com/kamailio/kama… [BT-FULL_core.kamailio.3331.1540415467.txt](https://github.com/kamailio/kama… [BT-FULL_core.kamailio.3333.1540415469.txt](https://github.com/kamailio/kama… [INFO-LOCALS_core.kamailio.3329.1540415468.txt](https://github.com/kamailio/… [INFO-LOCALS_core.kamailio.3330.1540415471.txt](https://github.com/kamailio/… [INFO-LOCALS_core.kamailio.3331.1540415467.txt](https://github.com/kamailio/… [INFO-LOCALS_core.kamailio.3333.1540415469.txt](https://github.com/kamailio/… [LIST_core.kamailio.3329.1540415468.txt](https://github.com/kamailio/kamaili… [LIST_core.kamailio.3330.1540415471.txt](https://github.com/kamailio/kamaili… [LIST_core.kamailio.3331.1540415467.txt](https://github.com/kamailio/kamaili… [LIST_core.kamailio.3333.1540415469.txt](https://github.com/kamailio/kamaili… #### Log Messages  The relevant log lines are: ``` Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/parse_addr_spec.c:718]: parse_addr_spec(): unexpected char [<] in status 6: ["910609864" <sip:;:929] . Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/msg_parser.c:164]: get_hdr_field(): bad to header Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/msg_parser.c:337]: parse_headers(): bad header field [To: "910609864" <sip:;:929<>64(a)138.99.136.3>;tag=as664d068c#015#012Call-ID: 032f010653fed9170365045a4e1002] Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/parse_addr_spec.c:718]: parse_addr_spec(): unexpected char [<] in status 6: ["910609864" <sip:;:929] . Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/msg_parser.c:164]: get_hdr_field(): bad to header Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/msg_parser.c:337]: parse_headers(): bad header field [To: "910609864" <sip:;:929<>64(a)138.99.136.3>;tag=as664d068c#015#012Call-ID: 032f010653fed9170365045a4e1002] Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/parse_addr_spec.c:718]: parse_addr_spec(): unexpected char [<] in status 6: ["910609864" <sip:;:929] . Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/msg_parser.c:164]: get_hdr_field(): bad to header Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/msg_parser.c:337]: parse_headers(): bad header field [To: "910609864" <sip:;:929<>64(a)138.99.136.3>;tag=as664d068c#015#012Call-ID: 032f010653fed9170365045a4e1002] Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: pv [pv_core.c:1892]: pv_get_hdr(): error parsing headers Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/parse_addr_spec.c:718]: parse_addr_spec(): unexpected char [<] in status 6: ["910609864" <sip:;:929] . Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/msg_parser.c:164]: get_hdr_field(): bad to header Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: <core> [core/parser/msg_parser.c:337]: parse_headers(): bad header field [To: "910609864" <sip:;:929<>64(a)138.99.136.3>;tag=as664d068c#015#012Call-ID: 032f010653fed9170365045a4e1002] Oct 24 16:11:11 sbc01 sbc[3330]: ERROR: pv [pv_core.c:704]: pv_get_callid(): cannot parse Call-Id header ``` #### SIP Traffic  I have enabled a mirror server to capture all traffic, once the problem happens again I will be able to update this issue with SIP traffic. ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@sbc01:/var/tmp# kamailio -v version: kamailio 5.2.0-pre1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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 6.3.0 root@sbc01:/var/tmp# ``` * **Operating System**:  ``` root@sbc01:/var/tmp# uname -a Linux sbc01.vozelia.com.pa 4.9.0-8-amd64 #1 SMP Debian 4.9.110-3+deb9u6 (2018-10-08) x86_64 GNU/Linux root@sbc01:/var/tmp# root@sbc01:/var/tmp# lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 9.5 (stretch) Release: 9.5 Codename: stretch root@sbc01:/var/tmp# ``` -- 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/1687

4 12

[kamailio/kamailio] pipelimit: module causes high CPU load due to periodic 1s /pro/net/upd|tcp and /pro/stat system call if server RAM >= 48GB (#1675)
by tpeham 26 Oct '18

26 Oct '18

### Description Kamailio pipelimit module causes high CPU load (20 - 30 %) on servers with > 48 GB RAM even if Kamailio is idle (no active calls). strace shows that every second `open /pro/stat` is called even if timer_interval is set to 10 seconds `modparam("pipelimit", "timer_interval", 10)` `1539343630.677932 open("/proc/stat", O_RDONLY) = 6` `1539343630.678278 open("/sys/devices/system/cpu/online", O_RDONLY|O_CLOEXEC) = 6` `1539343630.678418 open("/proc/net/udp", O_RDONLY) = 6` `1539343630.679448 open("/proc/net/tcp", O_RDONLY) = 6` `1539343630.722522 open("/proc/net/tcp", O_RDONLY) = 6` `1539343630.753095 open("/proc/net/udp", O_RDONLY) = 6` `1539343630.753838 open("/proc/net/tcp", O_RDONLY) = 6` `1539343630.783710 open("/proc/net/tcp", O_RDONLY) = 6` `1539343631.677966 open("/proc/stat", O_RDONLY) = 6` `1539343631.678378 open("/sys/devices/system/cpu/online", O_RDONLY|O_CLOEXEC) = 6` `1539343631.678534 open("/proc/net/udp", O_RDONLY) = 6` `1539343631.679784 open("/proc/net/tcp", O_RDONLY) = 6` `1539343631.717329 open("/proc/net/tcp", O_RDONLY) = 6` `1539343631.760763 open("/proc/net/udp", O_RDONLY) = 6` `1539343631.761786 open("/proc/net/tcp", O_RDONLY) = 6` `1539343631.805426 open("/proc/net/tcp", O_RDONLY) = 6` strace shows that with 8 GB RAM the read syscall takes 100us (average) - with 48GB it takes 586us (average)! see 5 seconds interval strace for 48GB: `2018-09-21 07:55:38,201` `strace: Process 6907 attached` `strace: Process 6907 detached` `% time seconds usecs/call calls errors syscall` `------ ----------- ----------- --------- --------- ----------------` `99.79 1.259694 586 2148 read` ` 0.06 0.000761 19 41 open` ` 0.04 0.000469 8 61 61 pause` ` 0.04 0.000462 13 36 munmap` ` 0.03 0.000336 8 41 close` ` 0.02 0.000257 7 36 mmap` ` 0.02 0.000234 3 80 61 rt_sigreturn` ` 0.01 0.000113 3 36 fstat` ` 0.00 0.000017 3 5 kill` `------ ----------- ----------- --------- --------- ----------------` `100.00 1.262343 2484 122 total` `2018-09-21 07:55:43,225` In the documentation (https://kamailio.org/docs/modules/5.1.x/modules/pipelimit.html) I found the following: > As reading the CPU load average is relatively expensive (opening /proc/stat, parsing it, etc), this only happens once every timer_interval seconds and consequently the FEEDBACK value is only at these intervals recomputed. This in turn makes it difficult for the drop rate to adjust quickly. Worst case scenarios are request rates going up/down instantly by thousands - it takes up to 20 seconds for the controller to adapt to the new request rate. IMHO the doc is misleading because the periodic timer used for this is hardcoded with 1000ms. see `( 349 pipelimit.c ) timer_add(pl_timer, MS_TO_TICKS(1000)); /* Start it after 1000ms */` Conclusion: Pipelimit polls periodically every second /proc/stats and /proc/net/udp|tcp. The modparam timer_interval does not affect the timer period. On servers with >48 GB this causes high CPU load. #### Reproduction always reproducible. ### Possible Solutions Use modparam timer_interval to initialize the `pl_timer` interval ### Additional Information version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown * **Operating System**: Centos 7.4 -- 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/1675

2 6

[kamailio/kamailio] sqlops cause infinite loop if database server is unreachable (#1690)
by David Minh Phan 26 Oct '18

26 Oct '18

### Description The sqlops module run into an infinite loop and print continously this line to the stderr (or stdout): 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] ### Troubleshooting #### Reproduction Set log_stderror=yes Load the sqlops module and configure it with a bad DB host. Example: ``` log_stderror=yes loadmodule "sqlops.so" modparam("sqlops","sqlcon","main=>postgres://abc:abc@INVALID_HOST/test") ``` #### Debugging Data #### Log Messages ``` 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] 22(17903) ERROR: <core> [core/io_wait.h:1040]: io_wait_loop_epoll(): epoll_wait(10, 0x2ab72bb7b690, 0, 5000): Invalid argument [22] ... ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.1.6 ``` * **Operating System**:  ``` Centos 7 Kernel: 3.10.0-514.26.1.el7.x86_64 ``` -- 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/1690

2 4

[kamailio/kamailio] cfg_rpc updates changing variable values to large random numbers (#1679)
by vinesinha 26 Oct '18

26 Oct '18

Continued from issue: https://github.com/kamailio/kamailio/issues/1583 Say you have a kamailio config file with variables ordered as A(int),B(int),C(string),D(int) – (all belonging to the same group). Kamailio first creates a linked list of these variables in a given group and calculates the group size as follows [actual code](https://github.com/kamailio/kamailio/blob/master/src/core/cfg/cfg_scr…): ``` Pseudo-code --------------------------------------------------------------------------------------------- group->size = 0 group->vars = null // the pointer to the head of the linked list of variables create_group_linked_list: for variable in group: if variable is integer: round up group_size to the nearest 4 byte multiple group_size += sizeof(int) if variable is string: round up group_size to the nearest 8 byte multiple group_size += sizeof(str) //str is a kamailio type (size 16 in our C++ compiler) if group->vars is null: group->vars = variable else variables->next = group->vars group->vars = variable --------------------------------------------------------------------------------------------- Linked list creation NULL group->size 0 A(int) group->size 4 B(int) -> A group->size 8 C(string) -> B -> A group->size 24 D(int) -> C -> B -> A group->size 28 ``` However, this linked list is not used as is. it is copied to a single shared memory block for all child processes. This is done in the [cfg_shmize()](https://github.com/kamailio/kamailio/blob/master/src/core/cfg… which further calls [cfg_script_fixup()](https://github.com/kamailio/kamailio/blob/master/src/co… Basically, the function goes through the linked list of variables created above and calculates the offset of each variable in the memory block assuming that the offset of the first variable is 0. Following is the pseudo-code of what cfg_script_fixup() does for the linked list and offset calculation: ``` Pseudo-code -------------------------------------------------------------------------------------------- offset = 0 node = group->vars: while node != null: if node's value is int: round up offset to nearest multiple of 4 node->offset = offset offset += sizeof(int) if node's value is str: round up offset to nearest multiple of 8 node->offset = offset offset += sizeof(str) node = node -> next -------------------------------------------------------------------------------------------- linked list (from above): D(int) -> C(string) -> B(int) -> A(int) offset=0 D D->offset = 0 offset = 4 C C->offset = 8 offset = 24 B B->offset = 24 offset = 28 A A->offset = 28 offset = 32 (which would be the actual group size) ``` So, as visible, **the order in which the linked list is being processed on the two cases is causing issues** (from A to D in one case and from D to A in the next case). while the group size calculation code block leads to a group size of 28, the group size according to the second code block would be 32 and the offset of the last variable would we 28. This would lead to the last variable (all 4 bytes) getting corrupted. My temporary solution is to recalculate the group size every time a variable is added in the first code block by re-traversing the linked list but is definitely not the ideal solution. -- 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/1679

3 8

git:master:6e6a2f44: uac: test if qop field has a list of values for remote auth challenge
by Daniel-Constantin Mierla 26 Oct '18

26 Oct '18

Module: kamailio Branch: master Commit: 6e6a2f442e06a23aa180f07c2a954068dfc58843 URL: https://github.com/kamailio/kamailio/commit/6e6a2f442e06a23aa180f07c2a95406… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-26T09:21:57+02:00 uac: test if qop field has a list of values for remote auth challenge - GH #1684 --- Modified: src/modules/uac/auth_alg.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6a2f442e06a23aa180f07c2a95406… Patch: https://github.com/kamailio/kamailio/commit/6e6a2f442e06a23aa180f07c2a95406… --- diff --git a/src/modules/uac/auth_alg.c b/src/modules/uac/auth_alg.c index 9d236e9d20..0425561fe2 100644 --- a/src/modules/uac/auth_alg.c +++ b/src/modules/uac/auth_alg.c @@ -135,6 +135,7 @@ void uac_calc_response( HASHHEX ha1, HASHHEX ha2, { MD5_CTX Md5Ctx; HASH RespHash; + char *p; MD5Init(&Md5Ctx); MD5Update(&Md5Ctx, ha1, HASHHEXLEN); @@ -148,7 +149,12 @@ void uac_calc_response( HASHHEX ha1, HASHHEX ha2, MD5Update(&Md5Ctx, ":", 1); MD5Update(&Md5Ctx, cnonce->s, cnonce->len); MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, auth->qop.s, auth->qop.len); + p = memchr(auth->qop.s, ',', auth->qop.len); + if(p) { + MD5Update(&Md5Ctx, auth->qop.s, (size_t)(p - auth->qop.s)); + } else { + MD5Update(&Md5Ctx, auth->qop.s, auth->qop.len); + } MD5Update(&Md5Ctx, ":", 1); }; MD5Update(&Md5Ctx, ha2, HASHHEXLEN);

1 0

git:master:2ecf601c: core: variables declared in the config file could cause memory corruption
by mtirpak 25 Oct '18

25 Oct '18

Module: kamailio Branch: master Commit: 2ecf601c472bb81b9cf4ffd5b1ac17c4dfd742f2 URL: https://github.com/kamailio/kamailio/commit/2ecf601c472bb81b9cf4ffd5b1ac17c… Author: mtirpak <miklos.tirpak(a)gmail.com> Committer: mtirpak <miklos.tirpak(a)gmail.com> Date: 2018-10-25T13:57:17+02:00 core: variables declared in the config file could cause memory corruption The config variables that are declared in the config file were recorded in the reverse order as their padding was calculated, which could cause the allocated memory block to be smaller as required at the end. Credits go to vinesinha. --- Modified: src/core/cfg/cfg_script.c --- Diff: https://github.com/kamailio/kamailio/commit/2ecf601c472bb81b9cf4ffd5b1ac17c… Patch: https://github.com/kamailio/kamailio/commit/2ecf601c472bb81b9cf4ffd5b1ac17c… --- diff --git a/src/core/cfg/cfg_script.c b/src/core/cfg/cfg_script.c index b85d103696..9873f70405 100644 --- a/src/core/cfg/cfg_script.c +++ b/src/core/cfg/cfg_script.c @@ -35,7 +35,7 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type char *descr) { cfg_group_t *group; - cfg_script_var_t *var; + cfg_script_var_t *var, **last_var; int gname_len, vname_len, descr_len; LM_DBG("declaring %s.%s\n", gname, vname); @@ -112,9 +112,15 @@ cfg_script_var_t *new_cfg_script_var(char *gname, char *vname, unsigned int type memset(var, 0, sizeof(cfg_script_var_t)); var->type = type; - /* add the variable to the group */ - var->next = (cfg_script_var_t *)(void *)group->vars; - group->vars = (char *)(void *)var; + /* Add the variable to the end of the group. + * The order is important because the padding depends on that. + * The list will be travelled later again, which must be done in + * the same order. */ + last_var = (cfg_script_var_t **)(void **)&group->vars; + while ((*last_var)) + last_var = &((*last_var)->next); + *last_var = var; + var->next = NULL; /* clone the name of the variable */ var->name = (char *)pkg_malloc(sizeof(char) * (vname_len + 1)); @@ -282,6 +288,14 @@ int cfg_script_fixup(cfg_group_t *group, unsigned char *block) } } + /* Sanity check for the group size, make sure that the + * newly calculated size equals the already calculated + * group size. */ + if (offset != group->size) { + LM_ERR("BUG: incorrect group size: %d; previously calculated value: %d \n", offset, group->size); + goto error; + } + /* allocate a handle even if it will not be used to directly access the variable, like handle->variable cfg_get_* functions access the memory block via the handle

1 0

[kamailio/kamailio] evapi: minor fix in tag length compare (#1688)
by dnadares 25 Oct '18

25 Oct '18

It was assigning the length instead of comparing it.   #### Pre-Submission Checklist    - [X ] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The tag length was being assigning instead of being compared. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1688 -- Commit Summary -- * evapi: minor fix in tag length compare -- File Changes -- M src/modules/evapi/evapi_dispatch.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1688.patch https://github.com/kamailio/kamailio/pull/1688.diff -- 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/pull/1688

2 2

git:master:3da3aa0c: evapi: minor fix in tag length compare
by Daniel-Constantin Mierla 25 Oct '18

25 Oct '18

Module: kamailio Branch: master Commit: 3da3aa0c9ee3fcd5aadd3924ee883666d2a15ac6 URL: https://github.com/kamailio/kamailio/commit/3da3aa0c9ee3fcd5aadd3924ee88366… Author: dnadares <dnadares(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-25T09:55:00+02:00 evapi: minor fix in tag length compare It was assigning the length instead of comparing it. --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/3da3aa0c9ee3fcd5aadd3924ee88366… Patch: https://github.com/kamailio/kamailio/commit/3da3aa0c9ee3fcd5aadd3924ee88366… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index fee0cc8c27..5b7d534d09 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -289,7 +289,7 @@ int evapi_dispatch_notify(evapi_msg_t *emsg) n = 0; for(i=0; i<EVAPI_MAX_CLIENTS; i++) { if(_evapi_clients[i].connected==1 && _evapi_clients[i].sock>=0) { - if(emsg->tag.s==NULL || (emsg->tag.len = _evapi_clients[i].stag.len + if(emsg->tag.s==NULL || (emsg->tag.len == _evapi_clients[i].stag.len && strncmp(_evapi_clients[i].stag.s, emsg->tag.s, emsg->tag.len)==0)) { wlen = write(_evapi_clients[i].sock, emsg->data.s,

1 0

git:master:5e763029: kex: safety check for accessing CSeq in per method stats
by Daniel-Constantin Mierla 25 Oct '18

25 Oct '18

Module: kamailio Branch: master Commit: 5e763029dc207c99796adc1c3ace71cf6de59446 URL: https://github.com/kamailio/kamailio/commit/5e763029dc207c99796adc1c3ace71c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-25T07:07:52+02:00 kex: safety check for accessing CSeq in per method stats - GH #1687 --- Modified: src/modules/kex/core_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/5e763029dc207c99796adc1c3ace71c… Patch: https://github.com/kamailio/kamailio/commit/5e763029dc207c99796adc1c3ace71c… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index 2f51a1f955..ef4d85dad8 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -234,8 +234,17 @@ static int km_cb_req_stats(struct sip_msg *msg, static int km_cb_rpl_stats_by_method(struct sip_msg *msg, unsigned int flags, void *param) { - int method = get_cseq(msg)->method_id; - int group = msg->first_line.u.reply.statuscode / 100 - 1; + int method = 0; + int group = 0; + + if(msg==NULL) { + return -1; + } + if (!msg->cseq && (parse_headers(msg, HDR_CSEQ_F, 0) < 0 || !msg->cseq)) { + return -1; + } + method = get_cseq(msg)->method_id; + group = msg->first_line.u.reply.statuscode / 100 - 1; if (group >= 0 && group <= 5) { switch(method) {

1 0

Pull request example
by Diego Nadares 25 Oct '18

25 Oct '18

Hi guys, I hit a little bug in evapi module. I would like to do a pull request but i don't know exactly how to accomplish this. I found this howto -> https://yangsu.github.io/pull-request-tutorial . Are these the correct steps? I tried but it's forbidden for my user. git checkout -b pull-request-demo git push origin pull-request-demo remote: Permission to kamailio/kamailio.git denied to dnadares. fatal: unable to access 'https://github.com/kamailio/kamailio.git/': The requested URL returned error: 403 Could you help me, please? Thanks in advance. Diego

2 3

Pull request example
by Diego Nadares 24 Oct '18

24 Oct '18

Hi guys, I hit a little bug in evapi module. I would like to do a pull request but i don't know exactly how to accomplish this. I found this howto -> https://yangsu.github.io/pull-request-tutorial . Are these the correct steps? I tried but it's forbidden for my user. git checkout -b pull-request-demo git push origin pull-request-demo remote: Permission to kamailio/kamailio.git denied to dnadares. fatal: unable to access 'https://github.com/kamailio/kamailio.git/': The requested URL returned error: 403 Could you help me, please? Thanks in advance. Diego.

1 0

git:master:e87feb9f: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 24 Oct '18

24 Oct '18

Module: kamailio Branch: master Commit: e87feb9f11c1dde9710bf3ef3ef5e6626b735233 URL: https://github.com/kamailio/kamailio/commit/e87feb9f11c1dde9710bf3ef3ef5e66… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-10-24T15:01:48+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/e87feb9f11c1dde9710bf3ef3ef5e66… Patch: https://github.com/kamailio/kamailio/commit/e87feb9f11c1dde9710bf3ef3ef5e66… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index e745e4b9cf..d75a9de697 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -172,7 +172,7 @@ modparam("topos", "mask_callid", 1) 3.4. sanity_checks (int) - If set to 1, topoh module will bind to sanity module in order to + If set to 1, topos module will bind to sanity module in order to perform sanity checks over received SIP request. Default sanity checks are done. It is useful to check if received request is well formatted before proceeding to encoding/decoding. @@ -181,7 +181,7 @@ modparam("topos", "mask_callid", 1) Example 1.4. Set sanity_checks parameter ... -modparam("topoh", "sanity_checks", 1) +modparam("topos", "sanity_checks", 1) ... 3.5. branch_expire (int)

1 0

git:master:56c40ebe: topos: docs - replaced c&p topoh with topos
by Daniel-Constantin Mierla 24 Oct '18

24 Oct '18

Module: kamailio Branch: master Commit: 56c40ebefcbe0954c5c40470b22d4f26e163a2d0 URL: https://github.com/kamailio/kamailio/commit/56c40ebefcbe0954c5c40470b22d4f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-24T14:49:10+02:00 topos: docs - replaced c&p topoh with topos --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/56c40ebefcbe0954c5c40470b22d4f2… Patch: https://github.com/kamailio/kamailio/commit/56c40ebefcbe0954c5c40470b22d4f2… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 281706b79b..b81672b006 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -150,7 +150,7 @@ modparam("topos", "mask_callid", 1) <section id="topos.p.sanity_checks"> <title><varname>sanity_checks</varname> (int)</title> <para> - If set to 1, topoh module will bind to sanity module in order + If set to 1, topos module will bind to sanity module in order to perform sanity checks over received SIP request. Default sanity checks are done. It is useful to check if received request is well formatted before proceeding to encoding/decoding. @@ -164,7 +164,7 @@ modparam("topos", "mask_callid", 1) <title>Set <varname>sanity_checks</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("topoh", "sanity_checks", 1) +modparam("topos", "sanity_checks", 1) ... </programlisting> </example>

1 0

Info: Pre-announcement about Kamailio World 2019
by Daniel-Constantin Mierla 24 Oct '18

24 Oct '18

Hello, being asked couple of times recently, for now I am sending a short note to say that the next edition of Kamailio World Conference is likely to take place at the same location in the city center of Berlin, Germany, during May 6-8, 2019. There are still some bits to sort out before making the dates final, so just have the dates in mind at this moment. Once all is set from organising point of view, we will make the official announcement. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:master:97855a17: core: cfg select - safety check accessing vars before initialization
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: master Commit: 97855a1766edf4ecc2cc4e38f3cc0d3cea3190db URL: https://github.com/kamailio/kamailio/commit/97855a1766edf4ecc2cc4e38f3cc0d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T11:34:08+02:00 core: cfg select - safety check accessing vars before initialization --- Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/97855a1766edf4ecc2cc4e38f3cc0d3… Patch: https://github.com/kamailio/kamailio/commit/97855a1766edf4ecc2cc4e38f3cc0d3… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index b8b5d265a0..175c6bd589 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -220,7 +220,12 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) break; case CFG_VAR_STR: - memcpy(res, p, sizeof(str)); + if(p) { + memcpy(res, p, sizeof(str)); + } else { + res->s = 0; + res->len = 0; + } break; default:

1 0

git:master:f4fb19db: pkg/kamailio/deb: version set to 5.2.0~pre1
by Victor Seva 19 Oct '18

19 Oct '18

Module: kamailio Branch: master Commit: f4fb19dbdadb5a6fb55b83804f5064dee6f98a4f URL: https://github.com/kamailio/kamailio/commit/f4fb19dbdadb5a6fb55b83804f5064d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-10-19T10:36:52+02:00 pkg/kamailio/deb: version set to 5.2.0~pre1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/f4fb19dbdadb5a6fb55b83804f5064d… Patch: https://github.com/kamailio/kamailio/commit/f4fb19dbdadb5a6fb55b83804f5064d…

1 0

git:master:85290210: Makefile.defs: version set to 5.2.0-pre1
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: master Commit: 85290210f05be46a04109b4f850e379c54f1a6a4 URL: https://github.com/kamailio/kamailio/commit/85290210f05be46a04109b4f850e379… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T09:50:46+02:00 Makefile.defs: version set to 5.2.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/85290210f05be46a04109b4f850e379… Patch: https://github.com/kamailio/kamailio/commit/85290210f05be46a04109b4f850e379… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index da9e95585a..52167a5899 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:82f7a6a7: ims_ipsec_pcscf: free memory on errors and variable supported
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: master Commit: 82f7a6a7f5c370442860a84a36ff449228bf1273 URL: https://github.com/kamailio/kamailio/commit/82f7a6a7f5c370442860a84a36ff449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T09:36:00+02:00 ims_ipsec_pcscf: free memory on errors and variable supported --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/82f7a6a7f5c370442860a84a36ff449… Patch: https://github.com/kamailio/kamailio/commit/82f7a6a7f5c370442860a84a36ff449… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index e0eeea8764..17e6c7b000 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -357,15 +357,19 @@ int add_supported_secagree_header(struct sip_msg* m) if((supported->s = pkg_malloc(supported_sec_agree_len)) == NULL) { LM_ERR("Error allcationg pkg memory for supported header str\n"); + pkg_free(supported); return -1; } memcpy(supported->s, supported_sec_agree, supported_sec_agree_len); supported->len = supported_sec_agree_len; if(cscf_add_header(m, supported, HDR_SUPPORTED_T) != 1) { + pkg_free(supported->s); + pkg_free(supported); LM_ERR("Error adding security header to reply!\n"); return -1; } + pkg_free(supported); return 0; }

1 0

[kamailio/kamailio] Kamailio crashes on NAPTR lookup (#1680)
by Joonas Keskitalo 19 Oct '18

19 Oct '18

### Description Kamailio crashes when running `dns.lookup NAPTR <x>` in kamcmd. NAPTR can be resolved from nameservers using `dig` command on same server: ``` # dig NAPTR sip.example.com +short 102 50 "s" "SIP+D2T" "" _sip._tcp.sip.example.com. 100 50 "s" "SIP+D2U" "" _sip._udp.sip.example.com. ``` Here is what happens when kamcmd is used: ``` kamcmd> dns.lookup NAPTR sip.example.com ERROR: read reply failed: Success (0) ``` All other lookups seems to work normally (A, SRV, etc...) ### Troubleshooting #### Reproduction This problem occurs every time I try to resolve any NAPTR record. It does not matter if the record exists or not in the nameserver. I have tried to use multiple nameservers but problem occurs on all of them. #### Debugging Data ``` (gdb) bt full #0 strlen () at ../sysdeps/x86_64/strlen.S:106 No locals. #1 0x00007fda60ad3032 in rpc_struct_add (s=0x556138f869c0, fmt=0x556137bc63c4 "s") at binrpc_run.c:1083 ap = {{gp_offset = 48, fp_offset = 48, overflow_arg_area = 0x7ffcfc0b4ed0, reg_save_area = 0x7ffcfc0b4de0}} err = 0 avp = {name = {s = 0x556137bc63ac "rr_preference", len = 13}, type = 1, u = {strval = { s = 0x32 <error: Cannot access memory at address 0x32>, len = 0}, fval = 2.4703282292062327e-322, intval = 50, end = 50}} rs = 0x38f56c00 __func__ = "rpc_struct_add" #2 0x0000556137a30e43 in dns_cache_print_entry (rpc=0x7fda60d01640 <binrpc_callbacks>, ctx=0x7ffcfc0b5060, e=0x7fda5b48e1d8) at core/dns_cache.c:3885 expires = 1445 rr = 0x7fda5b48e230 ip = {af = 32768, len = 0, u = {addrl = {32816, 512}, addr32 = {32816, 0, 512, 0}, addr16 = {32816, 0, 0, 0, 512, 0, 0, 0}, addr = "0\200\000\000\000\000\000\000\000\002\000\000\000\000\000"}} now = 1080071524 s = {s = 0x2300028660 <error: Cannot access memory at address 0x2300028660>, len = -66367552} i = 0 n = 1 th = 0x556138f54bb0 rh = 0x556138f56c00 sh = 0x556138f869c0 ih = 0x7ffcfc0b4f90 ah = 0x0 #3 0x0000556137a36ec8 in dns_cache_rpc_lookup (rpc=0x7fda60d01640 <binrpc_callbacks>, ctx=0x7ffcfc0b5060) at core/dns_cache.c:4712 e = 0x7fda5b48e1d8 name = {s = 0x556138f6e941 "sip.example.com", len = 17} type = {s = 0x556138f6e939 "NAPTR", len = 5} t = 35 __func__ = "dns_cache_rpc_lookup" #4 0x00007fda60ad094e in process_rpc_req (buf=0x556138f6e924 "\241\003({5\336`\221\vdns.lookup", size=47, bytes_needed=0x7ffcfc0b5224, sh=0x7ffcfc0b51a0, saved_state=0x556138f7e928) at binrpc_run.c:678 err = 0 val = {name = {s = 0x100b8 <error: Cannot access memory at address 0x100b8>, len = 934961267}, type = 1, u = {strval = { s = 0x556138f6e92d "dns.lookup", len = 10}, fval = 4.6380934184454688e-310, intval = 955705645, end = 955705645}} rpc_e = 0x7fda636f51a0 f_ctx = {in = {ctx = {tlen = 40, cookie = 2067127904, type = 0, flags = 1, offset = 40, in_struct = 0, in_array = 0}, s = 0x556138f6e953 "", end = 0x556138f6e953 "", record_no = 2, in_struct = 0}, out = {pkt = { body = 0x556138f7e9b0 "\003\203cfg.add_group_inst", end = 0x556138f869b0 "", crt = 0x556138f7e9b2 "cfg.add_group_inst"}, structs = {next = 0x556138f54bb0, prev = 0x556138f54bb0}}, send_h = 0x7ffcfc0b51a0, method = 0x556138f6e92d "dns.lookup", gc = 0x0, replied = 0, err_code = 0, err_phrase = {s = 0x0, len = 0}} ctx = 0x7ffcfc0b5060 __func__ = "process_rpc_req" #5 0x00007fda60ac6f8a in handle_stream_read (s_c=0x556138f6e8f0, idx=-1) at io_listener.c:511 bytes_free = 65535 bytes_read = 47 bytes_needed = 0 bytes_processed = 28 r = 0x556138f6e910 sh = {fd = 7, type = 0, from = {sa_in = {s = {sa_family = 0, sa_data = "\000\000\002\000\000\000\001\000\000\000\000\000\000"}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 2}, sin_zero = "\001\000\000\000\000\000\000"}, sin6 = { sin6_family = 0, sin6_port = 0, sin6_flowinfo = 2, sin6_addr = {__in6_u = { __u6_addr8 = "\001", '\000' <repeats 14 times>, __u6_addr16 = {1, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {1, 0, 0, 0}}}, sin6_scope_id = 0}}, sa_un = {sun_family = 0, sun_path = "\000\000\002\000\000\000\001", '\000' <repeats 47 times>, "\001\000\000\000\000\000\000\000xZ\341Z\332\177", '\000' <repeats 18 times>, "@R\v\374\001\000\000\000xZ\341Z\332\177\000\000@R\v\374\374\177"}}, from_len = 0} __func__ = "handle_stream_read" #6 0x00007fda60ac881d in handle_io (fm=0x7fda637b2558, events=1, idx=-1) at io_listener.c:706 ret = 1 __func__ = "handle_io" #7 0x00007fda60ac05ce in io_wait_loop_epoll (h=0x7fda60cf1340 <io_h>, t=10, repeat=0) at ../../core/io_wait.h:1065 n = 1 r = 0 fm = 0x7fda637b2558 revents = 1 __func__ = "io_wait_loop_epoll" #8 0x00007fda60ac42d5 in io_listen_loop (fd_no=1, cs_lst=0x556138f517f0) at io_listener.c:281 max_fd_no = 292 poll_err = 0x0 poll_method = 2 cs = 0x0 type = 2 __func__ = "io_listen_loop" #9 0x00007fda60adf397 in mod_child (rank=0) at ctl.c:337 pid = 0 cs = 0x2525252525252525 rpc_handler = 1 __func__ = "mod_child" #10 0x0000556137947c5b in init_mod_child (m=0x7fda63707cb0, rank=0) at core/sr_module.c:943 __func__ = "init_mod_child" #11 0x00005561379478e2 in init_mod_child (m=0x7fda63708310, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #12 0x00005561379478e2 in init_mod_child (m=0x7fda63709e78, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #13 0x00005561379478e2 in init_mod_child (m=0x7fda6370a2e0, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #14 0x00005561379478e2 in init_mod_child (m=0x7fda6370b178, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #15 0x00005561379478e2 in init_mod_child (m=0x7fda6370b888, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #16 0x000055613794802b in init_child (rank=0) at core/sr_module.c:970 No locals. #17 0x00005561377eeb91 in main_loop () at main.c:1701 i = 8 pid = 6785 si = 0x0 si_desc = "udp receiver child=7 sock=10.1.8.151:5060\000\060\000\332\177\000\000\070\217yc\332\177\000\000\001\000\000\000\f\b\000\000\000\000\000\000\000\000\000\000\370;G[\332\177\000\000\200X\v\374\001\000\000\000\310V\341Z\332\177\000\000\200X\v\374\374\177\000\000\"\341\245\067aU\000\000\200\016~7aU\000\000\320quc\332\177\000" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #18 0x00005561377f5cc7 in main (argc=3, argv=0x7ffcfc0b5bd8) at main.c:2638 cfg_stream = 0x556138e8b010 c = -1 r = 0 tmp = 0x7fda63fc92e7 "__vdso_getcpu" tmp_len = 32764 port = -66364912 proto = 32730 options = 0x556137b507e0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 220359506 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 19, st_ino = 40752, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1538560621, tv_nsec = 412647637}, st_mtim = { tv_sec = 1539854582, tv_nsec = 44920563}, st_ctim = {tv_sec = 1539854582, tv_nsec = 44920563}, __glibc_reserved = {0, 0, 0}} __func__ = "main" (gdb) info locals cfg_stream = 0x556138e8b010 c = -1 r = 0 tmp = 0x7fda63fc92e7 "__vdso_getcpu" tmp_len = 32764 port = -66364912 proto = 32730 options = 0x556137b507e0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 220359506 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 19, st_ino = 40752, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1538560621, tv_nsec = 412647637}, st_mtim = {tv_sec = 1539854582, tv_nsec = 44920563}, st_ctim = {tv_sec = 1539854582, tv_nsec = 44920563}, __glibc_reserved = {0, 0, 0}} __func__ = "main" (gdb) list 101 in ../sysdeps/x86_64/strlen.S ``` #### Log Messages  ``` Oct 18 10:37:11 sipfix1 kernel: [1393558.285356] kamailio[7264]: segfault at 32 ip 00007f57d79fb676 sp 00007ffdbb422d38 error 4 in libc-2 .24.so[7f57d797b000+195000] Oct 18 10:37:11 sipfix1 /usr/local/sbin/kamailio[7273]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 5 Oct 18 10:37:11 sipfix1 /usr/local/sbin/kamailio[7234]: ALERT: <core> [main.c:738]: handle_sigs(): child process 7264 exited by a signal 11 Oct 18 10:37:11 sipfix1 /usr/local/sbin/kamailio[7234]: ALERT: <core> [main.c:741]: handle_sigs(): core was generated Oct 18 10:37:11 sipfix1 /usr/local/sbin/kamailio[7234]: INFO: <core> [main.c:764]: handle_sigs(): terminating due to SIGCHLD ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.1.5 (x86_64/linux) c2f0c8 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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: c2f0c8 compiled on 09:25:31 Oct 2 2018 with gcc 6.3.0 ``` * **Operating System**:  ``` # uname -a Linux sip.example.com 4.9.0-8-amd64 #1 SMP Debian 4.9.110-3+deb9u3 (2018-08-19) x86_64 GNU/Linux ``` -- 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/1680

2 3

git:5.1:e178b8c6: core: init cfg framework before executing event_route[core:worker-one-init]
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: e178b8c620c991635d74c01e14b837e0080b1eea URL: https://github.com/kamailio/kamailio/commit/e178b8c620c991635d74c01e14b837e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:34:38+02:00 core: init cfg framework before executing event_route[core:worker-one-init] (cherry picked from commit a4b6a5cb1dda7576b265a23c91321b7f2a034658) --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/e178b8c620c991635d74c01e14b837e… Patch: https://github.com/kamailio/kamailio/commit/e178b8c620c991635d74c01e14b837e… --- diff --git a/src/core/action.c b/src/core/action.c index f7d3aaf465..374ba756ae 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1671,6 +1671,9 @@ int run_child_one_init_route(void) rt = route_get(&event_rt, "core:worker-one-init"); if(rt>=0 && event_rt.rlist[rt]!=NULL) { LM_DBG("executing event_route[core:worker-one-init] (%d)\n", rt); + if (cfg_child_init()) { + return -1; + } if(faked_msg_init()<0) return -1; fmsg = faked_msg_next();

1 0

git:5.1:552d90b8: core: fake msg - added sip schema to From/To URIs
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: 552d90b8a0c649917eedf7a6af47f03980b7b77f URL: https://github.com/kamailio/kamailio/commit/552d90b8a0c649917eedf7a6af47f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:29:18+02:00 core: fake msg - added sip schema to From/To URIs (cherry picked from commit 044cdefcadf5c7949945544dce30becb2d84c56e) --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/552d90b8a0c649917eedf7a6af47f03… Patch: https://github.com/kamailio/kamailio/commit/552d90b8a0c649917eedf7a6af47f03… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index fa948f4bbe..9a84954f0b 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -28,7 +28,7 @@ #include "fmsg.h" -#define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <you(a)kamailio.org>;tag=123\r\nTo: <you(a)kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" +#define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <sip:you@kamailio.org>;tag=123\r\nTo: <sip:you@kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) static char _faked_sip_buf[FAKED_SIP_MSG_LEN+1]; static struct sip_msg _faked_msg;

1 0

git:5.1:df62658b: core: info log at startup with number of precesses, pkg and shm sizes
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: df62658bb3af88b69c4dc4d019b4814967f9f8e3 URL: https://github.com/kamailio/kamailio/commit/df62658bb3af88b69c4dc4d019b4814… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:28:55+02:00 core: info log at startup with number of precesses, pkg and shm sizes - useful to see if needed to troubleshoot by analyzing log messages (cherry picked from commit f057e844ba407333ad8d876daa1f6ee49bd41c86) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/df62658bb3af88b69c4dc4d019b4814… Patch: https://github.com/kamailio/kamailio/commit/df62658bb3af88b69c4dc4d019b4814… --- diff --git a/src/main.c b/src/main.c index ee8239801f..dd33b89a75 100644 --- a/src/main.c +++ b/src/main.c @@ -2608,8 +2608,8 @@ int main(int argc, char** argv) * function being called before this point may rely on the * number of processes ! */ - LM_DBG("Expect (at least) %d kamailio processes in your process list\n", - get_max_procs()); + LM_INFO("processes (at least): %d - shm size: %lu - pkg size: %lu\n", + get_max_procs(), shm_mem_size, pkg_mem_size); #if defined USE_DNS_CACHE && defined USE_DNS_CACHE_STATS if (init_dns_cache_stats(get_max_procs())<0){

1 0

git:5.1:2a525588: core: dns_cache - NAPTR rr_preference set to number for rpc output
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: 2a5255880fb9b22bcc5d1615546935476facc787 URL: https://github.com/kamailio/kamailio/commit/2a5255880fb9b22bcc5d16155469354… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:29:08+02:00 core: dns_cache - NAPTR rr_preference set to number for rpc output - it was set to string, causing a crash - reported by GH #1680 (cherry picked from commit b29f333ab118c88d35fa51298cd7ef99857dbba7) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/2a5255880fb9b22bcc5d16155469354… Patch: https://github.com/kamailio/kamailio/commit/2a5255880fb9b22bcc5d16155469354… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index ab91a2077a..6363cefe38 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3882,7 +3882,7 @@ int dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_NAPTR: - if(rpc->struct_add(sh, "ds", + if(rpc->struct_add(sh, "dd", "rr_order", ((struct naptr_rdata*)(rr->rdata))->order, "rr_preference", ((struct naptr_rdata*)(rr->rdata))->pref) <0) {

1 0

git:5.1:df1f0cc7: kamctl: man page - note about prefixing number params with 's:' to enforce string
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: df1f0cc707255e848e8b5defd4c3ec43a7eab3f7 URL: https://github.com/kamailio/kamailio/commit/df1f0cc707255e848e8b5defd4c3ec4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:27:26+02:00 kamctl: man page - note about prefixing number params with 's:' to enforce string (cherry picked from commit 48048b0e372eabdde14460cb539b3e1ecbc13ae5) --- Modified: utils/kamctl/kamctl.8 --- Diff: https://github.com/kamailio/kamailio/commit/df1f0cc707255e848e8b5defd4c3ec4… Patch: https://github.com/kamailio/kamailio/commit/df1f0cc707255e848e8b5defd4c3ec4… --- diff --git a/utils/kamctl/kamctl.8 b/utils/kamctl/kamctl.8 index d82f25dc42..83a09c1703 100644 --- a/utils/kamctl/kamctl.8 +++ b/utils/kamctl/kamctl.8 @@ -40,6 +40,10 @@ inside .B kamctlrc file. +.PP +For some commands, parameters can be prefixed with 's:' in order to enforce +string type (e.g., 's:123456789'). + .SH AUTHORS see

1 0

git:5.1:3d203d97: dialplan: note and example for prefixing string param with s: for rpc dialplan.translate
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: 3d203d97f28e8d5eefb5ea63c0f3ff12b3cb9d2f URL: https://github.com/kamailio/kamailio/commit/3d203d97f28e8d5eefb5ea63c0f3ff1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:26:58+02:00 dialplan: note and example for prefixing string param with s: for rpc dialplan.translate (cherry picked from commit a169b298018f08a57da8e7a8c116560ee4fff006) --- Modified: src/modules/dialplan/doc/dialplan_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d203d97f28e8d5eefb5ea63c0f3ff1… Patch: https://github.com/kamailio/kamailio/commit/3d203d97f28e8d5eefb5ea63c0f3ff1… --- diff --git a/src/modules/dialplan/doc/dialplan_admin.xml b/src/modules/dialplan/doc/dialplan_admin.xml index e9f8f95350..ed8bad4fae 100644 --- a/src/modules/dialplan/doc/dialplan_admin.xml +++ b/src/modules/dialplan/doc/dialplan_admin.xml @@ -682,10 +682,12 @@ xlog("translated to var $var(y) \n"); <para>Parameters: <emphasis>2</emphasis></para> <itemizedlist> <listitem> - <para><emphasis>Dial plan ID</emphasis></para> + <para><emphasis>Dial plan ID</emphasis> (number)</para> </listitem> <listitem> - <para><emphasis>Input String</emphasis></para> + <para><emphasis>Input string</emphasis> (string) - it + can be prefixed with 's:' to avoid auto-conversion when + the command is executed with CLI apps such as &kamcmd;.</para> </listitem> </itemizedlist> <para> @@ -693,6 +695,7 @@ xlog("translated to var $var(y) \n"); </para> <programlisting format="linespecific"> &kamcmd; dialplan.translate 1 "abcdxyz" + &kamcmd; dialplan.translate 1 s:123456789 </programlisting> </section> </section>

1 0

git:5.1:3733918a: utils/kamcmd: man page - note about the suto-conversion of number parameters
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: 3733918a287af1f9aa323b0b4e454c2db409ac9a URL: https://github.com/kamailio/kamailio/commit/3733918a287af1f9aa323b0b4e454c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:27:14+02:00 utils/kamcmd: man page - note about the suto-conversion of number parameters (cherry picked from commit c998a7cc2d265d6e3c0e10facc280866495d827e) --- Modified: utils/kamcmd/kamcmd.8 --- Diff: https://github.com/kamailio/kamailio/commit/3733918a287af1f9aa323b0b4e454c2… Patch: https://github.com/kamailio/kamailio/commit/3733918a287af1f9aa323b0b4e454c2… --- diff --git a/utils/kamcmd/kamcmd.8 b/utils/kamcmd/kamcmd.8 index 017c814dfe..c2355243fd 100644 --- a/utils/kamcmd/kamcmd.8 +++ b/utils/kamcmd/kamcmd.8 @@ -22,6 +22,14 @@ It can be used to manage users, domains, aliases and other server options. .B \-h display a short usage description, including all available options. +.SH NOTE +.B kamcmd +tries to convert number parameters to integer, to avoid it, prefix the number +with +.B 's:' +, like +.B 's:123456789'. + .SH AUTHORS see

1 0

git:5.1:18ab2fbe: db_postgres: docs for bytea_output_escape
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: 18ab2fbe8d7d24d2cb88b3bee9d9a1bf1eede5d5 URL: https://github.com/kamailio/kamailio/commit/18ab2fbe8d7d24d2cb88b3bee9d9a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:26:32+02:00 db_postgres: docs for bytea_output_escape (cherry picked from commit 99368909cdfc5140a1948525c5c734252f998efb) --- Modified: src/modules/db_postgres/doc/db_postgres_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/18ab2fbe8d7d24d2cb88b3bee9d9a1b… Patch: https://github.com/kamailio/kamailio/commit/18ab2fbe8d7d24d2cb88b3bee9d9a1b… --- diff --git a/src/modules/db_postgres/doc/db_postgres_admin.xml b/src/modules/db_postgres/doc/db_postgres_admin.xml index e218294736..bc4d326dca 100644 --- a/src/modules/db_postgres/doc/db_postgres_admin.xml +++ b/src/modules/db_postgres/doc/db_postgres_admin.xml @@ -151,6 +151,25 @@ modparam("db_postgres", "lockset", 6) </example> </section> + <section id="db_postgres.p.bytea_output_escape"> + <title><varname>bytea_output_escape</varname> (integer)</title> + <para> + Control if the module should request escaping the output for + bytea fields. + </para> + <para> + Default value is 1 (do the escape). + </para> + <example> + <title>Set <varname>bytea_output_escape</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_postgres", "bytea_output_escape", 0) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:5.1:039bc391: db_postgres: Fixed blob hex encoding (#1255)
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: 039bc39162e93db6719452ab60465cd7ee166f72 URL: https://github.com/kamailio/kamailio/commit/039bc39162e93db6719452ab60465cd… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:26:12+02:00 db_postgres: Fixed blob hex encoding (#1255) (cherry picked from commit 5557a441a4969994c2a82a89d53dec710164a034) --- Modified: src/modules/db_postgres/km_pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/039bc39162e93db6719452ab60465cd… Patch: https://github.com/kamailio/kamailio/commit/039bc39162e93db6719452ab60465cd… --- diff --git a/src/modules/db_postgres/km_pg_con.c b/src/modules/db_postgres/km_pg_con.c index 5a7225cefa..b66a94a0fb 100644 --- a/src/modules/db_postgres/km_pg_con.c +++ b/src/modules/db_postgres/km_pg_con.c @@ -52,6 +52,7 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) int i = 0; const char *keywords[10], *values[10]; char to[16]; + PGresult *res; LM_DBG("db_id = %p\n", id); @@ -141,6 +142,15 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) } #endif + res = PQexec(ptr->con, "SET bytea_output=escape"); + if (PQresultStatus(res) != PGRES_COMMAND_OK) + { + LM_ERR("cannot set blob output escaping format\n"); + PQclear(res); + goto err; + } + PQclear(res); + return ptr; err:

1 0

git:5.1:c7250e72: db_postgres: new parameter bytea_output_escape
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: c7250e725d1c2c32f579cf4803619c41e52cf825 URL: https://github.com/kamailio/kamailio/commit/c7250e725d1c2c32f579cf4803619c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:26:23+02:00 db_postgres: new parameter bytea_output_escape - control escaping output for bytea fields - default 1 (do the escape) (cherry picked from commit 861205b8aeed19fe8693e21fe5f1856f1dcb08c5) --- Modified: src/modules/db_postgres/km_pg_con.c Modified: src/modules/db_postgres/pg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c7250e725d1c2c32f579cf4803619c4… Patch: https://github.com/kamailio/kamailio/commit/c7250e725d1c2c32f579cf4803619c4… --- diff --git a/src/modules/db_postgres/km_pg_con.c b/src/modules/db_postgres/km_pg_con.c index b66a94a0fb..f6a2b8c8e0 100644 --- a/src/modules/db_postgres/km_pg_con.c +++ b/src/modules/db_postgres/km_pg_con.c @@ -37,6 +37,8 @@ #include <netinet/tcp.h> +extern int pg_bytea_output_escape; + /*! * \brief Create a new connection * @@ -52,7 +54,7 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) int i = 0; const char *keywords[10], *values[10]; char to[16]; - PGresult *res; + PGresult *res = NULL; LM_DBG("db_id = %p\n", id); @@ -142,15 +144,16 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) } #endif - res = PQexec(ptr->con, "SET bytea_output=escape"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) - { - LM_ERR("cannot set blob output escaping format\n"); + if(pg_bytea_output_escape!=0) { + res = PQexec(ptr->con, "SET bytea_output=escape"); + if (PQresultStatus(res) != PGRES_COMMAND_OK) + { + LM_ERR("cannot set blob output escaping format\n"); + PQclear(res); + goto err; + } PQclear(res); - goto err; } - PQclear(res); - return ptr; err: diff --git a/src/modules/db_postgres/pg_mod.c b/src/modules/db_postgres/pg_mod.c index be70e911e4..4d5849a290 100644 --- a/src/modules/db_postgres/pg_mod.c +++ b/src/modules/db_postgres/pg_mod.c @@ -58,6 +58,7 @@ int pg_retries = int pg_lockset = 4; int pg_timeout = 0; /* default = no timeout */ int pg_keepalive = 0; +int pg_bytea_output_escape = 1; /* * Postgres module interface @@ -91,6 +92,7 @@ static param_export_t params[] = { {"lockset", PARAM_INT, &pg_lockset}, {"timeout", PARAM_INT, &pg_timeout}, {"tcp_keepalive", PARAM_INT, &pg_keepalive}, + {"bytea_output_escape", PARAM_INT, &pg_bytea_output_escape}, {0, 0, 0} };

1 0

git:5.1:b43fbb18: kamctl: make jsonrpc filter portable
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: 5.1 Commit: b43fbb18acb86b97ff86bd867ab46c25747b2cf0 URL: https://github.com/kamailio/kamailio/commit/b43fbb18acb86b97ff86bd867ab46c2… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:25:56+02:00 kamctl: make jsonrpc filter portable The filter has a regex looking for a literal '{' in the beginning of a line. Some awk implementations interpret this as a meta character, so the regex is deemed broken. Example with busybox awk (POSIX): root@hank2:~# kamctl ps awk: bad regex '^{.+"id"[ ]*:[ ]*[0-9]+[ ]*}$': Invalid contents of {} root@hank2:~# To fix this enclose the character in square brackets. This always matches for a literal '{' and is portable. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> (cherry picked from commit 59d287586f502a8df71c2e91899fde49594e072e) --- Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/b43fbb18acb86b97ff86bd867ab46c2… Patch: https://github.com/kamailio/kamailio/commit/b43fbb18acb86b97ff86bd867ab46c2… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 641449422c..2873c2ddb8 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -699,7 +699,7 @@ filter_json() $AWK 'function ltrim(s) { sub(/^[ \t\r\n]+/, "", s); return s } BEGIN { line=0; IGNORECASE=1; } { line++; } - NR == 1 && /^{.+"id"[ \t]*:[ \t]*[0-9]+[ \t]*}$/ { print; next; } + NR == 1 && /^[{].+"id"[ \t]*:[ \t]*[0-9]+[ \t]*}$/ { print; next; } NR == 1 && /^200 OK/ { next; } /^[ \t]*"jsonrpc":[ \t]*"2.0"/ { print; next; } /^[ \t]*"result":[ \t]*\[.+/ {

1 0

git:master:044cdefc: core: fake msg - added sip schema to From/To URIs
by Daniel-Constantin Mierla 19 Oct '18

19 Oct '18

Module: kamailio Branch: master Commit: 044cdefcadf5c7949945544dce30becb2d84c56e URL: https://github.com/kamailio/kamailio/commit/044cdefcadf5c7949945544dce30bec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:20:54+02:00 core: fake msg - added sip schema to From/To URIs --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/044cdefcadf5c7949945544dce30bec… Patch: https://github.com/kamailio/kamailio/commit/044cdefcadf5c7949945544dce30bec… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index fa948f4bbe..9a84954f0b 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -28,7 +28,7 @@ #include "fmsg.h" -#define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <you(a)kamailio.org>;tag=123\r\nTo: <you(a)kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" +#define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <sip:you@kamailio.org>;tag=123\r\nTo: <sip:you@kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) static char _faked_sip_buf[FAKED_SIP_MSG_LEN+1]; static struct sip_msg _faked_msg;

1 0

git:master:b29f333a: core: dns_cache - NAPTR rr_preference set to number for rpc output
by Daniel-Constantin Mierla 18 Oct '18

18 Oct '18

Module: kamailio Branch: master Commit: b29f333ab118c88d35fa51298cd7ef99857dbba7 URL: https://github.com/kamailio/kamailio/commit/b29f333ab118c88d35fa51298cd7ef9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-18T18:10:33+02:00 core: dns_cache - NAPTR rr_preference set to number for rpc output - it was set to string, causing a crash - reported by GH #1680 --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/b29f333ab118c88d35fa51298cd7ef9… Patch: https://github.com/kamailio/kamailio/commit/b29f333ab118c88d35fa51298cd7ef9… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index d9fc6a21cc..e60be2cd05 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3739,7 +3739,7 @@ int dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_NAPTR: - if(rpc->struct_add(sh, "ds", + if(rpc->struct_add(sh, "dd", "rr_order", ((struct naptr_rdata*)(rr->rdata))->order, "rr_preference", ((struct naptr_rdata*)(rr->rdata))->pref) <0) {

1 0

git:master:f057e844: core: info log at startup with number of precesses, pkg and shm sizes
by Daniel-Constantin Mierla 18 Oct '18

18 Oct '18

Module: kamailio Branch: master Commit: f057e844ba407333ad8d876daa1f6ee49bd41c86 URL: https://github.com/kamailio/kamailio/commit/f057e844ba407333ad8d876daa1f6ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-18T10:13:08+02:00 core: info log at startup with number of precesses, pkg and shm sizes - useful to see if needed to troubleshoot by analyzing log messages --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f057e844ba407333ad8d876daa1f6ee… Patch: https://github.com/kamailio/kamailio/commit/f057e844ba407333ad8d876daa1f6ee… --- diff --git a/src/main.c b/src/main.c index 2062f4a745..b7e9fdb58a 100644 --- a/src/main.c +++ b/src/main.c @@ -2615,8 +2615,8 @@ int main(int argc, char** argv) * function being called before this point may rely on the * number of processes ! */ - LM_DBG("Expect (at least) %d kamailio processes in your process list\n", - get_max_procs()); + LM_INFO("processes (at least): %d - shm size: %lu - pkg size: %lu\n", + get_max_procs(), shm_mem_size, pkg_mem_size); #if defined USE_DNS_CACHE && defined USE_DNS_CACHE_STATS if (init_dns_cache_stats(get_max_procs())<0){

1 0

git:master:a4b6a5cb: core: init cfg framework before executing event_route[core:worker-one-init]
by Daniel-Constantin Mierla 18 Oct '18

18 Oct '18

Module: kamailio Branch: master Commit: a4b6a5cb1dda7576b265a23c91321b7f2a034658 URL: https://github.com/kamailio/kamailio/commit/a4b6a5cb1dda7576b265a23c91321b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-18T08:35:51+02:00 core: init cfg framework before executing event_route[core:worker-one-init] --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/a4b6a5cb1dda7576b265a23c91321b7… Patch: https://github.com/kamailio/kamailio/commit/a4b6a5cb1dda7576b265a23c91321b7… --- diff --git a/src/core/action.c b/src/core/action.c index 821ef24749..2dd41a4d97 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1670,6 +1670,9 @@ int run_child_one_init_route(void) rt = route_get(&event_rt, evname.s); } if((keng!=NULL) || (rt>=0 && event_rt.rlist[rt]!=NULL)) { + if (cfg_child_init()) { + return -1; + } LM_DBG("executing event_route[%s] (%d)\n", evname.s, rt); if(faked_msg_init()<0) return -1;

1 0

[kamailio/kamailio] Crash on receiving incorrect REGISTER request? (#1420)
by kbdfck 18 Oct '18

18 Oct '18

### Description Periodically Kamailio crashes, log shows that it happens on REGISTER request with incorrect params. I don't know if it is a network problem or somebody sends incorrect request, but there are records in logs: #### Log Messages Jan 30 03:49:29 kam /usr/sbin/kamailio[20718]: ERROR: <core> [core/parser/parse_from.c:53]: parse_from_header(): bad msg or missing FROM header Jan 30 03:49:29 kam /usr/sbin/kamailio[20718]: ERROR: dialog [dlg_cseq.c:93]: dlg_cseq_prepare_msg(): cannot parse FROM header Jan 30 03:49:29 kam /usr/sbin/kamailio[20718]: ERROR: pv [pv_core.c:664]: pv_get_callid(): cannot parse Call-Id header Jan 30 03:49:29 kam /usr/sbin/kamailio[20718]: {1 <null> <null>} ERROR: <core> [core/parser/parse_from.c:53]: parse_from_header(): bad msg or missing FROM header Jan 30 03:49:29 kam /usr/sbin/kamailio[20718]: {1 <null> <null>} ERROR: pv [pv_core.c:468]: pv_get_from_attr(): cannot parse From header Jan 30 03:49:29 kam /usr/sbin/kamailio[20718]: {1 <null> <null>} ERROR: pv [pv_core.c:664]: pv_get_callid(): cannot parse Call-Id header Jan 30 03:49:29 kam /usr/sbin/kamailio[20718]: {1 <null> <null>} NOTICE: <script>: REQ: M='REGISTER sip:1.2.3.208:5060' F='<null>' T='<null>' CI='<null>' SRC='113.128.105.127:49556' AU='<null>' Jan 30 03:49:29 kam /usr/sbin/kamailio[20736]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 15 Jan 30 03:49:29 kam /usr/sbin/kamailio[20713]: ALERT: <core> [main.c:746]: handle_sigs(): child process 20718 exited by a signal 11 Jan 30 03:49:29 kam /usr/sbin/kamailio[20713]: ALERT: <core> [main.c:749]: handle_sigs(): core was not generated Jan 30 03:49:29 kam /usr/sbin/kamailio[20713]: INFO: <core> [main.c:771]: handle_sigs(): terminating due to SIGCHLD ### Additional Information version: kamailio 5.2.0-dev2 (i386/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, 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 4.9.2 * **Operating System**: Linux kam 3.16.0-4-amd64 #1 SMP Debian 3.16.7-ckt25-2 (2016-04-08) x86_64 GNU/Linux -- 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/1420

4 12

[kamailio/kamailio] deadlock in ims_registrar_scscf (#1647)
by Sergey Zyrianov 18 Oct '18

18 Oct '18

### Description  S-CSCF stops processing REGISTER and INVITE requests. ### Troubleshooting Gdb stack traces revealed several processes trying to do lock_udmain() unsuccessfully. Adding more debug pointed to the direction of ims_registrar_scscf [lookup.c:107]: lookup(). This function does lock_udomain() with one "slot" and releases it with another. The lookup() [locks](https://github.com/kamailio/kamailio/blob/48de203fda213749ac1e6fdb08… domain with one value in the **aor** but before unlocking it at lockup.c:209 the said aor is [changed](https://github.com/kamailio/kamailio/blob/48de203fda213749ac1e6fdb…. Aor points to the URI that is rewritten and therefore the wrong slot is [unlocked](https://github.com/kamailio/kamailio/blob/48de203fda213749ac1e6fd…. In the log below the locked slot is 461 while unlocked is 427. 9(791) DEBUG: ims_registrar_scscf [lookup.c:90]: lookup(): looking for any type of terminal 9(791) DEBUG: ims_registrar_scscf [lookup.c:103]: lookup(): Looking for tel:+46xxxxxxxxxx 9(791) DEBUG: ims_usrloc_scscf [udomain.c:445]: lock_ulslot(): LOCKING UDOMAIN SLOT [**461**] 9(791) DEBUG: ims_registrar_scscf [lookup.c:119]: lookup(): Found a valid contact [sip:10.110.2.199:5060;alias=10.110.2.19950602] 9(791) DEBUG: [core/parser/parse_rr.c:464]: get_path_dst_uri(): path for branch: 'sip:term@pcscf.yyy.xxx.3gppnetwork.org;lr' 9(791) DEBUG: ims_usrloc_scscf [udomain.c:465]: unlock_ulslot(): UN-LOCKING UDOMAIN SLOT [**427**] #### Reproduction  #### Debugging Data  ``` (gdb) bt #0 syscall () at ../sysdeps/unix/sysv/linux/x86_64/syscall.S:38 #1 0x00007fecd3f61dbd in futex_get (lock=0x7feccf6a2214) at ../../core/mem/../futexlock.h:108 #2 0x00007fecd3f6832e in lock_ulslot (_d=0x7feccf70a718, i=461) at udomain.c:450 #3 0x00007fecd3f68273 in lock_udomain (_d=0x7feccf70a718, _aor=0x7feccf72e5a8) at udomain.c:424 #4 0x00007fecd3ccd375 in update_contacts (msg=0x7fecd3f1b6c0 <_pv_treq>, _d=0x7feccf70a718, public_identity=0x7feccf73e0c8, assignment_type=2, s=0x7fff31beac58, ccf1=0x7fff31beac80, ccf2=0x7fff31beac90, ecf1=0x7fff31beaca0, ecf2=0x7fff31beacb0, contact_header=0x7feccf73e0e0) at save.c:886 #5 0x00007fecd3c6cbe5 in async_cdp_callback (is_timeout=0, param=0x7feccf73e0a0, saa=0x7feccf7b9430, elapsed_msecs=59) at cxdx_sar.c:252 #6 0x00007fecd460fb18 in api_callback (p=0x7feccf69cd18, msg=0x7feccf7b9430, ptr=0x0) at api_process.c:120 #7 0x00007fecd46868aa in worker_process (id=0) at worker.c:346 #8 0x00007fecd464636b in diameter_peer_start (blocking=0) at diameter_peer.c:242 #9 0x00007fecd4622666 in cdp_child_init (rank=0) at cdp_mod.c:243 #10 0x00000000005d2fbc in init_mod_child (m=0x7fecd940f8a0, rank=0) at core/sr_module.c:943 #11 0x00000000005d2c5e in init_mod_child (m=0x7fecd9410550, rank=0) at core/sr_module.c:939 #12 0x00000000005d2c5e in init_mod_child (m=0x7fecd9410958, rank=0) at core/sr_module.c:939 #13 0x00000000005d2c5e in init_mod_child (m=0x7fecd9410d68, rank=0) at core/sr_module.c:939 #14 0x00000000005d2c5e in init_mod_child (m=0x7fecd9411560, rank=0) at core/sr_module.c:939 #15 0x00000000005d2c5e in init_mod_child (m=0x7fecd9411aa0, rank=0) at core/sr_module.c:939 #16 0x00000000005d2c5e in init_mod_child (m=0x7fecd9411f00, rank=0) at core/sr_module.c:939 #17 0x00000000005d3390 in init_child (rank=0) at core/sr_module.c:970 #18 0x000000000042539c in main_loop () at main.c:1701 #19 0x000000000042bdd5 in main (argc=6, argv=0x7fff31beb998) at main.c:2638 ``` #### Log Messages  ``` 9(791) DEBUG: ims_registrar_scscf [lookup.c:90]: lookup(): looking for any type of terminal 9(791) DEBUG: ims_registrar_scscf [lookup.c:103]: lookup(): Looking for tel:+46xxxxxxxxxx 9(791) DEBUG: ims_usrloc_scscf [udomain.c:445]: lock_ulslot(): LOCKING UDOMAIN SLOT [461] 9(791) DEBUG: ims_registrar_scscf [lookup.c:119]: lookup(): Found a valid contact [sip:10.110.2.199:5060;alias=10.110.2.19950602] 9(791) DEBUG: [core/parser/parse_rr.c:464]: get_path_dst_uri(): path for branch: 'sip:term@pcscf.yyy.xxx.3gppnetwork.org;lr' 9(791) DEBUG: ims_usrloc_scscf [udomain.c:465]: unlock_ulslot(): UN-LOCKING UDOMAIN SLOT [427] ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  Make a copy of the aor string. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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 4.8.2 ``` * **Operating System**:  ``` Linux scscf 4.14.67-coreos #1 SMP Mon Sep 10 23:14:26 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1647

4 7

git:5.0:f127d593: core: [cfg] reset routename properly
by Victor Seva 17 Oct '18

17 Oct '18

Module: kamailio Branch: 5.0 Commit: f127d59318e0d277b5f0ab05bc6e885aa002c018 URL: https://github.com/kamailio/kamailio/commit/f127d59318e0d277b5f0ab05bc6e885… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-10-17T15:55:31+02:00 core: [cfg] reset routename properly solution for #1536 was not working fix #1668 (cherry picked from commit 6d1bf58d468e8ee62da2b1a2e50a57feb7c576c6) --- Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/f127d59318e0d277b5f0ab05bc6e885… Patch: https://github.com/kamailio/kamailio/commit/f127d59318e0d277b5f0ab05bc6e885… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index f7a3f145f1..53fefd34c8 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -556,23 +556,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 0bd017005b..8282751d49 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1792,8 +1792,11 @@ route_stm: | ROUTE error { yyerror("invalid route statement"); } | ROUTE_REQUEST error { yyerror("invalid request_route statement"); } ; + +failure_route_main: ROUTE_FAILURE { routename=NULL; } +; failure_route_stm: - ROUTE_FAILURE LBRACE actions RBRACE { + failure_route_main LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); @@ -1870,8 +1873,11 @@ onreply_route_stm: yyerror("invalid onreply_route statement"); } ; + +branch_route_main: ROUTE_BRANCH { routename=NULL; } +; branch_route_stm: - ROUTE_BRANCH LBRACE actions RBRACE { + branch_route_main LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); @@ -1900,7 +1906,11 @@ branch_route_stm: } | ROUTE_BRANCH error { yyerror("invalid branch_route statement"); } ; -send_route_stm: ROUTE_SEND LBRACE actions RBRACE { + +send_route_main: ROUTE_SEND { routename=NULL; } +; +send_route_stm: + send_route_main LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); @@ -1929,7 +1939,11 @@ send_route_stm: ROUTE_SEND LBRACE actions RBRACE { } | ROUTE_SEND error { yyerror("invalid onsend_route statement"); } ; -event_route_stm: ROUTE_EVENT LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { + +event_route_main: ROUTE_EVENT { routename=NULL; } +; +event_route_stm: + event_route_main LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory");

1 0

git:5.1:85b5f076: core: [cfg] reset routename properly
by Victor Seva 17 Oct '18

17 Oct '18

Module: kamailio Branch: 5.1 Commit: 85b5f07694b30bdddcb36591b7306fef4385ecc2 URL: https://github.com/kamailio/kamailio/commit/85b5f07694b30bdddcb36591b7306fe… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-10-17T15:55:01+02:00 core: [cfg] reset routename properly solution for #1536 was not working fix #1668 (cherry picked from commit 6d1bf58d468e8ee62da2b1a2e50a57feb7c576c6) --- Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/85b5f07694b30bdddcb36591b7306fe… Patch: https://github.com/kamailio/kamailio/commit/85b5f07694b30bdddcb36591b7306fe… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 4d3931d419..cd6808d063 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -562,23 +562,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 85105120b7..8a5cd8162c 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1828,8 +1828,11 @@ route_stm: | ROUTE error { yyerror("invalid route statement"); } | ROUTE_REQUEST error { yyerror("invalid request_route statement"); } ; + +failure_route_main: ROUTE_FAILURE { routename=NULL; } +; failure_route_stm: - ROUTE_FAILURE LBRACE actions RBRACE { + failure_route_main LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); @@ -1906,8 +1909,11 @@ onreply_route_stm: yyerror("invalid onreply_route statement"); } ; + +branch_route_main: ROUTE_BRANCH { routename=NULL; } +; branch_route_stm: - ROUTE_BRANCH LBRACE actions RBRACE { + branch_route_main LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); @@ -1936,7 +1942,11 @@ branch_route_stm: } | ROUTE_BRANCH error { yyerror("invalid branch_route statement"); } ; -send_route_stm: ROUTE_SEND LBRACE actions RBRACE { + +send_route_main: ROUTE_SEND { routename=NULL; } +; +send_route_stm: + send_route_main LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); @@ -1965,7 +1975,11 @@ send_route_stm: ROUTE_SEND LBRACE actions RBRACE { } | ROUTE_SEND error { yyerror("invalid onsend_route statement"); } ; -event_route_stm: ROUTE_EVENT LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { + +event_route_main: ROUTE_EVENT { routename=NULL; } +; +event_route_stm: + event_route_main LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory");

1 0

[kamailio/kamailio] cfgtrace reports strange call route (#1668)
by Marco Capetta 17 Oct '18

17 Oct '18

Kamailio version: 5.1.6 (x86_64/linux) cfgtrace reports strange call route flow going back and forward from the parent route. For example, if the cfg file looks like the following: ############################################### loadmodule "cfgt.so" modparam("cfgt", "mask", 30) modparam("cfgt", "basedir", "/tmp/cfgtest/") loadmodule "debugger.so" modparam("debugger", "cfgtrace", 1) modparam("debugger", "mod_level_mode", 1) modparam("debugger", "mod_hash_size", 4) modparam("debugger", "mod_level", "core=3") modparam("debugger", "cfgtest", 1) request_route { route(ENTRY); route(TEST_1); } route[ENTRY] { xlog("L_NOTICE", "New request\n"); } route[TEST_2] { xlog("L_NOTICE", "End\n"); } route[TEST_1] { xlog("L_NOTICE", "I'm here\n"); if(is_method("BYE")) { xlog("L_NOTICE", "I'm here, again\n"); route(TEST_2); } xlog("L_NOTICE", "I'm still here\n"); return; } ############################################### If I send an INVITE message, I get the following cfgtrace: DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header ERROR: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/proxy/kamailio.cfg] l=472 a=5 n=route ERROR: *** cfgtrace:request_route=[ENTRY] c=[/etc/kamailio/proxy/kamailio.cfg] l=479 a=26 n=xlog NOTICE: <script>: New request ERROR: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/proxy/kamailio.cfg] l=474 a=5 n=route ERROR: *** cfgtrace:request_route=[TEST_1] c=[/etc/kamailio/proxy/kamailio.cfg] l=489 a=26 n=xlog NOTICE: <script>: I'm here ERROR: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/proxy/kamailio.cfg] l=497 a=16 n=if ERROR: *** cfgtrace:request_route=[TEST_1] c=[/etc/kamailio/proxy/kamailio.cfg] l=491 a=25 n=is_method ERROR: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/proxy/kamailio.cfg] l=497 a=26 n=xlog NOTICE: <script>: I'm still here ERROR: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/proxy/kamailio.cfg] l=499 a=2 n=return DEBUG: <core> [core/receive.c:298]: receive_msg(): request-route executed in: 395 usec As you see some actions are assigned to route "DEFAULT_ROUTE" even if they are in TEST_1. The issue completely disappear if I remove "route(TEST_2);" line inside the IF. -- 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/1668

2 5

git:master:6d1bf58d: core: [cfg] reset routename properly
by Victor Seva 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: 6d1bf58d468e8ee62da2b1a2e50a57feb7c576c6 URL: https://github.com/kamailio/kamailio/commit/6d1bf58d468e8ee62da2b1a2e50a57f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-10-17T15:51:52+02:00 core: [cfg] reset routename properly solution for #1536 was not working fix #1668 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/6d1bf58d468e8ee62da2b1a2e50a57f… Patch: https://github.com/kamailio/kamailio/commit/6d1bf58d468e8ee62da2b1a2e50a57f… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 324cc57e9f..bcdad27322 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -571,23 +571,23 @@ IMPORTFILE "import_file" <INITIAL>{ISAVPFLAGSET} { count(); yylval.strval=yytext; return ISAVPFLAGSET; } <INITIAL>{AVPFLAGS_DECL} { count(); yylval.strval=yytext; return AVPFLAGS_DECL; } <INITIAL>{MSGLEN} { count(); yylval.strval=yytext; return MSGLEN; } -<INITIAL>{ROUTE} { count(); routename=0; default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE} { count(); default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE; } -<INITIAL>{ROUTE_REQUEST} { count(); routename=0; default_routename="DEFAULT_ROUTE"; +<INITIAL>{ROUTE_REQUEST} { count(); default_routename="DEFAULT_ROUTE"; yylval.strval=yytext; return ROUTE_REQUEST; } -<INITIAL>{ROUTE_ONREPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_ONREPLY} { count(); default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_ONREPLY; } -<INITIAL>{ROUTE_REPLY} { count(); routename=0; default_routename="DEFAULT_ONREPLY"; +<INITIAL>{ROUTE_REPLY} { count(); default_routename="DEFAULT_ONREPLY"; yylval.strval=yytext; return ROUTE_REPLY; } -<INITIAL>{ROUTE_FAILURE} { count(); routename=0; default_routename="DEFAULT_FAILURE"; +<INITIAL>{ROUTE_FAILURE} { count(); default_routename="DEFAULT_FAILURE"; yylval.strval=yytext; return ROUTE_FAILURE; } -<INITIAL>{ROUTE_BRANCH} { count(); routename=0; default_routename="DEFAULT_BRANCH"; +<INITIAL>{ROUTE_BRANCH} { count(); default_routename="DEFAULT_BRANCH"; yylval.strval=yytext; return ROUTE_BRANCH; } -<INITIAL>{ROUTE_SEND} { count(); routename=0; default_routename="DEFAULT_SEND"; +<INITIAL>{ROUTE_SEND} { count(); default_routename="DEFAULT_SEND"; yylval.strval=yytext; return ROUTE_SEND; } -<INITIAL>{ROUTE_EVENT} { count(); routename=0; default_routename="DEFAULT_EVENT"; +<INITIAL>{ROUTE_EVENT} { count(); default_routename="DEFAULT_EVENT"; yylval.strval=yytext; state=EVRT_NAME_S; BEGIN(EVRTNAME); return ROUTE_EVENT; } diff --git a/src/core/cfg.y b/src/core/cfg.y index b4ed024b8e..9279171f20 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1877,8 +1877,11 @@ route_stm: | ROUTE error { yyerror("invalid route statement"); } | ROUTE_REQUEST error { yyerror("invalid request_route statement"); } ; + +failure_route_main: ROUTE_FAILURE { routename=NULL; } +; failure_route_stm: - ROUTE_FAILURE LBRACE actions RBRACE { + failure_route_main LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); @@ -1955,8 +1958,11 @@ onreply_route_stm: yyerror("invalid onreply_route statement"); } ; + +branch_route_main: ROUTE_BRANCH { routename=NULL; } +; branch_route_stm: - ROUTE_BRANCH LBRACE actions RBRACE { + branch_route_main LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); @@ -1985,7 +1991,11 @@ branch_route_stm: } | ROUTE_BRANCH error { yyerror("invalid branch_route statement"); } ; -send_route_stm: ROUTE_SEND LBRACE actions RBRACE { + +send_route_main: ROUTE_SEND { routename=NULL; } +; +send_route_stm: + send_route_main LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory"); @@ -2014,7 +2024,11 @@ send_route_stm: ROUTE_SEND LBRACE actions RBRACE { } | ROUTE_SEND error { yyerror("invalid onsend_route statement"); } ; -event_route_stm: ROUTE_EVENT LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { + +event_route_main: ROUTE_EVENT { routename=NULL; } +; +event_route_stm: + event_route_main LBRACK EVENT_RT_NAME RBRACK LBRACE actions RBRACE { #ifdef SHM_MEM if (!shm_initialized() && init_shm()<0) { yyerror("Can't initialize shared memory");

1 0

git:master:4f81aa60: modules: readme files regenerated - pipelimit ... [skip ci]
by Kamailio Dev 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: 4f81aa605ba14e8ff90022bb5b36d12725c37f03 URL: https://github.com/kamailio/kamailio/commit/4f81aa605ba14e8ff90022bb5b36d12… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-10-17T13:46:27+02:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/4f81aa605ba14e8ff90022bb5b36d12… Patch: https://github.com/kamailio/kamailio/commit/4f81aa605ba14e8ff90022bb5b36d12…

1 0

git:master:fe480059: pipelimit: docs - moved algoritm section out of overview
by Daniel-Constantin Mierla 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: fe4800594911a0b77be6ee4bc92222c621229a50 URL: https://github.com/kamailio/kamailio/commit/fe4800594911a0b77be6ee4bc92222c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-17T13:39:10+02:00 pipelimit: docs - moved algoritm section out of overview --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fe4800594911a0b77be6ee4bc92222c… Patch: https://github.com/kamailio/kamailio/commit/fe4800594911a0b77be6ee4bc92222c… --- diff --git a/src/modules/pipelimit/doc/pipelimit_admin.xml b/src/modules/pipelimit/doc/pipelimit_admin.xml index c7e678985a..468a552cf1 100644 --- a/src/modules/pipelimit/doc/pipelimit_admin.xml +++ b/src/modules/pipelimit/doc/pipelimit_admin.xml @@ -32,6 +32,7 @@ new module which is focused on just traffic shaping policies, the implementation of queues was discarded. </para> + </section> <section> <title>Algorithms</title> <para> @@ -91,7 +92,6 @@ the controller to adapt to the new request rate. </para> </section> - </section> <section> <title>Dependencies</title> <section>

1 0

git:master:2b35fc28: modules: readme files regenerated - pipelimit ... [skip ci]
by Kamailio Dev 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: 2b35fc28a6cef63158e29e322171621d2c66fa1c URL: https://github.com/kamailio/kamailio/commit/2b35fc28a6cef63158e29e322171621… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-10-17T13:01:32+02:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/2b35fc28a6cef63158e29e322171621… Patch: https://github.com/kamailio/kamailio/commit/2b35fc28a6cef63158e29e322171621… --- diff --git a/src/modules/pipelimit/README b/src/modules/pipelimit/README index 810b5d48ca..05d05f27a8 100644 --- a/src/modules/pipelimit/README +++ b/src/modules/pipelimit/README @@ -42,8 +42,9 @@ Daniel-Constantin Mierla 3.6. plp_algorithm_column (string) 3.7. timer_interval (integer) 3.8. timer_mode (integer) - 3.9. reply_code (integer) - 3.10. reply_reason (string) + 3.9. load_fetch (integer) + 3.10. reply_code (integer) + 3.11. reply_reason (string) 4. Functions @@ -70,12 +71,13 @@ Daniel-Constantin Mierla 1.6. Set plp_algorithm_column parameter 1.7. Set timer_interval parameter 1.8. Set timer_mode parameter - 1.9. Set reply_code parameter - 1.10. Set reply_code parameter at runtime - 1.11. Set reply_reason parameter - 1.12. Set reply_reason parameter at runtime - 1.13. pl_check usage - 1.14. pl_drop usage + 1.9. Set load_fetch parameter + 1.10. Set reply_code parameter + 1.11. Set reply_code parameter at runtime + 1.12. Set reply_reason parameter + 1.13. Set reply_reason parameter at runtime + 1.14. pl_check usage + 1.15. pl_drop usage Chapter 1. Admin Guide @@ -100,8 +102,9 @@ Chapter 1. Admin Guide 3.6. plp_algorithm_column (string) 3.7. timer_interval (integer) 3.8. timer_mode (integer) - 3.9. reply_code (integer) - 3.10. reply_reason (string) + 3.9. load_fetch (integer) + 3.10. reply_code (integer) + 3.11. reply_reason (string) 4. Functions @@ -211,8 +214,9 @@ Chapter 1. Admin Guide 3.6. plp_algorithm_column (string) 3.7. timer_interval (integer) 3.8. timer_mode (integer) - 3.9. reply_code (integer) - 3.10. reply_reason (string) + 3.9. load_fetch (integer) + 3.10. reply_code (integer) + 3.11. reply_reason (string) 3.1. hash_size (int) @@ -314,36 +318,49 @@ modparam("pipelimit", "timer_interval", 5) modparam("pipelimit", "timer_mode", 1) ... -3.9. reply_code (integer) +3.9. load_fetch (integer) + + Control if the module should fetch the load for CPU and network + traffic. If set to 0, no load is fetched; if set to 1, the load is + fetched every timer interval. + + Default value is 1. + + Example 1.9. Set load_fetch parameter +... +modparam("pipelimit", "load_fetch", 0) +... + +3.10. reply_code (integer) The code of the reply sent by Kamailio while limiting. Default value is 503. - Example 1.9. Set reply_code parameter + Example 1.10. Set reply_code parameter ... modparam("pipelimit", "reply_code", 505) ... This value can be modified at runtime using kamcmd - Example 1.10. Set reply_code parameter at runtime + Example 1.11. Set reply_code parameter at runtime kamcmd cfg.set_now_int pipelimit reply_code 505 -3.10. reply_reason (string) +3.11. reply_reason (string) The reason of the reply sent by Kamailio while limiting. Default value is "Server Unavailable". - Example 1.11. Set reply_reason parameter + Example 1.12. Set reply_reason parameter ... modparam("pipelimit", "reply_reason", "Limiting") ... This value can be modified at runtime using kamcmd - Example 1.12. Set reply_reason parameter at runtime + Example 1.13. Set reply_reason parameter at runtime kamcmd cfg.set_now_string pipelimit reply_reason "Limiting" 4. Functions @@ -378,7 +395,7 @@ kamcmd cfg.set_now_string pipelimit reply_reason "Limiting" This function can be used from ANY_ROUTE. - Example 1.13. pl_check usage + Example 1.14. pl_check usage ... # perform pipe match for current method if (!pl_check("one")) { @@ -447,7 +464,7 @@ with unexpected retcode=$var(check_result)\n"); This function can be used from REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE. - Example 1.14. pl_drop usage + Example 1.15. pl_drop usage ... if (!pl_check("one")) { # send back a "503 - Server Unavailable"

1 0

git:master:81402552: pipelimit: docs for load_fetch parameter
by Daniel-Constantin Mierla 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: 81402552ee24cbfb47dc0d7a268dc9a66a7a47ee URL: https://github.com/kamailio/kamailio/commit/81402552ee24cbfb47dc0d7a268dc9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-17T12:50:58+02:00 pipelimit: docs for load_fetch parameter --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81402552ee24cbfb47dc0d7a268dc9a… Patch: https://github.com/kamailio/kamailio/commit/81402552ee24cbfb47dc0d7a268dc9a… --- diff --git a/src/modules/pipelimit/doc/pipelimit_admin.xml b/src/modules/pipelimit/doc/pipelimit_admin.xml index 1fa7a709a1..c7e678985a 100644 --- a/src/modules/pipelimit/doc/pipelimit_admin.xml +++ b/src/modules/pipelimit/doc/pipelimit_admin.xml @@ -295,6 +295,27 @@ modparam("pipelimit", "timer_interval", 5) ... modparam("pipelimit", "timer_mode", 1) ... +</programlisting> + </example> + </section> + <section id="pipelimit.p.load_fetch"> + <title><varname>load_fetch</varname> (integer)</title> + <para> + Control if the module should fetch the load for CPU and network traffic. + If set to 0, no load is fetched; if set to 1, the load is fetched every + timer interval. + </para> + <para> + <emphasis> + Default value is 1. + </emphasis> + </para> + <example> + <title>Set <varname>load_fetch</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pipelimit", "load_fetch", 0) +... </programlisting> </example> </section>

1 0

git:master:61d1fbcc: pipelimit: allow to disable fetching cpu and network load
by Daniel-Constantin Mierla 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: 61d1fbcc8c193568b4a7728d25be565ac761ea6f URL: https://github.com/kamailio/kamailio/commit/61d1fbcc8c193568b4a7728d25be565… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-17T12:47:16+02:00 pipelimit: allow to disable fetching cpu and network load - prevent usage of high cpu when related algoritms are not used - can be controlled via load_fetch parameter - GH #1675 --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/61d1fbcc8c193568b4a7728d25be565… Patch: https://github.com/kamailio/kamailio/commit/61d1fbcc8c193568b4a7728d25be565… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 7aff821930..46e3a45b7e 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -113,6 +113,7 @@ static int pl_timer_mode = 0; int _pl_cfg_setpoint = 0; /* desired load, used when reading modparams */ /* === */ +static int pl_load_fetch = 1; /** module functions */ static int mod_init(void); @@ -150,6 +151,7 @@ static param_export_t params[]={ {"plp_limit_column", PARAM_STR, &rlp_limit_col}, {"plp_algorithm_column", PARAM_STR, &rlp_algorithm_col}, {"hash_size", INT_PARAM, &pl_hash_size}, + {"load_fetch", INT_PARAM, &pl_load_fetch}, {0,0,0} }; @@ -727,13 +729,15 @@ static int fixup_pl_check3(void** param, int param_no) static void pl_timer_refresh(void) { - switch (*load_source) { - case LOAD_SOURCE_CPU: - update_cpu_load(); - break; - } + if(pl_load_fetch!=0) { + switch (*load_source) { + case LOAD_SOURCE_CPU: + update_cpu_load(); + break; + } - *network_load_value = get_total_bytes_waiting(); + *network_load_value = get_total_bytes_waiting(); + } pl_pipe_timer_update(pl_timer_interval, *network_load_value); }

1 0

git:master:fc1f16e5: modules: readme files regenerated - pipelimit ... [skip ci]
by Kamailio Dev 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: fc1f16e52433257ad7abf2cbbf26e72f0ac94e7a URL: https://github.com/kamailio/kamailio/commit/fc1f16e52433257ad7abf2cbbf26e72… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-10-17T09:31:37+02:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/fc1f16e52433257ad7abf2cbbf26e72… Patch: https://github.com/kamailio/kamailio/commit/fc1f16e52433257ad7abf2cbbf26e72… --- diff --git a/src/modules/pipelimit/README b/src/modules/pipelimit/README index 3b48f2e0d6..810b5d48ca 100644 --- a/src/modules/pipelimit/README +++ b/src/modules/pipelimit/README @@ -41,8 +41,9 @@ Daniel-Constantin Mierla 3.5. plp_limit_column (string) 3.6. plp_algorithm_column (string) 3.7. timer_interval (integer) - 3.8. reply_code (integer) - 3.9. reply_reason (string) + 3.8. timer_mode (integer) + 3.9. reply_code (integer) + 3.10. reply_reason (string) 4. Functions @@ -68,12 +69,13 @@ Daniel-Constantin Mierla 1.5. Set plp_limit_column parameter 1.6. Set plp_algorithm_column parameter 1.7. Set timer_interval parameter - 1.8. Set reply_code parameter - 1.9. Set reply_code parameter at runtime - 1.10. Set reply_reason parameter - 1.11. Set reply_reason parameter at runtime - 1.12. pl_check usage - 1.13. pl_drop usage + 1.8. Set timer_mode parameter + 1.9. Set reply_code parameter + 1.10. Set reply_code parameter at runtime + 1.11. Set reply_reason parameter + 1.12. Set reply_reason parameter at runtime + 1.13. pl_check usage + 1.14. pl_drop usage Chapter 1. Admin Guide @@ -97,8 +99,9 @@ Chapter 1. Admin Guide 3.5. plp_limit_column (string) 3.6. plp_algorithm_column (string) 3.7. timer_interval (integer) - 3.8. reply_code (integer) - 3.9. reply_reason (string) + 3.8. timer_mode (integer) + 3.9. reply_code (integer) + 3.10. reply_reason (string) 4. Functions @@ -207,8 +210,9 @@ Chapter 1. Admin Guide 3.5. plp_limit_column (string) 3.6. plp_algorithm_column (string) 3.7. timer_interval (integer) - 3.8. reply_code (integer) - 3.9. reply_reason (string) + 3.8. timer_mode (integer) + 3.9. reply_code (integer) + 3.10. reply_reason (string) 3.1. hash_size (int) @@ -298,36 +302,48 @@ modparam("pipelimit", "plp_algorithm_column", "name") modparam("pipelimit", "timer_interval", 5) ... -3.8. reply_code (integer) +3.8. timer_mode (integer) + + Control what timer process to be used: 0 - use main fast timer; 1 - use + secondary wheel timer. + + Default value is 0. + + Example 1.8. Set timer_mode parameter +... +modparam("pipelimit", "timer_mode", 1) +... + +3.9. reply_code (integer) The code of the reply sent by Kamailio while limiting. Default value is 503. - Example 1.8. Set reply_code parameter + Example 1.9. Set reply_code parameter ... modparam("pipelimit", "reply_code", 505) ... This value can be modified at runtime using kamcmd - Example 1.9. Set reply_code parameter at runtime + Example 1.10. Set reply_code parameter at runtime kamcmd cfg.set_now_int pipelimit reply_code 505 -3.9. reply_reason (string) +3.10. reply_reason (string) The reason of the reply sent by Kamailio while limiting. Default value is "Server Unavailable". - Example 1.10. Set reply_reason parameter + Example 1.11. Set reply_reason parameter ... modparam("pipelimit", "reply_reason", "Limiting") ... This value can be modified at runtime using kamcmd - Example 1.11. Set reply_reason parameter at runtime + Example 1.12. Set reply_reason parameter at runtime kamcmd cfg.set_now_string pipelimit reply_reason "Limiting" 4. Functions @@ -362,7 +378,7 @@ kamcmd cfg.set_now_string pipelimit reply_reason "Limiting" This function can be used from ANY_ROUTE. - Example 1.12. pl_check usage + Example 1.13. pl_check usage ... # perform pipe match for current method if (!pl_check("one")) { @@ -431,7 +447,7 @@ with unexpected retcode=$var(check_result)\n"); This function can be used from REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE. - Example 1.13. pl_drop usage + Example 1.14. pl_drop usage ... if (!pl_check("one")) { # send back a "503 - Server Unavailable"

1 0

git:master:7f0a083b: pipelimit: docs for timer_mode parameter
by Daniel-Constantin Mierla 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: 7f0a083b8e0b5b3c5cbf49ea226aa984f0da68ab URL: https://github.com/kamailio/kamailio/commit/7f0a083b8e0b5b3c5cbf49ea226aa98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-17T09:20:25+02:00 pipelimit: docs for timer_mode parameter --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7f0a083b8e0b5b3c5cbf49ea226aa98… Patch: https://github.com/kamailio/kamailio/commit/7f0a083b8e0b5b3c5cbf49ea226aa98… --- diff --git a/src/modules/pipelimit/doc/pipelimit_admin.xml b/src/modules/pipelimit/doc/pipelimit_admin.xml index 554c5d5e3b..1fa7a709a1 100644 --- a/src/modules/pipelimit/doc/pipelimit_admin.xml +++ b/src/modules/pipelimit/doc/pipelimit_admin.xml @@ -275,6 +275,26 @@ modparam("pipelimit", "plp_algorithm_column", "name") ... modparam("pipelimit", "timer_interval", 5) ... +</programlisting> + </example> + </section> + <section id="pipelimit.p.timer_mode"> + <title><varname>timer_mode</varname> (integer)</title> + <para> + Control what timer process to be used: 0 - use main fast timer; 1 - use + secondary wheel timer. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>timer_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pipelimit", "timer_mode", 1) +... </programlisting> </example> </section>

1 0

git:master:8a5dadf0: pipelimit: allow offloading timer routine from fast timer to secondary wheel timer
by Daniel-Constantin Mierla 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: 8a5dadf06dc20a6de9fe0c0f3cdf815f7c0eb41e URL: https://github.com/kamailio/kamailio/commit/8a5dadf06dc20a6de9fe0c0f3cdf815… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-17T09:16:24+02:00 pipelimit: allow offloading timer routine from fast timer to secondary wheel timer - reading cpu and network load from /proc/ file can be demanding - can be controlled via timer_mode parameter - GH #1675 --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/8a5dadf06dc20a6de9fe0c0f3cdf815… Patch: https://github.com/kamailio/kamailio/commit/8a5dadf06dc20a6de9fe0c0f3cdf815…

1 0

git:master:fb408fbd: pipelimit: execute timer routine per timer_interval
by Daniel-Constantin Mierla 17 Oct '18

17 Oct '18

Module: kamailio Branch: master Commit: fb408fbde981d86eb008e6a9dbcdd1f48dd9a9ee URL: https://github.com/kamailio/kamailio/commit/fb408fbde981d86eb008e6a9dbcdd1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-17T08:51:50+02:00 pipelimit: execute timer routine per timer_interval - reported by GH #1675 and GH #1671 --- Modified: src/modules/pipelimit/pipelimit.c Modified: src/modules/pipelimit/pl_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/fb408fbde981d86eb008e6a9dbcdd1f… Patch: https://github.com/kamailio/kamailio/commit/fb408fbde981d86eb008e6a9dbcdd1f… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 716938991a..c3cbf56103 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -64,7 +64,7 @@ MODULE_VERSION /* * timer interval length in seconds, tunable via modparam */ -#define PL_TIMER_INTERVAL 10 +#define PL_TIMER_INTERVAL_DEFAULT 10 /** SL API structure */ sl_api_t slb; @@ -85,10 +85,10 @@ static str pl_drop_reason = str_init("Server Unavailable"); static int pl_hash_size = 6; typedef struct pl_queue { - int * pipe; - int pipe_mp; - str * method; - str method_mp; + int *pipe; + int pipe_mp; + str *method; + str method_mp; } pl_queue_t; static struct timer_ln* pl_timer; @@ -107,7 +107,7 @@ static int load_source_mp = LOAD_SOURCE_CPU; static int * load_source; /* these only change in the mod_init() process -- no locking needed */ -static int timer_interval = PL_TIMER_INTERVAL; +static int pl_timer_interval = PL_TIMER_INTERVAL_DEFAULT; int _pl_cfg_setpoint; /* desired load, used when reading modparams */ /* === */ @@ -137,7 +137,7 @@ static cmd_export_t cmds[]={ {0,0,0,0,0,0} }; static param_export_t params[]={ - {"timer_interval", INT_PARAM, &timer_interval}, + {"timer_interval", INT_PARAM, &pl_timer_interval}, {"reply_code", INT_PARAM, &pl_drop_code}, {"reply_reason", PARAM_STR, &pl_drop_reason}, {"db_url", PARAM_STR, &pl_db_url}, @@ -346,7 +346,8 @@ static int mod_init(void) return -1; } timer_init(pl_timer, pl_timer_handle, 0, F_TIMER_FAST); - timer_add(pl_timer, MS_TO_TICKS(1000)); /* Start it after 1000ms */ + /* execute timer routine after pl_timer_interval * 1000ms */ + timer_add(pl_timer, pl_timer_interval * MS_TO_TICKS(1000)); /* bind the SL API */ if (sl_load_api(&slb)!=0) { @@ -723,7 +724,7 @@ static ticks_t pl_timer_handle(ticks_t ticks, struct timer_ln* tl, void* data) *network_load_value = get_total_bytes_waiting(); - pl_pipe_timer_update(timer_interval, *network_load_value); + pl_pipe_timer_update(pl_timer_interval, *network_load_value); return (ticks_t)(-1); /* periodical */ } diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index fa2c9c5ad0..518254f1fa 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -345,7 +345,7 @@ void pl_pipe_timer_update(int interval, int netload) if( it->algo == PIPE_ALGO_NETWORK ) { it->load = ( netload > it->limit ) ? 1 : -1; } else if (it->limit && interval) { - it->load = it->counter / (it->limit * interval); + it->load = it->counter / it->limit; } it->last_counter = it->counter; it->counter = 0;

1 0

[kamailio/kamailio] cfg_rpc updates changing variable values to large random numbers (#1583)
by vinesinha 16 Oct '18

16 Oct '18

I was trying to do a cfg_rpc update on a variable and some of the times, the variable would take on randomly large values or negative values. The -1 here is probably causing issues. https://github.com/kamailio/kamailio/blob/1d53ea3dba4e59b05b2e92ecc973c4415… Here's an explanation of what's going on (debugged using gdb). In cfg_struc.c if you put a breakpoint in the following line in cfg_clone_global https://github.com/kamailio/kamailio/blob/1d53ea3dba4e59b05b2e92ecc973c4415… checking variable values: ``` --- Old (correct) value --- (gdb) print sizeof(*(int *)(((unsigned char *)((*cfg_global)->vars + 984)) + 172)) $33 = 4 (gdb) print *((unsigned char *)&(*(int *)(((unsigned char *)((*cfg_global)->vars + 984)) + 172)) + 0) $34 = 99 'c' (gdb) print *((unsigned char *)&(*(int *)(((unsigned char *)((*cfg_global)->vars + 984)) + 172)) + 1) $35 = 0 '\000' (gdb) print *((unsigned char *)&(*(int *)(((unsigned char *)((*cfg_global)->vars + 984)) + 172)) + 2) $36 = 0 '\000' (gdb) print *((unsigned char *)&(*(int *)(((unsigned char *)((*cfg_global)->vars + 984)) + 172)) + 3) $37 = 0 '\000' --- new (corrupt) value --- (gdb) print sizeof(*(int *)(((unsigned char *)((block)->vars + 984)) + 172)) $28 = 4 (gdb) print *((unsigned char *)&(*(int *)(((unsigned char *)((block)->vars + 984)) + 172)) + 0) $29 = 99 'c' (gdb) print *((unsigned char *)&(*(int *)(((unsigned char *)((block)->vars + 984)) + 172)) + 1) $30 = 0 '\000' (gdb) print *((unsigned char *)&(*(int *)(((unsigned char *)((block)->vars + 984)) + 172)) + 2) $31 = 0 '\000' (gdb) print *((unsigned char *)&(*(int *)(((unsigned char *)((block)->vars + 984)) + 172)) + 3) $32 = 130 '\202' ``` As visible, the last byte is getting corrupted. I checked the memory allocation variables: ``` --> cfg_block_size (gdb) print cfg_block_size $2 = 1156 --> sizeof(cfg_block_t) print sizeof(cfg_block_t) $15 = 8 ``` This means that total memory assigned = 8 + 1156 -(1) = 1163 ``` --> address of new block (gdb) print (void *) block $12 = (void *) 0x7f63086b6758 --> address of the corrupted variable in the new block (gdb) print (void *)(((unsigned char *)((block)->vars + 984)) + 172) $13 = (void *) 0x7f63086b6be0 --> offset of the variable from the block start (gdb) print 0x7f63086b6be0 - 0x7f63086b6758 $14 = 1160 ``` since the variable is an integer, memory that should be assigned = 1160 + 4 = 1164 However, we're assigning 1163. Therefore the last byte is getting corrupted. Does it make sense to remove the -1 from all the memory allocation in cfg_struct ? -- 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/1583

2 26

git:master:73e3e5d1: siputils: fixed condition for alphanum matching
by Daniel-Constantin Mierla 16 Oct '18

16 Oct '18

Module: kamailio Branch: master Commit: 73e3e5d148c9eb74beb7432d9126abd1c5a8d7e7 URL: https://github.com/kamailio/kamailio/commit/73e3e5d148c9eb74beb7432d9126abd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-16T12:04:26+02:00 siputils: fixed condition for alphanum matching --- Modified: src/modules/siputils/checks.c --- Diff: https://github.com/kamailio/kamailio/commit/73e3e5d148c9eb74beb7432d9126abd… Patch: https://github.com/kamailio/kamailio/commit/73e3e5d148c9eb74beb7432d9126abd… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 76f5cac294..1db6901c4c 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -896,7 +896,7 @@ int ki_is_alphanum(sip_msg_t *msg, str *tval) for(; i<tval->len; i++) { if( !((tval->s[i]>='0' && tval->s[i]<='9') || (tval->s[i]>='A' && tval->s[i]<='Z') - || (tval->s[i]>='z' && tval->s[i]<='z')) ) + || (tval->s[i]>='a' && tval->s[i]<='z')) ) return -3; } @@ -935,7 +935,7 @@ int ki_is_alphanumex(sip_msg_t *msg, str *tval, str *eset) for(; i<tval->len; i++) { if( !((tval->s[i]>='0' && tval->s[i]<='9') || (tval->s[i]>='A' && tval->s[i]<='Z') - || (tval->s[i]>='z' && tval->s[i]<='z')) ) { + || (tval->s[i]>='a' && tval->s[i]<='z')) ) { if(eset==NULL || eset->len<=0) { return -3; }

1 0

git:master:f2f7b5a3: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 16 Oct '18

16 Oct '18

Module: kamailio Branch: master Commit: f2f7b5a38bff33043cb6de1c4038364d3f5db77b URL: https://github.com/kamailio/kamailio/commit/f2f7b5a38bff33043cb6de1c4038364… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-10-16T12:01:40+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/f2f7b5a38bff33043cb6de1c4038364… Patch: https://github.com/kamailio/kamailio/commit/f2f7b5a38bff33043cb6de1c4038364… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 32649f976f..390ef1b3cb 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -657,7 +657,7 @@ if (is_uri("$avp(i:705)") { if (is_tel_number("$rU")) { # Test if R-URI user is telephone number ... } -if (is_tel_number("+24242424") { +if (is_tel_number("+24242424")) { ... } ...

1 0

git:master:1d6b33a7: siputils: docs - added missing parenthesis in example
by Daniel-Constantin Mierla 16 Oct '18

16 Oct '18

Module: kamailio Branch: master Commit: 1d6b33a732ef225e28a367ca043b7e085a7f94f4 URL: https://github.com/kamailio/kamailio/commit/1d6b33a732ef225e28a367ca043b7e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-16T11:45:51+02:00 siputils: docs - added missing parenthesis in example --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1d6b33a732ef225e28a367ca043b7e0… Patch: https://github.com/kamailio/kamailio/commit/1d6b33a732ef225e28a367ca043b7e0… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index c022dd2dd1..a430f85cc9 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -654,7 +654,7 @@ if (is_uri("$avp(i:705)") { if (is_tel_number("$rU")) { # Test if R-URI user is telephone number ... } -if (is_tel_number("+24242424") { +if (is_tel_number("+24242424")) { ... } ...

1 0

[kamailio/kamailio] w_sanity_check(): input parameter (17895) outside of valid range <1-16384) (#1678)
by Rex 16 Oct '18

16 Oct '18

I am new to kamailio and I am trying to use docker to install the 5.1.6 version. I took the image from kamailio/kamailio:5.1.6-xenial and using a 5.7 mysql with it. Two services start fine, when I use sip client - linphone connect to it, it error with w_sanity_check(): input parameter (17895) outside of valid range <1-16384) without telling any reason. Can anyone help? Thanks kamailio.cfg ``` ####### Defined Values ######### #!define WITH_DEBUG #!define WITH_MYSQL #!define WITH_NAT #!define WITH_AUTH #!define WITH_ALIASDB #!define WITH_USRLOCDB #!define DBURL "mysql://kamailio:kamailiorw@tg-kamailio-db/kamailio" # *** Value defines - IDs used later in config ``` kamctlrc `````` # The Kamailio configuration file for the control tools. # # Here you can set variables used in the kamctl and kamdbctl setup # scripts. Per default all variables here are commented out, the control tools # will use their internal default values. ## your SIP domain SIP_DOMAIN=192.168.56.111 ## chrooted directory # $CHROOT_DIR="/path/to/chrooted/directory" ## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, DBTEXT, or SQLITE # by default none is loaded # # If you want to setup a database with kamdbctl, you must at least specify # this parameter. DBENGINE=MYSQL ## database host DBHOST=tg-kamailio-db ## database host DBPORT=3306 ## database name (for ORACLE this is TNS name) DBNAME=kamailio # database path used by dbtext, db_berkeley or sqlite # DB_PATH="/usr/local/etc/kamailio/dbtext" ## database read/write user DBRWUSER="kamailio" ## password for database read/write user DBRWPW="kamailiorw" `````` Error Log ````` 2018-10-16T09:03:28.812832261Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): SIP Request: 2018-10-16T09:03:28.823450876Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): method: <REGISTER> 2018-10-16T09:03:28.823485491Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:608]: parse_msg(): uri: <sip:192.168.56.111> 2018-10-16T09:03:28.823493873Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:610]: parse_msg(): version: <SIP/2.0> 2018-10-16T09:03:28.823499328Z 48(52) DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK.NszSAuWgI>; state=6 2018-10-16T09:03:28.823505373Z 48(52) DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 235, <rport> = <n/a>; state=17 2018-10-16T09:03:28.823510951Z 48(52) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 2018-10-16T09:03:28.823516043Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:492]: parse_headers(): Via found, flags=2 2018-10-16T09:03:28.823520787Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:494]: parse_headers(): this is the first via 2018-10-16T09:03:28.823525693Z 48(52) DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=10 2018-10-16T09:03:28.823530619Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [32]; uri=[sip:rex@192.168.56.111] 2018-10-16T09:03:28.823536065Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body ["rex" <sip:rex@192.168.56.111> 2018-10-16T09:03:28.823541562Z ] 2018-10-16T09:03:28.823546189Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <21> <REGISTER> 2018-10-16T09:03:28.823551761Z 48(52) DEBUG: <core> [core/receive.c:208]: receive_msg(): --- received sip message - request - call-id: [3D1vuRIhoP] - cseq: [21 REGISTER] 2018-10-16T09:03:28.823556553Z 48(52) DEBUG: <core> [core/parser/msg_parser.c:89]: get_hdr_field(): found end of header 2018-10-16T09:03:28.823561121Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/receive.c:256]: receive_msg(): preparing to run routing scripts... 2018-10-16T09:03:28.823581455Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[DEFAULT_ROUTE] c=[/etc/kamailio/kamailio.cfg] l=467 a=5 n=route 2018-10-16T09:03:28.823594380Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=579 a=16 n=if 2018-10-16T09:03:28.823600865Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=584 a=16 n=if 2018-10-16T09:03:28.823606633Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=579 a=25 n=mf_process_maxfwd_header 2018-10-16T09:03:28.823611928Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: maxfwd [mf_funcs.c:74]: is_maxfwd_present(): value = 70 2018-10-16T09:03:28.823616365Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=589 a=16 n=if 2018-10-16T09:03:28.823620781Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=584 a=25 n=is_method 2018-10-16T09:03:28.823625526Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=593 a=16 n=if 2018-10-16T09:03:28.823630296Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=589 a=26 n=sanity_check 2018-10-16T09:03:28.823634999Z {1 21 REGISTER 3D1vuRIhoP} 48(52) ERROR: sanity [sanity_mod.c:227]: w_sanity_check(): input parameter (17895) outside of valid range <1-16384) 2018-10-16T09:03:28.823640158Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=590 a=25 n=xlog 2018-10-16T09:03:28.823645318Z {1 21 REGISTER 3D1vuRIhoP} 48(52) ERROR: <script>: Malformed SIP message from 10.255.0.2:5060 2018-10-16T09:03:28.823762609Z {1 21 REGISTER 3D1vuRIhoP} 48(52) exec: *** cfgtrace:request_route=[REQINIT] c=[/etc/kamailio/kamailio.cfg] l=591 a=2 n=exit 2018-10-16T09:03:28.823770707Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/receive.c:298]: receive_msg(): request-route executed in: 92 usec 2018-10-16T09:03:28.823776922Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil) 2018-10-16T09:03:28.823782492Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil) 2018-10-16T09:03:28.823787580Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil) 2018-10-16T09:03:28.823792062Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil) 2018-10-16T09:03:28.823806720Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil) 2018-10-16T09:03:28.823812531Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list (nil) 2018-10-16T09:03:28.823817832Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/xavp.c:446]: xavp_destroy_list(): destroying xavp list (nil) 2018-10-16T09:03:28.823830768Z {1 21 REGISTER 3D1vuRIhoP} 48(52) DEBUG: <core> [core/receive.c:388]: receive_msg(): cleaning up `````` -- 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/1678

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev