Skip to content

Commit cca8ac9

Browse files
benceszigetibenceszigeti
committed
Merge branch '3.4' into TELECOM-11229
2 parents 92328ad + cbccb4a commit cca8ac9

100 files changed

Lines changed: 1291 additions & 484 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ChangeLog‎

Lines changed: 608 additions & 0 deletions
Large diffs are not rendered by default.

‎Makefile.defs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ MAIN_NAME=opensips
6666
#version number
6767
VERSION_MAJOR = 3
6868
VERSION_MINOR = 4
69-
VERSION_SUBMINOR = 11
69+
VERSION_SUBMINOR = 13
7070
VERSION_BUILD =
7171

7272
ifneq (,$(VERSION_BUILD))

‎db/db.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#include "db_cap.h"
4747
#include "db_row.h"
4848
#include "db_ps.h"
49+
#include "db_pool.h"
4950
#include "../globals.h"
5051

5152
extern stat_var *sql_total_queries;
@@ -393,7 +394,7 @@ int db_bind_mod(const str* mod, db_func_t* dbf);
393394
* \return returns a pointer to the db_con_t representing the connection if it was
394395
successful, otherwise 0 is returned.
395396
*/
396-
db_con_t* db_do_init(const str* url, void* (*new_connection)());
397+
db_con_t* db_do_init(const str* url, void* (*new_connection)(const struct db_id *));
397398

398399

399400
/**
@@ -404,7 +405,7 @@ db_con_t* db_do_init(const str* url, void* (*new_connection)());
404405
* \param _h database connection handle
405406
* \param (*free_connection) Pointer to the db specifc free_connection method
406407
*/
407-
void db_do_close(db_con_t* _h, void (*free_connection)());
408+
void db_do_close(db_con_t* _h, void (*free_connection)(struct pool_con*));
408409

409410

410411
/**

‎modules/aaa_diameter/README‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ Chapter 2. Contributors
291291
Name DevScore Commits Lines ++ Lines --
292292
1. Liviu Chircu (@liviuchircu) 91 26 5928 960
293293
2. Razvan Crainea (@razvancrainea) 11 8 233 35
294-
3. Maksym Sobolyev (@sobomax) 3 1 5 5
294+
3. Larry Laffer 3 1 6 5
295+
4. Maksym Sobolyev (@sobomax) 3 1 5 5
295296

296297
(1) DevScore = author_commits + author_lines_added /
297298
(project_lines_added / project_commits) + author_lines_deleted
@@ -313,9 +314,10 @@ Chapter 2. Contributors
313314

314315
Table 2.2. Most recently active contributors^(1) to this module
315316
Name Commit Activity
316-
1. Liviu Chircu (@liviuchircu) May 2021 - Feb 2024
317-
2. Razvan Crainea (@razvancrainea) May 2023 - May 2023
318-
3. Maksym Sobolyev (@sobomax) Feb 2023 - Feb 2023
317+
1. Larry Laffer Jul 2025 - Jul 2025
318+
2. Liviu Chircu (@liviuchircu) May 2021 - Feb 2024
319+
3. Razvan Crainea (@razvancrainea) May 2023 - May 2023
320+
4. Maksym Sobolyev (@sobomax) Feb 2023 - Feb 2023
319321

320322
(1) including any documentation-related commits, excluding
321323
merge commits

‎modules/aaa_diameter/aaa_impl.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,11 @@ static int dm_avps2json(void *root, cJSON *avps)
240240
memset(&ar, 0, sizeof ar);
241241
ar.avp_code = h->avp_code;
242242
ar.avp_vendor = h->avp_vendor;
243-
FD_CHECK_GT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP, AVP_BY_CODE_AND_VENDOR,
244-
&ar, &obj, ENOENT));
243+
__FD_CHECK_GT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP, AVP_BY_CODE_AND_VENDOR,
244+
&ar, &obj, ENOENT), 0, skip);
245245
} else {
246-
FD_CHECK_GT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP, AVP_BY_CODE,
247-
&h->avp_code, &obj, ENOENT));
246+
__FD_CHECK_GT(fd_dict_search(fd_g_config->cnf_dict, DICT_AVP, AVP_BY_CODE,
247+
&h->avp_code, &obj, ENOENT), 0, skip);
248248
}
249249
FD_CHECK_GT(fd_dict_getval(obj, &dm_avp));
250250

@@ -329,6 +329,7 @@ static int dm_avps2json(void *root, cJSON *avps)
329329
cJSON_AddItemToObject(item, dm_avp.avp_name, val);
330330
cJSON_AddItemToArray(avps, item);
331331

332+
skip:
332333
FD_CHECK_GT(fd_msg_browse(it, MSG_BRW_NEXT, &it, NULL));
333334
i++;
334335
}
@@ -339,7 +340,7 @@ static int dm_avps2json(void *root, cJSON *avps)
339340
out:
340341
cJSON_Delete(item);
341342

342-
LM_DBG("------------ END AVP iteration ----------------\n");
343+
LM_DBG("------------ END AVP iteration (failure) ----------------\n");
343344
return -1;
344345
}
345346

‎modules/aaa_diameter/doc/contributors.xml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@
3636
</row>
3737
<row>
3838
<entry>3. </entry>
39+
<entry>Larry Laffer</entry>
40+
<entry align="center">3</entry>
41+
<entry align="center">1</entry>
42+
<entry align="center">6</entry>
43+
<entry align="center">5</entry>
44+
</row>
45+
<row>
46+
<entry>4. </entry>
3947
<entry>Maksym Sobolyev (<ulink url="https://github.com/sobomax">@sobomax</ulink>)</entry>
4048
<entry align="center">3</entry>
4149
<entry align="center">1</entry>
@@ -72,16 +80,21 @@
7280
<tbody>
7381
<row>
7482
<entry>1. </entry>
83+
<entry>Larry Laffer</entry>
84+
<entry align="center">Jul 2025 - Jul 2025</entry>
85+
</row>
86+
<row>
87+
<entry>2. </entry>
7588
<entry>Liviu Chircu (<ulink url="https://github.com/liviuchircu">@liviuchircu</ulink>)</entry>
7689
<entry align="center">May 2021 - Feb 2024</entry>
7790
</row>
7891
<row>
79-
<entry>2. </entry>
92+
<entry>3. </entry>
8093
<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
8194
<entry align="center">May 2023 - May 2023</entry>
8295
</row>
8396
<row>
84-
<entry>3. </entry>
97+
<entry>4. </entry>
8598
<entry>Maksym Sobolyev (<ulink url="https://github.com/sobomax">@sobomax</ulink>)</entry>
8699
<entry align="center">Feb 2023 - Feb 2023</entry>
87100
</row>

‎modules/b2b_entities/dlg.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,6 +1862,8 @@ int _b2b_send_reply(b2b_dlg_t* dlg, b2b_rpl_data_t* rpl_data)
18621862
LM_DBG("Reset transaction- send final reply [%p], uas_tran=0\n", dlg);
18631863
if(sip_method == METHOD_UPDATE)
18641864
dlg->update_tran = NULL;
1865+
else if (sip_method == METHOD_PRACK)
1866+
dlg->prack_tran = NULL;
18651867
else
18661868
dlg->uas_tran = NULL;
18671869
}

‎modules/b2b_logic/README‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ Chapter 3. Contributors
12421242
commits^(2) and lines added/removed^(3)
12431243
Name DevScore Commits Lines ++ Lines --
12441244
1. Vlad Patrascu (@rvlad-patrascu) 235 57 8167 6793
1245-
2. Razvan Crainea (@razvancrainea) 36 25 810 237
1245+
2. Razvan Crainea (@razvancrainea) 37 26 811 238
12461246
3. Bogdan-Andrei Iancu (@bogdan-iancu) 16 12 148 72
12471247
4. Nick Altmann (@nikbyte) 14 10 346 36
12481248
5. Carsten Bock 12 5 679 23
@@ -1274,8 +1274,8 @@ Chapter 3. Contributors
12741274

12751275
Table 3.2. Most recently active contributors^(1) to this module
12761276
Name Commit Activity
1277-
1. Bogdan-Andrei Iancu (@bogdan-iancu) Apr 2021 - Jan 2025
1278-
2. Razvan Crainea (@razvancrainea) Jan 2021 - Jan 2025
1277+
1. Razvan Crainea (@razvancrainea) Jan 2021 - Jun 2025
1278+
2. Bogdan-Andrei Iancu (@bogdan-iancu) Apr 2021 - Jan 2025
12791279
3. Liviu Chircu (@liviuchircu) Nov 2020 - Feb 2024
12801280
4. Vlad Patrascu (@rvlad-patrascu) Nov 2020 - Jul 2023
12811281
5. Shanee Vanstone Apr 2023 - Apr 2023

‎modules/b2b_logic/b2b_logic.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,7 @@ static b2bl_tuple_t *ctx_search_tuple(struct b2b_context *ctx, int *locked)
14751475
if (!tuple) {
14761476
LM_ERR("Tuple [%u, %u] not found\n", ctx->hash_index, ctx->local_index);
14771477
B2BL_LOCK_RELEASE_AUX(ctx->hash_index);
1478-
locked = 0;
1478+
*locked = 0;
14791479
return NULL;
14801480
}
14811481

‎modules/b2b_logic/doc/contributors.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
<row>
3030
<entry>2. </entry>
3131
<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
32-
<entry align="center">36</entry>
33-
<entry align="center">25</entry>
34-
<entry align="center">810</entry>
35-
<entry align="center">237</entry>
32+
<entry align="center">37</entry>
33+
<entry align="center">26</entry>
34+
<entry align="center">811</entry>
35+
<entry align="center">238</entry>
3636
</row>
3737
<row>
3838
<entry>3. </entry>
@@ -128,13 +128,13 @@
128128
<tbody>
129129
<row>
130130
<entry>1. </entry>
131-
<entry>Bogdan-Andrei Iancu (<ulink url="https://github.com/bogdan-iancu">@bogdan-iancu</ulink>)</entry>
132-
<entry align="center">Apr 2021 - Jan 2025</entry>
131+
<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
132+
<entry align="center">Jan 2021 - Jun 2025</entry>
133133
</row>
134134
<row>
135135
<entry>2. </entry>
136-
<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
137-
<entry align="center">Jan 2021 - Jan 2025</entry>
136+
<entry>Bogdan-Andrei Iancu (<ulink url="https://github.com/bogdan-iancu">@bogdan-iancu</ulink>)</entry>
137+
<entry align="center">Apr 2021 - Jan 2025</entry>
138138
</row>
139139
<row>
140140
<entry>3. </entry>

0 commit comments

Comments
 (0)