sr-dev August 2014

sr-dev@lists.kamailio.org

25 participants
195 discussions

[tracker] Comment added: Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#459 - Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs User who did this - Daniel-Constantin Mierla (miconda) ---------- Database creation is done by kamdbctl, kamctl is another tool, both using kamctlrc as config, becuase the credentials to connect to database are the same. sip domain is optional, can be the server hostname or ip ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=459#comment1591 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.

9 years, 9 months

[tracker] Comment added: Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#459 - Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs User who did this - Ed James (erj01) ---------- I've got DBENGINE setup and the read/write user and read only user set up already. That link looks to me like the initial creation of the database which I wouldn't want to run again. I can log into MySQL using both read/write and readonly users and also the root user successfully. Could you tell me what the SIP_DOMAIN parameter should be pointing to in this file ? Also what does mi ds_list actually do ? Thanks for your help. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=459#comment1590 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.

9 years, 9 months

[tracker] Comment added: Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#459 - Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs User who did this - Daniel-Constantin Mierla (miconda) ---------- You need to set the DBENGINE -- maybe these notes would help a bit: - http://www.kamailio.org/wiki/install/4.1.x/git#create_mysql_database On the other hand, you can simply do: kamctl mi ds_list ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=459#comment1589 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.

9 years, 9 months

[tracker] Comment added: Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#459 - Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs User who did this - Ed James (erj01) ---------- Thanks - do you have a working kamctlrc file as I'm having difficulty getting past the same error relating to the database engine. I've uncommented all of the entries relating to the read write user but no luck. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=459#comment1588 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.

9 years, 9 months

git:master: textopsx: documented return behavior of msg_apply_changes()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1257d6832381d50280dff9133f0d5da7c4a58231 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1257d68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 15 16:14:34 2014 +0200 textopsx: documented return behavior of msg_apply_changes() --- modules/textopsx/README | 7 +++++++ modules/textopsx/doc/functions.xml | 8 ++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/modules/textopsx/README b/modules/textopsx/README index d53e2eb..3ff68fe 100644 --- a/modules/textopsx/README +++ b/modules/textopsx/README @@ -119,6 +119,13 @@ Chapter 1. Admin Guide the SIP message buffer so far, using this function might change the behaviour of your config. Do test your config properly! + The function returns true (1) on success. If it is failure before the + new content is build, the function returns false (-1), the old content + is still in place. If parsing of the new content is failing, the + function stops executions of the config file (the internal structure is + no longer valid for config processing, like it happens when a broken + message is received from network). + This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE. Example 1.1. msg_apply_changes() usage diff --git a/modules/textopsx/doc/functions.xml b/modules/textopsx/doc/functions.xml index 57d6d31..53fd113 100644 --- a/modules/textopsx/doc/functions.xml +++ b/modules/textopsx/doc/functions.xml @@ -16,6 +16,14 @@ the behaviour of your config. Do test your config properly! </para> <para> + The function returns true (1) on success. If it is failure before the + new content is build, the function returns false (-1), the old content + is still in place. If parsing of the new content is failing, the + function stops executions of the config file (the internal structure + is no longer valid for config processing, like it happens when a + broken message is received from network). + </para> + <para> This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE. </para> <example>

9 years, 9 months

git:master: textopsx: msg_apply_changes() exits config execution if result is not parsing well

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 55960106bbaa908057c3f619034b146fda7df48b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5596010… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 15 16:01:38 2014 +0200 textopsx: msg_apply_changes() exits config execution if result is not parsing well - sip_msg_t structure is can be invalid - similar behavior with the case when the message is broken from the network, it doesn't get to config file - reported by Marco B. --- modules/textopsx/textopsx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index 560f556..7e85013 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -228,8 +228,11 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) /* reparse the message */ LM_DBG("SIP message content updated - reparsing\n"); if (parse_msg(msg->buf, msg->len, msg)!=0){ - LM_ERR("parsing new sip message failed\n"); - return -1; + LM_ERR("parsing new sip message failed [[%.*s]]\n", + msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; } return 1;

9 years, 9 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Jason Penton

Module: sip-router Branch: master Commit: 11ade9c99d910da6c56d3d5499c0a5b6bd902e3d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11ade9c… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 15 15:32:34 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

9 years, 9 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Jason Penton

Module: sip-router Branch: master Commit: 6e23e6159c49ba20fcb1430f2a654a754e8cc0a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e23e61… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Aug 13 08:16:39 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

9 years, 9 months

git:master: modules/ims_registrar_pcscf: added new module param ignore_contact_rxport_check to ignore check on received port

by Jason Penton

Module: sip-router Branch: master Commit: fbcf59bb4f8c1559f8361a7fd96bc9521fb250b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fbcf59b… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 15 15:29:30 2014 +0200 modules/ims_registrar_pcscf: added new module param ignore_contact_rxport_check to ignore check on received port - this is particular useful for clients that register using UDP but switch to TCP for INVITEs that are too big and cant be carried by UDP. Before this change, searching for the contact would fail because of a difference in the received ports between REGISTER and other subsequent messages that don't use UDP --- modules/ims_registrar_pcscf/reg_mod.c | 22 ++++++++++------------ modules/ims_registrar_pcscf/service_routes.c | 7 +++++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/ims_registrar_pcscf/reg_mod.c b/modules/ims_registrar_pcscf/reg_mod.c index fdabd93..0c2ba77 100644 --- a/modules/ims_registrar_pcscf/reg_mod.c +++ b/modules/ims_registrar_pcscf/reg_mod.c @@ -77,6 +77,8 @@ pua_api_t pua; /**!< PUA API structure */ int publish_reginfo = 0; int subscribe_to_reginfo = 0; int subscription_expires = 3600; +int ignore_contact_rxport_check = 0; /**!< ignore port checks between received port on message and registration received port. + * this is useful for example if you register with UDP but possibly send invite over TCP (message too big)*/ time_t time_now; char * pcscf_uri = "sip:pcscf.ims.smilecoms.com:4060"; @@ -147,18 +149,14 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"pcscf_uri", STR_PARAM, &pcscf_uri }, - {"pending_reg_expires", INT_PARAM, &pending_reg_expires }, - - {"received_avp", STR_PARAM, &rcv_avp_param }, - - {"is_registered_fallback2ip", INT_PARAM, &is_registered_fallback2ip }, - - {"publish_reginfo", INT_PARAM, &publish_reginfo}, - {"subscribe_to_reginfo", INT_PARAM, &subscribe_to_reginfo}, - {"subscription_expires",INT_PARAM, &subscription_expires }, - - + {"pcscf_uri", STR_PARAM, &pcscf_uri }, + {"pending_reg_expires", INT_PARAM, &pending_reg_expires }, + {"received_avp", STR_PARAM, &rcv_avp_param }, + {"is_registered_fallback2ip", INT_PARAM, &is_registered_fallback2ip }, + {"publish_reginfo", INT_PARAM, &publish_reginfo }, + {"subscribe_to_reginfo", INT_PARAM, &subscribe_to_reginfo }, + {"subscription_expires", INT_PARAM, &subscription_expires }, + {"ignore_contact_rxport_check", INT_PARAM, &ignore_contact_rxport_check }, // {"store_profile_dereg", INT_PARAM, &store_data_on_dereg}, {0, 0, 0} }; diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 31db6d0..17328de 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -36,7 +36,7 @@ static unsigned int current_msg_id = 0; static pcontact_t * c = NULL; extern usrloc_api_t ul; - +extern int ignore_contact_rxport_check; static str * asserted_identity; /*! @@ -148,7 +148,10 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d) { } } - if ((c->reg_state == PCONTACT_REGISTERED) && ((c->received_port == _m->rcv.src_port) || (security_server_port == _m->rcv.src_port)) && (c->received_proto == _m->rcv.proto)) { + if ((c->reg_state == PCONTACT_REGISTERED) + && (ignore_contact_rxport_check || (c->received_port == _m->rcv.src_port) || (security_server_port == _m->rcv.src_port)) + && (ignore_contact_rxport_check||(c->received_proto == _m->rcv.proto))) { + received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); received_host.s = srcip; LM_DBG("Received host len %d (search %d)\n", c->received_host.len, received_host.len);

9 years, 9 months

git:master: modules/ims_usrloc_pcscf: fixed bug when updating DB record for P-CSCF contact

by Jason Penton

Module: sip-router Branch: master Commit: f1f227e661697cd527f6ab7077c275ddfc8ba23d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1f227e… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 8 11:38:00 2014 +0200 modules/ims_usrloc_pcscf: fixed bug when updating DB record for P-CSCF contact --- modules/ims_usrloc_pcscf/usrloc_db.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/ims_usrloc_pcscf/usrloc_db.c b/modules/ims_usrloc_pcscf/usrloc_db.c index c80f6ad..cc85163 100644 --- a/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/modules/ims_usrloc_pcscf/usrloc_db.c @@ -121,18 +121,20 @@ int db_update_pcontact(pcontact_t* _c) db_val_t match_values[1]; db_key_t match_keys[1] = { &aor_col }; + db_op_t op[1]; db_key_t update_keys[8] = { &expires_col, &reg_state_col, &service_routes_col, &received_col, &received_port_col, &received_proto_col, &rx_session_id_col, &public_ids_col }; db_val_t values[8]; - - LM_DBG("updating pcontact: %.*s\n", _c->aor.len, _c->aor.s); + + LM_DBG("updating pcontact: %.*s\n", _c->aor.len, _c->aor.s); VAL_TYPE(match_values) = DB1_STR; VAL_NULL(match_values) = 0; VAL_STR(match_values) = _c->aor; + op[0]=OP_EQ; if (use_location_pcscf_table(_c->domain) < 0) { LM_ERR("Error trying to use table %.*s\n", _c->domain->len, _c->domain->s); @@ -180,7 +182,7 @@ int db_update_pcontact(pcontact_t* _c) SET_PROPER_NULL_FLAG(impus, values, 7); SET_STR_VALUE(values + 7, impus); - if((ul_dbf.update(ul_dbh, match_keys, NULL, match_values, update_keys,values, 1, 8)) !=0){ + if((ul_dbf.update(ul_dbh, match_keys, op, match_values, update_keys,values, 1, 8)) !=0){ LM_ERR("could not update database info\n"); return -1; } @@ -323,6 +325,7 @@ int db_insert_pcontact(struct pcontact* _c) int db_update_pcontact_security_temp(struct pcontact* _c, security_type _t, security_t* _s) { db_val_t match_values[1]; db_key_t match_keys[1] = { &aor_col }; + db_op_t op[1]; db_key_t update_keys[13] = { &t_security_type_col, &t_protocol_col, &t_mode_col, &t_ck_col, &t_ik_col, &t_ealg_col, &t_ialg_col, &t_port_uc_col, &t_port_us_col, &t_spi_pc_col, &t_spi_ps_col, &t_spi_uc_col, &t_spi_us_col }; @@ -333,6 +336,7 @@ int db_update_pcontact_security_temp(struct pcontact* _c, security_type _t, secu VAL_TYPE(match_values) = DB1_STR; VAL_NULL(match_values) = 0; VAL_STR(match_values) = _c->aor; + op[0]=OP_EQ; if (use_location_pcscf_table(_c->domain) < 0) { LM_ERR("Error trying to use table %.*s\n", _c->domain->len, _c->domain->s); @@ -387,7 +391,7 @@ int db_update_pcontact_security_temp(struct pcontact* _c, security_type _t, secu VAL_NULL(values + i) = ipsec?0:1; VAL_BIGINT(values + i) = ipsec?ipsec->spi_us:0; - if ((ul_dbf.update(ul_dbh, match_keys, NULL, match_values, update_keys, + if ((ul_dbf.update(ul_dbh, match_keys, op, match_values, update_keys, values, 1, 13)) != 0) { LM_ERR("could not update database info\n"); return -1; @@ -412,6 +416,8 @@ int db_update_pcontact_security_temp(struct pcontact* _c, security_type _t, secu int db_update_pcontact_security(struct pcontact* _c, security_type _t, security_t* _s) { db_val_t match_values[1]; db_key_t match_keys[1] = { &aor_col }; + db_op_t op[1]; + db_key_t update_keys[13] = { &security_type_col, &protocol_col, &mode_col, &ck_col, &ik_col, &ealg_col, &ialg_col, &port_uc_col, &port_us_col, &spi_pc_col, &spi_ps_col, &spi_uc_col, &spi_us_col }; @@ -422,6 +428,7 @@ int db_update_pcontact_security(struct pcontact* _c, security_type _t, security_ VAL_TYPE(match_values) = DB1_STR; VAL_NULL(match_values) = 0; VAL_STR(match_values) = _c->aor; + op[0]=OP_EQ; if (use_location_pcscf_table(_c->domain) < 0) { LM_ERR("Error trying to use table %.*s\n", _c->domain->len, _c->domain->s); @@ -431,6 +438,7 @@ int db_update_pcontact_security(struct pcontact* _c, security_type _t, security_ VAL_TYPE(values) = DB1_INT; VAL_TIME(values) = _s?_s->type:0; VAL_NULL(values) = 0; + switch (_t) { case SECURITY_IPSEC: { @@ -485,7 +493,7 @@ int db_update_pcontact_security(struct pcontact* _c, security_type _t, security_ VAL_NULL(values + i) = ipsec?0:1; VAL_BIGINT(values + i) = ipsec?ipsec->spi_us:0; - if ((ul_dbf.update(ul_dbh, match_keys, NULL, match_values, update_keys, + if ((ul_dbf.update(ul_dbh, match_keys, op, match_values, update_keys, values, 1, 13)) != 0) { LM_ERR("could not update database info\n"); return -1;

9 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2014