sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: pua_usrloc: Minor edits, typo fix
by Olle E. Johansson 01 Dec '12

01 Dec '12

Module: sip-router Branch: master Commit: 99521dafd452e56d7974fcbf8c32bd3679ccc4c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99521da… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Dec 1 11:05:57 2012 +0100 pua_usrloc: Minor edits, typo fix --- modules_k/pua_usrloc/README | 21 +++++++++++---------- modules_k/pua_usrloc/doc/pua_usrloc_admin.xml | 14 ++++++++------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/modules_k/pua_usrloc/README b/modules_k/pua_usrloc/README index 65e1f87..942f2dd 100644 --- a/modules_k/pua_usrloc/README +++ b/modules_k/pua_usrloc/README @@ -61,13 +61,14 @@ Chapter 1. Admin Guide 1. Overview The pua_usrloc module is the connector between the usrloc and pua - modules. It creates the environment to send PUBLISH requests for user - location records, on specific events (e.g., when new record is added in - usrloc, a PUBLISH with status open (online) is issued; when expires, it - sends closed (offline)). + modules. With this module, you can monitor the status of SIP + registrations. The module sends PUBLISH requests for user location + record changes, based on specific events (e.g., when a new record is + added in usrloc, a PUBLISH with status open (online) is issued; when + expires, it sends closed (offline)). - Using this module, phones which have no support for presence can be - seen as online/offline. + Using this module phones which have no support for presence can be seen + as online/offline. 2. Dependencies @@ -95,7 +96,7 @@ Chapter 1. Admin Guide 3.1. default_domain (str) The default domain to use when constructing the presentity URI if it is - missing from recorded AOR. + missing from stored AOR in the usrloc table (in memory or database). Default value is "NULL". @@ -106,8 +107,8 @@ modparam("pua_usrloc", "default_domain", "kamailio.org") 3.2. entity_prefix (str) - The prefix when construstructing entity attribute to be added to - presence node in XML PIDF. (ex: pres:user@domain ). + The prefix used when constructing the entity attribute to be added to a + presence node in the XML PIDF document. (ex: pres:user@domain ). Default value is "NULL". @@ -132,7 +133,7 @@ modparam("pua_usrloc", "branch_flag", 9) 4.1. pua_set_publish() -4.1. pua_set_publish() +4.1. pua_set_publish() The function is used to mark REGISTER requests that have to issue a PUBLISH. The PUBLISH is issued when REGISTER is saved in location diff --git a/modules_k/pua_usrloc/doc/pua_usrloc_admin.xml b/modules_k/pua_usrloc/doc/pua_usrloc_admin.xml index 3e85a89..98b09c8 100644 --- a/modules_k/pua_usrloc/doc/pua_usrloc_admin.xml +++ b/modules_k/pua_usrloc/doc/pua_usrloc_admin.xml @@ -17,13 +17,14 @@ <title>Overview</title> <para> The pua_usrloc module is the connector between the usrloc and pua modules. - It creates the environment to send PUBLISH requests for user - location records, on specific events (e.g., when new record is + With this module, you can monitor the status of SIP registrations. + The module sends PUBLISH requests for user location record changes, + based on specific events (e.g., when a new record is added in usrloc, a PUBLISH with status open (online) is issued; when expires, it sends closed (offline)). </para> <para> - Using this module, phones which have no support for presence can + Using this module phones which have no support for presence can be seen as online/offline. </para> </section> @@ -68,7 +69,8 @@ <title><varname>default_domain</varname> (str)</title> <para> The default domain to use when constructing the presentity - URI if it is missing from recorded AOR. + URI if it is missing from stored AOR in the usrloc table (in + memory or database). </para> <para> <emphasis>Default value is <quote>NULL</quote>. @@ -86,8 +88,8 @@ modparam("pua_usrloc", "default_domain", "kamailio.org") <section> <title><varname>entity_prefix</varname> (str)</title> <para> - The prefix when construstructing entity attribute to be added to - presence node in XML PIDF. + The prefix used when constructing the entity attribute to be added to + a presence node in the XML PIDF document. (ex: pres:user@domain ). </para> <para>

1 0

git:master: sdpops: Typo fix, minor edits
by Olle E. Johansson 01 Dec '12

01 Dec '12

Module: sip-router Branch: master Commit: fe6508d6d56a7f739c7fc0ae2220e509abb337e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe6508d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Dec 1 10:49:11 2012 +0100 sdpops: Typo fix, minor edits --- modules/sdpops/README | 55 ++++++++++++++++++----------------- modules/sdpops/doc/sdpops_admin.xml | 25 ++++++++------- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/modules/sdpops/README b/modules/sdpops/README index 7556c42..88f8c86 100644 --- a/modules/sdpops/README +++ b/modules/sdpops/README @@ -86,9 +86,9 @@ Chapter 1. Admin Guide payloads of SIP messages. Examples of functions this module offers: remove codecs from SDP, check - the media stream types, return attributes of SDP document. For the full - list of the features provided by this module and the implementation - state, read the list of exported functions. + the media stream types and return attributes of SDP document. For the + full list of the features provided by this module and the + implementation state, please read the list of exported functions. 2. Dependencies @@ -125,11 +125,11 @@ Chapter 1. Admin Guide 4.11. sdp_get(avpvar) 4.12. sdp_content() -4.1. sdp_remove_codecs_by_id(list) +4.1. sdp_remove_codecs_by_id(list) Remove the codecs provided in the parameter 'list' from all media - streams found in SDP payload. The parameter 'list' must be one or a - comma separated list of numeric codec IDs. The parameter can be a + streams found in SDP payload. The parameter 'list' must be one item or + a comma separated list of numeric codec IDs. The parameter can be a static string or a variable holding the list of numeric codec IDs. This function can be used from ANY_ROUTE. @@ -142,11 +142,11 @@ sdp_remove_codecs_by_id("0"); sdp_remove_codecs_by_id("0,8,3"); ... -4.2. sdp_remove_codecs_by_name(list) +4.2. sdp_remove_codecs_by_name(list) Remove the codecs provided in the parameter 'list' from all media - streams found in SDP payload. The parameter 'list' must be one or a - comma separated list of codec names. The parameter can be a static + streams found in SDP payload. The parameter 'list' must be one item or + a comma separated list of codec names. The parameter can be a static string or a variable holding the list of codec names. This function can be used from ANY_ROUTE. @@ -159,15 +159,16 @@ sdp_remove_codecs_by_name("PCMU"); sdp_remove_codecs_by_name("PCMU,PCMA,GSM"); ... -4.3. sdp_remove_line_by_prefix(string) +4.3. sdp_remove_line_by_prefix(string) - Remove all SDP attribute lines beginning with 'string'. + Remove all SDP attribute lines beginning with 'string' in all media + streams. This function can be used from ANY_ROUTE. Example 1.3. sdp_remove_line_by_prefix usage ... -if ($si == "1080::8:800:200C:417A" +if ($si == "2001:DB8::8:800:200C:417A" and ( has_body("application/sdp") or has_body("multipart/mixed"))) { xlog("L_INFO", "Cleaning ugly SDP from $si\n"); @@ -177,11 +178,11 @@ if ($si == "1080::8:800:200C:417A" ... -4.4. sdp_keep_codecs_by_id(list [, mtype]) +4.4. sdp_keep_codecs_by_id(list [, mtype]) Keep only the codecs provided in the parameter 'list' from all media - streams found in SDP payload. The parameter 'list' must be one or a - comma separated list of numeric codec IDs. The parameter can be a + streams found in SDP payload. The parameter 'list' must be one item or + a comma separated list of numeric codec IDs. The parameter can be a static string or a variable holding the list of numeric codec IDs. Optional parameter mtype can be provided to apply the operations only @@ -197,7 +198,7 @@ sdp_keep_codecs_by_id("0"); sdp_keep_codecs_by_id("0,8,3", "audio"); ... -4.5. sdp_keep_codecs_by_name(list [, mtype]) +4.5. sdp_keep_codecs_by_name(list [, mtype]) Keep only the codecs provided in the parameter 'list' from all media streams found in SDP payload. The parameter 'list' must be one or a @@ -217,7 +218,7 @@ sdp_keep_codecs_by_name("PCMU"); sdp_keep_codecs_by_name("PCMU,PCMA,GSM"); ... -4.6. sdp_with_media(type) +4.6. sdp_with_media(type) Return true of the SDP has 'media=type ...' line. Useful to check the content of the RTP sessions, such as 'audio' or 'video'. The parameter @@ -234,7 +235,7 @@ if(sdp_with_media("video")) } ... -4.7. sdp_remove_media(type) +4.7. sdp_remove_media(type) Remove the streams that match on 'm=type ...' line. The parameter can be static string or variable holding the media type. @@ -247,7 +248,7 @@ if(sdp_with_media("video")) sdp_remove_media("video"); ... -4.8. sdp_with_codecs_by_id(list) +4.8. sdp_with_codecs_by_id(list) Returns true if any of the codecs provided in the parameter 'list' from all media streams is found in SDP payload. The parameter 'list' must be @@ -264,24 +265,24 @@ if(sdp_with_codecs_by_id("0")) { ... } if(sdp_with_codecs_by_id("0,8,3")) { ... } ... -4.9. sdp_with_codecs_by_name(list) +4.9. sdp_with_codecs_by_name(list) Returns true if any of the codecs provided in the parameter 'list' from all media streams is found in SDP payload. The parameter 'list' must be - one or a comma separated list of codec names. The parameter can be a - static string or a variable holding the list of codec names. + one item or a comma separated list of codec names. The parameter can be + a static string or a variable holding the list of codec names. This function can be used from ANY_ROUTE. Example 1.9. sdp_with_codecs_by_name usage ... # test for PCMU -if(sdp_with_codecs_by_id("PCMU")) { ... } +if(sdp_with_codecs_by_name("PCMU")) { ... } # test for PCMU, PCMA or GSM -if(sdp_with_codecs_by_id("PCMU,PCMA,GSM")) { ... } +if(sdp_with_codecs_by_name("PCMU,PCMA,GSM")) { ... } ... -4.10. sdp_print(level) +4.10. sdp_print(level) Print the SDP internal structure to log 'level'. The parameter can be static integer or variable holding the integer value of the log level. @@ -294,7 +295,7 @@ if(sdp_with_codecs_by_id("PCMU,PCMA,GSM")) { ... } sdp_print("1"); ... -4.11. sdp_get(avpvar) +4.11. sdp_get(avpvar) Store the SDP part of message body in an AVP. Return 1 if SDP is found, -1 on error and -2 if there is no SDP part in the message body. @@ -306,7 +307,7 @@ sdp_print("1"); sdp_get("$avp(sdp)"); ... -4.12. sdp_content() +4.12. sdp_content() Return true if the SIP message has SDP body or a SDP part in body. diff --git a/modules/sdpops/doc/sdpops_admin.xml b/modules/sdpops/doc/sdpops_admin.xml index b816c89..831669e 100644 --- a/modules/sdpops/doc/sdpops_admin.xml +++ b/modules/sdpops/doc/sdpops_admin.xml @@ -16,14 +16,14 @@ <section> <title>Overview</title> <para> - This module provides functions for checking and managing the SDP - payloads of SIP messages. + This module provides functions for checking and managing the + <acronym>SDP</acronym> payloads of SIP messages. </para> <para> Examples of functions this module offers: remove codecs from SDP, - check the media stream types, return attributes of SDP document. + check the media stream types and return attributes of SDP document. For the full list of the features provided by this module and - the implementation state, read the list of exported functions. + the implementation state, please read the list of exported functions. </para> </section> @@ -73,7 +73,7 @@ <para> Remove the codecs provided in the parameter 'list' from all media streams found in SDP payload. The parameter 'list' must - be one or a comma separated list of numeric codec IDs. The + be one item or a comma separated list of numeric codec IDs. The parameter can be a static string or a variable holding the list of numeric codec IDs. </para> @@ -99,7 +99,7 @@ sdp_remove_codecs_by_id("0,8,3"); <para> Remove the codecs provided in the parameter 'list' from all media streams found in SDP payload. The parameter 'list' must - be one or a comma separated list of codec names. The + be one item or a comma separated list of codec names. The parameter can be a static string or a variable holding the list of codec names. </para> @@ -123,7 +123,8 @@ sdp_remove_codecs_by_name("PCMU,PCMA,GSM"); <function moreinfo="none">sdp_remove_line_by_prefix(string)</function> </title> <para> - Remove all SDP attribute lines beginning with 'string'. + Remove all SDP attribute lines beginning with 'string' + in all media streams. </para> <para> This function can be used from ANY_ROUTE. @@ -132,7 +133,7 @@ sdp_remove_codecs_by_name("PCMU,PCMA,GSM"); <title><function>sdp_remove_line_by_prefix</function> usage</title> <programlisting format="linespecific"> ... -if ($si == "1080::8:800:200C:417A" +if ($si == "2001:DB8::8:800:200C:417A" and ( has_body("application/sdp") or has_body("multipart/mixed"))) { xlog("L_INFO", "Cleaning ugly SDP from $si\n"); @@ -151,7 +152,7 @@ if ($si == "1080::8:800:200C:417A" <para> Keep only the codecs provided in the parameter 'list' from all media streams found in SDP payload. The parameter 'list' must - be one or a comma separated list of numeric codec IDs. The + be one item or a comma separated list of numeric codec IDs. The parameter can be a static string or a variable holding the list of numeric codec IDs. </para> @@ -283,7 +284,7 @@ if(sdp_with_codecs_by_id("0,8,3")) { ... } <para> Returns true if any of the codecs provided in the parameter 'list' from all media streams is found in SDP payload. The parameter - 'list' must be one or a comma separated list of codec names. + 'list' must be one item or a comma separated list of codec names. The parameter can be a static string or a variable holding the list of codec names. </para> @@ -295,9 +296,9 @@ if(sdp_with_codecs_by_id("0,8,3")) { ... } <programlisting format="linespecific"> ... # test for PCMU -if(sdp_with_codecs_by_id("PCMU")) { ... } +if(sdp_with_codecs_by_name("PCMU")) { ... } # test for PCMU, PCMA or GSM -if(sdp_with_codecs_by_id("PCMU,PCMA,GSM")) { ... } +if(sdp_with_codecs_by_name("PCMU,PCMA,GSM")) { ... } ... </programlisting> </example>

1 0

git:master: utils: Minor update to README
by Olle E. Johansson 01 Dec '12

01 Dec '12

Module: sip-router Branch: master Commit: a7522f0d648470e36a82357660fc169628b2f506 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7522f0… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sat Dec 1 09:50:31 2012 +0100 utils: Minor update to README XML changes already committed. --- modules/utils/README | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/utils/README b/modules/utils/README index a4ff648..44fff00 100644 --- a/modules/utils/README +++ b/modules/utils/README @@ -256,7 +256,7 @@ id switch filter proxy Example 1.8. forward_switch usage ... -kamctl fifo sp_forward_switch 0=on +kamctl fifo forward_switch 0=on ... 5.3. forward_filter @@ -275,7 +275,7 @@ kamctl fifo sp_forward_switch 0=on Example 1.9. forward_filter usage ... -kamctl fifo sp_forward_filter 0=REGISTER:INVITE +kamctl fifo forward_filter 0=REGISTER:INVITE ... 5.4. forward_proxy @@ -288,7 +288,7 @@ kamctl fifo sp_forward_filter 0=REGISTER:INVITE Example 1.10. forward_proxy usage ... -kamctl fifo sp_forward_proxy 0=host-c.domain-c:5060 +kamctl fifo forward_proxy 0=host-c.domain-c:5060 ... 6. Configuration syntax

1 0

git:master: xmlrpc: fix cross-compilation
by Ovidiu Sas 01 Dec '12

01 Dec '12

Module: sip-router Branch: master Commit: 4fda56162c3b174033ea81ffd7c2af4a6e7f10f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fda561… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sat Dec 1 01:30:24 2012 -0500 xmlrpc: fix cross-compilation --- modules/xmlrpc/Makefile | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/xmlrpc/Makefile b/modules/xmlrpc/Makefile index 485d12a..94eee3b 100644 --- a/modules/xmlrpc/Makefile +++ b/modules/xmlrpc/Makefile @@ -6,9 +6,19 @@ include ../../Makefile.defs auto_gen= NAME=xmlrpc.so -INCLUDES += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + +ifeq ($(CROSS_COMPILE),) +XML2CFG=$(shell which xml2-config) +endif + +ifneq ($(XML2CFG),) + DEFS += $(shell $(XML2CFG) --cflags ) + LIBS += $(shell $(XML2CFG) --libs) +else + INCLUDES +=-I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 + LIBS += -L$(LOCALBASE)/lib -lxml2 +endif DEFS+=-DSER_MOD_INTERFACE

1 0

git:master: xmlops: fix cross compilation
by Ovidiu Sas 01 Dec '12

01 Dec '12

Module: sip-router Branch: master Commit: a419c74d065156a2c9626b2475beaf08e130137e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a419c74… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sat Dec 1 01:24:24 2012 -0500 xmlops: fix cross compilation --- modules/xmlops/Makefile | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/xmlops/Makefile b/modules/xmlops/Makefile index e1e35bc..a55c4a1 100644 --- a/modules/xmlops/Makefile +++ b/modules/xmlops/Makefile @@ -9,7 +9,9 @@ auto_gen= NAME=xmlops.so LIBS= +ifeq ($(CROSS_COMPILE),) XML2CFG=$(shell which xml2-config) +endif ifneq ($(XML2CFG),) @@ -18,7 +20,7 @@ ifneq ($(XML2CFG),) else - DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + DEFS+=-I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include LIBS+=-L$(LOCALBASE)/lib -lxml2

1 0

git:master: utils: fix cross-compilation
by Ovidiu Sas 01 Dec '12

01 Dec '12

Module: sip-router Branch: master Commit: c4b91489ac3f2e2fcbe16413f56ef8cb8e7e2dde URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c4b9148… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sat Dec 1 01:28:03 2012 -0500 utils: fix cross-compilation --- modules/utils/Makefile | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/utils/Makefile b/modules/utils/Makefile index fc98e3f..727fa8c 100644 --- a/modules/utils/Makefile +++ b/modules/utils/Makefile @@ -9,9 +9,18 @@ auto_gen= NAME=utils.so LIBS= -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ +ifeq ($(CROSS_COMPILE),) +XML2CFG=$(shell which xml2-config) +endif + +ifneq ($(XML2CFG),) + DEFS += $(shell $(XML2CFG) --cflags ) + LIBS += $(shell $(XML2CFG) --libs) +else + DEFS+=-I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L$(LOCALBASE)/lib -lcurl -lxml2 + LIBS+=-L$(LOCALBASE)/lib -lcurl -lxml2 +endif DEFS+=-DKAMAILIO_MOD_INTERFACE

1 0

git:master: kamailio.cfg: adding xhttp modules to the default config
by Ovidiu Sas 01 Dec '12

01 Dec '12

Module: sip-router Branch: master Commit: 983dd207a51be5ea2bd2a71d546280f8e4389408 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=983dd20… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Sat Dec 1 00:12:34 2012 -0500 kamailio.cfg: adding xhttp modules to the default config three new defines: WITH_XHTTP, WITH_XHTTP_RPC, WITH_XHTTP_PI --- Makefile | 8 +++++++ etc/kamailio.cfg | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index ee58a21..08c3245 100644 --- a/Makefile +++ b/Makefile @@ -1000,6 +1000,14 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) fi ; \ fi ; \ done; true + # provisionning xml framework + $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/pi_framework.xml.sample + $(INSTALL_CFG) examples/pi_framework.xml \ + $(cfg_prefix)/$(cfg_dir)/pi_framework.xml.sample + if [ ! -f $(cfg_prefix)/$(cfg_dir)/pi_framework.xml ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)/pi_framework.xml.sample \ + $(cfg_prefix)/$(cfg_dir)/pi_framework.xml; \ + fi # radius dictionary $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index aa83fad..e1d7ff1 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -67,6 +67,18 @@ # - define WITH_XMLRPC # - adjust route[XMLRPC] for access policy # +# *** To enable the embedded http server: +# - define WITH_XHTTP +# +# *** To enable the RPC web interface execute: +# - enable xhttp +# - define WITH_XHTTP_RPC +# +# *** To enable the provisioning web interface execute: +# - enable mysql +# - enable xhttp +# - define WITH_XHTTP_PI +# # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is # block if more than 16 requests in 2 seconds and ban for 300 seconds) @@ -174,6 +186,10 @@ enable_tls=yes # - a bit higher than registration expires to cope with UA behind NAT tcp_connection_lifetime=3605 +#!ifdef WITH_XHTTP +tcp_accept_no_cl=yes +#!endif + ####### Custom Parameters ######### # These parameters can be modified runtime via RPC interface @@ -282,6 +298,18 @@ loadmodule "xmlrpc.so" loadmodule "debugger.so" #!endif +#!ifdef WITH_XHTTP +loadmodule "xhttp.so" +#!endif + +#!ifdef WITH_XHTTP_RPC +loadmodule "xhttp_rpc.so" +#!endif + +#!ifdef WITH_XHTTP_PI +loadmodule "xhttp_pi.so" +#!endif + # ----------------- setting module-specific parameters --------------- @@ -445,6 +473,15 @@ modparam("xmlrpc", "url_match", "^/RPC") modparam("debugger", "cfgtrace", 1) #!endif +#!ifdef WITH_XHTTP_RPC +modparam("xhttp_rpc", "xhttp_rpc_root", "http_rpc") +#!endif + +#!ifdef WITH_XHTTP_PI +modparam("xhttp_pi", "xhttp_pi_root", "http_pi") +modparam("xhttp_pi", "framework", "/usr/local/etc/kamailio/pi_framework.xml") +#!endif + ####### Routing Logic ######## @@ -921,3 +958,23 @@ failure_route[MANAGE_FAILURE] { } #!endif } + +#!ifdef WITH_XHTTP +event_route[xhttp:request] { +#!ifdef WITH_XHTTP_RPC + $var(xhttp_rpc_root) = $(hu{s.substr,0,9}); + if ($var(xhttp_rpc_root) == "/http_rpc") { + dispatch_xhttp_rpc(); + } +#!endif +#!ifdef WITH_XHTTP_PI + $var(xhttp_rpc_root) = $(hu{s.substr,0,8}); + if ($var(xhttp_rpc_root) == "/http_pi") { + dispatch_xhttp_pi(); + } +#!endif + xhttp_reply("200", "OK", "text/html", + "<html><body>Wrong URL $hu</body></html>"); +} +#!endif +

1 0

git:master: sca: fix snprintf buffer size for Expires header in replies to SUBSCRIBE.
by Andrew Mortensen 01 Dec '12

01 Dec '12

Module: sip-router Branch: master Commit: 209317a81d845ba781964205242849ab12bbc0c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=209317a… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Nov 30 21:38:48 2012 -0500 sca: fix snprintf buffer size for Expires header in replies to SUBSCRIBE. - reported by Robert Boisvert. --- modules/sca/sca_reply.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_reply.c b/modules/sca/sca_reply.c index 57e0cfc..dfe66e4 100644 --- a/modules/sca/sca_reply.c +++ b/modules/sca/sca_reply.c @@ -67,7 +67,7 @@ sca_reply( sca_mod *scam, int status_code, char *status_msg, SCA_STR_COPY_CSTR( &extra_headers, "Expires: " ); len = snprintf( extra_headers.s + extra_headers.len, - sizeof( hdr_buf - extra_headers.len ), + sizeof( hdr_buf ) - extra_headers.len, "%d%s", expires, CRLF ); extra_headers.len += len;

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 December 2012