sr-dev September 2012

sr-dev@lists.kamailio.org

32 participants
175 discussions

git:master: xlog: use the function from core to get term color codes
by Elena-Ramona Modroiu 26 Sep '12

26 Sep '12

Module: sip-router Branch: master Commit: c79dffa959b325da2c579b2dce94511beac83f00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c79dffa… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Wed Sep 26 10:20:11 2012 +0200 xlog: use the function from core to get term color codes --- modules_k/xlog/xlog.c | 122 ++----------------------------------------------- 1 files changed, 4 insertions(+), 118 deletions(-) diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index 2ebd4e9..8a9b8c2 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -587,134 +587,20 @@ error: return -1; } -#define COL_BUF 10 - -#define append_sstring(p, end, s) \ - do{\ - if ((p)+(sizeof(s)-1)<=(end)){\ - memcpy((p), s, sizeof(s)-1); \ - (p)+=sizeof(s)-1; \ - }else{ \ - /* overflow */ \ - LM_ERR("append_sstring overflow\n"); \ - goto error;\ - } \ - } while(0) - - static int pv_get_color(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - static char color[COL_BUF]; - char* p; - char* end; - str s; + str s = {"", 0}; if(log_stderr==0 && force_color==0) { - s.s = ""; - s.len = 0; + LM_DBG("ignoring colors\n"); return pv_get_strval(msg, param, res, &s); } - p = color; - end = p + COL_BUF; - - /* excape sequenz */ - append_sstring(p, end, "\033["); - - if(param->pvn.u.isname.name.s.s[0]!='_') - { - if (islower((int)param->pvn.u.isname.name.s.s[0])) - { - /* normal font */ - append_sstring(p, end, "0;"); - } else { - /* bold font */ - append_sstring(p, end, "1;"); - param->pvn.u.isname.name.s.s[0] += 32; - } - } - - /* foreground */ - switch(param->pvn.u.isname.name.s.s[0]) - { - case 'x': - append_sstring(p, end, "39;"); - break; - case 's': - append_sstring(p, end, "30;"); - break; - case 'r': - append_sstring(p, end, "31;"); - break; - case 'g': - append_sstring(p, end, "32;"); - break; - case 'y': - append_sstring(p, end, "33;"); - break; - case 'b': - append_sstring(p, end, "34;"); - break; - case 'p': - append_sstring(p, end, "35;"); - break; - case 'c': - append_sstring(p, end, "36;"); - break; - case 'w': - append_sstring(p, end, "37;"); - break; - default: - LM_ERR("invalid foreground\n"); - return pv_get_null(msg, param, res); - } - - /* background */ - switch(param->pvn.u.isname.name.s.s[1]) - { - case 'x': - append_sstring(p, end, "49"); - break; - case 's': - append_sstring(p, end, "40"); - break; - case 'r': - append_sstring(p, end, "41"); - break; - case 'g': - append_sstring(p, end, "42"); - break; - case 'y': - append_sstring(p, end, "43"); - break; - case 'b': - append_sstring(p, end, "44"); - break; - case 'p': - append_sstring(p, end, "45"); - break; - case 'c': - append_sstring(p, end, "46"); - break; - case 'w': - append_sstring(p, end, "47"); - break; - default: - LM_ERR("invalid background\n"); - return pv_get_null(msg, param, res); - } - - /* end */ - append_sstring(p, end, "m"); - - s.s = color; - s.len = p-color; + dprint_term_color(param->pvn.u.isname.name.s.s[0], + param->pvn.u.isname.name.s.s[1], &s); return pv_get_strval(msg, param, res, &s); - -error: - return -1; } /**

1 0

git:master: core: exported dprint_term_color() function
by Elena-Ramona Modroiu 26 Sep '12

26 Sep '12

