sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

[tracker] Task opened: typo in debian packaging files (kamailio-xmlrcp-modules)
by sip-router 02 Sep '11

02 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Andrew Pogrebennyk (marduk) Attached to Project - sip-router Summary - typo in debian packaging files (kamailio-xmlrcp-modules) Task Type - Bug Report Category - tools/scripts Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Some debian control files contain "kamailio-xmlrcp-modules" instead of "kamailio-xmlrpc-modules": $ fgrep -Rn xmlrcp kamailio/pkg pkg/kamailio/deb/lenny/control:105:Provides: kamailio-xmlrcp-modules pkg/kamailio/deb/debian/control:105:Provides: kamailio-xmlrcp-modules pkg/kamailio/deb/lucid/control:105:Provides: kamailio-xmlrcp-modules pkg/kamailio/deb/squeeze/control:105:Provides: kamailio-xmlrcp-modules More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=148 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.

1 0

git:alexh/master: core: allow negative decimal numbers in configuration file parser
by Alex Hermann 02 Sep '11

02 Sep '11

Module: sip-router Branch: alexh/master Commit: 99f314429cea4341240836e9c9d62c38176eae12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99f3144… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Aug 5 15:32:14 2011 +0200 core: allow negative decimal numbers in configuration file parser --- cfg.lex | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index ff35a8a..ecf92db 100644 --- a/cfg.lex +++ b/cfg.lex @@ -525,7 +525,7 @@ NUM_ID {ALPHANUM}+ HEX [0-9a-fA-F] HEXNUMBER 0x{HEX}+ OCTNUMBER 0[0-7]+ -DECNUMBER 0|([1-9]{DIGIT}*) +DECNUMBER 0|(-?[1-9]{DIGIT}*) BINNUMBER [0-1]+b HEX4 {HEX}{1,4} IPV6ADDR ({HEX4}":"){7}{HEX4}|({HEX4}":"){1,7}(":"{HEX4}){1,7}|":"(":"{HEX4}){1,7}|({HEX4}":"){1,7}":"|"::"

2 2

git:master: sctp: update the cfg before handling notifications
by Andrei Pelinescu-Onciul 02 Sep '11

02 Sep '11

