[sr-dev] git:master:f51b2784: Merge pull request #1155 from adubovikov/master

[GitHub]

Module: kamailio
Branch: master
Commit: f51b27840b434fd6c65c6ed15b67c949d644faa9
URL: https://github.com/kamailio/kamailio/commit/f51b27840b434fd6c65c6ed15b67c949d644faa9

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: GitHub <noreply at github.com>
Date: 2017-06-20T10:02:56+02:00

Merge pull request #1155 from adubovikov/master

modules/topoh: fixed logical conditional and false jump in th_execute…

---

Modified: src/modules/topoh/topoh_mod.c

---

Diff:  https://github.com/kamailio/kamailio/commit/f51b27840b434fd6c65c6ed15b67c949d644faa9.diff
Patch: https://github.com/kamailio/kamailio/commit/f51b27840b434fd6c65c6ed15b67c949d644faa9.patch

---

diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c
index a749723cd8..23679a2b5d 100644
--- a/src/modules/topoh/topoh_mod.c
+++ b/src/modules/topoh/topoh_mod.c
@@ -408,7 +408,7 @@ int th_msg_sent(sr_event_param_t *evp)
 	obuf = (str*)evp->data;
 
 	if(th_execute_event_route(NULL, evp)==1) {
-		goto done;
+		return 0;
 	}
 
 	memset(&msg, 0, sizeof(sip_msg_t));
@@ -519,7 +519,7 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp)
 		}
 	}
 
-	if(_th_eventrt_outgoing<0 || keng==NULL) {
+	if(_th_eventrt_outgoing<0 && keng==NULL) {
 		return 0;
 	}