sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
321 discussions

git:master:a10d04dd: dialog: docs - fixed example for rpc dlg.terminate_dlg
by Daniel-Constantin Mierla 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: a10d04ddca3a357e8e589a4c3eaba7989dce7de9 URL: https://github.com/kamailio/kamailio/commit/a10d04ddca3a357e8e589a4c3eaba79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-14T15:29:16+02:00 dialog: docs - fixed example for rpc dlg.terminate_dlg --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a10d04ddca3a357e8e589a4c3eaba79… Patch: https://github.com/kamailio/kamailio/commit/a10d04ddca3a357e8e589a4c3eaba79… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index a1bc8959a1..e1d2bc275d 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2462,7 +2462,7 @@ if(has_totag()) { <emphasis>from_tag</emphasis> - from tag of the dialog to terminated </para></listitem> <listitem><para> - <emphasis>totag</emphasis> - to tag of the dialog to terminated + <emphasis>to_tag</emphasis> - to tag of the dialog to terminated </para></listitem> </itemizedlist> <para> @@ -2470,7 +2470,7 @@ if(has_totag()) { </para> <para>RPC Command Format:</para> <programlisting format="linespecific"> - kamcmd dlg.dlg_terminate_dlg callid12345 fromtag123 totag123 + kamcmd dlg.terminate_dlg callid12345 fromtag123 totag123 </programlisting> </section> <section>

1 0

git:master:5daba2fa: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: 5daba2fad6e757192e7ca4b90f1267f5e4dd0923 URL: https://github.com/kamailio/kamailio/commit/5daba2fad6e757192e7ca4b90f1267f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-14T10:31:49+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/5daba2fad6e757192e7ca4b90f1267f… Patch: https://github.com/kamailio/kamailio/commit/5daba2fad6e757192e7ca4b90f1267f… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index db70cdbad4..b5686cb6b1 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -91,6 +91,7 @@ Carsten Bock 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) 3.47. server_id_filter (int) + 3.48. version_table (integer) 4. RPC Commands @@ -185,6 +186,7 @@ Carsten Bock 1.45. Set db_timer_clean parameter 1.46. Set rm_expired_delay parameter 1.47. Set server_id_filter parameter + 1.48. version_table parameter usage Chapter 1. Admin Guide @@ -248,6 +250,7 @@ Chapter 1. Admin Guide 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) 3.47. server_id_filter (int) + 3.48. version_table (integer) 4. RPC Commands @@ -374,6 +377,7 @@ Chapter 1. Admin Guide 3.45. db_timer_clean (int) 3.46. rm_expired_delay (int) 3.47. server_id_filter (int) + 3.48. version_table (integer) 3.1. nat_bflag (integer) @@ -1015,6 +1019,18 @@ modparam("usrloc", "rm_expired_delay", 30) modparam("usrloc", "server_id_filter", 1) ... +3.48. version_table (integer) + + If set to 0, the module will skip checking the version for location + table. + + Default value is “1 (check for table version)”. + + Example 1.48. version_table parameter usage +... +modparam("usrloc", "version_table", 0) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:master:f20c90e9: usrloc: docs for version_table parameter
by Daniel-Constantin Mierla 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: f20c90e9adb98f3957134ef809dd0be1cac011f9 URL: https://github.com/kamailio/kamailio/commit/f20c90e9adb98f3957134ef809dd0be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-14T10:29:55+02:00 usrloc: docs for version_table parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f20c90e9adb98f3957134ef809dd0be… Patch: https://github.com/kamailio/kamailio/commit/f20c90e9adb98f3957134ef809dd0be… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 2e9bdb3ff9..5ef4bad77a 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1220,6 +1220,25 @@ modparam("usrloc", "server_id_filter", 1) </example> </section> + <section id="usrloc.p.version_table"> + <title><varname>version_table</varname> (integer)</title> + <para> + If set to 0, the module will skip checking the version + for location table. + </para> + <para> + Default value is <quote>1 (check for table version)</quote>. + </para> + <example> + <title><varname>version_table</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "version_table", 0) +... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:da922966: usrloc: new parameter version_table
by Daniel-Constantin Mierla 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: da922966f0576cd500b455bfa3dca792611b14eb URL: https://github.com/kamailio/kamailio/commit/da922966f0576cd500b455bfa3dca79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-14T10:27:42+02:00 usrloc: new parameter version_table - set it to 0 to disable checking the version for location table --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/da922966f0576cd500b455bfa3dca79… Patch: https://github.com/kamailio/kamailio/commit/da922966f0576cd500b455bfa3dca79… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index 77eecc5aed..b236de23ad 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -43,6 +43,8 @@ #include "usrloc_mod.h" +extern int ul_version_table; + /*! \brief Global list of all registered domains */ dlist_t* root = 0; @@ -645,7 +647,8 @@ int register_udomain(const char* _n, udomain_t** _d) goto err; } - if(db_check_table_version(&ul_dbf, con, &s, UL_TABLE_VERSION) < 0) { + if(ul_version_table != 0 + && db_check_table_version(&ul_dbf, con, &s, UL_TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); goto err; } diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index d0f8d22b6f..21d17e553c 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -112,6 +112,7 @@ int ul_db_ops_ruid = 1; int ul_expires_type = 0; int ul_db_raw_fetch_type = 0; int ul_rm_expired_delay = 0; +int ul_version_table = 1; str ul_xavp_contact_name = {0}; @@ -240,6 +241,7 @@ static param_export_t params[] = { {"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}, + {"version_table", PARAM_INT, &ul_version_table}, {0, 0, 0} };

