Module: sip-router
Branch: master
Commit: 3a1720a4d63ef5c83c5a6f739dadb06f3c292f50
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a1720a…
Author: Richard Good <richard.good(a)smilecoms.com>
Committer: Richard Good <richard.good(a)smilecoms.com>
Date: Thu Apr 3 15:24:59 2014 +0200
modules/ims_charging: updated debug line with new usrloc contact match mode
---
modules/ims_charging/dialog.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/ims_charging/dialog.c b/modules/ims_charging/dialog.c
index 9c1980d..6d5596f 100644
--- a/modules/ims_charging/dialog.c
+++ b/modules/ims_charging/dialog.c
@@ -207,7 +207,7 @@ void remove_dlg_data_from_contact(struct dlg_cell *dlg, int type, struct dlg_cb_
LM_DBG("usrloc does not have imprecord for implicity IMPU, ignore\n");
}else {
if (ul.get_ucontact(implicit_impurecord, &impu_data->contact, &callid, &path, 0/*cseq*/, &ucontact) != 0) { //contact does not exist
- LM_DBG("This contact: <%.*s> is not in usrloc, ignore - NOTE: You need S-CSCF usrloc set to match_mode CONTACT_ONLY\n", impu_data->contact.len, impu_data->contact.s);
+ LM_DBG("This contact: <%.*s> is not in usrloc, ignore - NOTE: You need S-CSCF usrloc set to match_mode CONTACT_PORT_IP_ONLY\n", impu_data->contact.len, impu_data->contact.s);
} else {//contact exists so add dialog data to it
ul.remove_dialog_data_from_contact(ucontact, dlg->h_entry, dlg->h_id);
}
@@ -242,7 +242,7 @@ void add_dlg_data_to_contact(struct dlg_cell *dlg, int type, struct dlg_cb_param
LM_DBG("usrloc does not have imprecord for implicity IMPU, ignore\n");
}else {
if (ul.get_ucontact(implicit_impurecord, &impu_data->contact, &callid, &path, 0/*cseq*/, &ucontact) != 0) { //contact does not exist
- LM_DBG("This contact: <%.*s> is not in usrloc, ignore - NOTE: You need S-CSCF usrloc set to match_mode CONTACT_ONLY\n", impu_data->contact.len, impu_data->contact.s);
+ LM_DBG("This contact: <%.*s> is not in usrloc, ignore - NOTE: You need S-CSCF usrloc set to match_mode CONTACT_PORT_IP_ONLY\n", impu_data->contact.len, impu_data->contact.s);
} else {//contact exists so add dialog data to it
ul.add_dialog_data_to_contact(ucontact, dlg->h_entry, dlg->h_id);
}
Module: sip-router
Branch: master
Commit: acd1f73f7a5b35a556e02501cccaeeb8948b7529
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acd1f73…
Author: Ovidiu Sas <osas(a)voipembedded.com>
Committer: Ovidiu Sas <osas(a)voipembedded.com>
Date: Wed Apr 2 15:26:50 2014 -0400
xhttp_pi: update inline doc for xhttp_pi samples
---
utils/kamctl/xhttp_pi/pi_framework-01 | 2 ++
utils/kamctl/xhttp_pi/pi_framework.xml | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/utils/kamctl/xhttp_pi/pi_framework-01 b/utils/kamctl/xhttp_pi/pi_framework-01
index d8bfb20..47525fd 100644
--- a/utils/kamctl/xhttp_pi/pi_framework-01
+++ b/utils/kamctl/xhttp_pi/pi_framework-01
@@ -14,6 +14,8 @@
Each col will have:
- a mandatory 'field' identifying the name of the field
- an optional 'value' identifing the given value
+ - an optional 'link_cmd' identifing the update cmd with prepared values
+ * only for query_cols for DB1_QUERY commands
- a mandatory 'operator' only for 'clause_cols'
The [clause|query|order_by]_cols can be:
- ov : optional with multiple 'col' with optional 'value'
diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml
index 1f942a9..68d4df0 100644
--- a/utils/kamctl/xhttp_pi/pi_framework.xml
+++ b/utils/kamctl/xhttp_pi/pi_framework.xml
@@ -906,6 +906,8 @@
Each col will have:
- a mandatory 'field' identifying the name of the field
- an optional 'value' identifing the given value
+ - an optional 'link_cmd' identifing the update cmd with prepared values
+ * only for query_cols for DB1_QUERY commands
- a mandatory 'operator' only for 'clause_cols'
The [clause|query|order_by]_cols can be:
- ov : optional with multiple 'col' with optional 'value'
Module: sip-router
Branch: master
Commit: 8598b812f59b37d7f4b7469aa1a7f61b93ece2a7
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8598b81…
Author: Jason Penton <jason.penton(a)gmail.com>
Committer: Jason Penton <jason.penton(a)gmail.com>
Date: Wed Apr 2 18:06:15 2014 +0200
ims_usrloc_pcscf: fixed bug where contact pointer is not bumped in continue sections of loops
---
modules/ims_usrloc_pcscf/udomain.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c
index c78b54d..dd6ec4d 100644
--- a/modules/ims_usrloc_pcscf/udomain.c
+++ b/modules/ims_usrloc_pcscf/udomain.c
@@ -482,6 +482,7 @@ int get_pcontact(udomain_t* _d, str* _contact, struct pcontact** _c) {
/* hosts HAVE to match */
if ((needle_uri.host.len != c->received_host.len) || (memcmp(needle_uri.host.s, c->contact_host.s, needle_uri.host.len)!=0)) {
//can't possibly match
+ c = c->next;
continue;
}
@@ -533,8 +534,10 @@ int get_pcontact(udomain_t* _d, str* _contact, struct pcontact** _c) {
port_match = 1;
}
- if (!port_match)
+ if (!port_match){
+ c = c->next;
continue;
+ }
/* user parts must match (if not wildcarded) with either primary contact OR with any userpart in the implicit set (associated URIs).. */
if (((needle_uri.user.len == 1)
@@ -551,6 +554,7 @@ int get_pcontact(udomain_t* _d, str* _contact, struct pcontact** _c) {
while (impu) {
if (parse_uri(impu->public_identity.s, impu->public_identity.len, &impu_uri) != 0) {
LM_ERR("failed to parse IMPU URI [%.*s]...continuing\n", impu->public_identity.len, impu->public_identity.s);
+ impu = impu->next;
continue;
}
LM_DBG("comparing first %d chars of impu [%.*s] for contact userpart [%.*s]\n",
THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.
The following task has a new comment added:
FS#353 - carrierroute not loading with kamailio 4.0.x
User who did this - Oli Roth (kolibri99)
----------
Hi Daniel
It seems to be "loadable" using your provided url.
The only thing I had to do is update the address table to verion 6 / before version 5
Now we will perform some tests
You mentioned a patch you applied.
Can I do this by myself with the newest kamailio versions?
If I got you right you will apply this patch to the next stable kamailio verision - correct?
Kind Regards,
Oli
----------
More information can be found at the following URL:
https://sip-router.org/tracker/index.php?do=details&task_id=353#comment1379
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.