sr-dev July 2014

sr-dev@lists.kamailio.org

25 participants
140 discussions

[tracker] Task closed: CNXCC: use of pseudo-variables in *cnxcc:call-shutdown* event route
by sip-router 20 Jul '14

20 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#450 - CNXCC: use of pseudo-variables in *cnxcc:call-shutdown* event route User who did this - Carlos Ruiz Diaz (caruizdiaz) Reason for closing: Implemented Additional comments about closing: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5519a2… More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=450 You are receiving this … [View More]

1 0

[tracker] User took ownership: CNXCC: use of pseudo-variables in *cnxcc:call-shutdown* event route
by sip-router 20 Jul '14

20 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Carlos Ruiz Diaz has taken ownership of the following task: FS#450 - CNXCC: use of pseudo-variables in *cnxcc:call-shutdown* event route More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=450 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 … [View More]

1 0

[tracker] Comment added: CNXCC: use of pseudo-variables in *cnxcc:call-shutdown* event route
by sip-router 20 Jul '14

20 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#450 - CNXCC: use of pseudo-variables in *cnxcc:call-shutdown* event route User who did this - Carlos Ruiz Diaz (caruizdiaz) ---------- I didn't have to opportunity to give your patch a try. The code looks good, and I'm assuming you tested it before submission :). Thanks! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=450#… [View More]

1 0

git:master: cnxcc: use of pseudo-variables in *cnxcc: call-shutdown* event route
by Carlos Ruiz Diaz 20 Jul '14

20 Jul '14