1 0

git:5.0:6c99d6bf: core: fix Makefile.defs errors to include raw socket support
by Henning Westerholt 14 Jun '18

14 Jun '18

Module: kamailio Branch: 5.0 Commit: 6c99d6bf7c3372fbc5484c5b8664eba988a0edfd URL: https://github.com/kamailio/kamailio/commit/6c99d6bf7c3372fbc5484c5b8664eba… Author: Edwin Fine <edwin(a)2600hz.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-14T08:37:18+02:00 core: fix Makefile.defs errors to include raw socket support Compiling kamailio on `linux`, `gnu_kfreebsd`, and `freebsd` - unless `RAW_SOCKS` is set up otherwise - should automatically enable raw sockets, according to `Makefile.defs` [L97][]: # enable raw sockets RAW_SOCKS ?= yes ifeq ($(RAW_SOCKS),1) RAW_SOCKS = yes endif By all indications, if `RAW_SOCKS` is unset, set to `1`, or set to `yes` before this `ifeq` statement, it will be set to `yes` after the `endif`. The issue arises later on in `Makefile.defs` [L1758][] (and also [L1808][] and [L1892]): #os specific stuff ifeq ($(OS), linux) # by default use futexes if available use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) ### <--- The issue ### C_DEFS+= -DUSE_RAW_SOCKS endif Clearly, the `ifneq` should be `ifeq`. This commit fixes the issue by making the above changes, and `kamailio` should compile on Linux - by default - with raw sockets support unless `RAW_SOCKS` is explicitly set prior to evaluation to something other than `yes` or `1`. [L97]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1758]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1808]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1892]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… (cherry picked from commit 1d4ee7720c6f609077e4497189103f9a950f4194) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6c99d6bf7c3372fbc5484c5b8664eba… Patch: https://github.com/kamailio/kamailio/commit/6c99d6bf7c3372fbc5484c5b8664eba… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a0ed23218b..dbf6191e8c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1755,7 +1755,7 @@ ifeq ($(OS), linux) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1805,7 +1805,7 @@ ifeq ($(OS), gnu_kfreebsd) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1889,7 +1889,7 @@ ifeq ($(OS), freebsd) -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ -DHAVE_NETINET_IN_SYSTM -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes)

1 0

git:5.1:a04c9310: core: fix Makefile.defs errors to include raw socket support
by Henning Westerholt 14 Jun '18

14 Jun '18

Module: kamailio Branch: 5.1 Commit: a04c931064d1332a7c23264a33268d3ecec793a2 URL: https://github.com/kamailio/kamailio/commit/a04c931064d1332a7c23264a33268d3… Author: Edwin Fine <edwin(a)2600hz.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-14T08:36:14+02:00 core: fix Makefile.defs errors to include raw socket support Compiling kamailio on `linux`, `gnu_kfreebsd`, and `freebsd` - unless `RAW_SOCKS` is set up otherwise - should automatically enable raw sockets, according to `Makefile.defs` [L97][]: # enable raw sockets RAW_SOCKS ?= yes ifeq ($(RAW_SOCKS),1) RAW_SOCKS = yes endif By all indications, if `RAW_SOCKS` is unset, set to `1`, or set to `yes` before this `ifeq` statement, it will be set to `yes` after the `endif`. The issue arises later on in `Makefile.defs` [L1758][] (and also [L1808][] and [L1892]): #os specific stuff ifeq ($(OS), linux) # by default use futexes if available use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) ### <--- The issue ### C_DEFS+= -DUSE_RAW_SOCKS endif Clearly, the `ifneq` should be `ifeq`. This commit fixes the issue by making the above changes, and `kamailio` should compile on Linux - by default - with raw sockets support unless `RAW_SOCKS` is explicitly set prior to evaluation to something other than `yes` or `1`. [L97]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1758]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1808]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1892]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… (cherry picked from commit 1d4ee7720c6f609077e4497189103f9a950f4194) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a04c931064d1332a7c23264a33268d3… Patch: https://github.com/kamailio/kamailio/commit/a04c931064d1332a7c23264a33268d3… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 3b1066da95..9b809b8bfa 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1755,7 +1755,7 @@ ifeq ($(OS), linux) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1805,7 +1805,7 @@ ifeq ($(OS), gnu_kfreebsd) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1889,7 +1889,7 @@ ifeq ($(OS), freebsd) -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ -DHAVE_NETINET_IN_SYSTM -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes)

1 0

