sipwise
/
kamailio
mirror of https://github.com/sipwise/kamailio.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#5301 add upstream fixes

Browse Source
vseva/6243_simple
Victor Seva 12 years ago
parent c6f1bda776
commit 201877e2f1
3 changed files with 177 additions and 0 deletions
Show Stats Download Patch File Download Diff File

2
debian/patches/series vendored
Unescape View File

@ -2,6 +2,8 @@ upstream/0001-snmpstats-use-share_prefix-for-deploying-MIBS.patch
upstream/0002-ims_auth-Fix-for-SIP-Digest-Segmentation-fault.patch
upstream/0003-ims_registrar_scscf-Fix-memory-corruption-in-build_c.patch
upstream/0004-snmpstats-fixed-path-for-deploying-mibs-when-net-snm.patch
upstream/0005-modules-tm-fixed-bug-where-AVPs-are-not-restored-cor.patch
upstream/0006-xhttp_rpc-fix-arg-parsing.patch
upstream/acc-allow-pseudo-variables-as-first-parameter-for-fu.patch
upstream/acc-add-documentation-note-indicating-the-use-of-pse.patch
upstream/debug/0001-modules-debugger-trace-msg-out.patch

131
debian/patches/upstream/0005-modules-tm-fixed-bug-where-AVPs-are-not-restored-cor.patch vendored
Unescape View File

@ -0,0 +1,131 @@
From 4fb71c24a119f53d75500c9bf69275634ea05a60 Mon Sep 17 00:00:00 2001
From: Jason Penton <jason.penton@gmail.com>
Date: Thu, 16 Jan 2014 13:08:29 +0200
Subject: [PATCH] =?UTF-8?q?modules/tm:=20fixed=20bug=20where=20AVPs=20are?=
=?UTF-8?q?=20not=20restored=20correctly=20if=20async=20used=20within=20fa?=
=?UTF-8?q?ilure=20route=20=09-=20related=20to=20mail=20by=20Jos=C3=A9=20S?=
=?UTF-8?q?eabra=20on=20Jan=2010=202014=20entitiled=20-=20kamailio-4.1.1?=
=?UTF-8?q?=20avp=20issue=20within=20failure=20routes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(cherry picked from commit f3f2f09beda60e1f7f4e6dfc0359f788991aeef6)
---
modules/tm/t_reply.c | 93 +++++++++++++++++++++++++---------------------------
1 file changed, 44 insertions(+), 49 deletions(-)
diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c
index 4d9901d..f6fc568 100644
--- a/modules/tm/t_reply.c
+++ b/modules/tm/t_reply.c
@@ -856,62 +856,57 @@ void faked_env(struct cell *t, struct sip_msg *msg, int is_async_env) {
* otherwise the actions would attempt to look the transaction
* up (unnecessary overhead, refcounting)
*/
- if (!is_async_env) {
- /* backup */
- backup_t = get_t();
- backup_branch = get_t_branch();
- backup_msgid = global_msg_id;
- /* fake transaction and message id */
- global_msg_id = msg->id;
+
+ /* backup */
+ backup_t = get_t();
+ backup_branch = get_t_branch();
+ backup_msgid = global_msg_id;
+ /* fake transaction and message id */
+ global_msg_id = msg->id;
+
+ if (is_async_env) {
+ set_t(t, t->async_backup.backup_branch);
+ } else {
set_t(t, T_BR_UNDEFINED);
+ }
- /* make available the avp list from transaction */
- backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from);
- backup_uri_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to);
- backup_user_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from);
- backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to);
- backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from);
- backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to);
+ /* make available the avp list from transaction */
+ backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from);
+ backup_uri_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to);
+ backup_user_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from);
+ backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to);
+ backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from);
+ backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to);
#ifdef WITH_XAVP
- backup_xavps = xavp_set_list(&t->xavps_list);
+ backup_xavps = xavp_set_list(&t->xavps_list);
#endif
- /* set default send address to the saved value */
- backup_si = bind_address;
- bind_address = t->uac[0].request.dst.send_sock;
- /* backup lump lists */
- backup_add_rm = t->uas.request->add_rm;
- backup_body_lumps = t->uas.request->body_lumps;
- backup_reply_lump = t->uas.request->reply_lump;
- } else {
- global_msg_id = msg->id;
- set_t(t, t->async_backup.backup_branch);
- }
+ /* set default send address to the saved value */
+ backup_si = bind_address;
+ bind_address = t->uac[0].request.dst.send_sock;
+ /* backup lump lists */
+ backup_add_rm = t->uas.request->add_rm;
+ backup_body_lumps = t->uas.request->body_lumps;
+ backup_reply_lump = t->uas.request->reply_lump;
} else {
- if (!is_async_env) {
- /* restore original environment */
- set_t(backup_t, backup_branch);
- global_msg_id = backup_msgid;
- set_route_type(backup_route_type);
- /* restore original avp list */
- set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, backup_user_from);
- set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to);
- set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from);
- set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to);
- set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from);
- set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to);
+ /* restore original environment */
+ set_t(backup_t, backup_branch);
+ global_msg_id = backup_msgid;
+ set_route_type(backup_route_type);
+ /* restore original avp list */
+ set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, backup_user_from);
+ set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to);
+ set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from);
+ set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to);
+ set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from);
+ set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to);
#ifdef WITH_XAVP
- xavp_set_list(backup_xavps);
+ xavp_set_list(backup_xavps);
#endif
- bind_address = backup_si;
- /* restore lump lists */
- t->uas.request->add_rm = backup_add_rm;
- t->uas.request->body_lumps = backup_body_lumps;
- t->uas.request->reply_lump = backup_reply_lump;
- } else {
- /*we don't need to restore anything as there was no "environment" prior
- to continuing (we are in a different process)*/
- LOG(L_DBG, "nothing to restore in async continue, useless call\n");
- }
+ bind_address = backup_si;
+ /* restore lump lists */
+ t->uas.request->add_rm = backup_add_rm;
+ t->uas.request->body_lumps = backup_body_lumps;
+ t->uas.request->reply_lump = backup_reply_lump;
}
}
--
1.8.5.3

44
debian/patches/upstream/0006-xhttp_rpc-fix-arg-parsing.patch vendored
Unescape View File

@ -0,0 +1,44 @@
From ab7f961dd22af7ce3cb451f30b116cc9a76bd4b5 Mon Sep 17 00:00:00 2001
From: Ovidiu Sas <osas@voipembedded.com>
Date: Thu, 16 Jan 2014 18:02:31 -0500
Subject: [PATCH] xhttp_rpc: fix arg parsing (cherry picked from commit
3615f3c26405f1c1bcd3721674e9d87e4b589146)
---
modules/xhttp_rpc/xhttp_rpc_fnc.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/modules/xhttp_rpc/xhttp_rpc_fnc.c b/modules/xhttp_rpc/xhttp_rpc_fnc.c
index b25405e..5218c2f 100644
--- a/modules/xhttp_rpc/xhttp_rpc_fnc.c
+++ b/modules/xhttp_rpc/xhttp_rpc_fnc.c
@@ -310,7 +310,16 @@ void xhttp_rpc_get_next_arg(rpc_ctx_t* ctx, str *arg)
int i;
trim_leading(&ctx->arg2scan);
- if (ctx->arg2scan.len) {
+
+ if (ctx->arg2scan.len<=0) {
+ *arg = XHTTP_RPC_NULL_ARG;
+ return;
+ }
+ if (ctx->arg2scan.len==1 && ctx->arg2scan.s[0]=='\0') {
+ *arg = XHTTP_RPC_NULL_ARG;
+ return;
+ }
+ else {
*arg = ctx->arg2scan;
for(i=1; i<arg->len-1; i++) {
if(arg->s[i]==' '||arg->s[i]=='\t'||
@@ -322,8 +331,6 @@ void xhttp_rpc_get_next_arg(rpc_ctx_t* ctx, str *arg)
i++;
ctx->arg2scan.s += i;
ctx->arg2scan.len -= i;
- } else {
- *arg = XHTTP_RPC_NULL_ARG;
}
return;
}
--
1.8.5.3
Write Preview
Loading…
Cancel
Save