sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
210 discussions

git:master: rtpproxy: Allow any pvar for rtpproxy instance

by Hugh Waite

Module: sip-router Branch: master Commit: 221cdf8497c2375133dd73ff0bed44ed6180245b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=221cdf8… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Jan 7 11:11:23 2014 +0000 rtpproxy: Allow any pvar for rtpproxy instance --- modules/rtpproxy/README | 20 ++++++------ modules/rtpproxy/doc/rtpproxy_admin.xml | 10 +++--- modules/rtpproxy/rtpproxy.c | 49 +++++++++++++++---------------- modules/rtpproxy/rtpproxy.h | 2 + modules/rtpproxy/rtpproxy_db.c | 1 + modules/rtpproxy/rtpproxy_stream.c | 2 + 6 files changed, 44 insertions(+), 40 deletions(-) diff --git a/modules/rtpproxy/README b/modules/rtpproxy/README index 8979560..82ecd1e 100644 --- a/modules/rtpproxy/README +++ b/modules/rtpproxy/README @@ -63,7 +63,7 @@ Carsten Bock 4.8. extra_id_pv (string) 4.9. db_url (string) 4.10. table_name (string) - 4.11. rtp_inst_avp (string) + 4.11. rtp_inst_pvar (string) 5. Functions @@ -102,7 +102,7 @@ Carsten Bock 1.8. Set extra_id_pv parameter 1.9. Set db_url parameter 1.10. Set table_name parameter - 1.11. Set rtp_inst_avp parameter + 1.11. Set rtp_inst_pvar parameter 1.12. set_rtp_proxy_set usage 1.13. rtpproxy_offer usage 1.14. rtpproxy_answer usage @@ -137,7 +137,7 @@ Chapter 1. Admin Guide 4.8. extra_id_pv (string) 4.9. db_url (string) 4.10. table_name (string) - 4.11. rtp_inst_avp (string) + 4.11. rtp_inst_pvar (string) 5. Functions @@ -225,7 +225,7 @@ Chapter 1. Admin Guide 4.8. extra_id_pv (string) 4.9. db_url (string) 4.10. table_name (string) - 4.11. rtp_inst_avp (string) + 4.11. rtp_inst_pvar (string) 4.1. rtpproxy_sock (string) @@ -381,17 +381,17 @@ modparam("rtpproxy", "db_url", "mysql://user:passwb@localhost/database") modparam("rtpproxy", "table_name", "my_rtpp_sets") ... -4.11. rtp_inst_avp (string) +4.11. rtp_inst_pvar (string) - An avp to store the chosen RTPProxy IP address. If this parameter is - set, the IP address and port of the instance chosen in a - rtpproxy_manage() call will be stored in the given AVP. + A pseudo variable to store the chosen RTPProxy IP address. If this + parameter is set, the IP address and port of the instance chosen will + be stored in the given variable. By default, this parameter is not set. - Example 1.11. Set rtp_inst_avp parameter + Example 1.11. Set rtp_inst_pvar parameter ... -modparam("rtpproxy", "rtp_inst_avp", "$avp(RTP_INSTANCE)") +modparam("rtpproxy", "rtp_inst_pvar", "$avp(RTP_INSTANCE)") ... 5. Functions diff --git a/modules/rtpproxy/doc/rtpproxy_admin.xml b/modules/rtpproxy/doc/rtpproxy_admin.xml index c4f2c86..db206f7 100644 --- a/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -322,19 +322,19 @@ modparam("rtpproxy", "table_name", "my_rtpp_sets") </example> </section> <section> - <title><varname>rtp_inst_avp</varname> (string)</title> + <title><varname>rtp_inst_pvar</varname> (string)</title> <para> - An avp to store the chosen RTPProxy IP address. - If this parameter is set, the IP address and port of the instance chosen in a rtpproxy_manage() call will be stored in the given AVP. + A pseudo variable to store the chosen RTPProxy IP address. + If this parameter is set, the IP address and port of the instance chosen will be stored in the given variable. </para> <para> By default, this parameter is not set. </para> <example> - <title>Set <varname>rtp_inst_avp</varname> parameter</title> + <title>Set <varname>rtp_inst_pvar</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("rtpproxy", "rtp_inst_avp", "$avp(RTP_INSTANCE)") +modparam("rtpproxy", "rtp_inst_pvar", "$avp(RTP_INSTANCE)") ... </programlisting> </example> diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 8cea776..073d954 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -308,8 +308,6 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); -static int set_rtp_inst_avp(const str * const uri); - /* Pseudo-Variables */ static int pv_get_rtpstat_f(struct sip_msg *, pv_param_t *, pv_value_t *); @@ -339,9 +337,8 @@ struct rtpp_set * default_rtpp_set=0; static char *ice_candidate_priority_avp_param = NULL; static int ice_candidate_priority_avp_type; static int_str ice_candidate_priority_avp; -static char *rtp_inst_avp_param = NULL; -static int rtp_inst_avp_type; -static int_str rtp_inst_avp; +static str rtp_inst_pv_param = {NULL, 0}; +static pv_spec_t *rtp_inst_pvar = NULL; /* array with the sockets used by rtpporxy (per process)*/ static unsigned int rtpp_no = 0; @@ -442,7 +439,7 @@ static param_export_t params[] = { {"extra_id_pv", STR_PARAM, &extra_id_pv_param.s }, {"db_url", STR_PARAM, &rtpp_db_url.s }, {"table_name", STR_PARAM, &rtpp_table_name.s }, - {"rtp_inst_avp", STR_PARAM, &rtp_inst_avp_param }, + {"rtp_inst_pvar", STR_PARAM, &rtp_inst_pv_param.s }, {0, 0, 0} }; @@ -976,17 +973,16 @@ mod_init(void) ice_candidate_priority_avp_type = avp_flags; } - if (rtp_inst_avp_param) { - s.s = rtp_inst_avp_param; s.len = strlen(s.s); - if (pv_parse_spec(&s, &avp_spec) == 0 || avp_spec.type != PVT_AVP) { - LM_ERR("malformed or non AVP definition <%s>\n", rtp_inst_avp_param); - return -1; - } - if (pv_get_avp_name(0, &(avp_spec.pvp), &rtp_inst_avp, &avp_flags) != 0) { - LM_ERR("invalid AVP definition <%s>\n", rtp_inst_avp_param); + if (rtp_inst_pv_param.s) { + rtp_inst_pv_param.len = strlen(rtp_inst_pv_param.s); + rtp_inst_pvar = pv_cache_get(&rtp_inst_pv_param); + if ((rtp_inst_pvar == NULL) || + ((rtp_inst_pvar->type != PVT_AVP) && + (rtp_inst_pvar->type != PVT_XAVP) && + (rtp_inst_pvar->type != PVT_SCRIPTVAR))) { + LM_ERR("Invalid pvar name <%.*s>\n", rtp_inst_pv_param.len, rtp_inst_pv_param.s); return -1; } - rtp_inst_avp_type = avp_flags; } if (extra_id_pv_param.s && *extra_id_pv_param.s) { @@ -1780,9 +1776,6 @@ select_rtpp_node(str callid, int do_test) node = selected_rtpp_set->rn_first; if (node->rn_disabled && node->rn_recheck_ticks <= get_ticks()) node->rn_disabled = rtpp_test(node, 1, 0); - if (!node->rn_disabled) { - set_rtp_inst_avp(&node->rn_url); - } return node->rn_disabled ? NULL : node; } @@ -1833,7 +1826,6 @@ found: if (node->rn_disabled) goto retry; } - set_rtp_inst_avp(&node->rn_url); return node; } @@ -1983,6 +1975,7 @@ unforce_rtp_proxy(struct sip_msg* msg, char* flags) LM_ERR("no available proxies\n"); return -1; } + set_rtp_inst_pvar(msg, &node->rn_url); send_rtpp_command(node, v, (to_tag.len > 0) ? 10 : 8); return 1; @@ -2654,6 +2647,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc LM_ERR("no available proxies\n"); FORCE_RTP_PROXY_RET (-3); } + set_rtp_inst_pvar(msg, &node->rn_url); if (rep_opts.oidx > 0) { if (node->rn_rep_supported == 0) { LM_WARN("re-packetization is requested but is not " @@ -2933,6 +2927,7 @@ static int start_recording_f(struct sip_msg* msg, char *foo, char *bar) LM_ERR("no available proxies\n"); return -1; } + set_rtp_inst_pvar(msg, &node->rn_url); nitems = 8; if (msg->first_line.type == SIP_REPLY) { @@ -2991,6 +2986,7 @@ pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, LM_ERR("no available proxies\n"); return -1; } + set_rtp_inst_pvar(msg, &node->rn_url); nitems = 8; if (msg->first_line.type == SIP_REPLY) { if (to_tag.len == 0) @@ -3010,16 +3006,19 @@ pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &ret_val); } -static int set_rtp_inst_avp(const str * const uri) { - int_str avp_val; - avp_val.s = *uri; +int set_rtp_inst_pvar(struct sip_msg *msg, const str * const uri) { + pv_value_t val; - if (rtp_inst_avp_param == NULL) + if (rtp_inst_pvar == NULL) return 0; - if (add_avp(AVP_VAL_STR | rtp_inst_avp_type, rtp_inst_avp, avp_val) != 0) + memset(&val, 0, sizeof(pv_value_t)); + val.flags = PV_VAL_STR; + val.rs = *uri; + + if (rtp_inst_pvar->setf(msg, &rtp_inst_pvar->pvp, (int)EQ_T, &val) < 0) { - LM_ERR("Failed to add RTPProxy URI to avp\n"); + LM_ERR("Failed to add RTPProxy URI to pvar\n"); return -1; } return 0; diff --git a/modules/rtpproxy/rtpproxy.h b/modules/rtpproxy/rtpproxy.h index 8672926..d15a58b 100644 --- a/modules/rtpproxy/rtpproxy.h +++ b/modules/rtpproxy/rtpproxy.h @@ -72,6 +72,8 @@ char *send_rtpp_command(struct rtpp_node *, struct iovec *, int); struct rtpp_set *get_rtpp_set(str *set_name); int insert_rtpp_node(struct rtpp_set *const rtpp_list, const str *const url, const int weight, const int disabled); +int set_rtp_inst_pvar(struct sip_msg *msg, const str * const uri); + int init_rtpproxy_db(void); extern str rtpp_db_url; diff --git a/modules/rtpproxy/rtpproxy_db.c b/modules/rtpproxy/rtpproxy_db.c index 2d3e374..cacac30 100644 --- a/modules/rtpproxy/rtpproxy_db.c +++ b/modules/rtpproxy/rtpproxy_db.c @@ -24,6 +24,7 @@ #include "../../lib/srdb1/db.h" #include "../../lib/srdb1/db_res.h" +#include "../../parser/msg_parser.h" #include "rtpproxy.h" #define RTPP_TABLE_VERSION 1 diff --git a/modules/rtpproxy/rtpproxy_stream.c b/modules/rtpproxy/rtpproxy_stream.c index 20693e0..944c8d2 100644 --- a/modules/rtpproxy/rtpproxy_stream.c +++ b/modules/rtpproxy/rtpproxy_stream.c @@ -119,6 +119,7 @@ rtpproxy_stream(struct sip_msg* msg, str *pname, int count, int stream2uac) "node. Please upgrade the RTPproxy and try again.\n"); return -1; } + set_rtp_inst_pvar(msg, &node->rn_url); nitems = 11; if (stream2uac == 0) { if (to_tag.len == 0) @@ -202,6 +203,7 @@ rtpproxy_stop_stream(struct sip_msg* msg, int stream2uac) "node. Please upgrade the RTPproxy and try again.\n"); return -1; } + set_rtp_inst_pvar(msg, &node->rn_url); nitems = 9; if (stream2uac == 0) { if (to_tag.len == 0)

10 years, 10 months

git:master: rtpproxy: Documentation: clarify rtpp_inst_pvar usage

by Hugh Waite

Module: sip-router Branch: master Commit: 37e8d6478f677be90178f26ac9348e2f9fd38a58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37e8d64… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Jan 8 09:45:22 2014 +0000 rtpproxy: Documentation: clarify rtpp_inst_pvar usage - The instance 'URL' is stored in the pvar - Added an example usage --- modules/rtpproxy/README | 59 ++++++++++++++++++------------ modules/rtpproxy/doc/rtpproxy_admin.xml | 19 ++++++++-- 2 files changed, 51 insertions(+), 27 deletions(-) diff --git a/modules/rtpproxy/README b/modules/rtpproxy/README index 82ecd1e..e8a2094 100644 --- a/modules/rtpproxy/README +++ b/modules/rtpproxy/README @@ -103,16 +103,17 @@ Carsten Bock 1.9. Set db_url parameter 1.10. Set table_name parameter 1.11. Set rtp_inst_pvar parameter - 1.12. set_rtp_proxy_set usage - 1.13. rtpproxy_offer usage - 1.14. rtpproxy_answer usage - 1.15. rtpproxy_destroy usage - 1.16. rtpproxy_manage usage - 1.17. rtpproxy_stream2xxx usage - 1.18. start_recording usage - 1.19. $rtpstat-Usage - 1.20. nh_enable_rtpp usage - 1.21. nh_show_rtpp usage + 1.12. rtp_inst_pvar usage + 1.13. set_rtp_proxy_set usage + 1.14. rtpproxy_offer usage + 1.15. rtpproxy_answer usage + 1.16. rtpproxy_destroy usage + 1.17. rtpproxy_manage usage + 1.18. rtpproxy_stream2xxx usage + 1.19. start_recording usage + 1.20. $rtpstat-Usage + 1.21. nh_enable_rtpp usage + 1.22. nh_show_rtpp usage Chapter 1. Admin Guide @@ -383,9 +384,9 @@ modparam("rtpproxy", "table_name", "my_rtpp_sets") 4.11. rtp_inst_pvar (string) - A pseudo variable to store the chosen RTPProxy IP address. If this - parameter is set, the IP address and port of the instance chosen will - be stored in the given variable. + A pseudo variable to store the chosen RTPProxy address. If this + parameter is set, the instance URL will be stored in the given + variable. By default, this parameter is not set. @@ -394,6 +395,16 @@ modparam("rtpproxy", "table_name", "my_rtpp_sets") modparam("rtpproxy", "rtp_inst_pvar", "$avp(RTP_INSTANCE)") ... + Example 1.12. rtp_inst_pvar usage +modparam("rtpproxy", "rtpproxy_sock", + "udp:localhost:12221 udp:localhost:12222") +modparam("rtpproxy", "rtp_inst_pvar", "$var(RTP_INSTANCE)") +... +rtpproxy_manage("eiro"); +xlog("L_INFO", "Chose rtpp instance $var(RTP_INSTANCE)\n"); +# This will display 'udp:localhost:12222' +... + 5. Functions 5.1. set_rtp_proxy_set(setid) @@ -418,7 +429,7 @@ modparam("rtpproxy", "rtp_inst_pvar", "$avp(RTP_INSTANCE)") This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.12. set_rtp_proxy_set usage + Example 1.13. set_rtp_proxy_set usage ... set_rtp_proxy_set("2"); rtpproxy_offer(); @@ -524,7 +535,7 @@ rtpproxy_offer(); This function can be used from ANY_ROUTE. - Example 1.13. rtpproxy_offer usage + Example 1.14. rtpproxy_offer usage route { ... if (is_method("INVITE")) { @@ -568,7 +579,7 @@ onreply_route[2] This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. - Example 1.14. rtpproxy_answer usage + Example 1.15. rtpproxy_answer usage See rtpproxy_offer() function example above for example. @@ -604,7 +615,7 @@ onreply_route[2] unused rtpproxy call when 200 OK is received on a branch, where rtpproxy is not needed. - Example 1.15. rtpproxy_destroy usage + Example 1.16. rtpproxy_destroy usage ... rtpproxy_destroy(); ... @@ -638,7 +649,7 @@ rtpproxy_destroy(); This function can be used from ANY_ROUTE. - Example 1.16. rtpproxy_manage usage + Example 1.17. rtpproxy_manage usage ... rtpproxy_manage(); ... @@ -674,7 +685,7 @@ rtpproxy_manage(); -1 means that it will be streaming in a loop indefinitely, until the appropriate rtpproxy_stop_stream2xxx is issued. - Example 1.17. rtpproxy_stream2xxx usage + Example 1.18. rtpproxy_stream2xxx usage ... if (is_method("INVITE")) { rtpproxy_offer(); @@ -707,7 +718,7 @@ rtpproxy_manage(); This function can be used from REQUEST_ROUTE and ONREPLY_ROUTE. - Example 1.18. start_recording usage + Example 1.19. start_recording usage ... start_recording(); ... @@ -727,7 +738,7 @@ start_recording(); packet-counters. The statistics must be retrieved before the session is deleted (before unforce_rtpproxy()). - Example 1.19. $rtpstat-Usage + Example 1.20. $rtpstat-Usage ... append_hf("X-RTP-Statistics: $rtpstat\r\n"); ... @@ -748,9 +759,9 @@ start_recording(); The second parameter value must be a number in decimal. NOTE: if a rtpproxy is defined multiple times (in the same or - diferente sete), all of its instances will be enables/disabled. + different sets), all of its instances will be enabled/disabled. - Example 1.20. nh_enable_rtpp usage + Example 1.21. nh_enable_rtpp usage ... $ kamctl fifo nh_enable_rtpp udp:192.168.2.133:8081 0 ... @@ -762,7 +773,7 @@ $ kamctl fifo nh_enable_rtpp udp:192.168.2.133:8081 0 No parameter. - Example 1.21. nh_show_rtpp usage + Example 1.22. nh_show_rtpp usage ... $ kamctl fifo nh_show_rtpp ... diff --git a/modules/rtpproxy/doc/rtpproxy_admin.xml b/modules/rtpproxy/doc/rtpproxy_admin.xml index db206f7..a1939c9 100644 --- a/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -324,8 +324,8 @@ modparam("rtpproxy", "table_name", "my_rtpp_sets") <section> <title><varname>rtp_inst_pvar</varname> (string)</title> <para> - A pseudo variable to store the chosen RTPProxy IP address. - If this parameter is set, the IP address and port of the instance chosen will be stored in the given variable. + A pseudo variable to store the chosen RTPProxy address. + If this parameter is set, the instance URL will be stored in the given variable. </para> <para> By default, this parameter is not set. @@ -338,6 +338,19 @@ modparam("rtpproxy", "rtp_inst_pvar", "$avp(RTP_INSTANCE)") ... </programlisting> </example> + <example> + <title><varname>rtp_inst_pvar</varname> usage</title> + <programlisting format="linespecific"> +modparam("rtpproxy", "rtpproxy_sock", + "udp:localhost:12221 udp:localhost:12222") +modparam("rtpproxy", "rtp_inst_pvar", "$var(RTP_INSTANCE)") +... +rtpproxy_manage("eiro"); +xlog("L_INFO", "Chose rtpp instance $var(RTP_INSTANCE)\n"); +# This will display 'udp:localhost:12222' +... +</programlisting> + </example> </section> </section> @@ -855,7 +868,7 @@ start_recording(); </para> <para> NOTE: if a rtpproxy is defined multiple times (in the same or - diferente sete), all of its instances will be enables/disabled. + different sets), all of its instances will be enabled/disabled. </para> <example> <title>

10 years, 10 months

rtpproxy: nortpproxy_str default value - bad behavior

by Klaus Darilion

Hi! The default value is "a=nortpproxy:yes\r\n". This means that external parties can influence the behavior a Kamailio/rtpproxy installation with default values. This may break functionality (just happend for one of my customers) and is IMO very bad from security point of view. Thus I propose to change the default value to "", which means that this feature is deactivated. regards Klaus

10 years, 10 months

[tracker] Comment added: Possible memory leak when processing sht_reload

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#385 - Possible memory leak when processing sht_reload User who did this - i (takeshi) ---------- Daniel, thanks. I confirmed expected behavior on this version: # kamctl fifo version Server:: kamailio (4.2.0-dev0 (x86_64/linux)) Build:: mi_core.c compiled on 13:43:19 Jan 8 2014 with gcc 4.6.3 Flags:: STATS: Off, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, DBG_QM_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES GIT:: b39365 # for i in $(seq 0 10000);do echo $i; kamctl fifo sht_reload domain; done ... abridged ... 9996 9997 9998 9999 10000 ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=385#comment1275 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.

10 years, 10 months

[tracker] Task closed: registrar: memory and db get not synced

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#351 - registrar: memory and db get not synced User who did this - Víctor Seva (linuxmaniac) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=351 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.

10 years, 10 months

git:master: usrloc: add user_col to the update contact query with instance

by Victor Seva

Module: sip-router Branch: master Commit: b393656c1113eb3630470389f142c53fbc085a90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b393656… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Jan 7 13:59:37 2014 +0100 usrloc: add user_col to the update contact query with instance --- modules/usrloc/ucontact.c | 48 ++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 15 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 4877c7f..b18ce98 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -1051,8 +1051,8 @@ int db_update_ucontact_instance(ucontact_t* _c) { str auser; str adomain; - db_key_t keys1[2]; - db_val_t vals1[2]; + db_key_t keys1[4]; + db_val_t vals1[4]; int n1; db_key_t keys2[13]; @@ -1070,6 +1070,13 @@ int db_update_ucontact_instance(ucontact_t* _c) } n1 = 0; + keys1[n1] = &user_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = *_c->aor; + LM_DBG("aor:%.*s\n", vals1[n1].val.str_val.len, vals1[n1].val.str_val.s); + n1++; + keys1[n1] = &instance_col; vals1[n1].type = DB1_STR; vals1[n1].nul = 0; @@ -1181,6 +1188,29 @@ int db_update_ucontact_instance(ucontact_t* _c) LM_DBG("contact:%.*s\n", vals2[n2].val.str_val.len, vals2[n2].val.str_val.s); n2++; + auser = *_c->aor; + if (use_domain) { + keys1[n1] = &domain_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + adomain.s = memchr(_c->aor->s, '@', _c->aor->len); + if (adomain.s==0) { + vals1[0].val.str_val.len = 0; + vals1[n1].val.str_val = *_c->aor; + auser.len = 0; + adomain = *_c->aor; + } else { + vals1[0].val.str_val.len = adomain.s - _c->aor->s; + vals1[n1].val.str_val.s = adomain.s + 1; + vals1[n1].val.str_val.len = _c->aor->s + _c->aor->len - adomain.s - 1; + auser.len = adomain.s - _c->aor->s; + adomain.s++; + adomain.len = _c->aor->s + + _c->aor->len - adomain.s; + } + n1++; + } + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1; @@ -1204,19 +1234,7 @@ int db_update_ucontact_instance(ucontact_t* _c) /* delete old db attrs and add the current list */ if (ul_xavp_contact_name.s) { - auser = *_c->aor; - if (use_domain) { - adomain.s = memchr(_c->aor->s, '@', _c->aor->len); - if (adomain.s==0) { - auser.len = 0; - adomain = *_c->aor; - } else { - auser.len = adomain.s - _c->aor->s; - adomain.s++; - adomain.len = _c->aor->s + - _c->aor->len - adomain.s; - } - + if (use_domain) { uldb_delete_attrs(_c->domain, &auser, &adomain, &_c->ruid); uldb_insert_attrs(_c->domain, &auser,

10 years, 10 months

git:3.3: modules_k/usrloc: add user_col to the update contact query with instance

by Victor Seva

Module: sip-router Branch: 3.3 Commit: cd6dea02f4c8a9aa6c22357f66d4d15713b28797 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd6dea0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Jan 7 14:29:17 2014 +0100 modules_k/usrloc: add user_col to the update contact query with instance backport of b393656c1113eb3630470389f142c53fbc085a90 --- modules_k/usrloc/ucontact.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index 9b21cee..c2462a7 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -752,8 +752,9 @@ int db_update_ucontact(ucontact_t* _c) */ int db_update_ucontact_instance(ucontact_t* _c) { - db_key_t keys1[2]; - db_val_t vals1[2]; + char* dom; + db_key_t keys1[4]; + db_val_t vals1[4]; db_key_t keys2[13]; db_val_t vals2[13]; @@ -769,8 +770,9 @@ int db_update_ucontact_instance(ucontact_t* _c) return -1; } - keys1[0] = &instance_col; - keys1[1] = &reg_id_col; + keys1[0] = &user_col; + keys1[1] = &instance_col; + keys1[2] = &reg_id_col; keys2[0] = &expires_col; keys2[1] = &q_col; keys2[2] = &cseq_col; @@ -787,11 +789,15 @@ int db_update_ucontact_instance(ucontact_t* _c) vals1[0].type = DB1_STR; vals1[0].nul = 0; - vals1[0].val.str_val = _c->instance; + vals1[0].val.str_val = *_c->aor; - vals1[1].type = DB1_INT; + vals1[1].type = DB1_STR; vals1[1].nul = 0; - vals1[1].val.int_val = (int)_c->reg_id; + vals1[1].val.str_val = _c->instance; + + vals1[2].type = DB1_INT; + vals1[2].nul = 0; + vals1[2].val.int_val = (int)_c->reg_id; vals2[0].type = DB1_DATETIME; vals2[0].nul = 0; @@ -870,6 +876,20 @@ int db_update_ucontact_instance(ucontact_t* _c) vals2[nr_cols2].val.str_val.len = _c->c.len; nr_cols2++; + if (use_domain) { + vals1[3].type = DB1_STR; + vals1[3].nul = 0; + dom = memchr(_c->aor->s, '@', _c->aor->len); + if (dom==0) { + vals1[0].val.str_val.len = 0; + vals1[3].val.str_val = *_c->aor; + } else { + vals1[0].val.str_val.len = dom - _c->aor->s; + vals1[3].val.str_val.s = dom + 1; + vals1[3].val.str_val.len = _c->aor->s + _c->aor->len - dom - 1; + } + } + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1;

10 years, 10 months

[tracker] Comment added: registrar: memory and db get not synced

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#351 - registrar: memory and db get not synced User who did this - Daniel-Constantin Mierla (miconda) ---------- It can be committed. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=351#comment1274 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.

10 years, 10 months

[tracker] Comment added: registrar: memory and db get not synced

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#351 - registrar: memory and db get not synced User who did this - Víctor Seva (linuxmaniac) ---------- instance+reg_id ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=351#comment1273 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.

10 years, 10 months

[tracker] Task changed: presence_dialoginfo to send initial NOTIFY with body

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#355 - presence_dialoginfo to send initial NOTIFY with body User who did this: Daniel-Constantin Mierla (miconda) Task Type: Bug Report -> Improvement More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=355 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.

10 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2014