From: Automerge Script <automerge@asterisk.org>
Date: Wed, 18 Jul 2007 21:29:47 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.23-netsec~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51c1456d6bda1f718d6ad187ac293eb2356303d4;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@75797 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b292eb2fbb..5b31f41e60 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2691,6 +2691,13 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
 
 					ast_unlock_path(dir);
 
+					/* We must store the file first, before copying the message, because
+					 * ODBC storage does the entire copy with SQL.
+					 */
+					if (ast_fileexists(fn, NULL, NULL) > 0) {
+						STORE(dir, vmu->mailbox, vmu->context, msgnum);
+					}
+
 					/* Are there to be more recipients of this message? */
 					while (tmpptr) {
 						struct ast_vm_user recipu, *recip;
@@ -2707,8 +2714,9 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_
 							free_user(recip);
 						}
 					}
+
+					/* Notification and disposal needs to happen after the copy, though. */
 					if (ast_fileexists(fn, NULL, NULL) > 0) {
-						STORE(dir, vmu->mailbox, vmu->context, msgnum);
 						notify_new_message(chan, vmu, msgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
 						DISPOSE(dir, msgnum);
 					}
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index dacc20e17c..ad120dbdcf 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6033,7 +6033,7 @@ static void vnak_retransmit(int callno, int last)
 	while(f) {
 		/* Send a copy immediately */
 		if ((f->callno == callno) && iaxs[f->callno] &&
-			(f->oseqno >= last)) {
+			((unsigned char ) (f->oseqno - last) < 128)) {
 			send_packet(f);
 		}
 		f = f->next;