[asterisk-commits] russell: branch russell/events r59270 - /team/russell/events/channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Mar 27 14:28:01 2007
New Revision: 59270

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59270
Log:
Create subscriptions to MWI events for all of the configured mailboxes for zap
channels.  Also, when chan_zap needs to know if there is voicemail waiting,
check the event cache instead of having to check the mailbox every time.

Modified:
    team/russell/events/channels/chan_zap.c

Modified: team/russell/events/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/events/channels/chan_zap.c?view=diff&rev=59270&r1=59269&r2=59270
==============================================================================
--- team/russell/events/channels/chan_zap.c (original)
+++ team/russell/events/channels/chan_zap.c Tue Mar 27 14:28:01 2007
@@ -106,6 +106,8 @@
 #include "asterisk/abstract_jb.h"
 #include "asterisk/smdi.h"
 #include "asterisk/astobj.h"
+#include "asterisk/event.h"
+
 #define SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */
 
 /*! Global jitterbuffer configuration - by default, jb is disabled */
@@ -260,6 +262,14 @@
 static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms);
 
 static int zt_sendtext(struct ast_channel *c, const char *text);
+
+static void mwi_event_cb(const struct ast_event *event)
+{
+	/* This module does not handle MWI in an event-based manner.  However, it
+	 * subscribes to MWI for each mailbox that is configured so that the core
+	 * knows that we care about it.  Then, chan_zap will get the MWI from the
+	 * event cache instead of checking the mailbox directly. */
+}
 
 /*! \brief Avoid the silly zt_getevent which ignores a bunch of events */
 static inline int zt_get_event(int fd)
@@ -600,6 +610,7 @@
 	struct tdd_state *tdd;				/*!< TDD flag */
 	char call_forward[AST_MAX_EXTENSION];
 	char mailbox[AST_MAX_EXTENSION];
+	struct ast_event_sub *mwi_event_sub;
 	char dialdest[256];
 	int onhooktime;
 	int msgstate;
@@ -1827,8 +1838,21 @@
 
 static int has_voicemail(struct zt_pvt *p)
 {
-
-	return ast_app_has_voicemail(p->mailbox, NULL);
+	int new_msgs;
+	struct ast_event *event;
+
+	event = ast_event_get_cached(AST_EVENT_MWI,
+		AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, p->mailbox,
+		AST_EVENT_IE_NEWMSGS, AST_EVENT_IE_PLTYPE_EXISTS,
+		AST_EVENT_IE_END);
+
+	if (event) {
+		new_msgs = ast_event_get_ie_uint(event, AST_EVENT_IE_NEWMSGS);
+		ast_event_destroy(event);
+	} else
+		new_msgs = ast_app_has_voicemail(p->mailbox, NULL);
+
+	return new_msgs;
 }
 
 static int send_callerid(struct zt_pvt *p)
@@ -2386,6 +2410,8 @@
 		p->next->prev = p->prev;
 	if (p->use_smdi)
 		ASTOBJ_UNREF(p->smdi_iface, ast_smdi_interface_destroy);
+	if (p->mwi_event_sub)
+		ast_event_unsubscribe(p->mwi_event_sub);
 	ast_mutex_destroy(&p->lock);
 	free(p);
 	*pvt = NULL;
@@ -7175,7 +7201,7 @@
 					if (last) {
 						if (!last->cidspill && !last->owner && !ast_strlen_zero(last->mailbox) && (thispass - last->onhooktime > 3) &&
 							(last->sig & __ZT_SIG_FXO)) {
-							res = ast_app_has_voicemail(last->mailbox, NULL);
+							res = has_voicemail(last);
 							if (last->msgstate != res) {
 								int x;
 								if (option_debug)
@@ -7859,6 +7885,10 @@
 		tmp->cid_ton = 0;
 		ast_copy_string(tmp->cid_name, conf.chan.cid_name, sizeof(tmp->cid_name));
 		ast_copy_string(tmp->mailbox, conf.chan.mailbox, sizeof(tmp->mailbox));
+		tmp->mwi_event_sub = ast_event_subscribe(AST_EVENT_MWI, mwi_event_cb,
+			AST_EVENT_IE_MAILBOX, AST_EVENT_IE_PLTYPE_STR, tmp->mailbox,
+			AST_EVENT_IE_NEWMSGS, AST_EVENT_IE_PLTYPE_EXISTS,
+			AST_EVENT_IE_END);
 		tmp->msgstate = -1;
 		tmp->group = conf.chan.group;
 		tmp->callgroup = conf.chan.callgroup;