Module: kamailio
Branch: master
Commit: 20634fccc59c82a35b45a3da0b8e6a0e64acb37e
URL: https://github.com/kamailio/kamailio/commit/20634fccc59c82a35b45a3da0b8e6a0…
Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro>
Committer: Henning Westerholt <hw(a)gilawa.com>
Date: 2023-08-14T17:08:35+02:00
ims_qos: doc and logs update
---
Modified: src/modules/ims_qos/doc/ims_qos_admin.xml
Modified: src/modules/ims_qos/ims_qos_mod.c
---
Diff: https://github.com/kamailio/kamailio/commit/20634fccc59c82a35b45a3da0b8e6a0…
Patch: https://github.com/kamailio/kamailio/commit/20634fccc59c82a35b45a3da0b8e6a0…
---
diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml
index b8a36c7b136..7755a963abd 100644
--- a/src/modules/ims_qos/doc/ims_qos_admin.xml
+++ b/src/modules/ims_qos/doc/ims_qos_admin.xml
@@ -29,7 +29,7 @@
<itemizedlist>
<listitem>
- <para>Dialog</para>
+ <para>IMS Dialog</para>
</listitem>
<listitem>
@@ -625,8 +625,8 @@ route[REG_AAR_REPLY]
</listitem>
</itemizedlist>
- <para>This function can be used from REQUEST_ROUTE or
- ONREPLY_ROUTE.</para>
+ <para>This function can be used only from ONREPLY_ROUTE, only for replies to INVITE, UPDATE, PRACK.
+ The reply and request must have SDP, for this function to work properly.</para>
<para>p.s. this is executed asynchronously. See example on how to
retrieve return value</para>
diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c
index d2502020450..9ff174f03eb 100644
--- a/src/modules/ims_qos/ims_qos_mod.c
+++ b/src/modules/ims_qos/ims_qos_mod.c
@@ -205,8 +205,8 @@ static int pv_t_copy_msg(struct sip_msg *src, struct sip_msg *dst)
}
-static cmd_export_t cmds[] = {{"Rx_AAR", (cmd_function)w_rx_aar, 4, fixup_aar,
- 0, REQUEST_ROUTE | ONREPLY_ROUTE},
+static cmd_export_t cmds[] = {
+ {"Rx_AAR", (cmd_function)w_rx_aar, 4, fixup_aar, 0, ONREPLY_ROUTE},
{"Rx_AAR_Register", (cmd_function)w_rx_aar_register, 2,
fixup_aar_register, 0, REQUEST_ROUTE},
{0, 0, 0, 0, 0, 0}};
@@ -801,7 +801,7 @@ static int w_rx_aar(
}
if(t->uas.status >= 200) {
- LM_DBG("transaction sent out a final response already - %d\n",
+ LM_WARN("transaction sent out a final response already - %d\n",
t->uas.status);
return result;
}
@@ -864,13 +864,13 @@ static int w_rx_aar(
|| memcmp(t->method.s, "UPDATE", 6) == 0))) {
if(cscf_get_content_length(msg) == 0
|| cscf_get_content_length(orig_sip_request_msg) == 0) {
- LM_DBG("No SDP offer answer -> therefore we can not do Rx AAR");
+ LM_WARN("No SDP offer answer -> therefore we can not do Rx AAR");
//goto aarna; //AAR na if we don't have offer/answer pair
return result;
}
} else {
- LM_DBG("Message is not response to INVITE, PRACK or UPDATE -> "
- "therefore we do not Rx AAR");
+ LM_WARN("Message is not response to INVITE, PRACK or UPDATE -> "
+ "therefore we do not Rx AAR");
return result;
}
@@ -1162,7 +1162,7 @@ static int w_rx_aar(
int ret = create_new_callsessiondata(&callid, &ftag, &ttag, &identifier,
identifier_type, &ip, ip_version, &rx_authdata_p);
if(!ret) {
- LM_DBG("Unable to create new media session data parcel\n");
+ LM_ERR("Unable to create new media session data parcel\n");
goto error;
}
Module: kamailio
Branch: master
Commit: 2fd5d881563126f7425730f798afcbfc2feeac65
URL: https://github.com/kamailio/kamailio/commit/2fd5d881563126f7425730f798afcbf…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2023-08-12T13:46:24+02:00
modules: readme files regenerated - rabbitmq ... [skip ci]
---
Modified: src/modules/rabbitmq/README
Modified: src/modules/xhttp/README
---
Diff: https://github.com/kamailio/kamailio/commit/2fd5d881563126f7425730f798afcbf…
Patch: https://github.com/kamailio/kamailio/commit/2fd5d881563126f7425730f798afcbf…
---
diff --git a/src/modules/rabbitmq/README b/src/modules/rabbitmq/README
index 942afffa83f..889512b6a48 100644
--- a/src/modules/rabbitmq/README
+++ b/src/modules/rabbitmq/README
@@ -176,7 +176,7 @@ modparam("rabbitmq", "direct_reply_to", 1)
* content_type - the content_type of the messagebody.
* messagebody - the messagebody to be published.
- This function can be used from REQUEST_ROUTE.
+ This function can be used from any route.
Example 1.5. rabbitmq_publish usage
rabbitmq_publish("exchange", "routing_key", "application/json", "$avp(json_reque
diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README
index 9a59c839aa1..ec009bacafb 100644
--- a/src/modules/xhttp/README
+++ b/src/modules/xhttp/README
@@ -83,8 +83,8 @@ Chapter 1. Admin Guide
SIP parser can easily handle HTTP requests just by adding a fake Via
header.
- The <module>xmlrpc</module> module uses the same concept. The xHTTP
- module offers a generic way of handling the HTTP protocol, by calling
+ The xmlrpc module uses the same concept. The xHTTP module offers a
+ generic way of handling the HTTP protocol, by calling
event_route[xhttp:request] in your config. You can check the HTTP URL
via the config variable $hu. Note that use of $ru will raise errors
since the structure of an HTTP URL is not compatible with that of a SIP
@@ -222,7 +222,10 @@ event_route[xhttp:request] {
6.1. xhttp:request
- The event route is executed when a new HTTP request is received.
+ The event route is executed when a new HTTP request is received. Most
+ of the variables related to a SIP request can be used inside this event
+ route to get HTTP request attributes (e.g., $si - source IP, $hdr(X) -
+ body of header X, $rm - request method, $rb - request body, ...).
...
tcp_accept_no_cl=yes
...
Enabling rabbitmq_publish function on any route so we can send events on reply reception.
Also disabling peer verification on the TLS handshake if no CA file is configured.
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [x] Commit message has the format required by CONTRIBUTING guide
- [x] Commits are split per component (core, individual modules, libs, utils, ...)
- [ ] Each component has a single commit (if not, squash them into one commit)
- [ ] No commits to README files for modules (changes must be done to docbook files
in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change
- [ ] Small bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [ ] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3537
-- Commit Summary --
* rabbitmq: Enabling rabbitmq_publish for any route and disabling peer
-- File Changes --
M src/modules/rabbitmq/doc/rabbitmq_admin.xml (2)
M src/modules/rabbitmq/rabbitmq.c (8)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3537.patchhttps://github.com/kamailio/kamailio/pull/3537.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3537
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3537(a)github.com>