sr-dev

sr-dev@lists.kamailio.org

18 participants
44290 discussions

[tracker] Task closed: modules/mi_rpc should support t_uac_dlg async mi command

by sip-router

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 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.

15 years, 1 month

git:andrei/blst_send_flags: core: send_flags preliminary blacklist support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/blst_send_flags Commit: 8cf5dde505392a2cfc1a99d4665c18dceacfbc2d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cf5dde… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 17 08:39:53 2009 +0100 core: send_flags preliminary blacklist support - send_flags_t contains now also a blacklist ignore mask (changed to a structure). --- action.c | 8 ++++---- forward.c | 2 +- forward.h | 4 ++-- ip_addr.h | 29 +++++++++++++++++++++++++++-- parser/msg_parser.h | 4 ++-- tcp_conn.h | 10 +++++++--- tcp_main.c | 6 +++--- tcp_read.c | 2 +- 8 files changed, 47 insertions(+), 18 deletions(-) diff --git a/action.c b/action.c index ddbf445..7641077 100644 --- a/action.c +++ b/action.c @@ -1217,19 +1217,19 @@ match_cleanup: ret=v; break; case SET_FWD_NO_CONNECT_T: - msg->fwd_send_flags|= SND_F_FORCE_CON_REUSE; + msg->fwd_send_flags.f|= SND_F_FORCE_CON_REUSE; ret=1; /* continue processing */ break; case SET_RPL_NO_CONNECT_T: - msg->rpl_send_flags|= SND_F_FORCE_CON_REUSE; + msg->rpl_send_flags.f|= SND_F_FORCE_CON_REUSE; ret=1; /* continue processing */ break; case SET_FWD_CLOSE_T: - msg->fwd_send_flags|= SND_F_CON_CLOSE; + msg->fwd_send_flags.f|= SND_F_CON_CLOSE; ret=1; /* continue processing */ break; case SET_RPL_CLOSE_T: - msg->rpl_send_flags|= SND_F_CON_CLOSE; + msg->rpl_send_flags.f|= SND_F_CON_CLOSE; ret=1; /* continue processing */ break; /* diff --git a/forward.c b/forward.c index d7fb827..e47831d 100644 --- a/forward.c +++ b/forward.c @@ -698,7 +698,7 @@ int forward_reply(struct sip_msg* msg) } dst.proto=msg->via2->proto; - dst.send_flags=msg->fwd_send_flags | msg->rpl_send_flags; + dst.send_flags.f=msg->fwd_send_flags.f | msg->rpl_send_flags.f; if (update_sock_struct_from_via( &dst.to, msg, msg->via2 )==-1) goto error; #ifdef USE_COMP dst.comp=msg->via2->comp_no; diff --git a/forward.h b/forward.h index b365753..e5f1a38 100644 --- a/forward.h +++ b/forward.h @@ -158,7 +158,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) goto error; }else{ from=0; - if (unlikely((dst->send_flags & SND_F_FORCE_SOCKET) && + if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) && dst->send_sock)) { local_addr=dst->send_sock->su; su_setport(&local_addr, 0); /* any local port will do */ @@ -180,7 +180,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) goto error; }else{ from=0; - if (unlikely((dst->send_flags & SND_F_FORCE_SOCKET) && + if (unlikely((dst->send_flags.f & SND_F_FORCE_SOCKET) && dst->send_sock)) { local_addr=dst->send_sock->su; su_setport(&local_addr, 0); /* any local port will do */ diff --git a/ip_addr.h b/ip_addr.h index 2983e46..7ec9a1f 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -142,7 +142,31 @@ struct receive_info{ #define SND_F_CON_CLOSE 2 /* close the connection after sending */ #define SND_F_FORCE_SOCKET 4 /* send socket in dst is forced */ -typedef unsigned char snd_flags_t; +struct snd_flags { + unsigned char f; /* snd flags */ + unsigned char blst_imask; /* blacklist ignore mask */ +}; + + +typedef struct snd_flags snd_flags_t; + +#define SND_FLAGS_INIT(sflags) \ + do{ \ + (sflags)->f=0; \ + (sflags)->blst_imask=0; \ + }while(0) + +#define SND_FLAGS_OR(dst, src1, src2) \ + do{ \ + (dst)->f = (src1)->f | (src2)->f; \ + (dst)->blst_imask = (src1)->blst_imask | (src2)->blst_imask; \ + }while(0) + +#define SND_FLAGS_AND(dst, src1, src2) \ + do{ \ + (dst)->f = (src1)->f & (src2)->f; \ + (dst)->blst_imask = (src1)->blst_imask & (src2)->blst_imask; \ + }while(0) struct dest_info{ struct socket_info* send_sock; @@ -757,7 +781,8 @@ inline static void init_dst_from_rcv(struct dest_info* dst, dst->to=rcv->src_su; dst->id=rcv->proto_reserved1; dst->proto=rcv->proto; - dst->send_flags=0; + dst->send_flags.f=0; + dst->send_flags.blst_imask=0; #ifdef USE_COMP dst->comp=rcv->comp; #endif diff --git a/parser/msg_parser.h b/parser/msg_parser.h index adedddb..c421384 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -477,9 +477,9 @@ void reset_path_vector(struct sip_msg* msg); do { \ (msg)->force_send_socket=(fsocket); \ if ((msg)->force_send_socket) \ - (msg)->fwd_send_flags |= SND_F_FORCE_SOCKET; \ + (msg)->fwd_send_flags.f |= SND_F_FORCE_SOCKET; \ else \ - (msg)->fwd_send_flags &= ~SND_F_FORCE_SOCKET; \ + (msg)->fwd_send_flags.f &= ~SND_F_FORCE_SOCKET; \ } while (0) /** reset a previously forced send socket. */ diff --git a/tcp_conn.h b/tcp_conn.h index f596b59..121c965 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -172,7 +172,7 @@ struct tcp_connection{ atomic_t refcnt; enum sip_protos type; /* PROTO_TCP or a protocol over it, e.g. TLS */ unsigned short flags; /* connection related flags */ - unsigned short send_flags; /* special send flags */ + snd_flags_t send_flags; /* special send flags */ enum tcp_conn_states state; /* connection state */ void* extra_data; /* extra data associated to the connection, 0 for tcp*/ struct timer_ln timer; @@ -192,9 +192,13 @@ struct tcp_connection{ /* helper macros */ -#define tcpconn_set_send_flags(c, snd_flags) ((c)->send_flags|=(snd_flags)) +#define tcpconn_set_send_flags(c, snd_flags) \ + do{ \ + (c)->send_flags.f|=(snd_flags).f; \ + (c)->send_flags.blst_imask|=(snd_flags).blst_imask; \ + }while(0) -#define tcpconn_close_after_send(c) ((c)->send_flags & SND_F_CON_CLOSE) +#define tcpconn_close_after_send(c) ((c)->send_flags.f & SND_F_CON_CLOSE) #define TCP_RCV_INFO(c) (&(c)->rcv) diff --git a/tcp_main.c b/tcp_main.c index 4840ddc..460e1fa 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1780,7 +1780,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, c=0; } /* check if connect() is disabled */ - if (unlikely((dst->send_flags & SND_F_FORCE_CON_REUSE) || + if (unlikely((dst->send_flags.f & SND_F_FORCE_CON_REUSE) || cfg_get(tcp, tcp_cfg, no_connect))) return -1; DBG("tcp_send: no open tcp connection found, opening new one\n"); @@ -1927,7 +1927,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, } LOG(L_INFO, "tcp_send: quick connect for %p\n", c); TCP_STATS_ESTABLISHED(S_CONN_CONNECT); - if (unlikely(dst->send_flags & SND_F_CON_CLOSE)){ + if (unlikely(dst->send_flags.f & SND_F_CON_CLOSE)){ /* if close-after-send requested, don't bother sending the fd back to tcp_main, try closing it immediately (no other tcp_send should use it, @@ -2224,7 +2224,7 @@ error: TCP_STATS_ESTABLISHED(c->state); c->state=S_CONN_OK; } - if (unlikely(dst->send_flags & SND_F_CON_CLOSE)){ + if (unlikely(dst->send_flags.f & SND_F_CON_CLOSE)){ /* close after write => send EOF request to tcp_main */ c->state=S_CONN_BAD; c->timeout=get_ticks_raw(); diff --git a/tcp_read.c b/tcp_read.c index d201765..c6d729c 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -964,7 +964,7 @@ again: con=(struct tcp_connection*)fm->data; if (unlikely(con->state==S_CONN_BAD)){ resp=CONN_ERROR; - if (!(con->send_flags & SND_F_CON_CLOSE)) + if (!(con->send_flags.f & SND_F_CON_CLOSE)) LOG(L_WARN, "WARNING: tcp_receive: handle_io: F_TCPCONN" " connection marked as bad: %p id %d refcnt %d\n", con, con->id, atomic_get(&con->refcnt));

15 years, 1 month

git:andrei/blst_send_flags: tm: simplified blacklist add code

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/blst_send_flags Commit: 00f3403093bbeefc882adedb404ab0d248dadb88 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00f3403… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Dec 23 11:44:45 2009 +0100 tm: simplified blacklist add code --- modules/tm/t_fwd.c | 3 +-- modules/tm/t_reply.c | 3 ++- modules/tm/timer.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index af7ab47..c518592 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1219,8 +1219,7 @@ int t_send_branch( struct cell *t, int branch, struct sip_msg* p_msg , ip_addr2a(&ip), su_getport(&uac->request.dst.to), uac->request.dst.proto); #ifdef USE_DST_BLACKLIST - if (cfg_get(core, core_cfg, use_dst_blacklist)) - dst_blacklist_add(BLST_ERR_SEND, &uac->request.dst, p_msg); + dst_blacklist_add(BLST_ERR_SEND, &uac->request.dst, p_msg); #endif #ifdef USE_DNS_FAILOVER /* if the destination resolves to more ips, add another diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 3dbe519..0b16fae 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1612,7 +1612,8 @@ 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.f|=relayed_msg->rpl_send_flags.f; + SND_FLAGS_OR(&uas_rb->dst.send_flags, &uas_rb->dst.send_flags, + &relayed_msg->rpl_send_flags); } } update_reply_stats( relayed_code ); diff --git a/modules/tm/timer.c b/modules/tm/timer.c index 9c38274..73fe5c1 100644 --- a/modules/tm/timer.c +++ b/modules/tm/timer.c @@ -454,13 +454,13 @@ inline static void final_response_handler( struct retr_buf* r_buf, ){ /* no reply received */ #ifdef USE_DST_BLACKLIST - if (cfg_get(core, core_cfg, use_dst_blacklist) - && r_buf->my_T + if (r_buf->my_T && r_buf->my_T->uas.request - && (r_buf->my_T->uas.request->REQ_METHOD & cfg_get(tm, tm_cfg, tm_blst_methods_add)) + && (r_buf->my_T->uas.request->REQ_METHOD & + cfg_get(tm, tm_cfg, tm_blst_methods_add)) ) dst_blacklist_add( BLST_ERR_TIMEOUT, &r_buf->dst, - r_buf->my_T->uas.request); + r_buf->my_T->uas.request); #endif #ifdef USE_DNS_FAILOVER /* if this is an invite, the destination resolves to more ips, and

15 years, 1 month

git:andrei/blst_send_flags: blacklist: ignore mask support

by Andrei Pelinescu-Onciul

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 add functions don't require anymore checking if the blacklist is enabled - added dst_blacklist_force_add_to() and dst_blacklist_force_su_to() tcp: - updated to the changed dst_blacklist_su() - a tcp connection send_flags and blacklist ignore mask are inherited from the packet that opens the connection sctp: - updated to the changed dst_blacklist_su() --- dst_blacklist.c | 12 ++-- dst_blacklist.h | 117 +++++++++++++++++++++++++++++++++++++------ forward.c | 5 +- sctp_server.c | 15 ++--- tcp_conn.h | 5 +-- tcp_main.c | 147 +++++++++++++++++++++++++------------------------------ tcp_read.c | 21 +++----- 7 files changed, 192 insertions(+), 130 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5d6…

15 years, 1 month

git:andrei/blst_send_flags: tm: updated to the new snd_flags_t structure

by Andrei Pelinescu-Onciul

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 | 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 */

15 years, 1 month

git:andrei/blst_send_flags: blst: use dst_blacklist_force_add

by Andrei Pelinescu-Onciul

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/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;

15 years, 1 month

problem with locally generated ACKs

by jh＠tutpro.com

i noticed that if sr sends a locally generated INVITE (as result of tm.t_uac_wait), the INVITE gets processes by my event_route [tm:local-request] script, but when UA responds with 200 OK, the ACK generated by sr does not get processed by the event_route and if the UA is behind nat, the UA never gets the ACK it because sr tries to send it to local address of the UA. how can i get sr to use the above event route also for locally generated ACKs so that i can properly rewrite r-uri of the ACK? -- juha

15 years, 1 month

git:master: topoh: callid prefix can be set via param

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a8f1190d0a400c34809af798a482311539b15527 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8f1190… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 20 12:49:59 2009 +0100 topoh: callid prefix can be set via param --- modules/topoh/topoh_mod.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 37eefae..90d4c2e 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -81,6 +81,7 @@ static param_export_t params[]={ {"uparam_prefix", STR_PARAM, &th_uparam_prefix.s}, {"vparam_name", STR_PARAM, &th_vparam_name.s}, {"vparam_prefix", STR_PARAM, &th_vparam_prefix.s}, + {"callid_prefix", STR_PARAM, &th_callid_prefix.s}, {0,0,0} }; @@ -112,6 +113,7 @@ static int mod_init(void) th_uparam_prefix.len = strlen(th_uparam_prefix.s); th_vparam_name.len = strlen(th_vparam_name.s); th_vparam_prefix.len = strlen(th_vparam_prefix.s); + th_callid_prefix.len = strlen(th_callid_prefix.s); /* 'SIP/2.0/UDP ' + ip + ';' + param + '=' + prefix (+ '\0') */ th_via_prefix.len = 12 + th_ip.len + 1 + th_vparam_name.len + 1

15 years, 1 month

git:master: topoh: updated README

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 63664db5030d1a6c5e700e645cebac9238e985ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63664db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 20 18:48:37 2009 +0100 topoh: updated README --- modules/topoh/README | 15 +++++++++++++++ modules/topoh/doc/topoh_admin.xml | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/modules/topoh/README b/modules/topoh/README index fd5fa13..93e594c 100644 --- a/modules/topoh/README +++ b/modules/topoh/README @@ -31,6 +31,7 @@ Daniel-Constantin Mierla 3.4. uparam_prefix (str) 3.5. vparam_name (str) 3.6. vparam_prefix (str) + 3.7. callid_prefix (str) 4. Exported Functions @@ -44,6 +45,7 @@ Daniel-Constantin Mierla 1.4. Set uparam_prefix parameter 1.5. Set vparam_name parameter 1.6. Set vparam_prefix parameter + 1.7. Set callid_prefix parameter Chapter 1. Admin Guide @@ -63,6 +65,7 @@ Chapter 1. Admin Guide 3.4. uparam_prefix (str) 3.5. vparam_name (str) 3.6. vparam_prefix (str) + 3.7. callid_prefix (str) 4. Exported Functions @@ -109,6 +112,7 @@ Chapter 1. Admin Guide 3.4. uparam_prefix (str) 3.5. vparam_name (str) 3.6. vparam_prefix (str) + 3.7. callid_prefix (str) 3.1. mask_key (str) @@ -179,6 +183,17 @@ modparam("topoh", "vparam_name", "myv") modparam("topoh", "vparam_prefix", "xyz") ... +3.7. callid_prefix (str) + + Prefix to be added in encoded Call-ID: headers. + + Default value is "!!:". + + Example 1.7. Set callid_prefix parameter +... +modparam("topoh", "callid_prefix", "***") +... + 4. Exported Functions 4.1. diff --git a/modules/topoh/doc/topoh_admin.xml b/modules/topoh/doc/topoh_admin.xml index ddb2871..9404308 100644 --- a/modules/topoh/doc/topoh_admin.xml +++ b/modules/topoh/doc/topoh_admin.xml @@ -184,6 +184,25 @@ modparam("topoh", "vparam_prefix", "xyz") </programlisting> </example> </section> + <section> + <title><varname>callid_prefix</varname> (str)</title> + <para> + Prefix to be added in encoded Call-ID: headers. + </para> + <para> + <emphasis> + Default value is "!!:". + </emphasis> + </para> + <example> + <title>Set <varname>callid_prefix</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "callid_prefix", "***") +... +</programlisting> + </example> + </section> </section> <section>

15 years, 1 month

git:master: topoh: update Replaces header

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f03706ce3b8670d052619ac4a38fda4fa35bedfd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f03706c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 20 18:44:33 2009 +0100 topoh: update Replaces header - case when call-id is masked --- modules/topoh/th_msg.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ modules/topoh/th_msg.h | 1 + modules/topoh/topoh_mod.c | 1 + 3 files changed, 69 insertions(+), 0 deletions(-) diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index 621f175..5304b1e 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -31,6 +31,7 @@ #include "../../mem/mem.h" #include "../../data_lump.h" #include "../../forward.h" +#include "../../trim.h" #include "../../msg_translator.h" #include "../../parser/parse_rr.h" #include "../../parser/parse_uri.h" @@ -735,6 +736,72 @@ int th_unmask_refer_to(sip_msg_t *msg) return 0; } +int th_update_hdr_replaces(sip_msg_t *msg) +{ + struct hdr_field *hf = NULL; + str replaces; + str rcallid; + struct lump* l; + str out; + + LM_DBG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + if(th_param_mask_callid==0) + return 0; + + if(!((get_cseq(msg)->method_id)&(METHOD_INVITE))) + return 0; + + for (hf=msg->headers; hf; hf=hf->next) + { + if (hf->name.len==8 && strncasecmp(hf->name.s, "Replaces", 8)==0) + break; + } + + if(hf==NULL) + return 0; + + replaces = hf->body; + trim(&replaces); + rcallid.s = replaces.s; + for(rcallid.len=0; rcallid.len<replaces.len; rcallid.len++) + { + if(rcallid.s[rcallid.len]==';') + break; + } + + if(rcallid.len>th_callid_prefix.len + && strncmp(rcallid.s, th_callid_prefix.s, th_callid_prefix.len)==0) + { + /* value encoded - decode it */ + out.s = th_mask_decode(rcallid.s, rcallid.len, + &th_callid_prefix, 0, &out.len); + } else { + /* value decoded - encode it */ + out.s = th_mask_encode(rcallid.s, rcallid.len, + &th_callid_prefix, &out.len); + } + if(out.s==NULL) + { + LM_ERR("cannot update Replaces callid\n"); + return -1; + } + + l=del_lump(msg, rcallid.s-msg->buf, rcallid.len, 0); + if (l==0) + { + LM_ERR("failed deleting Replaces callid\n"); + pkg_free(out.s); + return -1; + } + if (insert_new_lump_after(l, out.s, out.len, 0)==0) { + LM_ERR("could not insert new lump\n"); + pkg_free(out.s); + return -1; + } + + return 0; +} + char* th_msg_update(sip_msg_t *msg, unsigned int *olen) { struct dest_info dst; diff --git a/modules/topoh/th_msg.h b/modules/topoh/th_msg.h index f965f9d..d74ec65 100644 --- a/modules/topoh/th_msg.h +++ b/modules/topoh/th_msg.h @@ -40,6 +40,7 @@ int th_flip_record_route(sip_msg_t *msg, int mode); int th_unmask_ruri(sip_msg_t *msg); int th_unmask_route(sip_msg_t *msg); int th_unmask_refer_to(sip_msg_t *msg); +int th_update_hdr_replaces(sip_msg_t *msg); char* th_msg_update(sip_msg_t *msg, unsigned int *olen); int th_add_via_cookie(sip_msg_t *msg, struct via_body *via); int th_add_hdr_cookie(sip_msg_t *msg); diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 8e5dd8b..b3c6cd0 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -315,6 +315,7 @@ int th_msg_sent(void *data) } } else { /* initial request */ + th_update_hdr_replaces(&msg); th_mask_callid(&msg); } } else {

15 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev