Merged revisions 165071 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

I might add here that in I tested the merged fixes
from trunk in both 1.6.0 and 1.6.1 via both
'make' and ./runtests in the ael regression tests
for all but DEBUG_CHANNEL_LOCKS, DEBUG_SCHEDULER,
and CHANNEL_TRACE options.

........
r165071 | murf | 2008-12-16 22:04:56 -0700 (Tue, 16 Dec 2008) | 31 lines

A possibly "horrible fix" for a "horribly broken"
situation.

As stuff shifts around in the asterisk code, the
miscellaneous inclusions from the standalone stuff
gets broken. There's no easy fix for this situation.

I made sure that everything in utils builds without
problem ***AND*** that aelparse runs the regressions
correctly with the following make menuselect options
both on and off:

DONT_OPTIMIZE
DEBUG_THREADS
DEBUG_CHANNEL_LOCKS
MALLOC_DEBUG
MTX_PROFILE
DEBUG_SCHEDULER
DEBUG_THREADLOCALS
DETECT_DEADLOCKS
CHANNEL_TRACE

I think from now on, I'm going to #undef
all these features in the various utils native
files; I guess I could do the same for the
copied-in files, surrounded by STANDALONE ifdef.

A standalone isn't going to care about threads,
mutexes, etc.


........


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

pbx/ael/ael-test/ref.ael-vtest13

@@ -21,7 +21,7 @@ exten => s,7,Return()
 exten => a,1,VoiceMailMain(${ext})
 exten => _sw-1-.,10,Voicemail(u${ext})
 exten => _sw-1-.,11,Goto(s,6)
-exten => sw-1-,10,Goto(sw-1-.|10)
+exten => sw-1-,10,Goto(sw-1-.,10)
 exten => sw-1-ANSWER,10,Goto(s,6)
 exten => sw-1-NOANSWER,10,Voicemail(u${ext})
 exten => sw-1-NOANSWER,11,Goto(s,6)
@@ -44,7 +44,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_1-3)
 exten => s,12,Return()
 exten => _sw-3-.,10,Voicemail(u${ext})
 exten => _sw-3-.,11,Goto(s,11)
-exten => sw-3-,10,Goto(sw-3-.|10)
+exten => sw-3-,10,Goto(sw-3-.,10)
 exten => sw-3-NOANSWER,10,Voicemail(u${ext})
 exten => sw-3-NOANSWER,11,Goto(s,11)
 exten => sw-3-ANSWER,10,Goto(s,11)
@@ -71,7 +71,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_2-4)
 exten => s,12,Return()
 exten => _sw-4-.,10,Voicemail(u${ext})
 exten => _sw-4-.,11,Goto(s,11)
-exten => sw-4-,10,Goto(sw-4-.|10)
+exten => sw-4-,10,Goto(sw-4-.,10)
 exten => sw-4-NOANSWER,10,Voicemail(u${ext})
 exten => sw-4-NOANSWER,11,Goto(s,11)
 exten => sw-4-ANSWER,10,Goto(s,11)
@@ -98,7 +98,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_3-5)
 exten => s,12,Return()
 exten => _sw-5-.,10,Voicemail(u${ext})
 exten => _sw-5-.,11,Goto(s,11)
-exten => sw-5-,10,Goto(sw-5-.|10)
+exten => sw-5-,10,Goto(sw-5-.,10)
 exten => sw-5-NOANSWER,10,Voicemail(u${ext})
 exten => sw-5-NOANSWER,11,Goto(s,11)
 exten => sw-5-ANSWER,10,Goto(s,11)
@@ -125,7 +125,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_4-6)
 exten => s,12,Return()
 exten => _sw-6-.,10,Voicemail(u${ext})
 exten => _sw-6-.,11,Goto(s,11)
-exten => sw-6-,10,Goto(sw-6-.|10)
+exten => sw-6-,10,Goto(sw-6-.,10)
 exten => sw-6-NOANSWER,10,Voicemail(u${ext})
 exten => sw-6-NOANSWER,11,Goto(s,11)
 exten => sw-6-ANSWER,10,Goto(s,11)
@@ -152,7 +152,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_5-7)
 exten => s,12,Return()
 exten => _sw-7-.,10,Voicemail(u${ext})
 exten => _sw-7-.,11,Goto(s,11)
-exten => sw-7-,10,Goto(sw-7-.|10)
+exten => sw-7-,10,Goto(sw-7-.,10)
 exten => sw-7-NOANSWER,10,Voicemail(u${ext})
 exten => sw-7-NOANSWER,11,Goto(s,11)
 exten => sw-7-ANSWER,10,Goto(s,11)
@@ -179,7 +179,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_6-8)
 exten => s,12,Return()
 exten => _sw-8-.,10,Voicemail(u${ext})
 exten => _sw-8-.,11,Goto(s,11)
-exten => sw-8-,10,Goto(sw-8-.|10)
+exten => sw-8-,10,Goto(sw-8-.,10)
 exten => sw-8-NOANSWER,10,Voicemail(u${ext})
 exten => sw-8-NOANSWER,11,Goto(s,11)
 exten => sw-8-ANSWER,10,Goto(s,11)
@@ -206,7 +206,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_7-9)
 exten => s,12,Return()
 exten => _sw-9-.,10,Voicemail(u${ext})
 exten => _sw-9-.,11,Goto(s,11)
-exten => sw-9-,10,Goto(sw-9-.|10)
+exten => sw-9-,10,Goto(sw-9-.,10)
 exten => sw-9-NOANSWER,10,Voicemail(u${ext})
 exten => sw-9-NOANSWER,11,Goto(s,11)
 exten => sw-9-ANSWER,10,Goto(s,11)
@@ -233,7 +233,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_8-10)
 exten => s,12,Return()
 exten => _sw-10-.,10,Voicemail(u${ext})
 exten => _sw-10-.,11,Goto(s,11)
-exten => sw-10-,10,Goto(sw-10-.|10)
+exten => sw-10-,10,Goto(sw-10-.,10)
 exten => sw-10-NOANSWER,10,Voicemail(u${ext})
 exten => sw-10-NOANSWER,11,Goto(s,11)
 exten => sw-10-ANSWER,10,Goto(s,11)
@@ -260,7 +260,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_9-11)
 exten => s,12,Return()
 exten => _sw-11-.,10,Voicemail(u${ext})
 exten => _sw-11-.,11,Goto(s,11)
-exten => sw-11-,10,Goto(sw-11-.|10)
+exten => sw-11-,10,Goto(sw-11-.,10)
 exten => sw-11-NOANSWER,10,Voicemail(u${ext})
 exten => sw-11-NOANSWER,11,Goto(s,11)
 exten => sw-11-ANSWER,10,Goto(s,11)
@@ -287,7 +287,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_10-12)
 exten => s,12,Return()
 exten => _sw-12-.,10,Voicemail(u${ext})
 exten => _sw-12-.,11,Goto(s,11)
-exten => sw-12-,10,Goto(sw-12-.|10)
+exten => sw-12-,10,Goto(sw-12-.,10)
 exten => sw-12-NOANSWER,10,Voicemail(u${ext})
 exten => sw-12-NOANSWER,11,Goto(s,11)
 exten => sw-12-ANSWER,10,Goto(s,11)
@@ -314,7 +314,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_11-13)
 exten => s,12,Return()
 exten => _sw-13-.,10,Voicemail(u${ext})
 exten => _sw-13-.,11,Goto(s,11)
