sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

git:master: core: pvapi - be consistent in pv_printf_s()
by Daniel-Constantin Mierla 11 Jun '09

11 Jun '09

Module: sip-router Branch: master Commit: 0a9e22751e3f9c85d81a974ae5c06107f45650a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a9e227… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 11 20:10:57 2009 +0300 core: pvapi - be consistent in pv_printf_s() - there were cases when no copy was done, therefore no ending '\0' --- pvapi.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pvapi.c b/pvapi.c index 72fb48d..dbae078 100644 --- a/pvapi.c +++ b/pvapi.c @@ -1116,15 +1116,10 @@ int pv_printf_s(struct sip_msg* msg, pv_elem_p list, str *s) static int buf_itr = 0; static char buf[PV_PRINT_BUF_NO][PV_PRINT_BUF_SIZE]; - if (list->next==0 && list->spec.getf==0) { - *s = list->text; - return 0; - } else { - s->s = buf[buf_itr]; - s->len = PV_PRINT_BUF_SIZE; - buf_itr = (buf_itr+1)%PV_PRINT_BUF_NO; - return pv_printf( msg, list, s->s, &s->len); - } + s->s = buf[buf_itr]; + s->len = PV_PRINT_BUF_SIZE; + buf_itr = (buf_itr+1)%PV_PRINT_BUF_NO; + return pv_printf( msg, list, s->s, &s->len); } /********************************************************

1 0

git:master: presence_xml: new pv $xml(...)
by Daniel-Constantin Mierla 11 Jun '09

11 Jun '09

Module: sip-router Branch: master Commit: df5b7ebf3f91ab4335fe3c390a521cbb7b15e2f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df5b7eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 11 20:12:35 2009 +0300 presence_xml: new pv $xml(...) - $xml(...) can be used to handle xml documents - xpath access and set of content - module can act in passive mode by settin 'passive_mode' parameter to 1 (no bind to presence module, no connection to database) --- modules_k/presence_xml/presence_xml.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/modules_k/presence_xml/presence_xml.c b/modules_k/presence_xml/presence_xml.c index d54e76c..971449c 100644 --- a/modules_k/presence_xml/presence_xml.c +++ b/modules_k/presence_xml/presence_xml.c @@ -56,6 +56,7 @@ #include "pidf.h" #include "add_events.h" #include "presence_xml.h" +#include "pv_xml.h" MODULE_VERSION #define S_TABLE_VERSION 3 @@ -88,6 +89,7 @@ xcap_serv_t* xs_list= NULL; int disable_presence = 0; int disable_winfo = 0; int disable_bla = 1; +int passive_mode = 0; /* SL bind */ struct sl_binds slb; @@ -110,7 +112,7 @@ static param_export_t params[]={ { "disable_presence", INT_PARAM, &disable_presence }, { "disable_winfo", INT_PARAM, &disable_winfo }, { "disable_bla", INT_PARAM, &disable_bla }, - { 0, 0, 0} + { "passive_mode", INT_PARAM, &passive_mode }, { 0, 0, 0} }; static mi_export_t mi_cmds[] = { @@ -118,6 +120,12 @@ static mi_export_t mi_cmds[] = { { 0, 0, 0, 0, 0 } }; +static pv_export_t mod_pvs[] = { + { {"xml", sizeof("xml")-1}, PVT_OTHER, pv_get_xml, pv_set_xml, + pv_parse_xml_name, 0, 0, 0 }, + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + /** module exports */ struct module_exports exports= { "presence_xml", /* module name */ @@ -126,7 +134,7 @@ struct module_exports exports= { params, /* exported parameters */ 0, /* exported statistics */ mi_cmds, /* exported MI functions */ - 0, /* exported pseudo-variables */ + mod_pvs, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, /* module initialization function */ 0, /* response handling function */ @@ -141,7 +149,10 @@ static int mod_init(void) { bind_presence_t bind_presence; presence_api_t pres; - + + if(passive_mode==1) + return 0; + if(register_mi_mod(exports.name, mi_cmds)!=0) { LM_ERR("failed to register MI commands\n"); @@ -256,6 +267,9 @@ static int mod_init(void) static int mi_child_init(void) { + if(passive_mode==1) + return 0; + if (pxml_dbf.init==0) { LM_CRIT("database not bound\n"); @@ -283,6 +297,9 @@ static int child_init(int rank) { LM_DBG("[%d] pid [%d]\n", rank, getpid()); + if(passive_mode==1) + return 0; + if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; /* do nothing for the main process */

1 0

git:master: presence_xml: implementation of pv $xml(...)
by Daniel-Constantin Mierla 11 Jun '09

11 Jun '09

Module: sip-router Branch: master Commit: 6e729562274f7b5ec5230a7df2764f36ddb0f39f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e72956… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 11 21:02:47 2009 +0300 presence_xml: implementation of pv $xml(...) - handling of xml docs using xpath - $xml(name=>doc) - get/set an xml doc under 'name' - $xml(name=>xpath:xpath-expression) - evaluate/update xpath extension - example: $xml(x=>doc) = '<?xml version="1.0" encoding="UTF-8"?><a><b>test</b></a>'; xlog("content of node b: $xml(a=>xpath:/a/b/text())\n"); $xml(a=>xpath:/a/b) = "1234"; - TODO list: - extend presence modules to work also with xml documents from $xml() PV - support to set node content to an xml tree - usage: - do routing decisions based on content of xml documents comming with SIP messages (such as PUBLISH) - update xml document content - evaluate XPath-allowed expressions and functions, see: http://www.w3.org/TR/xpath --- modules_k/presence_xml/pv_xml.c | 463 +++++++++++++++++++++++++++++++++++++++ modules_k/presence_xml/pv_xml.h | 35 +++ 2 files changed, 498 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6e7…

1 0

git:master: tm: callbacks: obsolate description is removed.
by Miklos Tirpak 11 Jun '09

11 Jun '09

Module: sip-router Branch: master Commit: 09b7b0b356153335bcbb17220397f2a20801d4a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09b7b0b… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Thu Jun 11 16:53:59 2009 +0200 tm: callbacks: obsolate description is removed. The description about the callback insertion was confusing because no locking is necessary to insert new callbacks. --- modules/tm/t_hooks.h | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index 48b0d59..998ace1 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -146,21 +146,13 @@ struct cell; * incomplete -- this callback is called in very early stage * before the message is shmem-ized (so that you can work * with it). - * It's safe to install other TMCB callbacks from here. * Note: this callback MUST be installed before forking * (the req_in_tmcb_hl callback list does not live in shmem and has no access * protection), i.e., at best from mod_init functions. * - * Note: all the other callbacks MUST be installed before or immediately after - * the transaction is created (they must not be installed from any place - * where the transaction callbacks can be run or added simultaneously with - * the add operation). Another safe way of installing them is to hold the - * REPLY lock prior to adding a callback. - * In general it's not safe to register callbacks from other TMCB callbacks, - * unless the contrary is explicitly stated in the TMCB callback description. - * For example a good place for installing them is from a TMCB_REQUEST_IN - * callback. - * + * Note: All the other callbacks can be safely installed when the + * transaction already exists, it does not need to be locked. + * * TMCB_RESPONSE_IN -- a brand-new reply was received which matches * an existing non-local transaction. It may or may not be a retransmission. * No lock is held here (yet).

1 0

git:master: call_control: changed LM_ macro calls
by admin＠sip-router.org 11 Jun '09

11 Jun '09

Module: sip-router Branch: master Commit: 3ac29ef0133bf29047c4bcd414e246791e164744 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ac29ef… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Thu Jun 11 15:07:21 2009 +0100 call_control: changed LM_ macro calls - LM_ macro call changed to LOG calls --- modules_k/call_control/call_control.c | 88 ++++++++++++++++---------------- 1 files changed, 44 insertions(+), 44 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3ac…

1 0

kamctl for sr
by jh＠tutpro.com 11 Jun '09

11 Jun '09

what was the status regarding kamctl equivalent for sr? should i add a task about it or is it already done? at minimum i would need a script that i can use to give fifo commands to sr. actually, i do have a script that does that and only that. should i add it to scripts dir until someone comes up with something better? -- juha

4 3

how to set debug level?
by jh＠tutpro.com 11 Jun '09

11 Jun '09

in kamailio there was mi command debug that i could use to alter debug level dynamically. how can i now achieve the same in sr via mi fifo interface? -- juha

2 1

cancel/ack problems
by jh＠tutpro.com 11 Jun '09

11 Jun '09

now that db issues have been solved, i tried make a call. twinkle user test called twinkle user jh, but before jh answered, test canceled the call. i got to syslog: Jun 11 13:03:31 localhost /usr/sbin/sip-router[1727]: INFO: INVITE <sip:jh@test.fi> by <test(a)test.fi> as <sip:test@test.fi> from <192.98.101.10> is authorized Jun 11 13:03:31 localhost /usr/sbin/sip-router[1727]: INFO: Routing first INVITE to <sip:jh_test_fi@192.98.101.10:5074;transport=udp> and <<null>> Jun 11 13:03:33 localhost /usr/sbin/sip-router[1726]: INFO: Relaying CANCEL to <sip:jh@test.fi> Jun 11 13:03:33 localhost /usr/sbin/sip-router[1727]: INFO: Routing in-dialog ACK from <sip:test@test.fi> to <sip:jh@test.fi> Jun 11 13:03:33 localhost /usr/sbin/sip-router[1727]: WARNING: tm [t_lookup.c:1499]: WARNING: script writer didn't release transaction Jun 11 13:03:33 localhost /usr/sbin/sip-router[1727]: NOTICE: Discarding unmatched ACK <sip:jh@test.fi> with same config file, kamailio doesn't give the warning about not releasing transaction nor notice about unmatched cancel. notice comes from this: # Relay CANCEL without further processing if (is_method("CANCEL")) { if (!t_check_trans()) { xlog("L_NOTICE", "Discarding unmatched CANCEL to <$ru>\n"); exit; }; why is cancel not matched? in case mailing list accepts attachments, wireshark dump (which looks good to me), is enclosed. -- juha

2 2

git:master: * Just the call-control module from OpenSIPS ported to Sip-Router
by admin＠sip-router.org 11 Jun '09

11 Jun '09

Module: sip-router Branch: master Commit: b8d12a322f17aa302f21ee9fb2068400586bace3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8d12a3… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Thu Jun 11 13:01:15 2009 +0100 * Just the call-control module from OpenSIPS ported to Sip-Router --- modules_k/call_control/Makefile | 16 + modules_k/call_control/README | 354 ++++++++ modules_k/call_control/call_control.c | 967 +++++++++++++++++++++ modules_k/call_control/doc/Makefile | 4 + modules_k/call_control/doc/call_control.8 | 125 +++ modules_k/call_control/doc/call_control.xml | 45 + modules_k/call_control/doc/call_control_admin.xml | 437 ++++++++++ 7 files changed, 1948 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b8d…

1 0

Compilation ignoring directory settings
by Edson - Lists 11 Jun '09

11 Jun '09

I compile and install with: # make prefix=/ mandir=/usr/local/man cfg_dir=/etc/sip-router install then I run: # ser and got: ERROR: loading config file(/usr/local/etc/ser/ser.cfg): No such file or directory The ERROR message is expected (there is no /usr/local/etc/ser directory at all), but why is sip-router (ser) trying to find configuration file on the default directory if I explicitly compile it pointing to another one? From what I looked on Makefile.defs the config directory is gived by the "cfg_dir" variable... "prefix" is honor, since "ser" binary is installed correctly: # which ser /sbin/ser Edson.

4 9

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009