<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Exchange Server">
<!-- converted from text --><style><!-- .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left: #800000 2px solid; } --></style>
</head>
<body>
<meta content="text/html; charset=UTF-8">
<style type="text/css" style="">
<!--
p
{margin-top:0;
margin-bottom:0}
-->
</style>
<div dir="ltr">
<div id="x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:#000000; font-family:Calibri,Arial,Helvetica,sans-serif">
<p>sorry,</p>
<p>thought the new <span>ksr_msg_env_reset was already backported.</span></p>
<p><span><br>
</span></p>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="x_divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> sr-dev <sr-dev-bounces@lists.kamailio.org> on behalf of Luis Azedo <luis@2600hz.com><br>
<b>Sent:</b> Friday, May 19, 2017 4:10:18 PM<br>
<b>To:</b> sr-dev@lists.kamailio.org<br>
<b>Subject:</b> [sr-dev] git:5.0:1293dc52: Revert "kazoo: add ksr_msg_env_reset after processing events"</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:10pt;">
<div class="PlainText">Module: kamailio<br>
Branch: 5.0<br>
Commit: 1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5<br>
URL: <a href="https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5">
https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5</a><br>
<br>
Author: Luis Azedo <luis@2600hz.com><br>
Committer: Luis Azedo <luis@2600hz.com><br>
Date: 2017-05-19T16:10:00+01:00<br>
<br>
Revert "kazoo: add ksr_msg_env_reset after processing events"<br>
<br>
This reverts commit a5e68b5697688f82edbc48e64f32e15f89c8b357.<br>
<br>
---<br>
<br>
Modified: src/modules/kazoo/kz_amqp.c<br>
<br>
---<br>
<br>
Diff: <a href="https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.diff">
https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.diff</a><br>
Patch: <a href="https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.patch">
https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.patch</a><br>
<br>
---<br>
<br>
diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c<br>
index ca3a86a19c..da310893c9 100644<br>
--- a/src/modules/kazoo/kz_amqp.c<br>
+++ b/src/modules/kazoo/kz_amqp.c<br>
@@ -42,10 +42,6 @@<br>
#include "../../core/mod_fix.h"<br>
#include "../../core/lvalue.h"<br>
#include "../tm/tm_load.h"<br>
-#include "../../core/route.h"<br>
-#include "../../core/receive.h"<br>
-#include "../../core/action.h"<br>
-#include "../../core/script_cb.h"<br>
<br>
<br>
#include "kz_amqp.h"<br>
@@ -2284,14 +2280,11 @@ int kz_amqp_consumer_fire_event(char *eventkey)<br>
fmsg = faked_msg_get_next();<br>
rtb = get_route_type();<br>
set_route_type(REQUEST_ROUTE);<br>
- if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) {<br>
- init_run_actions_ctx(&ctx);<br>
- run_top_route(event_rt.rlist[rt], fmsg, 0);<br>
- exec_post_script_cb(fmsg, REQUEST_CB_TYPE);<br>
- ksr_msg_env_reset();<br>
- }<br>
+ init_run_actions_ctx(&ctx);<br>
+ run_top_route(event_rt.rlist[rt], fmsg, 0);<br>
set_route_type(rtb);<br>
return 0;<br>
+<br>
}<br>
<br>
void kz_amqp_consumer_event(char *payload, char* event_key, char* event_subkey)<br>
@@ -2415,7 +2408,6 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd)<br>
}<br>
struct action *a = main_rt.rlist[n];<br>
tmb.t_continue(cmd->t_hash, cmd->t_label, a);<br>
- ksr_msg_env_reset();<br>
}<br>
<br>
void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd)<br>
@@ -2427,7 +2419,6 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd)<br>
}<br>
struct action *a = main_rt.rlist[n];<br>
tmb.t_continue(cmd->t_hash, cmd->t_label, a);<br>
- ksr_msg_env_reset();<br>
}<br>
<br>
int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)<br>
<br>
<br>
_______________________________________________<br>
Kamailio (SER) - Development Mailing List<br>
sr-dev@lists.kamailio.org<br>
<a href="https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev">https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev</a><br>
</div>
</span></font>
</body>
</html>