sr-dev October 2018

sr-dev@lists.kamailio.org

23 participants
274 discussions

[kamailio/kamailio] Kamailio crashes on NAPTR lookup (#1680)

by Joonas Keskitalo

### Description Kamailio crashes when running `dns.lookup NAPTR <x>` in kamcmd. NAPTR can be resolved from nameservers using `dig` command on same server: ``` # dig NAPTR sip.example.com +short 102 50 "s" "SIP+D2T" "" _sip._tcp.sip.example.com. 100 50 "s" "SIP+D2U" "" _sip._udp.sip.example.com. ``` Here is what happens when kamcmd is used: ``` kamcmd> dns.lookup NAPTR sip.example.com ERROR: read reply failed: Success (0) ``` All other lookups seems to work normally (A, SRV, etc...) ### Troubleshooting #### Reproduction This problem occurs every time I try to resolve any NAPTR record. It does not matter if the record exists or not in the nameserver. I have tried to use multiple nameservers but problem occurs on all of them. #### Debugging Data ``` (gdb) bt full #0 strlen () at ../sysdeps/x86_64/strlen.S:106 No locals. #1 0x00007fda60ad3032 in rpc_struct_add (s=0x556138f869c0, fmt=0x556137bc63c4 "s") at binrpc_run.c:1083 ap = {{gp_offset = 48, fp_offset = 48, overflow_arg_area = 0x7ffcfc0b4ed0, reg_save_area = 0x7ffcfc0b4de0}} err = 0 avp = {name = {s = 0x556137bc63ac "rr_preference", len = 13}, type = 1, u = {strval = { s = 0x32 <error: Cannot access memory at address 0x32>, len = 0}, fval = 2.4703282292062327e-322, intval = 50, end = 50}} rs = 0x38f56c00 __func__ = "rpc_struct_add" #2 0x0000556137a30e43 in dns_cache_print_entry (rpc=0x7fda60d01640 <binrpc_callbacks>, ctx=0x7ffcfc0b5060, e=0x7fda5b48e1d8) at core/dns_cache.c:3885 expires = 1445 rr = 0x7fda5b48e230 ip = {af = 32768, len = 0, u = {addrl = {32816, 512}, addr32 = {32816, 0, 512, 0}, addr16 = {32816, 0, 0, 0, 512, 0, 0, 0}, addr = "0\200\000\000\000\000\000\000\000\002\000\000\000\000\000"}} now = 1080071524 s = {s = 0x2300028660 <error: Cannot access memory at address 0x2300028660>, len = -66367552} i = 0 n = 1 th = 0x556138f54bb0 rh = 0x556138f56c00 sh = 0x556138f869c0 ih = 0x7ffcfc0b4f90 ah = 0x0 #3 0x0000556137a36ec8 in dns_cache_rpc_lookup (rpc=0x7fda60d01640 <binrpc_callbacks>, ctx=0x7ffcfc0b5060) at core/dns_cache.c:4712 e = 0x7fda5b48e1d8 name = {s = 0x556138f6e941 "sip.example.com", len = 17} type = {s = 0x556138f6e939 "NAPTR", len = 5} t = 35 __func__ = "dns_cache_rpc_lookup" #4 0x00007fda60ad094e in process_rpc_req (buf=0x556138f6e924 "\241\003({5\336`\221\vdns.lookup", size=47, bytes_needed=0x7ffcfc0b5224, sh=0x7ffcfc0b51a0, saved_state=0x556138f7e928) at binrpc_run.c:678 err = 0 val = {name = {s = 0x100b8 <error: Cannot access memory at address 0x100b8>, len = 934961267}, type = 1, u = {strval = { s = 0x556138f6e92d "dns.lookup", len = 10}, fval = 4.6380934184454688e-310, intval = 955705645, end = 955705645}} rpc_e = 0x7fda636f51a0 f_ctx = {in = {ctx = {tlen = 40, cookie = 2067127904, type = 0, flags = 1, offset = 40, in_struct = 0, in_array = 0}, s = 0x556138f6e953 "", end = 0x556138f6e953 "", record_no = 2, in_struct = 0}, out = {pkt = { body = 0x556138f7e9b0 "\003\203cfg.add_group_inst", end = 0x556138f869b0 "", crt = 0x556138f7e9b2 "cfg.add_group_inst"}, structs = {next = 0x556138f54bb0, prev = 0x556138f54bb0}}, send_h = 0x7ffcfc0b51a0, method = 0x556138f6e92d "dns.lookup", gc = 0x0, replied = 0, err_code = 0, err_phrase = {s = 0x0, len = 0}} ctx = 0x7ffcfc0b5060 __func__ = "process_rpc_req" #5 0x00007fda60ac6f8a in handle_stream_read (s_c=0x556138f6e8f0, idx=-1) at io_listener.c:511 bytes_free = 65535 bytes_read = 47 bytes_needed = 0 bytes_processed = 28 r = 0x556138f6e910 sh = {fd = 7, type = 0, from = {sa_in = {s = {sa_family = 0, sa_data = "\000\000\002\000\000\000\001\000\000\000\000\000\000"}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 2}, sin_zero = "\001\000\000\000\000\000\000"}, sin6 = { sin6_family = 0, sin6_port = 0, sin6_flowinfo = 2, sin6_addr = {__in6_u = { __u6_addr8 = "\001", '\000' <repeats 14 times>, __u6_addr16 = {1, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {1, 0, 0, 0}}}, sin6_scope_id = 0}}, sa_un = {sun_family = 0, sun_path = "\000\000\002\000\000\000\001", '\000' <repeats 47 times>, "\001\000\000\000\000\000\000\000xZ\341Z\332\177", '\000' <repeats 18 times>, "@R\v\374\001\000\000\000xZ\341Z\332\177\000\000@R\v\374\374\177"}}, from_len = 0} __func__ = "handle_stream_read" #6 0x00007fda60ac881d in handle_io (fm=0x7fda637b2558, events=1, idx=-1) at io_listener.c:706 ret = 1 __func__ = "handle_io" #7 0x00007fda60ac05ce in io_wait_loop_epoll (h=0x7fda60cf1340 <io_h>, t=10, repeat=0) at ../../core/io_wait.h:1065 n = 1 r = 0 fm = 0x7fda637b2558 revents = 1 __func__ = "io_wait_loop_epoll" #8 0x00007fda60ac42d5 in io_listen_loop (fd_no=1, cs_lst=0x556138f517f0) at io_listener.c:281 max_fd_no = 292 poll_err = 0x0 poll_method = 2 cs = 0x0 type = 2 __func__ = "io_listen_loop" #9 0x00007fda60adf397 in mod_child (rank=0) at ctl.c:337 pid = 0 cs = 0x2525252525252525 rpc_handler = 1 __func__ = "mod_child" #10 0x0000556137947c5b in init_mod_child (m=0x7fda63707cb0, rank=0) at core/sr_module.c:943 __func__ = "init_mod_child" #11 0x00005561379478e2 in init_mod_child (m=0x7fda63708310, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #12 0x00005561379478e2 in init_mod_child (m=0x7fda63709e78, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #13 0x00005561379478e2 in init_mod_child (m=0x7fda6370a2e0, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #14 0x00005561379478e2 in init_mod_child (m=0x7fda6370b178, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #15 0x00005561379478e2 in init_mod_child (m=0x7fda6370b888, rank=0) at core/sr_module.c:939 __func__ = "init_mod_child" #16 0x000055613794802b in init_child (rank=0) at core/sr_module.c:970 No locals. #17 0x00005561377eeb91 in main_loop () at main.c:1701 i = 8 pid = 6785 si = 0x0 si_desc = "udp receiver child=7 sock=10.1.8.151:5060\000\060\000\332\177\000\000\070\217yc\332\177\000\000\001\000\000\000\f\b\000\000\000\000\000\000\000\000\000\000\370;G[\332\177\000\000\200X\v\374\001\000\000\000\310V\341Z\332\177\000\000\200X\v\374\374\177\000\000\"\341\245\067aU\000\000\200\016~7aU\000\000\320quc\332\177\000" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #18 0x00005561377f5cc7 in main (argc=3, argv=0x7ffcfc0b5bd8) at main.c:2638 cfg_stream = 0x556138e8b010 c = -1 r = 0 tmp = 0x7fda63fc92e7 "__vdso_getcpu" tmp_len = 32764 port = -66364912 proto = 32730 options = 0x556137b507e0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 220359506 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 19, st_ino = 40752, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1538560621, tv_nsec = 412647637}, st_mtim = { tv_sec = 1539854582, tv_nsec = 44920563}, st_ctim = {tv_sec = 1539854582, tv_nsec = 44920563}, __glibc_reserved = {0, 0, 0}} __func__ = "main" (gdb) info locals cfg_stream = 0x556138e8b010 c = -1 r = 0 tmp = 0x7fda63fc92e7 "__vdso_getcpu" tmp_len = 32764 port = -66364912 proto = 32730 options = 0x556137b507e0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 220359506 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 19, st_ino = 40752, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1538560621, tv_nsec = 412647637}, st_mtim = {tv_sec = 1539854582, tv_nsec = 44920563}, st_ctim = {tv_sec = 1539854582, tv_nsec = 44920563}, __glibc_reserved = {0, 0, 0}} __func__ = "main" (gdb) list 101 in ../sysdeps/x86_64/strlen.S ``` #### Log Messages  ``` Oct 18 10:37:11 sipfix1 kernel: [1393558.285356] kamailio[7264]: segfault at 32 ip 00007f57d79fb676 sp 00007ffdbb422d38 error 4 in libc-2 .24.so[7f57d797b000+195000] Oct 18 10:37:11 sipfix1 /usr/local/sbin/kamailio[7273]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 5 Oct 18 10:37:11 sipfix1 /usr/local/sbin/kamailio[7234]: ALERT: <core> [main.c:738]: handle_sigs(): child process 7264 exited by a signal 11 Oct 18 10:37:11 sipfix1 /usr/local/sbin/kamailio[7234]: ALERT: <core> [main.c:741]: handle_sigs(): core was generated Oct 18 10:37:11 sipfix1 /usr/local/sbin/kamailio[7234]: INFO: <core> [main.c:764]: handle_sigs(): terminating due to SIGCHLD ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.1.5 (x86_64/linux) c2f0c8 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: c2f0c8 compiled on 09:25:31 Oct 2 2018 with gcc 6.3.0 ``` * **Operating System**:  ``` # uname -a Linux sip.example.com 4.9.0-8-amd64 #1 SMP Debian 4.9.110-3+deb9u3 (2018-08-19) 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/1680

6 years, 1 month

git:5.1:e178b8c6: core: init cfg framework before executing event_route[core:worker-one-init]

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: e178b8c620c991635d74c01e14b837e0080b1eea URL: https://github.com/kamailio/kamailio/commit/e178b8c620c991635d74c01e14b837e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:34:38+02:00 core: init cfg framework before executing event_route[core:worker-one-init] (cherry picked from commit a4b6a5cb1dda7576b265a23c91321b7f2a034658) --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/e178b8c620c991635d74c01e14b837e… Patch: https://github.com/kamailio/kamailio/commit/e178b8c620c991635d74c01e14b837e… --- diff --git a/src/core/action.c b/src/core/action.c index f7d3aaf465..374ba756ae 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1671,6 +1671,9 @@ int run_child_one_init_route(void) rt = route_get(&event_rt, "core:worker-one-init"); if(rt>=0 && event_rt.rlist[rt]!=NULL) { LM_DBG("executing event_route[core:worker-one-init] (%d)\n", rt); + if (cfg_child_init()) { + return -1; + } if(faked_msg_init()<0) return -1; fmsg = faked_msg_next();

6 years, 1 month

git:5.1:552d90b8: core: fake msg - added sip schema to From/To URIs

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 552d90b8a0c649917eedf7a6af47f03980b7b77f URL: https://github.com/kamailio/kamailio/commit/552d90b8a0c649917eedf7a6af47f03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:29:18+02:00 core: fake msg - added sip schema to From/To URIs (cherry picked from commit 044cdefcadf5c7949945544dce30becb2d84c56e) --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/552d90b8a0c649917eedf7a6af47f03… Patch: https://github.com/kamailio/kamailio/commit/552d90b8a0c649917eedf7a6af47f03… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index fa948f4bbe..9a84954f0b 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -28,7 +28,7 @@ #include "fmsg.h" -#define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <you(a)kamailio.org>;tag=123\r\nTo: <you(a)kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" +#define FAKED_SIP_MSG "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <sip:you@kamailio.org>;tag=123\r\nTo: <sip:you@kamailio.org>\r\nCall-ID: 123\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_LEN (sizeof(FAKED_SIP_MSG)-1) static char _faked_sip_buf[FAKED_SIP_MSG_LEN+1]; static struct sip_msg _faked_msg;

6 years, 1 month

git:5.1:2a525588: core: dns_cache - NAPTR rr_preference set to number for rpc output

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 2a5255880fb9b22bcc5d1615546935476facc787 URL: https://github.com/kamailio/kamailio/commit/2a5255880fb9b22bcc5d16155469354… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:29:08+02:00 core: dns_cache - NAPTR rr_preference set to number for rpc output - it was set to string, causing a crash - reported by GH #1680 (cherry picked from commit b29f333ab118c88d35fa51298cd7ef99857dbba7) --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/2a5255880fb9b22bcc5d16155469354… Patch: https://github.com/kamailio/kamailio/commit/2a5255880fb9b22bcc5d16155469354… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index ab91a2077a..6363cefe38 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3882,7 +3882,7 @@ int dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_NAPTR: - if(rpc->struct_add(sh, "ds", + if(rpc->struct_add(sh, "dd", "rr_order", ((struct naptr_rdata*)(rr->rdata))->order, "rr_preference", ((struct naptr_rdata*)(rr->rdata))->pref) <0) {

6 years, 1 month

git:5.1:df62658b: core: info log at startup with number of precesses, pkg and shm sizes

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: df62658bb3af88b69c4dc4d019b4814967f9f8e3 URL: https://github.com/kamailio/kamailio/commit/df62658bb3af88b69c4dc4d019b4814… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:28:55+02:00 core: info log at startup with number of precesses, pkg and shm sizes - useful to see if needed to troubleshoot by analyzing log messages (cherry picked from commit f057e844ba407333ad8d876daa1f6ee49bd41c86) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/df62658bb3af88b69c4dc4d019b4814… Patch: https://github.com/kamailio/kamailio/commit/df62658bb3af88b69c4dc4d019b4814… --- diff --git a/src/main.c b/src/main.c index ee8239801f..dd33b89a75 100644 --- a/src/main.c +++ b/src/main.c @@ -2608,8 +2608,8 @@ int main(int argc, char** argv) * function being called before this point may rely on the * number of processes ! */ - LM_DBG("Expect (at least) %d kamailio processes in your process list\n", - get_max_procs()); + LM_INFO("processes (at least): %d - shm size: %lu - pkg size: %lu\n", + get_max_procs(), shm_mem_size, pkg_mem_size); #if defined USE_DNS_CACHE && defined USE_DNS_CACHE_STATS if (init_dns_cache_stats(get_max_procs())<0){

6 years, 1 month

git:5.1:df1f0cc7: kamctl: man page - note about prefixing number params with 's:' to enforce string

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: df1f0cc707255e848e8b5defd4c3ec43a7eab3f7 URL: https://github.com/kamailio/kamailio/commit/df1f0cc707255e848e8b5defd4c3ec4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:27:26+02:00 kamctl: man page - note about prefixing number params with 's:' to enforce string (cherry picked from commit 48048b0e372eabdde14460cb539b3e1ecbc13ae5) --- Modified: utils/kamctl/kamctl.8 --- Diff: https://github.com/kamailio/kamailio/commit/df1f0cc707255e848e8b5defd4c3ec4… Patch: https://github.com/kamailio/kamailio/commit/df1f0cc707255e848e8b5defd4c3ec4… --- diff --git a/utils/kamctl/kamctl.8 b/utils/kamctl/kamctl.8 index d82f25dc42..83a09c1703 100644 --- a/utils/kamctl/kamctl.8 +++ b/utils/kamctl/kamctl.8 @@ -40,6 +40,10 @@ inside .B kamctlrc file. +.PP +For some commands, parameters can be prefixed with 's:' in order to enforce +string type (e.g., 's:123456789'). + .SH AUTHORS see

6 years, 1 month

git:5.1:3733918a: utils/kamcmd: man page - note about the suto-conversion of number parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 3733918a287af1f9aa323b0b4e454c2db409ac9a URL: https://github.com/kamailio/kamailio/commit/3733918a287af1f9aa323b0b4e454c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:27:14+02:00 utils/kamcmd: man page - note about the suto-conversion of number parameters (cherry picked from commit c998a7cc2d265d6e3c0e10facc280866495d827e) --- Modified: utils/kamcmd/kamcmd.8 --- Diff: https://github.com/kamailio/kamailio/commit/3733918a287af1f9aa323b0b4e454c2… Patch: https://github.com/kamailio/kamailio/commit/3733918a287af1f9aa323b0b4e454c2… --- diff --git a/utils/kamcmd/kamcmd.8 b/utils/kamcmd/kamcmd.8 index 017c814dfe..c2355243fd 100644 --- a/utils/kamcmd/kamcmd.8 +++ b/utils/kamcmd/kamcmd.8 @@ -22,6 +22,14 @@ It can be used to manage users, domains, aliases and other server options. .B \-h display a short usage description, including all available options. +.SH NOTE +.B kamcmd +tries to convert number parameters to integer, to avoid it, prefix the number +with +.B 's:' +, like +.B 's:123456789'. + .SH AUTHORS see

6 years, 1 month

git:5.1:3d203d97: dialplan: note and example for prefixing string param with s: for rpc dialplan.translate

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 3d203d97f28e8d5eefb5ea63c0f3ff12b3cb9d2f URL: https://github.com/kamailio/kamailio/commit/3d203d97f28e8d5eefb5ea63c0f3ff1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:26:58+02:00 dialplan: note and example for prefixing string param with s: for rpc dialplan.translate (cherry picked from commit a169b298018f08a57da8e7a8c116560ee4fff006) --- Modified: src/modules/dialplan/doc/dialplan_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d203d97f28e8d5eefb5ea63c0f3ff1… Patch: https://github.com/kamailio/kamailio/commit/3d203d97f28e8d5eefb5ea63c0f3ff1… --- diff --git a/src/modules/dialplan/doc/dialplan_admin.xml b/src/modules/dialplan/doc/dialplan_admin.xml index e9f8f95350..ed8bad4fae 100644 --- a/src/modules/dialplan/doc/dialplan_admin.xml +++ b/src/modules/dialplan/doc/dialplan_admin.xml @@ -682,10 +682,12 @@ xlog("translated to var $var(y) \n"); <para>Parameters: <emphasis>2</emphasis></para> <itemizedlist> <listitem> - <para><emphasis>Dial plan ID</emphasis></para> + <para><emphasis>Dial plan ID</emphasis> (number)</para> </listitem> <listitem> - <para><emphasis>Input String</emphasis></para> + <para><emphasis>Input string</emphasis> (string) - it + can be prefixed with 's:' to avoid auto-conversion when + the command is executed with CLI apps such as &kamcmd;.</para> </listitem> </itemizedlist> <para> @@ -693,6 +695,7 @@ xlog("translated to var $var(y) \n"); </para> <programlisting format="linespecific"> &kamcmd; dialplan.translate 1 "abcdxyz" + &kamcmd; dialplan.translate 1 s:123456789 </programlisting> </section> </section>

6 years, 1 month

git:5.1:18ab2fbe: db_postgres: docs for bytea_output_escape

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 18ab2fbe8d7d24d2cb88b3bee9d9a1bf1eede5d5 URL: https://github.com/kamailio/kamailio/commit/18ab2fbe8d7d24d2cb88b3bee9d9a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:26:32+02:00 db_postgres: docs for bytea_output_escape (cherry picked from commit 99368909cdfc5140a1948525c5c734252f998efb) --- Modified: src/modules/db_postgres/doc/db_postgres_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/18ab2fbe8d7d24d2cb88b3bee9d9a1b… Patch: https://github.com/kamailio/kamailio/commit/18ab2fbe8d7d24d2cb88b3bee9d9a1b… --- diff --git a/src/modules/db_postgres/doc/db_postgres_admin.xml b/src/modules/db_postgres/doc/db_postgres_admin.xml index e218294736..bc4d326dca 100644 --- a/src/modules/db_postgres/doc/db_postgres_admin.xml +++ b/src/modules/db_postgres/doc/db_postgres_admin.xml @@ -151,6 +151,25 @@ modparam("db_postgres", "lockset", 6) </example> </section> + <section id="db_postgres.p.bytea_output_escape"> + <title><varname>bytea_output_escape</varname> (integer)</title> + <para> + Control if the module should request escaping the output for + bytea fields. + </para> + <para> + Default value is 1 (do the escape). + </para> + <example> + <title>Set <varname>bytea_output_escape</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_postgres", "bytea_output_escape", 0) +... +</programlisting> + </example> + </section> + </section> <section>

6 years, 1 month

git:5.1:c7250e72: db_postgres: new parameter bytea_output_escape

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: c7250e725d1c2c32f579cf4803619c41e52cf825 URL: https://github.com/kamailio/kamailio/commit/c7250e725d1c2c32f579cf4803619c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-19T08:26:23+02:00 db_postgres: new parameter bytea_output_escape - control escaping output for bytea fields - default 1 (do the escape) (cherry picked from commit 861205b8aeed19fe8693e21fe5f1856f1dcb08c5) --- Modified: src/modules/db_postgres/km_pg_con.c Modified: src/modules/db_postgres/pg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c7250e725d1c2c32f579cf4803619c4… Patch: https://github.com/kamailio/kamailio/commit/c7250e725d1c2c32f579cf4803619c4… --- diff --git a/src/modules/db_postgres/km_pg_con.c b/src/modules/db_postgres/km_pg_con.c index b66a94a0fb..f6a2b8c8e0 100644 --- a/src/modules/db_postgres/km_pg_con.c +++ b/src/modules/db_postgres/km_pg_con.c @@ -37,6 +37,8 @@ #include <netinet/tcp.h> +extern int pg_bytea_output_escape; + /*! * \brief Create a new connection * @@ -52,7 +54,7 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) int i = 0; const char *keywords[10], *values[10]; char to[16]; - PGresult *res; + PGresult *res = NULL; LM_DBG("db_id = %p\n", id); @@ -142,15 +144,16 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) } #endif - res = PQexec(ptr->con, "SET bytea_output=escape"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) - { - LM_ERR("cannot set blob output escaping format\n"); + if(pg_bytea_output_escape!=0) { + res = PQexec(ptr->con, "SET bytea_output=escape"); + if (PQresultStatus(res) != PGRES_COMMAND_OK) + { + LM_ERR("cannot set blob output escaping format\n"); + PQclear(res); + goto err; + } PQclear(res); - goto err; } - PQclear(res); - return ptr; err: diff --git a/src/modules/db_postgres/pg_mod.c b/src/modules/db_postgres/pg_mod.c index be70e911e4..4d5849a290 100644 --- a/src/modules/db_postgres/pg_mod.c +++ b/src/modules/db_postgres/pg_mod.c @@ -58,6 +58,7 @@ int pg_retries = int pg_lockset = 4; int pg_timeout = 0; /* default = no timeout */ int pg_keepalive = 0; +int pg_bytea_output_escape = 1; /* * Postgres module interface @@ -91,6 +92,7 @@ static param_export_t params[] = { {"lockset", PARAM_INT, &pg_lockset}, {"timeout", PARAM_INT, &pg_timeout}, {"tcp_keepalive", PARAM_INT, &pg_keepalive}, + {"bytea_output_escape", PARAM_INT, &pg_bytea_output_escape}, {0, 0, 0} };

6 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2018