sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

git:master: modules/sl: Added event_route[sl:local-response]

by Peter Dunkley

Module: sip-router Branch: master Commit: 3431ea3c2dda8906add5e005e263124a068c7d84 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3431ea3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 6 18:16:38 2012 +0000 modules/sl: Added event_route[sl:local-response] - The same as event_route[tm:local-response] but for stateless responses --- modules/sl/sl_funcs.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/modules/sl/sl_funcs.c b/modules/sl/sl_funcs.c index 67a2836..18d4217 100644 --- a/modules/sl/sl_funcs.c +++ b/modules/sl/sl_funcs.c @@ -58,6 +58,9 @@ #include "../../config.h" #include "../../tags.h" #include "../../parser/parse_to.h" +#include "../../route.h" +#include "../../receive.h" +#include "../../onsend.h" #include "sl_stats.h" #include "sl_funcs.h" #include "sl.h" @@ -130,6 +133,9 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) int backup_mhomed, ret; str text; + int rt, backup_rt; + struct run_act_ctx ctx; + struct sip_msg pmsg; if (msg->first_line.u.request.method_value==METHOD_ACK) goto error; @@ -200,6 +206,89 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) dst.send_flags=msg->rpl_send_flags; ret = msg_send(&dst, buf.s, buf.len); mhomed=backup_mhomed; + + rt = route_lookup(&event_rt, "sl:local-response"); + if (unlikely(rt >= 0 && event_rt.rlist[rt] != NULL)) + { + if (likely(build_sip_msg_from_buf(&pmsg, buf.s, buf.len, + inc_msg_no()) == 0)) + { + char *tmp = NULL; + struct onsend_info onsnd_info; + + onsnd_info.to=&dst.to; + onsnd_info.send_sock=dst.send_sock; + onsnd_info.buf=buf.s; + onsnd_info.len=buf.len; + p_onsend=&onsnd_info; + + if (unlikely(!IS_SIP(msg))) + { + /* This is an HTTP reply... So fudge in a CSeq into the parsed message + message structure so that $rm will work in the route */ + struct hdr_field *hf; + struct cseq_body *cseqb; + char *tmp2; + int len; + + if ((hf = (struct hdr_field *) pkg_malloc(sizeof(struct hdr_field))) == NULL) + { + LM_ERR("out of package memory\n"); + goto event_route_error; + } + + if ((cseqb = (struct cseq_body *) pkg_malloc(sizeof(struct cseq_body))) == NULL) + { + LM_ERR("out of package memory\n"); + pkg_free(hf); + goto event_route_error; + } + + if ((tmp = (char *) pkg_malloc(sizeof(char) * (msg->first_line.u.request.method.len + 5))) == NULL) + { + LM_ERR("out of package memory\n"); + pkg_free(cseqb); + pkg_free(hf); + goto event_route_error; + } + + memset(hf, 0, sizeof(struct hdr_field)); + memset(cseqb, 0, sizeof(struct cseq_body)); + + len = sprintf(tmp, "0 %.*s\r\n", msg->first_line.u.request.method.len, msg->first_line.u.request.method.s); + tmp2 = parse_cseq(tmp, &tmp[len], cseqb); + + hf->type = HDR_CSEQ_T; + hf->body.s = tmp; + hf->body.len = tmp2 - tmp; + hf->parsed = cseqb; + + pmsg.parsed_flag|=HDR_CSEQ_F; + pmsg.cseq = hf; + if (pmsg.last_header==0) { + pmsg.headers=hf; + pmsg.last_header=hf; + } else { + pmsg.last_header->next=hf; + pmsg.last_header=hf; + } + } + + backup_rt = get_route_type(); + set_route_type(LOCAL_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], &pmsg, 0); + set_route_type(backup_rt); + p_onsend=0; + + if (tmp != NULL) + pkg_free(tmp); + +event_route_error: + free_sip_msg(&pmsg); + } + } + pkg_free(buf.s); if (ret<0) {

12 years, 2 months

git:master: core: Changed HTTP_REPLY_HACK from a compile-time to a run-time option

by Peter Dunkley

Module: sip-router Branch: master Commit: c7151212056136c87265571624e7e15dd8c18978 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c715121… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 6 18:33:42 2012 +0000 core: Changed HTTP_REPLY_HACK from a compile-time to a run-time option - By default it is off, to turn it on set http_reply_hack=yes in kamailio.cfg - You need to turn this on if you use xhttp _and_ event_route[sl:local-response]. This is because HTTP responses are stateless responses and when the event_route is run it has to parse the response. Without HTTP_REPLY_HACK Kamailio can't actually parse HTTP responses. --- cfg.lex | 3 +++ cfg.y | 3 +++ globals.h | 1 + parser/parse_fline.c | 36 +++++++++++++++--------------------- ver_defs.h | 10 ++-------- 5 files changed, 24 insertions(+), 29 deletions(-) diff --git a/cfg.lex b/cfg.lex index 68766d1..00a55e0 100644 --- a/cfg.lex +++ b/cfg.lex @@ -494,6 +494,7 @@ KILL_TIMEOUT "exit_timeout"|"ser_kill_timeout" MAX_WLOOPS "max_while_loops" PVBUFSIZE "pv_buffer_size" PVBUFSLOTS "pv_buffer_slots" +HTTP_REPLY_HACK "http_reply_hack" /* stun config variables */ STUN_REFRESH_INTERVAL "stun_refresh_interval" @@ -961,6 +962,8 @@ IMPORTFILE "import_file" return PVBUFSIZE; } <INITIAL>{PVBUFSLOTS} { count(); yylval.strval=yytext; return PVBUFSLOTS; } +<INITIAL>{HTTP_REPLY_HACK} { count(); yylval.strval=yytext; + return HTTP_REPLY_HACK; } <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } <INITIAL>{LOADMODULE} { count(); yylval.strval=yytext; return LOADMODULE; } diff --git a/cfg.y b/cfg.y index 0e684c1..9edd0fde 100644 --- a/cfg.y +++ b/cfg.y @@ -556,6 +556,7 @@ extern char *finame; %token MAX_WLOOPS %token PVBUFSIZE %token PVBUFSLOTS +%token HTTP_REPLY_HACK %token CFG_DESCRIPTION %token SERVER_ID @@ -1661,6 +1662,8 @@ assign_stm: | PVBUFSIZE EQUAL error { yyerror("number expected"); } | PVBUFSLOTS EQUAL NUMBER { pv_set_buffer_slots($3); } | PVBUFSLOTS EQUAL error { yyerror("number expected"); } + | HTTP_REPLY_HACK EQUAL NUMBER { http_reply_hack=$3; } + | HTTP_REPLY_HACK EQUAL error { yyerror("boolean value expected"); } | STUN_REFRESH_INTERVAL EQUAL NUMBER { IF_STUN(stun_refresh_interval=$3); } | STUN_REFRESH_INTERVAL EQUAL error{ yyerror("number expected"); } | STUN_ALLOW_STUN EQUAL NUMBER { IF_STUN(stun_allow_stun=$3); } diff --git a/globals.h b/globals.h index 39c3616..49b8345 100644 --- a/globals.h +++ b/globals.h @@ -213,6 +213,7 @@ extern int rt_timer2_prio; /* "slow" timer */ extern int rt_timer1_policy; /* "fast" timer, SCHED_OTHER */ extern int rt_timer2_policy; /* "slow" timer, SCHED_OTHER */ +extern int http_reply_hack; #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ diff --git a/parser/parse_fline.c b/parser/parse_fline.c index 48ab09b..15a1a7a 100644 --- a/parser/parse_fline.c +++ b/parser/parse_fline.c @@ -48,12 +48,7 @@ #include "../mem/mem.h" #include "../ut.h" - -#ifdef NO_HTTP_REPLY_HACK -#undef HTTP_REPLY_HACK -#else -/* #define HTTP_REPLY_HACK */ /* allow HTTP replies */ -#endif +int http_reply_hack = 0; /* grammar: request = method SP uri SP version CRLF @@ -106,21 +101,20 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl) fl->type=SIP_REPLY; fl->u.reply.version.len=SIP_VERSION_LEN; tmp=buffer+SIP_VERSION_LEN; -#ifdef HTTP_REPLY_HACK - }else if ( (*tmp=='H' || *tmp=='h') && - /* 'HTTP/1.' */ - strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 && - /* [0|1] */ - ((*(tmp+HTTP_VERSION_LEN)=='0') || (*(tmp+HTTP_VERSION_LEN)=='1')) && - (*(tmp+HTTP_VERSION_LEN+1)==' ') ){ - /* ugly hack to be able to route http replies - * Note: - the http reply must have a via - * - the message is marked as SIP_REPLY (ugly) - */ - fl->type=SIP_REPLY; - fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/; - tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */; -#endif + } else if (http_reply_hack != 0 && + (*tmp=='H' || *tmp=='h') && + /* 'HTTP/1.' */ + strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 && + /* [0|1] */ + ((*(tmp+HTTP_VERSION_LEN)=='0') || (*(tmp+HTTP_VERSION_LEN)=='1')) && + (*(tmp+HTTP_VERSION_LEN+1)==' ') ){ + /* ugly hack to be able to route http replies + * Note: - the http reply must have a via + * - the message is marked as SIP_REPLY (ugly) + */ + fl->type=SIP_REPLY; + fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/; + tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */; } else IFISMETHOD( INVITE, 'I' ) else IFISMETHOD( CANCEL, 'C') else IFISMETHOD( ACK, 'A' ) diff --git a/ver_defs.h b/ver_defs.h index 1284881..957bb69 100644 --- a/ver_defs.h +++ b/ver_defs.h @@ -303,12 +303,6 @@ #define HAVE_RESOLV_RES_STR "" #endif -#ifdef HTTP_REPLY_HACK -#define HTTP_REPLY_HACK_STR ", HTTP_REPLY_HACK" -#else -#define HTTP_REPLY_HACK_STR "" -#endif - #ifdef QM_JOIN_FREE #define QM_JOIN_FREE_STR ", QM_JOIN_FREE" #else @@ -353,8 +347,8 @@ FAST_LOCK_STR NOSMP_STR USE_PTHREAD_MUTEX_STR USE_POSIX_SEM_STR \ USE_SYSV_SEM_STR USE_COMP_STR USE_DNS_CACHE_STR USE_DNS_FAILOVER_STR \ DNS_WATCHDOG_SUPPORT_STR USE_NAPTR_STR USE_DST_BLACKLIST_STR \ - HAVE_RESOLV_RES_STR HTTP_REPLY_HACK_STR SYSLOG_CALLBACK_SUPPORT_STR \ - MYSQL_FAKE_NULL_STR USE_DST_BLACKLIST_STATS_STR USE_DNS_CACHE_STATS_STR + HAVE_RESOLV_RES_STR SYSLOG_CALLBACK_SUPPORT_STR MYSQL_FAKE_NULL_STR \ + USE_DST_BLACKLIST_STATS_STR USE_DNS_CACHE_STATS_STR #endif

12 years, 2 months

git:master: modules_k/rls: Bugfix in RLS. NOTIFYs from RLS for presence changes have wrong expires value

by Peter Dunkley

Module: sip-router Branch: master Commit: ce8530af0700a1d9b9890c6b1aef816e018daade URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce8530a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 6 18:05:49 2012 +0000 modules_k/rls: Bugfix in RLS. NOTIFYs from RLS for presence changes have wrong expires value - The expires parameter in the Subscription-State: header was a UNIX time rather than an offset. --- modules_k/rls/resource_notify.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 382d8d9..df40e82 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -127,9 +127,9 @@ void get_dialog_from_did(char* did, subs_t **dialog, unsigned int *hash_code) *dialog= pres_copy_subs(s, PKG_MEM_TYPE); } - if(*dialog== NULL) + if(*dialog== NULL) { - LM_ERR("while copying subs_t structure\n"); + LM_ERR("while copying subs_t structure\n"); } else { @@ -138,7 +138,8 @@ void get_dialog_from_did(char* did, subs_t **dialog, unsigned int *hash_code) if (dbmode != RLS_DB_ONLY) lock_release(&rls_table[*hash_code].lock); - + + (*dialog)->expires -= (int)time(NULL); } int send_notify(xmlDocPtr * rlmi_doc, char * buf, int buf_len, @@ -880,7 +881,7 @@ void timer_send_notify(unsigned int ticks,void *param) goto error; } - send_notifies(result, did_col, resource_uri_col, auth_state_col, reason_col, + send_notifies(result, did_col, resource_uri_col, auth_state_col, reason_col, pres_state_col, content_type_col); error: done:

12 years, 2 months

git:master: modules/tm: Added event_route[tm:local-response]

by Peter Dunkley

Module: sip-router Branch: master Commit: 74a13d86340de56602f31c6a8bf9536ee0123911 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74a13d8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 6 18:13:56 2012 +0000 modules/tm: Added event_route[tm:local-response] - Event route that is run (immediately after) sending a locally generated, transaction stateful, response. - Because the response has already been sent there is no point trying to change anything in this event_route. --- modules/tm/t_reply.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index e8a8d6a..0e8de0b 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -152,6 +152,8 @@ #include "t_fwd.h" #include "../../fix_lumps.h" #include "../../sr_compat.h" +#include "../../receive.h" +#include "../../onsend.h" #include "t_stats.h" #include "uac.h" @@ -565,6 +567,9 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, unsigned int buf_len; struct cancel_info cancel_data; struct tmcb_params onsend_params; + int rt, backup_rt; + struct run_act_ctx ctx; + struct sip_msg pmsg; init_cancel_info(&cancel_data); if (!buf) @@ -668,6 +673,31 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, run_trans_callbacks_off_params(TMCB_RESPONSE_SENT, trans, &onsend_params); } + + rt = route_lookup(&event_rt, "tm:local-response"); + if (unlikely(rt >= 0 && event_rt.rlist[rt] != NULL)) + { + if (likely(build_sip_msg_from_buf(&pmsg, buf, len, inc_msg_no()) == 0)) + { + struct onsend_info onsnd_info; + + onsnd_info.to=&(trans->uas.response.dst.to); + onsnd_info.send_sock=trans->uas.response.dst.send_sock; + onsnd_info.buf=buf; + onsnd_info.len=len; + p_onsend=&onsnd_info; + + backup_rt = get_route_type(); + set_route_type(LOCAL_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], &pmsg, 0); + set_route_type(backup_rt); + p_onsend=0; + + free_sip_msg(&pmsg); + } + } + } DBG("DEBUG: reply sent out. buf=%p: %.20s..., shmem=%p: %.20s\n", buf, buf, rb->buffer, rb->buffer );

12 years, 2 months

git:master: modules_k/statistics: update_stat() can now be called from ANY_ROUTE

by Peter Dunkley

Module: sip-router Branch: master Commit: f7fd425060a5b4d76fca787ba5938d2658f0e64a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7fd425… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 6 17:58:05 2012 +0000 modules_k/statistics: update_stat() can now be called from ANY_ROUTE --- modules_k/statistics/README | 3 +-- modules_k/statistics/doc/statistics_admin.xml | 3 +-- modules_k/statistics/statistics.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules_k/statistics/README b/modules_k/statistics/README index 1bb8659..0554add 100644 --- a/modules_k/statistics/README +++ b/modules_k/statistics/README @@ -109,8 +109,7 @@ modparam("statistics", "variable", "active_calls/no_reset") pseudovariable); * value - value to update with; it may be also negative. - This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, - FAILURE_ROUTE and ONREPLY_ROUTE. + This function can be used from ANY_ROUTE. Example 1.2. update_stat usage ... diff --git a/modules_k/statistics/doc/statistics_admin.xml b/modules_k/statistics/doc/statistics_admin.xml index ffbe622..fb003f6 100644 --- a/modules_k/statistics/doc/statistics_admin.xml +++ b/modules_k/statistics/doc/statistics_admin.xml @@ -105,8 +105,7 @@ modparam("statistics", "variable", "active_calls/no_reset") </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, - FAILURE_ROUTE and ONREPLY_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>update_stat</function> usage</title> diff --git a/modules_k/statistics/statistics.c b/modules_k/statistics/statistics.c index 9cf0bcb..7aabe50 100644 --- a/modules_k/statistics/statistics.c +++ b/modules_k/statistics/statistics.c @@ -56,7 +56,7 @@ struct stat_or_pv { static cmd_export_t cmds[]={ {"update_stat", (cmd_function)w_update_stat, 2, fixup_stat, 0, - REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"reset_stat", (cmd_function)w_reset_stat, 1, fixup_stat, 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {0,0,0,0,0,0}

12 years, 2 months

git:master: modules/tm: Filled in the $snd() structure for event_route[tm: local-request]

by Peter Dunkley

Module: sip-router Branch: master Commit: 43e7274cad12535fc20d0e669d87939c1c18f399 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43e7274… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Mar 6 18:10:13 2012 +0000 modules/tm: Filled in the $snd() structure for event_route[tm:local-request] --- modules/tm/uac.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 525ca0d..c1f8256 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -86,6 +86,7 @@ #include "../../receive.h" #include "../../route.h" #include "../../action.h" +#include "../../onsend.h" #include "t_lookup.h" #endif @@ -349,6 +350,8 @@ static inline int t_uac_prepare(uac_req_t *uac_r, LM_ERR("failed to set dst_uri"); free_sip_msg(&lreq); } else { + struct onsend_info onsnd_info; + lreq.force_send_socket = uac_r->dialog->send_sock; lreq.rcv.proto = dst.send_sock->proto; lreq.rcv.src_ip = dst.send_sock->address; @@ -363,6 +366,12 @@ static inline int t_uac_prepare(uac_req_t *uac_r, sflag_bk = getsflags(); tm_xdata_swap(new_cell, &backup_xd, 0); + onsnd_info.to=&dst.to; + onsnd_info.send_sock=dst.send_sock; + onsnd_info.buf=buf; + onsnd_info.len=buf_len; + p_onsend=&onsnd_info; + /* run the route */ backup_route_type = get_route_type(); set_route_type(LOCAL_ROUTE); @@ -378,6 +387,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, set_t(backup_t, backup_branch); global_msg_id=backup_msgid; set_route_type( backup_route_type ); + p_onsend=0; /* restore original environment */ tm_xdata_swap(new_cell, &backup_xd, 1);

12 years, 2 months

git:master: modules_k/presence Fix and improvement for subscribe updates

by Anca Vamanu

Module: sip-router Branch: master Commit: 23cddf4220439be35ccb00c9056d802d32b9bc6f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=23cddf4… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Tue Mar 6 18:38:11 2012 +0200 modules_k/presence Fix and improvement for subscribe updates Fix: wrong Cseq for Notify for terminated Subscription in some DB modes Improvement: When DB mode is DB_ONLY do only one update in active_watchers when processing one Subscribe(instead of 2) --- modules_k/presence/hash.c | 2 +- modules_k/presence/notify.c | 47 +++------------------------------------ modules_k/presence/subscribe.c | 47 ++++++++++++++++++++++----------------- modules_k/presence/subscribe.h | 5 +-- 4 files changed, 33 insertions(+), 68 deletions(-) diff --git a/modules_k/presence/hash.c b/modules_k/presence/hash.c index 87b0908..4208fd2 100644 --- a/modules_k/presence/hash.c +++ b/modules_k/presence/hash.c @@ -346,7 +346,7 @@ int update_shtable(shtable_t htable,unsigned int hash_code, else { subs->local_cseq = ++s->local_cseq; - s->version = ++subs->version; + subs->version = ++s->version; } if(strncmp(s->contact.s, subs->contact.s, subs->contact.len)) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 4527b5a..52cb958 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -1150,13 +1150,13 @@ int get_subs_db(str* pres_uri, pres_ev_t* event, str* sender, s.local_contact.len = s.local_contact.s?strlen(s.local_contact.s):0; s.event= event; - s.local_cseq = row_vals[cseq_col].val.int_val; + s.local_cseq = row_vals[cseq_col].val.int_val +1; if(row_vals[expires_col].val.int_val < (int)time(NULL)) s.expires = 0; else s.expires = row_vals[expires_col].val.int_val - (int)time(NULL); - s.version = row_vals[version_col].val.int_val; + s.version = row_vals[version_col].val.int_val +1; s_new= mem_copy_subs(&s, PKG_MEM_TYPE); if(s_new== NULL) @@ -1182,46 +1182,6 @@ error: return -1; } -int update_in_list(subs_t* s, subs_t* s_array, int new_rec_no, int n) -{ - int i= 0; - subs_t* ls; - - ls= s_array; - - while(i< new_rec_no) - { - i++; - ls= ls->next; - } - - for(i = 0; i< n; i++) - { - if(ls== NULL) - { - LM_ERR("wrong records count\n"); - return -1; - } - printf_subs(ls); - - if(ls->callid.len== s->callid.len && - strncmp(ls->callid.s, s->callid.s, s->callid.len)== 0 && - ls->to_tag.len== s->to_tag.len && - strncmp(ls->to_tag.s, s->to_tag.s, s->to_tag.len)== 0 && - ls->from_tag.len== s->from_tag.len && - strncmp(ls->from_tag.s, s->from_tag.s, s->from_tag.len)== 0 ) - { - ls->local_cseq= s->local_cseq; - ls->expires= s->expires- (int)time(NULL); - ls->version= s->version; - ls->status= s->status; - return 1; - } - ls= ls->next; - } - return -1; -} - subs_t* get_subs_dialog(str* pres_uri, pres_ev_t* event, str* sender) { unsigned int hash_code; @@ -1600,7 +1560,8 @@ int notify(subs_t* subs, subs_t * watcher_subs,str* n_body,int force_null_body) } } /* if DB_ONLY mode or WRITE_THROUGH update in database */ - if(subs_dbmode == DB_ONLY || subs_dbmode == WRITE_THROUGH) + if(subs->recv_event!=PRES_SUBSCRIBE_RECV && + (subs_dbmode == DB_ONLY || subs_dbmode == WRITE_THROUGH)) { LM_DBG("updating subscription to database\n"); if(update_subs_db(subs, LOCAL_TYPE)< 0) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 39f649f..7e45a9b 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -326,8 +326,8 @@ int insert_subs_db(subs_t* s, int type) int update_subs_db(subs_t* subs, int type) { - db_key_t query_cols[3], update_keys[4]; - db_val_t query_vals[3], update_vals[4]; + db_key_t query_cols[3], update_keys[6]; + db_val_t query_vals[3], update_vals[6]; int n_update_cols= 0; int n_query_cols = 0; @@ -363,18 +363,18 @@ int update_subs_db(subs_t* subs, int type) update_vals[n_update_cols].val.int_val = subs->remote_cseq; n_update_cols++; } - else - { + if(type & LOCAL_TYPE) + { update_keys[n_update_cols] = &str_local_cseq_col; update_vals[n_update_cols].type = DB1_INT; update_vals[n_update_cols].nul = 0; - update_vals[n_update_cols].val.int_val = subs->local_cseq+ 1; + update_vals[n_update_cols].val.int_val = subs->local_cseq; n_update_cols++; update_keys[n_update_cols] = &str_version_col; update_vals[n_update_cols].type = DB1_INT; update_vals[n_update_cols].nul = 0; - update_vals[n_update_cols].val.int_val = subs->version+ 1; + update_vals[n_update_cols].val.int_val = subs->version; n_update_cols++; } @@ -425,6 +425,7 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, { unsigned int hash_code; + LM_DBG("update subscription\n"); printf_subs(subs); *sent_reply= 0; @@ -489,7 +490,7 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, if(subs_dbmode == DB_ONLY || subs_dbmode== WRITE_THROUGH) { /* update in database table */ - if(update_subs_db(subs, REMOTE_TYPE)< 0) + if(update_subs_db(subs, REMOTE_TYPE|LOCAL_TYPE)< 0) { LM_ERR("updating subscription in database table\n"); goto error; @@ -506,6 +507,7 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, LM_DBG("inserting in shtable\n"); subs->db_flag = (subs_dbmode==WRITE_THROUGH)?WTHROUGHDB_FLAG:INSERTDB_FLAG; hash_code= core_hash(&subs->pres_uri, &subs->event->name, shtable_size); + subs->version = 0; if(insert_shtable(subs_htable,hash_code,subs)< 0) { LM_ERR("failed to insert new record in subs htable\n"); @@ -515,6 +517,7 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, if(subs_dbmode == DB_ONLY || subs_dbmode == WRITE_THROUGH) { + subs->version = 1; if(insert_subs_db(subs, REMOTE_TYPE) < 0) { LM_ERR("failed to insert new record in database\n"); @@ -531,7 +534,7 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, } } -/* reply_and_notify */ + /* reply_and_notify */ if(subs->event->type & PUBL_TYPE) { @@ -542,17 +545,17 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, goto error; } *sent_reply= 1; - + if(subs->expires!= 0 && subs->event->wipeer) - { + { LM_DBG("send Notify with winfo\n"); if(query_db_notify(&subs->pres_uri, subs->event->wipeer, subs)< 0) { LM_ERR("Could not send notify winfo\n"); goto error; - } + } if(subs->send_on_cback== 0) - { + { if(notify(subs, NULL, NULL, 0)< 0) { LM_ERR("Could not send notify\n"); @@ -723,6 +726,8 @@ int handle_subscribe(struct sip_msg* msg, char* str1, char* str2) } reason= subs.reason; } + /* mark that the received event is a SUBSCRIBE message */ + subs.recv_event = PRES_SUBSCRIBE_RECV; /* call event specific subscription handling */ if(event->evs_subs_handl) @@ -732,7 +737,7 @@ int handle_subscribe(struct sip_msg* msg, char* str1, char* str2) LM_ERR("in event specific subscription handling\n"); goto error; } - } + } /* if dialog initiation Subscribe - get subscription state */ @@ -740,7 +745,7 @@ int handle_subscribe(struct sip_msg* msg, char* str1, char* str2) { if(!event->req_auth) subs.status = ACTIVE_STATUS; - else + else { /* query in watchers_table */ if(get_db_subs_auth(&subs, &found)< 0) @@ -1077,8 +1082,8 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, } subs->from_tag = pfrom->tag_value; - subs->version = 0; - + subs->version = 1; + if((!scontact.s) || (scontact.len== 0)) { if(ps_fill_local_contact(msg, &subs->local_contact)<0) @@ -1171,7 +1176,7 @@ found_rec: if(subs->pres_uri.s == NULL) subs->pres_uri= pres_uri; - subs->version = s->version; + subs->version = s->version + 1; subs->status= s->status; if(s->reason.s && s->reason.len) { @@ -1198,7 +1203,7 @@ found_rec: subs->record_route.len= s->record_route.len; } - subs->local_cseq= s->local_cseq; + subs->local_cseq= s->local_cseq +1; if(subs->remote_cseq<= s->remote_cseq) { @@ -1331,8 +1336,8 @@ int get_database_info(struct sip_msg* msg, subs_t* subs, int* reply_code, str* r subs->reason.len= reason.len; } - subs->local_cseq= row_vals[local_cseq_col].val.int_val; - subs->version= row_vals[version_col].val.int_val; + subs->local_cseq= row_vals[local_cseq_col].val.int_val + 1; + subs->version= row_vals[version_col].val.int_val + 1; if(!EVENT_DIALOG_SLA(subs->event->evp)) { @@ -1518,7 +1523,7 @@ void update_db_subs_timer_dbonly(void) } s.event= event; - s.local_cseq = row_vals[local_cseq_col].val.int_val; + s.local_cseq = row_vals[local_cseq_col].val.int_val +1; s.expires = 0; s_new= mem_copy_subs(&s, PKG_MEM_TYPE); diff --git a/modules_k/presence/subscribe.h b/modules_k/presence/subscribe.h index d76bf4f..05a8fa5 100644 --- a/modules_k/presence/subscribe.h +++ b/modules_k/presence/subscribe.h @@ -50,8 +50,7 @@ struct pres_ev; and reason is polite-block */ #define POLITE_BLOCK_STATUS 5 -#define INTERNAL_UPDATE_FALSE 0 -#define INTERNAL_UPDATE_TRUE 1 +#define PRES_SUBSCRIBE_RECV 1 struct subscription { @@ -78,7 +77,7 @@ struct subscription int send_on_cback; int db_flag; str* auth_rules_doc; - int internal_update_flag; + int recv_event; struct subscription* next; };

12 years, 2 months

Kamailio presence and internal triggering (publishing)

by Jason Penton

Hi All, Was wondering if there was a mechanism to internally (ie via another module) trigger notifies on a particular presentity? Looking at presence module I see there is only a handle_publish (called from cfg file on PUBLISH request). I would imagine it would be useful to add to the presence API a mechanism to update a presentity from within Kamailio as opposed to relying on a publish. I understand there is the PUA modules but from what I can see these explicitly send a PUBLISH to a presence server and is not what I am looking for. My scenario: I need to implicitly register a user and send notifies to all subscribed watchers (from another module). Cheers Jason

12 years, 2 months

git:master: module: modules/sipcapture fixed socket_info structure.

by Alexandr Dubovikov

Module: sip-router Branch: master Commit: f9494494d59d2036f2ed664fbdf4193760662937 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f949449… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Mon Mar 5 11:56:50 2012 +0100 module: modules/sipcapture fixed socket_info structure. Now users can use $Ri, $rp variables in RAW socket mode. --- modules/sipcapture/sipcapture.c | 94 ++++++++++++++++++++++++++++----------- 1 files changed, 68 insertions(+), 26 deletions(-) diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 837ac97..7e3a228 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1465,6 +1465,9 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) { unsigned short dst_port; unsigned short src_port; struct ip_addr dst_ip, src_ip; + struct socket_info* si = 0; + int tmp_len; + for(;;){ @@ -1514,28 +1517,6 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) { } } - /*FIL IPs*/ - dst_ip.af=AF_INET; - dst_ip.len=4; - dst_ip.u.addr32[0]=iph->ip_dst.s_addr; - /* fill dst_port */ - dst_port=ntohs(udph->uh_dport); - ip_addr2su(&to, &dst_ip, dst_port); - /* fill src_port */ - src_port=ntohs(udph->uh_sport); - src_ip.af=AF_INET; - src_ip.len=4; - src_ip.u.addr32[0]=iph->ip_src.s_addr; - ip_addr2su(&from, &src_ip, src_port); - su_setport(&from, src_port); - - ri.src_su=from; - su2ip_addr(&ri.src_ip, &from); - ri.src_port=src_port; - su2ip_addr(&ri.dst_ip, &to); - ri.dst_port=dst_port; - ri.proto=PROTO_UDP; - /* cut off the offset */ len -= offset; @@ -1544,13 +1525,74 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) { continue; } + /* fill dst_port && src_port */ + dst_port=ntohs(udph->uh_dport); + src_port=ntohs(udph->uh_sport); + + DBG("PORT: [%d] and [%d]\n", port1, port2); - if((!port1 && !port2) - || (src_port >= port1 && src_port <= port2) || (dst_port >= port1 && dst_port <= port2) - || (!port2 && (src_port == port1 || dst_port == port1))) - receive_msg(buf+offset, len, &ri); + if((!port1 && !port2) || (src_port >= port1 && src_port <= port2) + || (dst_port >= port1 && dst_port <= port2) + || (!port2 && (src_port == port1 || dst_port == port1))) { + + /*FIL IPs*/ + dst_ip.af=AF_INET; + dst_ip.len=4; + dst_ip.u.addr32[0]=iph->ip_dst.s_addr; + + /* fill dst_port */ + ip_addr2su(&to, &dst_ip, dst_port); + + /* fill src_port */ + src_ip.af=AF_INET; + src_ip.len=4; + src_ip.u.addr32[0]=iph->ip_src.s_addr; + ip_addr2su(&from, &src_ip, src_port); + su_setport(&from, src_port); + + ri.src_su=from; + su2ip_addr(&ri.src_ip, &from); + ri.src_port=src_port; + su2ip_addr(&ri.dst_ip, &to); + ri.dst_port=dst_port; + ri.proto=PROTO_UDP; + + /* a little bit memory */ + si=(struct socket_info*) pkg_malloc(sizeof(struct socket_info)); + if (si==0) { + LOG(L_ERR, "ERROR: new_sock_info: memory allocation error\n"); + return 0; + } + + memset(si, 0, sizeof(struct socket_info)); + si->address = ri.dst_ip; + si->socket=-1; + + /* set port & proto */ + si->port_no = dst_port; + si->proto=PROTO_UDP; + si->flags=0; + si->addr_info_lst=0; + + si->port_no_str.s = int2str(si->port_no, &tmp_len); + si->port_no_str.len = tmp_len; + + si->address_str.s = ip_addr2a(&si->address);; + si->address_str.len = strlen(si->address_str.s); + + si->name.len = si->address_str.len; + si->name.s = si->address_str.s; + + ri.bind_address=si; + + /* and now recieve message */ + receive_msg(buf+offset, len, &ri); + if(si) pkg_free(si); + } } return 0; } + +

12 years, 2 months

[tracker] Comment added: pua_dialoginfo: set PUBLISH R-URIs via AVPs (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#197 - pua_dialoginfo: set PUBLISH R-URIs via AVPs User who did this - Jasmin Schnatterbeck (jasmin) ---------- Thanks for your suggestions! I have updated the patch - now there is a module parameter available for setting a flag that indicates whether to send PUBLISH requests or not. If the flag has not been set, the default behaviour is to check if the PUBLISH R-URI is local or not. It does not depend on the R-URI via AVP functionality. Regarding the SHM OPs I see 2 possibilities - first determine how much memory we need, then reserve that amount of SHM memory in one OP and write on it (that means searching the AVP lists 2 times). - reserve and write in PKG MEM, then reserve and copy to SHM MEM, then delete PKG MEM What would you prefer? I plan to integrate functionality for individualizing the xml target elements (for Call pickup). The idea is, that the script writer then has the option to set a proxy, that should receive the INVITE of the new call, that aims to pick up the ringing call - because then the new call can be monitored by pua_dialoginfo on that proxy. This could be done by putting the desired proxy in the target uri and to set the "real" target-URI (as obtained from the Contact-Header e.g. of the orig INVITE) as URI-Param. Are there other suggestions/ideas on how to realize that? Jasmin ---------- 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=197#comment504 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, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2012