Module: sip-router Branch: master Commit: b6642a1af48b3d00ca55d5d7712c842efd2f384a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6642a1… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Wed Sep 26 10:19:51 2012 +0200 core: exported dprint_term_color() function --- dprint.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dprint.h b/dprint.h index cddb490..4a9fdbf 100644 --- a/dprint.h +++ b/dprint.h @@ -141,6 +141,7 @@ void dprint_color(int level); void dprint_color_reset(void); void dprint_color_update(int level, char f, char b); void dprint_init_colors(void); +void dprint_term_color(char f, char b, str *obuf); /** @brief * General logging macros

1 0

git:master: pv: new transformation {s.stripto,c}
by Daniel-Constantin Mierla 26 Sep '12

26 Sep '12

Module: sip-router Branch: master Commit: 5b1f81c72b40a0f7609aac32a8ce6e7325a70396 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b1f81c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 26 09:17:00 2012 +0200 pv: new transformation {s.stripto,c} - remove the prefix until meeting 'c' - "abcdef"{s.stripto,d} => "def" - the char can be given in a pv --- 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 d127e76..995d25a 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -487,6 +487,47 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len -= i; break; + + case TR_S_STRIPTO: + if(tp==NULL) + { + LM_ERR("stripto invalid parameters\n"); + return -1; + } + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + + 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("stripto cannot get p1\n"); + return -1; + } + st = v.rs; + } + + val->flags = PV_VAL_STR; + val->ri = 0; + for(i=0; i<val->rs.len; i++) + { + if(val->rs.s[i] == st.s[0]) + break; + } + if(i>=val->rs.len) + { + _tr_buffer[0] = '\0'; + val->rs.s = _tr_buffer; + val->rs.len = 0; + break; + } + val->rs.s += i; + val->rs.len -= i; + break; + case TR_S_PREFIXES: case TR_S_PREFIXES_QUOT: if(!(val->flags&PV_VAL_STR)) @@ -1874,6 +1915,26 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==7 && strncasecmp(name.s, "stripto", 7)==0) { + t->subtype = TR_S_STRIPTO; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid stripto 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 strip transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } else if(name.len==5 && strncasecmp(name.s, "ftime", 5)==0) { t->subtype = TR_S_TIMEFORMAT; if(*p!=TR_PARAM_MARKER) diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index c660102..a34eca2 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_RM + TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

git:master: registrar(k): some contact attributes were not in $ulc(...)
by Daniel-Constantin Mierla 25 Sep '12

25 Sep '12

Module: sip-router Branch: master Commit: 20c436df0c81b38777052b4ba6fb425577f5c707 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20c436d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 26 00:18:49 2012 +0200 registrar(k): some contact attributes were not in $ulc(...) - ruid, reg-id and instance were not returned by $ulc(...) --- modules_k/registrar/regpv.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/regpv.c b/modules_k/registrar/regpv.c index bc45f3c..91cfaa2 100644 --- a/modules_k/registrar/regpv.c +++ b/modules_k/registrar/regpv.c @@ -258,6 +258,16 @@ int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, case 17: /* count */ return pv_get_sintval(msg, param, res, rpp->nrc); break; + case 18: /* ruid */ + return pv_get_strval(msg, param, res, &c->ruid); + break; + case 19: /* reg-id */ + return pv_get_uintval(msg, param, res, c->reg_id); + break; + case 20: /* instance */ + if(c->instance.len>0) + return pv_get_strval(msg, param, res, &c->instance); + break; } return pv_get_null(msg, param, res); @@ -341,6 +351,8 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) rp->attr = 4; else if(strncmp(pa.s, "cseq", 4)==0) rp->attr = 9; + else if(strncmp(pa.s, "ruid", 4)==0) + rp->attr = 18; else goto error; break; case 5: @@ -348,6 +360,8 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) rp->attr = 10; else if(strncmp(pa.s, "count", 5)==0) rp->attr = 17; + else if(strncmp(pa.s, "regid", 5)==0) + rp->attr = 19; else goto error; break; case 6: @@ -375,6 +389,8 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) rp->attr = 5; else if(strncmp(pa.s, "modified", 8)==0) rp->attr = 15; + else if(strncmp(pa.s, "instance", 8)==0) + rp->attr = 20; else goto error; break; case 10: @@ -461,7 +477,8 @@ int pv_fetch_contacts(struct sip_msg* msg, char* table, char* uri, while(ptr) { olen = (ptr->c.len + ptr->received.len + ptr->path.len - + ptr->callid.len + ptr->user_agent.len)*sizeof(char) + ilen; + + ptr->callid.len + ptr->user_agent.len + ptr->ruid.len + + ptr->instance.len)*sizeof(char) + ilen; c0 = (ucontact_t*)pkg_malloc(olen); if(c0==NULL) { @@ -506,6 +523,20 @@ int pv_fetch_contacts(struct sip_msg* msg, char* table, char* uri, c0->user_agent.len = ptr->user_agent.len; p += c0->user_agent.len; } + if(ptr->ruid.s!=NULL) + { + c0->ruid.s = p; + memcpy(c0->ruid.s, ptr->ruid.s, ptr->ruid.len); + c0->ruid.len = ptr->ruid.len; + p += c0->ruid.len; + } + if(ptr->instance.s!=NULL) + { + c0->instance.s = p; + memcpy(c0->instance.s, ptr->instance.s, ptr->instance.len); + c0->instance.len = ptr->instance.len; + p += c0->instance.len; + } if(ptr0==NULL) {

1 0

git:master: pv: new pv class - $K(key)
by Daniel-Constantin Mierla 25 Sep '12

25 Sep '12

Module: sip-router Branch: master Commit: ed5859fcd482d803cb2896cf58e3ef19ad8c2a2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed5859f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 25 23:43:48 2012 +0200 pv: new pv class - $K(key) - return the value for internal constant keywords - key can be: - IPv4 - returns AF_INET - IPv6 - returns AF_INET6 - UDP - return PROTO_UDP - TCP - return PROTO_TCP - TLS - return PROTO_TLS - SCTP - return PROTO_SCTP - it can be used to compare the values from other pvs, such as $af(id), $snd(af), $snd(proto), ... --- modules_k/pv/pv.c | 2 + modules_k/pv/pv_core.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_core.h | 6 ++++ 3 files changed, 75 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 8ee7cfa..6bd0feb 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -411,6 +411,8 @@ static pv_export_t mod_pvs[] = { 0, pv_parse_nh_name, 0, 0, 0}, { {"version", (sizeof("version")-1)}, PVT_OTHER, pv_get_sr_version, 0, pv_parse_sr_version_name, 0, 0, 0}, + { {"K", (sizeof("K")-1)}, PVT_OTHER, pv_get_K, 0, + pv_parse_K_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 3d3f121..d67278f 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -2523,3 +2523,70 @@ error: pkg_free(pv); return -1; } + + +/** + * + */ +int pv_parse_K_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 3: + if(strncmp(in->s, "UDP", 3)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "TCP", 3)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "TLS", 3)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else goto error; + break; + case 4: + if(strncmp(in->s, "IPv4", 4)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "IPv6", 4)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "SCTP", 4)==0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV af key: %.*s\n", in->len, in->s); + return -1; +} + +/** + * + */ +int pv_get_K(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + if(param==NULL) + return -1; + + switch(param->pvn.u.isname.name.n) + { + case 1: + return pv_get_uintval(msg, param, res, AF_INET6); + case 2: + return pv_get_uintval(msg, param, res, PROTO_UDP); + case 3: + return pv_get_uintval(msg, param, res, PROTO_TCP); + case 4: + return pv_get_uintval(msg, param, res, PROTO_TLS); + case 5: + return pv_get_uintval(msg, param, res, PROTO_SCTP); + default: + return pv_get_uintval(msg, param, res, AF_INET); + } +} diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index a9e864c..9fb802c 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -280,5 +280,11 @@ int pv_parse_af_name(pv_spec_p sp, str *in); int pv_get_af(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); + +int pv_parse_K_name(pv_spec_p sp, str *in); + +int pv_get_K(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); + #endif

1 0

git:master: pv: new pv class - $af(key)
by Daniel-Constantin Mierla 25 Sep '12

25 Sep '12

Module: sip-router Branch: master Commit: a2de5aba014c34fa0d37c1d527ff241e3969e897 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2de5ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 25 23:13:50 2012 +0200 pv: new pv class - $af(key) - return address family for received message - key can be: - id: return integer representation for IPv4 or IPv6 (value of AF_INET and AF_INET6) - name: return "IPv4" or "IPv6" --- modules_k/pv/pv.c | 2 + modules_k/pv/pv_core.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_core.h | 4 +++ 3 files changed, 63 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index aff1ee1..8ee7cfa 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -60,6 +60,8 @@ static tr_export_t mod_trans[] = { }; static pv_export_t mod_pvs[] = { + { {"af", (sizeof("af")-1)}, PVT_OTHER, pv_get_af, 0, + pv_parse_af_name, 0, 0, 0 }, { {"branch", sizeof("branch")-1}, /* branch attributes */ PVT_CONTEXT, pv_get_branchx, pv_set_branchx, pv_parse_branchx_name, pv_parse_index, 0, 0 }, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index d0c7628..3d3f121 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -60,6 +60,11 @@ static str pv_uri_scheme[] = { { 0, 0 } }; +static str pv_af_list[] = { + { "IPv4", 4 }, + { "IPv6", 4 }, + { 0, 0 } + }; int _pv_pid = 0; #define PV_FIELD_DELIM ", " @@ -642,6 +647,58 @@ int pv_get_rcvport(struct sip_msg *msg, pv_param_t *param, &msg->rcv.bind_address->port_no_str); } +/** + * + */ +int pv_parse_af_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 2: + if(strncmp(in->s, "id", 2)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else goto error; + break; + case 4: + if(strncmp(in->s, "name", 4)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV af key: %.*s\n", in->len, in->s); + return -1; +} + +/** + * + */ +int pv_get_af(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + if(msg==NULL || param==NULL) + return -1; + + switch(param->pvn.u.isname.name.n) + { + case 1: + if(msg->rcv.bind_address->address.af==AF_INET6) + return pv_get_strval(msg, param, res, &pv_af_list[1]); + return pv_get_strval(msg, param, res, &pv_af_list[0]); + default: + return pv_get_uintval(msg, param, res, msg->rcv.bind_address->address.af); + } +} + int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index 0149d24..a9e864c 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -276,5 +276,9 @@ int pv_parse_hdr_name(pv_spec_p sp, str *in); int pv_parse_cnt_name(pv_spec_p sp, str *in); +int pv_parse_af_name(pv_spec_p sp, str *in); + +int pv_get_af(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); #endif

1 0

git:master: nathelper(k): removed set_rtp_proxy_set() from docs
by Daniel-Constantin Mierla 25 Sep '12

25 Sep '12

Module: sip-router Branch: master Commit: daf65bac9d276598d932c7f905c30587ccb5a855 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=daf65ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 25 22:20:21 2012 +0200 nathelper(k): removed set_rtp_proxy_set() from docs - the function is now part of the rtpproxy module --- modules_k/nathelper/README | 164 ++++++++++++--------------- modules_k/nathelper/doc/nathelper_admin.xml | 23 ---- 2 files changed, 73 insertions(+), 114 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=daf…

1 0

git:3.2: modules_k/path: Use single-quotes around received
by Daniel-Constantin Mierla 25 Sep '12

25 Sep '12

Module: sip-router Branch: 3.2 Commit: a875381d87c15190f8a0d83dd824c748883a81b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a875381… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 5 14:31:04 2012 +0200 modules_k/path: Use single-quotes around received For full RFC3261 compliance, use single-quoted "received" param instead of double-quoted one. (cherry picked from commit a5b181bca6bf37b4a18ef502717b50d06e53d5e4) --- modules_k/path/path.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/path/path.c b/modules_k/path/path.c index f286077..3776c6c 100644 --- a/modules_k/path/path.c +++ b/modules_k/path/path.c @@ -122,23 +122,23 @@ static int prepend_path(struct sip_msg* _m, str *user, int recv) if (recv) { /* TODO: agranig: optimize this one! */ src_ip = ip_addr2a(&_m->rcv.src_ip); - rcv_addr.s = pkg_malloc(6 + IP_ADDR_MAX_STR_SIZE + 22); /* "sip:<ip>:<port>;transport=sctp"\0 */ + rcv_addr.s = pkg_malloc(6 + IP_ADDR_MAX_STR_SIZE + 22); /* 'sip:<ip>:<port>;transport=sctp'\0 */ if(!rcv_addr.s) { LM_ERR("no pkg memory left for receive-address\n"); goto out3; } switch (_m->rcv.proto) { case PROTO_UDP: - rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 6, "\"sip:%s:%u\"", src_ip, _m->rcv.src_port); + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 6, "'sip:%s:%u'", src_ip, _m->rcv.src_port); break; case PROTO_TCP: - rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 20, "\"sip:%s:%u;transport=tcp\"", src_ip, _m->rcv.src_port); + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 20, "'sip:%s:%u;transport=tcp'", src_ip, _m->rcv.src_port); break; case PROTO_TLS: - rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 20, "\"sip:%s:%u;transport=tls\"", src_ip, _m->rcv.src_port); + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 20, "'sip:%s:%u;transport=tls'", src_ip, _m->rcv.src_port); break; case PROTO_SCTP: - rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 21, "\"sip:%s:%u;transport=sctp\"", src_ip, _m->rcv.src_port); + rcv_addr.len = snprintf(rcv_addr.s, 6 + IP_ADDR_MAX_STR_SIZE + 21, "'sip:%s:%u;transport=sctp'", src_ip, _m->rcv.src_port); break; }

