[sr-dev] git:master:285225c3: modules/dialog_ng: end dialog on timeout

[jaybeepee]

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

Author: jaybeepee <jason.penton at gmail.com>
Committer: jaybeepee <jason.penton at gmail.com>
Date: 2015-04-08T15:17:04+02:00

modules/dialog_ng: end dialog on timeout

---

Modified: modules/dialog_ng/dlg_handlers.c

---

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

---

diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c
index f484830..e680473 100644
--- a/modules/dialog_ng/dlg_handlers.c
+++ b/modules/dialog_ng/dlg_handlers.c
@@ -1212,7 +1212,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) {
     }
 
     if ((event == DLG_EVENT_REQ || event == DLG_EVENT_REQACK)
-            && new_state == DLG_STATE_CONFIRMED) {
+            && (new_state == DLG_STATE_CONFIRMED || new_state==DLG_STATE_EARLY)) {
 
         timeout = get_dlg_timeout(req);
         if (timeout != default_timeout) {
@@ -1294,9 +1294,8 @@ void dlg_ontimeout(struct dlg_tl *tl) {
         }
     }
 
-    if ((dlg->dflags & DLG_FLAG_TOBYE)
-            && (dlg->state == DLG_STATE_CONFIRMED)) {
-        //TODO: dlg_bye_all(dlg, NULL);
+    if (dlg->state == DLG_STATE_CONFIRMED) {
+        dlg_bye_all(dlg, NULL);
         unref_dlg(dlg, 1);
         return;
     }