sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:kamailio_3.0: utils/kamctl: removed unsupported commands to manage lcr gateways and routes

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: d8d9165324f32e82f6e8cbb5e07f33ddd697cd1d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8d9165… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Feb 10 22:37:44 2010 +0200 utils/kamctl: removed unsupported commands to manage lcr gateways and routes --- utils/kamctl/kamctl.8 | 15 --------------- utils/kamctl/kamctl.base | 15 --------------- 2 files changed, 0 insertions(+), 30 deletions(-) diff --git a/utils/kamctl/kamctl.8 b/utils/kamctl/kamctl.8 index 4343a88..96c8787 100644 --- a/utils/kamctl/kamctl.8 +++ b/utils/kamctl/kamctl.8 @@ -57,26 +57,11 @@ Grant user membership(s) (*) .TP 16 .I Least cost routes (lcr) managment command: .TP -.B lcr show -Show gateways and routes tables -.TP .B lcr dump Show in memory gateways and routes tables .TP .B lcr reload Reload lcr gateways and routes -.TP -.B lcr addgw <gw_name> <ip> <port> <scheme> <transport> <grp_id> <flags> <tag> <strip> <weight> <hostname> <ping> -Add a gateway with flags, tag, strip, weight, hostname, and ping (flags, tag, strip, weight, hostname, and ping are optional) -.TP -.B lcr rmgw <gw_name> -Delete a gateway -.TP -.B lcr addroute <prefix> <from> <grp_id> <prio> -Add a route ( use '' to match anything in <from> ) -.TP -.B lcr rmroute <prefix> <from> <grp_id> <prio> -Delete a route .TP 16 .I Carrierroute tables('cr') managment commands: diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 3a3816d..79025c2 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -362,23 +362,8 @@ usage_lcr() { mecho " -- command 'lcr' - manage least cost routes (lcr)" echo cat <<EOF - * IP addresses must be entered in dotted quad format e.g. 1.2.3.4 * - * <uri_scheme> and <transport> must be entered in integer or text, * - * e.g. transport '2' is identical to transport 'tcp'. * - * scheme: 1=sip, 2=sips; transport: 1=udp, 2=tcp, 3=tls, 4=sctp * - * Examples: lcr addgw level3 1.2.3.4 5080 sip tcp 1 * - * lcr addroute +1 '' 1 1 * - lcr show .......... show gateways and routes tables lcr dump .......... show in memory gateways and routes tables lcr reload ........ reload lcr gateways and routes - lcr addgw <gw_name> <ip> <port> <scheme> <transport> <grp_id> <flags> <tag> <strip> <weight> <hostname> <ping> - ......... add a gateway with flags, tag, strip, weight, hostname, and ping - ......... (flags, tag, strip, weight, hostname, and ping are optional) - lcr rmgw <gw_name> delete a gateway - lcr addroute <prefix> <from> <grp_id> <prio> - ......... add a route ( use '' to match anything in <from> ) - lcr rmroute <prefix> <from> <grp_id> <prio> - ......... delete a route EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_lcr"

14 years, 11 months

RFC 3326 (Reason header) for CANCEL (TM addition)

by Iñaki Baz Castillo

Hi, it would be great if TM implements RFC 3326 by adding a Reason header in CANCEL. I explain the use cases: 1) Parallel forking: - alice calls bob through Proxy. - Proxy does parallel forking to two locations from which bob is registered (bob1 and bob2). - Both phones ring. After a while bob2 answers. - Proxy generates a CANCEL for bob1 and includes a header: Reason: SIP ;cause=200 ;text="Call completed elsewhere" - By inspecting such header (cause=200) bob1 device decides not to include this call in the list of "missed calls". 2) Propagating CANCEL + Reason from an application server or PBX. - alice calls bob through PBX. - The PBX "forkes" (no need to really fork as it's a B2BUA/UAC and could just generate two different INVITE), and calls to bob's SIP phone and bob's mobile (through a PSTN gateway). - The INVITE to bob's SIP phone is sent to bob's inbound Proxy. The Proxy routes the request to the location of bob. - Bob human was out so answers the call in his mobile. - The PBX sends a CANCEL to Proxy including the header: Reason: SIP ;cause=200 ;text="Call completed elsewhere" - Such CANCEL arrives to Proxy. As CANCEL is hop by hop the Proxy generates its own CANCEL but due to local policy (i.e. the CANCEL comes from the trusted PBX) it *propagates* the Reason header. - Again bob's SIP phone receives the CANCEL with such Reason header and decides not to include this call in the list of "missed calls". This is very useful feature IMHO as bob won't waste time by calling to all of those non real "missed" calls. At implementation level I would consider the following: - Case 1 doesn't require parameters or script decissions (IMHO) so it's safe to add Reason header in a CANCEL when cancelling a branch (in parallel forking). - Case 2 requires a local policy as it wouldn't be safe to propagate any Reason header coming in a CANCEL from any sender (imagine you receive a malicius call at 5 o'clock in the night and the hacker added "Reason" header to the CANCEL so you don't find that call in the missed calls list of the phone). - This local policy could be implemented as follows: a) Enabling a flag in t_relay() that only makes sense for CANCEL rather than INVITE, so: if (is_method("CANCEL")) { if ($si == MY_APPLICATION_SERVER_IP) # Allow propagating "Reason" header. t_relay(0x12); else t_relay(); } or a explicit flag: if (is_method("CANCEL")) { if ($si == MY_APPLICATION_SERVER_IP) setflag(FLAG_ALLOW_CANCEL_REASON); t_relay(); } As a side note, Asterisk does implement this Reason header when calls to various phones for the same call. Also, this feature is implemented in OpenSIPS TM module (case 1 is already implemented and case 2 will be implemented soon). Do you consider feasible implementing it? opinnions? I would like to try it by myself, but being the serious TM module I would like to know your opinnions first :) Regards. -- Iñaki Baz Castillo <ibc(a)aliax.net>

14 years, 11 months

git:kamailio_3.0: modules/lcr: added in docs missing install dependency on libpcre

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 79583dc666ae198bbe00954c1326789be8cadbc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79583dc… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 10 07:34:33 2010 +0200 modules/lcr: added in docs missing install dependency on libpcre - Credits to Kris Amy. (cherry picked from commit 0c7048297f590f140ae84efdcde8a392ef23527e) (cherry picked from commit 9baa29e80e5aa9f5c656a32059d24901a23ef8e9) --- modules/lcr/README | 2 +- modules/lcr/doc/lcr_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index daeba04..5f83052 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -247,7 +247,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running SIP Router with this module: - * none. + * libpcre 3. Exported Parameters diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 83081ff..446fd4a 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -103,7 +103,7 @@ <itemizedlist> <listitem> <para> - <emphasis>none</emphasis>. + <emphasis>libpcre</emphasis> </para> </listitem> </itemizedlist>

14 years, 11 months

git:kamailio_3.0: modules_k/permissions: group identifier must be positive integer

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 59907c49af12496af3d85e74ef52e67055cf610f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59907c4… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 10 07:15:24 2010 +0200 modules_k/permissions: group identifier must be positive integer - Group Identifier in address permissions must have a positive integer value. (cherry picked from commit c67e72eb16f277eeae16182e15e0e8ebf319dce0) --- modules_k/permissions/README | 4 ++-- modules_k/permissions/address.c | 1 + modules_k/permissions/doc/permissions_admin.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules_k/permissions/README b/modules_k/permissions/README index a3406f2..ff0959f 100644 --- a/modules_k/permissions/README +++ b/modules_k/permissions/README @@ -276,8 +276,8 @@ Chapter 1. Admin Guide (allow_source_address) or given as pvar arguments (allow_address). Addresses stored in cached database table can be grouped together into - one or more groups specified by a group identifier (unsigned integer). - Group identifier is given as argument to allow_address and + one or more groups specified by a group identifier (positive integer + value). Group identifier is given as argument to allow_address and allow_source_address functions. 1.5. Trusted Requests diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index e40e510..126c8d8 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -114,6 +114,7 @@ int reload_address_table(void) val = ROW_VALUES(row + i); if ((ROW_N(row + i) == 4) && (VAL_TYPE(val) == DB1_INT) && !VAL_NULL(val) && + (VAL_INT(val) > 0) && (VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1) && inet_aton((char *)VAL_STRING(val + 1), &ip_addr) != 0 && (VAL_TYPE(val + 2) == DB1_INT) && !VAL_NULL(val + 2) && diff --git a/modules_k/permissions/doc/permissions_admin.xml b/modules_k/permissions/doc/permissions_admin.xml index 4ad28b7..06512a9 100644 --- a/modules_k/permissions/doc/permissions_admin.xml +++ b/modules_k/permissions/doc/permissions_admin.xml @@ -179,7 +179,7 @@ <para> Addresses stored in cached database table can be grouped together into one or more groups specified by a group - identifier (unsigned integer). Group + identifier (positive integer value). Group identifier is given as argument to allow_address and allow_source_address functions. </para>

14 years, 11 months

git:master: cfg.y: fix warnings introduced in previous commit

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0267d20a8ae6f814f54c62a53900dd62337576c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0267d20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 9 11:32:02 2010 +0100 cfg.y: fix warnings introduced in previous commit (cherry picked from commit 318ff6e6884641f3c9788b01e9ac3d859269be30) --- cfg.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index 9a87ef7..2ca76bb 100644 --- a/cfg.y +++ b/cfg.y @@ -2725,7 +2725,7 @@ avpflag_oper: | ISAVPFLAGSET { $$ = -1; } ; cmd: - | FORWARD LPAREN RPAREN { $$=mk_action(FORWARD_T, 2, URIHOST_ST, 0, URIPORT_ST, 0); set_cfg_pos($$); } + FORWARD LPAREN RPAREN { $$=mk_action(FORWARD_T, 2, URIHOST_ST, 0, URIPORT_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN host RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN STRING RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN ip RPAREN { $$=mk_action( FORWARD_T, 2, IP_ST, (void*)$3, NUMBER_ST, 0); set_cfg_pos($$); }

14 years, 11 months

git:master: core: added forward()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d31b697f2ca92e330efd482c19a4c2b7334781ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d31b697… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Feb 9 11:23:50 2010 +0100 core: added forward() - aliased forward() to forward(uri:host, uri:port) - k 1.5.x compatibility (cherry picked from commit 50237e89964b4fc8a4c8775076c1b75a05ee5e73) --- cfg.y | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index 4318728..9a87ef7 100644 --- a/cfg.y +++ b/cfg.y @@ -2725,7 +2725,8 @@ avpflag_oper: | ISAVPFLAGSET { $$ = -1; } ; cmd: - FORWARD LPAREN host RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } + | FORWARD LPAREN RPAREN { $$=mk_action(FORWARD_T, 2, URIHOST_ST, 0, URIPORT_ST, 0); set_cfg_pos($$); } + | FORWARD LPAREN host RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN STRING RPAREN { $$=mk_action( FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN ip RPAREN { $$=mk_action( FORWARD_T, 2, IP_ST, (void*)$3, NUMBER_ST, 0); set_cfg_pos($$); } | FORWARD LPAREN host COMMA NUMBER RPAREN { $$=mk_action(FORWARD_T, 2, STRING_ST, $3, NUMBER_ST, (void*)$5); set_cfg_pos($$); }

14 years, 11 months

git:master: Makefile: MEMDBG var to control mem debugging mode

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2c168f02b89cf4f97c5b95b8b3e8410b2f825a51 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c168f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 8 23:16:47 2010 +0100 Makefile: MEMDBG var to control mem debugging mode - to compile with memory debugging make MEMDBG=1 cfg; make ... --- Makefile.defs | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 556883e..304d706 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -152,6 +152,11 @@ PATCHLEVEL = 0 SUBLEVEL = 99 EXTRAVERSION = -dev1 +# memory debugger switcher +# 0 - off (release mode) +# 1 - on (devel mode) +MEMDBG ?= 0 + SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) ) RELEASE:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) @@ -619,15 +624,12 @@ C_DEFS= $(extra_defs) \ -DUSE_DNS_FAILOVER \ -DUSE_DST_BLACKLIST \ -DUSE_NAPTR \ - -DDBG_QM_MALLOC \ #-DUSE_DNS_CACHE_STATS \ #-DUSE_DST_BLACKLIST_STATS \ #-DDNS_WATCHDOG_SUPPORT \ #-DLL_MALLOC \ #-DSF_MALLOC \ #-DDL_MALLOC \ - #-DF_MALLOC \ - #-DDBG_QM_MALLOC \ #-DDBG_F_MALLOC \ #-DNO_DEBUG \ #-DEXTRA_DEBUG \ @@ -647,6 +649,11 @@ C_DEFS= $(extra_defs) \ # use make mode=debug all instead. Anyway no by default ser is compiled w/ # debugging symbols in all cases (-g). --andrei +ifeq ($(MEMDBG), 1) + C_DEFS+= -DDBG_QM_MALLOC +else + C_DEFS+= -DF_MALLOC +endif ifeq ($(CORE_TLS), 1) C_DEFS+= -DUSE_TLS -DCORE_TLS endif

14 years, 11 months

git:master: MEMDBG set to 1 (memory debugging on)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 60e004c9d438bf9626167eafa5e05c4c8b12fbfa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60e004c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 10 19:34:46 2010 +0100 MEMDBG set to 1 (memory debugging on) - default for devel version --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 304d706..d334f24 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -155,7 +155,7 @@ EXTRAVERSION = -dev1 # memory debugger switcher # 0 - off (release mode) # 1 - on (devel mode) -MEMDBG ?= 0 +MEMDBG ?= 1 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) )

14 years, 11 months

git:master: app_python: added skeleton for docs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bd93ff3ab2fe36bc9a4dd3b1e59398d6f63095ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd93ff3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 10 19:26:07 2010 +0100 app_python: added skeleton for docs - needs to be filled in --- modules/app_python/README | 104 ++++++++++++++++++++ modules/app_python/doc/Makefile | 4 + modules/app_python/doc/app_python.xml | 34 +++++++ modules/app_python/doc/app_python_admin.xml | 141 +++++++++++++++++++++++++++ 4 files changed, 283 insertions(+), 0 deletions(-) diff --git a/modules/app_python/README b/modules/app_python/README new file mode 100644 index 0000000..0253212 --- /dev/null +++ b/modules/app_python/README @@ -0,0 +1,104 @@ +app_python Module + +Maxim Sobolev + +Edited by + +Maxim Sobolev + + Copyright � 2010 Maxim Sobolev + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1.1. Overview + 1.2. Dependencies + + 1.2.1. Kamailio Modules + 1.2.2. External Libraries or Applications + + 1.3. Exported Parameters + + 1.3.1. script_name (string) + 1.3.2. mod_init_function (string) + 1.3.3. child_init_method (string) + + 1.4. Exported Functions + + 1.4.1. python_exec(method [, mystr]) + + List of Examples + + 1.1. Set script_name parameter + 1.2. Set mod_init_function parameter + 1.3. Set child_init_method parameter + 1.4. python_exec usage + +Chapter 1. Admin Guide + +1.1. Overview + + This module allows executing Python scripts from config file, exporting + functions to access the SIP message from Python. + +1.2. Dependencies + +1.2.1. Kamailio Modules + + The following modules must be loaded before this module: + * none. + +1.2.2. External Libraries or Applications + + The following libraries or applications must be installed before + running Kamailio with this module loaded: + * python-dev - Python devel library. + +1.3. Exported Parameters + +1.3.1. script_name (string) + + TBD. + + Default value is "/usr/local/etc/sip-router/handler.py". + + Example 1.1. Set script_name parameter +... +modparam("app_python", "script_name", "/usr/local/etc/sip-router/myscript.py") +... + +1.3.2. mod_init_function (string) + + TBD. + + Default value is "mod_init". + + Example 1.2. Set mod_init_function parameter +... +modparam("app_python", "mod_init_function", "my_mod_init") +... + +1.3.3. child_init_method (string) + + TBD. + + Default value is "child_init". + + Example 1.3. Set child_init_method parameter +... +modparam("app_python", "child_init_method", "my_child_init") +... + +1.4. Exported Functions + +1.4.1. python_exec(method [, mystr]) + + TBD. + + Example 1.4. python_exec usage +... +python_exec("..."); +python_exec("...", "..."); +... diff --git a/modules/app_python/doc/Makefile b/modules/app_python/doc/Makefile new file mode 100644 index 0000000..1792355 --- /dev/null +++ b/modules/app_python/doc/Makefile @@ -0,0 +1,4 @@ +docs = app_python.xml + +docbook_dir = ../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules/app_python/doc/app_python.xml b/modules/app_python/doc/app_python.xml new file mode 100644 index 0000000..462a5cf --- /dev/null +++ b/modules/app_python/doc/app_python.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + +<book xmlns:xi="http://www.w3.org/2001/XInclude"> + <bookinfo> + <title>app_python Module</title> + <productname class="trade">&kamailioname;</productname> + <authorgroup> + <author> + <firstname>Maxim</firstname> + <surname>Sobolev</surname> + </author> + <editor> + <firstname>Maxim</firstname> + <surname>Sobolev</surname> + </editor> + </authorgroup> + <copyright> + <year>2010</year> + <holder>Maxim Sobolev</holder> + </copyright> + </bookinfo> + <toc></toc> + + <xi:include href="app_python_admin.xml"/> + +</book> diff --git a/modules/app_python/doc/app_python_admin.xml b/modules/app_python/doc/app_python_admin.xml new file mode 100644 index 0000000..4a9f694 --- /dev/null +++ b/modules/app_python/doc/app_python_admin.xml @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding='ISO-8859-1'?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [ + + +<!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> +%docentities; + +]> + + + +<chapter> + + <title>&adminguide;</title> + + <section> + <title>Overview</title> + <para> + This module allows executing Python scripts from config file, + exporting functions to access the SIP message from Python. + </para> + </section> + <section> + <title>Dependencies</title> + <section> + <title>&kamailio; Modules</title> + <para> + The following modules must be loaded before this module: + <itemizedlist> + <listitem> + <para> + <emphasis>none</emphasis>. + </para> + </listitem> + </itemizedlist> + </para> + </section> + <section> + <title>External Libraries or Applications</title> + <para> + The following libraries or applications must be installed before running + &kamailio; with this module loaded: + <itemizedlist> + <listitem> + <para> + <emphasis>python-dev</emphasis> - Python devel library. + </para> + </listitem> + </itemizedlist> + </para> + </section> + </section> + <section> + <title>Exported Parameters</title> + <section> + <title><varname>script_name</varname> (string)</title> + <para> + TBD. + </para> + <para> + <emphasis> + Default value is <quote>/usr/local/etc/sip-router/handler.py</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>script_name</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_python", "script_name", "/usr/local/etc/sip-router/myscript.py") +... +</programlisting> + </example> + </section> + + <section> + <title><varname>mod_init_function</varname> (string)</title> + <para> + TBD. + </para> + <para> + <emphasis> + Default value is <quote>mod_init</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>mod_init_function</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_python", "mod_init_function", "my_mod_init") +... +</programlisting> + </example> + </section> + + <section> + <title><varname>child_init_method</varname> (string)</title> + <para> + TBD. + </para> + <para> + <emphasis> + Default value is <quote>child_init</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>child_init_method</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_python", "child_init_method", "my_child_init") +... +</programlisting> + </example> + </section> + + </section> + + <section> + <title>Exported Functions</title> + <section> + <title> + <function moreinfo="none">python_exec(method [, mystr])</function> + </title> + <para> + TBD. + </para> + <example> + <title><function>python_exec</function> usage</title> + <programlisting format="linespecific"> +... +python_exec("..."); +python_exec("...", "..."); +... +</programlisting> + </example> + </section> + + </section> + +</chapter> +

14 years, 11 months

dlg_handlers.c BUG or missing initialization

by Torben Friese

Hi all, we had problems with some callback-functions. The problem is isolated to the unref_new_dialog function in dlg_handlers.c If the whole tmcb_params structure is not initialized, we run into segfaults in a later usage. here a patch for this problem ("inspired" by openSIPS code) @@ -417,7 +420,7 @@ void unref_new_dialog(void *dialog) { struct tmcb_params p; - + memset(&p, 0, sizeof(struct tmcb_params)); p.param = (void*)&dialog; dlg_onreply(0, TMCB_TRANS_DELETED, &p); } Down below the whole patch for the dlg_handlers.c file, the second thing is a extra control part for FAKED_REPLY's in the dlg_onreply function. I hope this is useful. best regards Torben Friese Index: modules/dialog/dlg_handlers.c =================================================================== --- modules/dialog/dlg_handlers.c (revision 5983) +++ modules/dialog/dlg_handlers.c (working copy) @@ -280,24 +280,27 @@ if (new_state==DLG_STATE_CONFIRMED_NA && old_state!=DLG_STATE_CONFIRMED_NA && old_state!=DLG_STATE_CONFIRMED ) { LM_DBG("dialog %p confirmed\n",dlg); - - /* get to tag*/ - if ( !rpl->to && ((parse_headers(rpl, HDR_TO_F,0)<0) || !rpl->to) ) { - LM_ERR("bad reply or missing TO hdr :-/\n"); - tag.s = 0; - tag.len = 0; - } else { - tag = get_to(rpl)->tag_value; - if (tag.s==0 || tag.len==0) { - LM_ERR("missing TAG param in TO hdr :-/\n"); + if (rpl != FAKED_REPLY) { + /* get to tag*/ + if ( !rpl->to && ((parse_headers(rpl, HDR_TO_F,0)<0) || !rpl->to) ) { + LM_ERR("bad reply or missing TO hdr :-/\n"); tag.s = 0; tag.len = 0; + } else { + tag = get_to(rpl)->tag_value; + if (tag.s==0 || tag.len==0) { + LM_ERR("missing TAG param in TO hdr :-/\n"); + tag.s = 0; + tag.len = 0; + } } - } - /* save callee's tag, cseq, contact and record route*/ - if (populate_leg_info( dlg, rpl, t, DLG_CALLEE_LEG, &tag) !=0) { - LM_ERR("could not add further info to the dialog\n"); + /* save callee's tag, cseq, contact and record route*/ + if (populate_leg_info( dlg, rpl, t, DLG_CALLEE_LEG, &tag) !=0) { + LM_ERR("could not add further info to the dialog\n"); + } + } else { + LM_ERR("Faked reply!\n"); } /* set start time */ @@ -417,7 +420,7 @@ void unref_new_dialog(void *dialog) { struct tmcb_params p; - + memset(&p, 0, sizeof(struct tmcb_params)); p.param = (void*)&dialog; dlg_onreply(0, TMCB_TRANS_DELETED, &p); }

14 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev