sr-dev January 2019

sr-dev@lists.kamailio.org

27 participants
302 discussions

[kamailio/kamailio] tcp: correct queued length checking (#1376)
by Dmitri Savolainen 15 Jan '19

15 Jan '19

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I can’t get big responses via jsonrpcs with default tcp params. According to log response size ~3200k, kamailio send ~2500k of data and can’t add 700k to queue after. This patch should fix, if my understanding of “queued” value is right. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1376 -- Commit Summary -- * tcp: correct queued length checking -- File Changes -- M src/core/tcp_main.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1376.patch https://github.com/kamailio/kamailio/pull/1376.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/1376

2 11

git:master:38a696ff: doc/tutorials/tcp_tunning: note about network buffers size
by Daniel-Constantin Mierla 15 Jan '19

15 Jan '19

Module: kamailio Branch: master Commit: 38a696fff66f0a453e54c92c93e8c459a1b4e77d URL: https://github.com/kamailio/kamailio/commit/38a696fff66f0a453e54c92c93e8c45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-15T13:02:08+01:00 doc/tutorials/tcp_tunning: note about network buffers size - they may need tunning when dealing with large data --- Modified: doc/tutorials/tcp_tunning.txt --- Diff: https://github.com/kamailio/kamailio/commit/38a696fff66f0a453e54c92c93e8c45… Patch: https://github.com/kamailio/kamailio/commit/38a696fff66f0a453e54c92c93e8c45… --- diff --git a/doc/tutorials/tcp_tunning.txt b/doc/tutorials/tcp_tunning.txt index 39097d57b7..aca6a12449 100644 --- a/doc/tutorials/tcp_tunning.txt +++ b/doc/tutorials/tcp_tunning.txt @@ -19,22 +19,22 @@ For now it deals only with Linux specific optimizations. net.core.somaxconn - limit of the listen() backlog, default 128 net.ipv4.tcp_max_syn_backlog - default 1024 or 128 -net.ipv4.tcp_timestamps - default on., should be on (along with +net.ipv4.tcp_timestamps - default on., should be on (along with tcp_tw_recycle and timestamp supporting peers allows for fast connections rates) -1.2 connection in close_wait +1.2 Connection in close_wait - Connection should stay as little as possible - in close_wait to quickly free the fd/resources for new connections attempts - WARNING: this could break normal TCP use, use it only if you know what you are + Connection should stay as little as possible + in close_wait to quickly free the fd/resources for new connections attempts + WARNING: this could break normal TCP use, use it only if you know what you are doing - + net.ipv4.tcp_max_tw_buckets - maximum number of timewait sockets (the default seems to be ok) net.ipv4.tcp_tw_recycle - enables fast time wait sockets recycling (default off), should be enabled if you have lots of short - lived connections + lived connections WARNING: see the above warning net.ipv4.tcp_tw_reuse - allows reusing of time-wait sockets (default off) WARNING: see above @@ -49,10 +49,26 @@ net.ipv4.ip_local_port_range - should be increased (e.g. 4096-65534) 1.4 Open file descriptors fs.file-max - maximum number of fds that will be allocated - (you probably need to increase it, default + (you probably need to increase it, default depends on installed memory) -1.5 other sysctl that might affect tcp connection rate or the maximum number +1.5 Buffers size + + When dealing with large data, check the values for network sockets buffers + to be sufficient, among them: + +net.core.rmem_max +net.core.wmem_max +net.core.rmem_default +net.core.wmem_default +net.ipv4.tcp_mem +net.ipv4.tcp_rmem +net.ipv4.tcp_wmem + + Note: sysctl -w net.ipv4.route.flush=1 - enusre that immediatly subsequent + connections use the values + +1.6 Other sysctl that might affect tcp connection rate or the maximum number of open connections fs.epoll.max_user_instances - maximum number of devices - per user (2.6.27.8+)

1 0

[kamailio/kamailio] coredump when used append_body_part (#1631)
by sergey-safarov 15 Jan '19

15 Jan '19

### Description I want convert `application/sdp` body of INVITE message to `multipart/mixed`. For this used [contruction](https://kamailio.org/docs/modules/devel/modules/textops.html#t… ``` set_body_multipart("test", "text/plain", "delimiter"); msg_apply_changes(); $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c" append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); ``` For some reason `msg_apply_changes` is not applied and then `append_body_part` causes coredump. ### Troubleshooting #### Reproduction On alpine dist or on docker contained `kamailio/kamailio-ci` need add load [kazoo config](https://github.com/2600hz/kazoo-configs-kamailio) and apply this patch ``` diff --git a/kamailio/default.cfg b/kamailio/default.cfg index bc4a084..4b85642 100644 --- a/kamailio/default.cfg +++ b/kamailio/default.cfg @@ -334,6 +334,13 @@ route route(AUTHORIZATION_CHECK); #!endif + if (is_method("INVITE") && isflagset(FLAG_INTERNALLY_SOURCED)) { + set_body_multipart(); + msg_apply_changes(); + $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; + append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); + } + route(HANDLE_MESSAGE_WRAPPER); #!ifdef PRESENCE_ROLE ``` Then make call to other phone. #### Debugging Data ``` (gdb) bt #0 0x00007f1235f96f1b in __syscall4 (a4=<optimized out>, a3=<optimized out>, a2=<optimized out>, a1=<optimized out>, n=<optimized out>) at ./arch/x86_64/syscall_arch.h:38 #1 __restore_sigs (set=set@entry=0x7ffc151162d0) at src/signal/block.c:43 #2 0x00007f1235f97035 in raise (sig=sig@entry=6) at src/signal/raise.c:13 #3 0x00007f1235f6efb4 in abort () at src/exit/abort.c:9 #4 0x00005598707495a2 in free_lump (lmp=0x7f1235e76478) at core/data_lump.c:464 #5 0x000055987074965d in free_lump_list (l=l@entry=0x7f1235e763d8) at core/data_lump.c:498 #6 0x000055987074983a in del_nonshm_lump (lump_list=lump_list@entry=0x7f1235e737b8) at core/data_lump.c:647 #7 0x0000559870785c43 in replace_body (msg=msg@entry=0x7f1235e73208, txt=...) at core/msg_translator.c:1667 #8 0x000055987078d205 in check_boundaries (msg=msg@entry=0x7f1235e73208, send_info=send_info@entry=0x7f12322d6df8) at core/msg_translator.c:1874 #9 0x000055987078d5d3 in build_req_buf_from_sip_req (msg=msg@entry=0x7f1235e73208, returned_len=returned_len@entry=0x7ffc151166fc, send_info=0x7f12322d6df8, mode=mode@entry=128) at core/msg_translator.c:1979 #10 0x00007f123602a1ec in prepare_new_uac (t=t@entry=0x7f12322d6b90, i_req=i_req@entry=0x7f1235e73208, branch=branch@entry=0, uri=<optimized out>, uri@entry=0x7f1235e73480, path=<optimized out>, next_hop=<optimized out>, fsocket=0x7f1235e5ba50, snd_flags=..., fproto=0, flags=0, instance=<optimized out>, ruid=<optimized out>, location_ua=<optimized out>) at t_fwd.c:474 #11 0x00007f123602b665 in add_uac (t=t@entry=0x7f12322d6b90, request=request@entry=0x7f1235e73208, uri=0x7f1235e73480, next_hop=<optimized out>, path=<optimized out>, proxy=proxy@entry=0x0, fsocket=0x7f1235e5ba50, snd_flags=..., proto=0, flags=0, instance=0x7f1235e73850, ruid=0x7f1235e73868, location_ua=0x7f1235e73878) at t_fwd.c:800 #12 0x00007f12360307b8 in t_forward_nonack (t=0x7f12322d6b90, p_msg=p_msg@entry=0x7f1235e73208, proxy=proxy@entry=0x0, proto=proto@entry=0) at t_fwd.c:1680 #13 0x00007f123603ee65 in t_relay_to (p_msg=0x7f1235e73208, proxy=0x0, proto=0, replicate=0) at t_funcs.c:331 #14 0x000055987076fbb8 in do_action (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235bbf528, msg=msg@entry=0x7f1235e73208) at core/action.c:1073 #15 0x000055987076ac5d in run_actions (h=h@entry=0x7ffc15118360, a=0x7f1235bb1c28, msg=msg@entry=0x7f1235e73208) at core/action.c:1565 #16 0x000055987076dbb3 in do_action (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235bad570, msg=msg@entry=0x7f1235e73208) at core/action.c:691 #17 0x000055987076ac5d in run_actions (h=h@entry=0x7ffc15118360, a=0x7f1235bad570, msg=msg@entry=0x7f1235e73208) at core/action.c:1565 #18 0x000055987076fb99 in do_action (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235baf5c8, msg=msg@entry=0x7f1235e73208) at core/action.c:1062 #19 0x000055987076ac5d in run_actions (h=h@entry=0x7ffc15118360, a=0x7f1235bac9d0, msg=msg@entry=0x7f1235e73208) at core/action.c:1565 #20 0x000055987076dbb3 in do_action (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235b71db8, msg=msg@entry=0x7f1235e73208) at core/action.c:691 #21 0x000055987076ac5d in run_actions (h=h@entry=0x7ffc15118360, a=a@entry=0x7f1235b69540, msg=msg@entry=0x7f1235e73208) at core/action.c:1565 #22 0x0000559870775dc7 in run_top_route (a=0x7f1235b69540, msg=msg@entry=0x7f1235e73208, c=c@entry=0x0) at core/action.c:1654 #23 0x00005598707660c1 in receive_msg ( buf=buf@entry=0x559870a51640 <buf> "INVITE sip:safarov2@node1.nga911.com SIP/2.0\r\nVia: SIP/2.0/UDP 10.0.9.35:11000;rport;branch=z9hG4bK69ag32Nr5gFjH\r\nRoute: <sip:10.0.9.39:5060>\r\nMax-Forwards: 48\r\nFrom: \"Sergey Safarov\" <sip:1240@node1."..., len=<optimized out>, rcv_info=rcv_info@entry=0x7ffc151186c0) at core/receive.c:278 #24 0x00005598708131fb in udp_rcv_loop () at core/udp_server.c:554 #25 0x0000559870744fb6 in main_loop () at main.c:1619 #26 0x000055987073d51f in main (argc=<optimized out>, argv=<optimized out>) at main.c:2638 ``` Full backtrace at [bt_full.txt](https://github.com/kamailio/kamailio/files/2342768/bt_full.txt) #### Log Messages Please look [kamailio_console.txt](https://github.com/kamailio/kamailio/files/2342769/ka… #### SIP Traffic Crash when started modification of packet 73 of pcap file [sip.pcap.gz](https://github.com/kamailio/kamailio/files/2342770/sip.pcap.gz) ### Possible Solutions Not known ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` / # kamailio -v version: kamailio 5.1.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 16:32:28 Sep 1 2018 with gcc 6.4.0 ``` * **Operating System**: ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.0 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" ``` -- 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/1631

2 12

[kamailio/kamailio] presence_xml db_url param can not set (#1809)
by Cui Gang 15 Jan '19

15 Jan '19

### Description I'm testing the presence feature, on branch 5.2 last version 1e56e4d . modparam("presence_xml", "db_url", DBURL) Can not set db_url of the presence_xml correct value. presence_xml db_url always the default value(DEFAULT_DB_URL). The same way, presence db_url is right. #### Debugging Data presence.cfg file: ``` debug=3 #!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio52" /* set paths to location of modules */ mpath="/usr/local/kamailio/lib64/kamailio/modules/" loadmodule "db_mysql.so" loadmodule "tm.so" loadmodule "sl.so" loadmodule "presence.so" loadmodule "presence_xml.so" modparam("presence", "db_url", DBURL) modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "integrated_xcap_server", 1) request_route { exit; } ``` #### Log Messages ``` 0(76822) DEBUG: <core> [core/sr_module.c:896]: init_mod(): presence 0(76822) DEBUG: presence [presence.c:282]: mod_init(): db_url=mysql://kamailio:kamailiorw@localhost/kamailio52/48/0x102b9e860 .... 0(76822) DEBUG: <core> [core/sr_module.c:896]: init_mod(): presence_xml 0(76822) DEBUG: presence_xml [presence_xml.c:159]: mod_init(): db_url=mysql://kamailio:kamailiorw@localhost/kamailio/46/0x103cf2d64 ... 0(76822) DEBUG: presence_xml [add_events.c:139]: xml_add_events(): added 'xcap-diff' event to presence module 0(76822) DEBUG: <core> [core/sr_module.c:619]: find_mod_export_record(): found export of <db_bind_api> in module db_mysql [/usr/local/kamailio/lib64/kamailio/modules/db_mysql.so] 0(76822) DEBUG: <core> [db.c:210]: db_bind_mod(): using db bind api for db_mysql 0(76822) DEBUG: <core> [db.c:315]: db_do_init2(): connection 0x102bac2e8 not found in pool 0(76822) DEBUG: db_mysql [km_my_con.c:108]: db_mysql_new_connection(): opening connection: mysql://xxxx:xxxx@localhost/kamailio 0(76822) ERROR: db_mysql [km_my_con.c:139]: db_mysql_new_connection(): driver error: Unknown database 'kamailio' 0(76822) ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool 0(76822) ERROR: presence_xml [presence_xml.c:214]: mod_init(): while connecting to database 0(76822) ERROR: <core> [core/sr_module.c:899]: init_mod(): Error while initializing module presence_xml (/usr/local/kamailio/lib64/kamailio/modules/presence_xml.so) ERROR: error while initializing modules ``` The correct db_url is #!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio52" I don't know why presence_xml db_url always the default value in the source code DEFAULT_DB_URL. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.0 (x86_64/darwin) 1e56e4 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, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: 1e56e4 compiled on 23:15:49 Jan 12 2019 with gcc Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/include/c++/4.2.1 Apple LLVM version 10.0.0 (clang-1000.11.45.5) Target: x86_64-apple-darwin18.2.0 Thread model: posix InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin ``` * **Operating System**: ``` MacOS ``` -- 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/1809

2 4

[kamailio/kamailio] TSILO crashes kamailio on ts_store() (#1775)
by ForGuru 14 Jan '19

14 Jan '19

I am getting following error when ts_store() is called Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25676]: {1 2 INVITE 2d24732c962aa49859622eb9d214a115(a)192.168.2.7} DEBUG: tsilo [ts_store.c:80]: ts_store(): storing transaction 5967:208972607 for r-uri: Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25696]: DEBUG: <core> [core/tcp_main.c:3279]: handle_tcp_child(): dead tcp child 2 (pid 25676, no 19) (shutting down?) Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25696]: DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0xa6cf40, 37, -1, 0x0) fd_no=37 called Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25696]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 34 Dec 21 12:50:57 ejabberd /usr/local/kamailio-5.1/sbin/kamailio[25696]: DEBUG: <core> [core/tcp_main.c:3512]: handle_ser_child(): dead child 19, pid 25676 (shutting down?)  ``` if (lookup("location")) { xlog("L_INFO","PUSHASYNC: for new transaction [$T(id_index):$T(id_label)] $fU => $rU \n"); if(t_newtran()) { xlog("L_INFO","PUSHASYNC: storing transaction [$T(id_index):$T(id_label)] fU=[$fU] => rU=[$rU] ru=[$ru] \n"); ts_store(); xlog("L_INFO","PUSHASYNC: stored transaction [$T(id_index):$T(id_label)] [$fU] => [$rU]\n"); } $sht(vtp=>stored::$rU) = 1; return; } ``` ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1775

4 9

git:5.2:82d9703e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 82d9703e619f765efcda8f37e45bfcfe4b22607e URL: https://github.com/kamailio/kamailio/commit/82d9703e619f765efcda8f37e45bfcf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-14T12:46:35+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dialog/README Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/82d9703e619f765efcda8f37e45bfcf… Patch: https://github.com/kamailio/kamailio/commit/82d9703e619f765efcda8f37e45bfcf… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index b1b63b8e30..05a1b531f8 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -426,9 +426,10 @@ Chapter 1. Admin Guide 2. How it works - To create the dialog associated with an initial request, the flag - “dlg_flag” (Section 6.4, “dlg_flag (integer)”) must be set before - creating the corresponding transaction. + To create the dialog associated with an initial INVITE request, execute + the function “dlg_manage()” or set the flag specified by parameter + “dlg_flag” (Section 6.4, “dlg_flag (integer)”) before creating the + corresponding transaction. The dialog is automatically destroyed when a “BYE” is received. In case of no “BYE”, the dialog lifetime is controlled via the default timeout @@ -611,6 +612,10 @@ modparam("dialog", "rr_param", "xyz") Flag to be used for marking if a dialog should be constructed for the current request (this make sense only for initial requests). + Note: it is not needed to set this parameter and its corresponding flag + for initial request in case the “dlg_manage()” function is used. In + other words, using “dlg_manage()” alone is enough. + Default value is “none”. Example 1.4. Set dlg_flag parameter diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 53a464d8ff..c788e393c8 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -697,10 +697,15 @@ Note Controls what gateways are tested to see if they are reachable. * Value 0: If set to 0, only the gateways with state PROBING are tested. After a gateway is probed, the PROBING state is cleared in - this mode. + this mode. This means that no probing will be executed at all only + if flag in config file is set to 8/PROBING (please check + destination list file syntaxis for more details), it will probe + only one time at startup or after dispatcher reload. * Value 1: If set to 1, all gateways are tested. If set to 1 and there is a failure of keepalive to an active gateway, then it is - set to TRYING state. + set to TRYING state. This means that probing will be executed all + the time, but you can skip some servers with flag 4 in destination + list file, for example. * Value 2: if set to 2, only gateways in inactive state with probing mode set are tested. * Value 3: If set to 3, any gateway with state PROBING is continually @@ -1388,6 +1393,21 @@ kamcmd dispatcher.set_state ip 3 all Example: kamcmd dispatcher.list + ... +DEST: { + URI: sip:192.168.0.1:5060 + FLAGS: AP + PRIORITY: 12 +} + ... + + FLAGS consist out of 2 letters. First letter describe status of + destination: A-active, I â inactive, T â trying, D â disabled. + Second letter might be P or X. P is for probing, so AP means + destination is active and it is tested by SIP options continuously. X + means that there are no probing or sip pinging. So AX means that + destination is assumed as active and it is not tested by SIP options. + DX respectively is disabled destination that is not tested, etc. 5.3. dispatcher.reload

