mirror of https://github.com/sipwise/kamailio.git
Upgrading to 6.0.2 * sipwise/lost-add-method-parameter-to-http_connect-calls.patch: rework Change-Id: I2b43c934f1b9897174dcda9c434c1cbb586858bdpull/12/head
Donat Zenichev
10 months ago
parent
354097cd23
commit
37a2a89230
@ -1,21 +0,0 @@
|
||||
From: Victor Seva <linuxmaniac@torreviejawireless.org>
|
||||
Date: Wed, 12 Mar 2025 23:09:16 +0100
|
||||
Subject: [PATCH] presence_dfks: add missing definition
|
||||
|
||||
(cherry picked from commit fb00af35fa36120491c85d47d3e71b5c6c22a2db)
|
||||
---
|
||||
src/modules/presence_dfks/presence_dfks.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/modules/presence_dfks/presence_dfks.c b/src/modules/presence_dfks/presence_dfks.c
|
||||
index da72109..1e67ee6 100644
|
||||
--- a/src/modules/presence_dfks/presence_dfks.c
|
||||
+++ b/src/modules/presence_dfks/presence_dfks.c
|
||||
@@ -46,6 +46,7 @@ MODULE_VERSION
|
||||
static int mod_init(void);
|
||||
|
||||
/** API structures */
|
||||
+add_event_t pres_add_event;
|
||||
sl_api_t slb;
|
||||
presence_api_t pres;
|
||||
pua_api_t pua;
|
||||
@ -1,71 +0,0 @@
|
||||
From: Victor Seva <linuxmaniac@torreviejawireless.org>
|
||||
Date: Thu, 22 May 2025 09:04:51 +0200
|
||||
Subject: sca: reserve subscription.rr.s separately since it could be updated
|
||||
|
||||
(cherry picked from commit fd04bcc152dd6ef88fbb819b0b77aee7ca817878)
|
||||
---
|
||||
src/modules/sca/sca_subscribe.c | 24 +++++++++++++++---------
|
||||
1 file changed, 15 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c
|
||||
index 8cddf7c..844b918 100644
|
||||
--- a/src/modules/sca/sca_subscribe.c
|
||||
+++ b/src/modules/sca/sca_subscribe.c
|
||||
@@ -626,9 +626,6 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber,
|
||||
|
||||
len += sizeof(sca_subscription);
|
||||
len += sizeof(char) * (aor->len + subscriber->len);
|
||||
- if(!SCA_STR_EMPTY(rr)) {
|
||||
- len += sizeof(char) * rr->len;
|
||||
- }
|
||||
|
||||
sub = (sca_subscription *)shm_malloc(len);
|
||||
if(sub == NULL) {
|
||||
@@ -660,18 +657,20 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber,
|
||||
SCA_STR_COPY(&sub->target_aor, aor);
|
||||
len += aor->len;
|
||||
|
||||
+ // we shm_malloc this parts separately in case we need to update in-memory
|
||||
+ // info for this subscriber. This is likely to happen if the
|
||||
+ // subscriber goes off-line for some reason.
|
||||
if(!SCA_STR_EMPTY(rr)) {
|
||||
- sub->rr.s = (char *)sub + len;
|
||||
+ sub->rr.s = (char *)shm_malloc(rr->len);
|
||||
+ if(sub->rr.s == NULL) {
|
||||
+ SHM_MEM_ERROR;
|
||||
+ goto error;
|
||||
+ }
|
||||
SCA_STR_COPY(&sub->rr, rr);
|
||||
- len += rr->len;
|
||||
}
|
||||
// dialog.id holds call-id + from-tag + to-tag; dialog.call_id,
|
||||
// dialog.from_tag, and dialog.to_tag point to offsets within
|
||||
// dialog.id.
|
||||
- //
|
||||
- // we shm_malloc this separately in case we need to update in-memory
|
||||
- // dialog saved for this subscriber. This is likely to happen if the
|
||||
- // subscriber goes off-line for some reason.
|
||||
len = sizeof(char) * (call_id->len + from_tag->len + to_tag->len);
|
||||
sub->dialog.id.s = (char *)shm_malloc(len);
|
||||
if(sub->dialog.id.s == NULL) {
|
||||
@@ -702,6 +701,9 @@ sca_subscription *sca_subscription_create(str *aor, int event, str *subscriber,
|
||||
|
||||
error:
|
||||
if(sub != NULL) {
|
||||
+ if(sub->rr.s != NULL) {
|
||||
+ shm_free(sub->rr.s);
|
||||
+ }
|
||||
if(sub->dialog.id.s != NULL) {
|
||||
shm_free(sub->dialog.id.s);
|
||||
}
|
||||
@@ -734,6 +736,10 @@ void sca_subscription_free(void *value)
|
||||
LM_DBG("Freeing %s subscription from %.*s\n",
|
||||
sca_event_name_from_type(sub->event), STR_FMT(&sub->subscriber));
|
||||
|
||||
+ if(!SCA_STR_EMPTY(&sub->rr)) {
|
||||
+ shm_free(sub->rr.s);
|
||||
+ }
|
||||
+
|
||||
if(!SCA_STR_EMPTY(&sub->dialog.id)) {
|
||||
shm_free(sub->dialog.id.s);
|
||||
}
|
||||
Loading…
Reference in new issue