sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
247 discussions

git:rfuchs/rtpproxy-ng: rtpproxy-ng: implement $rtpstat and document start_recording()
by Richard Fuchs 11 Jul '13

11 Jul '13

Module: sip-router Branch: rfuchs/rtpproxy-ng Commit: eba7dcbe6b3ba7b88c0fa0b231cb265a68995e47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eba7dcb… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Thu Jul 11 15:36:54 2013 -0400 rtpproxy-ng: implement $rtpstat and document start_recording() --- modules/rtpproxy-ng/README | 43 +++++++--- modules/rtpproxy-ng/doc/rtpproxy_admin.xml | 16 ++-- modules/rtpproxy-ng/rtpproxy.c | 123 +++++++++++++-------------- 3 files changed, 98 insertions(+), 84 deletions(-) diff --git a/modules/rtpproxy-ng/README b/modules/rtpproxy-ng/README index 6c33f36..3155db6 100644 --- a/modules/rtpproxy-ng/README +++ b/modules/rtpproxy-ng/README @@ -74,10 +74,11 @@ Richard Fuchs 5.4. rtpproxy_destroy([flags]) 5.5. unforce_rtp_proxy() 5.6. rtpproxy_manage([flags [, ip_address]]) + 5.7. start_recording() 6. Exported Pseudo Variables - 6.1. $rtpstart + 6.1. $rtpstat 7. MI Commands @@ -98,9 +99,10 @@ Richard Fuchs 1.8. rtpproxy_answer usage 1.9. rtpproxy_destroy usage 1.10. rtpproxy_manage usage - 1.11. $rtpstat-Usage - 1.12. nh_enable_rtpp usage - 1.13. nh_show_rtpp usage + 1.11. start_recording usage + 1.12. $rtpstat Usage + 1.13. nh_enable_rtpp usage + 1.14. nh_show_rtpp usage Chapter 1. Admin Guide @@ -129,10 +131,11 @@ Chapter 1. Admin Guide 5.4. rtpproxy_destroy([flags]) 5.5. unforce_rtp_proxy() 5.6. rtpproxy_manage([flags [, ip_address]]) + 5.7. start_recording() 6. Exported Pseudo Variables - 6.1. $rtpstart + 6.1. $rtpstat 7. MI Commands @@ -278,6 +281,7 @@ modparam("rtpproxy-ng", "extra_id_pv", "$avp(extra_id)") 5.4. rtpproxy_destroy([flags]) 5.5. unforce_rtp_proxy() 5.6. rtpproxy_manage([flags [, ip_address]]) + 5.7. start_recording() 5.1. set_rtp_proxy_set(setid) @@ -538,18 +542,31 @@ rtpproxy_destroy(); rtpproxy_manage(); ... +5.7. start_recording() + + This function will send a signal to the RTP Proxy to record the RTP + stream on the RTP Proxy. This function is not supported by + ngcp-mediaproxy-ng at the moment! + + This function can be used from REQUEST_ROUTE and ONREPLY_ROUTE. + + Example 1.11. start_recording usage +... +start_recording(); +... + 6. Exported Pseudo Variables - 6.1. $rtpstart + 6.1. $rtpstat -6.1. $rtpstart +6.1. $rtpstat - Returns the RTP-Statistics from the RTP-Proxy. The RTP-Statistics from - the RTP-Proxy are provided as a string and it does contain several - packet-counters. The statistics must be retrieved before the session is + Returns the RTP Statistics from the RTP Proxy. The RTP Statistics from + the RTP Proxy are provided as a string and it does contain several + packet counters. The statistics must be retrieved before the session is deleted (before unforce_rtpproxy()). - Example 1.11. $rtpstat-Usage + Example 1.12. $rtpstat Usage ... append_hf("X-RTP-Statistics: $rtpstat\r\n"); ... @@ -572,7 +589,7 @@ rtpproxy_manage(); NOTE: if a rtpproxy is defined multiple times (in the same or diferente sete), all of its instances will be enables/disabled. - Example 1.12. nh_enable_rtpp usage + Example 1.13. nh_enable_rtpp usage ... $ kamctl fifo nh_enable_rtpp udp:192.168.2.133:8081 0 ... @@ -584,7 +601,7 @@ $ kamctl fifo nh_enable_rtpp udp:192.168.2.133:8081 0 No parameter. - Example 1.13. nh_show_rtpp usage + Example 1.14. nh_show_rtpp usage ... $ kamctl fifo nh_show_rtpp ... diff --git a/modules/rtpproxy-ng/doc/rtpproxy_admin.xml b/modules/rtpproxy-ng/doc/rtpproxy_admin.xml index 074beeb..9ad60c3 100644 --- a/modules/rtpproxy-ng/doc/rtpproxy_admin.xml +++ b/modules/rtpproxy-ng/doc/rtpproxy_admin.xml @@ -710,14 +710,15 @@ rtpproxy_manage(); These functions can be used from REQUEST_ROUTE, ONREPLY_ROUTE. </para> </section> +--> <section> <title> <function moreinfo="none">start_recording()</function> </title> <para> - This function will send a signal to the RTP-Proxy to record - the RTP stream on the RTP-Proxy. - <emphasis>This function is only supported by Sippy RTPproxy at the moment!</emphasis> + This function will send a signal to the RTP Proxy to record + the RTP stream on the RTP Proxy. + <emphasis>This function is not supported by ngcp-mediaproxy-ng at the moment!</emphasis> </para> <para> This function can be used from REQUEST_ROUTE and ONREPLY_ROUTE. @@ -731,6 +732,7 @@ start_recording(); </programlisting> </example> </section> +<!-- <section id="rtpproxy_stop_stream2uas"> <title> <function>rtpproxy_stop_stream2uas(prompt_name, count)</function> @@ -747,15 +749,15 @@ start_recording(); <section> <title>Exported Pseudo Variables</title> <section> - <title><function moreinfo="none">$rtpstart</function></title> + <title><function moreinfo="none">$rtpstat</function></title> <para> - Returns the RTP-Statistics from the RTP-Proxy. The RTP-Statistics from the RTP-Proxy - are provided as a string and it does contain several packet-counters. The statistics + Returns the RTP Statistics from the RTP Proxy. The RTP Statistics from the RTP Proxy + are provided as a string and it does contain several packet counters. The statistics must be retrieved before the session is deleted (before <function>unforce_rtpproxy()</function>). </para> <example> - <title>$rtpstat-Usage</title> + <title>$rtpstat Usage</title> <programlisting format="linespecific"> ... append_hf("X-RTP-Statistics: $rtpstat\r\n"); diff --git a/modules/rtpproxy-ng/rtpproxy.c b/modules/rtpproxy-ng/rtpproxy.c index fe49329..7675cc8 100644 --- a/modules/rtpproxy-ng/rtpproxy.c +++ b/modules/rtpproxy-ng/rtpproxy.c @@ -283,13 +283,15 @@ enum rtpp_operation { OP_ANSWER, OP_DELETE, OP_START_RECORDING, + OP_QUERY, }; static const char *command_strings[] = { - [1] = "offer", - [2] = "answer", - [3] = "delete", - [4] = "start recording", + [OP_OFFER] = "offer", + [OP_ANSWER] = "answer", + [OP_DELETE] = "delete", + [OP_START_RECORDING] = "start recording", + [OP_QUERY] = "query", }; static char *gencookie(); @@ -1364,6 +1366,23 @@ static int rtpp_function_call_simple(struct sip_msg *msg, enum rtpp_operation op return 1; } +static bencode_item_t *rtpp_function_call_ok(bencode_buffer_t *bencbuf, struct sip_msg *msg, + enum rtpp_operation op, const char *flags_str, str *body) { + bencode_item_t *ret; + + ret = rtpp_function_call(bencbuf, msg, op, flags_str, body); + if (!ret) + return NULL; + + if (bencode_dictionary_get_strcmp(ret, "result", "ok")) { + LM_ERR("proxy didn't return \"ok\" result\n"); + bencode_buffer_free(bencbuf); + return NULL; + } + + return ret; +} + static int @@ -1865,15 +1884,10 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc str body, newbody; struct lump *anchor; - dict = rtpp_function_call(&bencbuf, msg, offer ? OP_OFFER : OP_ANSWER, str1, &body); + dict = rtpp_function_call_ok(&bencbuf, msg, offer ? OP_OFFER : OP_ANSWER, str1, &body); if (!dict) return -1; - if (bencode_dictionary_get_strcmp(dict, "result", "ok")) { - LM_ERR("proxy didn't return \"ok\" result\n"); - goto error; - } - if (!bencode_dictionary_get_str_dup(dict, "sdp", &newbody)) { LM_ERR("failed to extract sdp body from proxy reply\n"); goto error; @@ -1913,59 +1927,40 @@ static int pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { -#if 0 - str ret_val = {0, 0}; - int nitems; - str callid = {0, 0}; - str from_tag = {0, 0}; - str to_tag = {0, 0}; - struct rtpp_node *node; - struct iovec v[1 + 4 + 3 + 1] = {{NULL, 0}, {"Q", 1}, {" ", 1}, {NULL, 0}, - {" ", 1}, {NULL, 0}, {";1 ", 3}, {";1", }, {NULL, 0}}; - - if (get_callid(msg, &callid) == -1 || callid.len == 0) { - LM_ERR("can't get Call-Id field\n"); - return pv_get_null(msg, param, res); - } - if (get_to_tag(msg, &to_tag) == -1) { - LM_ERR("can't get To tag\n"); - return pv_get_null(msg, param, res); - } - if (get_from_tag(msg, &from_tag) == -1 || from_tag.len == 0) { - LM_ERR("can't get From tag\n"); - return pv_get_null(msg, param, res); - } - if(msg->id != current_msg_id){ - selected_rtpp_set = default_rtpp_set; - } - - STR2IOVEC(callid, v[3]); - STR2IOVEC(from_tag, v[5]); - STR2IOVEC(to_tag, v[7]); - node = select_rtpp_node(callid, 1); - if (!node) { - LM_ERR("no available proxies\n"); - return -1; - } - nitems = 8; - if (msg->first_line.type == SIP_REPLY) { - if (to_tag.len == 0) - return -1; - STR2IOVEC(to_tag, v[5]); - STR2IOVEC(from_tag, v[7]); - } else { - STR2IOVEC(from_tag, v[5]); - STR2IOVEC(to_tag, v[7]); - if (to_tag.len <= 0) - nitems = 6; - } - ret_val.s = send_rtpp_command(node, v, nitems); - if(ret_val.s==NULL) - return pv_get_null(msg, param, res); - ret_val.len = strlen(ret_val.s); - return pv_get_strval(msg, param, res, &ret_val); -#else - return 1; -#endif + bencode_buffer_t bencbuf; + bencode_item_t *dict, *tot, *in, *out; + static char buf[256]; + str ret; + + dict = rtpp_function_call_ok(&bencbuf, msg, OP_QUERY, NULL, NULL); + if (!dict) + return -1; + + tot = bencode_dictionary_get_expect(dict, "totals", BENCODE_DICTIONARY); + in = bencode_dictionary_get_expect(tot, "input", BENCODE_DICTIONARY); + in = bencode_dictionary_get_expect(in, "rtp", BENCODE_DICTIONARY); + out = bencode_dictionary_get_expect(tot, "output", BENCODE_DICTIONARY); + out = bencode_dictionary_get_expect(out, "rtp", BENCODE_DICTIONARY); + + if (!in || !out) + goto error; + + ret.s = buf; + ret.len = snprintf(buf, sizeof(buf), + "Input: %lli bytes, %lli packets, %lli errors; " + "Output: %lli bytes, %lli packets, %lli errors", + bencode_dictionary_get_integer(in, "bytes", -1), + bencode_dictionary_get_integer(in, "packets", -1), + bencode_dictionary_get_integer(in, "errors", -1), + bencode_dictionary_get_integer(out, "bytes", -1), + bencode_dictionary_get_integer(out, "packets", -1), + bencode_dictionary_get_integer(out, "errors", -1)); + + bencode_buffer_free(&bencbuf); + return pv_get_strval(msg, param, res, &ret); + +error: + bencode_buffer_free(&bencbuf); + return -1; }

1 0

git:master: Makefile.defs: version set to 4.1.0-dev7
by Daniel-Constantin Mierla 11 Jul '13

11 Jul '13

Module: sip-router Branch: master Commit: d7d27cd803284ced4d709da543e64e553e0547ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7d27cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 11 20:43:54 2013 +0200 Makefile.defs: version set to 4.1.0-dev7 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 7026f5d..0cb1f01 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -165,7 +165,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -dev7 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[tracker] Task closed: Kamailio hangs on start after dialog module reads variables from database
by sip-router 11 Jul '13

11 Jul '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#171 - Kamailio hangs on start after dialog module reads variables from database User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Mistakenly reopened. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=171 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task reopened: Kamailio hangs on start after dialog module reads variables from database
by sip-router 11 Jul '13

11 Jul '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been re-opened: FS#171 - Kamailio hangs on start after dialog module reads variables from database User who did this - Daniel-Constantin Mierla (miconda) More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=171 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task closed: ACK not in transaction when t_relay or t_check_trans
by sip-router 11 Jul '13

11 Jul '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#229 - ACK not in transaction when t_relay or t_check_trans User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=229 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: ACK not in transaction when t_relay or t_check_trans
by sip-router 11 Jul '13

11 Jul '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#229 - ACK not in transaction when t_relay or t_check_trans User who did this - Daniel-Constantin Mierla (miconda) ---------- The problem is that the ACK for re-INVITE does not come with a Route header. Try to use record_route() even for INVITEs that have To-tag (within dialog routing block) -- this shouldn't be needed based on rfc, but maybe some UAs don't follow that. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=229#comment993 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task closed: "Error while parsing Route HF" for some INVITEs
by sip-router 11 Jul '13

11 Jul '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#169 - "Error while parsing Route HF" for some INVITEs User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Works for me More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=169 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task closed: UAC generates messages with a NULL body which failes in SANITY module check
by sip-router 11 Jul '13

11 Jul '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#295 - UAC generates messages with a NULL body which failes in SANITY module check User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=295 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task closed: db_unixodbc: Reserved filename blocks checkout in Windows
by sip-router 11 Jul '13

11 Jul '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#316 - db_unixodbc: Reserved filename blocks checkout in Windows User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=316 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:tmp/tm_async_reply_support: modules/tm: added dedicated lock for async continue, instead of using reply lock
by Jason Penton 11 Jul '13

11 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: a426434e80aca76bf32f54c2659e5a5be73bb78e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a426434… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Thu Jul 11 17:48:18 2013 +0200 modules/tm: added dedicated lock for async continue, instead of using reply lock --- modules/tm/h_table.c | 1 + modules/tm/h_table.h | 3 +++ modules/tm/lock.c | 35 ++++++++++++++++++++++++++++++++++- modules/tm/lock.h | 1 + modules/tm/t_reply.c | 42 ------------------------------------------ modules/tm/t_reply.h | 2 ++ modules/tm/t_suspend.c | 4 ++-- 7 files changed, 43 insertions(+), 45 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 92e8ba8..0f24d96 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -380,6 +380,7 @@ struct cell* build_cell( struct sip_msg* p_msg ) init_synonym_id(new_cell); init_cell_lock( new_cell ); + init_async_lock( new_cell ); t_stats_created(); return new_cell; diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 966f374..e4f2fa1 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -444,6 +444,9 @@ typedef struct cell /* protection against concurrent reply processing */ ser_lock_t reply_mutex; + + /* protect against concurrent async continues */ + ser_lock_t async_mutex; ticks_t fr_timeout; /* final response interval for retr_bufs */ ticks_t fr_inv_timeout; /* final inv. response interval for retr_bufs */ diff --git a/modules/tm/lock.c b/modules/tm/lock.c index 461f58e..224e64b 100644 --- a/modules/tm/lock.c +++ b/modules/tm/lock.c @@ -71,6 +71,7 @@ static int sem_nr; gen_lock_set_t* entry_semaphore=0; gen_lock_set_t* reply_semaphore=0; +gen_lock_set_t* async_semaphore=0; #endif @@ -100,6 +101,10 @@ again: lock_set_destroy(reply_semaphore); lock_set_dealloc(reply_semaphore); } + if (async_semaphore!=0){ + lock_set_destroy(async_semaphore); + lock_set_dealloc(async_semaphore); + } if (i==0){ LOG(L_CRIT, "lock_initialize: could not allocate semaphore" @@ -154,6 +159,20 @@ again: i--; goto again; } + + i++; + if (((async_semaphore=lock_set_alloc(i))==0)|| + (lock_set_init(async_semaphore)==0)){ + if (async_semaphore){ + lock_set_dealloc(async_semaphore); + async_semaphore=0; + } + DBG("DEBUG:lock_initialize: async semaphore initialization" + " failure: %s\n", strerror(errno)); + probe_run=1; + i--; + goto again; + } /* return success */ LOG(L_INFO, "INFO: semaphore arrays of size %d allocated\n", sem_nr ); @@ -193,7 +212,11 @@ void lock_cleanup() lock_set_destroy(reply_semaphore); lock_set_dealloc(reply_semaphore); }; - entry_semaphore = reply_semaphore = 0; + if (async_semaphore !=0) { + lock_set_destroy(async_semaphore); + lock_set_dealloc(async_semaphore); + }; + entry_semaphore = reply_semaphore = async_semaphore = 0; } #endif /*GEN_LOCK_T_PREFERED*/ @@ -201,6 +224,16 @@ void lock_cleanup() +int init_async_lock( struct cell *cell ) +{ +#ifdef GEN_LOCK_T_PREFERED + lock_init(&cell->async_mutex); +#else + cell->async_mutex.semaphore_set=async_semaphore; + cell->async_mutex.semaphore_index = cell->hash_index % sem_nr; +#endif /* GEN_LOCK_T_PREFERED */ + return 0; +} int init_cell_lock( struct cell *cell ) { diff --git a/modules/tm/lock.h b/modules/tm/lock.h index ee06cab..54239de 100644 --- a/modules/tm/lock.h +++ b/modules/tm/lock.h @@ -75,6 +75,7 @@ void lock_cleanup(void); int init_cell_lock( struct cell *cell ); +int init_async_lock( struct cell *cell ); int init_entry_lock( struct s_table* ht, struct entry *entry ); diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 4ab4532..c009a18 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -952,29 +952,12 @@ void faked_env_resp( struct cell *t, struct sip_msg *msg) } void faked_env_async( struct cell *t, struct sip_msg *msg) { - static int backup_route_type; - static struct cell *backup_t; - static int backup_branch; - static unsigned int backup_msgid; - static avp_list_t* backup_user_from, *backup_user_to; - static avp_list_t* backup_domain_from, *backup_domain_to; - static avp_list_t* backup_uri_from, *backup_uri_to; -#ifdef WITH_XAVP - static sr_xavp_t **backup_xavps; -#endif - static struct socket_info* backup_si; - - static struct lump *backup_add_rm; - static struct lump *backup_body_lumps; - static struct lump_rpl *backup_reply_lump; - if (msg) { /* remember we are back in request processing, but process * a shmem-ed replica of the request; advertise it in route type; * for example t_reply needs to know that */ - backup_route_type=get_route_type(); set_route_type(t->async_backup.backup_route); if (t->async_backup.ruri_new) { ruri_mark_new(); @@ -987,37 +970,12 @@ void faked_env_async( struct cell *t, struct sip_msg *msg) { ruri_mark_consumed(); /* in failure route we assume ruri should not be used again for forking */ } - /* also, tm actions look in beginning whether transaction is - * set -- whether we are called from a reply-processing - * or a timer process, we need to set current transaction; - * otherwise the actions would attempt to look the transaction - * up (unnecessary overhead, refcounting) - */ - /* backup */ - backup_t=get_t(); - backup_branch=get_t_branch(); - backup_msgid=global_msg_id; /* fake transaction and message id */ global_msg_id=msg->id; set_t(t, t->async_backup.backup_branch); - /* make available the avp list from transaction */ - backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from ); - backup_uri_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to ); - backup_user_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from ); - backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); - backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); - backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); -#ifdef WITH_XAVP - backup_xavps = xavp_set_list(&t->xavps_list); -#endif /* set default send address to the saved value */ - backup_si=bind_address; bind_address=t->uac[0].request.dst.send_sock; - /* backup lump lists */ - backup_add_rm = t->uas.request->add_rm; - backup_body_lumps = t->uas.request->body_lumps; - backup_reply_lump = t->uas.request->reply_lump; } else { /* on async restore - we don't need to do anything because we never really had an environment to restore prior to the suspend anyway ;) */ diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 6ac7928..d2f1370 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -148,6 +148,8 @@ int t_get_reply_totag(struct sip_msg *msg, str *totag); #define LOCK_REPLIES(_t) lock(&(_t)->reply_mutex ) #define UNLOCK_REPLIES(_t) unlock(&(_t)->reply_mutex ) +#define LOCK_ASYNC_CONTINUE(_t) lock(&(_t)->async_mutex ) +#define UNLOCK_ASYNC_CONTINUE(_t) unlock(&(_t)->async_mutex ) /* This function is called whenever a reply for our module is received; * we need to register this function on module initialization; diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index adc8faa..c7e331d 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -203,7 +203,7 @@ int t_continue(unsigned int hash_index, unsigned int label, /* The transaction has to be locked to protect it * form calling t_continue() multiple times simultaneously */ - LOCK_REPLIES(t); + LOCK_ASYNC_CONTINUE(t); /* Try to find the blind UAC, and cancel its fr timer. * We assume that the last blind uac called t_continue(). */ @@ -303,7 +303,7 @@ int t_continue(unsigned int hash_index, unsigned int label, } } - UNLOCK_REPLIES(t); + UNLOCK_ASYNC_CONTINUE(t); /* unref the transaction */ t_unref(t->uas.request);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
25
Older →

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