sr-dev

sr-dev@lists.kamailio.org

15 participants
44229 discussions

CVS:commitlog: rtpproxy Makefile.am main.c rtp.c rtpp_defines.h rtpp_network.c rtpp_network.h rtpp_record.h rtpp_util.c rtpp_util.h

by Maxim Sobolev

sobomax 2009/06/12 21:10:08 CEST SER CVS Repository Modified files: . Makefile.am main.c rtp.c rtpp_defines.h rtpp_network.c rtpp_network.h rtpp_record.h rtpp_util.c rtpp_util.h Log: Move network-related functions into the seperate file - rtpp_network.c, copied over from rtpp_network.h. Revision Changes Path 1.15 +1 -1 rtpproxy/Makefile.am http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/Makefile.am.diff?r1=… 1.91 +2 -1 rtpproxy/main.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/main.c.diff?r1=1.90&… 1.10 +2 -2 rtpproxy/rtp.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtp.c.diff?r1=1.9&r2… 1.26 +3 -1 rtpproxy/rtpp_defines.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_defines.h.diff?… 1.15 +2 -213 rtpproxy/rtpp_network.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_network.c.diff?… 1.20 +3 -43 rtpproxy/rtpp_network.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_network.h.diff?… 1.10 +2 -2 rtpproxy/rtpp_record.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_record.h.diff?r… 1.15 +1 -144 rtpproxy/rtpp_util.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_util.c.diff?r1=… 1.20 +1 -58 rtpproxy/rtpp_util.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/rtpproxy/rtpp_util.h.diff?r1=…

15 years, 7 months

Code-guidelines ?

by Raúl Alexis Betancor Santana

What are the code guidelines we must follow when developing for s-r ? I have not found a code-guideline on the wiki. I don't know if I used the correct LOG macros on the call_control module I just taked a look at tm module and see that is used the LOG macros instead of LM_* macros -- Raúl Alexis Betancor Santana Dimensión Virtual

15 years, 7 months

