[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r321659 - in /team/irroot/dist...

[SVN commits to the Asterisk project]

Author: irroot
Date: Fri Jun  3 00:57:09 2011
New Revision: 321659

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321659
Log:
resolve conflict, enable automerge

Modified:
    team/irroot/distrotech-customers-1.8/   (props changed)
    team/irroot/distrotech-customers-1.8/apps/app_voicemail.c
    team/irroot/distrotech-customers-1.8/channels/chan_sip.c

Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-1.8/
            ('svnmerge-integrated' removed)

Modified: team/irroot/distrotech-customers-1.8/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/apps/app_voicemail.c?view=diff&rev=321659&r1=321658&r2=321659
==============================================================================
--- team/irroot/distrotech-customers-1.8/apps/app_voicemail.c (original)
+++ team/irroot/distrotech-customers-1.8/apps/app_voicemail.c Fri Jun  3 00:57:09 2011
@@ -2179,11 +2179,16 @@
 	int ret; /* for better error checking */
 	char *imap_flags = NIL;
 	int msgcount = (messagecount(vmu->context, vmu->mailbox, "INBOX") + messagecount(vmu->context, vmu->mailbox, "Old"));
-
-    /* Back out early if this is a greeting and we don't want to store greetings in IMAP */
-    if (msgnum < 0 && !imapgreetings) {
-        return 0;
-    }
+	int box = NEW_FOLDER;
+
+	/* Back out early if this is a greeting and we don't want to store greetings in IMAP */
+	if (msgnum < 0) {
+		if(!imapgreetings) {
+			return 0;
+		} else {
+			box = GREETINGS_FOLDER;
+		}
+	}
 	
 	if (imap_check_limits(chan, vms, vmu, msgcount)) {
 		return -1;
@@ -2266,9 +2271,9 @@
 	}
 	((char *) buf)[len] = '\0';
 	INIT(&str, mail_string, buf, len);
-	ret = init_mailstream(vms, NEW_FOLDER);
+	ret = init_mailstream(vms, box);
 	if (ret == 0) {
-		imap_mailbox_name(mailbox, sizeof(mailbox), vms, NEW_FOLDER, 1);
+		imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1);
 		ast_mutex_lock(&vms->lock);
 		if(!mail_append_full(vms->mailstream, mailbox, imap_flags, NIL, &str))
 			ast_log(LOG_ERROR, "Error while sending the message to %s\n", mailbox);

Modified: team/irroot/distrotech-customers-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_sip.c?view=diff&rev=321659&r1=321658&r2=321659
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_sip.c Fri Jun  3 00:57:09 2011
@@ -21922,9 +21922,9 @@
 					char *decoded_exten = ast_strdupa(p->exten);
 					transmit_response_reliable(p, "404 Not Found", req);
 					ast_uri_decode(decoded_exten);
-					ast_log(LOG_NOTICE, "Call from '%s' to extension"
+					ast_log(LOG_NOTICE, "Call from '%s' (%s) to extension"
 						" '%s' rejected because extension not found in context '%s'.\n",
-						S_OR(p->username, p->peername), decoded_exten, p->context);
+						S_OR(p->username, p->peername), ast_sockaddr_stringify(&p->recv), decoded_exten, p->context);
 				}
 			} /* end switch */