sr-dev June 2011

sr-dev@lists.kamailio.org

32 participants
167 discussions

[tracker] Comment added: NAPTR records are retrieved but fully ignored

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#135 - NAPTR records are retrieved but fully ignored User who did this - Iñaki Baz Castillo (ibc) ---------- Confirmed that it works now. Thanks a lot. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=135#comment224 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.

12 years, 11 months

[tracker] Comment added: warn about implicit type conversions

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#93 - warn about implicit type conversions User who did this - Andrew Pogrebennyk (marduk) ---------- I vote for this, otherwise it's easy to run into the problem like: get_profile_size("caller","$avp(s:username)","$avp(i:22)"); if($avp(i:22) >= $avp(s:sim_calls)) { .... if there are 2 active calls for the user and concurrency limit is 11, string comparison will results in 2 > 11. should be: if($avp(i:22) >= $(avp(s:sim_calls){s.int})) { ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=93#comment223 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.

12 years, 11 months

[tracker] Comment added: nathelper path support with registrar on private network.

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#131 - nathelper path support with registrar on private network. User who did this - Andrew Pogrebennyk (marduk) ---------- Bruce, Let me ask - have you enabled the path_use_received and use_path parameters in the registrar module? It should work this way, kamailio will set $du to the path URI and the OPTIONS ping will arrive at proxy with its URI in the Route header. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=131#comment222 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.

12 years, 11 months

