sr-dev

sr-dev@lists.kamailio.org

13 participants
43416 discussions

git:ser_core_cvs: sctp protocol decoded in RPC dst_blacklist.view

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 1acade4541c8665f11800677f0ffe9ebf8608194 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1acade4… Author: Michal Matyska <michal.matyska(a)iptel.org> Committer: Michal Matyska <michal.matyska(a)iptel.org> Date: Tue Dec 9 14:09:22 2008 +0000 sctp protocol decoded in RPC dst_blacklist.view so it does not show unknown protocol anymore --- dst_blacklist.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dst_blacklist.c b/dst_blacklist.c index 3464517..bb6e35e 100644 --- a/dst_blacklist.c +++ b/dst_blacklist.c @@ -879,6 +879,8 @@ static char* get_proto_name(unsigned char proto) return "tcp"; case PROTO_TLS: return "tls"; + case PROTO_SCTP: + return "sctp"; default: return "unknown"; }

15 years, 9 months

git:ser_core_cvs: another switch where PROTO_SCTP was missing - added case

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: e4c9fe9a983a8825a342ed085565a9fc15abeeea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4c9fe9… Author: Michal Matyska <michal.matyska(a)iptel.org> Committer: Michal Matyska <michal.matyska(a)iptel.org> Date: Thu Dec 11 19:12:41 2008 +0000 another switch where PROTO_SCTP was missing - added case --- dns_cache.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 14598e0..9a53fe4 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -3014,6 +3014,12 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name, tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0'; len=SRV_TLS_PREFIX_LEN + name->len; break; + case PROTO_SCTP: + memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN); + memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len); + tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0'; + len=SRV_SCTP_PREFIX_LEN + name->len; + break; default: LOG(L_CRIT, "BUG: sip_resolvehost: " "unknown proto %d\n", (int)srv_proto);

15 years, 9 months

git:ser_core_cvs: sctp: SO_REUSEADDR on the sctp sockets

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 235631a00531fd84d8ddb3ba72ed815b22ea647e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=235631a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Dec 12 23:25:39 2008 +0000 sctp: SO_REUSEADDR on the sctp sockets Reported-by: Michal Matyska, michal.matyska at iptel org --- sctp_server.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/sctp_server.c b/sctp_server.c index 4a30954..7ac8444 100644 --- a/sctp_server.c +++ b/sctp_server.c @@ -216,6 +216,15 @@ static int sctp_init_sock_opt_common(int s) } } + /* set reuseaddr */ + if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, + (void*)&optval, sizeof(optval))==-1){ + LOG(L_ERR, "ERROR: sctp_init_sock_opt_common: setsockopt:" + " SO_REUSEADDR (%d): %s\n", optval, strerror(errno)); + /* continue, non-critical */ + } + + /* disable fragments interleave (SCTP_FRAGMENT_INTERLEAVE) -- * we don't want partial delivery, so fragment interleave must be off too */

15 years, 9 months

git:ser_core_cvs: tcp: fix for async write

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 74c6d2807c6ecf59f8efad22cfddfd27e4fadfc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74c6d28… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Dec 12 23:02:45 2008 +0000 tcp: fix for async write - fixed bug in _wbufq_add() which caused packet corruption when multiple packets with size < default buffer size where queued. Reported-by: Vaclav Kubart, vaclav.kubart at iptel org Tested-by: Vaclav Kubart, vaclav.kubart at iptel org --- tcp_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tcp_main.c b/tcp_main.c index e26685a..6a6e27a 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -648,7 +648,7 @@ inline static int _wbufq_add(struct tcp_connection* c, char* data, last_free=wb->b_size; } crt_size=MIN_unsigned(last_free, size); - memcpy(wb->buf, data, crt_size); + memcpy(wb->buf+q->last_used, data, crt_size); q->last_used+=crt_size; size-=crt_size; data+=crt_size;

15 years, 9 months

git:ser_core_cvs: dns cache: fixed missing sctp SRV queries

by Andrei Pelinescu-Onciul

Module: sip-router Branch: ser_core_cvs Commit: 5a1f979819f11fe453546c0ceaa067d93c8e3343 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a1f979… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Nov 28 10:41:40 2008 +0000 dns cache: fixed missing sctp SRV queries - added missing support for sctp SRV queries --- dns_cache.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 5cc8431..14598e0 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2392,6 +2392,12 @@ struct hostent* dns_srv_sip_resolvehost(str* name, unsigned short* port, tmp[SRV_TLS_PREFIX_LEN + name->len] = '\0'; len=SRV_TLS_PREFIX_LEN + name->len; break; + case PROTO_SCTP: + memcpy(tmp, SRV_SCTP_PREFIX, SRV_SCTP_PREFIX_LEN); + memcpy(tmp+SRV_SCTP_PREFIX_LEN, name->s, name->len); + tmp[SRV_SCTP_PREFIX_LEN + name->len] = '\0'; + len=SRV_SCTP_PREFIX_LEN + name->len; + break; default: LOG(L_CRIT, "BUG: sip_resolvehost: unknown proto %d\n", (int)srv_proto);

15 years, 9 months

k/o xlog and pv modules for srouter

by Daniel-Constantin Mierla

Hello, I have uploaded xlog and (stripped) pv Kamailio/Openser modules to sip-router.org site at: http://sip-router.org/pub/tmp/miconda/ If you are willing to test them, then just get the branch "master" from git and merge with "daniel/pv". Details about GIT repository: http://sip-router.org/2008/11/18/git-repository-online/ The pv module does not include yet the pseudo-variables and transformations dependent of K/O extensions (e.g., branch, script flags, ...). Probably one important to decide upon is the AVP (to start a new discussion about it separately). The ones missing now will be gradually activated as dependent code is sorted out. Testing and feedback is welcome. Andrei is doing heavy work to improve the config script interpreter for string and arithmetic operations, you can track the commits at: http://lists.sip-router.org/pipermail/sr-dev/ Once work is finished and the developers' branches are merged, we can mark an important milestone - K/O pseudo-variables working in sip-router config file, opening full functionality for large set of K/O modules and clean compatibility of config files for many typical deployments. SIP-Router is able to load now both types of modules: ser and k/o. DB APIs from both projects were tested as library, from K/O point of view mi and statistics API are the extensions yet to be made libraries for sip-router. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

15 years, 9 months

git:daniel/pv: fix add/lookup pv name

by Daniel-Constantin Mierla

Module: sip-router Branch: daniel/pv Commit: 41c098d017d823bcff70872b7f185faee893b745 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41c098d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 16 13:11:47 2008 +0200 fix add/lookup pv name --- pvapi.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/pvapi.c b/pvapi.c index 9bb1de4..e93b459 100644 --- a/pvapi.c +++ b/pvapi.c @@ -120,13 +120,10 @@ int pv_table_add(pv_export_t *e) { if(pvi->pvid > pvid) break; - if(pvi->pve.name.len > in->len) - break; if(pvi->pve.name.len==in->len) { found = strncmp(pvi->pve.name.s, in->s, in->len); - if(found>0) - break; + if(found==0) { LM_ERR("pvar [%.*s] already exists\n", in->len, in->s); @@ -334,8 +331,6 @@ pv_export_t* pv_lookup_spec_name(str *pvname, pv_spec_p e) { if(pvi->pvid > pvid) break; - if(pvi->pve.name.len > pvname->len) - break; if(pvi->pvid==pvid && pvi->pve.name.len==pvname->len && memcmp(pvi->pve.name.s, pvname->s, pvname->len)==0)

15 years, 9 months

git:andrei/script_vars: script: fix pvar parsing

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: 1c67272d35800a32ef3877ce87799c318dca8d52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c67272… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Dec 16 12:03:44 2008 +0100 script: fix pvar parsing - fix parsing for pvars with multiple '(' --- cfg.lex | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/cfg.lex b/cfg.lex index 6e9d991..fc9eecb 100644 --- a/cfg.lex +++ b/cfg.lex @@ -806,6 +806,7 @@ EAT_ABLE [\ \t\b\r] } yymore(); } +<PVAR_P>{LPAREN} { p_nest++; yymore(); } <PVAR_P>. { yymore(); } <PVARID>{ID}|'.' {yymore(); }

15 years, 9 months

git:andrei/script_vars: script engine: pvar & avp fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/script_vars Commit: a4ade2b9635011c0b66e1c2e96f77271b59551d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4ade2b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Dec 16 12:06:23 2008 +0100 script engine: pvar & avp fixes - fix avp type flags in assignments (not always set/reset) - always look first for the integer value of a pvar (since and int pvar can also have a str value) - don't destroy the pvar values before using them (typo) --- lvalue.c | 44 +++++++++++++++++++++++++------------------- route.c | 2 +- rvalue.c | 2 +- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/lvalue.c b/lvalue.c index e5f1afd..77a9a86 100644 --- a/lvalue.c +++ b/lvalue.c @@ -69,7 +69,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, goto error; case RV_INT: value.n=rv->v.l; - flags=avp->type; + flags=avp->type & ~AVP_VAL_STR; ret=!(!value.n); break; case RV_STR: @@ -78,7 +78,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, ret=(value.s.len>0); break; case RV_ACTION_ST: - flags=avp->type; + flags=avp->type & ~AVP_VAL_STR; if (rv->v.action) value.n=run_actions(h, rv->v.action, msg); else @@ -93,7 +93,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, WARN("error in expression\n"); value.n=0; /* expr. is treated as false */ } - flags=avp->type; + flags=avp->type & ~AVP_VAL_STR; ret=value.n; break; case RV_SEL: @@ -107,7 +107,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, value.s.len=0; } } - flags=avp->type; + flags=avp->type|AVP_VAL_STR; ret=(value.s.len>0); break; case RV_AVP: @@ -116,10 +116,11 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, r_avp = search_first_avp(rv->v.avps.type, rv->v.avps.name, &value, &st); while(r_avp){ - /* We take only the type and name from the source avp - * and reset the class and track flags */ - flags=(avp->type & ~AVP_INDEX_ALL) | - (r_avp->flags & ~(AVP_CLASS_ALL|AVP_TRACK_ALL)); + /* We take only the val type from the source avp + * and reset the class, track flags and name type */ + flags=(avp->type & ~(AVP_INDEX_ALL|AVP_VAL_STR)) | + (r_avp->flags & ~(AVP_CLASS_ALL|AVP_TRACK_ALL| + AVP_NAME_STR|AVP_NAME_RE)); if (add_avp_before(avp_mark, flags, avp->name, value)<0){ ERR("failed to assign avp\n"); ret=-1; @@ -139,8 +140,11 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, r_avp = search_avp_by_index(rv->v.avps.type, rv->v.avps.name, &value, rv->v.avps.index); if (likely(r_avp)){ - flags=avp->type | (r_avp->flags & - ~(AVP_CLASS_ALL|AVP_TRACK_ALL)); + /* take only the val type from the source avp + * and reset the class, track flags and name type */ + flags=(avp->type & ~AVP_VAL_STR) | (r_avp->flags & + ~(AVP_CLASS_ALL|AVP_TRACK_ALL|AVP_NAME_STR| + AVP_NAME_RE)); ret=1; }else{ ret=-1; @@ -149,27 +153,30 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, } break; case RV_PVAR: - flags=avp->type; memset(&pval, 0, sizeof(pval)); if (likely(pv_get_spec_value(msg, &rv->v.pvs, &pval)==0)){ destroy_pval=1; - if (pval.flags & PV_VAL_STR){ - value.s=pval.rs; - ret=(value.s.len>0); - }else if (pval.flags & PV_TYPE_INT){ + if (pval.flags & PV_TYPE_INT){ value.n=pval.ri; ret=value.n; + flags=avp->type & ~AVP_VAL_STR; + }else if (pval.flags & PV_VAL_STR){ + value.s=pval.rs; + ret=(value.s.len>0); + flags=avp->type | AVP_VAL_STR; }else if (pval.flags==PV_VAL_NONE || (pval.flags & (PV_VAL_NULL|PV_VAL_EMPTY))){ value.s.s=""; value.s.len=0; ret=0; + flags=avp->type | AVP_VAL_STR; } }else{ /* non existing pvar */ value.s.s=""; value.s.len=0; ret=0; + flags=avp->type | AVP_VAL_STR; } break; } @@ -286,13 +293,12 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, } break; case RV_PVAR: - memset(&pval, 0, sizeof(pval)); if (likely(pv_get_spec_value(msg, &rv->v.pvs, &pval)==0)){ destroy_pval=1; - if (pval.flags & PV_VAL_STR){ - ret=(pval.rs.len>0); - }else if (pval.flags & PV_TYPE_INT){ + if (pval.flags & PV_TYPE_INT){ ret=!(!pval.ri); + }else if (pval.flags & PV_VAL_STR){ + ret=(pval.rs.len>0); }else{ ERR("no value in pvar assignment rval\n"); ret=-1; diff --git a/route.c b/route.c index 4164284..ad85c00 100644 --- a/route.c +++ b/route.c @@ -841,8 +841,8 @@ inline static int comp_num(int op, long left, int rtype, union exp_op* r, return (op == DIFF_OP); /* error, not found => false */ } if (likely(pval.flags & (PV_TYPE_INT|PV_VAL_INT))){ - pv_value_destroy(&pval); right=pval.ri; + pv_value_destroy(&pval); }else{ pv_value_destroy(&pval); return (op == DIFF_OP); /* not found or invalid type */ diff --git a/rvalue.c b/rvalue.c index 6f9b118..063be00 100644 --- a/rvalue.c +++ b/rvalue.c @@ -661,8 +661,8 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, memset(&pval, 0, sizeof(pval)); if (likely(pv_get_spec_value(msg, &rv->v.pvs, &pval)==0)){ if (likely(pval.flags & PV_VAL_INT)){ - pv_value_destroy(&pval); *i=pval.ri; + pv_value_destroy(&pval); }else if (likely(pval.flags & PV_VAL_STR)){ pv_value_destroy(&pval); goto rv_str;

15 years, 9 months

avp script flags

by Daniel-Constantin Mierla

Hello, while adapting the PV API, I got into the AVP script flags? Is anyone still using them? If yes, for what purpose, maybe we can figure out a nicer way and drop these flags. We have to find the solution to make AVPs from kamailio/openser and ser compatible in the new sip-router.org project. Just for those not being sure what I am talking about, avp names can have flags after the name type specifier, like: $avp(i3:23) - meaning that flags 1 and 2 (bitmask ...0011) are set for that avp. As I haven't seen any related discussions for quite some time, the functionality might not be updated all over the code. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

15 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev