sr-dev June 2010

sr-dev@lists.kamailio.org

26 participants
164 discussions

git:master: modules_k: ratelimit - removing the old mi interface

by Ovidiu Sas

Module: sip-router Branch: master Commit: a52d454125eee97f2c2c76aeb2db0244ebffdf12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a52d454… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Jun 30 11:51:56 2010 -0400 modules_k: ratelimit - removing the old mi interface --- modules_k/ratelimit/Makefile | 1 - modules_k/ratelimit/ratelimit.c | 419 +-------------------------------------- 2 files changed, 1 insertions(+), 419 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a52…

14 years, 5 months

[tracker] Task opened: function for evaluating string value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - function for evaluating string value Task Type - Feature Request Category - Module Status - New Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - it would improve dynamic configuration of sip proxy if a function or transformation would exist for evaluating a string value stored in a pseudo variable that contains pseudo variables, transformations, etc. i tried to implement such function (below), but was not able to make it work. any help is appreciated. -- juha /* * Evaluates first param (string) and saves result to second param (pvar) */ int eval(struct sip_msg* _m, char* _string, char* _dst) { str value, result; char **param; pv_spec_t *dst; pv_value_t val; fparam_t *fp; if (fixup_get_svalue(_m, (gparam_p)_string, &value) != 0) { LM_ERR("cannot get parameter value\n"); return -1; } param = &(value.s); LM_INFO("param value as string is <%s>\n", *param); if (fixup_spve_null((void **)param, 1) != 0) { LM_ERR("failed to evaluate parameter <%.*s>\n", value.len, value.s); return -1; } fp = (fparam_t *)param; LM_INFO("orig <%s>, type <%d>\n", fp->orig, fp->type); if (get_str_fparam(&result, _m, fp) != 0) { LM_ERR("cannot get result value\n"); return -1; } val.rs.s = result.s; val.rs.len = result.len; LM_INFO("eval result: %.*s\n", val.rs.len, val.rs.s); val.flags = PV_VAL_STR; dst = (pv_spec_t *)_dst; dst->setf(_m, &dst->pvp, (int)EQ_T, &val); return 1; } More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=78 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

git:kamailio_3.0: modules_k/msilo: do not include Contact header in msilo generated messages

by Juha Heinanen