Module: sip-router Branch: master Commit: 5813703a7931f288b95840b9a93c628773c33a03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5813703… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Sep 2 10:22:35 2011 +0200 sctp: update the cfg before handling notifications Update the local config immediately after successfully reading a message (before processing notifications, since some of the notifications processing makes use of cfg values). --- sctp_server.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sctp_server.c b/sctp_server.c index cfd7015..fbe83ea 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -2460,6 +2460,9 @@ int sctp_rcv_loop() continue; /* goto skip;*/ else goto error; } + /* update the local config */ + cfg_update(); + if (unlikely(msg.msg_flags & MSG_NOTIFICATION)){ /* intercept useful notifications */ sctp_handle_notification(bind_address, &ri.src_su, buf, len); @@ -2518,8 +2521,6 @@ int sctp_rcv_loop() #ifdef USE_COMP ri.comp=COMP_NONE; #endif - /* update the local config */ - cfg_update(); #ifdef SCTP_CONN_REUSE if (likely(cfg_get(sctp, sctp_cfg, assoc_tracking) && sinfo)){ ri.proto_reserved1 = sctp_con_track(sinfo->sinfo_assoc_id,

1 0

Kamailio segfaults on shutdown since commit 7b3a6ec
by Alex Hermann 01 Sep '11

01 Sep '11

Hello Andrei, all, On my git master installations, Kamailio segfaults on logging "Thanks for flying Kamailio" on shutdown (backtrace below). A bisection on the repository pointed to the following commit as the culprit: commit 7b3a6eca7bb6dd1ca2a1395ca1e5821808ec85cd Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 12 21:54:07 2011 +0200 core: pkg mem size configurable form the cmd line The pkg mem size used can be configured by using the "-M" parameter on the command line, e.g.: ser -M 8 -f test.cfg # start ser with 8mb of pkg memory The default remains 4Mb. The following patch works around the issue, but maybe someone more knowledgable in this part of the code can create a real fix. commit 73cbfbba811b964b6a8db1096d97b4af503c030a Author: Alex Hermann <alex(a)speakup.nl> Date: Thu Sep 1 14:07:59 2011 +0200 core: disable logging on shutdown after killing children, causing segfault diff --git a/main.c b/main.c index 45f0a6a..28adbe0 100644 --- a/main.c +++ b/main.c @@ -701,7 +701,6 @@ void handle_sigs() DBG("SIGTERM received, program terminates\n"); /* shutdown/kill all the children */ shutdown_children(SIGTERM, 1); - LOG(L_NOTICE, "Thank you for flying " NAME "\n"); exit(0); break; Backtrace: Core was generated by `/usr/sbin/kamailio -f /home/alex/balancer/kamailio.cfg -m 64 -M 6 -u'. Program terminated with signal 11, Segmentation fault. #0 __strlen_sse2 () at ../sysdeps/x86_64/multiarch/../strlen.S:31 31 ../sysdeps/x86_64/multiarch/../strlen.S: No such file or directory. in ../sysdeps/x86_64/multiarch/../strlen.S (gdb) bt full #0 __strlen_sse2 () at ../sysdeps/x86_64/multiarch/../strlen.S:31 No locals. #1 0x00007f7cdd820aee in *__GI_fputs_unlocked (str=0x7f7cdd1fc480 <Address 0x7f7cdd1fc480 out of bounds>, fp=0x1dcf2d0) at iofputs_u.c:37 result = <value optimized out> #2 0x00007f7cdd8831eb in *__GI___vsyslog_chk (pri=<value optimized out>, flag=-1, fmt=<value optimized out>, ap=0x7fffb73d9bb0) at ../misc/syslog.c:207 now_tm = {tm_sec = 44, tm_min = 54, tm_hour = 10, tm_mday = 1, tm_mon = 8, tm_year = 111, tm_wday = 4, tm_yday = 243, tm_isdst = 1, tm_gmtoff = 7200, tm_zone = 0x1d3fde0 "CEST"} now = 1314867284 fd = <value optimized out> f = <value optimized out> buf = 0x0 bufsize = 0 msgoff = <value optimized out> saved_errno = 10 failbuf = "\000\000\000\000\000\000\000\000\377\377\377\377\000\000\000\000\340\241~\335|\177\000\000\r\241~\335|" clarg = {buf = 0x1, oldaction = 0x2000} #3 0x00007f7cdd8837d0 in __syslog (pri=-585120640, fmt=0x15 <Address 0x15 out of bounds>) at ../misc/syslog.c:119 ap = {{gp_offset = 16, fp_offset = 48, overflow_arg_area = 0x7fffb73d9c90, reg_save_area = 0x7fffb73d9bd0}} #4 0x0000000000460744 in handle_sigs () at main.c:704 chld = <value optimized out> chld_status = <value optimized out> memlog = <value optimized out> #5 0x0000000000462736 in main_loop () at main.c:1709 i = 8 pid = <value optimized out> si = 0x0 si_desc = "udp receiver child=7 sock=xxx.xxx.xxx.xxx:8060\000\000\030E#\335|\177\000\000\005\000\000\000\002\000\000\000\003", '\000' <repeats 15 times>"\240, =\214", '\000' <repeats 29 times>"\240, \277=\267\377\177\000\000GNJ\000\000\000\000" #6 0x0000000000463dd3 in main (argc=1, argv=0x7fffb73d9f18) at main.c:2471 cfg_stream = <value optimized out> c = <value optimized out> r = <value optimized out> tmp = 0x7fffb73dbf8b "" tmp_len = 0 port = <value optimized out> proto = <value optimized out> ret = <value optimized out> seed = 1436424957 rfd = <value optimized out> debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = <value optimized out> -- Greetings, Alex Hermann

1 0

git:master: modules_k/sqlops: small bug fix to sqlops_get_value
by Peter Dunkley 01 Sep '11

01 Sep '11

Module: sip-router Branch: master Commit: b1a8bfd69c82e700ad31ebda16f571ff610c72a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1a8bfd… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Sep 1 10:26:05 2011 +0100 modules_k/sqlops: small bug fix to sqlops_get_value --- modules_k/sqlops/sql_api.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index 50e4140..d1a4f63 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -710,7 +710,7 @@ int sqlops_get_value(str *sres, int i, int j, sql_val_t **val) LM_ERR("row index out of bounds [%d/%d]\n", i, res->nrows); goto error; } - if(i>=res->ncols) + if(j>=res->ncols) { LM_ERR("column index out of bounds [%d/%d]\n", j, res->ncols); goto error;

1 0

git:jh/mtree: modules/utils: check in_list() separator already in fixup function
by Juha Heinanen 01 Sep '11

01 Sep '11

Module: sip-router Branch: jh/mtree Commit: 36c2ea8fe8a9e2967d7ca66c5bd7d385f671298d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36c2ea8… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Sep 1 11:36:33 2011 +0300 modules/utils: check in_list() separator already in fixup function --- modules/utils/functions.c | 11 +---------- modules/utils/utils.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/utils/functions.c b/modules/utils/functions.c index bdd4491..a95e8f6 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -185,16 +185,7 @@ int in_list(struct sip_msg* _m, char* _subject, char* _list, char* _sep) if (list.len == 0) return -1; } - if (strlen(_sep) != 1) { - LM_ERR("separator needs to be a one charter string\n"); - return -1; - } else { - sep = _sep[0]; - if (sep == 0) { - LM_INFO("separator cannot be NUL\n"); - return -1; - } - } + sep = _sep[0]; at = list.s; past = list.s + list.len; diff --git a/modules/utils/utils.c b/modules/utils/utils.c index 88ea37f..7b5f38b 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -372,8 +372,14 @@ static int fixup_free_http_query(void** param, int param_no) static int fixup_in_list(void** param, int param_no) { if ((param_no == 1) || (param_no == 2)) return fixup_spve_null(param, 1); - - if (param_no == 3) return 0; + + if (param_no == 3) { + if ((strlen((char *)*param) != 1) || (*((char *)(*param)) == 0)) { + LM_ERR("invalid separator parameter\n"); + return -1; + } + return 0; + } LM_ERR("invalid parameter number <%d>\n", param_no); return -1; @@ -388,7 +394,7 @@ static int fixup_free_in_list(void** param, int param_no) LM_WARN("free function has not been defined for spve\n"); return 0; } - + if (param_no == 3) return 0; LM_ERR("invalid parameter number <%d>\n", param_no);

