MT#56147 fix undefined symbol: get_dlg_variable

ddd4bc1b1481c1ea7c8d5339efd9969a39da0f04 instroduced a change in the
dialog API, but get_dlg_var is not included in 5.6 branch

Change-Id: I0a0064b50f72821a9874b4c3b95ee261c9ae6faa
(cherry picked from commit 6930119dae)
mr11.1
Victor Seva 3 years ago
parent 4f2dc60b86
commit de2e4e136d

@ -40,6 +40,7 @@ upstream/dialog-reworked-kemi-export-for-dlg_get_var.patch
upstream/dialog-fix-ki_dlg_get_var-introduced-previously.patch
upstream/dialog-dlg_get_var-assure-return-null-on-error.patch
upstream/dialog-w_dlg_get_var-fix-incompatible-pointer.patch
sipwise/dialog-dlg_get_var-changes-in-API.patch
upstream/presence-No-autocommit-rollback-if-no-active-watcher.patch
### relevant for upstream
sipwise/pua_dialoginfo-refresh_pubruri_avps_flag.patch

@ -0,0 +1,21 @@
From: Victor Seva <vseva@sipwise.com>
Date: Tue, 13 Dec 2022 11:38:00 +0100
Subject: dialog: dlg_get_var changes in API
---
src/modules/dialog/dialog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c
index 6545444..25f3ca1 100644
--- a/src/modules/dialog/dialog.c
+++ b/src/modules/dialog/dialog.c
@@ -1536,7 +1536,7 @@ static str *ki_dlg_get_var_helper(sip_msg_t *msg, str *sc, str *sf, str *st, str
dlg = get_dlg(sc, sf, st, &dir);
if(dlg==NULL)
return val;
- val = get_dlg_variable(dlg, key);
+ val = get_dlg_varref(dlg, key);
dlg_release(dlg);
return val;
}

@ -8,7 +8,7 @@ Subject: MT#55631 dialog: dlg_set_var() support empty totag parameter
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c
index e9ed5d9..90a20f6 100644
index aedf8a7..8f4c806 100644
--- a/src/modules/dialog/dialog.c
+++ b/src/modules/dialog/dialog.c
@@ -1663,7 +1663,7 @@ static int ki_dlg_set_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key, s

@ -10,7 +10,7 @@ Subject: dialog: support profile_get_size for all profiles
4 files changed, 70 insertions(+)
diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c
index 6545444..e9ed5d9 100644
index 25f3ca1..aedf8a7 100644
--- a/src/modules/dialog/dialog.c
+++ b/src/modules/dialog/dialog.c
@@ -2758,6 +2758,33 @@ static void internal_rpc_profile_get_size(rpc_t *rpc, void *c, str *profile_name

@ -38,7 +38,7 @@ index 7c4f08d..3f6a639 100644
<title><varname>attribute_display</varname> (int)</title>
<para>
diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c
index 8848033..fe5dc8a 100644
index 8848033..94efcef 100644
--- a/src/modules/pua_dialoginfo/pua_dialoginfo.c
+++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c
@@ -87,6 +87,7 @@ static str caller_dlg_var = {0, 0}; /* pubruri_caller */
@ -62,7 +62,7 @@ index 8848033..fe5dc8a 100644
}
+void refresh_local_identity(struct dlg_cell *dlg, str *uri) {
+ str *s = dlg_api.get_dlg_var(dlg, &local_identity_dlg_var);
+ str *s = dlg_api.get_dlg_varref(dlg, &local_identity_dlg_var);
+
+ if(s != NULL) {
+ uri->s = s->s;

Loading…
Cancel
Save