-exten => sw-13-,10,Goto(sw-13-.|10)
+exten => sw-13-,10,Goto(sw-13-.,10)
 exten => sw-13-NOANSWER,10,Voicemail(u${ext})
 exten => sw-13-NOANSWER,11,Goto(s,11)
 exten => sw-13-ANSWER,10,Goto(s,11)
@@ -341,7 +341,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_12-14)
 exten => s,12,Return()
 exten => _sw-14-.,10,Voicemail(u${ext})
 exten => _sw-14-.,11,Goto(s,11)
-exten => sw-14-,10,Goto(sw-14-.|10)
+exten => sw-14-,10,Goto(sw-14-.,10)
 exten => sw-14-NOANSWER,10,Voicemail(u${ext})
 exten => sw-14-NOANSWER,11,Goto(s,11)
 exten => sw-14-ANSWER,10,Goto(s,11)
@@ -368,7 +368,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_13-15)
 exten => s,12,Return()
 exten => _sw-15-.,10,Voicemail(u${ext})
 exten => _sw-15-.,11,Goto(s,11)
-exten => sw-15-,10,Goto(sw-15-.|10)
+exten => sw-15-,10,Goto(sw-15-.,10)
 exten => sw-15-NOANSWER,10,Voicemail(u${ext})
 exten => sw-15-NOANSWER,11,Goto(s,11)
 exten => sw-15-ANSWER,10,Goto(s,11)
@@ -395,7 +395,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_14-16)
 exten => s,12,Return()
 exten => _sw-16-.,10,Voicemail(u${ext})
 exten => _sw-16-.,11,Goto(s,11)
-exten => sw-16-,10,Goto(sw-16-.|10)
+exten => sw-16-,10,Goto(sw-16-.,10)
 exten => sw-16-NOANSWER,10,Voicemail(u${ext})
 exten => sw-16-NOANSWER,11,Goto(s,11)
 exten => sw-16-ANSWER,10,Goto(s,11)
@@ -422,7 +422,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_15-17)
 exten => s,12,Return()
 exten => _sw-17-.,10,Voicemail(u${ext})
 exten => _sw-17-.,11,Goto(s,11)
-exten => sw-17-,10,Goto(sw-17-.|10)
+exten => sw-17-,10,Goto(sw-17-.,10)
 exten => sw-17-NOANSWER,10,Voicemail(u${ext})
 exten => sw-17-NOANSWER,11,Goto(s,11)
 exten => sw-17-ANSWER,10,Goto(s,11)
@@ -449,7 +449,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_16-18)
 exten => s,12,Return()
 exten => _sw-18-.,10,Voicemail(u${ext})
 exten => _sw-18-.,11,Goto(s,11)
-exten => sw-18-,10,Goto(sw-18-.|10)
+exten => sw-18-,10,Goto(sw-18-.,10)
 exten => sw-18-NOANSWER,10,Voicemail(u${ext})
 exten => sw-18-NOANSWER,11,Goto(s,11)
 exten => sw-18-ANSWER,10,Goto(s,11)
@@ -476,7 +476,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_17-19)
 exten => s,12,Return()
 exten => _sw-19-.,10,Voicemail(u${ext})
 exten => _sw-19-.,11,Goto(s,11)
-exten => sw-19-,10,Goto(sw-19-.|10)
+exten => sw-19-,10,Goto(sw-19-.,10)
 exten => sw-19-NOANSWER,10,Voicemail(u${ext})
 exten => sw-19-NOANSWER,11,Goto(s,11)
 exten => sw-19-ANSWER,10,Goto(s,11)
@@ -503,7 +503,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_18-20)
 exten => s,12,Return()
 exten => _sw-20-.,10,Voicemail(u${ext})
 exten => _sw-20-.,11,Goto(s,11)
-exten => sw-20-,10,Goto(sw-20-.|10)
+exten => sw-20-,10,Goto(sw-20-.,10)
 exten => sw-20-NOANSWER,10,Voicemail(u${ext})
 exten => sw-20-NOANSWER,11,Goto(s,11)
 exten => sw-20-ANSWER,10,Goto(s,11)
@@ -530,7 +530,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_19-21)
 exten => s,12,Return()
 exten => _sw-21-.,10,Voicemail(u${ext})
 exten => _sw-21-.,11,Goto(s,11)
-exten => sw-21-,10,Goto(sw-21-.|10)
+exten => sw-21-,10,Goto(sw-21-.,10)
 exten => sw-21-NOANSWER,10,Voicemail(u${ext})
 exten => sw-21-NOANSWER,11,Goto(s,11)
 exten => sw-21-ANSWER,10,Goto(s,11)
@@ -557,7 +557,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_20-22)
 exten => s,12,Return()
 exten => _sw-22-.,10,Voicemail(u${ext})
 exten => _sw-22-.,11,Goto(s,11)
-exten => sw-22-,10,Goto(sw-22-.|10)
+exten => sw-22-,10,Goto(sw-22-.,10)
 exten => sw-22-NOANSWER,10,Voicemail(u${ext})
 exten => sw-22-NOANSWER,11,Goto(s,11)
 exten => sw-22-ANSWER,10,Goto(s,11)
@@ -584,7 +584,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_21-23)
 exten => s,12,Return()
 exten => _sw-23-.,10,Voicemail(u${ext})
 exten => _sw-23-.,11,Goto(s,11)
-exten => sw-23-,10,Goto(sw-23-.|10)
+exten => sw-23-,10,Goto(sw-23-.,10)
 exten => sw-23-NOANSWER,10,Voicemail(u${ext})
 exten => sw-23-NOANSWER,11,Goto(s,11)
 exten => sw-23-ANSWER,10,Goto(s,11)
@@ -611,7 +611,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_22-24)
 exten => s,12,Return()
 exten => _sw-24-.,10,Voicemail(u${ext})
 exten => _sw-24-.,11,Goto(s,11)
-exten => sw-24-,10,Goto(sw-24-.|10)
+exten => sw-24-,10,Goto(sw-24-.,10)
 exten => sw-24-NOANSWER,10,Voicemail(u${ext})
 exten => sw-24-NOANSWER,11,Goto(s,11)
 exten => sw-24-ANSWER,10,Goto(s,11)
@@ -638,7 +638,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_23-25)
 exten => s,12,Return()
 exten => _sw-25-.,10,Voicemail(u${ext})
 exten => _sw-25-.,11,Goto(s,11)
-exten => sw-25-,10,Goto(sw-25-.|10)
+exten => sw-25-,10,Goto(sw-25-.,10)
 exten => sw-25-NOANSWER,10,Voicemail(u${ext})
 exten => sw-25-NOANSWER,11,Goto(s,11)
 exten => sw-25-ANSWER,10,Goto(s,11)
@@ -665,7 +665,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_24-26)
 exten => s,12,Return()
 exten => _sw-26-.,10,Voicemail(u${ext})
 exten => _sw-26-.,11,Goto(s,11)
-exten => sw-26-,10,Goto(sw-26-.|10)
+exten => sw-26-,10,Goto(sw-26-.,10)
 exten => sw-26-NOANSWER,10,Voicemail(u${ext})
 exten => sw-26-NOANSWER,11,Goto(s,11)
 exten => sw-26-ANSWER,10,Goto(s,11)
