sr-dev May 2014

sr-dev@lists.kamailio.org

34 participants
238 discussions

[tracker] Comment added: kamailio sometimes crash when handling failure events

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#427 - kamailio sometimes crash when handling failure events User who did this - Pawel Sternal (Sternik) ---------- It seems that the patch helped. Kamailio running almost three days without crashing and ALERT logs in syslog files. Many thanks :-) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=427#comment1478 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 7 months

git:master: Core: Bugfix: Do not reset tcp_listeners: We may only listen on TCP.

by Carsten Bock

Module: sip-router Branch: master Commit: 9b9d15875aa09a5574ff0754309f4f77161d3194 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b9d158… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu May 22 21:07:17 2014 +0200 Core: Bugfix: Do not reset tcp_listeners: We may only listen on TCP. --- main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/main.c b/main.c index bcfcf9f..63a6b13 100644 --- a/main.c +++ b/main.c @@ -1789,7 +1789,7 @@ static int calc_proc_no(void) tcp_listeners += tcp_e_listeners; #ifdef USE_TLS tcp_e_listeners = 0; - for (si=tls_listen, tcp_listeners=0, tcp_e_listeners=0; si; si=si->next) { + for (si=tls_listen, tcp_e_listeners=0; si; si=si->next) { if(si->workers>0) tcp_listeners += si->workers; else {

10 years, 7 months

git:master: modules/ims_usrloc_pcscf: fixed bug, not fetching associated IMPUs from DB during preload of domain on startup

by Jason Penton

Module: sip-router Branch: master Commit: 1323d05b304d2f527ca67036b23beb5967d0e89a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1323d05… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu May 22 14:52:43 2014 +0200 modules/ims_usrloc_pcscf: fixed bug, not fetching associated IMPUs from DB during preload of domain on startup --- modules/ims_usrloc_pcscf/udomain.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index dd6ec4d..d655dea 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -715,18 +715,17 @@ static inline pcontact_info_t* dbrow2info( db_val_t *vals, str *contact) if (VAL_NULL(vals+5) || !rx_session_id.s || !rx_session_id.s[0]) { rx_session_id.len = 0; rx_session_id.s = 0; - LM_DBG("2\n"); } else { rx_session_id.len = strlen(rx_session_id.s); } ci.rx_regsession_id = &rx_session_id; if (VAL_NULL(vals + 6)) { - LM_CRIT("empty registration state in DB\n"); + LM_ERR("empty registration state in DB\n"); return 0; } ci.reg_state = VAL_INT(vals + 6); if (VAL_NULL(vals + 7)) { - LM_CRIT("empty expire\n"); + LM_ERR("empty expire\n"); return 0; } ci.expires = VAL_TIME(vals + 7); @@ -741,7 +740,7 @@ static inline pcontact_info_t* dbrow2info( db_val_t *vals, str *contact) //public IDs - implicit set implicit_impus.s = (char*) VAL_STRING(vals + 10); - if (!VAL_NULL(vals + 8) && implicit_impus.s && implicit_impus.s[0]) { + if (!VAL_NULL(vals + 10) && implicit_impus.s && implicit_impus.s[0]) { //how many n=0; p = implicit_impus.s;

10 years, 7 months

git:master: modules/ims_usrloc_scscf: Added ability to do AKA resync of auth vectors

by Jason Penton

Module: sip-router Branch: master Commit: 65e945a66fa0df8742b0af55d3cc56e28f36e1cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65e945a… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed May 21 21:51:11 2014 +0200 modules/ims_usrloc_scscf: Added ability to do AKA resync of auth vectors - this functionality is required for AKA authentication between network and SIM should they get out of sync with each other re. sequence numbers --- modules/ims_auth/api.h | 1 + modules/ims_auth/authims_mod.c | 1 + modules/ims_auth/authorize.c | 214 +++++++++++++++++++++++++++++++++++----- modules/ims_auth/authorize.h | 1 + modules/ims_auth/cxdx_mar.c | 39 ++++---- modules/ims_auth/cxdx_mar.h | 1 + 6 files changed, 212 insertions(+), 45 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=65e…

10 years, 7 months

git:master: modules/ims_auth: fixed unlocking of usrloc hash slots

by Jason Penton