Module: sip-router Branch: kamailio_3.0 Commit: 37940ea09b861b18994c4243abf8c6d8e711a2ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37940ea… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 30 17:15:37 2010 +0300 modules_k/msilo: do not include Contact header in msilo generated messages --- modules_k/msilo/msfuncs.c | 24 +++++------------------- modules_k/msilo/msfuncs.h | 2 +- modules_k/msilo/msilo.c | 4 ++-- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/modules_k/msilo/msfuncs.c b/modules_k/msilo/msfuncs.c index ea0c028..735b8d6 100644 --- a/modules_k/msilo/msfuncs.c +++ b/modules_k/msilo/msfuncs.c @@ -36,11 +36,6 @@ #include "../../udp_server.h" #include "../../pt.h" -#define CONTACT_PREFIX "Contact: <" -#define CONTACT_SUFFIX ">;msilo=yes"CRLF -#define CONTACT_PREFIX_LEN (sizeof(CONTACT_PREFIX)-1) -#define CONTACT_SUFFIX_LEN (sizeof(CONTACT_SUFFIX)-1) - extern int ms_add_date; /** @@ -186,21 +181,21 @@ error: /** build MESSAGE headers * - * Add Content-Type, Contact, Date, and extra headers if they exist + * Add Content-Type, Date, and extra headers if they exist * expects - max buf len of the resulted body in body->len * - body->s MUST be allocated * return: 0 OK ; -1 error * */ -int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) +int m_build_headers(str *buf, str ctype, time_t date, str extra) { char *p; char strDate[48]; int lenDate = 0; - if(!buf || !buf->s || buf->len <= 0 || ctype.len < 0 || contact.len < 0 - || buf->len <= ctype.len+contact.len+extra.len+14 + if(!buf || !buf->s || buf->len <= 0 || ctype.len < 0 + || buf->len <= ctype.len+extra.len+14 /*Content-Type: */ - +CRLF_LEN+CONTACT_PREFIX_LEN+CONTACT_SUFFIX_LEN) + +CRLF_LEN) goto error; p = buf->s; @@ -220,15 +215,6 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) p += CRLF_LEN; } - if(contact.len > 0) - { - strncpy(p, CONTACT_PREFIX, CONTACT_PREFIX_LEN); - p += CONTACT_PREFIX_LEN; - strncpy(p, contact.s, contact.len); - p += contact.len; - strncpy(p, CONTACT_SUFFIX, CONTACT_SUFFIX_LEN); - p += CONTACT_SUFFIX_LEN; - } if (extra.len > 0) { strncpy(p, extra.s, extra.len); p += extra.len; diff --git a/modules_k/msilo/msfuncs.h b/modules_k/msilo/msfuncs.h index 8a70fc4..79a8fdd 100644 --- a/modules_k/msilo/msfuncs.h +++ b/modules_k/msilo/msfuncs.h @@ -49,7 +49,7 @@ int m_apo_escape(char*, int, char*, int); int m_extract_content_type(char*, int, content_type_t*, int); /** build MESSAGE headers */ -int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra); +int m_build_headers(str *buf, str ctype, time_t date, str extra); /** build MESSAGE body */ int m_build_body(str *body, time_t date, str msg, time_t sdate); diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 8249b43..1c59073 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1030,7 +1030,7 @@ static int m_dump(struct sip_msg* msg, char* owner, char* str2) hdr_str.len = 1024; if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/, - str_vals[0]/*from*/, rtime /*Date*/, + rtime /*Date*/, extra_hdrs_str /*extra_hdrs*/) < 0) { LM_ERR("headers building failed [%d]\n", mid); @@ -1297,7 +1297,7 @@ void m_send_ontimer(unsigned int ticks, void *param) extra_hdrs_str.len = 0; hdr_str.len = 1024; if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/, - ms_reminder/*from*/,0/*Date*/, + 0/*Date*/, extra_hdrs_str/*extra*/) < 0) {

14 years, 5 months

git:master: modules_k/msilo: do not include Contact header in msilo generated messages

by Juha Heinanen