@@ -692,7 +692,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_25-27)
 exten => s,12,Return()
 exten => _sw-27-.,10,Voicemail(u${ext})
 exten => _sw-27-.,11,Goto(s,11)
-exten => sw-27-,10,Goto(sw-27-.|10)
+exten => sw-27-,10,Goto(sw-27-.,10)
 exten => sw-27-NOANSWER,10,Voicemail(u${ext})
 exten => sw-27-NOANSWER,11,Goto(s,11)
 exten => sw-27-ANSWER,10,Goto(s,11)
@@ -719,7 +719,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_26-28)
 exten => s,12,Return()
 exten => _sw-28-.,10,Voicemail(u${ext})
 exten => _sw-28-.,11,Goto(s,11)
-exten => sw-28-,10,Goto(sw-28-.|10)
+exten => sw-28-,10,Goto(sw-28-.,10)
 exten => sw-28-NOANSWER,10,Voicemail(u${ext})
 exten => sw-28-NOANSWER,11,Goto(s,11)
 exten => sw-28-ANSWER,10,Goto(s,11)
@@ -746,7 +746,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_27-29)
 exten => s,12,Return()
 exten => _sw-29-.,10,Voicemail(u${ext})
 exten => _sw-29-.,11,Goto(s,11)
-exten => sw-29-,10,Goto(sw-29-.|10)
+exten => sw-29-,10,Goto(sw-29-.,10)
 exten => sw-29-NOANSWER,10,Voicemail(u${ext})
 exten => sw-29-NOANSWER,11,Goto(s,11)
 exten => sw-29-ANSWER,10,Goto(s,11)
@@ -773,7 +773,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_28-30)
 exten => s,12,Return()
 exten => _sw-30-.,10,Voicemail(u${ext})
 exten => _sw-30-.,11,Goto(s,11)
-exten => sw-30-,10,Goto(sw-30-.|10)
+exten => sw-30-,10,Goto(sw-30-.,10)
 exten => sw-30-NOANSWER,10,Voicemail(u${ext})
 exten => sw-30-NOANSWER,11,Goto(s,11)
 exten => sw-30-ANSWER,10,Goto(s,11)
@@ -800,7 +800,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_29-31)
 exten => s,12,Return()
 exten => _sw-31-.,10,Voicemail(u${ext})
 exten => _sw-31-.,11,Goto(s,11)
-exten => sw-31-,10,Goto(sw-31-.|10)
+exten => sw-31-,10,Goto(sw-31-.,10)
 exten => sw-31-NOANSWER,10,Voicemail(u${ext})
 exten => sw-31-NOANSWER,11,Goto(s,11)
 exten => sw-31-ANSWER,10,Goto(s,11)
@@ -827,7 +827,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_30-32)
 exten => s,12,Return()
 exten => _sw-32-.,10,Voicemail(u${ext})
 exten => _sw-32-.,11,Goto(s,11)
-exten => sw-32-,10,Goto(sw-32-.|10)
+exten => sw-32-,10,Goto(sw-32-.,10)
 exten => sw-32-NOANSWER,10,Voicemail(u${ext})
 exten => sw-32-NOANSWER,11,Goto(s,11)
 exten => sw-32-ANSWER,10,Goto(s,11)
@@ -854,7 +854,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_31-33)
 exten => s,12,Return()
 exten => _sw-33-.,10,Voicemail(u${ext})
 exten => _sw-33-.,11,Goto(s,11)
-exten => sw-33-,10,Goto(sw-33-.|10)
+exten => sw-33-,10,Goto(sw-33-.,10)
 exten => sw-33-NOANSWER,10,Voicemail(u${ext})
 exten => sw-33-NOANSWER,11,Goto(s,11)
 exten => sw-33-ANSWER,10,Goto(s,11)
@@ -881,7 +881,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_32-34)
 exten => s,12,Return()
 exten => _sw-34-.,10,Voicemail(u${ext})
 exten => _sw-34-.,11,Goto(s,11)
-exten => sw-34-,10,Goto(sw-34-.|10)
+exten => sw-34-,10,Goto(sw-34-.,10)
 exten => sw-34-NOANSWER,10,Voicemail(u${ext})
 exten => sw-34-NOANSWER,11,Goto(s,11)
 exten => sw-34-ANSWER,10,Goto(s,11)
@@ -908,7 +908,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_33-35)
 exten => s,12,Return()
 exten => _sw-35-.,10,Voicemail(u${ext})
 exten => _sw-35-.,11,Goto(s,11)
-exten => sw-35-,10,Goto(sw-35-.|10)
+exten => sw-35-,10,Goto(sw-35-.,10)
 exten => sw-35-NOANSWER,10,Voicemail(u${ext})
 exten => sw-35-NOANSWER,11,Goto(s,11)
 exten => sw-35-ANSWER,10,Goto(s,11)
@@ -935,7 +935,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_34-36)
 exten => s,12,Return()
 exten => _sw-36-.,10,Voicemail(u${ext})
 exten => _sw-36-.,11,Goto(s,11)
-exten => sw-36-,10,Goto(sw-36-.|10)
+exten => sw-36-,10,Goto(sw-36-.,10)
 exten => sw-36-NOANSWER,10,Voicemail(u${ext})
 exten => sw-36-NOANSWER,11,Goto(s,11)
 exten => sw-36-ANSWER,10,Goto(s,11)
@@ -962,7 +962,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_35-37)
 exten => s,12,Return()
 exten => _sw-37-.,10,Voicemail(u${ext})
 exten => _sw-37-.,11,Goto(s,11)
-exten => sw-37-,10,Goto(sw-37-.|10)
+exten => sw-37-,10,Goto(sw-37-.,10)
 exten => sw-37-NOANSWER,10,Voicemail(u${ext})
 exten => sw-37-NOANSWER,11,Goto(s,11)
 exten => sw-37-ANSWER,10,Goto(s,11)
@@ -989,7 +989,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_36-38)
 exten => s,12,Return()
 exten => _sw-38-.,10,Voicemail(u${ext})
 exten => _sw-38-.,11,Goto(s,11)
-exten => sw-38-,10,Goto(sw-38-.|10)
+exten => sw-38-,10,Goto(sw-38-.,10)
 exten => sw-38-NOANSWER,10,Voicemail(u${ext})
 exten => sw-38-NOANSWER,11,Goto(s,11)
 exten => sw-38-ANSWER,10,Goto(s,11)
@@ -1016,7 +1016,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_37-39)
 exten => s,12,Return()
 exten => _sw-39-.,10,Voicemail(u${ext})
 exten => _sw-39-.,11,Goto(s,11)
-exten => sw-39-,10,Goto(sw-39-.|10)
+exten => sw-39-,10,Goto(sw-39-.,10)
 exten => sw-39-NOANSWER,10,Voicemail(u${ext})
 exten => sw-39-NOANSWER,11,Goto(s,11)
 exten => sw-39-ANSWER,10,Goto(s,11)
@@ -1043,7 +1043,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_38-40)
 exten => s,12,Return()
 exten => _sw-40-.,10,Voicemail(u${ext})
 exten => _sw-40-.,11,Goto(s,11)
-exten => sw-40-,10,Goto(sw-40-.|10)
+exten => sw-40-,10,Goto(sw-40-.,10)
 exten => sw-40-NOANSWER,10,Voicemail(u${ext})
 exten => sw-40-NOANSWER,11,Goto(s,11)
 exten => sw-40-ANSWER,10,Goto(s,11)
