Skip to content

Commit

Permalink
Merge branch 'OpenSIPS:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Integration-IT
Integration-IT committed Aug 17, 2023
2 parents e0c9572 + 3aeeee4 commit b5050f1
Show file tree
Hide file tree
Showing 14 changed files with 155 additions and 122 deletions.
2 changes: 1 addition & 1 deletion modules/db_perlvdb/perlvdb_conv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ AV *keys2perlarray(db_key_t* keys, int n) {
return array;
}

inline SV *valdata(db_val_t* val) {
static inline SV *valdata(db_val_t* val) {
SV *data = &PL_sv_undef;
const char* stringval;

Expand Down
13 changes: 11 additions & 2 deletions modules/db_sqlite/res.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,9 @@ int db_sqlite_allocate_rows(db_res_t* res, const unsigned int rows)
*/
int db_sqlite_realloc_rows(db_res_t* res, const unsigned int rows)
{
unsigned int i;
unsigned int i, start;
struct db_row* res_rows;
db_val_t *prev_values;

res->rows = pkg_realloc(RES_ROWS(res),rows * (sizeof(db_row_t)));
memset( res->rows + RES_ROW_N(res), 0 ,
Expand All @@ -308,17 +309,25 @@ int db_sqlite_realloc_rows(db_res_t* res, const unsigned int rows)
return -1;
}

prev_values = res_rows[0].values;

res_rows[0].values =
pkg_realloc(res_rows[0].values, rows * sizeof(db_val_t) * RES_COL_N(res));
memset( res_rows[0].values + RES_COL_N(res)*RES_ROW_N(res),
0, (rows - RES_ROW_N(res)) * sizeof(db_val_t) * RES_COL_N(res));

if (! res_rows[0].values) {
LM_ERR("no memory left\n");
res_rows[0].values = prev_values;
return -1;
}

for( i=RES_ROW_N(res) ; i<rows ; i++ ) {
/* if the values was relocated, we need to re-point all values to the new block,
* otherwise only fix the new ones */
start = (res_rows[0].values == prev_values?RES_ROW_N(res):0);
start = RES_ROW_N(res);

for( i=start ; i<rows ; i++ ) {
/* the values of the row i */
res_rows[i].values = res_rows[0].values + RES_COL_N(res)*i;
res->rows[i].n = RES_COL_N(res);
Expand Down
8 changes: 4 additions & 4 deletions modules/prometheus/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ Chapter 2. Contributors
Table 2.1. Top contributors by DevScore^(1), authored
commits^(2) and lines added/removed^(3)
Name DevScore Commits Lines ++ Lines --
1. Razvan Crainea (@razvancrainea) 29 15 1281 152
1. Razvan Crainea (@razvancrainea) 30 16 1282 152
2. Maksym Sobolyev (@sobomax) 4 2 2 3
3. Liviu Chircu (@liviuchircu) 3 1 1 1
4. OpenSIPS 3 1 1 1
Expand All @@ -283,9 +283,9 @@ Chapter 2. Contributors

Table 2.2. Most recently active contributors^(1) to this module
Name Commit Activity
1. Maksym Sobolyev (@sobomax) Feb 2023 - Feb 2023
2. Liviu Chircu (@liviuchircu) Aug 2022 - Aug 2022
3. Razvan Crainea (@razvancrainea) Feb 2021 - Jan 2022
1. Razvan Crainea (@razvancrainea) Feb 2021 - Aug 2023
2. Maksym Sobolyev (@sobomax) Feb 2023 - Feb 2023
3. Liviu Chircu (@liviuchircu) Aug 2022 - Aug 2022
4. OpenSIPS Feb 2021 - Feb 2021

(1) including any documentation-related commits, excluding
Expand Down
18 changes: 9 additions & 9 deletions modules/prometheus/doc/contributors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<row>
<entry>1. </entry>
<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
<entry align="center">29</entry>
<entry align="center">15</entry>
<entry align="center">1281</entry>
<entry align="center">30</entry>
<entry align="center">16</entry>
<entry align="center">1282</entry>
<entry align="center">152</entry>
</row>
<row>
Expand Down Expand Up @@ -80,18 +80,18 @@
<tbody>
<row>
<entry>1. </entry>
<entry>Maksym Sobolyev (<ulink url="https://github.com/sobomax">@sobomax</ulink>)</entry>
<entry align="center">Feb 2023 - Feb 2023</entry>
<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
<entry align="center">Feb 2021 - Aug 2023</entry>
</row>
<row>
<entry>2. </entry>
<entry>Liviu Chircu (<ulink url="https://github.com/liviuchircu">@liviuchircu</ulink>)</entry>
<entry align="center">Aug 2022 - Aug 2022</entry>
<entry>Maksym Sobolyev (<ulink url="https://github.com/sobomax">@sobomax</ulink>)</entry>
<entry align="center">Feb 2023 - Feb 2023</entry>
</row>
<row>
<entry>3. </entry>
<entry>Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>)</entry>
<entry align="center">Feb 2021 - Jan 2022</entry>
<entry>Liviu Chircu (<ulink url="https://github.com/liviuchircu">@liviuchircu</ulink>)</entry>
<entry align="center">Aug 2022 - Aug 2022</entry>
</row>
<row>
<entry>4. </entry>
Expand Down
62 changes: 33 additions & 29 deletions modules/proto_hep/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ Chapter 1. Admin Guide

Once loaded, you will be able to define HEP listeners in your
configuration file by adding their IP and, optionally, a
listening port. You can define both TCP and UDP listeners. On
UDP you will be able to receive HEP v1, v2 and v3 packets, on
TCP only HEPv3.
listening port. You can define both TCP, UDP, and TLS
listeners. On UDP you will be able to receive HEP v1, v2 and v3
packets, on TCP and TLS only HEPv3.

...
#HEPv3 listener
Expand Down Expand Up @@ -117,13 +117,13 @@ socket= hep_udp:127.0.0.1:6061 # change the listening IP
by ;. The parameters are given in key-value format, the
possible keys being uri, transport and version, except
destiantion's URI which doesn't have a key and is in host:port
. transport key can be TCP or UDP. TCP works only for HEP
version 3. Version is the hep protocol version and can be 1, 2
or 3.
. transport key can be TCP, UDP or TLS. TCP and TLS works only
for HEP version 3. Version is the hep protocol version and can
be 1, 2 or 3.

HEPv1 and HEPv2 can use only UDP. HEPv3 can use both TCP and
UDP having the default set to TCP. If no hep version defined,
the default is version 3 with TCP.
HEPv1 and HEPv2 can use only UDP. HEPv3 can use TCP, UDP and
TLS having the default set to TCP. If no hep version defined,
the default is version 3 with TCP and TLS.

NO default value. If hep_id the module can't be used for HEP
tracing.
Expand Down Expand Up @@ -167,7 +167,7 @@ modparam("proto_hep", "homer5_delim", "##")

1.3.4. hep_port (integer)

The default port to be used by all TCP/UDP listeners.
The default port to be used by all TCP/UDP/TLS listeners.

Default value is 5656.

Expand Down Expand Up @@ -354,12 +354,14 @@ Chapter 3. Contributors
2. Razvan Crainea (@razvancrainea) 36 27 83 486
3. Bogdan-Andrei Iancu (@bogdan-iancu) 26 19 384 170
4. Liviu Chircu (@liviuchircu) 18 15 81 92
5. Vlad Patrascu (@rvlad-patrascu) 7 4 36 84
6. Maksym Sobolyev (@sobomax) 4 2 4 4
7. Nick Altmann (@nikbyte) 3 1 2 2
8. Dan Pascu (@danpascu) 3 1 1 1
9. Peter Lemenkov (@lemenkov) 3 1 1 1
10. Walter Doekes (@wdoekes) 3 1 1 1
5. Bence Szigeti 8 1 404 179
6. Vlad Patrascu (@rvlad-patrascu) 7 4 36 84
7. Maksym Sobolyev (@sobomax) 4 2 4 4
8. Nick Altmann (@nikbyte) 3 1 2 2
9. Dan Pascu (@danpascu) 3 1 1 1
10. Peter Lemenkov (@lemenkov) 3 1 1 1

All remaining contributors: Walter Doekes (@wdoekes).

(1) DevScore = author_commits + author_lines_added /
(project_lines_added / project_commits) + author_lines_deleted
Expand All @@ -382,15 +384,17 @@ Chapter 3. Contributors
Table 3.2. Most recently active contributors^(1) to this module
Name Commit Activity
1. Razvan Crainea (@razvancrainea) Nov 2015 - Jul 2023
2. Maksym Sobolyev (@sobomax) Feb 2023 - Feb 2023
3. Liviu Chircu (@liviuchircu) Mar 2016 - Oct 2022
4. Nick Altmann (@nikbyte) May 2021 - May 2021
5. Bogdan-Andrei Iancu (@bogdan-iancu) Jan 2017 - Apr 2021
6. Walter Doekes (@wdoekes) May 2020 - May 2020
7. Dan Pascu (@danpascu) May 2019 - May 2019
8. Vlad Patrascu (@rvlad-patrascu) May 2017 - Apr 2019
9. Peter Lemenkov (@lemenkov) Jun 2018 - Jun 2018
10. Ionut Ionita (@ionutrazvanionita) Oct 2015 - Apr 2017
2. Bence Szigeti Jul 2023 - Jul 2023
3. Maksym Sobolyev (@sobomax) Feb 2023 - Feb 2023
4. Liviu Chircu (@liviuchircu) Mar 2016 - Oct 2022
5. Nick Altmann (@nikbyte) May 2021 - May 2021
6. Bogdan-Andrei Iancu (@bogdan-iancu) Jan 2017 - Apr 2021
7. Walter Doekes (@wdoekes) May 2020 - May 2020
8. Dan Pascu (@danpascu) May 2019 - May 2019
9. Vlad Patrascu (@rvlad-patrascu) May 2017 - Apr 2019
10. Peter Lemenkov (@lemenkov) Jun 2018 - Jun 2018

All remaining contributors: Ionut Ionita (@ionutrazvanionita).

(1) including any documentation-related commits, excluding
merge commits
Expand All @@ -399,10 +403,10 @@ Chapter 4. Documentation

4.1. Contributors

Last edited by: Bogdan-Andrei Iancu (@bogdan-iancu), Liviu
Chircu (@liviuchircu), Razvan Crainea (@razvancrainea), Vlad
Patrascu (@rvlad-patrascu), Peter Lemenkov (@lemenkov), Ionut
Ionita (@ionutrazvanionita).
Last edited by: Bence Szigeti, Bogdan-Andrei Iancu
(@bogdan-iancu), Liviu Chircu (@liviuchircu), Razvan Crainea
(@razvancrainea), Vlad Patrascu (@rvlad-patrascu), Peter
Lemenkov (@lemenkov), Ionut Ionita (@ionutrazvanionita).

Documentation Copyrights:

Expand Down
54 changes: 27 additions & 27 deletions modules/proto_hep/doc/contributors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,47 +52,47 @@
</row>
<row>
<entry>5. </entry>
<entry>Bence Szigeti</entry>
<entry align="center">8</entry>
<entry align="center">1</entry>
<entry align="center">404</entry>
<entry align="center">179</entry>
</row>
<row>
<entry>6. </entry>
<entry>Vlad Patrascu (<ulink url="https://github.com/rvlad-patrascu">@rvlad-patrascu</ulink>)</entry>
<entry align="center">7</entry>
<entry align="center">4</entry>
<entry align="center">36</entry>
<entry align="center">84</entry>
</row>
<row>
<entry>6. </entry>
<entry>7. </entry>
<entry>Maksym Sobolyev (<ulink url="https://github.com/sobomax">@sobomax</ulink>)</entry>
<entry align="center">4</entry>
<entry align="center">2</entry>
<entry align="center">4</entry>
<entry align="center">4</entry>
</row>
<row>
<entry>7. </entry>
<entry>8. </entry>
<entry>Nick Altmann (<ulink url="https://github.com/nikbyte">@nikbyte</ulink>)</entry>
<entry align="center">3</entry>
<entry align="center">1</entry>
<entry align="center">2</entry>
<entry align="center">2</entry>
</row>
<row>
<entry>8. </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">1</entry>
<entry align="center">1</entry>
</row>
<row>
<entry>9. </entry>
<entry>Peter Lemenkov (<ulink url="https://github.com/lemenkov">@lemenkov</ulink>)</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">1</entry>
<entry align="center">1</entry>
</row>
<row>
<entry>10. </entry>
<entry>Walter Doekes (<ulink url="https://github.com/wdoekes">@wdoekes</ulink>)</entry>
<entry>Peter Lemenkov (<ulink url="https://github.com/lemenkov">@lemenkov</ulink>)</entry>
<entry align="center">3</entry>
<entry align="center">1</entry>
<entry align="center">1</entry>
Expand All @@ -101,7 +101,7 @@
</tbody>
</tgroup>
</table>

<para><emphasis role='bold'>All remaining contributors</emphasis>: 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>
Expand Down Expand Up @@ -133,53 +133,53 @@
</row>
<row>
<entry>2. </entry>
<entry>Bence Szigeti</entry>
<entry align="center">Jul 2023 - Jul 2023</entry>
</row>
<row>
<entry>3. </entry>
<entry>Maksym Sobolyev (<ulink url="https://github.com/sobomax">@sobomax</ulink>)</entry>
<entry align="center">Feb 2023 - Feb 2023</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 2016 - Oct 2022</entry>
</row>
<row>
<entry>4. </entry>
<entry>5. </entry>
<entry>Nick Altmann (<ulink url="https://github.com/nikbyte">@nikbyte</ulink>)</entry>
<entry align="center">May 2021 - May 2021</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">Jan 2017 - Apr 2021</entry>
</row>
<row>
<entry>6. </entry>
<entry>7. </entry>
<entry>Walter Doekes (<ulink url="https://github.com/wdoekes">@wdoekes</ulink>)</entry>
<entry align="center">May 2020 - May 2020</entry>
</row>
<row>
<entry>7. </entry>
<entry>8. </entry>
<entry>Dan Pascu (<ulink url="https://github.com/danpascu">@danpascu</ulink>)</entry>
<entry align="center">May 2019 - May 2019</entry>
</row>
<row>
<entry>8. </entry>
<entry>9. </entry>
<entry>Vlad Patrascu (<ulink url="https://github.com/rvlad-patrascu">@rvlad-patrascu</ulink>)</entry>
<entry align="center">May 2017 - Apr 2019</entry>
</row>
<row>
<entry>9. </entry>
<entry>10. </entry>
<entry>Peter Lemenkov (<ulink url="https://github.com/lemenkov">@lemenkov</ulink>)</entry>
<entry align="center">Jun 2018 - Jun 2018</entry>
</row>
<row>
<entry>10. </entry>
<entry>Ionut Ionita (<ulink url="https://github.com/ionutrazvanionita">@ionutrazvanionita</ulink>)</entry>
<entry align="center">Oct 2015 - Apr 2017</entry>
</row>
</tbody>
</tgroup>
</table>

<para><emphasis role='bold'>All remaining contributors</emphasis>: Ionut Ionita (<ulink url="https://github.com/ionutrazvanionita">@ionutrazvanionita</ulink>).</para>
<para>
<emphasis>(1) including any documentation-related commits, excluding merge commits</emphasis>
</para>
Expand All @@ -190,7 +190,7 @@
<title>Documentation</title>
<section id="documentation_contributors" xreflabel="documentation_contributors">
<title>Contributors</title>
<para><emphasis role='bold'>Last edited by:</emphasis> Bogdan-Andrei Iancu (<ulink url="https://github.com/bogdan-iancu">@bogdan-iancu</ulink>), Liviu Chircu (<ulink url="https://github.com/liviuchircu">@liviuchircu</ulink>), Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>), Vlad Patrascu (<ulink url="https://github.com/rvlad-patrascu">@rvlad-patrascu</ulink>), Peter Lemenkov (<ulink url="https://github.com/lemenkov">@lemenkov</ulink>), Ionut Ionita (<ulink url="https://github.com/ionutrazvanionita">@ionutrazvanionita</ulink>).</para>
<para><emphasis role='bold'>Last edited by:</emphasis> Bence Szigeti, Bogdan-Andrei Iancu (<ulink url="https://github.com/bogdan-iancu">@bogdan-iancu</ulink>), Liviu Chircu (<ulink url="https://github.com/liviuchircu">@liviuchircu</ulink>), Razvan Crainea (<ulink url="https://github.com/razvancrainea">@razvancrainea</ulink>), Vlad Patrascu (<ulink url="https://github.com/rvlad-patrascu">@rvlad-patrascu</ulink>), Peter Lemenkov (<ulink url="https://github.com/lemenkov">@lemenkov</ulink>), Ionut Ionita (<ulink url="https://github.com/ionutrazvanionita">@ionutrazvanionita</ulink>).</para>
</section>

</chapter>
9 changes: 5 additions & 4 deletions modules/rtp_relay/rtp_relay_ctx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ static inline void rtp_relay_push_sess_leg(struct rtp_relay_sess *sess,
leg->peer = sess->legs[RTP_RELAY_PEER(type)];
if (leg->peer)
sess->legs[RTP_RELAY_PEER(type)]->peer = leg;
leg->ref++;
}

static inline void rtp_relay_fill_sess_leg(struct rtp_relay_ctx *ctx,
Expand Down Expand Up @@ -1735,8 +1736,8 @@ static int handle_rtp_relay_ctx_leg_reply(struct rtp_relay_ctx *ctx,
return -1;
} else {
if (!sess->legs[type]) {
sess->legs[type] = rtp_relay_new_leg(ctx,
&get_to(msg)->tag_value, sess->index);
rtp_relay_push_sess_leg(sess, rtp_relay_new_leg(ctx,
&get_to(msg)->tag_value, sess->index), type);
if (!sess->legs[type]) {
LM_ERR("could not create new leg\n");
return -1;
Expand Down Expand Up @@ -1896,8 +1897,8 @@ int rtp_relay_ctx_engage(struct sip_msg *msg,
sess = rtp_relay_new_sess(ctx, relay, set,
&get_from(msg)->tag_value, index);
if (!sess->legs[RTP_RELAY_CALLER])
sess->legs[RTP_RELAY_CALLER] = rtp_relay_new_leg(ctx,
&get_from(msg)->tag_value, index);
rtp_relay_push_sess_leg(sess, rtp_relay_new_leg(ctx,
&get_from(msg)->tag_value, index), RTP_RELAY_CALLER);
} else {
leg = rtp_relay_get_peer_leg_ctx(ctx, msg);
if (!leg) {
Expand Down
4 changes: 3 additions & 1 deletion modules/rtpengine/doc/rtpengine_admin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@
<title><varname>rtpengine_sock</varname> (string)</title>
<para>
Definition of socket(s) used to connect to (a set) &rtp; proxy. It may
specify a UNIX socket or an IPv4/IPv6 UDP socket.
specify a UNIX socket or an IPv4/IPv6 UDP socket. If the protocol part
(i.e. <quote>udp:</quote>) is missing, the socket is treated as a
UNIX socket.
</para>
<para>
<emphasis>
Expand Down

0 comments on commit b5050f1

Please sign in to comment.