Module: sip-router Branch: master Commit: 259441d3e4f66f0907e2570809928d30b1527479 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=259441d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 30 17:15:37 2010 +0300 modules_k/msilo: do not include Contact header in msilo generated messages --- modules_k/msilo/msfuncs.c | 24 +++++------------------- modules_k/msilo/msfuncs.h | 2 +- modules_k/msilo/msilo.c | 4 ++-- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/modules_k/msilo/msfuncs.c b/modules_k/msilo/msfuncs.c index ea0c028..735b8d6 100644 --- a/modules_k/msilo/msfuncs.c +++ b/modules_k/msilo/msfuncs.c @@ -36,11 +36,6 @@ #include "../../udp_server.h" #include "../../pt.h" -#define CONTACT_PREFIX "Contact: <" -#define CONTACT_SUFFIX ">;msilo=yes"CRLF -#define CONTACT_PREFIX_LEN (sizeof(CONTACT_PREFIX)-1) -#define CONTACT_SUFFIX_LEN (sizeof(CONTACT_SUFFIX)-1) - extern int ms_add_date; /** @@ -186,21 +181,21 @@ error: /** build MESSAGE headers * - * Add Content-Type, Contact, Date, and extra headers if they exist + * Add Content-Type, Date, and extra headers if they exist * expects - max buf len of the resulted body in body->len * - body->s MUST be allocated * return: 0 OK ; -1 error * */ -int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) +int m_build_headers(str *buf, str ctype, time_t date, str extra) { char *p; char strDate[48]; int lenDate = 0; - if(!buf || !buf->s || buf->len <= 0 || ctype.len < 0 || contact.len < 0 - || buf->len <= ctype.len+contact.len+extra.len+14 + if(!buf || !buf->s || buf->len <= 0 || ctype.len < 0 + || buf->len <= ctype.len+extra.len+14 /*Content-Type: */ - +CRLF_LEN+CONTACT_PREFIX_LEN+CONTACT_SUFFIX_LEN) + +CRLF_LEN) goto error; p = buf->s; @@ -220,15 +215,6 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) p += CRLF_LEN; } - if(contact.len > 0) - { - strncpy(p, CONTACT_PREFIX, CONTACT_PREFIX_LEN); - p += CONTACT_PREFIX_LEN; - strncpy(p, contact.s, contact.len); - p += contact.len; - strncpy(p, CONTACT_SUFFIX, CONTACT_SUFFIX_LEN); - p += CONTACT_SUFFIX_LEN; - } if (extra.len > 0) { strncpy(p, extra.s, extra.len); p += extra.len; diff --git a/modules_k/msilo/msfuncs.h b/modules_k/msilo/msfuncs.h index 8a70fc4..79a8fdd 100644 --- a/modules_k/msilo/msfuncs.h +++ b/modules_k/msilo/msfuncs.h @@ -49,7 +49,7 @@ int m_apo_escape(char*, int, char*, int); int m_extract_content_type(char*, int, content_type_t*, int); /** build MESSAGE headers */ -int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra); +int m_build_headers(str *buf, str ctype, time_t date, str extra); /** build MESSAGE body */ int m_build_body(str *body, time_t date, str msg, time_t sdate); diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 8249b43..1c59073 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1030,7 +1030,7 @@ static int m_dump(struct sip_msg* msg, char* owner, char* str2) hdr_str.len = 1024; if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/, - str_vals[0]/*from*/, rtime /*Date*/, + rtime /*Date*/, extra_hdrs_str /*extra_hdrs*/) < 0) { LM_ERR("headers building failed [%d]\n", mid); @@ -1297,7 +1297,7 @@ void m_send_ontimer(unsigned int ticks, void *param) extra_hdrs_str.len = 0; hdr_str.len = 1024; if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/, - ms_reminder/*from*/,0/*Date*/, + 0/*Date*/, extra_hdrs_str/*extra*/) < 0) {

14 years, 5 months

git:master: modules_s/xlog: range specification added

by Miklos Tirpak