@@ -1070,7 +1070,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_39-41)
 exten => s,12,Return()
 exten => _sw-41-.,10,Voicemail(u${ext})
 exten => _sw-41-.,11,Goto(s,11)
-exten => sw-41-,10,Goto(sw-41-.|10)
+exten => sw-41-,10,Goto(sw-41-.,10)
 exten => sw-41-NOANSWER,10,Voicemail(u${ext})
 exten => sw-41-NOANSWER,11,Goto(s,11)
 exten => sw-41-ANSWER,10,Goto(s,11)
@@ -1097,7 +1097,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_40-42)
 exten => s,12,Return()
 exten => _sw-42-.,10,Voicemail(u${ext})
 exten => _sw-42-.,11,Goto(s,11)
-exten => sw-42-,10,Goto(sw-42-.|10)
+exten => sw-42-,10,Goto(sw-42-.,10)
 exten => sw-42-NOANSWER,10,Voicemail(u${ext})
 exten => sw-42-NOANSWER,11,Goto(s,11)
 exten => sw-42-ANSWER,10,Goto(s,11)
@@ -1124,7 +1124,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_41-43)
 exten => s,12,Return()
 exten => _sw-43-.,10,Voicemail(u${ext})
 exten => _sw-43-.,11,Goto(s,11)
-exten => sw-43-,10,Goto(sw-43-.|10)
+exten => sw-43-,10,Goto(sw-43-.,10)
 exten => sw-43-NOANSWER,10,Voicemail(u${ext})
 exten => sw-43-NOANSWER,11,Goto(s,11)
 exten => sw-43-ANSWER,10,Goto(s,11)
@@ -1151,7 +1151,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_42-44)
 exten => s,12,Return()
 exten => _sw-44-.,10,Voicemail(u${ext})
 exten => _sw-44-.,11,Goto(s,11)
-exten => sw-44-,10,Goto(sw-44-.|10)
+exten => sw-44-,10,Goto(sw-44-.,10)
 exten => sw-44-NOANSWER,10,Voicemail(u${ext})
 exten => sw-44-NOANSWER,11,Goto(s,11)
 exten => sw-44-ANSWER,10,Goto(s,11)
@@ -1178,7 +1178,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_43-45)
 exten => s,12,Return()
 exten => _sw-45-.,10,Voicemail(u${ext})
 exten => _sw-45-.,11,Goto(s,11)
-exten => sw-45-,10,Goto(sw-45-.|10)
+exten => sw-45-,10,Goto(sw-45-.,10)
 exten => sw-45-NOANSWER,10,Voicemail(u${ext})
 exten => sw-45-NOANSWER,11,Goto(s,11)
 exten => sw-45-ANSWER,10,Goto(s,11)
@@ -1205,7 +1205,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_44-46)
 exten => s,12,Return()
 exten => _sw-46-.,10,Voicemail(u${ext})
 exten => _sw-46-.,11,Goto(s,11)
-exten => sw-46-,10,Goto(sw-46-.|10)
+exten => sw-46-,10,Goto(sw-46-.,10)
 exten => sw-46-NOANSWER,10,Voicemail(u${ext})
 exten => sw-46-NOANSWER,11,Goto(s,11)
 exten => sw-46-ANSWER,10,Goto(s,11)
@@ -1232,7 +1232,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_45-47)
 exten => s,12,Return()
 exten => _sw-47-.,10,Voicemail(u${ext})
 exten => _sw-47-.,11,Goto(s,11)
-exten => sw-47-,10,Goto(sw-47-.|10)
+exten => sw-47-,10,Goto(sw-47-.,10)
 exten => sw-47-NOANSWER,10,Voicemail(u${ext})
 exten => sw-47-NOANSWER,11,Goto(s,11)
 exten => sw-47-ANSWER,10,Goto(s,11)
@@ -1259,7 +1259,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_46-48)
 exten => s,12,Return()
 exten => _sw-48-.,10,Voicemail(u${ext})
 exten => _sw-48-.,11,Goto(s,11)
-exten => sw-48-,10,Goto(sw-48-.|10)
+exten => sw-48-,10,Goto(sw-48-.,10)
 exten => sw-48-NOANSWER,10,Voicemail(u${ext})
 exten => sw-48-NOANSWER,11,Goto(s,11)
 exten => sw-48-ANSWER,10,Goto(s,11)
@@ -1286,7 +1286,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_47-49)
 exten => s,12,Return()
 exten => _sw-49-.,10,Voicemail(u${ext})
 exten => _sw-49-.,11,Goto(s,11)
-exten => sw-49-,10,Goto(sw-49-.|10)
+exten => sw-49-,10,Goto(sw-49-.,10)
 exten => sw-49-NOANSWER,10,Voicemail(u${ext})
 exten => sw-49-NOANSWER,11,Goto(s,11)
 exten => sw-49-ANSWER,10,Goto(s,11)
@@ -1313,7 +1313,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_48-50)
 exten => s,12,Return()
 exten => _sw-50-.,10,Voicemail(u${ext})
 exten => _sw-50-.,11,Goto(s,11)
-exten => sw-50-,10,Goto(sw-50-.|10)
+exten => sw-50-,10,Goto(sw-50-.,10)
 exten => sw-50-NOANSWER,10,Voicemail(u${ext})
 exten => sw-50-NOANSWER,11,Goto(s,11)
 exten => sw-50-ANSWER,10,Goto(s,11)
@@ -1340,7 +1340,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_49-51)
 exten => s,12,Return()
 exten => _sw-51-.,10,Voicemail(u${ext})
 exten => _sw-51-.,11,Goto(s,11)
-exten => sw-51-,10,Goto(sw-51-.|10)
+exten => sw-51-,10,Goto(sw-51-.,10)
 exten => sw-51-NOANSWER,10,Voicemail(u${ext})
 exten => sw-51-NOANSWER,11,Goto(s,11)
 exten => sw-51-ANSWER,10,Goto(s,11)
@@ -1367,7 +1367,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_50-52)
 exten => s,12,Return()
 exten => _sw-52-.,10,Voicemail(u${ext})
 exten => _sw-52-.,11,Goto(s,11)
-exten => sw-52-,10,Goto(sw-52-.|10)
+exten => sw-52-,10,Goto(sw-52-.,10)
 exten => sw-52-NOANSWER,10,Voicemail(u${ext})
 exten => sw-52-NOANSWER,11,Goto(s,11)
 exten => sw-52-ANSWER,10,Goto(s,11)
@@ -1394,7 +1394,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_51-53)
 exten => s,12,Return()
 exten => _sw-53-.,10,Voicemail(u${ext})
 exten => _sw-53-.,11,Goto(s,11)
-exten => sw-53-,10,Goto(sw-53-.|10)
+exten => sw-53-,10,Goto(sw-53-.,10)
 exten => sw-53-NOANSWER,10,Voicemail(u${ext})
 exten => sw-53-NOANSWER,11,Goto(s,11)
 exten => sw-53-ANSWER,10,Goto(s,11)
@@ -1421,7 +1421,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_52-54)
 exten => s,12,Return()
 exten => _sw-54-.,10,Voicemail(u${ext})
 exten => _sw-54-.,11,Goto(s,11)
