sr-dev December 2011

sr-dev@lists.kamailio.org

32 participants
230 discussions

git:master: rtimer: exec interval can be in microsecods

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f67c75cd0450eead5fb9e50d63e8966129646a97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f67c75c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 16 13:46:57 2011 +0100 rtimer: exec interval can be in microsecods - value of interval parameter can be ended in 'u' to tell is a microsecond based interval - for each timer running on micro-seconds interval, a new micro-second timer process is started (no option to use an existing timer with same precision) --- modules_k/rtimer/rtimer_mod.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/modules_k/rtimer/rtimer_mod.c b/modules_k/rtimer/rtimer_mod.c index 33c7c2e..97719d7 100644 --- a/modules_k/rtimer/rtimer_mod.c +++ b/modules_k/rtimer/rtimer_mod.c @@ -53,11 +53,14 @@ typedef struct _stm_route { typedef struct _stm_timer { str name; unsigned int mode; + unsigned int flags; unsigned int interval; stm_route_t *rt; struct _stm_timer *next; } stm_timer_t; +#define RTIMER_INTERVAL_USEC (1<<0) + stm_timer_t *_stm_list = NULL; /** module functions */ @@ -118,7 +121,7 @@ static int mod_init(void) return -1; } } else { - register_dummy_timers(1); + register_basic_timers(1); } it = it->next; } @@ -158,11 +161,21 @@ static int child_init(int rank) { if(it->mode!=0) { - if(fork_dummy_timer(PROC_TIMER, "TIMER RT", 1 /*socks flag*/, + if(it->flags & RTIMER_INTERVAL_USEC) + { + if(fork_basic_utimer(PROC_TIMER, "RTIMER USEC EXEC", 1 /*socks flag*/, + stm_timer_exec, (void*)it, it->interval + /*usec*/)<0) { + LM_ERR("failed to start utimer routine as process\n"); + return -1; /* error */ + } + } else { + if(fork_basic_timer(PROC_TIMER, "RTIMER SEC EXEC", 1 /*socks flag*/, stm_timer_exec, (void*)it, it->interval /*sec*/)<0) { - LM_ERR("failed to register timer routine as process\n"); - return -1; /* error */ + LM_ERR("failed to start timer routine as process\n"); + return -1; /* error */ + } } } it = it->next; @@ -221,9 +234,16 @@ int stm_t_param(modparam_t type, void *val) tmp.name = pit->body; } else if(pit->name.len==4 && strncasecmp(pit->name.s, "mode", 4)==0) { - str2int(&pit->body, &tmp.mode); + if(tmp.mode==0) + str2int(&pit->body, &tmp.mode); } else if(pit->name.len==8 && strncasecmp(pit->name.s, "interval", 8)==0) { + if(pit->body.s[pit->body.len-1]=='u' + || pit->body.s[pit->body.len-1]=='U') { + pit->body.len--; + tmp.flags |= RTIMER_INTERVAL_USEC; + tmp.mode = 1; + } str2int(&pit->body, &tmp.interval); } }

12 years, 9 months

git:master: lib/binrpc: fixed compile warnings

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 304fe28c1f299db8a36fe6953da3c3b9afa24c12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=304fe28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 16 13:17:22 2011 +0100 lib/binrpc: fixed compile warnings - reported by Juha Heinanen --- lib/binrpc/binrpc_api.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lib/binrpc/binrpc_api.c b/lib/binrpc/binrpc_api.c index e360b7f..9398fea 100644 --- a/lib/binrpc/binrpc_api.c +++ b/lib/binrpc/binrpc_api.c @@ -67,7 +67,9 @@ #define UNIX_PATH_MAX 108 #endif +#ifndef INT2STR_MAX_LEN #define INT2STR_MAX_LEN (19+1+1) /* 2^64~= 16*10^18 => 19+1 digits + \0 */ +#endif static void* (*internal_malloc)(size_t size) = malloc; static void* (*internal_realloc)(void* ptr, size_t size) = realloc; @@ -501,7 +503,7 @@ static int get_reply(struct binrpc_handle *handle, if (crt - hdr_end < tl) { snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, "get_reply: datagram truncated. Received: %ld, Expected: %d.", - crt-hdr_end, tl); + (long int)(crt-hdr_end), tl); return FATAL_ERROR; } }

12 years, 9 months

git:master: Makefile: devel version increased to 3.3.0-dev3

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a8fa5a92d2e5b42e7e7238ecaf4898e491c6574d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8fa5a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 16 13:18:09 2011 +0100 Makefile: devel version increased to 3.3.0-dev3 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 49f2f82..7a40abe 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory debugger switcher # 0 - off (release mode)

12 years, 9 months

git:master: pv: new transformation class 'line'

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0f598b1a5798ecd403ef588f7d4c6b38177883ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f598b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 16 13:10:57 2011 +0100 pv: new transformation class 'line' - {line.count} - return number of lines in PV - {line.at,pos} - return the line at position pos - {line.sw,exp} - return the line starting with 'exp' --- modules_k/pv/pv.c | 2 + modules_k/pv/pv_trans.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_trans.h | 6 +- 3 files changed, 298 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index f5784d9..bc47e1a 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -53,6 +53,8 @@ static tr_export_t mod_trans[] = { tr_parse_paramlist }, { {"tobody", sizeof("tobody")-1}, /* param class */ tr_parse_tobody }, + { {"line", sizeof("line")-1}, /* line class */ + tr_parse_line }, { { 0, 0 }, 0 } }; diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index f1dcce3..22d3a9e 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -1342,6 +1342,202 @@ int tr_eval_tobody(struct sip_msg *msg, tr_param_t *tp, int subtype, return 0; } +void *memfindrchr(const void *buf, int c, size_t n) +{ + int i; + unsigned char *p; + + p = (unsigned char*)buf; + + for (i=n-1; i>=0; i--) { + if (p[i] == (unsigned char)c) { + return (void*)(p+i); + } + } + return NULL; +} + +/*! + * \brief Evaluate line transformations + * \param msg SIP message + * \param tp transformation + * \param subtype transformation type + * \param val pseudo-variable + * \return 0 on success, -1 on error + */ +int tr_eval_line(struct sip_msg *msg, tr_param_t *tp, int subtype, + pv_value_t *val) +{ + pv_value_t v; + str sv; + str mv; + char *p; + int n, i; + + if(val==NULL || (!(val->flags&PV_VAL_STR)) || val->rs.len<=0) + return -1; + + switch(subtype) + { + case TR_LINE_SW: + if(tp==NULL) + { + LM_ERR("value invalid parameters\n"); + return -1; + } + + if(tp->type==TR_PARAM_STRING) + { + sv = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) + { + LM_ERR("value cannot get p1\n"); + return -1; + } + sv = v.rs; + } + + if(val->rs.len < sv.len) + { + val->rs = _tr_empty; + goto done; + } + p = val->rs.s; + do { + if(strncmp(p, sv.s, sv.len)==0) + { + /* match */ + mv.s = p; + p += sv.len; + p = memchr(p, '\n', (val->rs.s + val->rs.len) - p); + if(p==NULL) + { + /* last line */ + mv.len = (val->rs.s + val->rs.len) - p; + } else { + mv.len = p - mv.s; + } + val->rs = mv; + goto done; + } + p = memchr(p, '\n', (val->rs.s + val->rs.len) - p); + } while(p && ((++p)<=val->rs.s+val->rs.len-sv.len)); + val->rs = _tr_empty; + break; + + case TR_LINE_AT: + if(tp==NULL) + { + LM_ERR("name invalid parameters\n"); + return -1; + } + + if(tp->type==TR_PARAM_NUMBER) + { + n = tp->v.n; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_INT))) + { + LM_ERR("name cannot get p1\n"); + return -1; + } + n = v.ri; + } + if(n<0) + { + p = val->rs.s + val->rs.len - 1; + if(*p=='\n') + p--; + mv.s = p; + n = -n; + i=1; + p = memfindrchr(val->rs.s, '\n', p - val->rs.s); + if(p!=NULL) + p--; + while(i<n && p) + { + mv.s = p; + p = memfindrchr(val->rs.s, '\n', p - val->rs.s); + if(p!=NULL) + p--; + i++; + } + if(i==n) + { + if(p==NULL) + { + /* first line */ + mv.len = mv.s - val->rs.s + 1; + mv.s = val->rs.s; + } else { + mv.len = mv.s - p - 1; + mv.s = p + 2; + } + val->rs = mv; + goto done; + } + } else { + p = val->rs.s; + i = 0; + while(i<n && p) + { + p = memchr(p, '\n', (val->rs.s + val->rs.len) - p); + if(p!=NULL) + p++; + i++; + } + if(i==n && p!=NULL) + { + /* line found */ + mv.s = p; + p = memchr(p, '\n', (val->rs.s + val->rs.len) - p); + if(p==NULL) + { + /* last line */ + mv.len = (val->rs.s + val->rs.len) - p; + } else { + mv.len = p - mv.s; + } + val->rs = mv; + goto done; + } + } + val->rs = _tr_empty; + break; + + case TR_LINE_COUNT: + n=0; + for(i=0; i<val->rs.len; i++) + if(val->rs.s[i]=='\n') + n++; + if(n==0 && val->rs.len>0) + n = 1; + val->flags = PV_TYPE_INT|PV_VAL_INT|PV_VAL_STR; + val->ri = n; + val->rs.s = int2str(val->ri, &val->rs.len); + break; + + break; + + default: + LM_ERR("unknown subtype %d\n", + subtype); + return -1; + } +done: + if(val->rs.len>0) + { + /* skip ending '\r' if present */ + if(val->rs.s[val->rs.len-1]=='\r') + val->rs.len--; + } + val->flags = PV_VAL_STR; + return 0; +} + #define _tr_parse_nparam(_p, _p0, _tp, _spec, _n, _sign, _in, _s) \ while(is_in_str(_p, _in) && (*_p==' ' || *_p=='\t' || *_p=='\n')) _p++; \ @@ -2113,3 +2309,98 @@ done: t->name = name; return p; } + +/*! + * \brief Helper fuction to parse a line transformation + * \param in parsed string + * \param t transformation + * \return pointer to the end of the transformation in the string - '}', null on error + */ +char* tr_parse_line(str* in, trans_t *t) +{ + char *p; + char *p0; + char *ps; + str s; + str name; + int n; + int sign; + pv_spec_t *spec = NULL; + tr_param_t *tp = NULL; + + + if(in==NULL || t==NULL) + return NULL; + + p = in->s; + name.s = in->s; + t->type = TR_LINE; + t->trf = tr_eval_line; + + /* find next token */ + while(is_in_str(p, in) && *p!=TR_PARAM_MARKER && *p!=TR_RBRACKET) p++; + if(*p=='\0') + { + LM_ERR("invalid transformation: %.*s\n", + in->len, in->s); + goto error; + } + name.len = p - name.s; + trim(&name); + + if(name.len==2 && strncasecmp(name.s, "at", 2)==0) + { + t->subtype = TR_LINE_AT; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid name transformation: %.*s\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_nparam(p, p0, tp, spec, n, sign, in, s) + t->params = tp; + tp = 0; + while(is_in_str(p, in) && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid name transformation: %.*s!\n", + in->len, in->s); + goto error; + } + + goto done; + } else if(name.len==2 && strncasecmp(name.s, "sw", 2)==0) { + t->subtype = TR_LINE_SW; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid value transformation: %.*s\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid value transformation: %.*s!\n", + in->len, in->s); + goto error; + } + goto done; + } else if(name.len==5 && strncasecmp(name.s, "count", 5)==0) { + t->subtype = TR_LINE_COUNT; + goto done; + } + + + LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, + name.len, name.s, name.len); +error: + return NULL; +done: + t->name = name; + return p; +} diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index 4d77e1d..c660102 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -33,7 +33,7 @@ enum _tr_type { TR_NONE=0, TR_STRING, TR_URI, TR_PARAMLIST, TR_NAMEADDR, - TR_TOBODY }; + TR_TOBODY, TR_LINE }; enum _tr_s_subtype { TR_S_NONE=0, TR_S_LEN, TR_S_INT, TR_S_MD5, TR_S_SUBSTR, TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, @@ -58,6 +58,9 @@ enum _tr_tobody_subtype { TR_TOBODY_NONE=0, TR_TOBODY_DISPLAY, TR_TOBODY_URI, TR_TOBODY_TAG, TR_TOBODY_URI_USER, TR_TOBODY_URI_HOST, TR_TOBODY_PARAMS }; +enum _tr_line_subtype { + TR_LINE_NONE=0, TR_LINE_COUNT, TR_LINE_AT, TR_LINE_SW +}; char* tr_parse_string(str *in, trans_t *tr); @@ -65,6 +68,7 @@ char* tr_parse_uri(str *in, trans_t *tr); char* tr_parse_paramlist(str *in, trans_t *tr); char* tr_parse_nameaddr(str *in, trans_t *tr); char* tr_parse_tobody(str* in, trans_t *t); +char* tr_parse_line(str* in, trans_t *t); int tr_init_buffers(void);

12 years, 9 months

compiler warnings

by Juha Heinanen

i just compiled current master branch, and got these warnings: CC (cc) [L libbinrpc.so.0.1] binrpc_api.o binrpc_api.c:70:1: warning: "INT2STR_MAX_LEN" redefined In file included from ../../modules/ctl/../../ip_addr.h:50, from ../../modules/ctl/init_socks.h:36, from binrpc_api.c:48: ../../modules/ctl/../../ut.h:242:1: warning: this is the location of the previous definition binrpc_api.c: In function ‘get_reply’: binrpc_api.c:504: warning: format ‘%ld’ expects type ‘long int’, but argument 4 has type ‘int’ binrpc_api.c:504: warning: format ‘%ld’ expects type ‘long int’, but argument 4 has type ‘int’ -- juha

12 years, 9 months

Lost connection to MySQL Server - Frequent Occurrence?

by Brandon Armstead

Hello, I am very very very frequently seeing in logs "Lost connection to MySQL Server" --- the MySQL server that it is connecting to is less than 1 ms away (essentially sitting in the same rack). Dec 8 19:21:15 /usr/local/sbin/kamailio[4149]: INFO: dialog [dlg_db_handler.c:584]: trying to remove dialog [c9d5ed0-13c4-4ee10778-92e3eb21-a90244c(a)XXX.XXX.XXX.XXX], update_flag is 4 Dec 8 19:21:16 /usr/local/sbin/kamailio[4149]: ERROR: db_mysql [km_dbase.c:122]: driver error on query: Lost connection to MySQL server during query Dec 8 19:21:16 /usr/local/sbin/kamailio[4149]: ERROR: <core> [db_query.c:242]: error while submitting query Dec 8 19:21:16 /usr/local/sbin/kamailio[4149]: ERROR: dialog [dlg_db_handler.c:598]: failed to delete database information *** MOD PARAM CONFIG *** # database ping modparam("db_mysql", "ping_interval", 150) modparam("db_mysql", "auto_reconnect", 1) Any thoughts on what may be happening? It seems the overall connection (network) between the two servers is great. Thanks for your time & input in advance! Sincerely, Brandon Armstead

12 years, 9 months

git:master: pv: use a pool of buffers for transformations

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3775eb7730b2cd5491864109945b31f15df28f1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3775eb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 15 18:58:02 2011 +0100 pv: use a pool of buffers for transformations - currently 4 slots - safer for chained string transformations that need the local buffer --- modules_k/pv/pv.c | 5 +++++ modules_k/pv/pv_trans.c | 37 ++++++++++++++++++++++++++++++++++++- modules_k/pv/pv_trans.h | 2 ++ 3 files changed, 43 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index c195a06..f5784d9 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -473,6 +473,11 @@ static void mod_destroy(void) int mod_register(char *path, int *dlflags, void *p1, void *p2) { + if(tr_init_buffers()<0) + { + LM_ERR("failed to initialize transformations buffers\n"); + return -1; + } return register_trans_mod(path, mod_trans); } diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index a411351..f1dcce3 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <string.h> +#include <stdlib.h> #include <time.h> #include <sys/types.h> #include <unistd.h> @@ -51,10 +52,42 @@ /*! transformation buffer size */ #define TR_BUFFER_SIZE 65536 +#define TR_BUFFER_SLOTS 4 /*! transformation buffer */ -static char _tr_buffer[TR_BUFFER_SIZE]; +static char **_tr_buffer_list = NULL; +static char *_tr_buffer = NULL; + +static int _tr_buffer_idx = 0; + +/*! + * + */ +int tr_init_buffers(void) +{ + int i; + + _tr_buffer_list = (char**)malloc(TR_BUFFER_SLOTS); + if(_tr_buffer_list==NULL) + return -1; + for(i=0; i<TR_BUFFER_SLOTS; i++) { + _tr_buffer_list[i] = (char*)malloc(TR_BUFFER_SIZE); + if(_tr_buffer_list[i]==NULL) + return -1; + } + return 0; +} + +/*! + * + */ +char *tr_set_crt_buffer(void) +{ + _tr_buffer = _tr_buffer_list[_tr_buffer_idx]; + _tr_buffer_idx = (_tr_buffer_idx + 1) % TR_BUFFER_SLOTS; + return _tr_buffer; +} /*! * \brief Evaluate string transformations @@ -76,6 +109,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(val==NULL || val->flags&PV_VAL_NULL) return -1; + tr_set_crt_buffer(); + switch(subtype) { case TR_S_LEN: diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index 391084c..4d77e1d 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -66,4 +66,6 @@ char* tr_parse_paramlist(str *in, trans_t *tr); char* tr_parse_nameaddr(str *in, trans_t *tr); char* tr_parse_tobody(str* in, trans_t *t); +int tr_init_buffers(void); + #endif

