sr-dev November 2018

sr-dev@lists.kamailio.org

22 participants
298 discussions

git:master:37dae368: ims_charging : doc is fixed

by GitHub

Module: kamailio Branch: master Commit: 37dae368667fc82bc2f60639d722354e6528ec7f URL: https://github.com/kamailio/kamailio/commit/37dae368667fc82bc2f60639d722354… Author: Yasin CANER <12412027+ycaner06(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-28T16:02:25+03:00 ims_charging : doc is fixed ims_charging : doc is fixed --- Modified: src/modules/ims_charging/doc/ims_charging_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/37dae368667fc82bc2f60639d722354… Patch: https://github.com/kamailio/kamailio/commit/37dae368667fc82bc2f60639d722354… --- diff --git a/src/modules/ims_charging/doc/ims_charging_admin.xml b/src/modules/ims_charging/doc/ims_charging_admin.xml index 4dd9453164..465044a126 100644 --- a/src/modules/ims_charging/doc/ims_charging_admin.xml +++ b/src/modules/ims_charging/doc/ims_charging_admin.xml @@ -762,7 +762,7 @@ modparam("ims_charging", "custom_user_avp", "$avp(from_user)") <section> <title><function moreinfo="none">Ro_CCR(route_name, direction, - reservation_units, domain, incoming_trunk_id, outgoing_trunk_id</function> + reservation_units, incoming_trunk_id, outgoing_trunk_id)</function> </title> <para>Perform a CCR on Diameter Ro interface for Charging</para> @@ -784,11 +784,6 @@ modparam("ims_charging", "custom_user_avp", "$avp(from_user)") <para><emphasis>reservation_units</emphasis> how many units (at the moment seconds) should be reserved at the moment.</para> </listitem> - - <listitem> - <para><emphasis>domain</emphasis> Logical domain within - registrar.</para> - </listitem> <listitem> <para><emphasis>incoming_trunk_id</emphasis> Identifies the trunk group

6 years

[kamailio/kamailio] ims_charging : doc is fixed (#1741)

by Yasin CANER

ims_charging : doc is fixed   #### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Ro_CCR function doesnt get parameter like domain. it removed from doc. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1741 -- Commit Summary -- * ims_charging : doc is fixed -- File Changes -- M src/modules/ims_charging/doc/ims_charging_admin.xml (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1741.patch https://github.com/kamailio/kamailio/pull/1741.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/1741

6 years

[kamailio/kamailio] Body part comparison error logs (#1746)

by Y. Luis

### Description I used [get_body_part_by_filter](https://github.com/kamailio/kamailio/blob/f073f72a… to extract a body part from a `multipart/mixed` message. It works as expected but for every body part it compares and do not match (until finding the one that matches the filter) it shows error log messages like: `ERROR: <core> [core/parser/parse_body.c:513]: part_multipart_headers_cmp(): part_multipart_headers_cmp. error. "-2". "MIME types mismatch".` The comparison of body parts shouldn´t be logged as errors, since they are not.  ### Expected behavior No error logs. #### Actual observed behavior Error log messages. #### Log Messages  ``` ERROR: <core> [core/parser/parse_body.c:513]: part_multipart_headers_cmp(): part_multipart_headers_cmp. error. "-2". "MIME types mismatch". ``` ### Possible Solutions  Do not show logs or change log level. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.1 ``` * **Operating System**:  ``` CentOS 7 ``` -- 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/1746

6 years

git:master:08820db1: core: parse body - debug instead of error log message when mime mismatch

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 08820db104c7dbfce36af0f59dfcc28f97cffbd0 URL: https://github.com/kamailio/kamailio/commit/08820db104c7dbfce36af0f59dfcc28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-29T20:04:08+01:00 core: parse body - debug instead of error log message when mime mismatch - GH #1746 --- Modified: src/core/parser/parse_body.c --- Diff: https://github.com/kamailio/kamailio/commit/08820db104c7dbfce36af0f59dfcc28… Patch: https://github.com/kamailio/kamailio/commit/08820db104c7dbfce36af0f59dfcc28… --- diff --git a/src/core/parser/parse_body.c b/src/core/parser/parse_body.c index 05425b50ce..9794e43fb1 100644 --- a/src/core/parser/parse_body.c +++ b/src/core/parser/parse_body.c @@ -504,7 +504,11 @@ int part_multipart_headers_cmp (char *buffer, } if (error < 0) { - LM_ERR("part_multipart_headers_cmp. error. \"%i\". \"%s\".\n", error, error_msg); + if(error == -2) { + LM_DBG("result code: \"%i\" text: \"%s\".\n", error, error_msg); + } else { + LM_ERR("error code: \"%i\" error text: \"%s\".\n", error, error_msg); + } return 0; } else { return found;

6 years

git:master:ba31f4ec: dispatcher: docs for flags value 16

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ba31f4ec4f98487e9f1282fe12a5819d5df0b733 URL: https://github.com/kamailio/kamailio/commit/ba31f4ec4f98487e9f1282fe12a5819… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-29T18:31:07+01:00 dispatcher: docs for flags value 16 --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba31f4ec4f98487e9f1282fe12a5819… Patch: https://github.com/kamailio/kamailio/commit/ba31f4ec4f98487e9f1282fe12a5819… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 023f6a0ba2..3b40c04622 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1780,17 +1780,21 @@ onreply_route { sending keepalives. It is a bitwise value that can be built using the folowing flags: <itemizedlist> - <listitem><para>1 (bit at index 0 - 1 <<0) - inactive destination<para> + <listitem><para>1 (bit at index 0 - 1 <<0) - inactive destination</para> </listitem> <listitem><para>2 (bit at index 1 - 1 <<1) - temporary trying destination (in the way to become inactive if it does not reply to keepalives - there is a module parameter to set the threshold of - failures)<para> + failures)</para> </listitem> - <listitem><para>4 (bit at index 2 - 1 <<2) - admin disabled destination<para> + <listitem><para>4 (bit at index 2 - 1 <<2) - admin disabled destination</para> </listitem> <listitem><para>8 (bit at index 3 - 1 <<3) - probing destination (sending keep alives);</para> </listitem> + <listitem><para>16 (bit at index 4 - 1 <<4) - skip DNS A/AAAA resolve at startup, + useful when the hostname of the destination address is a NAPTR or SRV record only. + Such addresses cannot be matched anymore with ds_is_from_list(...).</para> + </listitem> </itemizedlist> </para> </listitem>

6 years

git:master:9eba5b67: dispatcher: flag 16 (1<<4) for destinations with host not having A/AAAA record

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9eba5b673cc1a80434642b280e6f7d53e310338e URL: https://github.com/kamailio/kamailio/commit/9eba5b673cc1a80434642b280e6f7d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-29T18:20:24+01:00 dispatcher: flag 16 (1<<4) for destinations with host not having A/AAAA record - use it for addresses that should not be resolved with an A/AAAA query at startup (e.g., it is a NAPTR or SRV only record for that specific hostname) - such addresses will not match when using ds_is_from_list(...) - GH #1743 --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/9eba5b673cc1a80434642b280e6f7d5… Patch: https://github.com/kamailio/kamailio/commit/9eba5b673cc1a80434642b280e6f7d5… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cb8fe6ea81..59cf1d9302 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -424,11 +424,17 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) /* Do a DNS-Lookup for the Host-Name: */ he = resolvehost(hn); if(he == 0) { - LM_ERR("could not resolve %.*s\n", puri.host.len, puri.host.s); - goto err; + if(dp->flags & DS_NODNSARES_DST) { + dp->irmode |= DS_IRMODE_NOIPADDR; + } else { + LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", + puri.host.len, puri.host.s); + goto err; + } + } else { + /* Store hostent in the dispatcher structure */ + hostent2ip_addr(&dp->ip_address, he, 0); } - /* Free the hostname */ - hostent2ip_addr(&dp->ip_address, he, 0); /* Copy the port out of the URI */ dp->port = puri.port_no; @@ -2957,8 +2963,8 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) if(group == -1) { - rc = ds_is_addr_from_set_r( - _m, pipaddr, tport, tproto, _ds_list, mode, 1); + rc = ds_is_addr_from_set_r(_m, pipaddr, tport, tproto, _ds_list, + mode, 1); } else { list = ds_avl_find(_ds_list, group); if(list) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 0675b3ccd3..1c89c756e6 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -44,7 +44,8 @@ #define DS_TRYING_DST 2 /*!< temporary trying destination */ #define DS_DISABLED_DST 4 /*!< admin disabled destination */ #define DS_PROBING_DST 8 /*!< checking destination */ -#define DS_STATES_ALL 15 /*!< all bits for the states of destination */ +#define DS_NODNSARES_DST 16 /*!< no DNS A/AAAA resolve for host in uri */ +#define DS_STATES_ALL 31 /*!< all bits for the states of destination */ #define ds_skip_dst(flags) ((flags) & (DS_INACTIVE_DST|DS_DISABLED_DST)) @@ -68,6 +69,8 @@ #define DS_XAVP_CTX_SKIP_CNT 1 +#define DS_IRMODE_NOIPADDR 1 + /* clang-format on */ extern str ds_db_url; @@ -185,16 +188,17 @@ typedef struct _ds_latency_stats { } ds_latency_stats_t; typedef struct _ds_dest { - str uri; - int flags; - int priority; - int dload; - ds_attrs_t attrs; - ds_latency_stats_t latency_stats; - struct socket_info * sock; - struct ip_addr ip_address; /*!< IP-Address of the entry */ - unsigned short int port; /*!< Port of the URI */ - unsigned short int proto; /*!< Protocol of the URI */ + str uri; /*!< address/uri */ + int flags; /*!< flags */ + int priority; /*!< priority */ + int dload; /*!< load */ + ds_attrs_t attrs; /*!< the atttributes */ + ds_latency_stats_t latency_stats; /*!< latency statistics */ + int irmode; /*!< internal runtime mode (flags) */ + struct socket_info *sock; /*!< pointer to local socket */ + struct ip_addr ip_address; /*!< IP of the address */ + unsigned short int port; /*!< port of the URI */ + unsigned short int proto; /*!< protocol of the URI */ int message_count; struct _ds_dest *next; } ds_dest_t;

6 years

git:master:4e7e355d: dispatcher: rename internal functions to match the module pattern

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4e7e355db6946850bec061ef4d113bd8b9505cb7 URL: https://github.com/kamailio/kamailio/commit/4e7e355db6946850bec061ef4d113bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-29T17:34:42+01:00 dispatcher: rename internal functions to match the module pattern --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/4e7e355db6946850bec061ef4d113bd… Patch: https://github.com/kamailio/kamailio/commit/4e7e355db6946850bec061ef4d113bd… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d247d6e104..cb8fe6ea81 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -213,7 +213,7 @@ int ds_log_sets(void) /** * */ -int init_data(void) +int ds_init_data(void) { int *p; @@ -864,7 +864,7 @@ void ds_disconnect_db(void) } /*! \brief Initialize and verify DB stuff*/ -int init_ds_db(void) +int ds_init_db(void) { int ret; diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 14db0e2a30..0675b3ccd3 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -114,8 +114,8 @@ extern str ds_outbound_proxy; extern str ds_default_socket; extern struct socket_info *ds_default_sockinfo; -int init_data(void); -int init_ds_db(void); +int ds_init_data(void); +int ds_init_db(void); int ds_load_list(char *lfile); int ds_connect_db(void); void ds_disconnect_db(void); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 66ed3248ef..d18652a05f 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -349,7 +349,7 @@ static int mod_init(void) ds_default_socket.len, ds_default_socket.s); } - if(init_data() != 0) + if(ds_init_data() != 0) return -1; if(ds_db_url.s) { @@ -369,7 +369,7 @@ static int mod_init(void) } } } - if(init_ds_db() != 0) { + if(ds_init_db() != 0) { LM_ERR("could not initiate a connect to the database\n"); return -1; }

6 years

git:master:f073f72a: dispatcher: docs - make a bullet list for the possible values for flags field

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f073f72af6a507e8113e06dc07ad161e3f4632c3 URL: https://github.com/kamailio/kamailio/commit/f073f72af6a507e8113e06dc07ad161… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T17:38:56+01:00 dispatcher: docs - make a bullet list for the possible values for flags field --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f073f72af6a507e8113e06dc07ad161… Patch: https://github.com/kamailio/kamailio/commit/f073f72af6a507e8113e06dc07ad161… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 34a4a1559a..023f6a0ba2 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1776,12 +1776,23 @@ onreply_route { </para> <itemizedlist> <listitem> - <para>flags (listed by index - can be bitwise mask of values): - 0 (value 1) - inactive destination; 1 (value 2) - temporary trying - destination (in the way to become inactive if it does not reply to - keepalives - there is a module parameter to set the threshold of - failures); 2 (value 4) - admin disabled destination; 3 (value 8) - - probing destination (sending keep alives);</para> + <para>flags - control the mode of using the destination address and + sending keepalives. It is a bitwise value that can be built using + the folowing flags: + <itemizedlist> + <listitem><para>1 (bit at index 0 - 1 <<0) - inactive destination<para> + </listitem> + <listitem><para>2 (bit at index 1 - 1 <<1) - temporary trying + destination (in the way to become inactive if it does not reply to + keepalives - there is a module parameter to set the threshold of + failures)<para> + </listitem> + <listitem><para>4 (bit at index 2 - 1 <<2) - admin disabled destination<para> + </listitem> + <listitem><para>8 (bit at index 3 - 1 <<3) - probing destination (sending keep alives);</para> + </listitem> + </itemizedlist> + </para> </listitem> <listitem> <para>priority: sets the priority in destination list (based on it

6 years

Kamailio v5.2.0 Released - new major version is out

by Daniel-Constantin Mierla

Kamailio v5.2.0 is out – it comes with 6 new modules and a consistent group of improvements touching more than 100 existing modules. You can read detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-2-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.2.0 brings more flexibility and optimizations for KEMI interpreters (including two new interpreters for Python3 and Ruby), major enhancements to load balancer and tls implementations, new variables and lots of other new features. Enjoy Kamailio v5.2.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference 2019 - http://www.kamailioworld.com

6 years

git:master:55c7f781: presence: test if event is dialog when attempting to delete old records

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 55c7f781be7cc40d0cd161640a47244aad60c0e7 URL: https://github.com/kamailio/kamailio/commit/55c7f781be7cc40d0cd161640a47244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T12:49:58+01:00 presence: test if event is dialog when attempting to delete old records --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/55c7f781be7cc40d0cd161640a47244… Patch: https://github.com/kamailio/kamailio/commit/55c7f781be7cc40d0cd161640a47244… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 5527d3736a..07d51c8982 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -380,6 +380,10 @@ int delete_presentity_if_dialog_id_exists(presentity_t* presentity, int i = 0; presentity_t old_presentity; + if (presentity->event->evp->type != EVENT_DIALOG) { + return 0; + } + query_cols[n_query_cols] = &str_domain_col; query_ops[n_query_cols] = OP_EQ; query_vals[n_query_cols].type = DB1_STR;

6 years

← Newer
1
...
7
8
9
10
11
12
13
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2018