[kamailio/kamailio] Kamailio 5.1.x builds without raw socket support due to Makefile error (#1565)
by Edwin Fine 14 Jun '18

14 Jun '18

### Description Kamailio compiles without raw sockets support, even though `src/Makefile.defs` should enable that by default, according to the Makefile. ### Troubleshooting Not applicable. #### Reproduction Build kamailio on Debian 8.10 Linux using the standard `Makefile.defs`, and add `udp4_raw = 0` to the config file. You should get the warning shown in the log message provided below. #### Debugging Data Not applicable #### Log Messages ``` kamailio[89847]: WARNING: <core> [core/cfg.y:3427]: warn_at(): warning in config file <redacted>, line 66, column 12: raw socket support not compiled in ``` #### SIP Traffic Not Applicable ### Possible Solutions This is the solution proposed in PR #1564. ``` diff --git a/src/Makefile.defs b/src/Makefile.defs index 428a236..3a2480c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1755,7 +1755,7 @@ ifeq ($(OS), linux) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.3 (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 4.9.2 ``` * **Operating System**: ``` Debian 8.10 Kernel 3.16.0-4-amd64 #1 SMP Debian 3.16.51-3 (2017-12-13) x86_64 GNU/Linux ``` -- 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/1565

2 2

[kamailio/kamailio] core: fix Makefile.defs error to include raw socket support (#1564)
by Edwin Fine 14 Jun '18

14 Jun '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Compiling kamailio on Linux, unless `RAW_SOCKS` is set up otherwise, should automatically enable raw sockets, according to `Makefile.defs` [L97][]: # enable raw sockets RAW_SOCKS ?= yes ifeq ($(RAW_SOCKS),1) RAW_SOCKS = yes endif By all indications, if `RAW_SOCKS` is unset, set to `1`, or set to `yes` before this `ifeq` statement, it will be set to `yes` after the `endif`. The issue arises later on in `Makefile.defs` [L1758][]: #os specific stuff ifeq ($(OS), linux) # by default use futexes if available use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) ### <--- The issue ### C_DEFS+= -DUSE_RAW_SOCKS endif Clearly, the `ifneq` should be `ifeq`. This commit fixes the issue by making the above change, and `kamailio` should compile on Linux - by default - with raw sockets support unless `RAW_SOCKS` is explicitly set prior to evaluation to something other than `yes` or `1`. [L97]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1758]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1564 -- Commit Summary -- * core: fix Makefile.defs error to include raw socket support -- File Changes -- M src/Makefile.defs (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1564.patch https://github.com/kamailio/kamailio/pull/1564.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/1564

2 2

git:master:1d4ee772: core: fix Makefile.defs errors to include raw socket support
by Henning Westerholt 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: 1d4ee7720c6f609077e4497189103f9a950f4194 URL: https://github.com/kamailio/kamailio/commit/1d4ee7720c6f609077e4497189103f9… Author: Edwin Fine <edwin(a)2600hz.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-06-14T08:22:49+02:00 core: fix Makefile.defs errors to include raw socket support Compiling kamailio on `linux`, `gnu_kfreebsd`, and `freebsd` - unless `RAW_SOCKS` is set up otherwise - should automatically enable raw sockets, according to `Makefile.defs` [L97][]: # enable raw sockets RAW_SOCKS ?= yes ifeq ($(RAW_SOCKS),1) RAW_SOCKS = yes endif By all indications, if `RAW_SOCKS` is unset, set to `1`, or set to `yes` before this `ifeq` statement, it will be set to `yes` after the `endif`. The issue arises later on in `Makefile.defs` [L1758][] (and also [L1808][] and [L1892]): #os specific stuff ifeq ($(OS), linux) # by default use futexes if available use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) ### <--- The issue ### C_DEFS+= -DUSE_RAW_SOCKS endif Clearly, the `ifneq` should be `ifeq`. This commit fixes the issue by making the above changes, and `kamailio` should compile on Linux - by default - with raw sockets support unless `RAW_SOCKS` is explicitly set prior to evaluation to something other than `yes` or `1`. [L97]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1758]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1808]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… [L1892]: https://github.com/kamailio/kamailio/blob/a57a96f8fea3a5f7bff068ab0ea0d4c17… --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/1d4ee7720c6f609077e4497189103f9… Patch: https://github.com/kamailio/kamailio/commit/1d4ee7720c6f609077e4497189103f9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 428a23674a..8e76de7687 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1755,7 +1755,7 @@ ifeq ($(OS), linux) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1805,7 +1805,7 @@ ifeq ($(OS), gnu_kfreebsd) C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes) @@ -1889,7 +1889,7 @@ ifeq ($(OS), freebsd) -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ -DHAVE_NETINET_IN_SYSTM -DHAVE_IP_MREQN - ifneq ($(RAW_SOCKS), yes) + ifeq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif ifneq ($(found_lock_method), yes)

1 0

git:master:5f7eee55: sqlops: increased the length of printed query part in case of errors
by Daniel-Constantin Mierla 14 Jun '18

14 Jun '18

Module: kamailio Branch: master Commit: 5f7eee55c648cfa1b5b5662648fc9133daa6d6b6 URL: https://github.com/kamailio/kamailio/commit/5f7eee55c648cfa1b5b5662648fc913… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-14T08:04:31+02:00 sqlops: increased the length of printed query part in case of errors --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/5f7eee55c648cfa1b5b5662648fc913… Patch: https://github.com/kamailio/kamailio/commit/5f7eee55c648cfa1b5b5662648fc913… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 21fbfa950f..b33bc0d0e6 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -262,7 +262,7 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) if(con->dbf.raw_query(con->dbh, query, &db_res)!=0) { LM_ERR("cannot do the query [%.*s]\n", - (query->len>32)?32:query->len, query->s); + (query->len>64)?64:query->len, query->s); return -1; }

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018