git:master: htable: delete item when assigning $null

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: b9aa4016c76434204692d4a2dc97aed5b5c9f239 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9aa401… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Fri Jun 12 13:01:48 2009 +0300 htable: delete item when assigning $null - compatibility with K style of removing item --- modules_k/htable/ht_var.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/htable/ht_var.c b/modules_k/htable/ht_var.c index 4cc0808..e97bc1d 100644 --- a/modules_k/htable/ht_var.c +++ b/modules_k/htable/ht_var.c @@ -83,7 +83,7 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, } LM_DBG("set value for $ht(%.*s=>%.*s)\n", hpv->htname.len, hpv->htname.s, htname.len, htname.s); - if(val==NULL) + if((val==NULL) || (val->flags&PV_VAL_NULL)) { /* delete it */ ht_del_cell(hpv->ht, &htname);

15 years, 7 months

git:master: htable: more match ops in counting items with $shtcn and $shtcv

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 80a6149e604ad663580551efd80d77068a22e6f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80a6149… Author: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Committer: Elena-Ramona Modroiu <ramona(a)rosdev.ro> Date: Fri Jun 12 13:03:00 2009 +0300 htable: more match ops in counting items with $shtcn and $shtcv --- modules_k/htable/ht_api.c | 130 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 119 insertions(+), 11 deletions(-) diff --git a/modules_k/htable/ht_api.c b/modules_k/htable/ht_api.c index 5932f52..5951167 100644 --- a/modules_k/htable/ht_api.c +++ b/modules_k/htable/ht_api.c @@ -863,14 +863,91 @@ int ht_count_cells_re(str *sre, ht_t *ht, int mode) regex_t re; regmatch_t pmatch; int cnt = 0; + int op = 0; + str sval; + str tval; + int ival = 0; if(sre==NULL || sre->len<=0 || ht==NULL) return 0; - if (regcomp(&re, sre->s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) + if(sre->len>=2) { - LM_ERR("bad re %s\n", sre->s); - return 0; + switch(sre->s[0]) { + case '~': + switch(sre->s[1]) { + case '~': + op = 1; /* regexp */ + break; + case '%': + op = 2; /* rlike */ + break; + } + break; + case '%': + switch(sre->s[1]) { + case '~': + op = 3; /* llike */ + break; + } + break; + case '=': + switch(sre->s[1]) { + case '=': + op = 4; /* str eq */ + break; + } + break; + case 'e': + switch(sre->s[1]) { + case 'q': + op = 5; /* int eq */ + break; + } + break; + case '*': + switch(sre->s[1]) { + case '*': + op = 6; /* int eq */ + break; + } + break; + } + } + + if(op==6) { + /* count all */ + for(i=0; i<ht->htsize; i++) + cnt += ht->entries[i].esize; + return cnt; + } + + if(op > 0) { + if(sre->len<=2) + return 0; + sval = *sre; + sval.s += 2; + sval.len -= 2; + if(op==5) { + if(mode==0) + { + /* match by name */ + return 0; + } + str2sint(&sval, &ival); + } + } else { + sval = *sre; + op = 1; + } + + if(op==1) + { + if (regcomp(&re, sval.s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) + { + LM_ERR("bad re %s\n", sre->s); + return 0; + } } for(i=0; i<ht->htsize; i++) @@ -881,21 +958,52 @@ int ht_count_cells_re(str *sre, ht_t *ht, int mode) while(it) { it0 = it->next; - if(mode==0) + if(op==5) { - /* match by name */ - if (regexec(&re, it->name.s, 1, &pmatch, 0)==0) - cnt++; - } else { - if(it->flags&AVP_VAL_STR) - if (regexec(&re, it->value.s.s, 1, &pmatch, 0)==0) + if(!(it->flags&AVP_VAL_STR)) + if( it->value.n==ival) cnt++; + } else { + tval.len = -1; + if(mode==0) + { + /* match by name */ + tval = it->name; + } else { + if(it->flags&AVP_VAL_STR) + tval = it->value.s; + } + if(tval.len>-1) { + switch(op) { + case 1: /* regexp */ + if (regexec(&re, tval.s, 1, &pmatch, 0)==0) + cnt++; + break; + case 2: /* rlike */ + if(sval.len<=tval.len + && strncmp(sval.s, + tval.s+tval.len-sval.len, sval.len)==0) + cnt++; + break; + case 3: /* llike */ + if(sval.len<=tval.len + && strncmp(sval.s, tval.s, sval.len)==0) + cnt++; + break; + case 4: /* str eq */ + if(sval.len==tval.len + && strncmp(sval.s, tval.s, sval.len)==0) + cnt++; + break; + } + } } it = it0; } lock_release(&ht->entries[i].lock); } - regfree(&re); + if(op==1) + regfree(&re); return cnt; }

15 years, 7 months

git:master: presence_xml: support to handle namespace prefixes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 30e285d05fe32235c0befde9573fafd8a162a974 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30e285d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 12 11:19:37 2009 +0300 presence_xml: support to handle namespace prefixes --- modules_k/presence_xml/presence_xml.c | 4 ++- modules_k/presence_xml/pv_xml.c | 54 +++++++++++++++++++++++++++++++++ modules_k/presence_xml/pv_xml.h | 3 ++ 3 files changed, 60 insertions(+), 1 deletions(-) diff --git a/modules_k/presence_xml/presence_xml.c b/modules_k/presence_xml/presence_xml.c index 971449c..7cdbf64 100644 --- a/modules_k/presence_xml/presence_xml.c +++ b/modules_k/presence_xml/presence_xml.c @@ -112,7 +112,9 @@ static param_export_t params[]={ { "disable_presence", INT_PARAM, &disable_presence }, { "disable_winfo", INT_PARAM, &disable_winfo }, { "disable_bla", INT_PARAM, &disable_bla }, - { "passive_mode", INT_PARAM, &passive_mode }, { 0, 0, 0} + { "passive_mode", INT_PARAM, &passive_mode }, + { "xml_ns", STR_PARAM|USE_FUNC_PARAM, (void*)pv_xml_ns_param }, + { 0, 0, 0} }; static mi_export_t mi_cmds[] = { diff --git a/modules_k/presence_xml/pv_xml.c b/modules_k/presence_xml/pv_xml.c index d183bae..dcb5a19 100644 --- a/modules_k/presence_xml/pv_xml.c +++ b/modules_k/presence_xml/pv_xml.c @@ -30,6 +30,7 @@ #include <libxml/xpathInternals.h> #include "../../mem/mem.h" +#include "../../parser/parse_param.h" #include "../../hashes.h" #include "../../dprint.h" @@ -58,6 +59,8 @@ typedef struct _pv_xml_spec { pv_xml_t *_pv_xml_root = NULL; +param_t *_pv_xml_ns_root = NULL; + pv_xml_t *pv_xml_get_struct(str *name) { unsigned int docid; @@ -159,6 +162,7 @@ int pv_xpath_nodes_eval(pv_xml_t *xdoc) xdoc->outbuf.s[xdoc->outbuf.len] = '\0'; return 0; } + int pv_xpath_nodes_update(pv_xml_t *xdoc, str *val) { xmlNodeSetPtr nodes; @@ -222,6 +226,17 @@ int pv_xpath_nodes_update(pv_xml_t *xdoc, str *val) return 0; } +void pv_xml_register_ns(xmlXPathContextPtr xpathCtx) +{ + param_t *ns; + ns = _pv_xml_ns_root; + while(ns) { + xmlXPathRegisterNs(xpathCtx, (xmlChar*)ns->name.s, + (xmlChar*)ns->body.s); + ns = ns->next; + } +} + int pv_get_xml(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -286,6 +301,7 @@ int pv_get_xml(struct sip_msg *msg, pv_param_t *param, } /* Evaluate xpath expression */ + pv_xml_register_ns(pxs->xdoc->xpathCtx); pxs->xdoc->xpathObj = xmlXPathEvalExpression( (const xmlChar*)xpaths.s, pxs->xdoc->xpathCtx); if(pxs->xdoc->xpathObj == NULL) @@ -494,3 +510,41 @@ error: return -1; } +int pv_xml_ns_param(modparam_t type, void *val) +{ + char *p; + param_t *ns; + + if(val==NULL) + goto error; + ns = (param_t*)pkg_malloc(sizeof(param_t)); + + if(ns==NULL) + { + LM_ERR("no more pkg\n"); + goto error; + } + memset(ns, 0, sizeof(param_t)); + + p = strchr((const char*)val, '='); + if(p==NULL) + { + ns->name.s = ""; + ns->body.s = (char*)val; + ns->body.len = strlen(ns->body.s); + } else { + *p = 0; + p++; + ns->name.s = (char*)val; + ns->name.len = strlen(ns->name.s); + ns->body.s = p; + ns->body.len = strlen(ns->body.s); + } + ns->next = _pv_xml_ns_root; + _pv_xml_ns_root = ns; + return 0; +error: + return -1; + +} + diff --git a/modules_k/presence_xml/pv_xml.h b/modules_k/presence_xml/pv_xml.h index dc14e38..7db8689 100644 --- a/modules_k/presence_xml/pv_xml.h +++ b/modules_k/presence_xml/pv_xml.h @@ -23,6 +23,7 @@ #ifndef _PV_XML_H_ #define _PV_XML_H_ +#include "../../sr_module.h" #include "../../pvar.h" int pv_get_xml(struct sip_msg *msg, pv_param_t *param, @@ -32,4 +33,6 @@ int pv_set_xml(struct sip_msg* msg, pv_param_t *param, int pv_parse_xml_name(pv_spec_p sp, str *in); +int pv_xml_ns_param(modparam_t type, void *val); + #endif

15 years, 7 months

git:master: presence_xml: safety checks for null node set

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5605e1fc7d0dab50f444d9c24edc8d50d8ae3eb4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5605e1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 12 00:31:39 2009 +0300 presence_xml: safety checks for null node set - print string reprezentation of the node if it has no cdata value --- modules_k/presence_xml/pv_xml.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git a/modules_k/presence_xml/pv_xml.c b/modules_k/presence_xml/pv_xml.c index 0fd0620..d183bae 100644 --- a/modules_k/presence_xml/pv_xml.c +++ b/modules_k/presence_xml/pv_xml.c @@ -101,12 +101,20 @@ int pv_xpath_nodes_eval(pv_xml_t *xdoc) int i; xmlNodeSetPtr nodes; char *p; + xmlChar *keyword; + xmlBufferPtr psBuf; if(xdoc==NULL || xdoc->doc==NULL || xdoc->xpathCtx==NULL || xdoc->xpathObj==NULL) return -1; nodes = xdoc->xpathObj->nodesetval; + if(nodes==NULL) + { + xdoc->outbuf.len = 0; + xdoc->outbuf.s[xdoc->outbuf.len] = '\0'; + return 0; + } size = nodes->nodeNr; p = xdoc->outbuf.s; for(i = 0; i < size; ++i) @@ -118,10 +126,33 @@ int pv_xpath_nodes_eval(pv_xml_t *xdoc) *p = ','; p++; } - if(nodes->nodeTab[i]->content!=NULL) + if(nodes->nodeTab[i]->type == XML_ATTRIBUTE_NODE) { - strcpy(p, (char*)nodes->nodeTab[i]->content); - p += strlen((char*)nodes->nodeTab[i]->content); + keyword = xmlNodeListGetString(xdoc->doc, + nodes->nodeTab[i]->children, 0); + if(keyword != NULL) + { + strcpy(p, (char*)keyword); + p += strlen((char*)keyword); + xmlFree(keyword); + keyword = NULL; + } + } else { + if(nodes->nodeTab[i]->content!=NULL) + { + strcpy(p, (char*)nodes->nodeTab[i]->content); + p += strlen((char*)nodes->nodeTab[i]->content); + } else { + psBuf = xmlBufferCreate(); + if(psBuf != NULL && xmlNodeDump(psBuf, xdoc->doc, + nodes->nodeTab[i], 0, 0)>0) + { + strcpy(p, (char*)xmlBufferContent(psBuf)); + p += strlen((char*)xmlBufferContent(psBuf)); + } + if(psBuf != NULL) xmlBufferFree(psBuf); + psBuf = NULL; + } } } xdoc->outbuf.len = p - xdoc->outbuf.s; @@ -144,6 +175,8 @@ int pv_xpath_nodes_update(pv_xml_t *xdoc, str *val) return -1; } nodes = xdoc->xpathObj->nodesetval; + if(nodes==NULL) + return 0; size = nodes->nodeNr; value = (const xmlChar*)xdoc->outbuf.s;

15 years, 7 months

git:master: presence_xml: readme updated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 986c26b70e4733172b6b0038494fd81eb983bb48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=986c26b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 11 22:21:28 2009 +0300 presence_xml: readme updated - documented passive_mode parameter and mentioned $xml(...) PV --- modules_k/presence_xml/README | 26 ++++++++++++++++ modules_k/presence_xml/doc/presence_xml_admin.xml | 33 +++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_xml/README b/modules_k/presence_xml/README index 25a8be2..d9fafe5 100644 --- a/modules_k/presence_xml/README +++ b/modules_k/presence_xml/README @@ -35,9 +35,11 @@ Anca-Maria Vamanu 3.7. pidf_manipulation (int) 3.8. integrated_xcap_server (int) 3.9. xcap_server (str) + 3.10. passive_mode(int) 4. Exported Functions 5. Installation + 6. Exported pseudo-variables 2. Developer Guide @@ -52,6 +54,7 @@ Anca-Maria Vamanu 1.7. Set pidf_manipulation parameter 1.8. Set integrated_xcap_server parameter 1.9. Set xcap_server parameter + 1.10. Set passive_mode parameter Chapter 1. Admin Guide @@ -74,9 +77,11 @@ Chapter 1. Admin Guide 3.7. pidf_manipulation (int) 3.8. integrated_xcap_server (int) 3.9. xcap_server (str) + 3.10. passive_mode(int) 4. Exported Functions 5. Installation + 6. Exported pseudo-variables 1. Overview @@ -123,6 +128,7 @@ Chapter 1. Admin Guide 3.7. pidf_manipulation (int) 3.8. integrated_xcap_server (int) 3.9. xcap_server (str) + 3.10. passive_mode(int) 3.1. db_url(str) @@ -252,6 +258,19 @@ modparam("presence_xml", "xcap_server", "xcap_server.example.org") modparam("presence_xml", "xcap_server", "xcap_server.ag.org") ... +3.10. passive_mode(int) + + If set to 1, module acts in passive mode - no bind to presence module, + no connection to database. Useful when needing only to use $xml(...) + pseudoc-variable. + + Default value: "0" (0 - active mode, 1 - passive mode). + + Example 1.10. Set passive_mode parameter +... +modparam("presence_xml", "passive_mode", 1) +... + 4. Exported Functions None to be used in configuration file. @@ -264,6 +283,13 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org") the complete database documentation on the project webpage, http://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. +6. Exported pseudo-variables + + * $xml(name=>spec) + + Exported pseudo-variables are documented at + http://www.kamailio.org/dokuwiki/. + Chapter 2. Developer Guide The module exports no function to be used in other Kamailio modules. diff --git a/modules_k/presence_xml/doc/presence_xml_admin.xml b/modules_k/presence_xml/doc/presence_xml_admin.xml index f706705..16a22bd 100644 --- a/modules_k/presence_xml/doc/presence_xml_admin.xml +++ b/modules_k/presence_xml/doc/presence_xml_admin.xml @@ -276,6 +276,27 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org") </programlisting> </example> </section> + <section> + <title><varname>passive_mode</varname>(int)</title> + <para> + If set to 1, module acts in passive mode - no bind to presence module, + no connection to database. Useful when needing only to use $xml(...) + pseudoc-variable. + </para> + <para> + <emphasis>Default value: <quote>0</quote> (0 - active mode, + 1 - passive mode). + </emphasis> + </para> + <example> + <title>Set <varname>passive_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence_xml", "passive_mode", 1) +... +</programlisting> + </example> + </section> </section> <section> <title>Exported Functions</title> @@ -295,5 +316,17 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org") </para> </section> +<section> + <title>Exported pseudo-variables</title> + <itemizedlist> + <listitem><para> + <emphasis>$xml(name=>spec)</emphasis> + </para></listitem> + </itemizedlist> + <para> + Exported pseudo-variables are documented at &kamwikilink;. + </para> +</section> + </chapter>

15 years, 7 months

git:master: tm: t_check_trans ends script on neg. or local ACK

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 22f9bd6620b851848853befc677ce6b6b318c483 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22f9bd6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jun 11 20:25:47 2009 +0200 tm: t_check_trans ends script on neg. or local ACK - t_check_trans will now end the script if the message is an ACK to an existing transaction ended with a negative reply or an ACK to a local transaction (as opposed to a normal proxied one). Before ending the script it will process the ACK in the same way t_newtran would, including calling the appropriate callbacks. t_check_trans behaviour for other requests (e.g. retransmissions, cancels, e2e ACK) remains unchanged. - added missing callbacks for the retransmitted request case. Reported-and-tested-by: Juha Heinanen jh at tutpro com. --- modules/tm/tm.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 982681a..e769b75 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -1742,8 +1742,9 @@ int w_t_reply_wrp(struct sip_msg *m, unsigned int code, char *txt) /** script function, check if a msg is assoc. to a transaction. - * @return -1 (not), 1 (reply, ack or cancel for an existing transaction), - * 0 (request retransmission) + * @return -1 (not), 1 (reply, e2e ack or cancel for an existing transaction), + * 0 (request retransmission, ack to negative reply or ack to local + * transaction) * Note: the e2e ack matching works only for local e2e acks or for * transactions with E2EACK* callbacks installed (but even in this * case matching E2EACKs on proxied transaction is not entirely @@ -1763,15 +1764,26 @@ static int t_check_trans(struct sip_msg* msg, char* foo, char* bar) case -2: /* possible e2e ack */ return 1; case 1: /* found */ - if (msg->REQ_METHOD==METHOD_ACK) - /* ack to neg. reply */ - return 1; - /* else retransmission */ t=get_t(); - t_retransmit_reply(t); - UNREF(t); - set_t(0); - return 0; + if (msg->REQ_METHOD==METHOD_ACK){ + /* ack to neg. reply or ack to local trans. + => process it and end the script */ + /* FIXME: there's no way to distinguish here + between acks to local trans. and neg. acks */ + if (unlikely(has_tran_tmcbs(t, TMCB_ACK_NEG_IN))) + run_trans_callbacks(TMCB_ACK_NEG_IN, t, msg, + 0, msg->REQ_METHOD); + t_release_transaction(t); + } else { + /* is a retransmission */ + if (unlikely(has_tran_tmcbs(t, TMCB_REQ_RETR_IN))) + run_trans_callbacks(TMCB_REQ_RETR_IN, t, msg, + 0, msg->REQ_METHOD); + t_retransmit_reply(t); + } + /* no need for UNREF(t); set_t(0) - the end-of-script + t_unref callback will take care of them */ + return 0; /* return from the script */ } /* not found or error */ }

15 years, 7 months

git:master: presence_xml: implementation of pv $xml(...)

by Daniel-Constantin Mierla

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…

15 years, 7 months

git:master: presence_xml: new pv $xml(...)

by Daniel-Constantin Mierla

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 */

15 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev