sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
246 discussions

git:master: core: helper function to generate sip reply content without removing top via
by Daniel-Constantin Mierla 04 Jul '13

04 Jul '13

Module: sip-router Branch: master Commit: 8248a1b2ed725933f84a343b4936ed4fdef4a869 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8248a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 4 22:27:32 2013 +0200 core: helper function to generate sip reply content without removing top via --- msg_translator.c | 45 ++++++++++++++++++++++++++++----------------- msg_translator.h | 2 ++ 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index c1ae7c9..b7d4894 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -1956,8 +1956,8 @@ error00: -char * build_res_buf_from_sip_res( struct sip_msg* msg, - unsigned int *returned_len) +char * generate_res_buf_from_sip_res( struct sip_msg* msg, + unsigned int *returned_len, unsigned int mode) { unsigned int new_len, via_len, body_delta; char* new_buf; @@ -1968,13 +1968,19 @@ char * build_res_buf_from_sip_res( struct sip_msg* msg, buf=msg->buf; len=msg->len; new_buf=0; - /* we must remove the first via */ - if (msg->via1->next) { - via_len=msg->via1->bsize; - via_offset=msg->h_via1->body.s-buf; + + if(unlikely(mode&BUILD_NO_VIA1_UPDATE)) { + via_len = 0; + via_offset = 0; } else { - via_len=msg->h_via1->len; - via_offset=msg->h_via1->name.s-buf; + /* we must remove the first via */ + if (msg->via1->next) { + via_len=msg->via1->bsize; + via_offset=msg->h_via1->body.s-buf; + } else { + via_len=msg->h_via1->len; + via_offset=msg->h_via1->name.s-buf; + } } /* Calculate message body difference and adjust @@ -1983,16 +1989,16 @@ char * build_res_buf_from_sip_res( struct sip_msg* msg, body_delta = lumps_len(msg, msg->body_lumps, 0); if (adjust_clen(msg, body_delta, (msg->via2? msg->via2->proto:PROTO_UDP)) < 0) { - LOG(L_ERR, "ERROR: build_req_buf_from_sip_req: Error while adjusting" - " Content-Length\n"); + LOG(L_ERR, "error while adjusting Content-Length\n"); goto error; } - /* remove the first via*/ - if (del_lump( msg, via_offset, via_len, HDR_VIA_T)==0){ - LOG(L_ERR, "build_res_buf_from_sip_res: error trying to remove first" - "via\n"); - goto error; + if(likely(!(mode&BUILD_NO_VIA1_UPDATE))) { + /* remove the first via*/ + if (del_lump( msg, via_offset, via_len, HDR_VIA_T)==0){ + LOG(L_ERR, "error trying to remove first via\n"); + goto error; + } } new_len=len+body_delta+lumps_len(msg, msg->add_rm, 0); /*FIXME: we don't @@ -2002,7 +2008,7 @@ char * build_res_buf_from_sip_res( struct sip_msg* msg, new_buf=(char*)pkg_malloc(new_len+1); /* +1 is for debugging (\0 to print it )*/ if (new_buf==0){ - LOG(L_ERR, "ERROR: build_res_buf_from_sip_res: out of mem\n"); + LOG(L_ERR, "out of mem\n"); goto error; } new_buf[new_len]=0; /* debug: print the message */ @@ -2015,7 +2021,7 @@ char * build_res_buf_from_sip_res( struct sip_msg* msg, buf+s_offset, len-s_offset); /* send it! */ - DBG("build_res_from_sip_res: copied size: orig:%d, new: %d, rest: %d" + DBG("copied size: orig:%d, new: %d, rest: %d" " msg=\n%s\n", s_offset, offset, len-s_offset, new_buf); *returned_len=new_len; @@ -2025,6 +2031,11 @@ error: return 0; } +char * build_res_buf_from_sip_res( struct sip_msg* msg, + unsigned int *returned_len) +{ + return generate_res_buf_from_sip_res(msg, returned_len, 0); +} char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, struct sip_msg* msg, unsigned int *returned_len, struct bookmark *bmark) diff --git a/msg_translator.h b/msg_translator.h index 33caa40..4848291 100644 --- a/msg_translator.h +++ b/msg_translator.h @@ -87,6 +87,8 @@ char * build_req_buf_from_sip_req(struct sip_msg* msg, char * build_res_buf_from_sip_res(struct sip_msg* msg, unsigned int *returned_len); +char * generate_res_buf_from_sip_res(struct sip_msg* msg, + unsigned int *returned_len, unsigned int mode); char * build_res_buf_from_sip_req(unsigned int code, str *text,

1 0

avpops error line number
by Juha Heinanen 04 Jul '13

04 Jul '13

i didn't get any response to this on users list. perhaps the question fits better to dev list: what would it take to make avpops module to print config file line number when error occurs? now i just get: Jun 24 14:13:43 host /usr/sbin/sip-proxy[29890]: ERROR: avpops [avpops_impl.c:1170]: ops_check_avp(): value types don't match -- juha

2 1

git:tmp/tm_async_reply_support: modules/tm: Updated documentation to include t_suspend
by Richard Good 04 Jul '13

04 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 733d8ca38dd6fc4f931cd48cdb0bf8f7634857e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=733d8ca… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Jul 4 17:10:16 2013 +0200 modules/tm: Updated documentation to include t_suspend - API documentation updated to include new methods: t_suspend_reply, t_continue_reply, t_cancel_suspend_reply --- modules/tm/doc/api.xml | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/modules/tm/doc/api.xml b/modules/tm/doc/api.xml index 2a627ab..7aeea5d 100644 --- a/modules/tm/doc/api.xml +++ b/modules/tm/doc/api.xml @@ -262,5 +262,127 @@ end of body </itemizedlist> <para>Return value: 0 - success, <0 - error.</para> </section> + + <section id="t_suspend_reply"> + <title> + <function>int t_suspend_reply(struct sip_msg *msg, + unsigned int *hash_index, unsigned int *label)</function> + </title> + <para> + For programmatic use only. + This function is the equivalent of t_continue, but used to + suspend on SIP responses. + This function together with t_continue_reply() can be used to + implement asynchronous actions on responses: t_suspend() saves + the transaction, returns its identifiers, and t_continue() continues the + SIP response processing. (The response processing does not continue + from the same point in the script, a separate route block defined + by the parameter of t_continue_reply() is executed instead. The reply lock + is held during the route block execution.) + FR timer is ticking while the transaction is suspended, and the + transaction's failure route is executed if t_continue() is not + called in time. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>msg</emphasis> - SIP message pointer. + </para> + </listitem> + <listitem> + <para><emphasis>hash_index</emphasis> - transaction identifier. + </para> + </listitem> + <listitem> + <para><emphasis>label</emphasis> - transaction identifier. + </para> + </listitem> + </itemizedlist> + <para>Return value: 0 - success, <0 - error.</para> + <para> + Usage: Allocate a memory block for storing the transaction identifiers + (hash_index and label), and for storing also any variable related to + the async query. Before calling t_suspend(), register for the following + callbacks, and pass the pointer to the allocated shared memory as + a parameter: TMCB_ON_FAILURE, TMCB_DESTROY, and TMCB_E2ECANCEL_IN + (in case of INVITE transaction). The async operation can be + cancelled, if it is still pending, when TMCB_ON_FAILURE or + TMCB_E2ECANCEL_IN is called. TMCB_DESTROY is suitable to free + the shared memory allocated for the async and SIP transaction identifiers. + Once the async query result is available call t_continue(), see below. + The SIP transaction must exist before calling t_suspend(), and the module + function calling t_suspend() should return 0 to make sure that the script + processing does not continue. + </para> + </section> + + <section id="t_continue_reply"> + <title> + <function>int t_continue_reply(unsigned int hash_index, unsigned int label, + struct action *route, int branch)</function> + </title> + <para> + For programmatic use only. + This function is the equivalent of t_continue but used to + suspend on SIP responses. + This function is the pair of t_suspend_reply(), and is supposed + to be called when the asynchronous query result is available. + The function executes a route block with the saved SIP message. + The calling application passes in the branch of the suspended + reply when wanting to continue. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hash_index</emphasis> - transaction identifier. + </para> + </listitem> + <listitem> + <para><emphasis>label</emphasis> - transaction identifier. + </para> + </listitem> + <listitem> + <para><emphasis>route</emphasis> - route block to execute. + </para> + </listitem> + <listitem> + <para><emphasis>branch</emphasis> - reply branch to resume. + </para> + </listitem> + </itemizedlist> + <para>Return value: 0 - success, <0 - error.</para> + </section> + + <section id="t_cancel_suspend_reply"> + <title> + <function>int t_cancel_suspend_reply(unsigned int hash_index, unsigned int label, branch)</function> + </title> + <para> + For programmatic use only. + This function is the equivalent of t_cancel_suspend but for SIP + responses. + This function is for revoking t_suspend_reply() from the + same process as it was executed before. t_cancel_suspend_reply() can be + used when something fails after t_suspend_reply() has already been executed + and it turns out that the transcation should not have been + suspended. The function cancels the FR timer of the transacation. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hash_index</emphasis> - transaction identifier. + </para> + </listitem> + <listitem> + <para><emphasis>label</emphasis> - transaction identifier. + </para> + </listitem> + <listitem> + <para><emphasis>branch</emphasis> - reply branch that was suspended. + </para> + </listitem> + </itemizedlist> + <para>Return value: 0 - success, <0 - error.</para> + </section> </section> </section>

1 0

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media
by Richard Good 04 Jul '13

04 Jul '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 7142883555cc5795ca52f27eef6c1477d13713da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7142883… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Jul 4 16:54:52 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

1 0

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support
by Richard Good 04 Jul '13

04 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: c9a32caa6775f1f2970ff6fe4d2638d1a25b9491 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9a32ca… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Jul 4 16:53:20 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support ---

1 0

git:tmp/tm_async_reply_support: modules:tm: Added fake environment methods for responses
by Richard Good 04 Jul '13

04 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 7542ecaeebc0d51e1644f97afdd8ecdd6dc54f4b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7542eca… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Jul 4 16:44:37 2013 +0200 modules:tm: Added fake environment methods for responses - Created new methods faked_resp, free_faked_resp, faked_env_resp - These allow t_suspend to set a fake environment to process suspended responses --- modules/tm/t_reply.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++++ modules/tm/t_reply.h | 5 + modules/tm/t_suspend.c | 89 +++++++++++++++++------ 3 files changed, 265 insertions(+), 22 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=754…

1 0

git:master: tm: avoid double execution of response-in callbacks
by Daniel-Constantin Mierla 04 Jul '13

04 Jul '13

Module: sip-router Branch: master Commit: d4cef7f5e49105c65df9651a1ad086b035f8ffdb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4cef7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 4 11:48:26 2013 +0200 tm: avoid double execution of response-in callbacks - double execution of response-in callbacks could happen when using tm pvs inside core reply route, being done in transaction matching function, which is executed again by tm reply received function --- modules/tm/t_lookup.c | 55 ++++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 25 deletions(-) diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index 8c34a81..fbc624b 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1001,33 +1001,38 @@ int t_reply_matching( struct sip_msg *p_msg , int *p_branch ) REF_UNSAFE( T ); UNLOCK_HASH(hash_index); DBG("DEBUG: t_reply_matching: reply matched (T=%p)!\n",T); - /* if this is a 200 for INVITE, we will wish to store to-tags to be - * able to distinguish retransmissions later and not to call - * TMCB_RESPONSE_OUT uselessly; we do it only if callbacks are - * enabled -- except callback customers, nobody cares about - * retransmissions of multiple 200/INV or ACK/200s - */ - if (unlikely( is_invite(p_cell) && p_msg->REPLY_STATUS>=200 - && p_msg->REPLY_STATUS<300 - && ((!is_local(p_cell) && - has_tran_tmcbs(p_cell, - TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY - |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN) ) - || (is_local(p_cell)&&has_tran_tmcbs(p_cell, TMCB_LOCAL_COMPLETED)) - )) ) { - if (parse_headers(p_msg, HDR_TO_F, 0)==-1) { - LOG(L_ERR, "ERROR: t_reply_matching: to parsing failed\n"); + if(likely(!(p_msg->msg_flags&FL_TM_RPL_MATCHED))) { + /* if this is a 200 for INVITE, we will wish to store to-tags to be + * able to distinguish retransmissions later and not to call + * TMCB_RESPONSE_OUT uselessly; we do it only if callbacks are + * enabled -- except callback customers, nobody cares about + * retransmissions of multiple 200/INV or ACK/200s + */ + if (unlikely( is_invite(p_cell) && p_msg->REPLY_STATUS>=200 + && p_msg->REPLY_STATUS<300 + && ((!is_local(p_cell) && + has_tran_tmcbs(p_cell, + TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY + |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN) ) + || (is_local(p_cell)&&has_tran_tmcbs(p_cell, TMCB_LOCAL_COMPLETED)) + )) ) { + if (parse_headers(p_msg, HDR_TO_F, 0)==-1) { + LOG(L_ERR, "ERROR: t_reply_matching: to parsing failed\n"); + } } - } - if (unlikely(has_tran_tmcbs(T, TMCB_RESPONSE_IN | - TMCB_LOCAL_RESPONSE_IN))){ - if (!is_local(p_cell)) { - run_trans_callbacks( TMCB_RESPONSE_IN, T, T->uas.request, - p_msg, p_msg->REPLY_STATUS); - }else{ - run_trans_callbacks( TMCB_LOCAL_RESPONSE_IN, T, T->uas.request, - p_msg, p_msg->REPLY_STATUS); + if (unlikely(has_tran_tmcbs(T, TMCB_RESPONSE_IN | + TMCB_LOCAL_RESPONSE_IN))){ + if (!is_local(p_cell)) { + run_trans_callbacks( TMCB_RESPONSE_IN, T, T->uas.request, + p_msg, p_msg->REPLY_STATUS); + }else{ + run_trans_callbacks( TMCB_LOCAL_RESPONSE_IN, T, T->uas.request, + p_msg, p_msg->REPLY_STATUS); + } } + p_msg->msg_flags |= FL_TM_RPL_MATCHED; + } else { + DBG("reply in callbacks already done (T=%p)!\n", T); } return 1; } /* for cycle */

1 0

git:master: core: new internam sip msg flag FL_TM_RPL_MATCHED
by Daniel-Constantin Mierla 04 Jul '13

04 Jul '13

Module: sip-router Branch: master Commit: 230a138991b25f7f9b07b4f9cbeffbdd6acef2e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=230a138… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 4 11:47:18 2013 +0200 core: new internam sip msg flag FL_TM_RPL_MATCHED - mark sip reply when matched first time by tm - used to avoid double execution of response-in callbacks --- parser/msg_parser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index d58ea5e..9e97e65 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -119,6 +119,7 @@ typedef enum request_method { #define FL_SDP_BODY (1 << 12) /*!< msg has SDP in body */ #define FL_USE_UAC_FROM (1<<13) /* take FROM hdr from UAC instead of UAS*/ #define FL_USE_UAC_TO (1<<14) /* take TO hdr from UAC instead of UAS */ +#define FL_TM_RPL_MATCHED (1<<15) /* tm matched reply already */ /* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master: core: Fix connection leak with websockets
by Hugh Waite 04 Jul '13

04 Jul '13

Module: sip-router Branch: master Commit: ffdae5987b99b9bfd39992d407a3a0a33aa772ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffdae59… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Thu Jul 4 10:30:51 2013 +0100 core: Fix connection leak with websockets - Decrease connection ref count after using connection --- forward.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/forward.h b/forward.h index 175c53d..4680a8e 100644 --- a/forward.h +++ b/forward.h @@ -134,6 +134,7 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) union sockaddr_union local_addr; struct tcp_connection *con = NULL; struct ws_event_info wsev; + int ret; #endif outb.s = buf; @@ -162,13 +163,13 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) con = tcpconn_get(dst->id, 0, 0, 0, 0); else { LM_CRIT("BUG: msg_send called with null_id & to\n"); - return -1; + goto error; } if (con == NULL) { LM_WARN("TCP/TLS connection for WebSocket could not be found\n"); - return -1; + goto error; } memset(&wsev, 0, sizeof(ws_event_info_t)); @@ -176,7 +177,9 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) wsev.buf = outb.s; wsev.len = outb.len; wsev.id = con->id; - return sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev); + ret = sr_event_exec(SREV_TCP_WS_FRAME_OUT, (void *) &wsev); + tcpconn_put(con); + return ret; } #endif

1 0

git:master: core: Improve tcp stats output
by Hugh Waite 04 Jul '13

04 Jul '13

Module: sip-router Branch: master Commit: fb4dc4b7b866239a90a4d6441ed319664697edab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb4dc4b… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Thu Jul 4 09:33:56 2013 +0100 core: Improve tcp stats output - Add connection ref count - Add websocket protocols --- core_cmd.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index d46c180..304c49d 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -773,8 +773,12 @@ static void core_tcp_list(rpc_t* rpc, void* c) /* tcp data */ if (con->rcv.proto == PROTO_TCP) type = "TCP"; - else if (con->rcv.proto == PROTO_TCP) + else if (con->rcv.proto == PROTO_TLS) type = "TLS"; + else if (con->rcv.proto == PROTO_WSS) + type = "WSS"; + else if (con->rcv.proto == PROTO_WS) + type = "WS"; else type = "UNKNOWN"; @@ -812,11 +816,12 @@ static void core_tcp_list(rpc_t* rpc, void* c) default: state = "UNKNOWN"; } - rpc->struct_add(handle, "dssdsdsd", + rpc->struct_add(handle, "dssddsdsd", "id", con->id, "type", type, "state", state, "timeout", timeout, + "ref_count", con->refcnt, "src_ip", src_ip, "src_port", con->rcv.src_port, "dst_ip", dst_ip,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2013