git:master: tm: fix minor tm_load_xapi bug

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 0a4683f73ea05a97627d868d1753aaaee3ca5173 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a4683f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jun 11 11:32:16 2011 +0200 tm: fix minor tm_load_xapi bug Due to a typo the check for load_xtm not found was wrong. --- modules/tm/tm_load.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index aad979b..370c2ef 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -191,7 +191,7 @@ static inline int tm_load_xapi(tm_xapi_t *xtmb) /* import the TM auto-loading function */ load_xtm = (load_xtm_f)find_export("load_xtm", NO_SCRIPT, 0); - if (load_tm == NULL) { + if (load_xtm == NULL) { LOG(L_WARN, "Cannot import load_xtm function from tm module\n"); return -1; }

12 years, 11 months

git:master: tm: fix warnings/eliminate unused variables

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b6cb8823682e3a1f7881bf0e0a3ce3053bb5895c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6cb882… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jun 11 11:31:43 2011 +0200 tm: fix warnings/eliminate unused variables Eliminate initialized, but unused variables (reported by gcc 4.6). --- modules/tm/t_lookup.c | 2 -- modules/tm/timer.h | 4 ---- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index e69fdec..b626a1f 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -503,7 +503,6 @@ int t_lookup_request( struct sip_msg* p_msg , int leave_new_locked, struct cell *p_cell; unsigned int isACK; struct sip_msg *t_msg; - int ret; struct via_param *branch; int match_status; struct cell *e2e_ack_trans; @@ -529,7 +528,6 @@ int t_lookup_request( struct sip_msg* p_msg , int leave_new_locked, /* assume not found */ - ret=-1; e2e_ack_trans = 0; /* first of all, look if there is RFC3261 magic cookie in branch; if diff --git a/modules/tm/timer.h b/modules/tm/timer.h index 0160535..7810169 100644 --- a/modules/tm/timer.h +++ b/modules/tm/timer.h @@ -241,14 +241,10 @@ inline static void change_retr(struct cell* t, int now, ticks_t rt_t1, ticks_t rt_t2) { int i; - ticks_t new_rt1_expire, new_rt2_expire, crt; if (rt_t1) t->rt_t1_timeout=rt_t1; if (rt_t2) t->rt_t2_timeout=rt_t2; if (now){ - crt=get_ticks_raw(); - new_rt1_expire=crt+rt_t1; - new_rt2_expire=crt+rt_t2; for (i=0; i<t->nr_of_outgoings; i++){ if (t->uac[i].request.t_active){ if ((t->uac[i].request.flags & F_RB_T2) && rt_t2)

12 years, 11 months

git:master: core: remove unused variables + coding style

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8a90dd3515bddb189b411672555688427612cf31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a90dd3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jun 11 11:24:05 2011 +0200 core: remove unused variables + coding style --- action.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/action.c b/action.c index 268b3f5..8ca143a 100644 --- a/action.c +++ b/action.c @@ -302,6 +302,8 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) unsigned short port; str* dst_host; int i, flags; + avp_t* avp; + struct search_state st; struct switch_cond_table* sct; struct switch_jmp_table* sjt; struct rval_expr* rve; @@ -618,15 +620,16 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) break; /* jku - end : flag processing */ - case AVPFLAG_OPER_T: { - struct search_state st; - avp_t* avp; - int flag; + case AVPFLAG_OPER_T: ret = 0; - flag = a->val[1].u.number; - if ((a->val[0].u.attr->type & AVP_INDEX_ALL) == AVP_INDEX_ALL || (a->val[0].u.attr->type & AVP_NAME_RE)!=0) { - for (avp=search_first_avp(a->val[0].u.attr->type, a->val[0].u.attr->name, NULL, &st); avp; avp = search_next_avp(&st, NULL)) { - switch (a->val[2].u.number) { /* oper: 0..reset, 1..set, -1..no change */ + if ((a->val[0].u.attr->type & AVP_INDEX_ALL) == AVP_INDEX_ALL || + (a->val[0].u.attr->type & AVP_NAME_RE)!=0) { + for (avp=search_first_avp(a->val[0].u.attr->type, + a->val[0].u.attr->name, NULL, &st); + avp; + avp = search_next_avp(&st, NULL)) { + switch (a->val[2].u.number) { + /* oper: 0..reset, 1..set, -1..no change */ case 0: avp->flags &= ~(avp_flags_t)a->val[1].u.number; break; @@ -635,13 +638,16 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) break; default:; } - ret = ret || ((avp->flags & (avp_flags_t)a->val[1].u.number) != 0); + ret = ret || + ((avp->flags & (avp_flags_t)a->val[1].u.number) != 0); } - } - else { - avp = search_avp_by_index(a->val[0].u.attr->type, a->val[0].u.attr->name, NULL, a->val[0].u.attr->index); + } else { + avp = search_avp_by_index(a->val[0].u.attr->type, + a->val[0].u.attr->name, NULL, + a->val[0].u.attr->index); if (avp) { - switch (a->val[2].u.number) { /* oper: 0..reset, 1..set, -1..no change */ + switch (a->val[2].u.number) { + /* oper: 0..reset, 1..set, -1..no change */ case 0: avp->flags &= ~(avp_flags_t)a->val[1].u.number; break; @@ -656,7 +662,6 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) if (ret==0) ret = -1; break; - } case ERROR_T: if ((a->val[0].type!=STRING_ST)|(a->val[1].type!=STRING_ST)){ LOG(L_CRIT, "BUG: do_action: bad error() types %d, %d\n",

12 years, 11 months

git:master: core: fix warnings/eliminate unused variables

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e4a750639587056cbcad699980d0fe191a10a504 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4a7506… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jun 11 11:21:49 2011 +0200 core: fix warnings/eliminate unused variables Eliminate initialized, but unused variables (reported by gcc 4.6). --- counters.c | 4 ++-- dns_cache.c | 2 -- events.c | 6 ++++-- mem/q_malloc.c | 10 +++++++--- msg_translator.c | 4 +++- parser/msg_parser.c | 4 ---- parser/parse_subscription_state.c | 3 +-- pvapi.c | 3 +-- rvalue.c | 2 -- switch.c | 7 +------ tcp_main.c | 2 -- tcp_read.c | 2 -- ut.h | 5 ----- 13 files changed, 19 insertions(+), 35 deletions(-) diff --git a/counters.c b/counters.c index 56bcd2f..72a9b4e 100644 --- a/counters.c +++ b/counters.c @@ -202,10 +202,10 @@ int counters_prefork_init(int max_process_no) /* replace the temporary pre-fork pkg array (with only 1 row) with the final shm version (with max_process_no rows) */ old = _cnts_vals; - _cnts_vals = shm_malloc(max_process_no * row_size); + _cnts_vals = shm_malloc(size); if (_cnts_vals == 0) return -1; - memset(_cnts_vals, 0, max_process_no * row_size); + memset(_cnts_vals, 0, size); cnts_max_rows = max_process_no; /* copy prefork values into the newly shm array */ if (old) { diff --git a/dns_cache.c b/dns_cache.c index 22d1676..5a12ca1 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2202,14 +2202,12 @@ inline static struct dns_rr* dns_entry_get_rr( struct dns_hash_entry* e, { struct dns_rr* rr; int n; - int flags; #ifdef DNS_WATCHDOG_SUPPORT int servers_up; servers_up = atomic_get(dns_servers_up); #endif - flags=0; for(rr=e->rr_lst, n=0;rr && (n<*no);rr=rr->next, n++);/* skip *no records*/ for(;rr;rr=rr->next){ if ( diff --git a/events.c b/events.c index 881da1d..fccfd1c 100644 --- a/events.c +++ b/events.c @@ -93,13 +93,15 @@ int sr_event_register_cb(int type, sr_event_cb_f f) int sr_event_exec(int type, void *data) { int ret; +#ifdef EXTRA_DEBUG str *p; +#endif /* EXTRA_DEBUG */ switch(type) { case SREV_NET_DATA_IN: if(unlikely(_sr_events_list.net_data_in!=0)) { - p = (str*)data; #ifdef EXTRA_DEBUG + p = (str*)data; LM_DBG("PRE-IN ++++++++++++++++++++++++++++++++\n" "%.*s\n+++++\n", p->len, p->s); #endif /* EXTRA_DEBUG */ @@ -114,8 +116,8 @@ int sr_event_exec(int type, void *data) case SREV_NET_DATA_OUT: if(unlikely(_sr_events_list.net_data_out!=0)) { - p = (str*)data; #ifdef EXTRA_DEBUG + p = (str*)data; LM_DBG("PRE-OUT ++++++++++++++++++++\n" "%.*s\n+++++++++++++++++++\n", p->len, p->s); #endif /* EXTRA_DEBUG */ diff --git a/mem/q_malloc.c b/mem/q_malloc.c index a90c1e6..7344f66 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -427,9 +427,11 @@ void qm_free(struct qm_block* qm, void* p) #endif { struct qm_frag* f; - struct qm_frag* prev; - struct qm_frag* next; unsigned long size; +#ifdef QM_JOIN_FREE + struct qm_frag* next; + struct qm_frag* prev; +#endif /* QM_JOIN_FREE*/ #ifdef DBG_QM_MALLOC MDBG("qm_free(%p, %p), called from %s: %s(%d)\n", qm, p, file, func, line); @@ -443,7 +445,9 @@ void qm_free(struct qm_block* qm, void* p) LOG(L_WARN, "WARNING:qm_free: free(0) called\n"); return; } - prev=next=0; +#ifdef QM_JOIN_FREE + next=prev=0; +#endif /* QM_JOIN_FREE*/ f=(struct qm_frag*) ((char*)p-sizeof(struct qm_frag)); #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f); diff --git a/msg_translator.c b/msg_translator.c index 8b60fa7..9b97794 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -2271,7 +2271,9 @@ char* via_builder( unsigned int *len, str* port_str; /* port no displayed in via */ struct socket_info* send_sock; int comp_len, comp_name_len; +#ifdef USE_COMP char* comp_name; +#endif /* USE_COMP */ send_sock=send_info->send_sock; /* use pre-set address in via or the outbound socket one */ @@ -2285,8 +2287,8 @@ char* via_builder( unsigned int *len, port_str=&(send_sock->port_no_str); comp_len=comp_name_len=0; - comp_name=0; #ifdef USE_COMP + comp_name=0; switch(send_info->comp){ case COMP_NONE: break; diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 01bb40e..e138c7f 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -604,8 +604,6 @@ int parse_msg(char* buf, unsigned int len, struct sip_msg* msg) char *tmp; char* rest; - char* first_via; - char* second_via; struct msg_start *fl; int offset; hdr_flags_t flags; @@ -654,8 +652,6 @@ int parse_msg(char* buf, unsigned int len, struct sip_msg* msg) } msg->unparsed=tmp; /*find first Via: */ - first_via=0; - second_via=0; if (parse_headers(msg, flags, 0)==-1) goto error; #ifdef EXTRA_DEBUG diff --git a/parser/parse_subscription_state.c b/parser/parse_subscription_state.c index f7260bc..94a55e5 100644 --- a/parser/parse_subscription_state.c +++ b/parser/parse_subscription_state.c @@ -43,14 +43,13 @@ static int ss_parse(str *src, subscription_state_t *ss) param_t *params; str s = *src; str state; - char *c, *end; + char *c; /* initialization */ ss->expires_set = 0; ss->expires = 0; trim_leading(&s); - end = s.s + s.len; state = s; diff --git a/pvapi.c b/pvapi.c index f6c029c..b75f231 100644 --- a/pvapi.c +++ b/pvapi.c @@ -1012,7 +1012,7 @@ int pv_set_spec_value(struct sip_msg* msg, pv_spec_p sp, int op, */ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) { - int n, h; + int n; pv_value_t tok; pv_elem_p it; char *cur; @@ -1026,7 +1026,6 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) *buf = '\0'; cur = buf; - h = 0; n = 0; for (it=list; it; it=it->next) { diff --git a/rvalue.c b/rvalue.c index ea861e6..a3e158b 100644 --- a/rvalue.c +++ b/rvalue.c @@ -3424,14 +3424,12 @@ static int rve_optimize(struct rval_expr* rve) struct rvalue* rv; struct rvalue* trv; /* used only for DBG() */ enum rval_expr_op op; - int flags; struct rval_expr tmp_rve; enum rval_type type, l_type; struct rval_expr* bad_rve; enum rval_type bad_type, exp_type; ret=0; - flags=0; rv=0; if (scr_opt_lev<1) return 0; diff --git a/switch.c b/switch.c index b09d8ae..b254a7b 100644 --- a/switch.c +++ b/switch.c @@ -158,7 +158,6 @@ int fix_switch(struct action* t) struct action** tail; struct switch_jmp_table* jmp; struct switch_cond_table* sct; - int labels_no; struct action** def_jmp_bm; int* cond; struct action*** jmp_bm; @@ -170,7 +169,6 @@ int fix_switch(struct action* t) cond=0; jmp_bm=0; def_jmp_bm=0; - labels_no=0; default_found=0; /* check if string switch (first case is string or RE) */ for (c=(struct case_stms*)t->val[1].u.data; c && c->is_default; c=c->next); @@ -254,7 +252,6 @@ int fix_switch(struct action* t) goto error; } } - labels_no=n; cond=pkg_malloc(sizeof(cond[0])*n); jmp_bm=pkg_malloc(sizeof(jmp_bm[0])*n); if (cond==0 || jmp_bm==0){ @@ -432,7 +429,6 @@ static int fix_match(struct action* t) struct action* action_lst; struct action** tail; struct match_cond_table* mct; - int labels_no; struct action** def_jmp_bm; struct match_str* match; struct action*** jmp_bm; @@ -446,7 +442,6 @@ static int fix_match(struct action* t) match=0; jmp_bm=0; def_jmp_bm=0; - labels_no=0; default_found=0; rv=0; s.s=0; @@ -578,7 +573,7 @@ static int fix_match(struct action* t) goto error; } } - labels_no=n; + /* n is the number of labels here */ match=pkg_malloc(sizeof(match[0])*n); jmp_bm=pkg_malloc(sizeof(jmp_bm[0])*n); if (match==0 || jmp_bm==0){ diff --git a/tcp_main.c b/tcp_main.c index ac76dc5..5aa8638 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1774,7 +1774,6 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, int fd; long response[2]; int n; - int do_close_fd; ticks_t con_lifetime; #ifdef USE_TLS const char* rest_buf; @@ -1784,7 +1783,6 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, snd_flags_t t_send_flags; #endif /* USE_TLS */ - do_close_fd=1; /* close the fd on exit */ port=su_getport(&dst->to); con_lifetime=cfg_get(tcp, tcp_cfg, con_lifetime); if (likely(port)){ diff --git a/tcp_read.c b/tcp_read.c index be67f9a..1ba6cbb 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -857,14 +857,12 @@ int tcp_read_req(struct tcp_connection* con, int* bytes_read, int* read_flags) long size; struct tcp_req* req; struct dest_info dst; - int s; char c; int ret; bytes=-1; total_bytes=0; resp=CONN_RELEASE; - s=con->fd; req=&con->req; again: diff --git a/ut.h b/ut.h index da40ebc..04ce934 100644 --- a/ut.h +++ b/ut.h @@ -192,14 +192,12 @@ static inline unsigned short str2s(const char* s, unsigned int len, unsigned short ret; int i; unsigned char *limit; - unsigned char *init; unsigned char* str; /*init*/ str=(unsigned char*)s; ret=i=0; limit=str+len; - init=str; for(;str<limit ;str++){ if ( (*str <= '9' ) && (*str >= '0') ){ @@ -215,12 +213,9 @@ static inline unsigned short str2s(const char* s, unsigned int len, return ret; error_digits: - /*DBG("str2s: ERROR: too many letters in [%.*s]\n", (int)len, init); */ if (err) *err=1; return 0; error_char: - /*DBG("str2s: ERROR: unexpected char %c in %.*s\n", *str, (int)len, init); - * */ if (err) *err=1; return 0; }

12 years, 11 months

[tracker] Task closed: NAPTR records are retrieved but fully ignored

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#135 - NAPTR records are retrieved but fully ignored User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Fixed Additional comments about closing: Fixed on master and 3.1, GIT#12dc82 and GIT#e2d6f0 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=135 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.

12 years, 11 months

[tracker] Comment added: NAPTR records are retrieved but fully ignored

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#135 - NAPTR records are retrieved but fully ignored User who did this - Andrei Pelinescu-Onciul (andrei) ---------- Thanks, the check for the flags ('S') was case sensitive ('s' was expected). All the NAPTR records I've used, had 's' and that's why it passed all the tests. It's fixed now. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=135#comment221 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.

12 years, 11 months

git:3.1: dns: case insensitive check for NAPTR record flags

by Andrei Pelinescu-Onciul

Module: sip-router Branch: 3.1 Commit: e2d6f0e3e0a3b9511f05be79d11a097a99d70eb7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2d6f0e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jun 11 10:38:10 2011 +0200 dns: case insensitive check for NAPTR record flags The NAPTR records flags where not checked in case insensitive mode. Records with the 'S' flags where ignored ('s' was expected). Closes: FS#135 Reported-by: Inaki Baz Castillo ibc aliax net (cherry picked from commit fa00eaf013a1787f0523559595a1a73ab469de83) --- resolve.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/resolve.c b/resolve.c index a106315..782c15a 100644 --- a/resolve.c +++ b/resolve.c @@ -1017,7 +1017,7 @@ char naptr_get_sip_proto(struct naptr_rdata* n) proto=-1; - if ((n->flags_len!=1) || (*n->flags!='s')) + if ((n->flags_len!=1) || ((*n->flags | 0x20 )!='s')) return -1; if (n->regexp_len!=0) return -1;

12 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2011