[Asterisk-cvs] asterisk ChangeLog,1.67,1.68 HARDWARE,1.3,1.4 asterisk.c,1.111,1.112 muted.c,1.4,1.5 pbx.c,1.142,1.143
markster at lists.digium.com
markster at lists.digium.com
Tue Aug 3 02:45:18 CDT 2004
Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv3205
Modified Files:
ChangeLog HARDWARE asterisk.c muted.c pbx.c
Log Message:
Plane commits (a.k.a. the Delta deltas): 1) Make muted reconnect 2) Add "X" option to meetme and add ${MEETME_EXIT_CONTEXT}, 3) Allow SIP call parking with supervised transfer, 4) Only create parking entries when calls actually get parked, 5) Add "sunshine" song, 6) Update hardware documentation, 7) Don't load empty strings from history file
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- ChangeLog 17 Jul 2004 02:52:52 -0000 1.67
+++ ChangeLog 3 Aug 2004 06:31:20 -0000 1.68
@@ -1,3 +1,10 @@
+ -- Additional CDR backends
+ -- Allow muted to reconnect
+ -- Call parking improvements (including SIP parking support)
+ -- Added licensed hold music from FreePlayMusic
+ -- GR-303 and Zap improvements
+ -- More bug fixes from the bug tracker
+ -- Improved FreeBSD/OpenBSD/MacOS X support
Asterisk 1.0-RC1
-- Innumerable bug fixes and features from the bug tracker
-- Added Open Settlement Protocol (OSP) support
Index: HARDWARE
===================================================================
RCS file: /usr/cvsroot/asterisk/HARDWARE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HARDWARE 12 Jan 2004 03:16:56 -0000 1.3
+++ HARDWARE 3 Aug 2004 06:31:20 -0000 1.4
@@ -16,11 +16,11 @@
* Wildcard X100P - Single FXO interface connects to Loopstart phone
line
- * Wildcard T400P - Quad T1 interface connects to four T1/PRI
+ * Wildcard T400P (obsolete) - Quad T1 interface connects to four T1/PRI
interfaces. Supports RBS and PRI voice and PPP, FR, and HDLC data.
- * Wildcard E400P - Quad E1 interface connects to four E1/PRI (or PRA)
- interfaces. Supports PRA/PRI, EuroISDN voice and PPP, FR, HDLC data.
+ * Wildcard E400P (obsolete)- Quad E1 interface connects to four E1/PRI
+ (or PRA) interfaces. Supports PRA/PRI, EuroISDN voice and data.
* Wildcard T100P - Single T1 interface connects to a single T1/PRI
interface. Supports RBS and PRI voice and PPP, FR, and HDLC data.
Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- asterisk.c 1 Aug 2004 18:12:52 -0000 1.111
+++ asterisk.c 3 Aug 2004 06:31:20 -0000 1.112
@@ -689,7 +689,7 @@
{
int ret = 0;
/* Called when readline data is available */
- if (s && !ast_strlen_zero(s))
+ if (s && !ast_all_zeros(s))
ast_el_add_history(s);
/* Give the console access to the shell */
if (s) {
@@ -1341,6 +1341,8 @@
fgets(buf, sizeof(buf), f);
if (!strcmp(buf, "_HiStOrY_V2_\n"))
continue;
+ if (ast_all_zeros(buf))
+ continue;
if ((ret = ast_el_add_history(buf)) == -1)
break;
}
Index: muted.c
===================================================================
RCS file: /usr/cvsroot/asterisk/muted.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- muted.c 14 Jul 2004 07:44:19 -0000 1.4
+++ muted.c 3 Aug 2004 06:31:20 -0000 1.5
@@ -535,8 +535,16 @@
if (needfork)
daemon(0,0);
for(;;) {
- if (wait_event())
- exit(1);
+ if (wait_event()) {
+ fclose(astf);
+ while(connect_asterisk()) {
+ sleep(5);
+ }
+ if (login_asterisk()) {
+ fclose(astf);
+ exit(1);
+ }
+ }
}
exit(0);
}
Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- pbx.c 30 Jul 2004 18:57:37 -0000 1.142
+++ pbx.c 3 Aug 2004 06:31:20 -0000 1.143
@@ -1,4 +1,4 @@
-/*
+ /*
* Asterisk -- A telephony toolkit for Linux.
*
* Core PBX routines.
@@ -2044,7 +2044,7 @@
while (i) {
/* find our include */
if (!strcmp(i->name, include) &&
- (!strcmp(i->registrar, registrar) || !registrar)) {
+ (!registrar || !strcmp(i->registrar, registrar))) {
/* remove from list */
if (pi)
pi->next = i->next;
@@ -2116,7 +2116,7 @@
while (i) {
/* find our switch */
if (!strcmp(i->name, sw) && !strcmp(i->data, data) &&
- (!strcmp(i->registrar, registrar) || !registrar)) {
+ (!registrar || !strcmp(i->registrar, registrar))) {
/* remove from list */
if (pi)
pi->next = i->next;
@@ -2189,7 +2189,7 @@
/* look for right extension */
if (!strcmp(exten->exten, extension) &&
- (!strcmp(exten->registrar, registrar) || !registrar)) {
+ (!registrar || !strcmp(exten->registrar, registrar))) {
struct ast_exten *peer;
/* should we free all peers in this extension? (priority == 0)? */
@@ -2224,7 +2224,7 @@
while (peer) {
/* is this our extension? */
if (peer->priority == priority &&
- (!strcmp(peer->registrar, registrar) || !registrar)) {
+ (!registrar || !strcmp(peer->registrar, registrar) )) {
/* we are first priority extension? */
if (!previous_peer) {
/* exists previous extension here? */
@@ -3459,7 +3459,7 @@
ip = con->ignorepats;
while (ip) {
if (!strcmp(ip->pattern, ignorepat) &&
- (registrar == ip->registrar || !registrar)) {
+ (!registrar || (registrar == ip->registrar))) {
if (ipl) {
ipl->next = ip->next;
free(ip);
More information about the svn-commits
mailing list