sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

git:master:8ed8d834: db_postgres: safety check of str buffer pointer before writing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8ed8d8349dad1e2abd2ac026b4540e9a296c866b URL: https://github.com/kamailio/kamailio/commit/8ed8d8349dad1e2abd2ac026b4540e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-28T16:09:40+02:00 db_postgres: safety check of str buffer pointer before writing --- Modified: modules/db_postgres/pg_sql.c --- Diff: https://github.com/kamailio/kamailio/commit/8ed8d8349dad1e2abd2ac026b4540e9… Patch: https://github.com/kamailio/kamailio/commit/8ed8d8349dad1e2abd2ac026b4540e9… --- diff --git a/modules/db_postgres/pg_sql.c b/modules/db_postgres/pg_sql.c index 6f64cde..641773e 100644 --- a/modules/db_postgres/pg_sql.c +++ b/modules/db_postgres/pg_sql.c @@ -119,11 +119,11 @@ static inline int sb_add(struct string_buffer *sb, str *nstr) int rsize = sb->len + nstr->len; int asize; char *newp; - + if (rsize > sb->size) { asize = rsize - sb->size; - new_size = sb->size + (asize / sb->increment + - (asize % sb->increment > 0)) * sb->increment; + new_size = sb->size + (asize / sb->increment + + (asize % sb->increment > 0)) * sb->increment; newp = pkg_malloc(new_size); if (!newp) { ERR("postgres: No memory left\n"); @@ -136,8 +136,10 @@ static inline int sb_add(struct string_buffer *sb, str *nstr) sb->s = newp; sb->size = new_size; } - memcpy(sb->s + sb->len, nstr->s, nstr->len); - sb->len += nstr->len; + if(sb->s) { + memcpy(sb->s + sb->len, nstr->s, nstr->len); + sb->len += nstr->len; + } return 0; }

8 years, 1 month

git:master:d7431dd1: lib/srdb1: fix the memset to 0 in util function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d7431dd190bb1f4aba8e2373807047ac6fe8db90 URL: https://github.com/kamailio/kamailio/commit/d7431dd190bb1f4aba8e2373807047a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-28T16:09:40+02:00 lib/srdb1: fix the memset to 0 in util function --- Modified: lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/d7431dd190bb1f4aba8e2373807047a… Patch: https://github.com/kamailio/kamailio/commit/d7431dd190bb1f4aba8e2373807047a… --- diff --git a/lib/srdb1/db_ut.c b/lib/srdb1/db_ut.c index 54c0811..e5048b7 100644 --- a/lib/srdb1/db_ut.c +++ b/lib/srdb1/db_ut.c @@ -358,7 +358,7 @@ int db_print_where(const db1_con_t* _c, char* _b, const int _l, const db_key_t* if (_o && strncmp(_o[i], OP_BITWISE_AND, 1) == 0) { char tmp_buf[16]; int tmp_len = 15; - memset(tmp_buf, '0', 16); + memset(tmp_buf, 0, 16); if ((*val2str)(_c, &(_v[i]), tmp_buf, &tmp_len) < 0) { LM_ERR("Error while converting value to string\n"); return -1;

8 years, 1 month

git:master:0a6c85ff: modules: readme files regenerated - dialog ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 0a6c85ff386ccd9c129e25bddbd1f4cafff2f014 URL: https://github.com/kamailio/kamailio/commit/0a6c85ff386ccd9c129e25bddbd1f4c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-10-28T16:01:16+02:00 modules: readme files regenerated - dialog ... --- Modified: modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/0a6c85ff386ccd9c129e25bddbd1f4c… Patch: https://github.com/kamailio/kamailio/commit/0a6c85ff386ccd9c129e25bddbd1f4c…

8 years, 1 month

git:master:1f25c84e: Merge pull request #831 from Soapnix/dlg_dmq

by GitHub

Module: kamailio Branch: master Commit: 1f25c84eb0145f30ab5cf9c707d05dc56ea16a61 URL: https://github.com/kamailio/kamailio/commit/1f25c84eb0145f30ab5cf9c707d05dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-10-28T15:48:28+02:00 Merge pull request #831 from Soapnix/dlg_dmq dialog: adding dialog replication via DMQ --- Added: modules/dialog/dlg_dmq.c Added: modules/dialog/dlg_dmq.h Modified: modules/dialog/dialog.c Modified: modules/dialog/dlg_db_handler.c Modified: modules/dialog/dlg_handlers.c Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h Modified: modules/dialog/dlg_profile.c Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1f25c84eb0145f30ab5cf9c707d05dc… Patch: https://github.com/kamailio/kamailio/commit/1f25c84eb0145f30ab5cf9c707d05dc…