Module: sip-router Branch: master Commit: 1010ba9fe6fdfcffa6322418b0011280d7eda6b8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1010ba9… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Jun 30 14:39:42 2010 +0200 modules_s/xlog: range specification added The xl-formatted string can contain the range of the expression the following way: - %[<num>]<expression> - %[<from>-<to>]<expression> - %[<from>-]<expression> - %[-<to>]<expression> For example "%[-3](a)ruri.user" prints the first 4 characters of @ruri.user. The index numbers start from 0. --- modules_s/xlog/xl_lib.c | 86 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 83 insertions(+), 3 deletions(-) diff --git a/modules_s/xlog/xl_lib.c b/modules_s/xlog/xl_lib.c index a583f62..5043153 100644 --- a/modules_s/xlog/xl_lib.c +++ b/modules_s/xlog/xl_lib.c @@ -995,6 +995,21 @@ static int xl_get_special(struct sip_msg *msg, str *res, str *hp, int hi, int hf return 0; } +/* copy the string withing this range */ +static int range_from = -1; +static int range_to = -1; + +/* get the range of the string that follows */ +static int xl_get_range(struct sip_msg *msg, str *res, str *hp, int hi, int hf) +{ + range_from = hi; + range_to = hf; + + res->s = NULL; + res->len = 0; + return 0; +} + static int _xl_elog_free_all(xl_elog_p log, int shm) { xl_elog_p t; @@ -1033,6 +1048,7 @@ static int _xl_parse_format(char *s, xl_elog_p *el, int shm, xl_parse_cb parse_c int avp_flags, avp_index; int_str avp_name; select_t *sel; + int *range; if(s==NULL || el==NULL) return -1; @@ -1042,6 +1058,7 @@ static int _xl_parse_format(char *s, xl_elog_p *el, int shm, xl_parse_cb parse_c p = s; *el = NULL; e = e0 = NULL; + range = NULL; while(*p) { @@ -1060,13 +1077,14 @@ static int _xl_parse_format(char *s, xl_elog_p *el, int shm, xl_parse_cb parse_c e0->next = e; e->text.s = p; - while(*p && *p!='%' && *p!='\\') + while(*p && *p!='%' && *p!='\\' && !range) p++; + e->text.len = p - e->text.s; if(*p == '\0') break; - if (*p == '\\') { + if ((*p == '\\') && !range) { p++; switch(*p) { @@ -1124,7 +1142,10 @@ static int _xl_parse_format(char *s, xl_elog_p *el, int shm, xl_parse_cb parse_c goto cont; } - p++; + if (range) + range = NULL; + else + p++; switch(*p) { case 'b': @@ -1594,6 +1615,42 @@ static int _xl_parse_format(char *s, xl_elog_p *el, int shm, xl_parse_cb parse_c case '|': e->itf = xl_get_empty; break; + case '[': + range = &e->hindex; + e->itf = xl_get_range; + while (1) { + p++; + if (((*p) >= '0') && ((*p) <= '9')) { + (*range) *= 10; + (*range) += (*p) - '0'; + + } else if ((*p) == '-') { + if (range == &e->hindex) { + range = &e->hflags; + } else { + ERR("xlog: xl_parse_format: syntax error in the range specification\n"); + goto error; + } + + } else if ((*p) == ']') { + if (range == &e->hindex) { + /* no range, only a single number */ + e->hflags = e->hindex; + } else if (e->hflags == 0) { + /* only the left side is defined */ + e->hflags = -1; + } else if (e->hindex > e->hflags) { + ERR("xlog: xl_parse_format: syntax error in the range specification\n"); + goto error; + } + break; + + } else { + ERR("xlog: xl_parse_format: syntax error in the range specification\n"); + goto error; + } + } + break; default: e->itf = xl_get_null; } @@ -1682,6 +1739,29 @@ int xl_print_log(struct sip_msg* msg, xl_elog_p log, char *buf, int *len) /* && ((*it->itf != xl_get_color) || (log_stderr!=0)) */ && !((*it->itf)(msg, &tok, &(it->hparam), it->hindex, it->hflags))) { + if (*it->itf == xl_get_range) + continue; + + /* cut the string to the required size */ + if (range_to >= 0) { + if (range_to + 1 < tok.len) + tok.len = range_to + 1; + range_to = -1; + } + if (range_from > 0) { + if (range_from + 1 > tok.len) { + range_from = -1; + /* nothing to copy */ + continue; + } + tok.s += range_from; + tok.len -= range_from; + range_from = -1; + } + + if (tok.len == 0) + continue; + if(n+tok.len < *len) { memcpy(cur, tok.s, tok.len);

14 years, 5 months

git:master: dns cache: fix dns_cache_delete_single_record()

by Miklos Tirpak

Module: sip-router Branch: master Commit: a1dea0ec1d8418ef039d100119c801c91a60a253 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1dea0e… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Jun 30 10:21:24 2010 +0200 dns cache: fix dns_cache_delete_single_record() Binary comparison is needed to check the flags. --- dns_cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index a501e3e..7d52c2c 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -4539,7 +4539,7 @@ int dns_cache_delete_single_record(unsigned short type, ) goto not_found; - if (flags && DNS_FLAG_BAD_NAME) /* negative record, there is no value */ + if (flags & DNS_FLAG_BAD_NAME) /* negative record, there is no value */ goto delete; /* check whether there is an rr with the same value */

14 years, 5 months

git:master: core: safety check for free contact

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7aed7d72c98a8228e9687773c3bab20d8934251a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7aed7d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 29 19:48:59 2010 +0200 core: safety check for free contact - patch by Sebastian Z., checking if the content is null before freeing it --- parser/contact/parse_contact.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/contact/parse_contact.c b/parser/contact/parse_contact.c index 0f7398d..eb28763 100644 --- a/parser/contact/parse_contact.c +++ b/parser/contact/parse_contact.c @@ -102,6 +102,8 @@ int parse_contact(struct hdr_field* _h) */ void free_contact(contact_body_t** _c) { + if(*_c==NULL) + return; if ((*_c)->contacts) { free_contacts(&((*_c)->contacts)); }

14 years, 5 months

git:master: makefile: added radius modules in excluded list

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 87ef6a3339734b9231be6c94683b60431ba75ae3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=87ef6a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 29 19:47:50 2010 +0200 makefile: added radius modules in excluded list --- Makefile | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 650e13f..b3fa651 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,8 @@ module_group_postgres_driver=db_postgres module_group_postgres=$(module_group_postgres_driver) $(module_group_db) # For radius -module_group_radius=acc_radius auth_radius misc_radius peering +module_group_radius=acc_radius auth_radius misc_radius avp_radius uri_radius \ + peering # For presence # kamailio modules @@ -269,7 +270,7 @@ else # Old defaults for backwards compatibility # excluded because they depend on external libraries exclude_modules?= cpl mangler postgres jabber mysql cpl-c \ - auth_radius misc_radius \ + auth_radius misc_radius avp_radius uri_radius \ acc_radius pa rls presence_b2b xcap xmlrpc\ osp tls oracle \ unixsock dbg print_lib auth_identity ldap \ @@ -277,7 +278,7 @@ else db_unixodbc memcached mi_xmlrpc \ perl perlvdb purple seas \ snmpstats xmpp \ - carrierroute misc_radius peering \ + carrierroute peering \ dialplan lcr utils presence presence_mwi \ presence_dialoginfo presence_xml pua pua_bla \ pua_dialoginfo pua_usrloc pua_xmpp \

14 years, 5 months

[tracker] Task closed: presence_xml with db_postgres

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#77 - presence_xml with db_postgres User who did this - Henning Westerholt (henningw) Reason for closing: Fixed Additional comments about closing: Thank you, commited to 1.5, 3.0 and master. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=77 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

git:kamailio_3.0: db_postgres(old API) FS#77: fix BLOBs with postgres

by Henning Westerholt

Module: sip-router Branch: kamailio_3.0 Commit: a6141a32738b8610c70ba7e0a88c0d79561cb7a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6141a3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 29 18:11:58 2010 +0200 db_postgres(old API) FS#77: fix BLOBs with postgres fix BLOBs with postgres, also add a null-termination as the other SQL databases in order to be able to work with the presence modules (cherry picked from commit 2e56720769913c55cacc83fe3a31f44f072e7590) --- modules/db_postgres/km_val.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index cb3fe9f..9faa5b5 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -72,16 +72,18 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const LM_ERR("PQunescapeBytea failed\n"); return -7; } - VAL_BLOB(_v).s = pkg_malloc(VAL_BLOB(_v).len); + VAL_BLOB(_v).s = pkg_malloc(VAL_BLOB(_v).len + 1); if (VAL_BLOB(_v).s == NULL) { LM_ERR("no private memory left\n"); PQfreemem(tmp_s); return -8; } - LM_DBG("allocate %d bytes memory for BLOB at %p", VAL_BLOB(_v).len, VAL_BLOB(_v).s); + LM_DBG("allocate %d bytes memory for BLOB at %p", VAL_BLOB(_v).len + 1, VAL_BLOB(_v).s); memcpy(VAL_BLOB(_v).s, tmp_s, VAL_BLOB(_v).len); PQfreemem(tmp_s); + VAL_BLOB(_v).s[VAL_BLOB(_v).len] = '\0'; + VAL_BLOB(_v).len++; VAL_TYPE(_v) = DB1_BLOB; VAL_FREE(_v) = 1;

14 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2010