Merge branch 'master' into pr_github_actions

OpenSIPS · Dec 27, 2020 · 2b25cdd · 2b25cdd
2 parents 58b0190 + b7368f4
commit 2b25cdd
Show file tree

Hide file tree

Showing 30 changed files with 327 additions and 214 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![Build Status@GitHub](https://github.com/OpenSIPS/opensips/workflows/Main%20CI/badge.svg?branch=master)](https://github.com/OpenSIPS/opensips/actions?query=branch%3Amaster++)
-[![Build Status@TravisCI](https://travis-ci.org/OpenSIPS/opensips.svg?branch=master)](https://travis-ci.org/OpenSIPS/opensips)
+[![Build Status@TravisCI](https://travis-ci.com/OpenSIPS/opensips.svg?branch=master)](https://travis-ci.org/OpenSIPS/opensips)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/7580/badge.svg)](https://scan.coverity.com/projects/opensips-opensips)
 [![Code Quality: Cpp](https://img.shields.io/lgtm/grade/cpp/g/OpenSIPS/opensips.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/OpenSIPS/opensips/context:cpp)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/OpenSIPS/opensips.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/OpenSIPS/opensips/alerts)

diff --git a/cachedb/cachedb.h b/cachedb/cachedb.h
@@ -60,6 +60,14 @@ typedef struct cachedb_funcs_t {
 	/* NOTE: "val->s" shall be allocated in PKG memory,
 	 * and MUST be freed by the calling layer! */
 	int (*get) (cachedb_con *con, str *attr, str *val);
+
+	/**
+	 * Gets the value of a counter.
+	 * Return values:
+	 *  -2: key does not exist
+	 *  -1: internal error
+	 *   0: key found and value returned in the `val` parameter
+	 */
 	int (*get_counter) (cachedb_con *con, str *attr, int *val);
 	int (*set) (cachedb_con *con, str *attr, str *val, int expires);
 	int (*remove) (cachedb_con *con, str *attr);

diff --git a/modules/b2b_logic/README b/modules/b2b_logic/README
@@ -1074,11 +1074,11 @@ Chapter 3. Contributors
    7. Nick Altmann (@nikbyte) 14 6 461 199
    8. Vlad Paiu (@vladpaiu) 7 5 35 21
    9. Peter Lemenkov (@lemenkov) 4 2 2 2
-   10. Dan Pascu (@danpascu) 3 1 6 6
+   10. Zero King (@l2dy) 4 2 2 2
 
-   All remaining contributors: Ezequiel Lovelle (@lovelle), Maksym
-   Sobolyev (@sobomax), Walter Doekes (@wdoekes), Zero King
-   (@l2dy).
+   All remaining contributors: Dan Pascu (@danpascu), Ezequiel
+   Lovelle (@lovelle), Maksym Sobolyev (@sobomax), Walter Doekes
+   (@wdoekes).
 
    (1) DevScore = author_commits + author_lines_added /
    (project_lines_added / project_commits) + author_lines_deleted
@@ -1100,12 +1100,12 @@ Chapter 3. Contributors
 
    Table 3.2. Most recently active contributors^(1) to this module
                       Name                   Commit Activity
-   1.  Liviu Chircu (@liviuchircu)         Mar 2014 - Nov 2020
-   2.  Vlad Patrascu (@rvlad-patrascu)     May 2017 - Nov 2020
-   3.  Maksym Sobolyev (@sobomax)          Oct 2020 - Oct 2020
-   4.  Razvan Crainea (@razvancrainea)     Jun 2011 - Jul 2020
-   5.  Bogdan-Andrei Iancu (@bogdan-iancu) Aug 2009 - Mar 2020
-   6.  Zero King (@l2dy)                   Mar 2020 - Mar 2020
+   1.  Zero King (@l2dy)                   Mar 2020 - Dec 2020
+   2.  Liviu Chircu (@liviuchircu)         Mar 2014 - Nov 2020
+   3.  Vlad Patrascu (@rvlad-patrascu)     May 2017 - Nov 2020
+   4.  Maksym Sobolyev (@sobomax)          Oct 2020 - Oct 2020
+   5.  Razvan Crainea (@razvancrainea)     Jun 2011 - Jul 2020
+   6.  Bogdan-Andrei Iancu (@bogdan-iancu) Aug 2009 - Mar 2020
    7.  Peter Lemenkov (@lemenkov)          Jun 2018 - Feb 2020
    8.  Dan Pascu (@danpascu)               Jul 2019 - Jul 2019
    9.  Walter Doekes (@wdoekes)            Apr 2019 - Apr 2019

diff --git a/modules/b2b_logic/doc/contributors.xml b/modules/b2b_logic/doc/contributors.xml
@@ -92,16 +92,16 @@
 	</row>
 	<row>
 		<entry>10. </entry>
-		<entry>Dan Pascu (<ulink url="https://github.com/danpascu">@danpascu</ulink>)</entry>
-		<entry align="center">3</entry>
-		<entry align="center">1</entry>
-		<entry align="center">6</entry>
-		<entry align="center">6</entry>
+		<entry>Zero King (<ulink url="https://github.com/l2dy">@l2dy</ulink>)</entry>
+		<entry align="center">4</entry>
+		<entry align="center">2</entry>
+		<entry align="center">2</entry>
+		<entry align="center">2</entry>
 	</row>
 	</tbody>
 	</tgroup>
 	</table>
-	<para><emphasis role='bold'>All remaining contributors</emphasis>: Ezequiel Lovelle (<ulink url="https://github.com/lovelle">@lovelle</ulink>), Maksym Sobolyev (<ulink url="https://github.com/sobomax">@sobomax</ulink>), Walter Doekes (<ulink url="https://github.com/wdoekes">@wdoekes</ulink>), Zero King (<ulink url="https://github.com/l2dy">@l2dy</ulink>).</para>
+	<para><emphasis role='bold'>All remaining contributors</emphasis>: Dan Pascu (<ulink url="https://github.com/danpascu">@danpascu</ulink>), Ezequiel Lovelle (<ulink url="https://github.com/lovelle">@lovelle</ulink>), Maksym Sobolyev (<ulink url="https://github.com/sobomax">@sobomax</ulink>), Walter Doekes (<ulink url="https://github.com/wdoekes">@wdoekes</ulink>).</para>
 	<para>
 	    <emphasis>(1) DevScore = author_commits + author_lines_added / (project_lines_added / project_commits) + author_lines_deleted / (project_lines_deleted / project_commits)</emphasis>
 	</para>
@@ -128,34 +128,34 @@
 	<tbody>
 	<row>
 		<entry>1. </entry>
+		<entry>Zero King (<ulink url="https://github.com/l2dy">@l2dy</ulink>)</entry>
+		<entry align="center">Mar 2020 - Dec 2020</entry>
+	</row>
+	<row>
+		<entry>2. </entry>
 		<entry>Liviu Chircu (<ulink url="https://github.com/liviuchircu">@liviuchircu</ulink>)</entry>
 		<entry align="center">Mar 2014 - Nov 2020</entry>
 	</row>
 	<row>
-		<entry>2. </entry>
+		<entry>3. </entry>
 		<entry>Vlad Patrascu (<ulink url="https://github.com/rvlad-patrascu">@rvlad-patrascu</ulink>)</entry>
 		<entry align="center">May 2017 - Nov 2020</entry>
 	</row>
 	<row>
-		<entry>3. </entry>
+		<entry>4. </entry>
 		<entry>Maksym Sobolyev (<ulink url="https://github.com/sobomax">@sobomax</ulink>)</entry>
 		<entry align="center">Oct 2020 - Oct 2020</entry>
 	</row>
 	<row>
-		<entry>4. </entry>
+		<entry>5. </entry>
 		<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
 		<entry align="center">Jun 2011 - Jul 2020</entry>
 	</row>
 	<row>
-		<entry>5. </entry>
+		<entry>6. </entry>
 		<entry>Bogdan-Andrei Iancu (<ulink url="https://github.com/bogdan-iancu">@bogdan-iancu</ulink>)</entry>
 		<entry align="center">Aug 2009 - Mar 2020</entry>
 	</row>
-	<row>
-		<entry>6. </entry>
-		<entry>Zero King (<ulink url="https://github.com/l2dy">@l2dy</ulink>)</entry>
-		<entry align="center">Mar 2020 - Mar 2020</entry>
-	</row>
 	<row>
 		<entry>7. </entry>
 		<entry>Peter Lemenkov (<ulink url="https://github.com/lemenkov">@lemenkov</ulink>)</entry>

diff --git a/modules/b2b_logic/logic.c b/modules/b2b_logic/logic.c
@@ -2977,7 +2977,7 @@ str *b2b_scenario_hdrs(struct b2bl_new_entity *entity)
 	unsigned int len;
 	char *tmp_buf;
 	int_str name_value, body_value;
-	struct usr_avp *avp_hdrs = NULL, *avp_hdr_vals;
+	struct usr_avp *avp_hdrs = NULL, *avp_hdr_vals = NULL;
 
 	/* reset the buffer to fill in with new information */
 	b2b_hdrs_buf.len = 0;

diff --git a/modules/cachedb_mongodb/README b/modules/cachedb_mongodb/README
@@ -265,7 +265,7 @@ Chapter 2. Contributors
      Name DevScore Commits Lines ++ Lines --
    1. Liviu Chircu (@liviuchircu) 147 78 2886 2733
    2. Vlad Paiu (@vladpaiu) 35 9 2964 50
-   3. Razvan Crainea (@razvancrainea) 11 9 28 25
+   3. Razvan Crainea (@razvancrainea) 12 10 30 26
    4. Ovidiu Sas (@ovidiusas) 10 8 92 16
    5. Vlad Patrascu (@rvlad-patrascu) 5 3 87 2
    6. Bogdan-Andrei Iancu (@bogdan-iancu) 5 3 3 5
@@ -296,11 +296,11 @@ Chapter 2. Contributors
 
    Table 2.2. Most recently active contributors^(1) to this module
                       Name                   Commit Activity
-   1.  Vlad Patrascu (@rvlad-patrascu)     May 2017 - Jun 2020
-   2.  Bogdan-Andrei Iancu (@bogdan-iancu) Oct 2014 - Mar 2020
-   3.  Liviu Chircu (@liviuchircu)         Mar 2014 - Feb 2020
-   4.  Alessio Garzi (@Ozzyboshi)          Nov 2019 - Dec 2019
-   5.  Razvan Crainea (@razvancrainea)     Aug 2015 - Sep 2019
+   1.  Razvan Crainea (@razvancrainea)     Aug 2015 - Dec 2020
+   2.  Vlad Patrascu (@rvlad-patrascu)     May 2017 - Jun 2020
+   3.  Bogdan-Andrei Iancu (@bogdan-iancu) Oct 2014 - Mar 2020
+   4.  Liviu Chircu (@liviuchircu)         Mar 2014 - Feb 2020
+   5.  Alessio Garzi (@Ozzyboshi)          Nov 2019 - Dec 2019
    6.  Dan Pascu (@danpascu)               May 2019 - May 2019
    7.  Peter Lemenkov (@lemenkov)          Jun 2018 - Jun 2018
    8.  @jalung                             Aug 2017 - Aug 2017

diff --git a/modules/cachedb_mongodb/cachedb_mongodb_dbase.c b/modules/cachedb_mongodb/cachedb_mongodb_dbase.c
@@ -1023,7 +1023,7 @@ int mongo_con_get_counter(cachedb_con *con, str *attr, int *val)
 	mongoc_cursor_t *cursor;
 	bson_iter_t iter;
 	struct timeval start;
-	int ret = 0;
+	int ret = -2;
 
 	query = bson_new();
 #if MONGOC_CHECK_VERSION(1, 5, 0)
@@ -1059,6 +1059,7 @@ int mongo_con_get_counter(cachedb_con *con, str *attr, int *val)
 			value = bson_iter_value(&iter);
 			switch (value->value_type) {
 			case BSON_TYPE_INT32:
+				ret = 0;
 				*val = value->value.v_int32;
 				break;
 			default:

diff --git a/modules/cachedb_mongodb/doc/contributors.xml b/modules/cachedb_mongodb/doc/contributors.xml
@@ -37,10 +37,10 @@
 	<row>
 		<entry>3. </entry>
 		<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
-		<entry align="center">11</entry>
-		<entry align="center">9</entry>
-		<entry align="center">28</entry>
-		<entry align="center">25</entry>
+		<entry align="center">12</entry>
+		<entry align="center">10</entry>
+		<entry align="center">30</entry>
+		<entry align="center">26</entry>
 	</row>
 	<row>
 		<entry>4. </entry>
@@ -128,29 +128,29 @@
 	<tbody>
 	<row>
 		<entry>1. </entry>
+		<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
+		<entry align="center">Aug 2015 - Dec 2020</entry>
+	</row>
+	<row>
+		<entry>2. </entry>
 		<entry>Vlad Patrascu (<ulink url="https://github.com/rvlad-patrascu">@rvlad-patrascu</ulink>)</entry>
 		<entry align="center">May 2017 - Jun 2020</entry>
 	</row>
 	<row>
-		<entry>2. </entry>
+		<entry>3. </entry>
 		<entry>Bogdan-Andrei Iancu (<ulink url="https://github.com/bogdan-iancu">@bogdan-iancu</ulink>)</entry>
 		<entry align="center">Oct 2014 - Mar 2020</entry>
 	</row>
 	<row>
-		<entry>3. </entry>
+		<entry>4. </entry>
 		<entry>Liviu Chircu (<ulink url="https://github.com/liviuchircu">@liviuchircu</ulink>)</entry>
 		<entry align="center">Mar 2014 - Feb 2020</entry>
 	</row>
 	<row>
-		<entry>4. </entry>
+		<entry>5. </entry>
 		<entry>Alessio Garzi (<ulink url="https://github.com/Ozzyboshi">@Ozzyboshi</ulink>)</entry>
 		<entry align="center">Nov 2019 - Dec 2019</entry>
 	</row>
-	<row>
-		<entry>5. </entry>
-		<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
-		<entry align="center">Aug 2015 - Sep 2019</entry>
-	</row>
 	<row>
 		<entry>6. </entry>
 		<entry>Dan Pascu (<ulink url="https://github.com/danpascu">@danpascu</ulink>)</entry>

diff --git a/modules/dialog/README b/modules/dialog/README
@@ -2475,7 +2475,7 @@ Chapter 4. Contributors
    1. Bogdan-Andrei Iancu (@bogdan-iancu) 435 274 12809 3398
    2. Vlad Paiu (@vladpaiu) 252 143 7199 3026
    3. Razvan Crainea (@razvancrainea) 242 180 4715 1397
-   4. Vlad Patrascu (@rvlad-patrascu) 162 83 3405 3116
+   4. Vlad Patrascu (@rvlad-patrascu) 163 84 3406 3117
    5. Liviu Chircu (@liviuchircu) 146 105 2748 1095
    6. Dan Pascu (@danpascu) 30 25 233 179
    7. Ovidiu Sas (@ovidiusas) 29 23 487 111
@@ -2490,11 +2490,12 @@ Chapter 4. Contributors
    Baumann (@jarrodb), Zero King (@l2dy), Michel Bensoussan,
    Richard Revels, Elena-Ramona Modroiu, Tavis Paquette, Andrei
    Datcu (@andrei-datcu), Jeffrey Magder, Ron Winacott, Andy
-   Pyles, Julián Moreno Patiño, Konstantin Bokarius, Alex
-   Massover, Damien Sandras (@dsandras), Alex Hermann, Dusan
-   Klinec (@ph4r05), Norman Brandinger (@NormB), Peter Lemenkov
-   (@lemenkov), UnixDev, Eliot Gable, Ryan Bullock (@rrb3942),
-   Nick Altmann (@nikbyte), Edson Gellert Schubert.
+   Pyles, Julián Moreno Patiño, Maksym Sobolyev (@sobomax),
+   Konstantin Bokarius, Alex Massover, Damien Sandras (@dsandras),
+   Alex Hermann, Dusan Klinec (@ph4r05), Norman Brandinger
+   (@NormB), Peter Lemenkov (@lemenkov), UnixDev, Eliot Gable,
+   Ryan Bullock (@rrb3942), Nick Altmann (@nikbyte), Edson Gellert
+   Schubert.
 
    (1) DevScore = author_commits + author_lines_added /
    (project_lines_added / project_commits) + author_lines_deleted
@@ -2521,24 +2522,25 @@ Chapter 4. Contributors
    3.  Liviu Chircu (@liviuchircu)         Aug 2012 - Nov 2020
    4.  Ovidiu Sas (@ovidiusas)             Feb 2008 - Nov 2020
    5.  Razvan Crainea (@razvancrainea)     Aug 2010 - Nov 2020
-   6.  Vlad Paiu (@vladpaiu)               Oct 2010 - Apr 2020
-   7.  Zero King (@l2dy)                   Mar 2020 - Mar 2020
-   8.  Dan Pascu (@danpascu)               Dec 2007 - Aug 2019
-   9.  Peter Lemenkov (@lemenkov)          Jun 2018 - Jun 2018
-   10. Ionel Cerghit (@ionel-cerghit)      Jul 2015 - Dec 2016
-
-   All remaining contributors: Jarrod Baumann (@jarrodb), Ionut
-   Ionita (@ionutrazvanionita), Julián Moreno Patiño, Dusan Klinec
-   (@ph4r05), Walter Doekes (@wdoekes), Eseanu Marius Cristian
-   (@eseanucristian), Andrei Datcu (@andrei-datcu), Nick Altmann
-   (@nikbyte), Norman Brandinger (@NormB), Damien Sandras
-   (@dsandras), Ryan Bullock (@rrb3942), Anca Vamanu, Alex
-   Massover, Andrei Dragus, John Riordan, Hugues Mitonneau,
-   Richard Revels, UnixDev, Alex Hermann, Henning Westerholt
-   (@henningw), Carsten Bock, Klaus Darilion, Daniel-Constantin
-   Mierla (@miconda), Konstantin Bokarius, Edson Gellert Schubert,
-   Jerome Martin, Tavis Paquette, Michel Bensoussan, Eliot Gable,
-   Andy Pyles, Elena-Ramona Modroiu, Jeffrey Magder, Ron Winacott.
+   6.  Maksym Sobolyev (@sobomax)          Nov 2020 - Nov 2020
+   7.  Vlad Paiu (@vladpaiu)               Oct 2010 - Apr 2020
+   8.  Zero King (@l2dy)                   Mar 2020 - Mar 2020
+   9.  Dan Pascu (@danpascu)               Dec 2007 - Aug 2019
+   10. Peter Lemenkov (@lemenkov)          Jun 2018 - Jun 2018
+
+   All remaining contributors: Ionel Cerghit (@ionel-cerghit),
+   Jarrod Baumann (@jarrodb), Ionut Ionita (@ionutrazvanionita),
+   Julián Moreno Patiño, Dusan Klinec (@ph4r05), Walter Doekes
+   (@wdoekes), Eseanu Marius Cristian (@eseanucristian), Andrei
+   Datcu (@andrei-datcu), Nick Altmann (@nikbyte), Norman
+   Brandinger (@NormB), Damien Sandras (@dsandras), Ryan Bullock
+   (@rrb3942), Anca Vamanu, Alex Massover, Andrei Dragus, John
+   Riordan, Hugues Mitonneau, Richard Revels, UnixDev, Alex
+   Hermann, Henning Westerholt (@henningw), Carsten Bock, Klaus
+   Darilion, Daniel-Constantin Mierla (@miconda), Konstantin
+   Bokarius, Edson Gellert Schubert, Jerome Martin, Tavis
+   Paquette, Michel Bensoussan, Eliot Gable, Andy Pyles,
+   Elena-Ramona Modroiu, Jeffrey Magder, Ron Winacott.
 
    (1) including any documentation-related commits, excluding
    merge commits

diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c
@@ -1356,7 +1356,7 @@ static inline int dlg_update_contact(struct dlg_cell *dlg, struct sip_msg *msg,
 	if ((dlg->mod_flags & TOPOH_ONGOING) &&
 			str_strcmp(&dlg->legs[other_leg(dlg, leg)].adv_contact, &contact_hdr) == 0) {
 		LM_DBG("skip updating topo hiding advertised contact\n");
-		return 0;
+		goto end;
 	}
 
 	if (dlg->legs[leg].contact.s) {