Module: sip-router Branch: master Commit: e5519a2762f892ef97f2c4da2e3f8bfd6078211a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5519a2… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Sun Jul 20 08:40:22 2014 -0500 cnxcc: use of pseudo-variables in *cnxcc:call-shutdown* event route - Ticket FS#450 - Patch contributed by Guillaume Bour --- modules/cnxcc/cnxcc_mod.c … [View More]| 42 ++++++++++++++++++++++------------ modules/cnxcc/cnxcc_mod.h | 4 ++- modules/cnxcc/cnxcc_sip_msg_faker.c | 16 +++++++----- modules/cnxcc/cnxcc_sip_msg_faker.h | 2 +- 4 files changed, 40 insertions(+), 24 deletions(-) diff --git a/modules/cnxcc/cnxcc_mod.c b/modules/cnxcc/cnxcc_mod.c index 3c0e9b9..d42ea7d 100644 --- a/modules/cnxcc/cnxcc_mod.c +++ b/modules/cnxcc/cnxcc_mod.c @@ -110,14 +110,14 @@ static int set_max_channels(struct sip_msg* msg, char* str_pv_client, char* str_ static int get_channel_count(struct sip_msg* msg, char* str_pv_client, char* str_pv_max_chan); static int terminate_all(struct sip_msg* msg, char* str_pv_client); -static void start_billing(str *callid, str tags[2]); +static void start_billing(str *callid, str *from_uri, str *to_uri, str tags[2]); static void setup_billing(str *callid, unsigned int h_entry, unsigned int h_id); static void stop_billing(str *callid); static int add_call_by_cid(str *cid, call_t *call, credit_type_t type); static credit_data_t *get_or_create_credit_data_entry(str *client_id, credit_type_t type); static call_t *alloc_new_call_by_time(credit_data_t *credit_data, struct sip_msg *msg, int max_secs); static call_t *alloc_new_call_by_money(credit_data_t *credit_data, struct sip_msg *msg, double credit, double cost_per_second, int initial_pulse, int final_pulse); -static void notify_call_termination(str *callid, str *from_tag, str *to_tag); +static void notify_call_termination(sip_data_t *data); static void free_call(call_t *call); static int has_to_tag(struct sip_msg *msg); @@ -388,7 +388,7 @@ static void dialog_confirmed_callback(struct dlg_cell *cell, int type, struct dl { LM_DBG("Dialog confirmed for CID [%.*s]\n", cell->callid.len, cell->callid.s); - start_billing(&cell->callid, cell->tag); + start_billing(&cell->callid, &cell->from_uri, &cell->to_uri, cell->tag); } static void dialog_terminated_callback(struct dlg_cell *cell, int type, struct dlg_cb_params *params) @@ -398,7 +398,7 @@ static void dialog_terminated_callback(struct dlg_cell *cell, int type, struct d stop_billing(&cell->callid); } -static void notify_call_termination(str *callid, str *from_tag, str *to_tag) +static void notify_call_termination(sip_data_t *data) { struct run_act_ctx ra_ctx; struct sip_msg *msg; @@ -406,9 +406,10 @@ static void notify_call_termination(str *callid, str *from_tag, str *to_tag) if (_data.cs_route_number < 0) return; - if (faked_msg_init_with_dlg_info(callid, from_tag, to_tag, &msg) != 0) + if (faked_msg_init_with_dlg_info(&data->callid, &data->from_uri, &data->from_tag, + &data->to_uri, &data->to_tag, &msg) != 0) { - LM_ERR("[%.*s]: error generating faked sip message\n", callid->len, callid->s); + LM_ERR("[%.*s]: error generating faked sip message\n", data->callid.len, data->callid.s); return; } @@ -662,8 +663,8 @@ static void stop_billing(str *callid) static void setup_billing(str *callid, unsigned int h_entry, unsigned int h_id) { - call_t *call = NULL; - hash_tables_t *hts = NULL; + call_t *call = NULL; + hash_tables_t *hts = NULL; LM_DBG("Creating dialog for [%.*s], h_id [%u], h_entry [%u]\n", callid->len, callid->s, h_id, h_entry); @@ -710,12 +711,12 @@ static void setup_billing(str *callid, unsigned int h_entry, unsigned int h_id) lock_release(&call->lock); } -static void start_billing(str *callid, str tags[2]) +static void start_billing(str *callid, str *from_uri, str *to_uri, str tags[2]) { struct str_hash_entry *cd_entry = NULL; - call_t *call = NULL; - hash_tables_t *hts = NULL; - credit_data_t *credit_data = NULL; + call_t *call = NULL; + hash_tables_t *hts = NULL; + credit_data_t *credit_data = NULL; LM_DBG("Billing started for call [%.*s]\n", callid->len, callid->s); @@ -815,10 +816,22 @@ static void start_billing(str *callid, str tags[2]) goto exit; } + if(shm_str_dup(&call->sip_data.from_uri, from_uri) != 0 || + shm_str_dup(&call->sip_data.to_uri , to_uri) != 0) + { + LM_ERR("No more pkg memory\n"); + goto exit; + } + call->start_timestamp = get_current_timestamp(); call->confirmed = TRUE; - LM_DBG("Call [%.*s] from client [%.*s], confirmed\n", callid->len, callid->s, call->client_id.len, call->client_id.s); + LM_DBG("Call [%.*s] from client [%.*s], confirmed. from=<%.*s>;tag=%.*s, to=<%.*s>;tag=%.*s\n", + callid->len, callid->s, call->client_id.len, call->client_id.s, + call->sip_data.from_uri.len, call->sip_data.from_uri.s, + call->sip_data.from_tag.len, call->sip_data.from_tag.s, + call->sip_data.to_uri.len, call->sip_data.to_uri.s, + call->sip_data.to_tag.len, call->sip_data.to_tag.s); exit: lock_release(&call->lock); @@ -1060,8 +1073,7 @@ int terminate_call(call_t *call) free_mi_tree(root); free_mi_tree(result); - notify_call_termination(&call->sip_data.callid, &call->sip_data.from_tag, &call->sip_data.to_tag); - + notify_call_termination(&call->sip_data); return 0; } diff --git a/modules/cnxcc/cnxcc_mod.h b/modules/cnxcc/cnxcc_mod.h index 835566c..12febe3 100644 --- a/modules/cnxcc/cnxcc_mod.h +++ b/modules/cnxcc/cnxcc_mod.h @@ -89,8 +89,10 @@ typedef struct data typedef struct sip_data { str callid; - str to_tag; + str from_uri; str from_tag; + str to_uri; + str to_tag; } sip_data_t; typedef struct money_spec_data diff --git a/modules/cnxcc/cnxcc_sip_msg_faker.c b/modules/cnxcc/cnxcc_sip_msg_faker.c index 778b13f..41c09e0 100644 --- a/modules/cnxcc/cnxcc_sip_msg_faker.c +++ b/modules/cnxcc/cnxcc_sip_msg_faker.c @@ -27,21 +27,23 @@ #include <sys/socket.h> -#define FAKED_SIP_MSG_FORMAT "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <you(a)kamailio.org>;tag=%.*s\r\nTo: <you(a)kamailio.org>;tag=%.*s\r\nCall-ID: %.*s\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" +#define FAKED_SIP_MSG_FORMAT "OPTIONS sip:you@kamailio.org SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1\r\nFrom: <%.*s>;tag=%.*s\r\nTo: <%.*s>;tag=%.*s\r\nCall-ID: %.*s\r\nCSeq: 1 OPTIONS\r\nContent-Length: 0\r\n\r\n" #define FAKED_SIP_MSG_BUF_LEN 1024 char _faked_sip_msg_buf[FAKED_SIP_MSG_BUF_LEN]; static struct sip_msg _faked_msg; -int faked_msg_init_with_dlg_info(str *callid, str *from_tag, str *to_tag, struct sip_msg **msg) +int faked_msg_init_with_dlg_info(str *callid, str *from_uri, str *from_tag, str *to_uri, str *to_tag, struct sip_msg **msg) { memset(_faked_sip_msg_buf, 0, FAKED_SIP_MSG_BUF_LEN); - sprintf(_faked_sip_msg_buf, FAKED_SIP_MSG_FORMAT, from_tag->len, from_tag->s, - to_tag->len, to_tag->s, - callid->len, callid->s); + sprintf(_faked_sip_msg_buf, FAKED_SIP_MSG_FORMAT, + from_uri->len, from_uri->s, from_tag->len, from_tag->s, + to_uri->len, to_uri->s, to_tag->len, to_tag->s, + callid->len, callid->s); + LM_DBG("fake msg:\n%s\n", _faked_sip_msg_buf); memset(&_faked_msg, 0, sizeof(struct sip_msg)); _faked_msg.buf = _faked_sip_msg_buf; @@ -52,8 +54,8 @@ int faked_msg_init_with_dlg_info(str *callid, str *from_tag, str *to_tag, struc if (parse_msg(_faked_msg.buf, _faked_msg.len, &_faked_msg) != 0) { - LM_ERR("parse_msg failed\n"); - return -1; + LM_ERR("parse_msg failed\n"); + return -1; } _faked_msg.rcv.proto = PROTO_UDP; diff --git a/modules/cnxcc/cnxcc_sip_msg_faker.h b/modules/cnxcc/cnxcc_sip_msg_faker.h index 2f0507a..b038d57 100644 --- a/modules/cnxcc/cnxcc_sip_msg_faker.h +++ b/modules/cnxcc/cnxcc_sip_msg_faker.h @@ -24,6 +24,6 @@ #ifndef CNXCC_SIP_MSG_FAKER_H_ #define CNXCC_SIP_MSG_FAKER_H_ -int faked_msg_init_with_dlg_info(str *callid, str *from_tag, str *to_tag, struct sip_msg **msg); +int faked_msg_init_with_dlg_info(str *callid, str *from_uri, str *from_tag, str *to_uri, str *to_tag, struct sip_msg **msg); #endif /* CNXCC_SIP_MSG_FAKER_H_ */ [View Less]