8 years, 1 month

git:master:586fe44c: dialog: removing unused DMQ variables

by Ivan Myalkin

Module: kamailio Branch: master Commit: 586fe44c5d8ee35d809dbe0ada0640b0773f4f68 URL: https://github.com/kamailio/kamailio/commit/586fe44c5d8ee35d809dbe0ada0640b… Author: Ivan Myalkin <thereisnomorefreelogins(a)gmail.com> Committer: Ivan Myalkin <thereisnomorefreelogins(a)gmail.com> Date: 2016-10-28T14:02:15+03:00 dialog: removing unused DMQ variables Removing unused variables, early created for DMQ sync purposes. --- Modified: modules/dialog/dialog.c Modified: modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/586fe44c5d8ee35d809dbe0ada0640b… Patch: https://github.com/kamailio/kamailio/commit/586fe44c5d8ee35d809dbe0ada0640b… --- diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index f3abb04..bbe8e6f 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -109,8 +109,6 @@ static int _dlg_track_cseq_updates = 0; int dlg_ka_failed_limit = 1; int dlg_enable_dmq = 0; -int dlg_id_offset = 1; -int dlg_id_increment = 1; int dlg_event_rt[DLG_EVENTRT_MAX]; @@ -302,9 +300,6 @@ static param_export_t mod_params[]={ { "db_skip_load", INT_PARAM, &db_skip_load }, { "ka_failed_limit", INT_PARAM, &dlg_ka_failed_limit }, { "enable_dmq", INT_PARAM, &dlg_enable_dmq }, - { "id_offset", INT_PARAM, &dlg_id_offset }, - { "id_increment", INT_PARAM, &dlg_id_increment }, - { 0,0,0 } }; diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index aede715..7652560 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -48,8 +48,6 @@ extern int dlg_ka_interval; extern int dlg_enable_dmq; -extern int dlg_id_offset; -extern int dlg_id_increment; /*! global dialog table */ struct dlg_table *d_table = 0;

8 years, 1 month

git:master:9fe51ed4: Adding dialog replication via DMQ

by Ivan Myalkin

Module: kamailio Branch: master Commit: 9fe51ed408918a85946b919e7101c231e983223b URL: https://github.com/kamailio/kamailio/commit/9fe51ed408918a85946b919e7101c23… Author: Ivan Myalkin <thereisnomorefreelogins(a)gmail.com> Committer: Ivan Myalkin <thereisnomorefreelogins(a)gmail.com> Date: 2016-10-25T12:13:00+03:00 Adding dialog replication via DMQ Updating code base to actual state. Adding repliation for DLG_STATE_EARLY to prevent hanging up unconfirmed dialogs and its infinite replication. Fixing dialog removal on peers to prevent die on timeout and possible infinite replication. Fixing dialog removal on peers when master node cleanly restart. --- Added: modules/dialog/dlg_dmq.c Added: modules/dialog/dlg_dmq.h Modified: modules/dialog/dialog.c Modified: modules/dialog/dlg_db_handler.c Modified: modules/dialog/dlg_handlers.c Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h Modified: modules/dialog/dlg_profile.c Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9fe51ed408918a85946b919e7101c23… Patch: https://github.com/kamailio/kamailio/commit/9fe51ed408918a85946b919e7101c23…

8 years, 1 month

git:master:2ee8fef9: Merge pull request #830 from tverlaan/use_default_port_on_loose_route

by GitHub

Module: kamailio Branch: master Commit: 2ee8fef95b3dcd4b3aa42f2068277c84fbe53bd5 URL: https://github.com/kamailio/kamailio/commit/2ee8fef95b3dcd4b3aa42f2068277c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-10-28T15:44:33+02:00 Merge pull request #830 from tverlaan/use_default_port_on_loose_route rr: default to port 5060 if port is omitted in route header --- Modified: modules/rr/loose.c Modified: socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/2ee8fef95b3dcd4b3aa42f2068277c8… Patch: https://github.com/kamailio/kamailio/commit/2ee8fef95b3dcd4b3aa42f2068277c8… --- diff --git a/modules/rr/loose.c b/modules/rr/loose.c index ef68545..4248a2e 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -827,8 +827,9 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } if (!use_ob) { - si = grep_sock_info( &puri.host, puri.port_no, puri.proto); - if (si) { + if ((si = grep_sock_info( &puri.host, puri.port_no?puri.port_no:proto_default_port(puri.proto), puri.proto)) != 0) { + set_force_socket(_m, si); + } else if ((si = grep_sock_info( &puri.host, puri.port_no, puri.proto)) != 0) { set_force_socket(_m, si); } else { if (enable_socket_mismatch_warning) { diff --git a/socket_info.h b/socket_info.h index eec9dd4..03225ac 100644 --- a/socket_info.h +++ b/socket_info.h @@ -44,6 +44,8 @@ int socket2str(char* s, int* len, struct socket_info* si); int socketinfo2str(char* s, int* len, struct socket_info* si, int mode); +/* Helper macro that results in the default port based on the protocol */ +#define proto_default_port(proto) ((proto==PROTO_TLS)?SIPS_PORT:SIP_PORT) /* struct socket_info is defined in ip_addr.h */

8 years, 1 month

git:master:aaec127f: rr: use default port for protocol if it is omitted in route header

by Timmo Verlaan

Module: kamailio Branch: master Commit: aaec127fbf1f3be41e49601330d7eafe7353c53a URL: https://github.com/kamailio/kamailio/commit/aaec127fbf1f3be41e49601330d7eaf… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2016-10-28T14:56:54+02:00 rr: use default port for protocol if it is omitted in route header When using double route headers the selection of the outgoing socket is only done on IP address if the port is omitted in that route header. This fix defaults the port to 5060/5061 depending on protocol so the correct listen socket is chosen. When no socket is found it will fallback to the current behaviour keeping backwards interoperability. --- Modified: modules/rr/loose.c Modified: socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/aaec127fbf1f3be41e49601330d7eaf… Patch: https://github.com/kamailio/kamailio/commit/aaec127fbf1f3be41e49601330d7eaf… --- diff --git a/modules/rr/loose.c b/modules/rr/loose.c index 71d7d43..a0054ba 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -827,8 +827,9 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } if (!use_ob) { - si = grep_sock_info( &puri.host, puri.port_no, puri.proto); - if (si) { + if ((si = grep_sock_info( &puri.host, puri.port_no?puri.port_no:proto_default_port(puri.proto), puri.proto)) != 0) { + set_force_socket(_m, si); + } else if ((si = grep_sock_info( &puri.host, puri.port_no, puri.proto)) != 0) { set_force_socket(_m, si); } else { if (enable_socket_mismatch_warning) diff --git a/socket_info.h b/socket_info.h index eec9dd4..03225ac 100644 --- a/socket_info.h +++ b/socket_info.h @@ -44,6 +44,8 @@ int socket2str(char* s, int* len, struct socket_info* si); int socketinfo2str(char* s, int* len, struct socket_info* si, int mode); +/* Helper macro that results in the default port based on the protocol */ +#define proto_default_port(proto) ((proto==PROTO_TLS)?SIPS_PORT:SIP_PORT) /* struct socket_info is defined in ip_addr.h */

8 years, 1 month

[kamailio/kamailio] rr: default to port 5060 if port is omitted in route header (#830)

by Timmo Verlaan

When using double route headers the selection of the outgoing socket is only done on IP address if the port is omitted in that route header. This fix defaults the port to 5060 so the correct listen socket is chosen. When no socket is found it will fallback to the current behaviour keeping backwards compatibility. If backwards compatibility is not required the extra 'if else' could be removed. I'm not sure if `loose_route()` is being used in this way so I opted for keeping backwards compatibility. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/830 -- Commit Summary -- * rr: default to port 5060 if port is omitted in route header -- File Changes -- M modules/rr/loose.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/830.patch https://github.com/kamailio/kamailio/pull/830.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/830

8 years, 1 month

[kamailio/kamailio] pv: Use memcpy to copy len bytes instead of strcpy (#832)

by Holger Freyther

The sipcapture plugin stores bytes with VAR_VAL_STR and when copying the data it would end up being truncated. Use memcpy instead of strncpy and assume that the original string already has the NUL termination (or not as with the hep plugin). Config example: $var(payload) = hep(0x00f) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/832 -- Commit Summary -- * pv: Use memcpy to copy len bytes instead of strcpy -- File Changes -- M modules/pv/pv_svar.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/832.patch https://github.com/kamailio/kamailio/pull/832.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/832

8 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016