sr-dev

sr-dev@lists.kamailio.org

17 participants
45417 discussions

Re: [sr-dev] [kamailio/kamailio] usrloc: renamed dmq specific flag from FL_RPL to FL_DMQRPL (0640853)
by Charles Chance 19 Jan '18

19 Jan '18

I think the flag can be removed completely. It is unused since b5f94a9. -- 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/commit/0640853223af068f191fea62790e00d…

1 0

git:master:68c476bc: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 19 Jan '18

19 Jan '18

Module: kamailio Branch: master Commit: 68c476bcba8e49bc02a13beda431678d93cb2d47 URL: https://github.com/kamailio/kamailio/commit/68c476bcba8e49bc02a13beda431678… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-19T11:31:33+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/68c476bcba8e49bc02a13beda431678… Patch: https://github.com/kamailio/kamailio/commit/68c476bcba8e49bc02a13beda431678… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index fb7646597f..58fe8f7d80 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -89,6 +89,7 @@ Carsten Bock 3.43. db_insert_null (int) 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) + 3.46. rm_expired_delay (int) 4. RPC Commands @@ -181,6 +182,7 @@ Carsten Bock 1.43. Set db_insert_null parameter 1.44. Set skip_remote_socket parameter 1.45. Set db_timer_clean parameter + 1.46. Set rm_expired_delay parameter Chapter 1. Admin Guide @@ -242,6 +244,7 @@ Chapter 1. Admin Guide 3.43. db_insert_null (int) 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) + 3.46. rm_expired_delay (int) 4. RPC Commands @@ -367,6 +370,7 @@ Chapter 1. Admin Guide 3.43. db_insert_null (int) 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) + 3.46. rm_expired_delay (int) 3.1. nat_bflag (integer) @@ -980,6 +984,18 @@ modparam("usrloc", "skip_remote_socket", 1) modparam("usrloc", "db_timer_clean", 1) ... +3.46. rm_expired_delay (int) + + Specify the number of seconds to delay the removal of expired records. + For now it works for DB_ONLY mode (db_mode=3). + + Default value is “0”. + + Example 1.46. Set rm_expired_delay parameter +... +modparam("usrloc", "rm_expired_delay", 30) +... + 4. RPC Commands 4.1. ul.dump

1 0

Errored: kamailio/kamailio#5396 (master - 50c3c0d)
by Travis CI 19 Jan '18

19 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5396 Status: Errored Duration: 11 minutes and 14 seconds Commit: 50c3c0d (master) Author: Daniel-Constantin Mierla Message: usrloc: documentation for rm_expired_delay parameter View the changeset: https://github.com/kamailio/kamailio/compare/72bbf9280879...50c3c0d0bb40 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/330742851?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:50c3c0d0: usrloc: documentation for rm_expired_delay parameter
by Daniel-Constantin Mierla 19 Jan '18

19 Jan '18

Module: kamailio Branch: master Commit: 50c3c0d0bb404f1fbd3d618042aa7c2f3533d7b0 URL: https://github.com/kamailio/kamailio/commit/50c3c0d0bb404f1fbd3d618042aa7c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T11:16:04+01:00 usrloc: documentation for rm_expired_delay parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/50c3c0d0bb404f1fbd3d618042aa7c2… Patch: https://github.com/kamailio/kamailio/commit/50c3c0d0bb404f1fbd3d618042aa7c2… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 96ff750f97..608a85edf1 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1177,6 +1177,27 @@ modparam("usrloc", "db_timer_clean", 1) </example> </section> + <section id="usrloc.p.rm_expired_delay"> + <title><varname>rm_expired_delay</varname> (int)</title> + <para> + Specify the number of seconds to delay the removal of expired + records. For now it works for DB_ONLY mode (db_mode=3). + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>rm_expired_delay</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "rm_expired_delay", 30) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:3de21172: usrloc: new parameter rm_expired_delay
by Daniel-Constantin Mierla 19 Jan '18

19 Jan '18

