From 4c362acb8fe8150491a88b16e050cbd29a090647 Mon Sep 17 00:00:00 2001
From: mpmc <markc@markc.net>
Date: Tue, 27 Jun 2023 17:26:39 +0100
Subject: [PATCH] ast: cleanup

---
 asterisk/conf/extensions.conf | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/asterisk/conf/extensions.conf b/asterisk/conf/extensions.conf
index ffbb533..c70ee38 100644
--- a/asterisk/conf/extensions.conf
+++ b/asterisk/conf/extensions.conf
@@ -5,16 +5,8 @@
 ; First, some safeguards against abuse of the built-in contexts.
 [default]
 exten => s,1,Verbose(1, "INFO ${CALLERID(num)} was passed to default.")
- same => n,Wait(1)
- same => n,Answer(1)
- same => n,Goto(s-info,1)
  same => n,Hangup(3)
 
-exten => s-info,1,PlayTones(info)
- same => n,Playback(hangup-try-again)
- same => n,Wait(1)
- same => n,Playback(hangup-try-again)
-
 [globals]
 
 ; trunk caller IDs.
@@ -35,7 +27,7 @@ exten => s,1,Queue(${QUEUE_ONE},nr,,,50)
 
 
 [outbound-one]
-exten => _X.,1,Verbose(1, "OUTBOUND TRUNK ONE ${TRUNK_ONE_CID}")
+exten => _X.,1,Verbose(1, "INFO: using ${TRUNK_ONE_CID} for call to ${EXTEN}.")
  same => n,Set(CALLERID(all)=${TRUNK_ONE_CID})
  same => n,Dial(PJSIP/${EXTEN}@trunk-one)
  same => n,GotoIf($["${DIALSTATUS}"="CONGESTION"]?outbound-two,${EXTEN},1)
@@ -43,7 +35,7 @@ exten => _X.,1,Verbose(1, "OUTBOUND TRUNK ONE ${TRUNK_ONE_CID}")
  same => n,Hangup()
 
 [outbound-two]
-exten => _X.,1,Verbose(1, "OUTBOUND TRUNK TWO ${TRUNK_TWO_CID}")
+exten => _X.,1,Verbose(1, "INFO: using ${TRUNK_TWO_CID} for call to ${EXTEN}.")
  same => n,Set(CALLERID(all)=${TRUNK_TWO_CID})
  same => n,Dial(PJSIP/${EXTEN}@trunk-two)
  same => n,GotoIf($["${DIALSTATUS}"="CONGESTION"]?default,s,1)
@@ -79,7 +71,7 @@ exten = 1571,1,Verbose(1, "${CALLERID(num)} dialed the voicemail feature.")
 
 [from-ext]
 
-exten => 123,1,Goto(default,s,1)
+exten => 123,1,Goto(i,1)
  same => n,Hangup()
 
 exten => 1471,1,Goto(app-lastcallreturn,${EXTEN},1)
@@ -93,6 +85,16 @@ exten => _XX.,1,Goto(outbound-one,${EXTEN},1)
  same => n,GotoIf($["${DIALSTATUS}"="CHANUNAVAIL"]?outbound-two,${EXTEN},1)
  same => n,Hangup()
 
+exten => i,1,Answer(1)
+ same => n,PlayTones(info)
+ same => n,Wait(2)
+ same => n,Playback(cannot-complete-as-dialed&check-number-dial-again)
+ same => n,PlayTones(info)
+ same => n,Wait(1)
+ same => n,Playback(cannot-complete-as-dialed&check-number-dial-again)
+ same => n,PlayTones(info)
+ same => n,Hangup()
+
 [to-ext]
 exten => s,1,Set(DB(lastcaller/${EXTEN})=${CALLERID(num)})
  same => n,Dial(PJSIP/${EXTEN})