1 0

git:5.2:1bebb9f8: presence_xml: do not include ../presence/presence.h
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 1bebb9f8a4cb33f8ef9a4e95ad28e80d74b545b6 URL: https://github.com/kamailio/kamailio/commit/1bebb9f8a4cb33f8ef9a4e95ad28e80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:30:30+01:00 presence_xml: do not include ../presence/presence.h - it is not needed, that header file is related to modparams of presence module - renamed db_url to presxml_db_url just to avoid possible conflict in the future like for GH #1809 (cherry picked from commit f0e0a849f5dfe5dae0cd0e755b9739cbc7fa8200) --- Modified: src/modules/presence_xml/presence_xml.c Modified: src/modules/presence_xml/presence_xml.h --- Diff: https://github.com/kamailio/kamailio/commit/1bebb9f8a4cb33f8ef9a4e95ad28e80… Patch: https://github.com/kamailio/kamailio/commit/1bebb9f8a4cb33f8ef9a4e95ad28e80… --- diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index 183d0a6626..10e34293bd 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -81,7 +81,7 @@ pres_get_sphere_t pres_get_sphere; /* Module parameter variables */ str xcap_table= str_init("xcap"); -str db_url = str_init(DEFAULT_DB_URL); +static str presxml_db_url = str_init(DEFAULT_DB_URL); int force_active= 0; int force_dummy_presence = 0; int integrated_xcap_server= 0; @@ -115,7 +115,7 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - { "db_url", PARAM_STR, &db_url}, + { "db_url", PARAM_STR, &presxml_db_url}, { "xcap_table", PARAM_STR, &xcap_table}, { "force_active", INT_PARAM, &force_active }, { "integrated_xcap_server", INT_PARAM, &integrated_xcap_server}, @@ -156,7 +156,8 @@ static int mod_init(void) if(passive_mode==1) return 0; - LM_DBG("db_url=%s/%d/%p\n",ZSW(db_url.s),db_url.len, db_url.s); + LM_DBG("db_url=%s (len=%d addr=%p)\n", ZSW(presxml_db_url.s), + presxml_db_url.len, presxml_db_url.s); /* bind the SL API */ if (sl_load_api(&slb)!=0) { @@ -196,7 +197,7 @@ static int mod_init(void) if(force_active== 0) { /* binding to mysql module */ - if (db_bind_mod(&db_url, &pxml_dbf)) + if (db_bind_mod(&presxml_db_url, &pxml_dbf)) { LM_ERR("Database module not found\n"); return -1; @@ -208,7 +209,7 @@ static int mod_init(void) return -1; } - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (!pxml_db) { LM_ERR("while connecting to database\n"); @@ -279,7 +280,7 @@ static int child_init(int rank) { if(pxml_db) return 0; - pxml_db = pxml_dbf.init(&db_url); + pxml_db = pxml_dbf.init(&presxml_db_url); if (pxml_db== NULL) { LM_ERR("while connecting database\n"); diff --git a/src/modules/presence_xml/presence_xml.h b/src/modules/presence_xml/presence_xml.h index 7b523ef028..e165852684 100644 --- a/src/modules/presence_xml/presence_xml.h +++ b/src/modules/presence_xml/presence_xml.h @@ -35,7 +35,6 @@ #include "../../lib/srdb1/db.h" #include "../../modules/sl/sl.h" #include "../presence/event_list.h" -#include "../presence/presence.h" #include "../presence/presentity.h" #include "../xcap_client/xcap_functions.h"

