[svn-commits] branch russell/make_menuconfig - r7442 in /team/russell/make_menuconfig: ./ a...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Mon Dec 12 15:27:20 CST 2005


Author: russell
Date: Mon Dec 12 15:27:16 2005
New Revision: 7442

URL: http://svn.digium.com/view/asterisk?rev=7442&view=rev
Log:
Merged revisions 7424,7428,7431,7434,7436 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r7424 | bweschke | 2005-12-10 13:05:00 -0500 (Sat, 10 Dec 2005) | 4 lines

 Bug #5877
 Make sure the digit string from E&M wink DNIS collection is properly null terminated as it grows.


................
r7428 | tilghman | 2005-12-10 20:26:09 -0500 (Sat, 10 Dec 2005) | 2 lines

Bug 5965 - major bug in AST_LIST_REMOVE

................
r7431 | russell | 2005-12-11 01:17:36 -0500 (Sun, 11 Dec 2005) | 37 lines

Merged revisions 7404,7406,7425,7427,7429-7430 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7404 | tilghman | 2005-12-08 18:32:08 -0500 (Thu, 08 Dec 2005) | 2 lines

Documenting two keywords that were previously missing

........
r7406 | tilghman | 2005-12-08 18:45:36 -0500 (Thu, 08 Dec 2005) | 2 lines

Bug 5960

........
r7425 | bweschke | 2005-12-10 13:10:50 -0500 (Sat, 10 Dec 2005) | 4 lines

 Bug #5877
 Make sure the digit string from E&M wink DNIS collection is properly null terminated as it grows.


........
r7427 | tilghman | 2005-12-10 20:15:15 -0500 (Sat, 10 Dec 2005) | 2 lines

Bug 5967

........
r7429 | tilghman | 2005-12-10 20:26:51 -0500 (Sat, 10 Dec 2005) | 2 lines

Bug 5965 - major bug in AST_LIST_REMOVE

........
r7430 | russell | 2005-12-11 01:08:56 -0500 (Sun, 11 Dec 2005) | 2 lines

silence a couple of compiler warnings about pointer signedness

........

................
r7434 | tilghman | 2005-12-12 12:20:21 -0500 (Mon, 12 Dec 2005) | 2 lines

Typo

................
r7436 | kpfleming | 2005-12-12 12:31:45 -0500 (Mon, 12 Dec 2005) | 15 lines

Merged revisions 7433,7435 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7433 | tilghman | 2005-12-12 11:19:29 -0600 (Mon, 12 Dec 2005) | 2 lines

Typo

........
r7435 | kpfleming | 2005-12-12 11:30:59 -0600 (Mon, 12 Dec 2005) | 2 lines

set all the child file descriptors to non-blocking so that we don't hang if the child fails to send a newline-terminated command or error message

........

................

Modified:
    team/russell/make_menuconfig/   (props changed)
    team/russell/make_menuconfig/apps/app_externalivr.c
    team/russell/make_menuconfig/apps/app_voicemail.c
    team/russell/make_menuconfig/channels/chan_zap.c
    team/russell/make_menuconfig/include/asterisk/linkedlists.h
    team/russell/make_menuconfig/utils/astman.c

Propchange: team/russell/make_menuconfig/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 12 15:27:16 2005
@@ -1,1 +1,1 @@
-/trunk:1-7417
+/trunk:1-7441

Modified: team/russell/make_menuconfig/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/apps/app_externalivr.c?rev=7442&r1=7441&r2=7442&view=diff
==============================================================================
--- team/russell/make_menuconfig/apps/app_externalivr.c (original)
+++ team/russell/make_menuconfig/apps/app_externalivr.c Mon Dec 12 15:27:16 2005
@@ -345,8 +345,6 @@
 			goto exit;
 		}
 
-		setvbuf(child_events, NULL, _IONBF, 0);
-
 		if (!(child_commands = fdopen(child_commands_fd, "r"))) {
 			ast_chan_log(LOG_WARNING, chan, "Could not open stream for child commands\n");
 			goto exit;
@@ -356,6 +354,10 @@
 			ast_chan_log(LOG_WARNING, chan, "Could not open stream for child errors\n");
 			goto exit;
 		}
+
+		setvbuf(child_events, NULL, _IONBF, 0);
+		setvbuf(child_commands, NULL, _IONBF, 0);
+		setvbuf(child_errors, NULL, _IONBF, 0);
 
 		res = 0;
 

Modified: team/russell/make_menuconfig/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/apps/app_voicemail.c?rev=7442&r1=7441&r2=7442&view=diff
==============================================================================
--- team/russell/make_menuconfig/apps/app_voicemail.c (original)
+++ team/russell/make_menuconfig/apps/app_voicemail.c Mon Dec 12 15:27:16 2005
@@ -582,7 +582,7 @@
 	while (cur) {
 		if (ast_test_flag((&globalflags), VM_SEARCH) && !strcasecmp(mailbox, cur->mailbox))
 			break;
-		if ((!strcasecmp(context, cur->context)) && (!strcasecmp(mailbox, cur->mailbox)))
+		if (context && (!strcasecmp(context, cur->context)) && (!strcasecmp(mailbox, cur->mailbox)))
 			break;
 		cur=cur->next;
 	}

Modified: team/russell/make_menuconfig/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/channels/chan_zap.c?rev=7442&r1=7441&r2=7442&view=diff
==============================================================================
--- team/russell/make_menuconfig/channels/chan_zap.c (original)
+++ team/russell/make_menuconfig/channels/chan_zap.c Mon Dec 12 15:27:16 2005
@@ -5269,6 +5269,7 @@
 				return NULL;
 			} else if (res) {
 				exten[len++] = res;
+				exten[len] = '\0';
 			} else
 				break;
 		}
@@ -5375,6 +5376,7 @@
 			default:
 				/* If we got the first digit, get the rest */
 				len = 1;
+				dtmfbuf[len] = '\0';
 				while((len < AST_MAX_EXTENSION-1) && ast_matchmore_extension(chan, chan->context, dtmfbuf, 1, p->cid_num)) {
 					if (ast_exists_extension(chan, chan->context, dtmfbuf, 1, p->cid_num)) {
 						timeout = matchdigittimeout;
@@ -5388,6 +5390,7 @@
 						return NULL;
 					} else if (res) {
 						dtmfbuf[len++] = res;
+						dtmfbuf[len] = '\0';
 					} else {
 						break;
 					}

Modified: team/russell/make_menuconfig/include/asterisk/linkedlists.h
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/include/asterisk/linkedlists.h?rev=7442&r1=7441&r2=7442&view=diff
==============================================================================
--- team/russell/make_menuconfig/include/asterisk/linkedlists.h (original)
+++ team/russell/make_menuconfig/include/asterisk/linkedlists.h Mon Dec 12 15:27:16 2005
@@ -424,15 +424,16 @@
 #define AST_LIST_REMOVE(head, elm, field) do {			        \
 	if ((head)->first == (elm)) {					\
 		(head)->first = (elm)->field.next;			\
-	}								\
-	else {								\
+		if ((head)->last == (elm))			\
+			(head)->last = NULL;			\
+	} else {								\
 		typeof(elm) curelm = (head)->first;			\
 		while (curelm->field.next != (elm))			\
 			curelm = curelm->field.next;			\
 		curelm->field.next = (elm)->field.next;			\
+		if ((head)->last == curelm->field.next)			\
+			(head)->last = curelm;				\
 	}								\
-	if ((head)->last == elm)					\
-		(head)->last = NULL;					\
 } while (0)
 
 #endif /* _ASTERISK_LINKEDLISTS_H */

Modified: team/russell/make_menuconfig/utils/astman.c
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/utils/astman.c?rev=7442&r1=7441&r2=7442&view=diff
==============================================================================
--- team/russell/make_menuconfig/utils/astman.c (original)
+++ team/russell/make_menuconfig/utils/astman.c Mon Dec 12 15:27:16 2005
@@ -660,8 +660,8 @@
 				struct MD5Context md5;
 				unsigned char digest[16];
 				MD5Init(&md5);
-				MD5Update(&md5, challenge, strlen(challenge));
-				MD5Update(&md5, pass, strlen(pass));
+				MD5Update(&md5, (unsigned char *)challenge, strlen(challenge));
+				MD5Update(&md5, (unsigned char *)pass, strlen(pass));
 				MD5Final(digest, &md5);
 				for (x=0; x<16; x++)
 					len += sprintf(md5key + len, "%2.2x", digest[x]);



More information about the svn-commits mailing list