[asterisk-commits] mmichelson: branch group/upenn r129204 - in /team/group/upenn: ./ apps/ chann...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Jul  8 16:31:07 2008
New Revision: 129204

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129204
Log:
resolve then reset


Modified:
    team/group/upenn/   (props changed)
    team/group/upenn/apps/app_dial.c
    team/group/upenn/apps/app_voicemail.c
    team/group/upenn/channels/chan_sip.c
    team/group/upenn/include/asterisk/causes.h

Propchange: team/group/upenn/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/upenn/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul  8 16:31:07 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-129061
+/branches/1.4:1-129198

Modified: team/group/upenn/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/upenn/apps/app_dial.c?view=diff&rev=129204&r1=129203&r2=129204
==============================================================================
--- team/group/upenn/apps/app_dial.c (original)
+++ team/group/upenn/apps/app_dial.c Tue Jul  8 16:31:07 2008
@@ -341,6 +341,7 @@
 			ast_cdr_failed(chan->cdr); \
 		numcongestion++; \
 		break; \
+	case AST_CAUSE_NO_ROUTE_DESTINATION: \
 	case AST_CAUSE_UNREGISTERED: \
 		if (chan->cdr) \
 			ast_cdr_failed(chan->cdr); \

Modified: team/group/upenn/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/upenn/apps/app_voicemail.c?view=diff&rev=129204&r1=129203&r2=129204
==============================================================================
--- team/group/upenn/apps/app_voicemail.c (original)
+++ team/group/upenn/apps/app_voicemail.c Tue Jul  8 16:31:07 2008
@@ -109,7 +109,6 @@
 #ifdef IMAP_STORAGE
 AST_MUTEX_DEFINE_STATIC(imaptemp_lock);
 static char imaptemp[1024];
-
 static char imapserver[48];
 static char imapport[8];
 static char imapflags[128];
@@ -119,6 +118,7 @@
 
 static int expungeonhangup = 1;
 static char delimiter = '\0';
+static const long DEFAULT_IMAP_TCP_TIMEOUT = 60L;
 
 struct vm_state;
 struct ast_vm_user;
@@ -7614,6 +7614,7 @@
 	const char *auth_user;
 	const char *auth_password;
 	const char *expunge_on_hangup;
+	const char *imap_timeout;
 #endif
 	const char *astcallop;
 	const char *astreview;

Modified: team/group/upenn/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/upenn/channels/chan_sip.c?view=diff&rev=129204&r1=129203&r2=129204
==============================================================================
--- team/group/upenn/channels/chan_sip.c (original)
+++ team/group/upenn/channels/chan_sip.c Tue Jul  8 16:31:07 2008
@@ -3457,6 +3457,7 @@
 		case AST_CAUSE_NO_USER_RESPONSE:	/* 18 */
 			return "408 Request Timeout";
 		case AST_CAUSE_NO_ANSWER:		/* 19 */
+		case AST_CAUSE_UNREGISTERED:        /* 20 */
 			return "480 Temporarily unavailable";
 		case AST_CAUSE_CALL_REJECTED:		/* 21 */
 			return "403 Forbidden";

Modified: team/group/upenn/include/asterisk/causes.h
URL: http://svn.digium.com/view/asterisk/team/group/upenn/include/asterisk/causes.h?view=diff&rev=129204&r1=129203&r2=129204
==============================================================================
--- team/group/upenn/include/asterisk/causes.h (original)
+++ team/group/upenn/include/asterisk/causes.h Tue Jul  8 16:31:07 2008
@@ -33,6 +33,7 @@
 #define AST_CAUSE_USER_BUSY				17
 #define AST_CAUSE_NO_USER_RESPONSE			18
 #define AST_CAUSE_NO_ANSWER				19
+#define AST_CAUSE_SUBSCRIBER_ABSENT			20
 #define AST_CAUSE_CALL_REJECTED				21
 #define AST_CAUSE_NUMBER_CHANGED			22
 #define AST_CAUSE_DESTINATION_OUT_OF_ORDER		27
@@ -75,7 +76,7 @@
 #define AST_CAUSE_NORMAL 				AST_CAUSE_NORMAL_CLEARING
 #define AST_CAUSE_NOANSWER	 			AST_CAUSE_NO_ANSWER
 #define AST_CAUSE_CONGESTION	 			AST_CAUSE_NORMAL_CIRCUIT_CONGESTION
-#define AST_CAUSE_UNREGISTERED				AST_CAUSE_NO_ROUTE_DESTINATION
+#define AST_CAUSE_UNREGISTERED				AST_CAUSE_SUBSCRIBER_ABSENT
 #define AST_CAUSE_NOTDEFINED 				0
 #define AST_CAUSE_NOSUCHDRIVER				AST_CAUSE_CHAN_NOT_IMPLEMENTED