sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:master: registrar(s): doc - fix reply_reason_attr name
by Andrei Pelinescu-Onciul 13 Oct '10

13 Oct '10

Module: sip-router Branch: master Commit: 50eb81b1287292238aa4b194cfcdba2afa8b4f89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50eb81b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 12 19:31:07 2010 +0200 registrar(s): doc - fix reply_reason_attr name The docs used reply_code_reason_attr instead of reply_reason_attr. --- modules_s/registrar/README | 4 ++-- modules_s/registrar/doc/params.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_s/registrar/README b/modules_s/registrar/README index ba553ea..53dd93b 100644 --- a/modules_s/registrar/README +++ b/modules_s/registrar/README @@ -32,7 +32,7 @@ Jan Janak 1.6.14. trust_received_flag (flagname or integer) 1.6.15. received_to_uri (boolean) 1.6.16. reply_code_attr (avp name) - 1.6.17. reply_code_reason_attr (avp name) + 1.6.17. reply_reason_attr (avp name) 1.6.18. contact_attr (avp name) 1.6.19. aor_attr (avp name) 1.6.20. server_id_attr (avp name) @@ -525,7 +525,7 @@ route{ ... } -1.6.17. reply_code_reason_attr (avp name) +1.6.17. reply_reason_attr (avp name) See reply_code_attr above. diff --git a/modules_s/registrar/doc/params.xml b/modules_s/registrar/doc/params.xml index d580386..3835b7b 100644 --- a/modules_s/registrar/doc/params.xml +++ b/modules_s/registrar/doc/params.xml @@ -463,8 +463,8 @@ route{ </example> </section> - <section id="reply_code_reason_attr"> - <title><varname>reply_code_reason_attr</varname> (avp name)</title> + <section id="reply_reason_attr"> + <title><varname>reply_reason_attr</varname> (avp name)</title> <para> See <varname>reply_code_attr</varname> above. </para>

1 0

git:master: registrar(s): support for disabled code, reason and contact AVPs
by Andrei Pelinescu-Onciul 13 Oct '10

13 Oct '10

Module: sip-router Branch: master Commit: fb021d55b09bfbb5503d5879a902f968f1bcabfd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb021d5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 6 19:06:42 2010 +0200 registrar(s): support for disabled code, reason and contact AVPs reply_code_attr, reply_reason_attr and contact_attr modparams can now be set to "" to disable setting the corresponding AVPs when a save*_noreply() is used (speed-up if not needed). --- modules_s/registrar/reg_mod.c | 70 +++++++++++++++++++++++------------------ modules_s/registrar/reg_mod.h | 1 + modules_s/registrar/reply.c | 48 ++++++++++++++++------------ 3 files changed, 67 insertions(+), 52 deletions(-) diff --git a/modules_s/registrar/reg_mod.c b/modules_s/registrar/reg_mod.c index f623d1b..b21039d 100644 --- a/modules_s/registrar/reg_mod.c +++ b/modules_s/registrar/reg_mod.c @@ -174,42 +174,50 @@ static int parse_attr_params(void) { str tmp; - tmp = reply_code_attr; - trim(&tmp); - if (!tmp.len || tmp.s[0] != '$') { - ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; - } - tmp.s++; tmp.len--; - if (parse_avp_ident(&tmp, &avpid_code) < 0) { - ERR("Error while parsing attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; + if (reply_code_attr.len) { + tmp = reply_code_attr; + trim(&tmp); + if (!tmp.len || tmp.s[0] != '$') { + ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); + return -1; + } + tmp.s++; tmp.len--; + if (parse_avp_ident(&tmp, &avpid_code) < 0) { + ERR("Error while parsing attribute name '%.*s'\n", + tmp.len, tmp.s); + return -1; + } } - tmp = reply_reason_attr; - trim(&tmp); - if (!tmp.len || tmp.s[0] != '$') { - ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; - } - tmp.s++; tmp.len--; - if (parse_avp_ident(&tmp, &avpid_reason) < 0) { - ERR("Error while parsing attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; + if (reply_reason_attr.len) { + tmp = reply_reason_attr; + trim(&tmp); + if (!tmp.len || tmp.s[0] != '$') { + ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); + return -1; + } + tmp.s++; tmp.len--; + if (parse_avp_ident(&tmp, &avpid_reason) < 0) { + ERR("Error while parsing attribute name '%.*s'\n", + tmp.len, tmp.s); + return -1; + } } - tmp = contact_attr; - trim(&tmp); - if (!tmp.len || tmp.s[0] != '$') { - ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; - } - tmp.s++; tmp.len--; - if (parse_avp_ident(&tmp, &avpid_contact) < 0) { - ERR("Error while parsing attribute name '%.*s'\n", tmp.len, tmp.s); - return -1; + if (contact_attr.len) { + tmp = contact_attr; + trim(&tmp); + if (!tmp.len || tmp.s[0] != '$') { + ERR("Invalid attribute name '%.*s'\n", tmp.len, tmp.s); + return -1; + } + tmp.s++; tmp.len--; + if (parse_avp_ident(&tmp, &avpid_contact) < 0) { + ERR("Error while parsing attribute name '%.*s'\n", + tmp.len, tmp.s); + return -1; + } } - return 0; } diff --git a/modules_s/registrar/reg_mod.h b/modules_s/registrar/reg_mod.h index 6b61c29..027a571 100644 --- a/modules_s/registrar/reg_mod.h +++ b/modules_s/registrar/reg_mod.h @@ -57,6 +57,7 @@ extern usrloc_api_t ul; /* Structure containing pointers to usrloc functions */ extern sl_api_t slb; +extern str reply_code_attr, reply_reason_attr, contact_attr; extern avp_ident_t avpid_code, avpid_reason, avpid_contact; #endif /* REG_MOD_H */ diff --git a/modules_s/registrar/reply.c b/modules_s/registrar/reply.c index 9661bdb..7e65596 100644 --- a/modules_s/registrar/reply.c +++ b/modules_s/registrar/reply.c @@ -349,40 +349,46 @@ int setup_attrs(struct sip_msg* msg) str reason, c; avp_value_t val; - reason.s = NULL; - reason.len = 0; code = codes[rerrno]; - switch(code) { - case 200: reason.s = MSG_200; reason.len = sizeof(MSG_200) - 1; break; - case 400: reason.s = MSG_400; reason.len = sizeof(MSG_400) - 1; break; - case 500: reason.s = MSG_500; reason.len = sizeof(MSG_500) - 1; break; - case 503: reason.s = MSG_503; reason.len = sizeof(MSG_503) - 1; break; - } - val.n = code; - if (add_avp(avpid_code.flags, avpid_code.name, val) < 0) { - ERR("Error while creating reply code attribute\n"); - return -1; + if (reply_code_attr.len) { + val.n = code; + if (add_avp(avpid_code.flags, avpid_code.name, val) < 0) { + ERR("Error while creating reply code attribute\n"); + return -1; + } } - val.s = reason; - if (add_avp(avpid_reason.flags | AVP_VAL_STR, avpid_reason.name, val) < 0) { - ERR("Error while creating reply reason attribute\n"); - return -1; - } + if (reply_reason_attr.len) { + reason.s = NULL; + reason.len = 0; + switch(code) { + case 200: reason.s = MSG_200; reason.len = sizeof(MSG_200) - 1; break; + case 400: reason.s = MSG_400; reason.len = sizeof(MSG_400) - 1; break; + case 500: reason.s = MSG_500; reason.len = sizeof(MSG_500) - 1; break; + case 503: reason.s = MSG_503; reason.len = sizeof(MSG_503) - 1; break; + } + val.s = reason; + if (add_avp(avpid_reason.flags | AVP_VAL_STR, avpid_reason.name, val) + < 0) { + ERR("Error while creating reply reason attribute\n"); + return -1; + } + } - if (contact.data_len > 0) { + if (contact_attr.len && contact.data_len > 0) { c.s = contact.buf; c.len = contact.data_len; val.s = c; - if (add_avp(avpid_contact.flags | AVP_VAL_STR, avpid_contact.name, val) < 0) { + if (add_avp(avpid_contact.flags | AVP_VAL_STR, avpid_contact.name, val) + < 0) { ERR("Error while creating contact attribute\n"); return -1; - } + } contact.data_len = 0; - } + } return 0; }

1 0

git:master: registrar(s): support for disabled aor_attr and server_id_attr
by Andrei Pelinescu-Onciul 13 Oct '10

13 Oct '10

Module: sip-router Branch: master Commit: 5f94dececcbf709f92b9a4b022731d4ee17e7e42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f94dec… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Oct 6 18:53:14 2010 +0200 registrar(s): support for disabled aor_attr and server_id_attr If aor_attr or server_id_attr are empty ("") don't try to use them. --- modules_s/registrar/save.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/modules_s/registrar/save.c b/modules_s/registrar/save.c index a491526..045e139 100644 --- a/modules_s/registrar/save.c +++ b/modules_s/registrar/save.c @@ -697,10 +697,12 @@ static int get_server_id(void) int sid; - name.s.s = server_id_attr.s + 1; /* Skip the 1st char which is $ */ - name.s.len = server_id_attr.len - 1; - if (search_first_avp(AVP_TRACK_FROM | AVP_NAME_STR, name, &val, 0)) { - if (str2sint(&val.s, &sid) == 0) return sid; + if (server_id_attr.len && server_id_attr.s) { + name.s.s = server_id_attr.s + 1; /* Skip the 1st char which is $ */ + name.s.len = server_id_attr.len - 1; + if (search_first_avp(AVP_TRACK_FROM | AVP_NAME_STR, name, &val, 0)) { + if (str2sint(&val.s, &sid) == 0) return sid; + } } /* No server_id attribute found or the attribute doesn't have @@ -721,12 +723,16 @@ static inline int contacts(struct sip_msg* _m, contact_t* _c, udomain_t* _d, str str* aor; int_str name, val; - name.s.s = aor_attr.s + 1; /* Skip the 1st char which is $ */ - name.s.len = aor_attr.len - 1; - if (search_first_avp(AVP_TRACK_TO | AVP_NAME_STR, name, &val, 0)) { - aor = &val.s; + if (aor_attr.len && aor_attr.s) { + name.s.s = aor_attr.s + 1; /* Skip the 1st char which is $ */ + name.s.len = aor_attr.len - 1; + if (search_first_avp(AVP_TRACK_TO | AVP_NAME_STR, name, &val, 0)) { + aor = &val.s; + } else { + aor = &get_to(_m)->uri; + } } else { - aor = &get_to(_m)->uri; + aor = &get_to(_m)->uri; } sid = get_server_id();

1 0

git:master: INSTALL: updates to reflect flavour switching
by Daniel-Constantin Mierla 12 Oct '10

12 Oct '10

Module: sip-router Branch: master Commit: 77d7e32549b46bb3a3c7d796e46cf08c0359b730 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77d7e32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 12 22:50:28 2010 +0200 INSTALL: updates to reflect flavour switching --- INSTALL | 344 ++++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 222 insertions(+), 122 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=77d…

1 0

git:master: pv: new PV $timef(format)
by Daniel-Constantin Mierla 12 Oct '10

12 Oct '10

Module: sip-router Branch: master Commit: a2dfe0b9ed4c53cd35f62532ed451f1d347e3361 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2dfe0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 12 19:16:08 2010 +0200 pv: new PV $timef(format) - print strftime() formatted time - e.g.,: $timef(%Y%m%d%H%M) => 201010121920 - max internal buf for printed value is 64 - it uses a static buffer, so clone the value if you use the PV many times with different formats --- modules_k/pv/pv.c | 2 + modules_k/pv/pv_time.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_time.h | 3 ++ 3 files changed, 60 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 2a79578..efeb7ee 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -374,6 +374,8 @@ static pv_export_t mod_pvs[] = { pv_set_shvar, pv_parse_shvar_name, 0, 0, 0}, { {"time", (sizeof("time")-1)}, PVT_CONTEXT, pv_get_time, 0, pv_parse_time_name, 0, 0, 0}, + { {"timef", (sizeof("timef")-1)}, PVT_CONTEXT, pv_get_strftime, + 0, pv_parse_strftime_name, 0, 0, 0}, { {"TV", (sizeof("TV")-1)}, PVT_OTHER, pv_get_timeval, 0, pv_parse_timeval_name, 0, 0, 0}, { {"nh", (sizeof("nh")-1)}, PVT_OTHER, pv_get_nh, diff --git a/modules_k/pv/pv_time.c b/modules_k/pv/pv_time.c index f904080..0687f53 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -100,9 +100,31 @@ error: return -1; } +int pv_parse_strftime_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + sp->pvp.pvn.u.isname.name.s.s = as_asciiz(in); + if(sp->pvp.pvn.u.isname.name.s.s==NULL) + { + LM_ERR("no more pkg\n"); + return -1; + } + sp->pvp.pvn.u.isname.name.s.len = in->len; +#if 0 + /* to-do: free function for pv name structure */ + sp->pvp.pvn.nfree = pkg_free; +#endif + return 0; +} + static struct tm _cfgutils_ts; static unsigned int _cfgutils_msg_id = 0; +/** + * return broken-down time attributes + */ int pv_get_time(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -149,6 +171,39 @@ int pv_get_time(struct sip_msg *msg, pv_param_t *param, } } +/** + * return strftime() formatted time + */ +int pv_get_strftime(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + time_t t; + str s; +#define PV_STRFTIME_BUF_SIZE 64 + static char _pv_strftime_buf[PV_STRFTIME_BUF_SIZE]; + + if(msg==NULL || param==NULL) + return -1; + + if(_cfgutils_msg_id != msg->id) + { + pv_update_time(msg, &t); + _cfgutils_msg_id = msg->id; + if(localtime_r(&t, &_cfgutils_ts) == NULL) + { + LM_ERR("unable to break time to attributes\n"); + return -1; + } + } + s.len = strftime(_pv_strftime_buf, PV_STRFTIME_BUF_SIZE, + param->pvn.u.isname.name.s.s, &_cfgutils_ts); + if(s.len<=0) + return pv_get_null(msg, param, res); + s.s = _pv_strftime_buf; + return pv_get_strval(msg, param, res, &s); +} + + int pv_get_timenows(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/modules_k/pv/pv_time.h b/modules_k/pv/pv_time.h index 4a6caf6..d1ab6a9 100644 --- a/modules_k/pv/pv_time.h +++ b/modules_k/pv/pv_time.h @@ -29,6 +29,9 @@ int pv_parse_time_name(pv_spec_p sp, str *in); int pv_get_time(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_strftime_name(pv_spec_p sp, str *in); +int pv_get_strftime(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); int pv_get_timenows(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_timenowf(struct sip_msg *msg, pv_param_t *param,

1 0

[tracker] Task closed: record_route_preset enhancement
by sip-router 12 Oct '10

12 Oct '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#91 - record_route_preset enhancement User who did this - Ovidiu Sas (osas) Reason for closing: Fixed Additional comments about closing: Patch uploaded in trunk. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=91 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:master: modules_k/rr: record_route_preset enahancement
by Ovidiu Sas 12 Oct '10

12 Oct '10

Module: sip-router Branch: master Commit: 65b0d767a13bfbba22a539a086aca8899cf57bdf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65b0d76… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Oct 12 12:59:13 2010 -0400 modules_k/rr: record_route_preset enahancement - record_route_preset takes a second parameter allowing the setting of a second Record-Route header - new rr param 'enable_socket_mismatch_warning': enables or disables a warning log - closes FS#91 - record_route_preset enhancement --- modules_k/rr/README | 60 +++++++++++++++++++++++++++++----------- modules_k/rr/doc/rr_admin.xml | 39 +++++++++++++++++++++++++- modules_k/rr/loose.c | 6 +++- modules_k/rr/rr_mod.c | 21 +++++++++++++- modules_k/rr/rr_mod.h | 1 + 5 files changed, 105 insertions(+), 22 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=65b…

1 0

rtpproxy (k): removal of force_rtpproxy
by Juha Heinanen 12 Oct '10

12 Oct '10

What you propose is a new functionality. I would prefer a new name (engage_rtp_proxy) for this function and still drop the old force_rtp_proxy. ovidiu, it may be confusing to call the new function engage_rtp_proxy, because similar name is used in mediaproxy module for a dialog based function that tries to handle the whole dialog, but fails to address important issues, such as forking. if the idea is not to have a dialog based thing, then function names like use_rtp_proxy/end_rtp_session would be better. -- juha

5 10

git:master: acc(k): update of documentation
by Daniel-Constantin Mierla 12 Oct '10

12 Oct '10

Module: sip-router Branch: master Commit: c9bc65cc5c008a882d28cb034f6c84ce7fa8aeb5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9bc65c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 12 14:59:23 2010 +0200 acc(k): update of documentation --- modules_k/acc/README | 13 +++++++++---- modules_k/acc/doc/acc_admin.xml | 14 ++++++++++---- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/modules_k/acc/README b/modules_k/acc/README index 3e38cdc..08ff24a 100644 --- a/modules_k/acc/README +++ b/modules_k/acc/README @@ -689,21 +689,25 @@ modparam("acc", "db_missed_flag", 3) 5.19. db_table_acc (string) - Table name of accounting successfull calls -- database specific. + Table name of accounting successfull calls -- database specific. It can + include config variables. Default value is “acc” Example 1.19. db_table_acc example modparam("acc", "db_table_acc", "myacc_table") +modparam("acc", "db_table_acc", "acc_$time(year)_$time(mon)") 5.20. db_table_missed_calls (string) - Table name for accounting missed calls -- database specific. + Table name for accounting missed calls -- database specific. It can + include config variables. Default value is “missed_calls” Example 1.20. db_table_missed_calls example modparam("acc", "db_table_missed_calls", "myMC_table") +modparam("acc", "db_table_missed_calls", "mc_$time(year)_$time(mon)") 5.21. db_url (string) @@ -874,13 +878,14 @@ acc_log_request("Some comment"); Meaning of the parameters is as follows: * comment - Comment to be appended. - * table - Database table to be used. + * table - Database table to be used. It can include config variables. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. Example 1.36. acc_db_request usage ... -acc_log_request("Some comment", "Some table"); +acc_log_request("Some comment", "some_table"); +acc_log_request("200 ok", "acc_cfg_$time(year)"); ... 6.3. acc_rad_request(comment) diff --git a/modules_k/acc/doc/acc_admin.xml b/modules_k/acc/doc/acc_admin.xml index 82184fa..05bf63e 100644 --- a/modules_k/acc/doc/acc_admin.xml +++ b/modules_k/acc/doc/acc_admin.xml @@ -695,7 +695,8 @@ modparam("acc", "db_missed_flag", 3) <section> <title><varname>db_table_acc</varname> (string)</title> <para> - Table name of accounting successfull calls -- database specific. + Table name of accounting successfull calls -- database specific. It + can include config variables. </para> <para> Default value is <quote>acc</quote> @@ -704,13 +705,15 @@ modparam("acc", "db_missed_flag", 3) <title>db_table_acc example</title> <programlisting format="linespecific"> modparam("acc", "db_table_acc", "myacc_table") +modparam("acc", "db_table_acc", "acc_$time(year)_$time(mon)") </programlisting> </example> </section> <section> <title><varname>db_table_missed_calls</varname> (string)</title> <para> - Table name for accounting missed calls -- database specific. + Table name for accounting missed calls -- database specific. It + can include config variables. </para> <para> Default value is <quote>missed_calls</quote> @@ -719,6 +722,7 @@ modparam("acc", "db_table_acc", "myacc_table") <title>db_table_missed_calls example</title> <programlisting format="linespecific"> modparam("acc", "db_table_missed_calls", "myMC_table") +modparam("acc", "db_table_missed_calls", "mc_$time(year)_$time(mon)") </programlisting> </example> </section> @@ -997,7 +1001,8 @@ acc_log_request("Some comment"); <para><emphasis>comment</emphasis> - Comment to be appended.</para> </listitem> <listitem> - <para><emphasis>table</emphasis> - Database table to be used.</para> + <para><emphasis>table</emphasis> - Database table to be used. It + can include config variables.</para> </listitem> </itemizedlist> <para> @@ -1007,7 +1012,8 @@ acc_log_request("Some comment"); <title>acc_db_request usage</title> <programlisting format="linespecific"> ... -acc_log_request("Some comment", "Some table"); +acc_log_request("Some comment", "some_table"); +acc_log_request("200 ok", "acc_cfg_$time(year)"); ... </programlisting> </example>

1 0

git:master: acc(k): table name for db acc can be dynamic
by Daniel-Constantin Mierla 12 Oct '10

12 Oct '10

Module: sip-router Branch: master Commit: e8f6a95d43b6a4340cf7e97213af5c71fa2a69e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8f6a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 12 14:52:07 2010 +0200 acc(k): table name for db acc can be dynamic - you can include variables in table name and will be evaluated at runtime: modparam("acc", "db_table_acc", "acc_$time(year)_$time(mon)") will write now to table acc_2010_10 - same can be done for missed_calls table name - second parameter of acc_db_request() supports as well config variables --- modules_k/acc/acc_logic.c | 52 +++++++++++++++++++++++++++++++++++++++----- modules_k/acc/acc_mod.c | 24 ++++++++++++++++++++ modules_k/acc/acc_mod.h | 2 + 3 files changed, 72 insertions(+), 6 deletions(-) diff --git a/modules_k/acc/acc_logic.c b/modules_k/acc/acc_logic.c index e460404..38666a1 100644 --- a/modules_k/acc/acc_logic.c +++ b/modules_k/acc/acc_logic.c @@ -39,6 +39,7 @@ #include <string.h> #include "../../dprint.h" +#include "../../sr_module.h" #include "../../parser/parse_from.h" #include "../../parser/parse_content.h" #include "../../modules/tm/tm_load.h" @@ -101,8 +102,6 @@ struct acc_enviroment acc_env; (((_rq)->REQ_METHOD==METHOD_CANCEL) && report_cancels==0) - - static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ); @@ -180,6 +179,35 @@ int w_acc_log_request(struct sip_msg *rq, char *comment, char *foo) #ifdef SQL_ACC +int acc_db_set_table_name(struct sip_msg *msg, void *param, str *table) +{ +#define DB_TABLE_NAME_SIZE 64 + static char db_table_name_buf[DB_TABLE_NAME_SIZE]; + str dbtable; + + if(param!=NULL) { + if(get_str_fparam(&dbtable, msg, (fparam_t*)param)<0) { + LM_ERR("cannot get acc db table name\n"); + return -1; + } + if(dbtable.len>=DB_TABLE_NAME_SIZE) { + LM_ERR("acc db table name too big [%.*s] max %d\n", + dbtable.len, dbtable.s, DB_TABLE_NAME_SIZE); + return -1; + } + strncpy(db_table_name_buf, dbtable.s, dbtable.len); + env_set_text(db_table_name_buf, dbtable.len); + } else { + if(table==NULL) { + LM_ERR("no acc table name\n"); + return -1; + } + env_set_text(table->s, table->len); + } + return 0; +} + + int w_acc_db_request(struct sip_msg *rq, char *comment, char *table) { if (!table) { @@ -188,9 +216,12 @@ int w_acc_db_request(struct sip_msg *rq, char *comment, char *table) } if (acc_preparse_req(rq)<0) return -1; + if(acc_db_set_table_name(rq, (void*)table, NULL)<0) { + LM_ERR("cannot set table name\n"); + return -1; + } env_set_to( rq->to ); env_set_comment((struct acc_param*)comment); - env_set_text(table, strlen(table)); return acc_db_request(rq); } #endif @@ -318,7 +349,10 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, } #ifdef SQL_ACC if (is_db_mc_on(req)) { - env_set_text(db_table_mc.s, db_table_mc.len); + if(acc_db_set_table_name(req, db_table_mc_data, &db_table_mc)<0) { + LM_ERR("cannot set missed call db table name\n"); + return; + } acc_db_request( req ); flags_to_reset |= db_missed_flag; } @@ -386,7 +420,10 @@ static inline void acc_onreply( struct cell* t, struct sip_msg *req, } #ifdef SQL_ACC if (is_db_acc_on(req)) { - env_set_text( db_table_acc.s, db_table_acc.len); + if(acc_db_set_table_name(req, db_table_acc_data, &db_table_acc)<0) { + LM_ERR("cannot set acc db table name\n"); + return; + } acc_db_request(req); } #endif @@ -427,7 +464,10 @@ static inline void acc_onack( struct cell* t, struct sip_msg *req, } #ifdef SQL_ACC if (is_db_acc_on(req)) { - env_set_text( db_table_acc.s, db_table_acc.len); + if(acc_db_set_table_name(ack, db_table_acc_data, &db_table_acc)<0) { + LM_ERR("cannot set acc db table name\n"); + return; + } acc_db_request( ack ); } #endif diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index 5ded9a4..6cfef81 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -164,7 +164,9 @@ static char *db_extra_str = 0; /*!< db extra variables */ struct acc_extra *db_extra = 0; static str db_url = {NULL, 0}; /*!< Database url */ str db_table_acc = str_init("acc"); /*!< name of database tables */ +void *db_table_acc_data = NULL; str db_table_mc = str_init("missed_calls"); +void *db_table_mc_data = NULL; /* names of columns in tables acc/missed calls*/ str acc_method_col = str_init("method"); str acc_fromtag_col = str_init("from_tag"); @@ -318,6 +320,8 @@ static int acc_fixup(void** param, int param_no) if (db_url.s==0) { pkg_free(p); *param = 0; + } else { + return fixup_var_pve_str_12(param, 2); } #endif } @@ -363,7 +367,27 @@ static int mod_init( void ) if (db_url.s) db_url.len = strlen(db_url.s); db_table_acc.len = strlen(db_table_acc.s); + if(db_table_acc.len!=3 || strncmp(db_table_acc.s, "acc", 3)!=0) + { + db_table_acc_data = db_table_acc.s; + if(fixup_var_pve_str_12(&db_table_acc_data, 1)<0) + { + LM_ERR("unable to parse acc table name [%.*s]\n", + db_table_acc.len, db_table_acc.s); + return -1; + } + } db_table_mc.len = strlen(db_table_mc.s); + if(db_table_mc.len!=12 || strncmp(db_table_mc.s, "missed_calls", 12)!=0) + { + db_table_mc_data = db_table_mc.s; + if(fixup_var_pve_str_12(&db_table_mc_data, 1)<0) + { + LM_ERR("unable to parse mc table name [%.*s]\n", + db_table_mc.len, db_table_mc.s); + return -1; + } + } acc_method_col.len = strlen(acc_method_col.s); acc_fromtag_col.len = strlen(acc_fromtag_col.s); acc_totag_col.len = strlen(acc_totag_col.s); diff --git a/modules_k/acc/acc_mod.h b/modules_k/acc/acc_mod.h index d565773..5a6c104 100644 --- a/modules_k/acc/acc_mod.h +++ b/modules_k/acc/acc_mod.h @@ -73,7 +73,9 @@ extern int db_flag; extern int db_missed_flag; extern str db_table_acc; +extern void *db_table_acc_data; extern str db_table_mc; +extern void *db_table_mc_data; extern str acc_method_col; extern str acc_fromuri_col;

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010