sr-dev December 2009

sr-dev@lists.kamailio.org

26 participants
157 discussions

add_contact_alias()
by Klaus Darilion 23 Dec '09

23 Dec '09

Hi Juha! I tried your new add_contact_alias function - some questions: 1. + /* Compare source ip and port against contact uri */ + if ((ip = str2ip(&(uri.host))) == NULL) { + LM_ERR("contact uri host is not an ip address\n"); + return -1; + } Why do you in return -1 in case of a domain instead of adding the alias parameter in this case too? 2. AFAIS the new functions are included in sr3.0 branch, but not in kamailio-3.0 branch. Why? regards klaus

2 8

git:sr_3.0: tm: new param: local_ack_mode
by Andrei Pelinescu-Onciul 23 Dec '09

23 Dec '09

Module: sip-router Branch: sr_3.0 Commit: 49218e800df4a349fae240733963ca4b46bdca3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49218e8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 23 13:16:01 2009 +0100 tm: new param: local_ack_mode local_ack_mode controls how local 200 ACKs (ACKs to 2xx replies for local transactions, created via t_uac*) are sent. There are 3 possible … [View More]modes: - 0 (default) - ACK is sent according to the rfc (the next hop is found using the contact and the route set and then dns resolution is used on it). - 1 - the ACK is sent to the same address as the corresponding INVITE branch. - 2 - the ACL is sent to the same address as the source of the 2xx reply. Modes 1 and 2 break the rfc, but are useful to deal with some simple UA behind the NAT cases. Note that mode 1 is not similar to generating ACKs for negative replies. Even if the ACK will be sent to the same address as the INVITE, it will contain the correct route set and uri. --- modules/tm/config.c | 10 +++++++- modules/tm/config.h | 1 + modules/tm/t_msgbuilder.c | 56 +++++++++++++++++++++++++++++---------------- modules/tm/tm.c | 1 + 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/modules/tm/config.c b/modules/tm/config.c index 1ecb5ac..654153d 100644 --- a/modules/tm/config.c +++ b/modules/tm/config.c @@ -91,7 +91,8 @@ struct cfg_group_tm default_tm_cfg = { * for every method except BYE by default */ 1, /* cancel_b_method used for e2e and 6xx cancels*/ 1, /* reparse_on_dns_failover */ - 0 /* disable_6xx, by default off */ + 0, /* disable_6xx, by default off */ + 0 /* local_ack_mode, default 0 (rfc3261 conformant) */ }; void *tm_cfg = &default_tm_cfg; @@ -186,5 +187,12 @@ cfg_def_t tm_cfg_def[] = { "branch instead of from the received request"}, {"disable_6xx_block", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set to 1, 6xx is treated like a normal reply (breaks rfc)"}, + {"local_ack_mode", CFG_VAR_INT | CFG_ATOMIC, 0, 2, 0, 0, + "if set to 1 or 2, local 200 ACKs are sent to the same address as the" + " corresponding INVITE (1) or the source of the 200 reply (2) instead" + " of using the contact and the route set (it breaks the rfc, if " + " it is not set to 0 but allows dealing with NATed contacts in some " + "simple cases)" + }, {0, 0, 0, 0, 0, 0} }; diff --git a/modules/tm/config.h b/modules/tm/config.h index 91edf42..cfdd41f 100644 --- a/modules/tm/config.h +++ b/modules/tm/config.h @@ -134,6 +134,7 @@ struct cfg_group_tm { unsigned int cancel_b_flags; int reparse_on_dns_failover; int disable_6xx; + int local_ack_mode; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index c0160b9..b76c659 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -982,33 +982,49 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, *len = SIP_VERSION_LEN + ACK_LEN + 2 /* spaces */ + CRLF_LEN; *len += ruri.len; - - /* via */ + /* dst */ + switch(cfg_get(tm, tm_cfg, local_ack_mode)){ + case 1: + /* send the local 200 ack to the same dst as the corresp. invite*/ + *dst=Trans->uac[branch].request.dst; + break; + case 2: + /* send the local 200 ack to the same dst as the 200 reply source*/ + init_dst_from_rcv(dst, &rpl->rcv); + dst->send_flags=rpl->fwd_send_flags; + break; + case 0: + default: + /* rfc conformant behaviour: use the next_hop determined from the + contact and the route set */ #ifdef USE_DNS_FAILOVER - if (cfg_get(core, core_cfg, use_dns_failover)){ - dns_srv_handle_init(&dns_h); - if ((uri2dst(&dns_h , dst, rpl, &next_hop, PROTO_NONE)==0) || - (dst->send_sock==0)){ - dns_srv_handle_put(&dns_h); - LOG(L_ERR, "build_dlg_ack: no socket found\n"); - goto error; + if (cfg_get(core, core_cfg, use_dns_failover)){ + dns_srv_handle_init(&dns_h); + if ((uri2dst(&dns_h , dst, rpl, &next_hop, PROTO_NONE)==0) || + (dst->send_sock==0)){ + dns_srv_handle_put(&dns_h); + LOG(L_ERR, "build_dlg_ack: no socket found\n"); + goto error; + } + dns_srv_handle_put(&dns_h); /* not needed any more */ + }else{ + if ((uri2dst(0 , dst, rpl, &next_hop, PROTO_NONE)==0) || + (dst->send_sock==0)){ + LOG(L_ERR, "build_dlg_ack: no socket found\n"); + goto error; + } } - dns_srv_handle_put(&dns_h); /* not needed any more */ - }else{ - if ((uri2dst(0 , dst, rpl, &next_hop, PROTO_NONE)==0) || +#else /* USE_DNS_FAILOVER */ + if ( (uri2dst( dst, rpl, &next_hop, PROTO_NONE)==0) || (dst->send_sock==0)){ - LOG(L_ERR, "build_dlg_ack: no socket found\n"); + LOG(L_ERR, "build_dlg_ack: no socket found\n"); goto error; } +#endif /* USE_DNS_FAILOVER */ + break; } -#else - if ( (uri2dst( dst, rpl, &next_hop, PROTO_NONE)==0) || - (dst->send_sock==0)){ - LOG(L_ERR, "build_dlg_ack: no socket found\n"); - goto error; - } -#endif + /* via */ if (!t_calc_branch(Trans, branch, branch_buf, &branch_len)) goto error; branch_str.s = branch_buf; branch_str.len = branch_len; diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 09f08c6..f4fb487 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -470,6 +470,7 @@ static param_export_t params[]={ {"on_sl_reply", PARAM_STRING|PARAM_USE_FUNC, fixup_on_sl_reply }, {"contacts_avp", PARAM_STRING, &contacts_avp_param }, {"disable_6xx_block", PARAM_INT, &default_tm_cfg.disable_6xx }, + {"local_ack_mode", PARAM_INT, &default_tm_cfg.local_ack_mode }, {0,0,0} }; [View Less]

2 1

git:sr_3.0: sctp: stats: don't increment ASSOC_SHUTDOWN on COMM_LOST
by Andrei Pelinescu-Onciul 23 Dec '09

23 Dec '09

Module: sip-router Branch: sr_3.0 Commit: 642ff762480e3c16ef417b106ed5a2b64d126d88 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=642ff76… Author: Libor Chocholaty <libor(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 23 17:06:36 2009 +0100 sctp: stats: don't increment ASSOC_SHUTDOWN on COMM_LOST Signed-off-by: Andrei Pelinescu-Onciul <andrei(a)iptel.org> --- sctp_server.c | 5 ++++- 1 files changed, 4 … [View More]

1 0

git:sr_3.0: sctp: SCTP_STATS_ASSOC_SHUTDOWN
by Andrei Pelinescu-Onciul 23 Dec '09

23 Dec '09

Module: sip-router Branch: sr_3.0 Commit: 8dfdb3c7a9577438ced848cbbf5d845052ba5032 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8dfdb3c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 23 16:58:45 2009 +0100 sctp: SCTP_STATS_ASSOC_SHUTDOWN Statistics placeholder for counting shutdowns. --- sctp_server.c | 1 + sctp_stats.h | 7 +++++++ 2 files changed, 8 … [View More]

1 0

git:sr_3.0: tm doc: local_ack_mode documentation
by Andrei Pelinescu-Onciul 23 Dec '09

23 Dec '09

Module: sip-router Branch: sr_3.0 Commit: c3a38caa6d669abd209b5a40260c7c13e49484a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3a38ca… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 23 16:46:18 2009 +0100 tm doc: local_ack_mode documentation --- modules/tm/README | 202 +++++++++++++++++++++++++++++++++++++-------- modules/tm/doc/params.xml | 47 +++++++++++ … [View More]

1 0

how to proper set the RURI
by Klaus Darilion 23 Dec '09

23 Dec '09

Hi! I sr code I found several methods how RURI is set, eg: - rewrite_uri() - act.type = SET_URI_T; do_action(&act, msg) - manually by applying a lump What is the preferred way to do this? Thanks klaus

2 2

[tracker] Task closed: modules/mi_rpc should support t_uac_dlg async mi command
by sip-router 23 Dec '09

23 Dec '09

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#10 - modules/mi_rpc should support t_uac_dlg async mi command User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Implemented Additional comments about closing: support implemented in September (commit 244d4d4729b295be999acb3a4ca4cf156a9bfbbf) More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=10 You are receiving this … [View More]

1 0

git:andrei/blst_send_flags: blst: use dst_blacklist_force_add
by Andrei Pelinescu-Onciul 23 Dec '09

23 Dec '09

Module: sip-router Branch: andrei/blst_send_flags Commit: 26889815bcdbde46b0be48024955dbff966b6d38 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2688981… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 23 11:47:00 2009 +0100 blst: use dst_blacklist_force_add - use dst_blacklist_force_add (skip over ignore masks checks) - porperly init dest_info structs --- modules_s/blst/… [View More]blst.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules_s/blst/blst.c b/modules_s/blst/blst.c index 1561f61..a953670 100644 --- a/modules_s/blst/blst.c +++ b/modules_s/blst/blst.c @@ -90,16 +90,15 @@ static int blst_add_f(struct sip_msg* msg, char* to, char* foo) t=0; if (unlikely( to && (get_int_fparam(&t, msg, (fparam_t*)to)<0))) return -1; - + if (t==0) + t=cfg_get(core, core_cfg, blst_timeout); + init_dest_info(&src); src.send_sock=0; src.to=msg->rcv.src_su; src.id=msg->rcv.proto_reserved1; src.proto=msg->rcv.proto; - if (t) - dst_blacklist_add_to(BLST_ADM_PROHIBITED, &src, msg, + dst_blacklist_force_add_to(BLST_ADM_PROHIBITED, &src, msg, S_TO_TICKS(t)); - else - dst_blacklist_add(BLST_ADM_PROHIBITED, &src, msg); return 1; }else{ LOG(L_WARN, "WARNING: blst: blst_add: blacklist support disabled\n"); @@ -130,6 +129,7 @@ static int blst_add_retry_after_f(struct sip_msg* msg, char* min, char* max) t_max=0; } + init_dest_info(&src); src.send_sock=0; src.to=msg->rcv.src_su; src.id=msg->rcv.proto_reserved1; @@ -150,8 +150,8 @@ static int blst_add_retry_after_f(struct sip_msg* msg, char* min, char* max) t=MAX_unsigned(t, t_min); t=MIN_unsigned(t, t_max); if (likely(t)) - dst_blacklist_add_to(BLST_ADM_PROHIBITED, &src, msg, - S_TO_TICKS(t)); + dst_blacklist_force_add_to(BLST_ADM_PROHIBITED, &src, msg, + S_TO_TICKS(t)); return 1; }else{ LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" @@ -173,6 +173,7 @@ static int blst_del_f(struct sip_msg* msg, char* foo, char* bar) if (likely(cfg_get(core, core_cfg, use_dst_blacklist))){ + init_dest_info(&src); src.send_sock=0; src.to=msg->rcv.src_su; src.id=msg->rcv.proto_reserved1; @@ -197,6 +198,7 @@ static int blst_is_blacklisted_f(struct sip_msg* msg, char* foo, char* bar) struct dest_info src; if (likely(cfg_get(core, core_cfg, use_dst_blacklist))){ + init_dest_info(&src); src.send_sock=0; src.to=msg->rcv.src_su; src.id=msg->rcv.proto_reserved1; [View Less]

1 0

git:andrei/blst_send_flags: tm: updated to the new snd_flags_t structure
by Andrei Pelinescu-Onciul 23 Dec '09

23 Dec '09

Module: sip-router Branch: andrei/blst_send_flags Commit: 1d777cdcf8462e2dc0d104ec16c19bf1a5e782d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d777cd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 17 13:29:50 2009 +0100 tm: updated to the new snd_flags_t structure --- modules/tm/t_fwd.c | 14 +++++++++----- modules/tm/t_reply.c | 2 +- modules/tm/uac.c | … [View More]8 +++++--- modules/tm/ut.h | 16 ++++++++++++---- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 1e9644d..af7ab47 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -659,8 +659,10 @@ static int add_uac( struct cell *t, struct sip_msg *request, str *uri, t->uac[branch].request.dst.send_sock = get_send_socket( request, &t->uac[branch].request.dst.to, t->uac[branch].request.dst.proto); - t->uac[branch].request.dst.send_flags=request? - request->fwd_send_flags:0; + if (request) + t->uac[branch].request.dst.send_flags=request->fwd_send_flags; + else + SND_FLAGS_INIT(&t->uac[branch].request.dst.send_flags); next_hop=0; }else { next_hop= next_hop?next_hop:uri; @@ -845,7 +847,7 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, * in the rest of the message, only in the VIA HF (Miklos) */ ret=add_uac_from_buf(t, msg, &old_uac->uri, &old_uac->path, - (old_uac->request.dst.send_flags & + (old_uac->request.dst.send_flags.f & SND_F_FORCE_SOCKET)? old_uac->request.dst.send_sock:0, old_uac->request.dst.send_flags, @@ -858,7 +860,7 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, * must be changed and the send_socket might be different => * re-create the whole uac */ ret=add_uac(t, msg, &old_uac->uri, 0, &old_uac->path, 0, - (old_uac->request.dst.send_flags & + (old_uac->request.dst.send_flags.f & SND_F_FORCE_SOCKET)? old_uac->request.dst.send_sock:0, old_uac->request.dst.send_flags, @@ -883,6 +885,7 @@ int e2e_cancel_branch( struct sip_msg *cancel_msg, struct cell *t_cancel, int ret; char *shbuf; unsigned int len; + snd_flags_t snd_flags; ret=-1; if (t_cancel->uac[branch].request.buffer) { @@ -928,12 +931,13 @@ int e2e_cancel_branch( struct sip_msg *cancel_msg, struct cell *t_cancel, cancel_msg->first_line.u.request.method.len+1; t_cancel->uac[branch].uri.len=t_invite->uac[branch].uri.len; } else { + SND_FLAGS_INIT(&snd_flags); /* buffer is constructed from the received CANCEL with lumps applied */ /* t_cancel...request.dst is already filled (see above) */ if (unlikely((ret=prepare_new_uac( t_cancel, cancel_msg, branch, &t_invite->uac[branch].uri, &t_invite->uac[branch].path, - 0, 0, 0, PROTO_NONE, 0)) <0)){ + 0, 0, snd_flags, PROTO_NONE, 0)) <0)){ ser_error=ret; goto error; } diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 8dbd1d6..3dbe519 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1612,7 +1612,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, } /* update send_flags with possible additions from the reply route */ - uas_rb->dst.send_flags|=relayed_msg->rpl_send_flags; + uas_rb->dst.send_flags.f|=relayed_msg->rpl_send_flags.f; } } update_reply_stats( relayed_code ); diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 7565763..da30b0d 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -215,6 +215,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, int sflag_bk; int backup_route_type; #endif + snd_flags_t snd_flags; ret=-1; hi=0; /* make gcc happy */ @@ -239,10 +240,11 @@ static inline int t_uac_prepare(uac_req_t *uac_r, uac_r->dialog->hooks.next_hop->s); /* new message => take the dialog send_socket if set, or the default send_socket if not*/ + SND_FLAGS_INIT(&snd_flags); #ifdef USE_DNS_FAILOVER if (cfg_get(core, core_cfg, use_dns_failover)){ dns_srv_handle_init(&dns_h); - if ((uri2dst2(&dns_h, &dst, uac_r->dialog->send_sock, 0, + if ((uri2dst2(&dns_h, &dst, uac_r->dialog->send_sock, snd_flags, uac_r->dialog->hooks.next_hop, PROTO_NONE)==0) || (dst.send_sock==0)){ dns_srv_handle_put(&dns_h); @@ -253,7 +255,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, } dns_srv_handle_put(&dns_h); /* not needed anymore */ }else{ - if ((uri2dst2(0, &dst, uac_r->dialog->send_sock, 0, + if ((uri2dst2(0, &dst, uac_r->dialog->send_sock, snd_flags, uac_r->dialog->hooks.next_hop, PROTO_NONE)==0) || (dst.send_sock==0)){ ser_error = E_NO_SOCKET; @@ -263,7 +265,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, } } #else /* USE_DNS_FAILOVER */ - if ((uri2dst2(&dst, uac_r->dialog->send_sock, 0, + if ((uri2dst2(&dst, uac_r->dialog->send_sock, snd_flags, uac_r->dialog->hooks.next_hop, PROTO_NONE)==0) || (dst.send_sock==0)){ ser_error = E_NO_SOCKET; diff --git a/modules/tm/ut.h b/modules/tm/ut.h index e0cabcf..fff774b 100644 --- a/modules/tm/ut.h +++ b/modules/tm/ut.h @@ -356,16 +356,24 @@ inline static struct dest_info *uri2dst(struct dns_srv_handle* dns_h, struct sip_msg *msg, str *uri, int proto ) { - return uri2dst2(dns_h, dst, msg?msg->force_send_socket:0, - msg?msg->fwd_send_flags:0, uri, proto); + snd_flags_t sflags; + if (msg) + return uri2dst2(dns_h, dst, msg->force_send_socket, + msg->fwd_send_flags, uri, proto); + SND_FLAGS_INIT(&sflags); + return uri2dst2(dns_h, dst, 0, sflags, uri, proto); } #else inline static struct dest_info *uri2dst(struct dest_info* dst, struct sip_msg *msg, str *uri, int proto ) { - return uri2dst2(dst, msg?msg->force_send_socket:0, - msg?msg->fwd_send_flags:0, uri, proto); + snd_flags_t sflags; + if (msg) + return uri2dst2(dst, msg->force_send_socket, msg->fwd_send_flags, + uri, proto); + SND_FLAGS_INIT(&sflags); + return uri2dst2(dst, 0, sflags, uri, proto); } #endif /* USE_DNS_FAILOVER */ [View Less]

1 0

git:andrei/blst_send_flags: blacklist: ignore mask support
by Andrei Pelinescu-Onciul 23 Dec '09

23 Dec '09

Module: sip-router Branch: andrei/blst_send_flags Commit: 5d6752dc5d37e112a7493d9e50f40e8f19a5dd41 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d6752d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 23 09:44:12 2009 +0100 blacklist: ignore mask support blacklist: - a blacklist ignore mask (part of the send flags) is now supported by the blacklist functions - blacklist … [View More]

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2009