[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openser-devel
Subject:    [sr-dev] git:3.1: modules_k/dialog: Fix commit backport mistakes in
From:       Timo Reimann <timo.reimann () 1und1 ! de>
Date:       2011-08-27 0:23:20
Message-ID: 20110827002321.4DC0CEF804D () rimmer
[Download RAW message or body]

Module: sip-router
Branch: 3.1
Commit: cb21425e6fa9e824a51b44829b0ad9d9bf9beb99
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb21425e6fa9e824a51b44829b0ad9d9bf9beb99


Author: Timo Reimann <timo.reimann@1und1.de>
Committer: Timo Reimann <timo.reimann@1und1.de>
Date:   Sat Aug 27 02:20:00 2011 +0200

modules_k/dialog: Fix commit backport mistakes in dlg_handlers.c
causing compiler run to fail.

- Add and set missing "spiral_detected" flag variable.
- Use correct SIP message variable name (req -> msg).

---

 modules_k/dialog/dlg_handlers.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c
index 3500fad..89fb0b3 100644
--- a/modules_k/dialog/dlg_handlers.c
+++ b/modules_k/dialog/dlg_handlers.c
@@ -664,6 +664,7 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t)
     str ttag;
     str req_uri;
     unsigned int dir;
+    int spiral_detected;
 
 	if(current_dlg_pointer != NULL)
 		return -1;
@@ -694,6 +695,7 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t)
 		{
 			LM_DBG("Callid '%.*s' found, must be a spiraled request\n",
 					callid.len, callid.s);
+			spiral_detected = 1;
 
 			run_dlg_callbacks( DLGCB_SPIRALED, dlg, msg, DLG_DIR_DOWNSTREAM, 0);
 
@@ -702,6 +704,7 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t)
 			goto finish;
 		}
 	}
+	spiral_detected = 0;
 
 	dlg = build_new_dlg (&callid /*callid*/,
 			&(get_from(msg)->uri) /*from uri*/,
@@ -775,7 +778,7 @@ finish:
 		}
 	}
 
-    set_current_dialog(req, dlg);
+    set_current_dialog(msg, dlg);
     _dlg_ctx.dlg = dlg;
     ref_dlg(dlg, 1);
 


_______________________________________________
sr-dev mailing list
sr-dev@lists.sip-router.org
http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev


[prev in list] [next in list] [prev in thread] [next in thread]