[Asterisk-cvs] asterisk/channels chan_iax2.c,1.161,1.162

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv19723/channels

Modified Files:
	chan_iax2.c 
Log Message:
Add ability to send detailed mailbox info (bug #1690)


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- chan_iax2.c	26 Jun 2004 15:48:30 -0000	1.161
+++ chan_iax2.c	26 Jun 2004 20:55:35 -0000	1.162
@@ -178,6 +178,7 @@
 static int amaflags = 0;
 static int globalnotransfer = 0;
 static int delayreject = 0;
+static int globalmessagedetail = 0;
 
 static pthread_t netthreadid = AST_PTHREADT_NULL;
 
@@ -239,6 +240,7 @@
 	int delme;						/* I need to be deleted */
 	int temponly;					/* I'm only a temp */
 	int trunk;						/* Treat as an IAX trunking */
+	int messagedetail;				/* Show exact numbers? */
 
 	/* Qualification */
 	int callno;					/* Call number of POKE request */
@@ -4175,9 +4177,19 @@
 			iax_ie_append_short(&ied, IAX_IE_REFRESH, p->expirey);
 			iax_ie_append_addr(&ied, IAX_IE_APPARENT_ADDR, &p->addr);
 			if (!ast_strlen_zero(p->mailbox)) {
-				msgcount = ast_app_has_voicemail(p->mailbox);
-				if (msgcount)
-					msgcount = 65535;
+				if (p->messagedetail) {
+					int new, old;
+					ast_app_messagecount(p->mailbox, &new, &old);
+					if (new > 255)
+						new = 255;
+					if (old > 255)
+						old = 255;
+					msgcount = (old << 8) | new;
+				} else {
+					msgcount = ast_app_has_voicemail(p->mailbox);
+					if (msgcount)
+						msgcount = 65535;
+				}
 				iax_ie_append_short(&ied, IAX_IE_MSGCOUNT, msgcount);
 			}
 			if (p->hascallerid)
@@ -5955,6 +5967,7 @@
 		peer->expire = -1;
 		peer->pokeexpire = -1;
 	}
+	peer->messagedetail = globalmessagedetail;
 	if (peer) {
 		if (!found) {
 			strncpy(peer->name, name, sizeof(peer->name)-1);
@@ -5967,6 +5980,8 @@
 				strncpy(peer->secret, v->value, sizeof(peer->secret)-1);
 			else if (!strcasecmp(v->name, "mailbox"))
 				strncpy(peer->mailbox, v->value, sizeof(peer->mailbox) - 1);
+			else if (!strcasecmp(v->name, "mailboxdetail"))
+				peer->messagedetail = ast_true(v->value);
 			else if (!strcasecmp(v->name, "trunk")) {
 				peer->trunk = ast_true(v->value);
 				if (peer->trunk && (timingfd < 0)) {
@@ -6362,6 +6377,8 @@
 			globalnotransfer = ast_true(v->value);
 		else if (!strcasecmp(v->name, "delayreject"))
 			delayreject = ast_true(v->value);
+		else if (!strcasecmp(v->name, "mailboxdetail"))
+			globalmessagedetail = ast_true(v->value);
 		else if (!strcasecmp(v->name, "trunkfreq")) {
 			trunkfreq = atoi(v->value);
 			if (trunkfreq < 10)