1 0

git:master: utils/misc: few updates to vim syntax highlighting
by Daniel-Constantin Mierla 25 Sep '12

25 Sep '12

Module: sip-router Branch: master Commit: 7943249ea75d8103d1364bcb4b6a63a2e685e88a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7943249… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 25 13:52:05 2012 +0200 utils/misc: few updates to vim syntax highlighting --- utils/misc/vim/ftdetect/ser.vim | 8 +++++++- utils/misc/vim/syntax/ser.vim | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/utils/misc/vim/ftdetect/ser.vim b/utils/misc/vim/ftdetect/ser.vim index 478220e..641b638 100644 --- a/utils/misc/vim/ftdetect/ser.vim +++ b/utils/misc/vim/ftdetect/ser.vim @@ -6,7 +6,13 @@ func! s:cfgType() if getline(n) =~ '^\s*#!$KAMAILIO\|OPENSER\|SER\|ALL\|MAXCOMPAT$' set filetype=ser return - elseif getline(n) =~ '^\s*modparam\s*(\s*"[^"]\+"' + elseif getline(n) =~ '^\s*#!$define\|ifdef\|endif\|subst\|substdef$' + set filetype=ser + return + elseif getline(n) =~ '^\s*!!$define\|ifdef\|endif\|subst\|substdef$' + set filetype=ser + return + elseif getline(n) =~ '^\s*modparam\s*(\s*"[^"]\+"' set filetype=ser return elseif getline(n) =~ '^\s*route\s*{\s*' diff --git a/utils/misc/vim/syntax/ser.vim b/utils/misc/vim/syntax/ser.vim index f9caddd..04d8278 100644 --- a/utils/misc/vim/syntax/ser.vim +++ b/utils/misc/vim/syntax/ser.vim @@ -34,7 +34,7 @@ syn keyword serTodo TODO FIXME XXX contained syn match serOperator '!\|&&\|||\|=[~=]\?\|>\|<\|+\|-\|/\|\*\||\|&\|^\|\~\|defined\|eq\|ieq\|ne\|ine\|mod' display contained syn region serCppComment start='/\*' end='\*/' contains=serTodo -syn match serHashDefine '#!define\s\|#!ifdef\s\|#!ifndef\s\|#!endif\|#!else\|#!subst\|!!define\s\|!!ifdef\s\|!!ifndef\s\|!!endif\|!!else\|!!subst\|#!KAMAILIO\|#!OPENSER\|#!SER\|#!MAXCOMPAT\|#!ALL' +syn match serHashDefine '#!define\s\|#!ifdef\s\|#!ifndef\s\|#!endif\|#!else\|#!substdef\|#!subst\|!!define\s\|!!ifdef\s\|!!ifndef\s\|!!endif\|!!else\|!!substdef\|!!subst\|#!KAMAILIO\|#!OPENSER\|#!SER\|#!MAXCOMPAT\|#!ALL' " syn match serHashDefine '^\s*#!.+$' syn match serHashComment '#[^!].*$\|#$' contains=serTodo @@ -43,7 +43,7 @@ syn match serNumber '[0-9]\+' contained syn region serString matchgroup=Normal start='"' skip='\\"' end='"' contained contains=serVariable,serStringEscape syn match serVariable "$[a-zA-Z_][a-zA-Z0-9_]*$([^)]\+)$\?" contained syn match serIdentifier '[a-zA-Z_][a-zA-Z0-9_]*' contained -syn keyword serStatement route if else switch case default break exit return drop while include_file contained +syn keyword serStatement route if else switch case default break exit return drop while include_file import_file contained syn keyword serSpecial yes no on off true false enabled disabled contained syn keyword serCoreKeyword af dst_ip dst_port from_uri method msg:len proto status snd_af snd_ip snd_port snd_proto src_ip src_port to_af to_ip to_port to_proto to_uri uri uri:host uri:port contained