1 0

git:master: - fixed throttling (do not override values when adjust_timeout( ))
by Andrei Pelinescu-Onciul 01 Sep '11

01 Sep '11

Module: sip-router Branch: master Commit: 5fd18d3ccc29c2a194ddcd9b5b533c7c927b0ef1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5fd18d3… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 31 22:02:45 2011 +0200 - fixed throttling (do not override values when adjust_timeout()) --- modules/iptrtpproxy/iptrtpproxy.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/iptrtpproxy/iptrtpproxy.c b/modules/iptrtpproxy/iptrtpproxy.c index 1338be1..3ab0c10 100644 --- a/modules/iptrtpproxy/iptrtpproxy.c +++ b/modules/iptrtpproxy/iptrtpproxy.c @@ -1228,6 +1228,10 @@ inline static void fill_in_session(int flags, int media_idx, struct sdp_session in_session->sh.ttl = global_params.ttl; in_session->sh.flags |= XT_RTPPROXY_SOCKOPT_FLAG_SESSION_TTL; } +} + +inline static void fill_in_session_throttle(int flags, int media_idx, struct xt_rtpproxy_sockopt_session *in_session) { + int j; if (global_params.throttle.mark > 0) { for (j=0; j<2; j++) { in_session->dir[GATE_A_TO_B(flags)].stream[j].throttle.mark = global_params.throttle.mark; @@ -1376,6 +1380,7 @@ ERR("DEBUG_RTPPROXY: module: do not allocate session for on-hold stream unless r } } fill_in_session(flags, i, &global_sdp_sess, ipt_sess.sessions+ipt_sess.session_count); + fill_in_session_throttle(flags, i, ipt_sess.sessions+ipt_sess.session_count); ipt_sess.sdp_media[i] = ipt_sess.session_count; skip_fill: ipt_sess.session_count++; @@ -1666,6 +1671,7 @@ static int rtpproxy_update(struct sip_msg* msg, char* _flags, char* _session_ids if (ipt_sess.sdp_media[i] >= 0) { if (global_sdp_sess.media[i].active) { fill_in_session(flags, i, &global_sdp_sess, ipt_sess.sessions+ipt_sess.sdp_media[i]); + fill_in_session_throttle(flags, i, ipt_sess.sessions+ipt_sess.sdp_media[i]); ipt_sess.sessions[ipt_sess.sdp_media[i]].sh.flags &= ~XT_RTPPROXY_SOCKOPT_FLAG_SESSION_DESTROY; } } @@ -1737,6 +1743,7 @@ static int rtpproxy_adjust_timeout(struct sip_msg* msg, char* _flags, char* _ses for (i = 0; i < ipt_sess.sdp_media_count; i++) { if (ipt_sess.sdp_media[i] >= 0) { fill_in_session(flags, i, NULL, ipt_sess.sessions+ipt_sess.sdp_media[i]); + /* throttle not affected */ } } //ERR("DEBUG_RTPPROXY: module: rtpproxy_adjust_timeout: xt_RTPPROXY_update_sessions(%d), flags:%d, sess:%.*s\n", ipt_sess.session_count, flags, STR_FMT(&session_ids));

1 0

git:jh/mtree: modules/utils: new script function in_list(subject, list, separator)
by Juha Heinanen 01 Sep '11

01 Sep '11

Module: sip-router Branch: jh/mtree Commit: e2f8a96bf5221456113852970f210e37beb39fc8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2f8a96… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Sep 1 09:58:35 2011 +0300 modules/utils: new script function in_list(subject, list, separator) --- modules/utils/README | 40 +++++++++++++++++----- modules/utils/doc/utils.xml | 2 +- modules/utils/doc/utils_admin.xml | 23 +++++++++++++ modules/utils/functions.c | 65 ++++++++++++++++++++++++++++++++++++- modules/utils/functions.h | 8 ++++- modules/utils/utils.c | 38 ++++++++++++++++++++- 6 files changed, 162 insertions(+), 14 deletions(-) diff --git a/modules/utils/README b/modules/utils/README index aaf7d35..b09dd5b 100644 --- a/modules/utils/README +++ b/modules/utils/README @@ -4,7 +4,7 @@ Juha Heinanen TutPro Inc. - Copyright © 2008-2009 Juha Heinanen + Copyright © 2008-2011 Juha Heinanen __________________________________________________________________ Table of Contents @@ -29,6 +29,7 @@ Juha Heinanen 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) 4.3. is_int(pvar) + 4.4. in_list(subject, list, separator) 5. MI Commands @@ -48,10 +49,11 @@ Juha Heinanen 1.5. http_query() usage 1.6. xcap_auth_status() usage 1.7. is_int() usage - 1.8. forward_list usage - 1.9. forward_switch usage - 1.10. forward_filter usage - 1.11. forward_proxy usage + 1.8. in_list() usage + 1.9. forward_list usage + 1.10. forward_switch usage + 1.11. forward_filter usage + 1.12. forward_proxy usage Chapter 1. Admin Guide @@ -75,6 +77,7 @@ Chapter 1. Admin Guide 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) 4.3. is_int(pvar) + 4.4. in_list(subject, list, separator) 5. MI Commands @@ -177,6 +180,7 @@ modparam("utils", "xcap_table", "pres_xcap") 4.1. http_query(url, result) 4.2. xcap_auth_status(watcher_uri, presentity_uri) 4.3. is_int(pvar) + 4.4. in_list(subject, list, separator) 4.1. http_query(url, result) @@ -243,6 +247,24 @@ if (is_int("$var(foo)")) { } ... +4.4. in_list(subject, list, separator) + + Function checks if subject string is found in list string where list + items are separated by separator string. Subject and list strings may + contain pseudo variables. Separator string needs to be one character + long. Returns 1 if subject is found and -1 otherwise. + + Function can be used from all kinds of routes. + + Example 1.8. in_list() usage +... +$var(subject) = "fi"; +$var(list) = "dk,fi,no,se"; +if (in_list("$var(subject)", "$var(list)", ",") { + xlog("L_INFO", "subject is found in list\n"); +} +... + 5. MI Commands 5.1. forward_list @@ -256,7 +278,7 @@ if (is_int("$var(foo)")) { No parameters. - Example 1.8. forward_list usage + Example 1.9. forward_list usage ... kamctl fifo forward_list id switch filter proxy @@ -269,7 +291,7 @@ id switch filter proxy The syntax of this configuration string is described in 1.6. (switch_setting_list). - Example 1.9. forward_switch usage + Example 1.10. forward_switch usage ... kamctl fifo sp_forward_switch 0=on ... @@ -288,7 +310,7 @@ kamctl fifo sp_forward_switch 0=on The syntax of this configuration string is described in 1.6. (filter_setting_list). - Example 1.10. forward_filter usage + Example 1.11. forward_filter usage ... kamctl fifo sp_forward_filter 0=REGISTER:INVITE ... @@ -301,7 +323,7 @@ kamctl fifo sp_forward_filter 0=REGISTER:INVITE switch). The syntax of this configuration string is described in 1.6. (proxy_setting_list). - Example 1.11. forward_proxy usage + Example 1.12. forward_proxy usage ... kamctl fifo sp_forward_proxy 0=host-c.domain-c:5060 ... diff --git a/modules/utils/doc/utils.xml b/modules/utils/doc/utils.xml index dfdb290..86cf93d 100644 --- a/modules/utils/doc/utils.xml +++ b/modules/utils/doc/utils.xml @@ -23,7 +23,7 @@ </author> </authorgroup> <copyright> - <year>2008-2009</year> + <year>2008-2011</year> <holder>Juha Heinanen</holder> </copyright> </bookinfo> diff --git a/modules/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml index 23527d0..bc88cfc 100644 --- a/modules/utils/doc/utils_admin.xml +++ b/modules/utils/doc/utils_admin.xml @@ -251,6 +251,29 @@ if (is_int("$var(foo)")) { </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">in_list(subject, list, separator)</function> + </title> + <para> + Function checks if subject string is found in list string where list items are separated by separator string. Subject and list strings may contain pseudo variables. Separator string needs to be one character long. Returns 1 if subject is found and -1 otherwise. + </para> + <para> + Function can be used from all kinds of routes. + </para> + <example> + <title><function>in_list()</function> usage</title> + <programlisting format="linespecific"> +... +$var(subject) = "fi"; +$var(list) = "dk,fi,no,se"; +if (in_list("$var(subject)", "$var(list)", ",") { + xlog("L_INFO", "subject is found in list\n"); +} +... + </programlisting> + </example> + </section> </section> <section> diff --git a/modules/utils/functions.c b/modules/utils/functions.c index 878073a..bdd4491 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -1,7 +1,7 @@ /* * script functions of utils module * - * Copyright (C) 2008 Juha Heinanen + * Copyright (C) 2008-2011 Juha Heinanen * * This file is part of Kamailio, a free SIP server. * @@ -157,3 +157,66 @@ int is_int(struct sip_msg* _m, char* _pvar, char* _s2) return -1; } + + +/* + * Checks if subject is found in list + */ +int in_list(struct sip_msg* _m, char* _subject, char* _list, char* _sep) +{ + str subject, list; + int sep; + char *at, *past, *s; + + if (fixup_get_svalue(_m, (gparam_p)_subject, &subject) != 0) { + LM_ERR("cannot get subject value\n"); + return -1; + } else { + if (subject.len == 0) { + LM_ERR("subject cannot be empty string\n"); + return -1; + } + } + + if (fixup_get_svalue(_m, (gparam_p)_list, &list) != 0) { + LM_ERR("cannot get list value\n"); + return -1; + } else { + if (list.len == 0) return -1; + } + + if (strlen(_sep) != 1) { + LM_ERR("separator needs to be a one charter string\n"); + return -1; + } else { + sep = _sep[0]; + if (sep == 0) { + LM_INFO("separator cannot be NUL\n"); + return -1; + } + } + + at = list.s; + past = list.s + list.len; + + while (at < past) { + s = index(at, sep); + if (s == NULL) { + if ((subject.len == (past - at)) && + strncmp(at, subject.s, subject.len) == 0) { + return 1; + } else { + return -1; + } + } else { + if ((subject.len == (s - at)) && + strncmp(at, subject.s, subject.len) == 0) { + return 1; + } else { + at = s + 1; + } + } + } + + return -1; +} diff --git a/modules/utils/functions.h b/modules/utils/functions.h index df34211..a7bbdf3 100644 --- a/modules/utils/functions.h +++ b/modules/utils/functions.h @@ -1,7 +1,7 @@ /* * headers of script functions of utils module * - * Copyright (C) 2008 Juha Heinanen + * Copyright (C) 2008-2011Juha Heinanen * * This file is part of Kamailio, a free SIP server. * @@ -47,4 +47,10 @@ int http_query(struct sip_msg* _m, char* _page, char* _params, char* _dst); */ int is_int(struct sip_msg* _m, char* _pvar, char* _s2); + +/* + * Checks if subject is found in list + */ +int in_list(struct sip_msg* _m, char* _subject, char* _list, char* _sep); + #endif /* UTILS_FUNCTIONS_H */ diff --git a/modules/utils/utils.c b/modules/utils/utils.c index b5fa5b1..88ea37f 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -1,7 +1,7 @@ /* * utils Module * - * Copyright (C) 2008 Juha Heinanen + * Copyright (C) 2008-2011 Juha Heinanen * Copyright (C) 2009 1&1 Internet AG * * This file is part of Kamailio, a free SIP server. @@ -57,7 +57,7 @@ MODULE_VERSION -#define XCAP_TABLE_VERSION 3 +#define XCAP_TABLE_VERSION 4 /* Module parameter variables */ int http_query_timeout = 4; @@ -90,6 +90,8 @@ static void destroy(void); /* Fixup functions to be defined later */ static int fixup_http_query(void** param, int param_no); static int fixup_free_http_query(void** param, int param_no); +static int fixup_in_list(void** param, int param_no); +static int fixup_free_in_list(void** param, int param_no); /* forward function */ int utils_forward(struct sip_msg *msg, int id, int proto); @@ -103,6 +105,8 @@ static cmd_export_t cmds[] = { fixup_free_pvar_pvar, REQUEST_ROUTE}, {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + {"in_list", (cmd_function)in_list, 3, fixup_in_list, fixup_free_in_list, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -361,6 +365,36 @@ static int fixup_free_http_query(void** param, int param_no) return -1; } +/* + * Fix in_list params: subject and list (strings that may contain pvars), + * separator (string) + */ +static int fixup_in_list(void** param, int param_no) +{ + if ((param_no == 1) || (param_no == 2)) return fixup_spve_null(param, 1); + + if (param_no == 3) return 0; + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + +/* + * Free http_query params. + */ +static int fixup_free_in_list(void** param, int param_no) +{ + if ((param_no == 1) || (param_no == 2)) { + LM_WARN("free function has not been defined for spve\n"); + return 0; + } + + if (param_no == 3) return 0; + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + /*! * \brief checks precondition, switch, filter and forwards msg if necessary

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011