1 0

[tracker] Task closed: CNXCC: add \n at end of each log outputs (LM_XXX functions)
by sip-router 20 Jul '14

20 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#452 - CNXCC: add \n at end of each log outputs (LM_XXX functions) User who did this - Carlos Ruiz Diaz (caruizdiaz) Reason for closing: Fixed Additional comments about closing: Completed. http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=516eee4… More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=452 You are receiving this … [View More]

1 0

git:master: Added LF character at the end of every log message
by Carlos Ruiz Diaz 20 Jul '14

20 Jul '14

Module: sip-router Branch: master Commit: 516eee4a8f9d49e7810784587edd08517b868c12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=516eee4… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Sun Jul 20 08:19:32 2014 -0500 Added LF character at the end of every log message - requested in ticket FS#452 --- modules/cnxcc/cnxcc_check.c | 4 +- modules/cnxcc/cnxcc_mod.c | 64 ++… [View More]

1 0

[tracker] Comment added: db_unixodbc cannot load more than 1024 bytes from a database field (patch supplied)
by sip-router 18 Jul '14

18 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#443 - db_unixodbc cannot load more than 1024 bytes from a database field (patch supplied) User who did this - Alex Villacis Lasso (a_villacis) ---------- I made it a void function because the original code does not abort processing if SQLGetData fails in the inner loop - it just reports the error and goes to the next cell. I wanted to preserve the original code structure as much as possible. Looking … [View More]

1 0

git:master: tmx: fixed type in doc example for t_continue()
by Daniel-Constantin Mierla 18 Jul '14

18 Jul '14

Module: sip-router Branch: master Commit: 3e51a293bccf6dd69f5560a00a8d20d54a0836ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e51a29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 18 16:57:35 2014 +0200 tmx: fixed type in doc example for t_continue() --- modules/tmx/README | 34 +++++++++++++++++----------------- modules/tmx/doc/tmx_admin.xml | 2 +… [View More]- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/tmx/README b/modules/tmx/README index eaaa718..9a6b472 100644 --- a/modules/tmx/README +++ b/modules/tmx/README @@ -22,7 +22,7 @@ Juha Heinanen <jh(a)tutpro.com> - Copyright (c) 2009 Daniel-Constantin Mierla + Copyright � 2009 Daniel-Constantin Mierla __________________________________________________________________ Table of Contents @@ -166,7 +166,7 @@ Chapter 1. Admin Guide 3.9. t_continue(tindex, tlabel, rtname) 3.10. t_reuse_branch() -3.1. t_cancel_branches(which) +3.1. t_cancel_branches(which) Cancel branches of an active SIP transaction. The function can be called for a SIP reply that will identify the current branch. @@ -185,7 +185,7 @@ if (t_cancel_branches("all")) { } ... -3.2. t_cancel_callid(callid, cseq, flag) +3.2. t_cancel_callid(callid, cseq, flag) Cancel first INVITE transaction identified by callid and cseq. It sets the flag if the value is greater than zero @@ -204,7 +204,7 @@ if (t_cancel_callid("123qaz", "5", "22")) { } ... -3.3. t_reply_callid(callid, cseq, code, reason) +3.3. t_reply_callid(callid, cseq, code, reason) Send reply to first INVITE transaction identified by callid and cseq. @@ -223,7 +223,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { } ... -3.4. t_flush_flags() +3.4. t_flush_flags() Flush the flags from current SIP message into the already created transaction. It make sense only in routing block if the transaction was @@ -236,7 +236,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { t_flush_flags(); ... -3.5. t_is_failure_route() +3.5. t_is_failure_route() Returns true if the top-executed route block is failure_route. @@ -253,7 +253,7 @@ route[abc] { } ... -3.6. t_is_branch_route() +3.6. t_is_branch_route() Returns true if the top-executed route block is branch_route. @@ -270,7 +270,7 @@ route[abc] { } ... -3.7. t_is_reply_route() +3.7. t_is_reply_route() Returns true if the top-executed route block is reply_route. @@ -287,7 +287,7 @@ route[abc] { } ... -3.8. t_suspend() +3.8. t_suspend() Suspend the execution of SIP request in a transaction. If transaction was not created yet, it is created by this function. Returns true in @@ -305,7 +305,7 @@ if(t_suspend()) } ... -3.9. t_continue(tindex, tlabel, rtname) +3.9. t_continue(tindex, tlabel, rtname) Continue the execution of the transaction identified by tindex and tlabel with the actions defined in route[rtname]. @@ -322,10 +322,10 @@ if(t_suspend()) Example 1.9. t_continue usage ... -tcontinue('123', '456', 'MYROUTE'); +t_continue('123', '456', 'MYROUTE'); ... -3.10. t_reuse_branch() +3.10. t_reuse_branch() Creates new "main" branch by making copy of branch-failure branch. Currently the following branch attributes are copied from @@ -366,7 +366,7 @@ event_route [tm:branch-failure:contact] { 5.4. t_reply 5.5. t_reply_callid -5.1. t_uac_dlg +5.1. t_uac_dlg Generates and sends a local SIP request. @@ -381,7 +381,7 @@ event_route [tm:branch-failure:contact] { * body - (optional, may not be present) request body (if present, requires the "Content-Type" and "Content-length" headers) -5.2. t_uac_cancel +5.2. t_uac_cancel Generates and sends a CANCEL for an existing local SIP request. @@ -389,14 +389,14 @@ event_route [tm:branch-failure:contact] { * callid - callid of the INVITE request to be cancelled. * cseq - cseq of the INVITE request to be cancelled. -5.3. t_hash +5.3. t_hash Gets information about the load of TM internal hash table. Parameters: * none -5.4. t_reply +5.4. t_reply Generates and sends a reply for an existing inbound SIP transaction. @@ -410,7 +410,7 @@ event_route [tm:branch-failure:contact] { * body - (optional, may not be present) reply body (if present, requires the "Content-Type" and "Content-length" headers) -5.5. t_reply_callid +5.5. t_reply_callid Generates and sends a reply for an existing inbound SIP transaction. diff --git a/modules/tmx/doc/tmx_admin.xml b/modules/tmx/doc/tmx_admin.xml index e4ee84a..9042763 100644 --- a/modules/tmx/doc/tmx_admin.xml +++ b/modules/tmx/doc/tmx_admin.xml @@ -327,7 +327,7 @@ if(t_suspend()) <title><function>t_continue</function> usage</title> <programlisting format="linespecific"> ... -tcontinue('123', '456', 'MYROUTE'); +t_continue('123', '456', 'MYROUTE'); ... </programlisting> </example> [View Less]

1 0

git:master: nosip: new module allowing to handle non-sip packets via event route
by Daniel-Constantin Mierla 18 Jul '14

18 Jul '14

Module: sip-router Branch: master Commit: a29089207ac592ff2ae079e2ebd918722b22f1d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a290892… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 18 16:58:14 2014 +0200 nosip: new module allowing to handle non-sip packets via event route - packets that fail to be parsed as SIP messages are given to event_route[nosip:msg] - use … [View More]

1 0

git:master: core: new core event executed when a non sip packet is received
by Daniel-Constantin Mierla 18 Jul '14

18 Jul '14

Module: sip-router Branch: master Commit: ac0bd3790b40a4788cea83542b99fe9dd08116bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac0bd37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 18 16:01:29 2014 +0200 core: new core event executed when a non sip packet is received - event type SREV_RCV_NOSIP --- events.c | 13 +++++++++++++ events.h | 3 ++- 2 files … [View More]

1 0

← Newer
1
...
6
7
8
9
10
11
12
13
14
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 2014