瀏覽代碼

presence(k): updated to use hooks attribute of dialog event header

Daniel-Constantin Mierla 15 年之前
父節點
當前提交
caa38207fe
共有 2 個文件被更改,包括 12 次插入7 次删除
  1. 10 6
      modules_k/presence/event_list.c
  2. 2 1
      modules_k/presence/utils_func.h

+ 10 - 6
modules_k/presence/event_list.c

@@ -90,12 +90,16 @@ event_t* shm_copy_event(event_t* e)
 		/* Update parameter hooks in the shmmem copy, this is needed so that
 		 * we can test for the presence of the sla parameter even in the
 		 * shared copy of the event */
-		if (e->params.dialog.call_id == p1) ev->params.dialog.call_id = p2;
-		if (e->params.dialog.from_tag == p1) ev->params.dialog.from_tag = p2;
-		if (e->params.dialog.to_tag == p1) ev->params.dialog.to_tag = p2;
-		if (e->params.dialog.include_session_description == p1) 
-			ev->params.dialog.include_session_description = p2;
-		if (e->params.dialog.sla == p1) ev->params.dialog.sla = p2;
+		if (e->params.hooks.event_dialog.call_id == p1)
+			ev->params.hooks.event_dialog.call_id = p2;
+		if (e->params.hooks.event_dialog.from_tag == p1)
+			ev->params.hooks.event_dialog.from_tag = p2;
+		if (e->params.hooks.event_dialog.to_tag == p1)
+			ev->params.hooks.event_dialog.to_tag = p2;
+		if (e->params.hooks.event_dialog.include_session_description == p1) 
+			ev->params.hooks.event_dialog.include_session_description = p2;
+		if (e->params.hooks.event_dialog.sla == p1)
+			ev->params.hooks.event_dialog.sla = p2;
 
 		p1= p1->next;
 	}

+ 2 - 1
modules_k/presence/utils_func.h

@@ -51,7 +51,8 @@
 
 #define EVENT_DIALOG_SLA(ev) \
 	((ev)->type == EVENT_DIALOG \
-		&& ((ev)->params.dialog.sla || (ev)->params.dialog.ma))
+		&& ((ev)->params.hooks.event_dialog.sla \
+			|| (ev)->params.hooks.event_dialog.ma))
 
 
 static inline int uandd_to_uri(str user,  str domain, str *out)