-exten => sw-54-,10,Goto(sw-54-.|10)
+exten => sw-54-,10,Goto(sw-54-.,10)
 exten => sw-54-NOANSWER,10,Voicemail(u${ext})
 exten => sw-54-NOANSWER,11,Goto(s,11)
 exten => sw-54-ANSWER,10,Goto(s,11)
@@ -1448,7 +1448,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_53-55)
 exten => s,12,Return()
 exten => _sw-55-.,10,Voicemail(u${ext})
 exten => _sw-55-.,11,Goto(s,11)
-exten => sw-55-,10,Goto(sw-55-.|10)
+exten => sw-55-,10,Goto(sw-55-.,10)
 exten => sw-55-NOANSWER,10,Voicemail(u${ext})
 exten => sw-55-NOANSWER,11,Goto(s,11)
 exten => sw-55-ANSWER,10,Goto(s,11)
@@ -1475,7 +1475,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_54-56)
 exten => s,12,Return()
 exten => _sw-56-.,10,Voicemail(u${ext})
 exten => _sw-56-.,11,Goto(s,11)
-exten => sw-56-,10,Goto(sw-56-.|10)
+exten => sw-56-,10,Goto(sw-56-.,10)
 exten => sw-56-NOANSWER,10,Voicemail(u${ext})
 exten => sw-56-NOANSWER,11,Goto(s,11)
 exten => sw-56-ANSWER,10,Goto(s,11)
@@ -1502,7 +1502,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_55-57)
 exten => s,12,Return()
 exten => _sw-57-.,10,Voicemail(u${ext})
 exten => _sw-57-.,11,Goto(s,11)
-exten => sw-57-,10,Goto(sw-57-.|10)
+exten => sw-57-,10,Goto(sw-57-.,10)
 exten => sw-57-NOANSWER,10,Voicemail(u${ext})
 exten => sw-57-NOANSWER,11,Goto(s,11)
 exten => sw-57-ANSWER,10,Goto(s,11)
@@ -1529,7 +1529,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_56-58)
 exten => s,12,Return()
 exten => _sw-58-.,10,Voicemail(u${ext})
 exten => _sw-58-.,11,Goto(s,11)
-exten => sw-58-,10,Goto(sw-58-.|10)
+exten => sw-58-,10,Goto(sw-58-.,10)
 exten => sw-58-NOANSWER,10,Voicemail(u${ext})
 exten => sw-58-NOANSWER,11,Goto(s,11)
 exten => sw-58-ANSWER,10,Goto(s,11)
@@ -1556,7 +1556,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_57-59)
 exten => s,12,Return()
 exten => _sw-59-.,10,Voicemail(u${ext})
 exten => _sw-59-.,11,Goto(s,11)
-exten => sw-59-,10,Goto(sw-59-.|10)
+exten => sw-59-,10,Goto(sw-59-.,10)
 exten => sw-59-NOANSWER,10,Voicemail(u${ext})
 exten => sw-59-NOANSWER,11,Goto(s,11)
 exten => sw-59-ANSWER,10,Goto(s,11)
@@ -1583,7 +1583,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_58-60)
 exten => s,12,Return()
 exten => _sw-60-.,10,Voicemail(u${ext})
 exten => _sw-60-.,11,Goto(s,11)
-exten => sw-60-,10,Goto(sw-60-.|10)
+exten => sw-60-,10,Goto(sw-60-.,10)
 exten => sw-60-NOANSWER,10,Voicemail(u${ext})
 exten => sw-60-NOANSWER,11,Goto(s,11)
 exten => sw-60-ANSWER,10,Goto(s,11)
@@ -1610,7 +1610,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_59-61)
 exten => s,12,Return()
 exten => _sw-61-.,10,Voicemail(u${ext})
 exten => _sw-61-.,11,Goto(s,11)
-exten => sw-61-,10,Goto(sw-61-.|10)
+exten => sw-61-,10,Goto(sw-61-.,10)
 exten => sw-61-NOANSWER,10,Voicemail(u${ext})
 exten => sw-61-NOANSWER,11,Goto(s,11)
 exten => sw-61-ANSWER,10,Goto(s,11)
@@ -1637,7 +1637,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_60-62)
 exten => s,12,Return()
 exten => _sw-62-.,10,Voicemail(u${ext})
 exten => _sw-62-.,11,Goto(s,11)
-exten => sw-62-,10,Goto(sw-62-.|10)
+exten => sw-62-,10,Goto(sw-62-.,10)
 exten => sw-62-NOANSWER,10,Voicemail(u${ext})
 exten => sw-62-NOANSWER,11,Goto(s,11)
 exten => sw-62-ANSWER,10,Goto(s,11)
@@ -1664,7 +1664,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_61-63)
 exten => s,12,Return()
 exten => _sw-63-.,10,Voicemail(u${ext})
 exten => _sw-63-.,11,Goto(s,11)
-exten => sw-63-,10,Goto(sw-63-.|10)
+exten => sw-63-,10,Goto(sw-63-.,10)
 exten => sw-63-NOANSWER,10,Voicemail(u${ext})
 exten => sw-63-NOANSWER,11,Goto(s,11)
 exten => sw-63-ANSWER,10,Goto(s,11)
@@ -1691,7 +1691,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_62-64)
 exten => s,12,Return()
 exten => _sw-64-.,10,Voicemail(u${ext})
 exten => _sw-64-.,11,Goto(s,11)
-exten => sw-64-,10,Goto(sw-64-.|10)
+exten => sw-64-,10,Goto(sw-64-.,10)
 exten => sw-64-NOANSWER,10,Voicemail(u${ext})
 exten => sw-64-NOANSWER,11,Goto(s,11)
 exten => sw-64-ANSWER,10,Goto(s,11)
@@ -1718,7 +1718,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_63-65)
 exten => s,12,Return()
 exten => _sw-65-.,10,Voicemail(u${ext})
 exten => _sw-65-.,11,Goto(s,11)
-exten => sw-65-,10,Goto(sw-65-.|10)
+exten => sw-65-,10,Goto(sw-65-.,10)
 exten => sw-65-NOANSWER,10,Voicemail(u${ext})
 exten => sw-65-NOANSWER,11,Goto(s,11)
 exten => sw-65-ANSWER,10,Goto(s,11)
@@ -1745,7 +1745,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_64-66)
 exten => s,12,Return()
 exten => _sw-66-.,10,Voicemail(u${ext})
 exten => _sw-66-.,11,Goto(s,11)
-exten => sw-66-,10,Goto(sw-66-.|10)
+exten => sw-66-,10,Goto(sw-66-.,10)
 exten => sw-66-NOANSWER,10,Voicemail(u${ext})
 exten => sw-66-NOANSWER,11,Goto(s,11)
 exten => sw-66-ANSWER,10,Goto(s,11)
@@ -1772,7 +1772,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_65-67)
 exten => s,12,Return()
 exten => _sw-67-.,10,Voicemail(u${ext})
 exten => _sw-67-.,11,Goto(s,11)
-exten => sw-67-,10,Goto(sw-67-.|10)
+exten => sw-67-,10,Goto(sw-67-.,10)
 exten => sw-67-NOANSWER,10,Voicemail(u${ext})
 exten => sw-67-NOANSWER,11,Goto(s,11)
 exten => sw-67-ANSWER,10,Goto(s,11)
@@ -1799,7 +1799,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_66-68)
 exten => s,12,Return()
 exten => _sw-68-.,10,Voicemail(u${ext})
 exten => _sw-68-.,11,Goto(s,11)
-exten => sw-68-,10,Goto(sw-68-.|10)
+exten => sw-68-,10,Goto(sw-68-.,10)
 exten => sw-68-NOANSWER,10,Voicemail(u${ext})
 exten => sw-68-NOANSWER,11,Goto(s,11)
 exten => sw-68-ANSWER,10,Goto(s,11)
@@ -1826,7 +1826,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_67-69)
 exten => s,12,Return()
 exten => _sw-69-.,10,Voicemail(u${ext})
 exten => _sw-69-.,11,Goto(s,11)
-exten => sw-69-,10,Goto(sw-69-.|10)
+exten => sw-69-,10,Goto(sw-69-.,10)
 exten => sw-69-NOANSWER,10,Voicemail(u${ext})
 exten => sw-69-NOANSWER,11,Goto(s,11)
 exten => sw-69-ANSWER,10,Goto(s,11)
@@ -1853,7 +1853,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_68-70)
 exten => s,12,Return()
 exten => _sw-70-.,10,Voicemail(u${ext})
 exten => _sw-70-.,11,Goto(s,11)
-exten => sw-70-,10,Goto(sw-70-.|10)
+exten => sw-70-,10,Goto(sw-70-.,10)
 exten => sw-70-NOANSWER,10,Voicemail(u${ext})
 exten => sw-70-NOANSWER,11,Goto(s,11)
 exten => sw-70-ANSWER,10,Goto(s,11)
@@ -1880,7 +1880,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_69-71)
 exten => s,12,Return()
 exten => _sw-71-.,10,Voicemail(u${ext})
 exten => _sw-71-.,11,Goto(s,11)
-exten => sw-71-,10,Goto(sw-71-.|10)
+exten => sw-71-,10,Goto(sw-71-.,10)
 exten => sw-71-NOANSWER,10,Voicemail(u${ext})
 exten => sw-71-NOANSWER,11,Goto(s,11)
 exten => sw-71-ANSWER,10,Goto(s,11)
@@ -1907,7 +1907,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_70-72)
 exten => s,12,Return()
 exten => _sw-72-.,10,Voicemail(u${ext})
 exten => _sw-72-.,11,Goto(s,11)
-exten => sw-72-,10,Goto(sw-72-.|10)
+exten => sw-72-,10,Goto(sw-72-.,10)
 exten => sw-72-NOANSWER,10,Voicemail(u${ext})
 exten => sw-72-NOANSWER,11,Goto(s,11)
 exten => sw-72-ANSWER,10,Goto(s,11)
@@ -1934,7 +1934,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_71-73)
 exten => s,12,Return()
 exten => _sw-73-.,10,Voicemail(u${ext})
 exten => _sw-73-.,11,Goto(s,11)
-exten => sw-73-,10,Goto(sw-73-.|10)
+exten => sw-73-,10,Goto(sw-73-.,10)
 exten => sw-73-NOANSWER,10,Voicemail(u${ext})
 exten => sw-73-NOANSWER,11,Goto(s,11)
 exten => sw-73-ANSWER,10,Goto(s,11)
@@ -1961,7 +1961,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_72-74)
 exten => s,12,Return()
 exten => _sw-74-.,10,Voicemail(u${ext})
 exten => _sw-74-.,11,Goto(s,11)
-exten => sw-74-,10,Goto(sw-74-.|10)
+exten => sw-74-,10,Goto(sw-74-.,10)
 exten => sw-74-NOANSWER,10,Voicemail(u${ext})
 exten => sw-74-NOANSWER,11,Goto(s,11)
 exten => sw-74-ANSWER,10,Goto(s,11)
@@ -1988,7 +1988,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten_73-75)
 exten => s,12,Return()
 exten => _sw-75-.,10,Voicemail(u${ext})
 exten => _sw-75-.,11,Goto(s,11)
-exten => sw-75-,10,Goto(sw-75-.|10)
+exten => sw-75-,10,Goto(sw-75-.,10)
 exten => sw-75-NOANSWER,10,Voicemail(u${ext})
 exten => sw-75-NOANSWER,11,Goto(s,11)
 exten => sw-75-ANSWER,10,Goto(s,11)
@@ -2015,7 +2015,7 @@ exten => s,11,NoOp(Finish switch-std-priv-exten-76)
 exten => s,12,Return()
 exten => _sw-76-.,10,Voicemail(u${ext})
 exten => _sw-76-.,11,Goto(s,11)
-exten => sw-76-,10,Goto(sw-76-.|10)
+exten => sw-76-,10,Goto(sw-76-.,10)
 exten => sw-76-NOANSWER,10,Voicemail(u${ext})
 exten => sw-76-NOANSWER,11,Goto(s,11)
 exten => sw-76-ANSWER,10,Goto(s,11)
@@ -2242,7 +2242,7 @@ exten => s,103,NoOp(Finish iftime-homeline-93)
 exten => s,104,Background(murphy-homeline-intro1)
 exten => _sw-92-.,10,Set(z=${direct}-2)
 exten => _sw-92-.,11,Goto(homeline-kids,${z},1)
-exten => sw-92-,10,Goto(sw-92-.|10)
+exten => sw-92-,10,Goto(sw-92-.,10)
 exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
 exten => sw-92-2,11,Goto(s,loopback)
 exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))

pbx/ael/ael-test/ref.ael-vtest17

@@ -46,7 +46,7 @@ exten => 83,1,Set(~~EXTEN~~=${EXTEN})
 exten => 83,2,Goto(sw-2-${~~EXTEN~~},10)
 exten => 83,3,NoOp(Finish switch-extension-2)
 exten => _sw-2-.,10,Goto(83,3)
-exten => sw-2-,10,Goto(sw-2-.|10)
+exten => sw-2-,10,Goto(sw-2-.,10)
 exten => _sw-2-[4-7]X,10,Verbose(and this too!)
 exten => _sw-2-[4-7]X,11,Goto(sw-2-.,10)
 exten => _sw-2-9X,10,Verbose(handle both 8x and 9x calls)

pbx/pbx_ael.c

@@ -36,6 +36,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <regex.h>
 #include <sys/stat.h>
 
+#ifdef STANDALONE
+#ifdef HAVE_MTX_PROFILE
+static int mtx_prof = -1; /* helps the standalone compile with the mtx_prof flag on */
+#endif
+#endif
 #include "asterisk/pbx.h"
 #include "asterisk/config.h"
 #include "asterisk/module.h"

utils/Makefile

@@ -16,9 +16,7 @@ ASTTOPDIR?=..
 
 .PHONY: clean all uninstall
 
-ALL_UTILS:=astman smsq stereorize streamplayer muted check_expr hashtest2 hashtest astcanary refcounter
-# aelparse and conf2ael currently not being built because they rely on extconf, which is horribly broken
-# ALL_UTILS:=aelparse conf2ael
+ALL_UTILS:=astman smsq stereorize streamplayer muted check_expr hashtest2 hashtest astcanary refcounter aelparse conf2ael
 UTILS:=$(ALL_UTILS)
 
 LIBS += $(BKTR_LIB)	# astobj2 with devmode uses backtrace

utils/ael_main.c

@@ -24,6 +24,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/ael_structs.h"
 #include "asterisk/extconf.h"
 
+int option_debug = 0;
+int option_verbose = 0;
+void ast_register_file_version(const char *file, const char *version) { }
+void ast_unregister_file_version(const char *file) { }
+
 struct ast_flags ast_compat = { 7 };
 
 /*** MODULEINFO

utils/check_expr.c

@@ -85,6 +85,7 @@ enum ast_lock_type {
 	        AST_WRLOCK,
 };
 #endif
+
 #if !defined(LOW_MEMORY)
 #ifdef HAVE_BKTR
 void ast_store_lock_info(enum ast_lock_type type, const char *filename,

utils/conf2ael.c

@@ -78,6 +78,8 @@ char ast_config_AST_SYSTEM_NAME[20] = ""; */
 #define AST_PBX_MAX_STACK	128
 /* static AST_RWLIST_HEAD_STATIC(acf_root, ast_custom_function); */
 //extern char ast_config_AST_CONFIG_DIR[PATH_MAX];
+int option_debug = 0;
+int option_verbose = 0;
 
 void ast_register_file_version(const char *file, const char *version);
 void ast_register_file_version(const char *file, const char *version)

utils/extconf.c

@@ -50,6 +50,9 @@
 #include <netdb.h>
 #include <sys/param.h>
 
+static void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
+void ast_verbose(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
+
 #define ASINCLUDE_GLOB 1
 #ifdef AST_INCLUDE_GLOB
 
@@ -148,6 +151,8 @@ void ast_console_puts(const char *string);
 #ifndef	HAVE_MTX_PROFILE
 #define	__MTX_PROF(a)	return pthread_mutex_lock((a))
 #else
+int mtx_prof = -1;
+
 #define	__MTX_PROF(a)	do {			\
 	int i;					\
 	/* profile only non-blocking events */	\
@@ -885,6 +890,136 @@ int ast_channel_trylock(struct ast_channel *chan);
 
 /* from utils.h */
 
+#define ast_free free
+
+#define MALLOC_FAILURE_MSG \
+	ast_log(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file);
+#ifndef __AST_DEBUG_MALLOC
+
+/*!
+ * \brief A wrapper for malloc()
+ *
+ * ast_malloc() is a wrapper for malloc() that will generate an Asterisk log
+ * message in the case that the allocation fails.
+ *
+ * The argument and return value are the same as malloc()
+ */
+#define ast_malloc(len) \
+	_ast_malloc((len), __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+#define ast_calloc(num, len) \
+	_ast_calloc((num), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+#define ast_calloc_cache(num, len) \
+	_ast_calloc((num), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+#define ast_realloc(p, len) \
+	_ast_realloc((p), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+#define ast_strdup(str) \
+	_ast_strdup((str), __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+#define ast_strndup(str, len) \
+	_ast_strndup((str), (len), __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+#define ast_asprintf(ret, fmt, ...) \
+	_ast_asprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, __VA_ARGS__)
+
+#define ast_vasprintf(ret, fmt, ap) \
+	_ast_vasprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, (fmt), (ap))
+
+#else
+
+/* If astmm is in use, let it handle these.  Otherwise, it will report that
+   all allocations are coming from this header file */
+
+#undef __ast_calloc
+#undef calloc
+#undef ast_calloc
+
+#define ast_malloc(a)		malloc(a)
+#define ast_calloc(a,b)		calloc(a,b)
+#define ast_realloc(a,b)	realloc(a,b)
+#define ast_strdup(a)		strdup(a)
+#define ast_strndup(a,b)	strndup(a,b)
+#define ast_asprintf(a,b,...)	asprintf(a,b,__VA_ARGS__)
+#define ast_vasprintf(a,b,c)	vasprintf(a,b,c)
+
+void * attribute_malloc __ast_malloc(size_t len, const char *file, int lineno, const char *func)
+{
+	void *p;
+
+	if (!(p = malloc(len)))
+		MALLOC_FAILURE_MSG;
+
+	return p;
+}
+
+void * attribute_malloc __ast_calloc(size_t num, size_t len, const char *file, int lineno, const char *func)
+{
+	void *p;
+
+	if (!(p = calloc(num, len)))
+		MALLOC_FAILURE_MSG;
+
+	return p;
+}
+
+void * attribute_malloc _ast_calloc(size_t num, size_t len, const char *file, int lineno, const char *func);
+
+void * attribute_malloc _ast_calloc(size_t num, size_t len, const char *file, int lineno, const char *func)
+{
+	void *p;
+
+	if (!(p = calloc(num, len)))
+		MALLOC_FAILURE_MSG;
+
+	return p;
+}
+
+void * attribute_malloc __ast_realloc(void *p, size_t len, const char *file, int lineno, const char *func)
+{
+	void *newp;
+
+	if (!(newp = realloc(p, len)))
+		MALLOC_FAILURE_MSG;
+
+	return newp;
+}
+
+char * attribute_malloc __ast_strdup(const char *str, const char *file, int lineno, const char *func)
+{
+	char *newstr = NULL;
+
+	if (str) {
+		if (!(newstr = strdup(str)))
+			MALLOC_FAILURE_MSG;
+	}
+
+	return newstr;
+}
+
+char * attribute_malloc __ast_strndup(const char *str, size_t len, const char *file, int lineno, const char *func)
+{
+	char *newstr = NULL;
+
+	if (str) {
+		if (!(newstr = strndup(str, len)))
+			MALLOC_FAILURE_MSG;
+	}
+
+	return newstr;
+}
+
+void __ast_free(void *ptr, const char *file, int lineno, const char *func)
+{
+#undef free
+	free(ptr);
+}
+
+#endif /* AST_DEBUG_MALLOC */
+
+
 static unsigned int __unsigned_int_flags_dummy;
 
 struct ast_flags {  /* stolen from utils.h */
@@ -908,15 +1043,6 @@ struct ast_flags {  /* stolen from utils.h */
 					} while (0)
 
 
-#ifdef __AST_DEBUG_MALLOC
-static void ast_free(void *ptr) attribute_unused;
-static void ast_free(void *ptr)
-{
-	free(ptr);
-}
-#else
-#define ast_free free
-#endif
 
 #ifndef __AST_DEBUG_MALLOC
 
@@ -1123,7 +1249,6 @@ int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, c
 #define ast_realloc(a,b)	realloc(a,b)
 #define ast_strdup(a)		strdup(a)
 #define ast_strndup(a,b)	strndup(a,b)
-#define ast_asprintf(a,b,c)	asprintf(a,b,c)
 #define ast_vasprintf(a,b,c)	vasprintf(a,b,c)
 
 #endif /* AST_DEBUG_MALLOC */
@@ -1757,15 +1882,72 @@ static void ast_config_destroy(struct ast_config *cfg)
 	free(cfg);
 }
 
+enum ast_option_flags {
+	/*! Allow \#exec in config files */
+	AST_OPT_FLAG_EXEC_INCLUDES = (1 << 0),
+	/*! Do not fork() */
+	AST_OPT_FLAG_NO_FORK = (1 << 1),
+	/*! Keep quiet */
+	AST_OPT_FLAG_QUIET = (1 << 2),
+	/*! Console mode */
+	AST_OPT_FLAG_CONSOLE = (1 << 3),
+	/*! Run in realtime Linux priority */
+	AST_OPT_FLAG_HIGH_PRIORITY = (1 << 4),
+	/*! Initialize keys for RSA authentication */
+	AST_OPT_FLAG_INIT_KEYS = (1 << 5),
+	/*! Remote console */
+	AST_OPT_FLAG_REMOTE = (1 << 6),
+	/*! Execute an asterisk CLI command upon startup */
+	AST_OPT_FLAG_EXEC = (1 << 7),
+	/*! Don't use termcap colors */
+	AST_OPT_FLAG_NO_COLOR = (1 << 8),
+	/*! Are we fully started yet? */
+	AST_OPT_FLAG_FULLY_BOOTED = (1 << 9),
+	/*! Trascode via signed linear */
+	AST_OPT_FLAG_TRANSCODE_VIA_SLIN = (1 << 10),
+	/*! Dump core on a seg fault */
+	AST_OPT_FLAG_DUMP_CORE = (1 << 12),
+	/*! Cache sound files */
+	AST_OPT_FLAG_CACHE_RECORD_FILES = (1 << 13),
+	/*! Display timestamp in CLI verbose output */
+	AST_OPT_FLAG_TIMESTAMP = (1 << 14),
+	/*! Override config */
+	AST_OPT_FLAG_OVERRIDE_CONFIG = (1 << 15),
+	/*! Reconnect */
+	AST_OPT_FLAG_RECONNECT = (1 << 16),
+	/*! Transmit Silence during Record() and DTMF Generation */
+	AST_OPT_FLAG_TRANSMIT_SILENCE = (1 << 17),
+	/*! Suppress some warnings */
+	AST_OPT_FLAG_DONT_WARN = (1 << 18),
+	/*! End CDRs before the 'h' extension */
+	AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN = (1 << 19),
+	/*! Use DAHDI Timing for generators if available */
+	AST_OPT_FLAG_INTERNAL_TIMING = (1 << 20),
+	/*! Always fork, even if verbose or debug settings are non-zero */
+	AST_OPT_FLAG_ALWAYS_FORK = (1 << 21),
+	/*! Disable log/verbose output to remote consoles */
+	AST_OPT_FLAG_MUTE = (1 << 22),
+	/*! There is a per-file debug setting */
+	AST_OPT_FLAG_DEBUG_FILE = (1 << 23),
+	/*! There is a per-file verbose setting */
+	AST_OPT_FLAG_VERBOSE_FILE = (1 << 24),
+	/*! Terminal colors should be adjusted for a light-colored background */
+	AST_OPT_FLAG_LIGHT_BACKGROUND = (1 << 25),
+	/*! Count Initiated seconds in CDR's */
+	AST_OPT_FLAG_INITIATED_SECONDS = (1 << 26),
+	/*! Force black background */
+	AST_OPT_FLAG_FORCE_BLACK_BACKGROUND = (1 << 27),
+};
 
-/* options.h declars ast_options extern; I need it static? */
-
+/* options.h declares ast_options extern; I need it static? */
 #define AST_CACHE_DIR_LEN 	512
 #define AST_FILENAME_MAX	80
 
 /*! These are the options that set by default when Asterisk starts */
 #define AST_DEFAULT_OPTIONS AST_OPT_FLAG_TRANSCODE_VIA_SLIN
 
+struct ast_flags ast_options = { AST_DEFAULT_OPTIONS };
+
 #define ast_opt_exec_includes		ast_test_flag(&ast_options, AST_OPT_FLAG_EXEC_INCLUDES)
 #define ast_opt_no_fork			ast_test_flag(&ast_options, AST_OPT_FLAG_NO_FORK)
 #define ast_opt_quiet			ast_test_flag(&ast_options, AST_OPT_FLAG_QUIET)
@@ -1790,8 +1972,8 @@ static void ast_config_destroy(struct ast_config *cfg)
 #define ast_opt_always_fork		ast_test_flag(&ast_options, AST_OPT_FLAG_ALWAYS_FORK)
 #define ast_opt_mute			ast_test_flag(&ast_options, AST_OPT_FLAG_MUTE)
 
-/*  IN CONFLICT: extern int option_verbose; */
-/*  IN CONFLICT: extern int option_debug;	*/	/*!< Debugging */
+extern int option_verbose;
+extern int option_debug;		/*!< Debugging */
 extern int option_maxcalls;		/*!< Maximum number of simultaneous channels */
 extern double option_maxload;
 extern char defaultlanguage[];
@@ -2768,6 +2950,7 @@ struct ast_timing {
 	unsigned int daymask;			/*!< Mask for date */
 	unsigned int dowmask;			/*!< Mask for day of week (mon-sun) */
 	unsigned int minmask[24];		/*!< Mask for minute */
+	char *timezone;                 /*!< NULL, or zoneinfo style timezone */
 };
 /* end of pbx.h */
 /*! \brief ast_include: include= support in extensions.conf */
@@ -4313,7 +4496,9 @@ char *months[] =
 	NULL,
 };
 
-static int ast_build_timing(struct ast_timing *i, const char *info_in)
+int ast_build_timing(struct ast_timing *i, const char *info_in);
+
+int ast_build_timing(struct ast_timing *i, const char *info_in)
 {
 	char info_save[256];
 	char *info;
@@ -4488,39 +4673,13 @@ static int ext_strncpy(char *dst, const char *src, int len)
  * Wrapper around _extension_match_core() to do performance measurement
  * using the profiling code.
  */
-static int ast_check_timing(const struct ast_timing *i)
-{
-	struct tm tm;
-	time_t t = time(NULL);
-
-	localtime_r(&t,&tm);
-
-	/* If it's not the right month, return */
-	if (!(i->monthmask & (1 << tm.tm_mon)))
-		return 0;
-
-	/* If it's not that time of the month.... */
-	/* Warning, tm_mday has range 1..31! */
-	if (!(i->daymask & (1 << (tm.tm_mday-1))))
-		return 0;
-
-	/* If it's not the right day of the week */
-	if (!(i->dowmask & (1 << tm.tm_wday)))
-		return 0;
+int ast_check_timing(const struct ast_timing *i);
 
-	/* Sanity check the hour just to be safe */
-	if ((tm.tm_hour < 0) || (tm.tm_hour > 23)) {
-		ast_log(LOG_WARNING, "Insane time...\n");
-		return 0;
-	}
-
-	/* Now the tough part, we calculate if it fits
-	   in the right time based on min/hour */
-	if (!(i->minmask[tm.tm_hour] & (1 << (tm.tm_min / 2))))
-		return 0;
-
-	/* If we got this far, then we're good */
-	return 1;
+int ast_check_timing(const struct ast_timing *i)
+{
+	/* sorry, but this feature will NOT be available
+	   in the standalone version */
+	return 0;
 }
 
 #ifdef NOT_ANYMORE
@@ -5836,7 +5995,6 @@ static int pbx_load_config(const char *config_file)
 	if ((aft = ast_variable_retrieve(cfg, "general", "autofallthrough")))
 		autofallthrough_config = ast_true(aft);
 	clearglobalvars_config = ast_true(ast_variable_retrieve(cfg, "general", "clearglobalvars"));
-	ast_set2_flag(&ast_options, ast_true(ast_variable_retrieve(cfg, "general", "priorityjumping")), AST_OPT_FLAG_PRIORITY_JUMPING);
 
 	if ((cxt = ast_variable_retrieve(cfg, "general", "userscontext"))) 
 		ast_copy_string(userscontext, cxt, sizeof(userscontext));