Module: sip-router Branch: master Commit: 8166802f171367fd3d60ac27cfeda3443c6f95b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8166802… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed May 21 21:47:38 2014 +0200 modules/ims_auth: fixed unlocking of usrloc hash slots - can cause deadlock --- modules/ims_usrloc_scscf/usrloc_db.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/ims_usrloc_scscf/usrloc_db.c b/modules/ims_usrloc_scscf/usrloc_db.c index 4fad64e..044ca98 100644 --- a/modules/ims_usrloc_scscf/usrloc_db.c +++ b/modules/ims_usrloc_scscf/usrloc_db.c @@ -637,6 +637,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) { if (impu_id < 0) { LM_ERR("impu_id has not been set [%.*s] - we cannot read contacts from DB....aborting preload\n", impu.len, impu.s); //TODO: check frees + unlock_udomain(_d, &impu); continue; } impu_id_len = int_to_str_len(impu_id); @@ -649,6 +650,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) { if (!query_buffer.s) { LM_ERR("mo more pkg mem\n"); //TODO: check free + unlock_udomain(_d, &impu); return -1; } query_buffer_len = len; @@ -661,11 +663,13 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) { LM_ERR("Unable to query DB for contacts associated with impu [%.*s]\n", impu.len, impu.s); ul_dbf.free_result(_c, contact_rs); + unlock_udomain(_d, &impu); continue; } if (RES_ROW_N(contact_rs) == 0) { LM_DBG("no contacts associated with impu [%.*s]\n",impu.len, impu.s); ul_dbf.free_result(_c, contact_rs); + unlock_udomain(_d, &impu); continue; } @@ -682,6 +686,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) { } if (dbrow2contact(contact_vals, &contact_data) != 0) { LM_ERR("unable to convert contact row from DB into valid data... moving on\n"); + unlock_udomain(_d, &impu); continue; } @@ -695,6 +700,7 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) { if (ul_dbf.fetch_result(_c, &contact_rs, ul_fetch_rows) < 0) { LM_ERR("fetching rows failed\n"); ul_dbf.free_result(_c, contact_rs); + unlock_udomain(_d, &impu); return -1; } } else {

10 years, 7 months

[tracker] Task opened: maddr broken in 4.1.x?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Morten Tryfoss (mtryfoss) Attached to Project - sip-router Summary - maddr broken in 4.1.x? Task Type - Bug Report Category - tm Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - 4.1 Due in Version - Undecided Due Date - Undecided Details - maddr is used in all lync-setups. Kamailio 4.1.1 receives this, which should be forwarded: PRACK sip:med002.lync4all.intra:5060;transport=Tcp;maddr=<publicip> And returns this error when using t_relay(): May 20 22:59:19 sip3ha /usr/sbin/kamailio[24754]: ERROR: <core> [resolve.c:1733]: sip_hostport2su(): ERROR: sip_hostport2su: could not resolve hostname: "med002.lync4all.intra" May 20 22:59:19 sip3ha /usr/sbin/kamailio[24754]: ERROR: tm [ut.h:337]: uri2dst2(): failed to resolve "med002.lync4all.intra" May 20 22:59:19 sip3ha /usr/sbin/kamailio[24754]: ERROR: tm [t_fwd.c:1773]: t_forward_nonack(): ERROR: t_forward_nonack: failure to add branches It seems like it worked in 3.3.x. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=433 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 7 months

Fwd: kamailio 4.1 segfault with MySQL auth

by Peter Villeneuve

Ah, that would explain it then. Thanks, working now. Mystery solved. On Tue, May 20, 2014 at 6:26 PM, Daniel-Constantin Mierla <miconda(a)gmail.com > wrote: > This is related to: > > > http://sip-router.org/tracker/index.php?do=details&task_id=425&project=1&or… > > For now, can you add? > > listen=tcp:127.0.0.1:5060 > > This will not expose any tcp to outside world. > > Cheers, > Daniel > > > On 20/05/14 19:08, Peter Villeneuve wrote: > > I'm listening on TLS only, listen=tls:my-public.ip:5071 > I don't see any tcp_children in kamailio.cfg at all. I have fork=yes and > children=4 > > (gdb) frame 1 > #1 0x00000000005328da in send2child (tcpconn=0x7f05815ddda8) at > tcp_main.c:3979 > 3979 in tcp_main.c > (gdb) p tcp_children[0] > $1 = {pid = 775369265, proc_no = 774909488, unix_sock = 926351409, busy = > 12851, mysocket = 0xc0c0c0c0, n_reqs = -1412567058} > > Thanks > > > > > On Tue, May 20, 2014 at 5:37 PM, Daniel-Constantin Mierla < > miconda(a)gmail.com> wrote: > >> What is the value of tcp_children on your config? Do you listen on a tcp >> socket? >> >> I need also more from gdb: >> >> frame 1 >> p tcp_children[0] >> >> Daniel >> >> >> On 20/05/14 17:44, Peter Villeneuve wrote: >> >> Sure. Thanks Daniel. >> >> >> #0 handle_ser_child (p=0x7f1ec3adc1d8, fd_i=fd_i@entry=-1) at >> tcp_main.c:3579 >> tcpconn = <optimized out> >> tmp = <optimized out> >> response = {9034836, 2086} >> cmd = <optimized out> >> bytes = <optimized out> >> ret = -1 >> fd = <optimized out> >> flags = <optimized out> >> t = <optimized out> >> con_lifetime = <optimized out> >> nxt_timeout = <optimized out> >> __FUNCTION__ = "handle_ser_child" >> #1 0x00000000005328da in send2child (tcpconn=0x7f05815ddda8) at >> tcp_main.c:3979 >> i = <optimized out> >> min_busy = <optimized out> >> idx = 0 >> wlast = <optimized out> >> last = <optimized out> >> crt = 1 >> wfirst = <optimized out> >> #2 handle_tcpconn_ev (tcpconn=0x7f05815ddda8, ev=<optimized out>, >> ev@entry=1, fd_i=fd_i@entry=-1) at tcp_main.c:4314 >> empty_q = <optimized out> >> bytes = 0 >> __FUNCTION__ = "handle_tcpconn_ev" >> #3 0x000000000053c428 in handle_io (idx=-1, ev=<optimized out>, >> fm=<optimized out>) at tcp_main.c:4366 >> ret = <optimized out> >> #4 io_wait_loop_epoll (repeat=repeat@entry=0, t=5, h=0x89dc40) at >> io_wait.h:1092 >> n = 1 >> r = <optimized out> >> fm = 0x7f058b9da368 >> revents = 1 >> #5 0x0000000000544577 in tcp_main_loop () at tcp_main.c:4660 >> si = <optimized out> >> r = <optimized out> >> __FUNCTION__ = "tcp_main_loop" >> #6 0x00000000004821a8 in main_loop () at main.c:1711 >> i = <optimized out> >> pid = <optimized out> >> si = 0x0 >> si_desc = >> "\t\000\000\000\005\177\000\000\000\000\034\000\000\000\000\000\001\000\000\000\005\177\000\000\310\311\027\206\005\177", >> '\000' <repeats 18 times>, >> "pn\233\213\005\177\000\000\002\000\000\000\000\000\000\000\f\b\000\000\000\000\000\000@ >> \333`\000\000\000\000\000\003\000\000\000\377\177\000\000\000!\006\370\033\340\337\001\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\210ٓ\000\000\000\000\000\200ٓ\000\000\000\000" >> nrprocs = <optimized out> >> __FUNCTION__ = "main_loop" >> >> #7 0x0000000000420585 in main (argc=<optimized out>, argv=<optimized >> out>) at main.c:2533 >> cfg_stream = <optimized out> >> c = <optimized out> >> r = <optimized out> >> tmp = 0x7fffd40e1f81 "" >> tmp_len = -737279072 >> port = -163754450 >> proto = -1 >> options = 0x608ab0 >> ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" >> ret = -1 >> seed = 542838069 >> rfd = 0 >> ---Type <return> to continue, or q <return> to quit--- >> debug_save = <optimized out> >> debug_flag = <optimized out> >> dont_fork_cnt = <optimized out> >> n_lst = 0x0 >> p = <optimized out> >> __FUNCTION__ = "main" >> (gdb) p *p >> Cannot access memory at address 0x7f1ec3adc1d8 >> (gdb) >> >> >> >> On Tue, May 20, 2014 at 4:04 PM, Daniel-Constantin Mierla < >> miconda(a)gmail.com> wrote: >> >>> Hello, >>> >>> can you get the output of gdb for 'bt full'? >>> >>> As well as 'p *p'? >>> >>> Daniel >>> >>> >>> On 20/05/14 15:59, Peter Villeneuve wrote: >>> >>> Well I ended up dumping the core and this is what GDB tells me. >>> How can tcp_main.c be missing if I installed the deb packages? Weird. >>> >>> What do people suggest I do from here? Remove the deb packages and >>> compile directly from git? >>> >>> Thanks, >>> >>> Peter >>> >>> >>> me@myhost:/$ sudo gdb /usr/sbin/kamailio /home/corefiles/core2 >>> GNU gdb (GDB) 7.4.1-debian >>> Copyright (C) 2012 Free Software Foundation, Inc. >>> License GPLv3+: GNU GPL version 3 or later < >>> http://gnu.org/licenses/gpl.html> >>> This is free software: you are free to change and redistribute it. >>> There is NO WARRANTY, to the extent permitted by law. Type "show >>> copying" >>> and "show warranty" for details. >>> This GDB was configured as "x86_64-linux-gnu". >>> For bug reporting instructions, please see: >>> <http://www.gnu.org/software/gdb/bugs/>... >>> Reading symbols from /usr/sbin/kamailio...Reading symbols from >>> /usr/lib/debug/.build-id/dd/9191ec1e595a90e4844b8ccd1c70b3c92037a1.debug...done. >>> done. >>> [New LWP 30988] >>> >>> warning: Could not load shared library symbols for linux-vdso.so.1. >>> Do you need "set solib-search-path" or "set sysroot"? >>> [Thread debugging using libthread_db enabled] >>> Using host libthread_db library >>> "/lib/x86_64-linux-gnu/libthread_db.so.1". >>> Core was generated by `/usr/sbin/kamailio -f /etc/kamailio/kamailio.cfg >>> -P /var/run/kamailio/kamailio.'. >>> Program terminated with signal 11, Segmentation fault. >>> #0 handle_ser_child (p=0x7f1ec3adc1d8, fd_i=fd_i@entry=-1) at >>> tcp_main.c:3579 >>> 3579 *tcp_main.c: No such file or directory*. >>> (gdb) backtrace >>> #0 handle_ser_child (p=0x7f1ec3adc1d8, fd_i=fd_i@entry=-1) at >>> tcp_main.c:3579 >>> #1 0x00000000005328da in send2child (tcpconn=0x7f05815ddda8) at >>> tcp_main.c:3979 >>> #2 handle_tcpconn_ev (tcpconn=0x7f05815ddda8, ev=<optimized out>, >>> ev@entry=1, fd_i=fd_i@entry=-1) at tcp_main.c:4314 >>> #3 0x000000000053c428 in handle_io (idx=-1, ev=<optimized out>, >>> fm=<optimized out>) at tcp_main.c:4366 >>> #4 io_wait_loop_epoll (repeat=repeat@entry=0, t=5, h=0x89dc40) at >>> io_wait.h:1092 >>> #5 0x0000000000544577 in tcp_main_loop () at tcp_main.c:4660 >>> #6 0x00000000004821a8 in main_loop () at main.c:1711 >>> #7 0x0000000000420585 in main (argc=<optimized out>, argv=<optimized >>> out>) at main.c:2533 >>> (gdb) >>> >>> >>> >>> On Tue, May 20, 2014 at 11:33 AM, Peter Villeneuve <petervnv1(a)gmail.com>wrote: >>> >>>> Hi, >>>> >>>> I posted previously on this issue but never got any replies. >>>> >>>> Has anyone had this experience with 4.1? >>>> It seems that as soon as a UAC tries to register, Kamailio segfaults: >>>> >>>> May 20 09:41:00 vmhost /usr/sbin/kamailio[27806]: ALERT: <core> >>>> [main.c:775]: handle_sigs(): child process 27813 exited by a signal 11 >>>> May 20 09:41:00 vmhost /usr/sbin/kamailio[27806]: ALERT: <core> >>>> [main.c:778]: handle_sigs(): core was not generated >>>> May 20 09:41:00 vmhost /usr/sbin/kamailio[27806]: INFO: <core> >>>> [main.c:790]: handle_sigs(): INFO: terminating due to SIGCHLD >>>> May 20 09:41:00 vmhost kernel: [251087.555502] kamailio[27813]: *segfault >>>> at* 7fa5d1d0a1dc ip 0000000000536104 sp 00007fffaade6c20 error 4 in >>>> kamailio[400000+27a000] >>>> May 20 09:41:00 vmhost /usr/sbin/kamailio[27812]: INFO: <core> >>>> [main.c:841]: sig_usr(): INFO: signal 15 received >>>> >>> >>> >>> >>> _______________________________________________ >>> sr-dev mailing listsr-dev@lists.sip-router.orghttp://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev >>> >>> >>> -- >>> Daniel-Constantin Mierla - http://www.asipto.comhttp://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda >>> >>> >>> _______________________________________________ >>> sr-dev mailing list >>> sr-dev(a)lists.sip-router.org >>> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev >>> >>> >> >> -- >> Daniel-Constantin Mierla - http://www.asipto.comhttp://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda >> >> > > -- > Daniel-Constantin Mierla - http://www.asipto.comhttp://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda > >

10 years, 7 months

[tracker] Comment added: No TCP-Children, when listening only on TLS-Sockets

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#425 - No TCP-Children, when listening only on TLS-Sockets User who did this - Daniel-Constantin Mierla (miconda) ---------- I pushed a patch for it, testing and feedback is appreciated. When all is ok, I will backport: - http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eea7f9d… ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=425#comment1477 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 7 months

git:master: core: allow listening on tls without listening on tcp

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: eea7f9d04090a736c8a0f2b2a350c08635cc8e39 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eea7f9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 21 09:55:46 2014 +0200 core: allow listening on tls without listening on tcp - reported in FS#425 --- main.c | 12 ++++++++++++ tcp_main.c | 11 +++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/main.c b/main.c index 89115a4..bcfcf9f 100644 --- a/main.c +++ b/main.c @@ -1787,6 +1787,18 @@ static int calc_proc_no(void) tcp_e_listeners = tcp_cfg_children_no; } tcp_listeners += tcp_e_listeners; +#ifdef USE_TLS + tcp_e_listeners = 0; + for (si=tls_listen, tcp_listeners=0, tcp_e_listeners=0; si; si=si->next) { + if(si->workers>0) + tcp_listeners += si->workers; + else { + if(tcp_listeners==0) + tcp_e_listeners = tcp_cfg_children_no; + } + } + tcp_listeners += tcp_e_listeners; +#endif tcp_children_no = tcp_listeners; #endif #ifdef USE_SCTP diff --git a/tcp_main.c b/tcp_main.c index 701f90f..5a43d2c 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -4934,6 +4934,17 @@ int tcp_init_children() } } } +#ifdef USE_TLS + for(si=tls_listen; si; si=si->next) { + if(si->workers>0) { + si->workers_tcpidx = i - si->workers + 1; + for(r=0; r<si->workers; r++) { + tcp_children[i].mysocket = si; + i--; + } + } + } +#endif tcp_sockets_gworkers = (i != tcp_children_no-1)?(1 + i + 1):0; /* create the tcp sock_info structures */

10 years, 7 months

git:master: dispatcher: ds_select_dst/domain can take args as string ( not only int)

by Ovidiu Sas

Module: sip-router Branch: master Commit: 196c65fdc5d2526d3c777b22ec37eef200cd08ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=196c65f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue May 20 13:47:44 2014 -0400 dispatcher: ds_select_dst/domain can take args as string (not only int) - internal converion of string->int (if possible) --- modules/dispatcher/dispatcher.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index b07cc24..b7a5236 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -545,23 +545,39 @@ static void destroy(void) } +#define GET_VALUE(param_name,param,i_value,s_value,value_flags) do{ \ + if(get_is_fparam(&(i_value), &(s_value), msg, (fparam_t*)(param), &(value_flags))!=0) { \ + LM_ERR("no %s value\n", (param_name)); \ + return -1; \ + } \ +}while(0) + /** * */ static int w_ds_select(struct sip_msg* msg, char* set, char* alg, int mode) { + unsigned int algo_flags, set_flags; + str s_algo = {NULL, 0}; + str s_set = {NULL, 0}; int a, s; if(msg==NULL) return -1; - if(fixup_get_ivalue(msg, (gparam_p)set, &s)!=0) - { - LM_ERR("no dst set value\n"); + GET_VALUE("destination set", set, s, s_set, set_flags); + if (!(set_flags&PARAM_INT)) { + if (set_flags&PARAM_STR) + LM_ERR("unable to get destination set from [%.*s]\n", s_set.len, s_set.s); + else + LM_ERR("unable to get destination set\n"); return -1; } - if(fixup_get_ivalue(msg, (gparam_p)alg, &a)!=0) - { - LM_ERR("no alg value\n"); + GET_VALUE("algorithm", alg, a, s_algo, algo_flags); + if (!(algo_flags&PARAM_INT)) { + if (algo_flags&PARAM_STR) + LM_ERR("unable to get algorithm from [%.*s]\n", s_algo.len, s_algo.s); + else + LM_ERR("unable to get algorithm\n"); return -1; }

10 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2014