Module: kamailio Branch: master Commit: 3de21172fa0f435a77aea73151a2ddad7a711a8f URL: https://github.com/kamailio/kamailio/commit/3de21172fa0f435a77aea73151a2dda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T11:05:31+01:00 usrloc: new parameter rm_expired_delay - set how many seconds to delay the removal of an expired record - for now works only in DB_ONLY mode --- Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/urecord.c Modified: src/modules/usrloc/usrloc.h Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3de21172fa0f435a77aea73151a2dda… Patch: https://github.com/kamailio/kamailio/commit/3de21172fa0f435a77aea73151a2dda… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index bf4a040e58..a3d948ad0b 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -42,6 +42,8 @@ #include "usrloc.h" #include "urecord.h" +extern int ul_rm_expired_delay; + #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) { @@ -900,7 +902,7 @@ int db_timer_udomain(udomain_t* _d) keys[0] = &expires_col; ops[0] = "<"; vals[0].nul = 0; - UL_DB_EXPIRES_SET(&vals[0], act_time + 1); + UL_DB_EXPIRES_SET(&vals[0], act_time + 1 + ul_rm_expired_delay); keys[1] = &expires_col; ops[1] = OP_NEQ; diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index ef223db960..482c14efcf 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -286,8 +286,10 @@ static inline void nodb_timer(urecord_t* _r) if (!VALID_CONTACT(ptr, act_time)) { /* run callbacks for EXPIRE event */ - if (exists_ulcb_type(UL_CONTACT_EXPIRE)) + if (!(ptr->flags&FL_EXPCLB) && exists_ulcb_type(UL_CONTACT_EXPIRE)) { run_ul_callbacks( UL_CONTACT_EXPIRE, ptr); + ptr->flags |= FL_EXPCLB; + } LM_DBG("Binding '%.*s','%.*s' has expired\n", ptr->aor->len, ZSW(ptr->aor->s), diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index ef3572262c..6fb4965539 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -62,6 +62,7 @@ typedef enum flags { FL_NONE = 0, /*!< No flags set */ FL_MEM = 1 << 0, /*!< Update memory only */ FL_DMQRPL = 1 << 1, /*!< DMQ replication */ + FL_EXPCLB = 1 << 2, /*!< Expired callback executed */ FL_ALL = (int)0xFFFFFFFF /*!< All flags set */ } flags_t; diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 2eb9037f24..cedc65a73d 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -111,6 +111,7 @@ int ul_keepalive_timeout = 0; int ul_db_ops_ruid = 1; int ul_expires_type = 0; int ul_db_raw_fetch_type = 0; +int ul_rm_expired_delay = 0; str ul_xavp_contact_name = {0}; @@ -238,6 +239,7 @@ static param_export_t params[] = { {"db_insert_null", PARAM_INT, &ul_db_insert_null}, {"server_id_filter", PARAM_INT, &ul_db_srvid}, {"db_timer_clean", PARAM_INT, &ul_db_timer_clean}, + {"rm_expired_delay", PARAM_INT, &ul_rm_expired_delay}, {0, 0, 0} }; @@ -272,6 +274,17 @@ static int mod_init(void) int i; udomain_t* d; + if(ul_rm_expired_delay!=0) { + if(db_mode != DB_ONLY) { + LM_ERR("rm expired delay feature is available for db only mode\n"); + return -1; + } + } + if(ul_rm_expired_delay<0) { + LM_WARN("rm expired delay value is negative (%d) - setting it to 0\n", + ul_rm_expired_delay); + ul_rm_expired_delay = 0; + } if(sruid_init(&_ul_sruid, '-', "ulcx", SRUID_INC)<0) return -1;

1 0

git:master:06408532: usrloc: renamed dmq specific flag from FL_RPL to FL_DMQRPL
by Daniel-Constantin Mierla 19 Jan '18

19 Jan '18

Module: kamailio Branch: master Commit: 0640853223af068f191fea62790e00d7a6b4319f URL: https://github.com/kamailio/kamailio/commit/0640853223af068f191fea62790e00d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:32:24+01:00 usrloc: renamed dmq specific flag from FL_RPL to FL_DMQRPL --- Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/0640853223af068f191fea62790e00d… Patch: https://github.com/kamailio/kamailio/commit/0640853223af068f191fea62790e00d… --- diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index fbec7d844a..ef3572262c 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -61,7 +61,7 @@ typedef enum cstate { typedef enum flags { FL_NONE = 0, /*!< No flags set */ FL_MEM = 1 << 0, /*!< Update memory only */ - FL_RPL = 1 << 1, /*!< DMQ replication */ + FL_DMQRPL = 1 << 1, /*!< DMQ replication */ FL_ALL = (int)0xFFFFFFFF /*!< All flags set */ } flags_t;

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 19 Jan '18

19 Jan '18

- URL: https://github.com/kamailio/kamailio/commit/59de2edd14cdc6ca1744269f46e3c93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:18:14+01:00 pua: renamed MI flags to reflect use of RPC (cherry picked from commit 5c7bc8a3c1a289111c08334cc4500291f01324aa) - URL: https://github.com/kamailio/kamailio/commit/2dc91981abe7492ee55588ff0026892… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:18:42+01:00 pua_rpc: use RPC flags for callbacks (cherry picked from commit 4d28f007d71d6b49486483ddc4b5307ea36506d5) - URL: https://github.com/kamailio/kamailio/commit/2001fa779952d424032b8bc074f2c40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:21:05+01:00 kamctl: use VERIFY_USER variable to control if user check is done - help automating some commands such as acl grant (cherry picked from commit 28f107d0eb48c59f0b89dbd9fc0fa24c599ed5f9) - URL: https://github.com/kamailio/kamailio/commit/fb97acea191903ce28c8950cb95f920… Author: Carlos Cruz <carlos(a)irontec.com> Date: 2018-01-19T09:22:29+01:00 acc: use acc.time_mode to save cdrs in gmtime - reuse acc.time_mode modparam for cdr entries, storing start_time and end_time in gmtime if time_mode is 4. GH #1358 (cherry picked from commit 63f747a9adcba51562b7ec6848d1f6454374bfa4) - URL: https://github.com/kamailio/kamailio/commit/958d096dfdb1b569b1f00a6d11c3382… Author: Carlos Cruz <carlos(a)irontec.com> Date: 2018-01-19T09:22:43+01:00 doc: time_mode param used for cdrs too (cherry picked from commit 49dd734c241be1531bf11bb5d1b3f4a658b35031) - URL: https://github.com/kamailio/kamailio/commit/258d9009e8cd9f01863304ebbffeb4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:23:45+01:00 app_java: declare global variable in c file instead of header file (cherry picked from commit 93606c35ffdcd55ab98c5704880a6d5375aae299) - URL: https://github.com/kamailio/kamailio/commit/dda0e156a9dc973d1d2cbcd39ce72f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:23:59+01:00 app_java: global variables declared in c files - some renamed to avoid global reference conflicts due to common naming (cherry picked from commit c828cf872fe629381a8c9be24058d63add881071) - URL: https://github.com/kamailio/kamailio/commit/2673911a9866953661e95de7f6d63bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:24:10+01:00 app_java: clang format the code (cherry picked from commit fddc58b97796904a17bb2d01f4480e095a5c4cda) - URL: https://github.com/kamailio/kamailio/commit/789e6126195c00120f1ac79c1e1dec4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:24:25+01:00 app_java: fix writing over the size of allocated buffer (cherry picked from commit 441acf646fa9cf2fd1733f05397a43245b98d322) - URL: https://github.com/kamailio/kamailio/commit/ff37363db2d85178a56b2c3cff51b09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:24:39+01:00 db_berkeley: clang-format the code (cherry picked from commit bbedfa4c3db1b8ae02cabb1fa6b2748b7031c8e8) - URL: https://github.com/kamailio/kamailio/commit/23b03bec84ec605472225373b0f83ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:24:51+01:00 snmpstats: keep sockets list pointer global - they are allocated and content could be referenced at runtime, thus no free - free allocated variables in case of errors (cherry picked from commit 8bc890f595005090479cad1670b4360817f307af) - URL: https://github.com/kamailio/kamailio/commit/5d3be2314434cc5207f9f87773ba8e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:25:05+01:00 snmpstats: clang format the code (cherry picked from commit db0b73b0c69014aa0dee41a78d07800812c10746) - URL: https://github.com/kamailio/kamailio/commit/120bd10b63a948f7179e1335b78692c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:25:18+01:00 call_control: keep reference to allocated buffer used for params (cherry picked from commit 37f6e1e7640b29263e85be9e8958ee14912e20a1) - URL: https://github.com/kamailio/kamailio/commit/fe02ca6c76ab969277a1b5e9092a229… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-01-19T09:25:47+01:00 pv: correct sbranch params appending - some params (like dest uri) were not appended to branch due to a copy-paste typo (cherry picked from commit e66f109c0d2cf657387ee1e0745ff2d55eebcaaa) - URL: https://github.com/kamailio/kamailio/commit/8428dbeff259e9d80e9715fb682a52a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:26:31+01:00 phonenum: Makefile rules to remove cpp object file (cherry picked from commit f170b300857510e91c7a78454be45b68326fc7b3) - URL: https://github.com/kamailio/kamailio/commit/f23191b8cf85efd5e7cb973608e893b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:27:35+01:00 evapi: detect the OS darwin as substring - adjust condition to suit analyzer (cherry picked from commit 81687628bc5fb90a6b126cd2b89c8725a4c3caab) - URL: https://github.com/kamailio/kamailio/commit/108047648d5f614aea5939060e502bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:27:56+01:00 sctp: removed risky workaround for dealing with old libksctp versions - writing over the size of field may have unexpected results (cherry picked from commit b8fb6f9f453a7ab72ea578e8469ae88a831ca0e9) - URL: https://github.com/kamailio/kamailio/commit/7b5f6f7624e5a6bb47a1ccfb3d29bf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:28:07+01:00 sctp: note about using recent versions for libsctp and kernel (cherry picked from commit 12f313c6c7c9b6a9c12d8ee2693cb955c16afe35) - URL: https://github.com/kamailio/kamailio/commit/54190cdec461b5f85bebb9467159292… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:28:16+01:00 sctp: clang format the code (cherry picked from commit ed5a3b04c79fbe071900d53a207c14a379679092) - URL: https://github.com/kamailio/kamailio/commit/7d6d22f8312eda3487f1826d385d851… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-01-19T09:44:23+01:00 app_lua: LUAJIT variable to build agains LuaJIT compiler (cherry picked from commit 41ff35e2ec3f735f818c19cec6697c913dc1a0f7) - URL: https://github.com/kamailio/kamailio/commit/a573d8faabfe7f34083cd8efff25fde… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-01-19T09:44:42+01:00 app_lua: update doc about LUAJIT variable and building against LuaJIT libraries. (cherry picked from commit 55e3b72692d500a988b085c73fefa87e91ff068b) - URL: https://github.com/kamailio/kamailio/commit/aa75f8543a665b6aac3da2dcf5be10d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:45:04+01:00 core: forward - add note about return code of forward_request() (cherry picked from commit 05509f322d5b4ce23b6e5918f4d6bc4e48678202) - URL: https://github.com/kamailio/kamailio/commit/171e3b9f197ffebaa2b1a1959ba109b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:45:33+01:00 tm: handle success return code by forward_request() for e2e ACK - forward_request() returns 0 on success, propagate 1 to config wrapper (cherry picked from commit 52111974b4571e0562e8e731df80f48dbc504915) - URL: https://github.com/kamailio/kamailio/commit/5a03a7a0a014b14b2e528453cc1641a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:46:52+01:00 topos_redis: store and load local side contacts for branch (cherry picked from commit 98a993661cd4fbb574844fbfb012a052cc8e6989) - URL: https://github.com/kamailio/kamailio/commit/087b629506261576509efde32ac83e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:47:15+01:00 snmpstats: init sigaction var and close fd in case of errors (cherry picked from commit 0b7b291ab153472c7d371c29e0c4dfa20c492f08) - URL: https://github.com/kamailio/kamailio/commit/85555549bac9be735ad81b8deff6c8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:47:27+01:00 snmpstats: free table_info in case of error for SIPStatusCodesTable (cherry picked from commit 172cfd3494db462593da2d04feb6528f9ad3a84c) - URL: https://github.com/kamailio/kamailio/commit/7e8e7e57608e54de4b81c7522cbec89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:47:37+01:00 snmpstats: free allocated vars in case of error during init snmp tables (cherry picked from commit 4d4c91a709aff0b9b15fcc02b44de2106e65903e) - URL: https://github.com/kamailio/kamailio/commit/f2650f0b0d829f70a44f29afe5cf923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:47:56+01:00 dialog: replaced inline function with a single log with a macro - makes possible to get the file name and line of its usage (cherry picked from commit eb016670220c20f1156be838ca6645265b64eacc) - URL: https://github.com/kamailio/kamailio/commit/ea7900b1e0557d09d0eb6bd233ae424… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:48:13+01:00 core: resolve - use unsigned short int to match dns result types (cherry picked from commit b46d113e941c5429914069be48faa181ba1e805e) - URL: https://github.com/kamailio/kamailio/commit/27787c332b9ea256e135486e1b4f38f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:48:26+01:00 janssonrpcc: use size of data type to allocate memory (cherry picked from commit dba589a52bddc2833c41c91287a328d22fbc2712) - URL: https://github.com/kamailio/kamailio/commit/461b03d166729c41502c683a6e425dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:48:37+01:00 jsonrpcc: init sockaddr_in structure (cherry picked from commit 539abf29103875f7412b7b3b95c5f6663a7afbe8) - URL: https://github.com/kamailio/kamailio/commit/95e0976ce7e1976664f5ae107936e94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:02+01:00 core: resolve - early safety checks to deal faster with broken dns responses (cherry picked from commit 20752cf945d4ba0660d321d73efff5c93f6d20a8) - URL: https://github.com/kamailio/kamailio/commit/a6ad018a1d7d796272bc0cb07f7540c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:16+01:00 websocket: early check for frame size to fit max buf size - avoid decoding a large buffer and then fail - allocate BUF_SIZE+1 for fragment buffer, coherent with other recv buffers (cherry picked from commit 3302687e2b995ee9faab1655e6bb5e5d4a0dbc87) - URL: https://github.com/kamailio/kamailio/commit/39c698d637def67f79a095279d2ca1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:29+01:00 websocket: clang format the code (cherry picked from commit fa7688bb321bbee3d8d6d6c5692c0d142c0830a3) - URL: https://github.com/kamailio/kamailio/commit/bc9f93c2b4029307ed0549365883605… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:37+01:00 websocket: print len in debug messages when decoding frame (cherry picked from commit 2865a1f16490cadb1c07864f270976d7311373a9) - URL: https://github.com/kamailio/kamailio/commit/23e6e6787daed0e4268ab416dde5bb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:51+01:00 xcap_client: cast curl setopt params to avoid analyzer warnings (cherry picked from commit 1f5ba1a5ac2f652cd3a374200411767286803f9f) - URL: https://github.com/kamailio/kamailio/commit/383cce7a1f5eb4229bb6a7982352062… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:50:00+01:00 auth_identity: use app name to set curl user agent (cherry picked from commit 741d39251468429788846c8386f445eeede2f7ba) - URL: https://github.com/kamailio/kamailio/commit/3091e65d9ee1ce4c524f1ef359d6164… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:50:11+01:00 mohqueue: handle return code for pv_parse_format() (cherry picked from commit 571c9993bb42a1c22a575874f186cfef06af19e8) - URL: https://github.com/kamailio/kamailio/commit/4b4346000f8de5026619caac39f2ade… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:50:29+01:00 core: pt - helper function to get description for current process (cherry picked from commit 5c4309e47b0f66c3c4a98145a956bfe0b2ce0953) - URL: https://github.com/kamailio/kamailio/commit/79a09341c2df408254975a7749133a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:50:37+01:00 core: print more details about process when doing child init (cherry picked from commit 71f11210b6b36cf69aaf3c8318bba9da3334c4e0) - URL: https://github.com/kamailio/kamailio/commit/9159c87cac34630e5657d46cfbc009d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:51:25+01:00 presence: pass dbf structure by pointer instead of value to function param - passing large values is not optimal (cherry picked from commit aad751ab54f37f3482641488929133296974025e) - URL: https://github.com/kamailio/kamailio/commit/651ff06669f1a286fe93a2b6a3599ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:51:39+01:00 rls: pass dbf structure by pointer instead of value to function param (cherry picked from commit 5097954ce5dbbd1094a022f3ae014c77e389aecb) - URL: https://github.com/kamailio/kamailio/commit/19e32304bfd2ba49cf936db043d26b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:52:07+01:00 http_client: cast parameter to curl function to avoid warnings (cherry picked from commit bab289f36b189a2836ef51acc9e26aed422a7dad) - URL: https://github.com/kamailio/kamailio/commit/93e1da2a8313e19084f13caacfc21fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:52:20+01:00 snmpstats: check the return code when registering statistics (cherry picked from commit 5b00ef8bb31fb029b2d4dedae40e2c7a54841fe6) - URL: https://github.com/kamailio/kamailio/commit/73a5f47e07cafbddb4382c371f6c61d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:52:30+01:00 snmpstats: safety checks on hdr variable (cherry picked from commit 74c02fdb1cd04d674046c38bc2f5193f91da4edf) - URL: https://github.com/kamailio/kamailio/commit/0c2daaf795c5dab543c2b38acddd27d… Author: Hugh Waite <hughw273(a)gmail.com> Date: 2018-01-19T09:52:48+01:00 pkg/kamailio/obs: Minor improvements to kamailio.init file Use $PROG instead of uninitialised $DESC Pass the .cfg file name as a parameter when starting and checking config Use the pidfile when stopping to allow parallel instances (cherry picked from commit f06cad16ddd38771f29bfba29161bfa3ec76354f) - URL: https://github.com/kamailio/kamailio/commit/d54d3244f9496b7963ff8b722ea0431… Author: Hugh Waite <hughw273(a)gmail.com> Date: 2018-01-19T09:52:57+01:00 pkg/kamailio/obs: Move ims_ocs module to ims RPM This module has a dependancy on libkamailio_ims.so so it belongs within the IMS RPM. (cherry picked from commit 6a7ea3d489175659cbfcca4088a8cd26b9352273) - URL: https://github.com/kamailio/kamailio/commit/b05f1eb0248c6a48288d67ffbca3091… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:53:17+01:00 core: typedefed struct proxy_l to proxy_l_t (cherry picked from commit a41db4b0f56eccb8fb12c3c8257fd677d6c62537) - URL: https://github.com/kamailio/kamailio/commit/c7dd9321976c2fed34b58d1cdcdf306… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:53:27+01:00 core: typedefed struct onsend_info to onsend_info_t (cherry picked from commit 697c19b016fb1b0f7678716f31462d3f54d60719) - URL: https://github.com/kamailio/kamailio/commit/d446a4fa070c00db940010c0be02822… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:53:40+01:00 siptrace: define max size for address buffers - use struct types (cherry picked from commit f9b98c647d2de1c279d370a5fb5b49201c117d8a) - URL: https://github.com/kamailio/kamailio/commit/67a796cf731421819b6a5d85a387b96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:53:57+01:00 siptrace: use safety macros to copy values building address buffers (cherry picked from commit ed4a2bc477ebaf60d2fa82a3993dd5a61b54d9d3) - URL: https://github.com/kamailio/kamailio/commit/4d56c16c38b92f0f2ce07daadb9cbb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:54:09+01:00 siptrace: siptrace_copy_proto() converted to macro (cherry picked from commit aaf3b2e35bf58ad19b2b375f26909b102b7d512f) - URL: https://github.com/kamailio/kamailio/commit/257d351cddef0a8607f93b7cd7c82c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:54:20+01:00 siptrace: retrieve and use the len of proto when building the address (cherry picked from commit 8f51d6b1624ebca08e71061e0c18c68101595201) - URL: https://github.com/kamailio/kamailio/commit/03d584a5db8a71515a2dc3e8f1b3e24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:54:53+01:00 pua: safety check on tuple_id len (cherry picked from commit 2bb33a88881eacb94e2af54d564cdffc00478cea) - URL: https://github.com/kamailio/kamailio/commit/53e21ff455f42905cbd4ee5100d2c44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:55:49+01:00 siptrace: replaced sequeces of string concatenations with safer formatted print - used to build proxy-like addresses (cherry picked from commit 2e46081424240dfb3767da74b0818249dff46802) - URL: https://github.com/kamailio/kamailio/commit/2c790c0c2ccdeb1978bd5ac34d0cd1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:56:00+01:00 siptrace: use same value for "any" address - two variants were used: any:255.255.255.255:5060 and any:255.255.255.255, now any:255.255.255.255:5060 is used everywhere through a define (cherry picked from commit 2ae4d19a5948d771980853bf38aeef8c1553faec) - URL: https://github.com/kamailio/kamailio/commit/c98cd35dec2eaac78a24150d8f0c550… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:56:23+01:00 drouting: free max val for time recurrence struct on update if already set - reported by Uri Shacked (cherry picked from commit e0f95ea7fc691f976564b07436848673c633195d) - URL: https://github.com/kamailio/kamailio/commit/08fd66009294baa4a02e83aee9d48b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:56:33+01:00 drouting: option to use a static structure for computing ac max val (cherry picked from commit b3e14fc9bd379ad77c13ade0bc60dc32f1d55ade) - URL: https://github.com/kamailio/kamailio/commit/fd9fa1787e28e8e072459e620f5798c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:56:49+01:00 siptrace: simplified internal sip_trace() function using now formatted print (cherry picked from commit 788f81af006f481b23606451d225a86b6b02aac8) - URL: https://github.com/kamailio/kamailio/commit/8a2d2c90d9116744dcc9f54f10b7439… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:57:39+01:00 pipelimit: remove mutiplying the limit with timer interval for TAILDROP alg - the limit is documented as per interval, not per second (closes GH #1390) - renamed macro for default limit to use module specific prefix (cherry picked from commit 1880f1f8be4b51cec2a0567580828e9ac449947d) - URL: https://github.com/kamailio/kamailio/commit/407b257d4ef56730e04888259764ca6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:57:51+01:00 pipelimit: docs - more details about timer interval and limit values (cherry picked from commit 93cfd4e8581fed04d4e596ed7f3d284c53fc5501) - URL: https://github.com/kamailio/kamailio/commit/84e451d44269da540969fc562f5d981… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:58:14+01:00 db2_ops: proper check for memory allocation pointer - check result codes for registering script callbacks (cherry picked from commit 1f9366ab5978ee4aa8fd3cefea0393c94889c26e) - URL: https://github.com/kamailio/kamailio/commit/e900b9450f0f9e8c3adab1610ee0dcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:59:19+01:00 core: tcp - typedefed structs (cherry picked from commit edb3d6d848c9ccf85b077950ecf6aec7acf3e5b6) - URL: https://github.com/kamailio/kamailio/commit/a812a627729eda9b6520d805524603e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:00:04+01:00 topos: store and load tags in transaction record (cherry picked from commit 5b2b06ceff61144c5f0cbddacdfcaee18a2e8eff) - URL: https://github.com/kamailio/kamailio/commit/8d3a0145cd603f5e323cb5ea6de0cef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:00:14+01:00 topos_redis: store tags in transaction records (cherry picked from commit 883d49d5ed2cc6140c583559d0f61bde3fa6fdb5) - URL: https://github.com/kamailio/kamailio/commit/11cfb840ad58445b19ec27f73653bb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:00:36+01:00 topos: set uuid fields before checking contact/rr fields (cherry picked from commit 97532ca18f595d89edf9b0b6e6688847aa38dd44) - URL: https://github.com/kamailio/kamailio/commit/be8070c3a9fe4c33ad017f9272e76eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:00:54+01:00 topos: docs - more explicit info about required use of record_route() (cherry picked from commit 4e659b5f3cd9b176e3bf2e20ceebf34d9734707b) - URL: https://github.com/kamailio/kamailio/commit/040a8d2c5863527ac3d26afbd04b7a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:06+01:00 topos: print warn message when local address is not set (cherry picked from commit ce9f67581f45a00fd879329ffc918b2a7ef9b8d0) - URL: https://github.com/kamailio/kamailio/commit/c60e7025761f7b4a767c8219304cf24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:20+01:00 tm: handle rpc tm.t_uac_start only with From and To headers - reported by GH #1393 (cherry picked from commit 6feb28266210a8210d31d7dac49cf3ea3da06164) - URL: https://github.com/kamailio/kamailio/commit/d23c5d782aaef224e283766e8faeb9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:35+01:00 exec: small typo in log message (cherry picked from commit 8a501f2be2860b1bfd0b9a3d1f63d85f4654fd01) - URL: https://github.com/kamailio/kamailio/commit/f622be60abe31bc4d0618b92caddced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:45+01:00 exec: clang format the code (cherry picked from commit 34ec1fc381916ee2ce7b08afce413bf2aa427a55) - URL: https://github.com/kamailio/kamailio/commit/ee21e28cb2632d4a7c421c93fae0974… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:56+01:00 exec: more info in log messages when uri parsing fails (cherry picked from commit 74c9f53aa736b9d2581666a8a75bc685156447f4) - URL: https://github.com/kamailio/kamailio/commit/a7a087879b850db336c8611349d533b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:02:53+01:00 siptrace: use formatted print for addresses inside trace_onreq_out() (cherry picked from commit 219072f0ef43eff1a5d4947f6fd71f2fd4fb7d1f) - URL: https://github.com/kamailio/kamailio/commit/f5e9533b0149fdb3f000d2c837075b0… Author: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-01-19T10:03:09+01:00 CDP: Safety checks and warnings for adding applications to a peer definition (cherry picked from commit 72bbf9280879475dcdbda59f00b75a274885abaa)

