sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: msilo: set table before doing db query
by Daniel-Constantin Mierla 09 Apr '12

09 Apr '12

Module: sip-router Branch: master Commit: cebdb3730f1411401d0fa171947034d01caef212 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cebdb37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 9 16:33:44 2012 +0200 msilo: set table before doing db query - cope with db_cluster module, reported by Juha Heinanen --- modules_k/msilo/msilo.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index e849fc7..12e6fe0 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1061,6 +1061,12 @@ static int m_dump(struct sip_msg* msg, str* owner_s) goto error; } + if (msilo_dbf.use_table(db_con, &ms_db_table) < 0) + { + LM_ERR("failed to use_table\n"); + return -1; + } + if (msilo_dbf.query(db_con,db_keys,db_ops,db_vals,db_cols,db_no_keys, db_no_cols, ob_key, &db_res) < 0) { LM_ERR("failed to query database\n"); @@ -1211,6 +1217,11 @@ void m_clean_silo(unsigned int ticks, void *param) msg_list_check(ml); mle = p = msg_list_reset(ml); n = 0; + if (msilo_dbf.use_table(db_con, &ms_db_table) < 0) + { + LM_ERR("failed to use_table\n"); + return; + } while(p) { if(p->flag & MS_MSG_DONE)

1 0

git:master: modules:tm Other function declaration fixes
by Marius Zbihlei 09 Apr '12

09 Apr '12

Module: sip-router Branch: master Commit: 5b9c3547c42ae2273504a84538fa12f1f0a5ff17 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b9c354… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Apr 9 11:41:42 2012 +0300 modules:tm Other function declaration fixes Functions in C musn't be declered with an empty parameter list, as (...) is assumed by compiler, resulting in poorly optimized calls --- modules/tm/dlg.h | 2 +- modules/tm/h_table.h | 6 +++--- modules/tm/lock.h | 4 ++-- modules/tm/select.h | 2 +- modules/tm/t_fifo.h | 2 +- modules/tm/t_funcs.h | 2 +- modules/tm/t_fwd.h | 6 +++--- modules/tm/t_hooks.h | 4 ++-- modules/tm/t_lookup.h | 12 ++++++------ modules/tm/t_reply.h | 12 ++++++------ modules/tm/t_stats.h | 12 ++++++------ 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/modules/tm/dlg.h b/modules/tm/dlg.h index 69452d4..5efa3b2 100644 --- a/modules/tm/dlg.h +++ b/modules/tm/dlg.h @@ -232,7 +232,7 @@ int register_dlg_tmcb(int type, dlg_t* dlg, transaction_cb f, void* param); void run_trans_dlg_callbacks(dlg_t* dlg, struct cell* trans, struct retr_buf* rbuf); /* cleanup on exit */ -void destroy_new_dlg_cbs(); +void destroy_new_dlg_cbs(void); typedef int (*register_new_dlg_cb_f)(int, dialog_cb, void*); typedef int (*register_dlg_tmcb_f)(int, dlg_t*, transaction_cb, void*); diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 7ee089e..0d7f163 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -520,15 +520,15 @@ extern struct s_table* _tm_table; /* private internal stuff, don't touch void reset_kr(void); void set_kr( enum kill_reason kr ); -enum kill_reason get_kr(); +enum kill_reason get_kr(void); #define get_tm_table() (_tm_table) typedef struct s_table* (*tm_get_table_f)(void); struct s_table* tm_get_table(void); -struct s_table* init_hash_table(); -void free_hash_table( ); +struct s_table* init_hash_table(void); +void free_hash_table(void); void free_cell( struct cell* dead_cell ); struct cell* build_cell( struct sip_msg* p_msg ); diff --git a/modules/tm/lock.h b/modules/tm/lock.h index 52ccf13..ee06cab 100644 --- a/modules/tm/lock.h +++ b/modules/tm/lock.h @@ -62,8 +62,8 @@ typedef struct { -int lock_initialize(); -void lock_cleanup(); +int lock_initialize(void); +void lock_cleanup(void); #ifdef DBG_LOCK #define lock(_s) _lock( (_s), __FILE__, __FUNCTION__, __LINE__ ) diff --git a/modules/tm/select.h b/modules/tm/select.h index bfdcd04..c4e7739 100644 --- a/modules/tm/select.h +++ b/modules/tm/select.h @@ -31,7 +31,7 @@ #define _T_SELECT_H -int tm_init_selects(); +int tm_init_selects(void); #endif diff --git a/modules/tm/t_fifo.h b/modules/tm/t_fifo.h index 9e46393..973dfd7 100644 --- a/modules/tm/t_fifo.h +++ b/modules/tm/t_fifo.h @@ -42,7 +42,7 @@ int fixup_t_write( void** param, int param_no); int parse_tw_append( modparam_t type, void* val); -int init_twrite_lines(); +int init_twrite_lines(void); int init_twrite_sock(void); diff --git a/modules/tm/t_funcs.h b/modules/tm/t_funcs.h index 1cb3ca7..940e843 100644 --- a/modules/tm/t_funcs.h +++ b/modules/tm/t_funcs.h @@ -190,7 +190,7 @@ int fr_inv_avp2timer(unsigned int* timer); -void tm_shutdown(); +void tm_shutdown(void); /* function returns: diff --git a/modules/tm/t_fwd.h b/modules/tm/t_fwd.h index 0484c5d..34a1d2a 100644 --- a/modules/tm/t_fwd.h +++ b/modules/tm/t_fwd.h @@ -48,11 +48,11 @@ enum unmatched_cancel_t { UM_CANCEL_STATEFULL=0, UM_CANCEL_STATELESS, UM_CANCEL_DROP }; typedef int (*tfwd_f)(struct sip_msg* p_msg , struct proxy_l * proxy ); -typedef int (*taddblind_f)( /*struct cell *t */ ); +typedef int (*taddblind_f)( /*struct cell *t */ void); typedef int (*treplicate_uri_f)(struct sip_msg* p_msg , str *suri ); void t_on_branch(unsigned int go_to); -unsigned int get_on_branch(); +unsigned int get_on_branch(void); int t_replicate_uri(struct sip_msg *p_msg, str *suri); int t_replicate(struct sip_msg *p_msg, struct proxy_l * proxy, int proto); /* -- not use outside t_fwd.c for noe @@ -70,7 +70,7 @@ int add_uac_dns_fallback( struct cell *t, struct sip_msg* msg, struct ua_client* old_uac, int lock_replies); #endif -int add_blind_uac( /* struct cell *t */ ); +int add_blind_uac(/* struct cell *t */ void); int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, struct proxy_l * p, int proto); int t_forward_cancel(struct sip_msg* p_msg , struct proxy_l * proxy, diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index 37ae4b8..9646c11 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -427,9 +427,9 @@ void set_early_tmcb_list(struct sip_msg *msg, ( local_req_in_tmcb_hl->first!=0 ) -int init_tmcb_lists(); +int init_tmcb_lists(void); -void destroy_tmcb_lists(); +void destroy_tmcb_lists(void); /* register a callback for several types of events */ diff --git a/modules/tm/t_lookup.h b/modules/tm/t_lookup.h index 6fc1ba6..32a9e8a 100644 --- a/modules/tm/t_lookup.h +++ b/modules/tm/t_lookup.h @@ -54,7 +54,7 @@ extern unsigned int global_msg_id; -void init_t(); +void init_t(void); int init_rb( struct retr_buf *rb, struct sip_msg *msg ); typedef struct cell* (*tlookup_original_f)( struct sip_msg* p_msg ); @@ -85,8 +85,8 @@ int t_check(struct sip_msg* , int *branch ); int t_check_msg(struct sip_msg* , int *branch ); typedef struct cell * (*tgett_f)(void); -struct cell *get_t(); -int get_t_branch(); +struct cell *get_t(void); +int get_t_branch(void); /* use carefully or better not at all -- current transaction is * primarily set by lookup functions */ @@ -111,14 +111,14 @@ int t_lookup_ident(struct cell** trans, unsigned int hash_index, unsigned int la int t_lookup_callid(struct cell** trans, str callid, str cseq); int t_set_fr(struct sip_msg* msg, unsigned int fr_inv_to, unsigned int fr_to ); -int t_reset_fr(); +int t_reset_fr(void); #ifdef TM_DIFF_RT_TIMEOUT int t_set_retr(struct sip_msg* msg, unsigned int t1_to, unsigned int t2_to); -int t_reset_retr(); +int t_reset_retr(void); #endif int t_set_max_lifetime(struct sip_msg* msg, unsigned int eol_inv, unsigned int eol_noninv); -int t_reset_max_lifetime(); +int t_reset_max_lifetime(void); #ifdef WITH_AS_SUPPORT /** diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 1fe81ad..3ebbd73 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -165,9 +165,9 @@ typedef int (*run_failure_handlers_f)(struct cell*, struct sip_msg*, int, int); /* Retransmits the last sent inbound reply. * Returns -1 - error * 1 - OK - */ -int t_retransmit_reply( /* struct sip_msg * */ ); - + + *int t_retransmit_reply(struct sip_msg *); +*/ /* send a UAS reply * Warning: 'buf' and 'len' should already have been build. @@ -208,13 +208,13 @@ void on_negative_reply( struct cell* t, struct sip_msg* msg, replies arrive */ void t_on_negative( unsigned int go_to ); -unsigned int get_on_negative(); +unsigned int get_on_negative(void); void t_on_reply( unsigned int go_to ); -unsigned int get_on_reply(); +unsigned int get_on_reply(void); int t_retransmit_reply( struct cell *t ); -void tm_init_tags(); +void tm_init_tags(void); /* selects the branch for fwd-ing the reply */ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code); diff --git a/modules/tm/t_stats.h b/modules/tm/t_stats.h index 33fb9fa..1c4c094 100644 --- a/modules/tm/t_stats.h +++ b/modules/tm/t_stats.h @@ -72,19 +72,19 @@ union t_stats{ extern union t_stats *tm_stats; #ifdef TM_MORE_STATS -inline void static t_stats_created() +inline void static t_stats_created(void) { /* keep it in process's piece of shmem */ tm_stats[process_no].s.t_created++; } -inline void static t_stats_freed() +inline void static t_stats_freed(void) { /* keep it in process's piece of shmem */ tm_stats[process_no].s.t_freed++; } -inline void static t_stats_delayed_free() +inline void static t_stats_delayed_free(void) { /* keep it in process's piece of shmem */ tm_stats[process_no].s.delayed_free++; @@ -104,7 +104,7 @@ inline void static t_stats_new(int local) if(local) tm_stats[process_no].s.client_transactions++; } -inline void static t_stats_wait() +inline void static t_stats_wait(void) { /* keep it in process's piece of shmem */ tm_stats[process_no].s.waiting++; @@ -130,7 +130,7 @@ inline static void update_reply_stats( int code ) { } -inline void static t_stats_replied_locally() +inline void static t_stats_replied_locally(void) { tm_stats[process_no].s.replied_locally++; } @@ -139,7 +139,7 @@ inline void static t_stats_replied_locally() int init_tm_stats(void); int init_tm_stats_child(void); -void free_tm_stats(); +void free_tm_stats(void); void tm_rpc_stats(rpc_t* rpc, void* c);

1 0

git:master: core: allow send() without parameters
by Daniel-Constantin Mierla 06 Apr '12

06 Apr '12

Module: sip-router Branch: master Commit: 8e4db808bf9f94d3ccf0f14ed22e75586afd0f23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8e4db80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 6 14:42:44 2012 +0200 core: allow send() without parameters - will use r-uri/dst-uri to send the msg buffer --- action.c | 47 ++++++++++++++++++++++++++++++++++++++--------- cfg.y | 2 ++ 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/action.c b/action.c index ec7df6f..5263f02 100644 --- a/action.c +++ b/action.c @@ -485,15 +485,45 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) break; case SEND_T: case SEND_TCP_T: - if ((a->val[0].type!= PROXY_ST)|(a->val[1].type!=NUMBER_ST)){ - LOG(L_CRIT, "BUG: do_action: bad send() types %d, %d\n", - a->val[0].type, a->val[1].type); - ret=E_BUG; - goto error; + if (a->val[0].type==URIHOST_ST){ + /*get next hop uri uri*/ + if (msg->dst_uri.len) { + ret = parse_uri(msg->dst_uri.s, msg->dst_uri.len, + &next_hop); + u = &next_hop; + } else { + ret = parse_sip_msg_uri(msg); + u = &msg->parsed_uri; + } + + if (ret<0) { + LM_ERR("send() - bad_uri dropping packet\n"); + ret=E_BUG; + goto error; + } + /* init dst */ + init_dest_info(&dst); + ret = sip_hostport2su(&dst.to, &u->host, u->port_no, + &dst.proto); + if(ret!=0) { + LM_ERR("failed to resolve [%.*s]\n", u->host.len, + ZSW(u->host.s)); + ret=E_BUG; + goto error; + } + } else { + if ((a->val[0].type!= PROXY_ST)|(a->val[1].type!=NUMBER_ST)){ + LOG(L_CRIT, "BUG: do_action: bad send() types %d, %d\n", + a->val[0].type, a->val[1].type); + ret=E_BUG; + goto error; + } + /* init dst */ + init_dest_info(&dst); + ret=proxy2su(&dst.to, (struct proxy_l*)a->val[0].u.data); + if(ret==0) + proxy_mark((struct proxy_l*)a->val[0].u.data, ret); } - /* init dst */ - init_dest_info(&dst); - ret=proxy2su(&dst.to, (struct proxy_l*)a->val[0].u.data); if (ret==0){ if (p_onsend){ tmp=p_onsend->buf; @@ -524,7 +554,6 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=E_BUG; goto error; } - proxy_mark((struct proxy_l*)a->val[0].u.data, ret); if (ret>=0) ret=1; break; diff --git a/cfg.y b/cfg.y index 99f77a6..1c62c10 100644 --- a/cfg.y +++ b/cfg.y @@ -3154,6 +3154,7 @@ cmd: | FORWARD_SCTP error { $$=0; yyerror("missing '(' or ')' ?"); } | FORWARD_SCTP LPAREN error RPAREN { $$=0; yyerror("bad forward_tls argument"); } + | SEND LPAREN RPAREN { $$=mk_action(SEND_T, 2, URIHOST_ST, 0, URIPORT_ST, 0); set_cfg_pos($$); } | SEND LPAREN host RPAREN { $$=mk_action(SEND_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | SEND LPAREN STRING RPAREN { $$=mk_action(SEND_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | SEND LPAREN ip RPAREN { $$=mk_action(SEND_T, 2, IP_ST, (void*)$3, NUMBER_ST, 0); set_cfg_pos($$); } @@ -3162,6 +3163,7 @@ cmd: | SEND LPAREN ip COMMA NUMBER RPAREN { $$=mk_action(SEND_T, 2, IP_ST, (void*)$3, NUMBER_ST, (void*)$5); set_cfg_pos($$); } | SEND error { $$=0; yyerror("missing '(' or ')' ?"); } | SEND LPAREN error RPAREN { $$=0; yyerror("bad send argument"); } + | SEND_TCP LPAREN RPAREN { $$=mk_action(SEND_TCP_T, 2, URIHOST_ST, 0, URIPORT_ST, 0); set_cfg_pos($$); } | SEND_TCP LPAREN host RPAREN { $$=mk_action(SEND_TCP_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | SEND_TCP LPAREN STRING RPAREN { $$=mk_action(SEND_TCP_T, 2, STRING_ST, $3, NUMBER_ST, 0); set_cfg_pos($$); } | SEND_TCP LPAREN ip RPAREN { $$=mk_action(SEND_TCP_T, 2, IP_ST, (void*)$3, NUMBER_ST, 0); set_cfg_pos($$); }

1 0

git:master: msrp: init dst info struct before parsing uri
by Daniel-Constantin Mierla 06 Apr '12

06 Apr '12

Module: sip-router Branch: master Commit: 321cbd8a3657e1ae455d01fe8dbd2f6354204f60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=321cbd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 6 14:09:30 2012 +0200 msrp: init dst info struct before parsing uri --- modules/msrp/msrp_netio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/msrp/msrp_netio.c b/modules/msrp/msrp_netio.c index c566b31..e636df3 100644 --- a/modules/msrp/msrp_netio.c +++ b/modules/msrp/msrp_netio.c @@ -262,6 +262,8 @@ struct dest_info *msrp_uri_to_dstinfo(struct dns_srv_handle* dns_h, union sockaddr_union to; int err; + init_dest_info(dst); + if (msrp_parse_uri(uri->s, uri->len, &parsed_uri) < 0) { LM_ERR("bad msrp uri: %.*s\n", uri->len, uri->s ); return 0; @@ -273,7 +275,6 @@ struct dest_info *msrp_uri_to_dstinfo(struct dns_srv_handle* dns_h, dst->proto = PROTO_TCP; } - init_dest_info(dst); dst->send_flags=sflags; host=&parsed_uri.host; port = parsed_uri.port_no;

1 0

git:master: modules_k/pua, modules_k/rls: Prevent RLS from performing multiple back-end subscriptions to a presentity for a single RLS subscription
by Peter Dunkley 05 Apr '12

05 Apr '12

Module: sip-router Branch: master Commit: 9cb078da8ff7cba9d2642d949e4e5a10bd851d82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9cb078d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 5 23:21:39 2012 +0100 modules_k/pua, modules_k/rls: Prevent RLS from performing multiple back-end subscriptions to a presentity for a single RLS subscription --- modules_k/pua/hash.c | 2 +- modules_k/pua/pua_db.c | 2 +- modules_k/pua/send_subscribe.c | 9 +---- modules_k/rls/list.h | 13 +++++++- modules_k/rls/subscribe.c | 70 +++++++++++++++++++++++----------------- 5 files changed, 56 insertions(+), 40 deletions(-) diff --git a/modules_k/pua/hash.c b/modules_k/pua/hash.c index fe6d82b..1fa6149 100644 --- a/modules_k/pua/hash.c +++ b/modules_k/pua/hash.c @@ -687,7 +687,7 @@ list_entry_t *get_subs_list(str *did) tmp_str->len = dialog->pres_uri->len; tmp_str->s[tmp_str->len] = '\0'; - list = list_insert(tmp_str, list); + list = list_insert(tmp_str, list, NULL); } dialog = dialog->next; } diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index c9846d0..2bc9e88 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -1560,7 +1560,7 @@ list_entry_t *get_subs_list_puadb(str *did) tmp_str->len = strng.len; tmp_str->s[tmp_str->len] = '\0'; - list = list_insert(tmp_str, list); + list = list_insert(tmp_str, list, NULL); } } while ((db_fetch_next(&pua_dbf, pua_fetch_rows, pua_db, &res)==1) && (RES_ROWS(res)>0)); diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index c88db69..a62ba7c 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -1091,15 +1091,10 @@ insert: if (presentity->to_tag.len == 0) { if (subs->expires > 0) - { - LM_WARN("attempting to re-SUBSCRIBE to temporary (non-established) dialog - skipping\n"); - LM_WARN(" is %.*s in %.*s's contact list more than once?\n", - presentity->pres_uri->len, presentity->pres_uri->s, - presentity->watcher_uri->len, presentity->watcher_uri->s); - } + LM_WARN("attempting to re-SUBSCRIBE to a temporary (non-established) dialog - skipping\n"); else { - LM_WARN("attempting to un-SUBSCRIBE to temporary (non-established) dialog - skipping and deleting dialog\n"); + LM_WARN("attempting to un-SUBSCRIBE from a temporary (non-established) dialog - skipping and deleting dialog\n"); if (dbmode==PUA_DB_ONLY) delete_dialog_puadb(presentity); else diff --git a/modules_k/rls/list.h b/modules_k/rls/list.h index e8580da..c9904aa 100644 --- a/modules_k/rls/list.h +++ b/modules_k/rls/list.h @@ -11,11 +11,14 @@ typedef struct list_entry struct list_entry *next; } list_entry_t; -static inline list_entry_t *list_insert(str *strng, list_entry_t *list) +static inline list_entry_t *list_insert(str *strng, list_entry_t *list, int *duplicate) { int cmp; list_entry_t *p, *q; + if (duplicate != NULL) + *duplicate = 0; + if (strng == NULL || strng->s == NULL || strng->len == 0) { LM_ERR("bad string\n"); @@ -36,7 +39,11 @@ static inline list_entry_t *list_insert(str *strng, list_entry_t *list) cmp = strncmp(list->strng->s, strng->s, strng->len); if (cmp == 0) + { + if (duplicate != NULL) + *duplicate = 1; return list; + } if (cmp > 0) { p->next = list; @@ -49,7 +56,11 @@ static inline list_entry_t *list_insert(str *strng, list_entry_t *list) q = q->next; if (cmp == 0) + { + if (duplicate != NULL) + *duplicate = 1; return list; + } p->next = q->next; q->next = p; diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index c3dc4a2..eadef7a 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -861,8 +861,10 @@ error: int send_resource_subs(char* uri, void* param) { - str pres_uri; + str pres_uri, *tmp_str; struct sip_uri parsed_pres_uri; + int duplicate = 0; + subs_info_t *s = (subs_info_t *) param; pres_uri.s = uri; pres_uri.len = strlen(uri); @@ -877,8 +879,8 @@ int send_resource_subs(char* uri, void* param) { LM_WARN("Unable to subscribe to remote contact %.*s for watcher %.*s\n", pres_uri.len, pres_uri.s, - ((subs_info_t*)param)->watcher_uri->len, - ((subs_info_t*)param)->watcher_uri->s); + s->watcher_uri->len, + s->watcher_uri->s); return 1; } @@ -887,31 +889,33 @@ int send_resource_subs(char* uri, void* param) if (rls_max_backend_subs > 0 && ++counter > rls_max_backend_subs) return 1; - ((subs_info_t*)param)->pres_uri = &pres_uri; - ((subs_info_t*)param)->remote_target = &pres_uri; + s->pres_uri = &pres_uri; + s->remote_target = &pres_uri; - if (((subs_info_t*)param)->internal_update_flag == INTERNAL_UPDATE_TRUE) + /* Build list of contacts... checking each contact exists only once */ + if ((tmp_str = (str *)pkg_malloc(sizeof(str))) == NULL) { - str *tmp_str; - - if ((tmp_str = (str *)pkg_malloc(sizeof(str))) == NULL) - { - LM_ERR("out of private memory\n"); - return -1; - } - if ((tmp_str->s = (char *)pkg_malloc(sizeof(char) * pres_uri.len)) == NULL) - { - pkg_free(tmp_str); - LM_ERR("out of private memory\n"); - return -1; - } - memcpy(tmp_str->s, pres_uri.s, pres_uri.len); - tmp_str->len = pres_uri.len; - - rls_contact_list = list_insert(tmp_str, rls_contact_list); + LM_ERR("out of private memory\n"); + return -1; + } + if ((tmp_str->s = (char *)pkg_malloc(sizeof(char) * pres_uri.len)) == NULL) + { + pkg_free(tmp_str); + LM_ERR("out of private memory\n"); + return -1; + } + memcpy(tmp_str->s, pres_uri.s, pres_uri.len); + tmp_str->len = pres_uri.len; + rls_contact_list = list_insert(tmp_str, rls_contact_list, &duplicate); + if (duplicate != 0) + { + LM_WARN("%.*s has %.*s multiple times in the same resource list\n", + s->watcher_uri->len, s->watcher_uri->s, + s->pres_uri->len, s->pres_uri->s); + return 1; } - return pua_send_subscribe((subs_info_t*)param); + return pua_send_subscribe(s); } /** @@ -964,14 +968,14 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode) s.internal_update_flag = subs->internal_update_flag; - if (subs->internal_update_flag == INTERNAL_UPDATE_TRUE) + if (rls_contact_list != NULL) { - if (rls_contact_list != NULL) - { - LM_WARN("contact list is not empty\n"); - list_free(&rls_contact_list); - } + LM_WARN("contact list is not empty\n"); + list_free(&rls_contact_list); + } + if (subs->internal_update_flag == INTERNAL_UPDATE_TRUE) + { if (rls_subs_list != NULL) { LM_WARN("subscriber list is not empty\n"); @@ -1016,6 +1020,10 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode) pkg_free(tmp_str); } } + else + { + list_free(&rls_contact_list); + } pkg_free(wuri.s); pkg_free(did_str.s); @@ -1027,6 +1035,8 @@ error: pkg_free(wuri.s); if(did_str.s) pkg_free(did_str.s); + if(rls_contact_list) + list_free(&rls_contact_list); return -1; }

1 0

git:master: modules_k/pua: Fixed a DB only mode race condition found during soak testing
by Peter Dunkley 05 Apr '12

05 Apr '12

Module: sip-router Branch: master Commit: 56eec10df95d1887f3818c82884108f3895a8b11 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56eec10… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 5 23:24:01 2012 +0100 modules_k/pua: Fixed a DB only mode race condition found during soak testing --- modules_k/pua/send_subscribe.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index a62ba7c..9b89a4a 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -410,7 +410,6 @@ faked_error: if(ps->code >= 300 || lexpire == 0) { - /* Initial request so dialog is temporary */ hentity->to_tag.s = NULL; hentity->to_tag.len = 0; find_and_delete_dialog(hentity, hash_code); @@ -452,6 +451,8 @@ faked_error: subs_info_t subs; + hentity->to_tag.s = NULL; + hentity->to_tag.len = 0; find_and_delete_dialog(hentity, hash_code); /* Redirect if the response 3XX */

1 0

git:master: modules_k/rls: Made the number of notifier processes in RLS configurable
by Peter Dunkley 05 Apr '12

05 Apr '12

Module: sip-router Branch: master Commit: 2140c307537fc9719ec84d3961c8b955a1b708bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2140c30… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Apr 5 23:27:46 2012 +0100 modules_k/rls: Made the number of notifier processes in RLS configurable - Defaults to 1 - Configurable through a new modparam --- modules_k/rls/README | 188 +++++++++++++++++++++------------------ modules_k/rls/doc/rls_admin.xml | 25 +++++- modules_k/rls/resource_notify.c | 15 ++-- modules_k/rls/rls.c | 40 +++++++-- modules_k/rls/rls.h | 1 + 5 files changed, 167 insertions(+), 102 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=214…

1 0

[tracker] Comment added: to send notification to sender when the offline message is delivered
by sip-router 05 Apr '12

05 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#211 - to send notification to sender when the offline message is delivered User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you attach the patches instead of all files? You included object file a.s.o. In your working directory with kamailio sources do: git diff >../my-desired-name.patch It is easier to review patches. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=211#comment515 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.

1 0

[tracker] Assignee added: to send notification to sender when the offline message is delivered
by sip-router 05 Apr '12

05 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#211 - to send notification to sender when the offline message is delivered User who did this - Krish Kura (KrishKura) http://sip-router.org/tracker/index.php?do=details&task_id=211 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.

1 0

[tracker] Task opened: to send notification to sender when the offline message is delivered (Attachment added)
by sip-router 05 Apr '12

05 Apr '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Krish Kura (KrishKura) Attached to Project - sip-router Summary - to send notification to sender when the offline message is delivered Task Type - Improvement Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - When offline message is delivered, the sender needs to know. Added capability to send NOTIFY with the same callid as the original message to sender. If the sender is offline when the message was delivered, the notifies are delivered along with the messages that were pending for the user. database table "silo" is extended to accommodate the functionality Also, tm is extended to support the ability to create a UAC which callid. Find attached the updated code. I have tested it. MESSAGEs and NOTIFYs are being delivered correctly. Best, Krish Kura One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=211 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.

1 0

← Newer
1
...
28
29
30
31
32
33
34
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2012