1 0

git:master: sanity: fix to parameter type in example
by Daniel-Constantin Mierla 25 Sep '12

25 Sep '12

Module: sip-router Branch: master Commit: 779addb9df44434448f78ab17d2daa756d31d3c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=779addb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 25 11:31:17 2012 +0200 sanity: fix to parameter type in example --- modules/sanity/README | 6 +++--- modules/sanity/doc/params.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/sanity/README b/modules/sanity/README index b733826..27bcaa1 100644 --- a/modules/sanity/README +++ b/modules/sanity/README @@ -4,7 +4,7 @@ Nils Ohlmeier iptelorg GmbH - Copyright © 2006 iptelorg GmbH + Copyright � 2006 iptelorg GmbH __________________________________________________________________ 1.1. Overview @@ -84,7 +84,7 @@ Nils Ohlmeier Example 1. Set default_checks parameter ... -modparam("sanity", "default_checks", "1") +modparam("sanity", "default_checks", 1) ... 1.3.2. uri_checks (integer) @@ -128,7 +128,7 @@ modparam("sanity", "autodrop", 1) 1.4. Functions -1.4.1. sanity_check([msg_checks [, uri_checks]]) +1.4.1. sanity_check([msg_checks [, uri_checks]]) This function makes a row of sanity checks over the given SIP request. The behavior of the function is also controled by 'autodrop' parameter. diff --git a/modules/sanity/doc/params.xml b/modules/sanity/doc/params.xml index 08258b8..552ec82 100644 --- a/modules/sanity/doc/params.xml +++ b/modules/sanity/doc/params.xml @@ -33,7 +33,7 @@ <title>Set <varname>default_checks</varname> parameter</title> <programlisting> ... -modparam("sanity", "default_checks", "1") +modparam("sanity", "default_checks", 1) ... </programlisting> </example>

1 0

← Newer
1
2
3
4
5
6
7
...
18
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2012