1 0

git:master:72bbf928: CDP: Safety checks and warnings for adding applications to a peer definition
by Carsten Bock 18 Jan '18

18 Jan '18

Module: kamailio Branch: master Commit: 72bbf9280879475dcdbda59f00b75a274885abaa URL: https://github.com/kamailio/kamailio/commit/72bbf9280879475dcdbda59f00b75a2… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-01-18T20:11:50+01:00 CDP: Safety checks and warnings for adding applications to a peer definition --- Modified: src/modules/cdp/peer.h Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/72bbf9280879475dcdbda59f00b75a2… Patch: https://github.com/kamailio/kamailio/commit/72bbf9280879475dcdbda59f00b75a2… --- diff --git a/src/modules/cdp/peer.h b/src/modules/cdp/peer.h index c4005515fd..daea465519 100644 --- a/src/modules/cdp/peer.h +++ b/src/modules/cdp/peer.h @@ -101,6 +101,7 @@ typedef struct _peer_t{ str src_addr; /**< IP Address used to connect to the peer */ app_config *applications;/**< list of supported applications */ + int applications_max; /**< size of list of supporter applications*/ int applications_cnt; /**< size of list of supporter applications*/ gen_lock_t *lock; /**< lock for operations with this peer */ diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 641ec8c7bd..5100e508e8 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -670,9 +670,15 @@ void add_peer_application(peer *p, int id, int vendor, app_type type) p->applications[i].vendor == vendor && p->applications[i].type == type) return; + if (p->applications_cnt > p->applications_max) { + LM_ERR("Too many applications for this peer (max %i), not adding Application %i:%i.\n", p->applications_max, id, vendor); + return; + } + p->applications[p->applications_cnt].id = id; p->applications[p->applications_cnt].vendor = vendor; p->applications[p->applications_cnt].type = type; + LM_DBG("Application %i of maximum %i\n", p->applications_cnt, p->applications_max); p->applications_cnt++; } @@ -724,6 +730,7 @@ void save_peer_applications(peer *p,AAAMessage *msg) } p->applications_cnt = 0; p->applications = shm_malloc(sizeof(app_config)*total_cnt); + p->applications_max = total_cnt; if (!p->applications){ LM_ERR("save_peer_applications(): Error allocating %ld bytes! No applications saved...\n", (long int)(sizeof(app_config)*total_cnt)); @@ -1305,5 +1312,3 @@ void Rcv_Process(peer *p, AAAMessage *msg) // AAAPrintMessage(msg); } - -

1 0

[kamailio/kamailio] Kamailio crashes with debug level > 2 and registering from certain SIP clients (#1403)
by mechanixza 18 Jan '18

18 Jan '18

### Description  When registering a soft client running on my Android phone (Grandstream Wave), Kamailio crashes every time when the client registers. When setting the debug level below 3 Kamailio does not crash. I have only found the problem with this SIP client. Others are working fine. ### Troubleshooting #### Reproduction  Set debug level greather than 2 and register the Grandstream Wave soft client from an Android phone. Kamailio then crashes. #### Log Messages  just before crashing I get the following message: 0(7819) ERROR: <core> [core/udp_server.c:484]: udp_rcv_loop(): print buffer building failed (10/16/4) ### Possible Solutions  The problem seems to come from non-printable characters sent by the SIP client causing Kamailio to crash. Changing line 482 in udp_server.c from l = snprintf(printbuf+j, 6, " %02X ", buf[i]); to l = snprintf(printbuf+j, 6, " %02X ", (unsigned char)buf[i]); fixes the problem. The compiler treats buf[i] as a signed integer and prepends 'FFFFFF' to the string making it longer than 6 characters. Casting buf[i] as an unsigned char prevents Kamailio from crashing. ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.1.0 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 * **Operating System**:  Ubuntu 16.04 (Xenial) -- 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/issues/1403

3 5

git:master:219072f0: siptrace: use formatted print for addresses inside trace_onreq_out()
by Daniel-Constantin Mierla 18 Jan '18

18 Jan '18

Module: kamailio Branch: master Commit: 219072f0ef43eff1a5d4947f6fd71f2fd4fb7d1f URL: https://github.com/kamailio/kamailio/commit/219072f0ef43eff1a5d4947f6fd71f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-18T17:40:42+01:00 siptrace: use formatted print for addresses inside trace_onreq_out() --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/219072f0ef43eff1a5d4947f6fd71f2… Patch: https://github.com/kamailio/kamailio/commit/219072f0ef43eff1a5d4947f6fd71f2… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 3636a0929e..924c4f52e7 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1093,12 +1093,16 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) sto.fromip = trace_local_ip; } else { if(dst == 0 || dst->send_sock == 0 || dst->send_sock->sock_str.s == 0) { - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), + ip_addr2a(&msg->rcv.dst_ip), (int)msg->rcv.dst_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.fromip.s = sto.fromip_buff; + } } else { sto.fromip = dst->send_sock->sock_str; } @@ -1109,13 +1113,16 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { su2ip_addr(&to_ip, &dst->to); - siptrace_copy_proto(dst->proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&to_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, - int2str((unsigned long)su_getport(&dst->to), &len)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(dst->proto), + ip_addr2a(&to_ip), (int)su_getport(&dst->to)); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } } sto.dir = "out";

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev