sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: doc: generated counter lists

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 2effff88007d5b543cc8b0779af126f65d18e6fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2effff8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 1 19:06:17 2010 +0200 doc: generated counter lists --- doc/counter_list/counters_dns.txt | 9 ++ doc/counter_list/counters_mysql.txt | 10 +++ doc/counter_list/counters_sctp.txt | 43 ++++++++++ doc/counter_list/counters_tcp.txt | 44 ++++++++++ doc/counter_list/docbook/counter_list.xml | 22 +++++ doc/counter_list/docbook/counters_dns.xml | 18 ++++ doc/counter_list/docbook/counters_mysql.xml | 19 +++++ doc/counter_list/docbook/counters_sctp.xml | 112 ++++++++++++++++++++++++++ doc/counter_list/docbook/counters_tcp.xml | 113 +++++++++++++++++++++++++++ 9 files changed, 390 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2ef…

14 years, 5 months

git:master: doc: counter_list

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 467d1f2f5a9af24bae6ac3c7057ace961c89684f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=467d1f2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 1 11:36:50 2010 +0200 doc: counter_list Added a new directory (doc/counter_list) complete with Makefiles for auto-generating the lists with all the counters (stats) implemented in the code. Both .txt and docbook format are supported. E.g.: make -C doc/counter_list all # generates the docbook and .txt make -C doc/counter_list/docbook html # html from docbook --- doc/counter_list/Makefile | 331 +++++++++++++++++++++++++++++++++++++ doc/counter_list/docbook/Makefile | 7 + 2 files changed, 338 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=467…

14 years, 5 months

git:master: doc: *_list: minor sed script fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: bf9d269f1a903288b0361a538070191b52535f10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf9d269… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 1 13:01:34 2010 +0200 doc: *_list: minor sed script fix Fix empty output for the sed script for parsing/filtering makefiles (in some cases the commands for the last line were not executed). --- doc/cfg_list/Makefile | 8 ++++---- doc/rpc_list/Makefile | 8 ++++---- doc/select_list/Makefile | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index a10aaef..2aa9756 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -127,11 +127,11 @@ get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ # replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. get_make_vars=$(subst ^LF^,$(LF),$(shell sed -n \ -e ': start' \ - -e '/^$ifeq\|ifneq\|else\|endif$[\t ]*$$$\|.*[^\]$$$/{H;d}' \ - -e '/^$ifeq\|ifneq\|else\|endif$[\t ]\+.*[\]$$/,/[^\]$$/{H;d}' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]*$$$\|.*[^\]$$$/{H;b end}' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]\+.*[\]$$/,/[^\]$$/{H;b end}' \ -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:$[^=]\|$$$/b eat_rule' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;d}' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/{H;d}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;b end}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/{H;b end}' \ -e ': end' \ -e '$${g;s/\n/^LF^/g;p}'\ -e 'b' \ diff --git a/doc/rpc_list/Makefile b/doc/rpc_list/Makefile index bf9f5bf..06b4a32 100644 --- a/doc/rpc_list/Makefile +++ b/doc/rpc_list/Makefile @@ -143,11 +143,11 @@ get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ # replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. get_make_vars=$(subst ^LF^,$(LF),$(shell sed -n \ -e ': start' \ - -e '/^$ifeq\|ifneq\|else\|endif$[\t ]*$$$\|.*[^\]$$$/{H;d}' \ - -e '/^$ifeq\|ifneq\|else\|endif$[\t ]\+.*[\]$$/,/[^\]$$/{H;d}' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]*$$$\|.*[^\]$$$/{H;b end}' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]\+.*[\]$$/,/[^\]$$/{H;b end}' \ -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:$[^=]\|$$$/b eat_rule' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;d}' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/{H;d}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;b end}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/{H;b end}' \ -e ': end' \ -e '$${g;s/\n/^LF^/g;p}'\ -e 'b' \ diff --git a/doc/select_list/Makefile b/doc/select_list/Makefile index 7d43356..ae84037 100644 --- a/doc/select_list/Makefile +++ b/doc/select_list/Makefile @@ -136,11 +136,11 @@ get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ # replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. get_make_vars=$(subst ^LF^,$(LF),$(shell sed -n \ -e ': start' \ - -e '/^$ifeq\|ifneq\|else\|endif$[\t ]*$$$\|.*[^\]$$$/{H;d}' \ - -e '/^$ifeq\|ifneq\|else\|endif$[\t ]\+.*[\]$$/,/[^\]$$/{H;d}' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]*$$$\|.*[^\]$$$/{H;b end}' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]\+.*[\]$$/,/[^\]$$/{H;b end}' \ -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:$[^=]\|$$$/b eat_rule' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;d}' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/{H;d}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;b end}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/{H;b end}' \ -e ': end' \ -e '$${g;s/\n/^LF^/g;p}'\ -e 'b' \

14 years, 5 months

git:master: doc: script to generate counter/stats list from C code

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b09a0eb16a3f3f6bdb458f2e118d3c5c2b9549cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b09a0eb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 1 10:34:19 2010 +0200 doc: script to generate counter/stats list from C code Added a perl script that generates counter documentation (name and description) from a C file (based on the counter definition array). It can output txt or docbook. --- doc/scripts/cdefs2doc/dump_counters.pl | 447 ++++++++++++++++++++++++++++++++ 1 files changed, 447 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b09…

14 years, 5 months

modules/db_berkeley fails to compile with libdb4.5-dev or below

by marius zbihlei

Hello, Both on master and kamailio_3.0: CC (gcc) [M db_berkeley.so] bdb_res.o bdb_res.c: In function ‘bdb_res_free’: bdb_res.c:51: error: ‘DBC’ has no member named ‘close’ make: *** [bdb_res.o] Error 1 After checking the documentation, it seems that a function that works and closes a cursor for versions > 4.2 is c_close(), but this is marked as deprecated in 4.6, where the close() alternative is also present . c_close() is still used in several places. My thoughts : either we replace DBC->close() with DBC->c_close() or , keeping in mind DB_VERSION, we use both c_close() or close() depending on the version on the system. Ideas? Marius

14 years, 5 months

git:master: xcap_server: documentation updated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a3e9121179c22a3cd7aa990982a772f5016d1792 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3e9121… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 1 15:00:13 2010 +0200 xcap_server: documentation updated --- modules_k/xcap_server/README | 126 ++++++++++++++++------- modules_k/xcap_server/doc/xcap_server_admin.xml | 121 +++++++++++++++++----- 2 files changed, 181 insertions(+), 66 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a3e…

14 years, 5 months

git:master: core: make READ_HTTP11 on if NO_READ_HTTP11 is defined

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2ad5ba6fd8a5cde9038d90c969632ee3a1148ccd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ad5ba6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 1 14:31:50 2010 +0200 core: make READ_HTTP11 on if NO_READ_HTTP11 is defined - the code is anyhow enabled only when tcp_accept_no_cl is on - suggested by Andrei --- tcp_conn.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tcp_conn.h b/tcp_conn.h index b729df7..4328208 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -76,6 +76,9 @@ #define F_CONN_WANTS_WR 8192 /* conn. should be watched for WRITE */ #define F_CONN_PASSIVE 16384 /* conn. created via accept() and not connect()*/ +#ifndef NO_READ_HTTP11 +#define READ_HTTP11 +#endif enum tcp_req_errors { TCP_REQ_INIT, TCP_REQ_OK, TCP_READ_ERROR, TCP_REQ_OVERRUN, TCP_REQ_BAD_LEN };

14 years, 5 months

git:master: xcap_server: components of xcap uri available in cfg

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1ae80a64d1d488ed581a70085c61480ca3ae7c79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ae80a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 1 12:49:01 2010 +0200 xcap_server: components of xcap uri available in cfg - the user id is embedded in xcap uri and is needed to decide what is the sip uri associated with it - $xcapuri(name=>key) PV exported to config --- modules_k/xcap_server/xcap_misc.c | 247 ++++++++++++++++++++++++++++++++++- modules_k/xcap_server/xcap_misc.h | 8 + modules_k/xcap_server/xcap_server.c | 10 +- 3 files changed, 260 insertions(+), 5 deletions(-) diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 70a7d1f..1c844e7 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -30,15 +30,19 @@ #include <libxml/xpathInternals.h> #include "../../dprint.h" -#include "../../sr_module.h" #include "../../mem/mem.h" #include "../../parser/parse_param.h" #include "../../modules_k/xcap_client/xcap_callbacks.h" #include "xcap_misc.h" +extern str xcaps_root; + static param_t *_xcaps_xpath_ns_root = NULL; +/** + * parse xcap uri + */ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) { str s; @@ -213,6 +217,7 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) xuri->node.len = xuri->uri.s + xuri->uri.len - xuri->node.s; } +#if 0 LM_DBG("----- uri: [%.*s]\n", xuri->uri.len, xuri->uri.s); LM_DBG("----- root: [%.*s]\n", xuri->root.len, xuri->root.s); LM_DBG("----- auid: [%.*s] (%d)\n", xuri->auid.len, xuri->auid.s, @@ -225,9 +230,13 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) LM_DBG("----- rdoc: [%.*s]\n", xuri->rdoc.len, xuri->rdoc.s); if(xuri->nss!=NULL) LM_DBG("----- node: [%.*s]\n", xuri->node.len, xuri->node.s); +#endif return 0; } +/** + * get content of xpath pointer + */ int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf) { xmlDocPtr doc = NULL; @@ -357,7 +366,9 @@ error: return -1; } - +/** + * set content of xpath pointer + */ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) { xmlDocPtr doc = NULL; @@ -499,7 +510,9 @@ error: return -1; } - +/** + * register extra xml name spaces + */ void xcaps_xpath_register_ns(xmlXPathContextPtr xpathCtx) { param_t *ns; @@ -511,6 +524,9 @@ void xcaps_xpath_register_ns(xmlXPathContextPtr xpathCtx) } } +/** + * parse xml ns parameter + */ int xcaps_xpath_ns_param(modparam_t type, void *val) { char *p; @@ -549,3 +565,228 @@ error: } +/** + * xcapuri PV export + */ +typedef struct _pv_xcap_uri { + str name; + unsigned int id; + xcap_uri_t xuri; + struct _pv_xcap_uri *next; +} pv_xcap_uri_t; + +typedef struct _pv_xcap_uri_spec { + str name; + str key; + int ktype; + pv_xcap_uri_t *xus; +} pv_xcap_uri_spec_t; + + +pv_xcap_uri_t *_pv_xcap_uri_root = NULL; + +/** + * + */ +pv_xcap_uri_t *pv_xcap_uri_get_struct(str *name) +{ + unsigned int id; + pv_xcap_uri_t *it; + + id = get_hash1_raw(name->s, name->len); + it = _pv_xcap_uri_root; + + while(it!=NULL) + { + if(id == it->id && name->len==it->name.len + && strncmp(name->s, it->name.s, name->len)==0) + { + LM_DBG("uri found [%.*s]\n", name->len, name->s); + return it; + } + it = it->next; + } + + it = (pv_xcap_uri_t*)pkg_malloc(sizeof(pv_xcap_uri_t)); + if(it==NULL) + { + LM_ERR("no more pkg\n"); + return NULL; + } + memset(it, 0, sizeof(pv_xcap_uri_t)); + + it->id = id; + it->name = *name; + + it->next = _pv_xcap_uri_root; + _pv_xcap_uri_root = it; + return it; +} + + +/** + * + */ +int pv_parse_xcap_uri_name(pv_spec_p sp, str *in) +{ + pv_xcap_uri_spec_t *pxs = NULL; + char *p; + + if(in->s==NULL || in->len<=0) + return -1; + + pxs = (pv_xcap_uri_spec_t*)pkg_malloc(sizeof(pv_xcap_uri_spec_t)); + if(pxs==NULL) + return -1; + + memset(pxs, 0, sizeof(pv_xcap_uri_spec_t)); + + p = in->s; + + while(p<in->s+in->len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r')) + p++; + if(p>in->s+in->len || *p=='\0') + goto error; + pxs->name.s = p; + while(p < in->s + in->len) + { + if(*p=='=' || *p==' ' || *p=='\t' || *p=='\n' || *p=='\r') + break; + p++; + } + if(p>in->s+in->len || *p=='\0') + goto error; + pxs->name.len = p - pxs->name.s; + if(*p!='=') + { + while(p<in->s+in->len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r')) + p++; + if(p>in->s+in->len || *p=='\0' || *p!='=') + goto error; + } + p++; + if(*p!='>') + goto error; + p++; + + pxs->key.len = in->len - (int)(p - in->s); + pxs->key.s = p; + LM_DBG("uri name [%.*s] - key [%.*s]\n", pxs->name.len, pxs->name.s, + pxs->key.len, pxs->key.s); + if(pxs->key.len==4 && strncmp(pxs->key.s, "data", 4)==0) { + pxs->ktype = 0; + } else if(pxs->key.len==3 && strncmp(pxs->key.s, "uri", 4)==0) { + pxs->ktype = 1; + } else if(pxs->key.len==4 && strncmp(pxs->key.s, "root", 4)==0) { + pxs->ktype = 2; + } else if(pxs->key.len==4 && strncmp(pxs->key.s, "auid", 4)==0) { + pxs->ktype = 3; + } else if(pxs->key.len==4 && strncmp(pxs->key.s, "type", 4)==0) { + pxs->ktype = 4; + } else if(pxs->key.len==4 && strncmp(pxs->key.s, "tree", 4)==0) { + pxs->ktype = 5; + } else if(pxs->key.len==4 && strncmp(pxs->key.s, "xuid", 4)==0) { + pxs->ktype = 6; + } else if(pxs->key.len==4 && strncmp(pxs->key.s, "file", 4)==0) { + pxs->ktype = 7; + } else if(pxs->key.len==4 && strncmp(pxs->key.s, "node", 4)==0) { + pxs->ktype = 8; + } else { + LM_ERR("unknown key type [%.*s]\n", in->len, in->s); + goto error; + } + pxs->xus = pv_xcap_uri_get_struct(&pxs->name); + sp->pvp.pvn.u.dname = (void*)pxs; + sp->pvp.pvn.type = PV_NAME_OTHER; + return 0; + +error: + if(pxs!=NULL) + pkg_free(pxs); + return -1; +} + +/** + * + */ +int pv_set_xcap_uri(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val) +{ + pv_xcap_uri_spec_t *pxs = NULL; + + pxs = (pv_xcap_uri_spec_t*)param->pvn.u.dname; + if(pxs->xus==NULL) + return -1; + if(!(val->flags&PV_VAL_STR)) + return -1; + if(pxs->ktype!=0) + return -1; + /* set uri data */ + if(xcap_parse_uri(&val->rs, &xcaps_root, &pxs->xus->xuri)<0) + { + LM_ERR("error setting xcap uri data [%.*s]\n", + val->rs.len, val->rs.s); + return -1; + } + + return 0; +} + +/** + * + */ +int pv_get_xcap_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + pv_xcap_uri_spec_t *pxs = NULL; + + pxs = (pv_xcap_uri_spec_t*)param->pvn.u.dname; + if(pxs->xus==NULL) + return -1; + + switch(pxs->ktype) { + case 0: + case 1: + /* get uri */ + if(pxs->xus->xuri.uri.len>0) + return pv_get_strval(msg, param, res, &pxs->xus->xuri.uri); + break; + case 2: + /* get root */ + if(pxs->xus->xuri.root.len>0) + return pv_get_strval(msg, param, res, &pxs->xus->xuri.root); + break; + case 3: + /* get auid */ + if(pxs->xus->xuri.auid.len>0) + return pv_get_strval(msg, param, res, &pxs->xus->xuri.auid); + break; + case 4: + /* get type */ + return pv_get_sintval(msg, param, res, pxs->xus->xuri.type); + break; + case 5: + /* get tree */ + if(pxs->xus->xuri.tree.len>0) + return pv_get_strval(msg, param, res, &pxs->xus->xuri.tree); + break; + case 6: + /* get xuid */ + if(pxs->xus->xuri.xuid.len>0) + return pv_get_strval(msg, param, res, &pxs->xus->xuri.xuid); + break; + case 7: + /* get file */ + if(pxs->xus->xuri.file.len>0) + return pv_get_strval(msg, param, res, &pxs->xus->xuri.file); + break; + case 8: + /* get node */ + if(pxs->xus->xuri.node.len>0) + return pv_get_strval(msg, param, res, &pxs->xus->xuri.node); + break; + default: + return pv_get_null(msg, param, res); + } + return pv_get_null(msg, param, res); +} diff --git a/modules_k/xcap_server/xcap_misc.h b/modules_k/xcap_server/xcap_misc.h index 83564e9..78c92a0 100644 --- a/modules_k/xcap_server/xcap_misc.h +++ b/modules_k/xcap_server/xcap_misc.h @@ -26,6 +26,8 @@ #define _XCAP_MISC_H_ #include "../../str.h" +#include "../../sr_module.h" +#include "../../pvar.h" #define XCAP_MAX_URI_SIZE 127 /* Node Selector Separator */ @@ -50,4 +52,10 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri); int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf); int xcaps_xpath_get(str *inbuf, str *xpaths, str *outbuf); +int pv_get_xcap_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); +int pv_set_xcap_uri(struct sip_msg* msg, pv_param_t *param, + int op, pv_value_t *val); +int pv_parse_xcap_uri_name(pv_spec_p sp, str *in); + #endif diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index e71bee4..4f5d5c0 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -75,9 +75,9 @@ int xcaps_generate_etag_hdr(str *etag); static str xcaps_db_table = str_init("xcap"); static str xcaps_db_url = str_init(DEFAULT_DB_URL); -static str xcaps_root = str_init("/xcap-root/"); static int xcaps_init_time = 0; static int xcaps_etag_counter = 1; +str xcaps_root = str_init("/xcap-root/"); static str xcaps_buf = {0, 8192}; #define XCAPS_ETAG_SIZE 128 @@ -100,6 +100,12 @@ db_func_t xcaps_dbf; /** SL API structure */ sl_api_t slb; +static pv_export_t mod_pvs[] = { + { {"xcapuri", sizeof("xcapuri")-1}, PVT_OTHER, pv_get_xcap_uri, + pv_set_xcap_uri, pv_parse_xcap_uri_name, 0, 0, 0 }, + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + static param_export_t params[] = { { "db_url", STR_PARAM, &xcaps_db_url.s }, { "xcap_table", STR_PARAM, &xcaps_db_table.s }, @@ -128,7 +134,7 @@ struct module_exports exports= { params, /* exported parameters */ 0, /* exported statistics */ 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ + mod_pvs, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, /* module initialization function */ 0, /* response handling function */

14 years, 5 months

ratelimit module migration from (k) to generic

by Ovidiu Sas

Hello all, The (k) ratelimit module is an enhanced version of the original (s) ratelimit module. Are there any objections in moving the ratelimit module from (k) to generic and purging the (s) version? Regards, Ovidiu Sas

14 years, 5 months

git:master: core: use req.start for http11 tcp read

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 38f1ee418f7249b713e5f4cdaa8f9fa5c19ad093 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=38f1ee4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 31 23:24:04 2010 +0200 core: use req.start for http11 tcp read - shifting back chunks is done with memmove - safer for overlapping buffers - credits to Andrei Pelinescu-Onciul --- tcp_read.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index e152f5b..b8be180 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -145,7 +145,7 @@ int tcp_http11_continue(struct tcp_connection *c) return 0; /* check for Expect header */ - if(strstr(c->req.buf, "Expect: 100-continue")!=NULL) + if(strstr(c->req.start, "Expect: 100-continue")!=NULL) { init_dst_from_rcv(&dst, &c->rcv); if (tcp_send(&dst, 0, HTTP11CONTINUE, HTTP11CONTINUE_LEN) < 0) { @@ -153,7 +153,7 @@ int tcp_http11_continue(struct tcp_connection *c) } } /* check for Transfer-Encoding header */ - if(strstr(c->req.buf, "Transfer-Encoding: chunked")!=NULL) + if(strstr(c->req.start, "Transfer-Encoding: chunked")!=NULL) { c->req.flags |= F_TCP_REQ_BCHUNKED; ret = 1; @@ -745,7 +745,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) r->state = H_HTTP11_CHUNK_END; /* shift back body content */ if(r->chunk_size>0 && p-r->chunk_size>r->body) { - memcpy(r->body + r->content_len, p - r->chunk_size, + memmove(r->body + r->content_len, p - r->chunk_size, r->chunk_size); r->content_len += r->chunk_size; }

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev