sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:master:04d082d2: CONTRIBUTING.md: section for first line of the commit message [skip ci]
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 04d082d2a89f8e0d3646856cb81666f9f03fdffa URL: https://github.com/kamailio/kamailio/commit/04d082d2a89f8e0d3646856cb81666f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T11:39:02+01:00 CONTRIBUTING.md: section for first line of the commit message [skip ci] - note about [skip ci] flag in first line --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/04d082d2a89f8e0d3646856cb81666f… Patch: https://github.com/kamailio/kamailio/commit/04d082d2a89f8e0d3646856cb81666f… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f90d1c492b..fca94e33de 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -81,13 +81,20 @@ Please create the commit messages following the GIT convention: * start with one short line, preferably less then 50 chars summarizing the changes (this is referred later as "first line of the commit message") * then one empty line - * then a more detailed description + * then a more detailed description (the "commit message content") + +#### First Line Of The Commit Message #### Think of the first line as of an email "Subject" line. In fact it will be used as "Subject" in the generated commit emails and it will also be used when generating the Changelog (e.g. git log --pretty=oneline). -Please start always with the prefix of the component (subsystem) that is modified by the commit, for example: + +The first line (subjecthas to contain meaningful text about what that commit +does, do not put just a reference to bug tracker or pull request items + +Please start always with the prefix of the component (subsystem) that is modified +by the commit, for example: * `core`: more fixup helper functions * `core`: tcp - support for haproxy protocol * `core`: mem - added faster malloc @@ -96,13 +103,19 @@ Please start always with the prefix of the component (subsystem) that is modifie * `lib`: srutils - critical bug fix for abc case * `kamctl`: added support for management of module xyz +At the end of the first line some CI flags can be added. Available at this +moment: + + * `[skip ci]` - skip continous integration builds for source code, recommended + to be added when updating documentation, example configs or other utilities. + Example: + * `msilo: docs - updated example for m_dump() function [skip ci]` + #### Commit Message Content #### - * first line (subject line) has to contain meaningful text about what that commit - does, do not put just a reference to bug tracker or pull request items - * commit message must describe the changes done by the patch +* commit message must describe the changes done by the patch * other details (e.g., how to reproduce, backtrace, sip packets, ...) belong - to content (comments) of the pull request. Example: + to content (comments) of the pull request. Example of a full commit message: ``` core: added latency_limit_cfg global parameter

1 0

git:master:7bea3020: ims_qos: more extern declarations in the header files
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 7bea30203b85b7ed17434ee3f301faa0cedcba76 URL: https://github.com/kamailio/kamailio/commit/7bea30203b85b7ed17434ee3f301faa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T11:14:26+01:00 ims_qos: more extern declarations in the header files --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.h Modified: src/modules/ims_qos/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/7bea30203b85b7ed17434ee3f301faa… Patch: https://github.com/kamailio/kamailio/commit/7bea30203b85b7ed17434ee3f301faa… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 27964f5b64..c2e2ae06a1 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -75,7 +75,11 @@ MODULE_VERSION - extern gen_lock_t* process_lock; /* lock on the process table */ +extern gen_lock_t* process_lock; /* lock on the process table */ + +stat_var* stat_aar_timeouts; +stat_var* aar_replies_received; +stat_var* aar_replies_response_time; str orig_session_key = str_init("originating"); str term_session_key = str_init("terminating"); diff --git a/src/modules/ims_qos/rx_aar.h b/src/modules/ims_qos/rx_aar.h index 0a9a63b51a..10fa2cc059 100644 --- a/src/modules/ims_qos/rx_aar.h +++ b/src/modules/ims_qos/rx_aar.h @@ -54,7 +54,7 @@ #include "../../core/mod_fix.h" #include "../../core/locking.h" -struct cdp_binds cdpb; +extern struct cdp_binds cdpb; extern cdp_avp_bind_t *cdp_avp; /*this is the parcel to pass for CDP async for AAR*/ diff --git a/src/modules/ims_qos/stats.h b/src/modules/ims_qos/stats.h index 2de4bcdfa3..86424b94a2 100644 --- a/src/modules/ims_qos/stats.h +++ b/src/modules/ims_qos/stats.h @@ -51,9 +51,9 @@ #include "../../core/counters.h" -stat_var* stat_aar_timeouts; -stat_var* aar_replies_received; -stat_var* aar_replies_response_time; +extern stat_var* stat_aar_timeouts; +extern stat_var* aar_replies_received; +extern stat_var* aar_replies_response_time; int register_stats(); unsigned long get_avg_aar_response_time();

1 0

git:master:a8395274: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: a83952746263725500d92772038b64a3d58db3a0 URL: https://github.com/kamailio/kamailio/commit/a83952746263725500d92772038b64a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-03-04T10:46:17+01:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README Modified: src/modules/tm/README Modified: src/modules/usrloc/README Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/a83952746263725500d92772038b64a… Patch: https://github.com/kamailio/kamailio/commit/a83952746263725500d92772038b64a…

1 0

git:master:8d5ea6fb: Merge pull request #2238 from btriller/doc-fixes
by GitHub 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 8d5ea6fbbc1d213c2f284720977dc67b8bb89b49 URL: https://github.com/kamailio/kamailio/commit/8d5ea6fbbc1d213c2f284720977dc67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-03-04T10:42:29+01:00 Merge pull request #2238 from btriller/doc-fixes Doc fixes --- Modified: src/modules/acc_json/doc/acc_json_admin.xml Modified: src/modules/tm/doc/params.xml Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8d5ea6fbbc1d213c2f284720977dc67… Patch: https://github.com/kamailio/kamailio/commit/8d5ea6fbbc1d213c2f284720977dc67…

1 0

[kamailio/kamailio] Doc fixes (#2238)
by Bastian Triller 04 Mar '20

04 Mar '20

#### Pre-Submission Checklist    - [ ] 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:  - [ ] PR should be backported to stable branches - [ ] 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/2238 -- Commit Summary -- * acc_json: doc fixes * usrloc: doc fixes * tm: docs - fix title for parameter event_callback_lres_sent * websocket: docs - fix title for parameter rm_delay_interval -- File Changes -- M src/modules/acc_json/doc/acc_json_admin.xml (29) M src/modules/tm/doc/params.xml (2) M src/modules/usrloc/doc/usrloc_admin.xml (22) M src/modules/websocket/doc/websocket_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2238.patch https://github.com/kamailio/kamailio/pull/2238.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/2238

2 2

git:master:c4a566bf: websocket: docs - fix title for parameter rm_delay_interval
by Bastian Triller 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: c4a566bf8df05b55a690a4ad9ea5f5dfe8961e0e URL: https://github.com/kamailio/kamailio/commit/c4a566bf8df05b55a690a4ad9ea5f5d… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-03-04T10:26:42+01:00 websocket: docs - fix title for parameter rm_delay_interval --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c4a566bf8df05b55a690a4ad9ea5f5d… Patch: https://github.com/kamailio/kamailio/commit/c4a566bf8df05b55a690a4ad9ea5f5d… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 132ede160b..35e0e626a6 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -499,7 +499,7 @@ modparam("websocket", "timer_interval", 5) </para> <para><emphasis>Default value is 5.</emphasis></para> <example> - <title>Set <varname>rm_timer_interval</varname>parameter</title> + <title>Set <varname>rm_delay_interval</varname>parameter</title> <programlisting format="linespecific"> ... modparam("websocket", "rm_delay_interval", 2)

1 0

git:master:32a21b5b: tm: docs - fix title for parameter event_callback_lres_sent
by Bastian Triller 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 32a21b5bd17309175ba99186629fa0d4e6b21fa7 URL: https://github.com/kamailio/kamailio/commit/32a21b5bd17309175ba99186629fa0d… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-03-04T10:26:42+01:00 tm: docs - fix title for parameter event_callback_lres_sent --- Modified: src/modules/tm/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/32a21b5bd17309175ba99186629fa0d… Patch: https://github.com/kamailio/kamailio/commit/32a21b5bd17309175ba99186629fa0d… --- diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index 4c583ca782..512e7d40a0 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1440,7 +1440,7 @@ end </section> <section id="tm.p.event_callback_lres_sent"> - <title><varname>event_callback_lres</varname> (str)</title> + <title><varname>event_callback_lres_sent</varname> (str)</title> <para> The name of the function in the kemi configuration file (embedded scripting language such as Lua, Python, ...) to be executed instead

1 0

git:master:305ba1b2: usrloc: doc fixes
by Bastian Triller 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 305ba1b23bae19a4042c3e8fa88451b47ac69ff5 URL: https://github.com/kamailio/kamailio/commit/305ba1b23bae19a4042c3e8fa88451b… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-03-04T10:26:12+01:00 usrloc: doc fixes * add doc for parameter reg_id_column * fix title for parameter partition_column --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/305ba1b23bae19a4042c3e8fa88451b… Patch: https://github.com/kamailio/kamailio/commit/305ba1b23bae19a4042c3e8fa88451b… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index d23b2a9e7e..902d0586c1 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -456,6 +456,26 @@ modparam("usrloc", "instance_column", "myinstance") </example> </section> + <section id="usrloc.p.reg_id_column"> + <title><varname>reg_id_column</varname> (string)</title> + <para> + Name of database table column containing the value for reg-id. + </para> + <para> + <emphasis> + Default value is <quote>reg_id</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>reg_id_column</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "reg_id_column", "r_id") +... +</programlisting> + </example> + </section> + <section id="usrloc.p.server_id_column"> <title><varname>server_id_column</varname> (string)</title> <para> @@ -527,7 +547,7 @@ modparam("usrloc", "keepalive_column", "kalive") </emphasis> </para> <example> - <title>Set <varname>partitioncolumn</varname> parameter</title> + <title>Set <varname>partition_column</varname> parameter</title> <programlisting format="linespecific"> ... modparam("usrloc", "partition_column", "part")

1 0

git:master:81a9c09b: acc_json: doc fixes
by Bastian Triller 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: 81a9c09b7b25afc6bd9d0854c1bf7aa3c34d6b82 URL: https://github.com/kamailio/kamailio/commit/81a9c09b7b25afc6bd9d0854c1bf7aa… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-03-04T10:24:20+01:00 acc_json: doc fixes * fix parameter names acc_output_mqueue and acc_output_syslog * add missing parameter cdr_output_syslog --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/81a9c09b7b25afc6bd9d0854c1bf7aa… Patch: https://github.com/kamailio/kamailio/commit/81a9c09b7b25afc6bd9d0854c1bf7aa… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index 70b6df1d2b..ae0f9d68c4 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -69,7 +69,7 @@ <title><varname>acc_flag</varname> (integer)</title> <para> Request flag which needs to be set to account a transaction in acc_json. - See output_mqueue and output_syslog + See acc_output_mqueue and acc_output_syslog </para> <para> Default value is not-set (no flag). @@ -88,7 +88,7 @@ modparam("acc_json", "acc_flag", 2) <title><varname>acc_missed_flag</varname> (integer)</title> <para> Request flag which needs to be set to account missed calls in acc_json. - See output_mqueue and output_syslog + See acc_output_mqueue and acc_output_syslog </para> <para> Default value is not-set (no flag). @@ -181,8 +181,8 @@ modparam("acc_json", "acc_time_format", "%Y/%m/%d %H:%M:%S") </example> </section> - <section id="acc_json.p.output_mqueue"> - <title><varname>output_mqueue</varname> (integer)</title> + <section id="acc_json.p.acc_output_mqueue"> + <title><varname>acc_output_mqueue</varname> (integer)</title> <para> Requires the mqueue module. The acc module will queue json acc events in the specified mqueue. @@ -195,13 +195,13 @@ modparam("acc_json", "acc_time_format", "%Y/%m/%d %H:%M:%S") Default value is not-set mqueue will not be required. </para> <example> - <title>output_mqueue usage example</title> + <title>acc_output_mqueue usage example</title> <programlisting format="linespecific"> ... # example using json_mqueue/http_client to publish to NSQD max_while_loops=100000 modparam("mqueue", "mqueue", "name=acc_events;size=100000") -modparam("acc_json", "output_mqueue", "acc_events") +modparam("acc_json", "acc_output_mqueue", "acc_events") modparam("acc_json", "acc_flag", 2) modparam("acc_json", "acc_extra", "caller_ip_port=$avp(caller_ip_port);") modparam("rtimer", "timer", "name=nsqt;interval=1;mode=1;") @@ -234,8 +234,8 @@ route[RUN_ACC_PUBLISH] { </example> </section> - <section id="acc_json.p.output_syslog"> - <title><varname>output_syslog</varname> (integer)</title> + <section id="acc_json.p.acc_output_syslog"> + <title><varname>acc_output_syslog</varname> (integer)</title> <para> Control if the output of acc json should be sent to syslog. This is not dependent on Kamailio global logging settings, @@ -246,10 +246,10 @@ route[RUN_ACC_PUBLISH] { Default value is not-set (no flag). </para> <example> - <title>output_syslog example</title> + <title>acc_output_syslog example</title> <programlisting format="linespecific"> ... -modparam("acc_json", "output_syslog", 1) +modparam("acc_json", "acc_output_syslog", 1) modparam("acc_json", "acc_log_level", 2) modparam("acc_json", "acc_log_facility", "LOG_DAEMON") ... @@ -408,8 +408,13 @@ route[RUN_CDR_PUBLISH] { </programlisting> </example> </section> - -<section id="acc_json.p.cdr_log_facility"> + <section id="acc_json.p.cdr_output_syslog"> + <title><varname>cdr_output_syslog</varname> (integer)</title> + <para> + The acc module will log json cdr events to syslog. + </para> + </section> + <section id="acc_json.p.cdr_log_facility"> <title><varname>cdr_log_facility</varname> (integer)</title> <para> Log facility to which accounting messages are issued to syslog.

1 0

git:master:df5521fc: ims_qos: use extern in header files not to redeclare variables
by Daniel-Constantin Mierla 04 Mar '20

04 Mar '20

Module: kamailio Branch: master Commit: df5521fcdfc96462eb191b774f242fe1d4616adb URL: https://github.com/kamailio/kamailio/commit/df5521fcdfc96462eb191b774f242fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-04T08:28:30+01:00 ims_qos: use extern in header files not to redeclare variables --- Modified: src/modules/ims_qos/cdpeventprocessor.h Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_aar.h Modified: src/modules/ims_qos/rx_avp.h --- Diff: https://github.com/kamailio/kamailio/commit/df5521fcdfc96462eb191b774f242fe… Patch: https://github.com/kamailio/kamailio/commit/df5521fcdfc96462eb191b774f242fe… --- diff --git a/src/modules/ims_qos/cdpeventprocessor.h b/src/modules/ims_qos/cdpeventprocessor.h index 4f2b4d688f..8f393656ee 100644 --- a/src/modules/ims_qos/cdpeventprocessor.h +++ b/src/modules/ims_qos/cdpeventprocessor.h @@ -67,8 +67,8 @@ typedef struct { int size; } cdp_cb_event_list_t; -str early_qosrelease_reason; -str confirmed_qosrelease_headers; +extern str early_qosrelease_reason; +extern str confirmed_qosrelease_headers; int init_cdp_cb_event_list(); void destroy_cdp_cb_event_list(); diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 684f3a75c5..2029035415 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -71,7 +71,7 @@ #define macro_name(_rc) #_rc //extern struct tm_binds tmb; -usrloc_api_t ul; +extern usrloc_api_t ul; extern struct ims_qos_counters_h ims_qos_cnts_h; diff --git a/src/modules/ims_qos/rx_aar.h b/src/modules/ims_qos/rx_aar.h index f12def162f..0a9a63b51a 100644 --- a/src/modules/ims_qos/rx_aar.h +++ b/src/modules/ims_qos/rx_aar.h @@ -55,7 +55,7 @@ #include "../../core/locking.h" struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern cdp_avp_bind_t *cdp_avp; /*this is the parcel to pass for CDP async for AAR*/ typedef struct saved_transaction { diff --git a/src/modules/ims_qos/rx_avp.h b/src/modules/ims_qos/rx_avp.h index c8f81b6f85..55840f3e81 100644 --- a/src/modules/ims_qos/rx_avp.h +++ b/src/modules/ims_qos/rx_avp.h @@ -64,8 +64,8 @@ struct AAA_AVP_List; struct AAAMessage; enum dialog_direction; -int audio_default_bandwidth; -int video_default_bandwidth; +extern int audio_default_bandwidth; +extern int video_default_bandwidth; /*helper*/

1 0

← Newer
1
...
41
42
43
44
45
46
47
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020