1 0

git:5.2:57017b10: presence: do not include presence.h in other header files
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 57017b10d9a50385368324beb7eef9044d0b124a URL: https://github.com/kamailio/kamailio/commit/57017b10d9a50385368324beb7eef90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:30:18+01:00 presence: do not include presence.h in other header files - it exports as extern the module parameter variables and other modules built on top of presence can end up including this header file, overwriting declaration of variables with same name - renamed db_url to pres_db_url, this being a common variable name, to avoid same situation with a mistaken include in the future - GH #1809 (cherry picked from commit eb1bf9a69abad3d237c136750fe8cacea4cd0a31) --- Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presence_dmq.h Modified: src/modules/presence/presentity.h Modified: src/modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/57017b10d9a50385368324beb7eef90… Patch: https://github.com/kamailio/kamailio/commit/57017b10d9a50385368324beb7eef90…

1 0

git:5.2:df148278: presence_xml: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: df1482789cdbcfb7d32e08ba908e185f53cc48ac URL: https://github.com/kamailio/kamailio/commit/df1482789cdbcfb7d32e08ba908e185… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:30:06+01:00 presence_xml: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it (cherry picked from commit 869f57aac4496e10480094c36373f485aef11a80) --- Modified: src/modules/presence_xml/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/df1482789cdbcfb7d32e08ba908e185… Patch: https://github.com/kamailio/kamailio/commit/df1482789cdbcfb7d32e08ba908e185… --- diff --git a/src/modules/presence_xml/Makefile b/src/modules/presence_xml/Makefile index 08711cdfa9..f6a1dd4d63 100644 --- a/src/modules/presence_xml/Makefile +++ b/src/modules/presence_xml/Makefile @@ -8,6 +8,12 @@ LIBS= ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -19,6 +25,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules

1 0

git:5.2:ff5d8bf7: presence: Makefile - link agaist libicu on macos/darwin
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: ff5d8bf7e0692d50a104e0ebcb7690ba236ff343 URL: https://github.com/kamailio/kamailio/commit/ff5d8bf7e0692d50a104e0ebcb7690b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:29:55+01:00 presence: Makefile - link agaist libicu on macos/darwin - libxml2 needs it but its pkg-config doesn't list it (cherry picked from commit d3208e1859051eb09013f855126f7f5f5ec47ab8) --- Modified: src/modules/presence/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ff5d8bf7e0692d50a104e0ebcb7690b… Patch: https://github.com/kamailio/kamailio/commit/ff5d8bf7e0692d50a104e0ebcb7690b… --- diff --git a/src/modules/presence/Makefile b/src/modules/presence/Makefile index 6891a79d39..bd1bcebc75 100644 --- a/src/modules/presence/Makefile +++ b/src/modules/presence/Makefile @@ -7,6 +7,12 @@ NAME=presence.so ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +ifeq ($(OS), darwin) +ICU_BUILDER = $(shell \ + if pkg-config --exists icu-uc; then \ + echo 'pkg-config icu-uc'; \ + fi) +endif endif ifneq ($(XML2CFG),) @@ -18,6 +24,11 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +ifneq ($(ICU_BUILDER),) + DEFS += $(shell $(ICU_BUILDER) --cflags ) + LIBS += $(shell $(ICU_BUILDER) --libs) +endif + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/srutils/srutils

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2019