12 years, 9 months

git:master: pv: added s.rm transformation

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c37efcf217148e9c1623a96c3cd2b54d52364078 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c37efcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 15 17:54:21 2011 +0100 pv: added s.rm transformation - {s.rm,match} - remove occurrences of 'match' from PV - 'match' can be static string or variable --- modules_k/pv/pv_trans.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_trans.h | 2 +- 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 139275b..932e9c2 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -628,6 +628,47 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s[val->rs.len] = '\0'; break; + case TR_S_RM: + if(tp==NULL) + { + LM_ERR("invalid parameters\n"); + return -1; + } + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len>TR_BUFFER_SIZE-2) + return -1; + if(tp->type==TR_PARAM_STRING) + { + st = tp->v.s; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) + { + LM_ERR("cannot get parameter value\n"); + return -1; + } + st = v.rs; + } + val->flags = PV_VAL_STR; + val->ri = 0; + + i = 0; + j = 0; + max = val->rs.len - st.len; + while (i < val->rs.len && j < TR_BUFFER_SIZE) { + if (i <= max && val->rs.s[i] == st.s[0] + && strncmp(val->rs.s+i, st.s, st.len) == 0) { + i += st.len; + } else { + _tr_buffer[j++] = val->rs.s[i++]; + } + } + val->rs.s = _tr_buffer; + val->rs.s[j] = '\0'; + val->rs.len = j; + break; + default: LM_ERR("unknown subtype %d\n", subtype); @@ -1625,6 +1666,26 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==5 && strncasecmp(name.s, "ltrim", 5)==0) { t->subtype = TR_S_LTRIM; goto done; + } else if(name.len==2 && strncasecmp(name.s, "rm", 2)==0) { + t->subtype = TR_S_RM; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid ftime transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid ftime transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index 24f4bc2..391084c 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -40,7 +40,7 @@ enum _tr_s_subtype { TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, - TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM + TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

12 years, 9 months

git:master: pv: take in cosideration escaped chars for s.rm transformation

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dd39f8456269ae4c414704d4d0e25341be20a987 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd39f84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 15 18:37:03 2011 +0100 pv: take in cosideration escaped chars for s.rm transformation --- modules_k/pv/pv_trans.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index 932e9c2..a411351 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -36,6 +36,7 @@ #include "../../mem/mem.h" #include "../../ut.h" #include "../../trim.h" +#include "../../pvapi.h" #include "../../dset.h" #include "../../lib/kcore/errinfo.h" @@ -641,6 +642,40 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(tp->type==TR_PARAM_STRING) { st = tp->v.s; + if(memchr(st.s, '\\', st.len)) { + p = pv_get_buffer(); + if(st.len>=pv_get_buffer_size()-1) + return -1; + j=0; + for(i=0; i<st.len-1; i++) { + if(st.s[i]=='\\') { + switch(st.s[i+1]) { + case 'n': + p[j++] = '\n'; + break; + case 'r': + p[j++] = '\r'; + break; + case 't': + p[j++] = '\t'; + break; + case '\\': + p[j++] = '\\'; + break; + default: + p[j++] = st.s[i+1]; + } + i++; + } else { + p[j++] = st.s[i]; + } + } + if(i==st.len-1) + p[j++] = st.s[i]; + p[j] = '\0'; + st.s = p; + st.len = j; + } } else { if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) @@ -650,6 +685,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } st = v.rs; } + LM_DBG("removing [%.*s](%d) in [%.*s](%d)\n", + st.len, st.s, st.len, val->rs.len, val->rs.s, val->rs.len); val->flags = PV_VAL_STR; val->ri = 0;

12 years, 9 months

git:master: pv: added transformations for trim, right trim and left trim

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6ad59b21c54865e45144b84a3d0569553891da4c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ad59b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 15 16:19:18 2011 +0100 pv: added transformations for trim, right trim and left trim - remove whitespaces (' ', '\t', '\r', '\n') from start or end of a string value --- modules_k/pv/pv_trans.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_trans.h | 2 +- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index da5dbfd..139275b 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -592,6 +592,42 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s = _tr_buffer; break; + case TR_S_TRIM: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len>TR_BUFFER_SIZE-2) + return -1; + memcpy(_tr_buffer, val->rs.s, val->rs.len); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + trim(&val->rs); + val->rs.s[val->rs.len] = '\0'; + break; + + case TR_S_RTRIM: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len>TR_BUFFER_SIZE-2) + return -1; + memcpy(_tr_buffer, val->rs.s, val->rs.len); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + trim_trailing(&val->rs); + val->rs.s[val->rs.len] = '\0'; + break; + + case TR_S_LTRIM: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + if(val->rs.len>TR_BUFFER_SIZE-2) + return -1; + memcpy(_tr_buffer, val->rs.s, val->rs.len); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + trim_leading(&val->rs); + val->rs.s[val->rs.len] = '\0'; + break; + default: LM_ERR("unknown subtype %d\n", subtype); @@ -1580,6 +1616,15 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==4 && strncasecmp(name.s, "trim", 4)==0) { + t->subtype = TR_S_TRIM; + goto done; + } else if(name.len==5 && strncasecmp(name.s, "rtrim", 5)==0) { + t->subtype = TR_S_RTRIM; + goto done; + } else if(name.len==5 && strncasecmp(name.s, "ltrim", 5)==0) { + t->subtype = TR_S_LTRIM; + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index 0938ddc..24f4bc2 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -40,7 +40,7 @@ enum _tr_s_subtype { TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, - TR_S_TIMEFORMAT + TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

12 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2011