Bring all app_rpt and chan_usbradio stuff up to date

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@116731 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 11353 insertions, 3624 deletions

diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index cf64d12d4..fa8a563cb 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -1,7 +1,9 @@
+#define	NEW_ASTERISK
+/* #define OLD_ASTERISK */
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 2002-2005, Jim Dixon, WB6NIL
+ * Copyright (C) 2002-2008, Jim Dixon, WB6NIL
  *
  * Jim Dixon, WB6NIL <jim@lambdatel.com>
  * Serious contributions by Steve RoDgers, WA6ZFT <hwstar@rodgers.sdcoxmail.com>
@@ -16,16 +18,16 @@
  * the GNU General Public License Version 2. See the LICENSE file
  * at the top of the source tree.
  */
-
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.48 06/13/06
+ *  version 0.115 5/12/08 2055 EDT
  * 
  * \author Jim Dixon, WB6NIL <jim@lambdatel.com>
  *
  * \note Serious contributions by Steve RoDgers, WA6ZFT <hwstar@rodgers.sdcoxmail.com>
- * 
+ * \note Steven Henke, W9SH, <w9sh@arrl.net> added a few features here and there.
+ *
  * See http://www.zapatatelephony.org/app_rpt.html
  *
  *
@@ -51,18 +53,43 @@
  *
  * status cmds:
  *
- *  1 - Force ID
- *  2 - Give Time of Day
- *  3 - Give software Version
+ *  1 - Force ID (global)
+ *  2 - Give Time of Day (global)
+ *  3 - Give software Version (global)
+ *  11 - Force ID (local only)
+ *  12 - Give Time of Day (local only)
  *
  * cop (control operator) cmds:
  *
  *  1 - System warm boot
  *  2 - System enable
  *  3 - System disable
- *  4 - Test Tone On
+ *  4 - Test Tone On/Off
  *  5 - Dump System Variables on Console (debug)
  *  6 - PTT (phone mode only)
+ *  7 - Time out timer enable
+ *  8 - Time out timer disable
+ *  9 - Autopatch enable
+ *  10 - Autopatch disable
+ *  11 - Link enable
+ *  12 - Link disable
+ *  13 - Query System State
+ *  14 - Change System State
+ *  15 - Scheduler Enable
+ *  16 - Scheduler Disable
+ *  17 - User functions (time, id, etc) enable
+ *  18 - User functions (time, id, etc) disable
+ *  19 - Select alternate hang timer
+ *  20 - Select standard hang timer 
+ *  21 - Enable Parrot Mode
+ *  22 - Disable Parrot Mode
+ *  23 - Birdbath (Current Parrot Cleanup/Flush)
+ *  24 - Flush all telemetry
+ *  25 - Query last node un-keyed
+ *  26 - Query all nodes keyed/unkeyed
+ *  30 - Recall Memory Setting in Attached Xcvr
+ *  31 - Channel Selector for Parallel Programmed Xcvr
+ *  32 - Touchtone pad test: command + Digit string + # to playback all digits pressed
  *
  * ilink cmds:
  *
@@ -72,6 +99,12 @@
  *  4 - Enter command mode on specified link
  *  5 - System status
  *  6 - Disconnect all links
+ *  11 - Disconnect a previously permanently connected link
+ *  12 - Permanently connect specified link -- monitor only
+ *  13 - Permanently connect specified link -- tranceive
+ *  15 - Full system status (all nodes)
+ *  16 - Reconnect links disconnected with "disconnect all links"
+ *  200 thru 215 - (Send DTMF 0-9,*,#,A-D) (200=0, 201=1, 210=*, etc)
  *
  * remote cmds:
  *
@@ -102,7 +135,10 @@
  *  118 - Scan Up Fast
  *  119 - Transmit allowing auto-tune
  *  140 - Link Status (brief)
+ *  200 thru 215 - (Send DTMF 0-9,*,#,A-D) (200=0, 201=1, 210=*, etc)
  *
+ * playback cmds:
+ *  specify the name of the file to be played (for example, 25=rpt/foo)
  *
  *
  * 'duplex' modes:  (defaults to duplex=2)
@@ -131,14 +167,33 @@
 
 /* maximum digits in DTMF buffer, and seconds after * for DTMF command timeout */
 
+#ifdef OLD_ASTERISK
+#define ast_free free
+#define ast_malloc malloc
+#define ast_strdup strdup
+#endif
+
+
 #define	MAXDTMF 32
 #define	MAXMACRO 2048
-#define	MAXGOSUB 2048
+#define	MAXLINKLIST 512
+#define	LINKLISTTIME 10000
+#define	LINKLISTSHORTTIME 200
+#define	LINKPOSTTIME 30000
+#define	LINKPOSTSHORTTIME 200
+#define	KEYPOSTTIME 30000
+#define	KEYPOSTSHORTTIME 200
 #define	MACROTIME 100
-#define	GOSUBTIME 100
 #define	MACROPTIME 500
-#define	GOSUBPTIME 500
 #define	DTMF_TIMEOUT 3
+#define	KENWOOD_RETRIES 5
+#define	TOPKEYN 32
+#define	TOPKEYWAIT 3
+#define	TOPKEYMAXSTR 30
+
+#define	AUTHTELLTIME 7000
+#define	AUTHTXTIME 1000
+#define	AUTHLOGOUTTIME 25000
 
 #ifdef	__RPT_NOTCH
 #define	MAXFILTERS 10
@@ -146,33 +201,64 @@
 
 #define	DISC_TIME 10000  /* report disc after 10 seconds of no connect */
 #define	MAX_RETRIES 5
+#define	MAX_RETRIES_PERM 1000000000
 
 #define	REDUNDANT_TX_TIME 2000
 
 #define	RETRY_TIMER_MS 5000
 
+#define	PATCH_DIALPLAN_TIMEOUT 1500
+
+#ifdef OLD_ASTERISK
+#define	START_DELAY 10
+#else
+#define	START_DELAY 2
+#endif
+
+#define	RPT_LOCKOUT_SECS 10
+
 #define MAXPEERSTR 31
 #define	MAXREMSTR 15
 
 #define	DELIMCHR ','
 #define	QUOTECHR 34
 
+#define	MONITOR_DISK_BLOCKS_PER_MINUTE 38
+
+#define	DEFAULT_MONITOR_MIN_DISK_BLOCKS 10000
+#define	DEFAULT_REMOTE_INACT_TIMEOUT (15 * 60)
+#define	DEFAULT_REMOTE_TIMEOUT (60 * 60)
+#define	DEFAULT_REMOTE_TIMEOUT_WARNING (3 * 60)
+#define	DEFAULT_REMOTE_TIMEOUT_WARNING_FREQ 30
+
 #define	NODES "nodes"
+#define	EXTNODES "extnodes"
 #define MEMORY "memory"
 #define MACRO "macro"
-#define GOSUB "gosub"
 #define	FUNCTIONS "functions"
 #define TELEMETRY "telemetry"
 #define MORSE "morse"
+#define	TONEMACRO "tonemacro"
 #define	FUNCCHAR '*'
 #define	ENDCHAR '#'
+#define	EXTNODEFILE "/var/lib/asterisk/rpt_extnodes"
+#define	NODENAMES "rpt/nodenames"
+#define	PARROTFILE "/tmp/parrot_%s_%u"
+
+#define	PARROTTIME 1000
 
 #define	DEFAULT_IOBASE 0x378
 
+#define	DEFAULT_CIV_ADDR 0x58
+
 #define	MAXCONNECTTIME 5000
 
 #define MAXNODESTR 300
 
+#define MAXNODELEN 16
+
+#define MAXIDENTLEN 32
+
 #define MAXPATCHCONTEXT 100
 
 #define ACTIONSIZE 32
@@ -181,69 +267,122 @@
 
 #define REM_SCANTIME 100
 
+#define	DTMF_LOCAL_TIME 250
+#define	DTMF_LOCAL_STARTTIME 500
 
-enum {REM_OFF, REM_MONITOR, REM_TX};
+#define	IC706_PL_MEMORY_OFFSET 50
 
-enum {ID, PROC, TERM, COMPLETE, UNKEY, REMDISC, REMALREADY, REMNOTFOUND, REMGO,
-	CONNECTED, CONNFAIL, STATUS, TIMEOUT, ID1, STATS_TIME,
+#define	VOX_ON_DEBOUNCE_COUNT 3
+#define	VOX_OFF_DEBOUNCE_COUNT 20
+#define	VOX_MAX_THRESHOLD 10000.0
+#define	VOX_MIN_THRESHOLD 3000.0
+#define	VOX_TIMEOUT_MS 5000
+#define	VOX_RECOVER_MS 500
+#define	SIMPLEX_PATCH_DELAY 25
+#define	SIMPLEX_PHONE_DELAY 25
+
+#define	STATPOST_PROGRAM "/usr/bin/wget,-q,--output-document=/dev/null,--no-check-certificate"
+
+#define	ALLOW_LOCAL_CHANNELS
+
+enum {REM_OFF,REM_MONITOR,REM_TX};
+
+enum{ID,PROC,TERM,COMPLETE,UNKEY,REMDISC,REMALREADY,REMNOTFOUND,REMGO,
+	CONNECTED,CONNFAIL,STATUS,TIMEOUT,ID1, STATS_TIME, PLAYBACK,
 	STATS_VERSION, IDTALKOVER, ARB_ALPHA, TEST_TONE, REV_PATCH,
-	TAILMSG, MACRO_NOTFOUND, GOSUB_NOTFOUND, MACRO_BUSY, GOSUB_BUSY, LASTNODEKEY};
+	TAILMSG, MACRO_NOTFOUND, MACRO_BUSY, LASTNODEKEY, FULLSTATUS,
+	MEMNOTFOUND, INVFREQ, REMMODE, REMLOGIN, REMXXX, REMSHORTSTATUS,
+	REMLONGSTATUS, LOGINREQ, SCAN, SCANSTAT, TUNE, SETREMOTE, TOPKEY,
+	TIMEOUT_WARNING, ACT_TIMEOUT_WARNING, LINKUNKEY, UNAUTHTX, PARROT,
+	STATS_TIME_LOCAL};
 
-enum {REM_SIMPLEX, REM_MINUS, REM_PLUS};
 
-enum {REM_LOWPWR, REM_MEDPWR, REM_HIPWR};
+enum {REM_SIMPLEX,REM_MINUS,REM_PLUS};
 
-enum {DC_INDETERMINATE, DC_REQ_FLUSH, DC_ERROR, DC_COMPLETE, DC_DOKEY};
+enum {REM_LOWPWR,REM_MEDPWR,REM_HIPWR};
 
-enum {SOURCE_RPT, SOURCE_LNK, SOURCE_RMT, SOURCE_PHONE, SOURCE_DPHONE};
+enum {DC_INDETERMINATE, DC_REQ_FLUSH, DC_ERROR, DC_COMPLETE, DC_COMPLETEQUIET, DC_DOKEY};
 
-enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM};
+enum {SOURCE_RPT, SOURCE_LNK, SOURCE_RMT, SOURCE_PHONE, SOURCE_DPHONE, SOURCE_ALT};
 
-enum {REM_MODE_FM, REM_MODE_USB, REM_MODE_LSB, REM_MODE_AM};
+enum {DLY_TELEM, DLY_ID, DLY_UNKEY, DLY_CALLTERM, DLY_COMP, DLY_LINKUNKEY, DLY_PARROT};
 
-enum {HF_SCAN_OFF, HF_SCAN_DOWN_SLOW, HF_SCAN_DOWN_QUICK,
-	HF_SCAN_DOWN_FAST, HF_SCAN_UP_SLOW, HF_SCAN_UP_QUICK, HF_SCAN_UP_FAST};
+enum {REM_MODE_FM,REM_MODE_USB,REM_MODE_LSB,REM_MODE_AM};
+
+enum {HF_SCAN_OFF,HF_SCAN_DOWN_SLOW,HF_SCAN_DOWN_QUICK,
+      HF_SCAN_DOWN_FAST,HF_SCAN_UP_SLOW,HF_SCAN_UP_QUICK,HF_SCAN_UP_FAST};
 
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include <search.h>
+#include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 #include <dirent.h>
 #include <ctype.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/io.h>
+#include <sys/vfs.h>
 #include <math.h>
+#ifdef OLD_ASTERISK
+#include <linux/zaptel.h>
+#include <tonezone.h>
+#else
+#include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
+#endif
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
+#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/callerid.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
 #include "asterisk/features.h"
+#include "asterisk/options.h"
 #include "asterisk/cli.h"
 #include "asterisk/config.h"
 #include "asterisk/say.h"
 #include "asterisk/localtime.h"
-#include "asterisk/app.h"
+#include "asterisk/cdr.h"
+#include "asterisk/options.h"
+#include "asterisk/manager.h"
+#include <termios.h>
+
+#ifdef	NEW_ASTERISK
+struct ast_flags config_flags = { CONFIG_FLAG_WITHCOMMENTS };
+#endif
+
 
-#include "asterisk/zapata.h"
+/* Start a tone-list going */
+int ast_playtones_start(struct ast_channel *chan, int vol, const char* tonelist, int interruptible);
+/*! Stop the tones from playing */
+void ast_playtones_stop(struct ast_channel *chan);
+
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.115  5/12/2008";
 
 static char *app = "Rpt";
 
 static char *synopsis = "Radio Repeater/Remote Base Control System";
 
 static char *descrip = 
-"  Rpt(nodename[,options]):  Radio Remote Link or Remote Base Link Endpoint Process.\n"
+"  Rpt(nodename[|options][|M][|*]):  \n"
+"    Radio Remote Link or Remote Base Link Endpoint Process.\n"
 "\n"
 "    Not specifying an option puts it in normal endpoint mode (where source\n"
 "    IP and nodename are verified).\n"
@@ -254,7 +393,7 @@ static char *descrip =
 "            this if you have checked security already (like with an IAX2\n"
 "            user/password or something).\n"
 "\n"
-"        Rannounce-string[,timeout[,timeout-destination]] - Amateur Radio\n"
+"        Rannounce-string[|timeout[|timeout-destination]] - Amateur Radio\n"
 "            Reverse Autopatch. Caller is put on hold, and announcement (as\n"
 "            specified by the 'announce-string') is played on radio system.\n"
 "            Users of radio system can access autopatch, dial specified\n"
@@ -275,17 +414,66 @@ static char *descrip =
 "            this mode), the 'dphone_functions' parameter must be specified\n"
 "            for the node in 'rpt.conf'. Otherwise no DTMF control will be\n"
 "            available to the phone user.\n"
+"\n"
+"        S - Simplex Dumb Phone Control mode. This allows a regular phone user\n"
+"            audio-only access to the radio system. In this mode, the\n"
+"            transmitter is toggled on and off when the phone user presses the\n"
+"            funcchar (*) key on the telephone set. In addition, the transmitter\n"
+"            will turn off if the endchar (#) key is pressed. When a user first\n"
+"            calls in, the transmitter will be off, and the user can listen for\n"
+"            radio traffic. When the user wants to transmit, they press the *\n" 
+"            key, start talking, then press the * key again or the # key to turn\n"
+"            the transmitter off.  No other functions can be executed by the\n"
+"            user on the phone when this mode is selected. Note: If your\n"
+"            radio system is full-duplex, we recommend using either P or D\n"
+"            modes as they provide more flexibility.\n"
+"\n"
+"        q - Query Status. Sets channel variables and returns + 101 in plan.\n"
+"\n"
+"        M - Memory Channel Steer as MXX where XX is the memory channel number.\n"
+"\n"
+"        * - Alt Macro to execute (e.g. *7 for status)\n"
 "\n";
+;
 
-static unsigned int vmajor = 0;
-static unsigned int vminor = 47;
-
-static int debug = 0;  /* FIXME Set this >0 for extra debug output */
+static int debug = 0;  /* Set this >0 for extra debug output */
 static int nrpts = 0;
 
+static char remdtmfstr[] = "0123456789*#ABCD";
+
+enum {TOP_TOP,TOP_WON,WON_BEFREAD,BEFREAD_AFTERREAD};
+
+int max_chan_stat [] = {22000,1000,22000,100,22000,2000,22000};
+
+#define NRPTSTAT 7
+
+struct rpt_chan_stat
+{
+	struct timeval last;
+	long long total;
+	unsigned long count;
+	unsigned long largest;
+	struct timeval largest_time;
+};
+
 char *discstr = "!!DISCONNECT!!";
-static char *remote_rig_ft897 = "ft897";
-static char *remote_rig_rbi = "rbi";
+char *newkeystr = "!NEWKEY!";
+static char *remote_rig_ft897="ft897";
+static char *remote_rig_rbi="rbi";
+static char *remote_rig_kenwood="kenwood";
+static char *remote_rig_tm271="tm271";
+static char *remote_rig_ic706="ic706";
+static char *remote_rig_rtx150="rtx150";
+static char *remote_rig_rtx450="rtx450";
+static char *remote_rig_ppp16="ppp16";	  		// parallel port programmable 16 channels
+
+#define ISRIG_RTX(x) ((!strcmp(x,remote_rig_rtx150)) || (!strcmp(x,remote_rig_rtx450)))
+#define	IS_XPMR(x) (!strncasecmp(x->rxchanname,"rad",3))
+
+#ifdef	OLD_ASTERISK
+STANDARD_LOCAL_USER;
+LOCAL_USER_DECL;
+#endif
 
 #define	MSWAIT 200
 #define	HANGTIME 5000
@@ -296,9 +484,44 @@ static char *remote_rig_rbi = "rbi";
 #define POLITEID 30000
 #define FUNCTDELAY 1500
 
-static  pthread_t rpt_master_thread;
+#define	MAXXLAT 20
+#define	MAXXLATTIME 3
+
+#define MAX_SYSSTATES 10
+
+struct vox {
+	float	speech_energy;
+	float	noise_energy;
+	int	enacount;
+	char	voxena;
+	char	lastvox;
+	int	offdebcnt;
+	int	ondebcnt;
+} ;
+
+#define	mymax(x,y) ((x > y) ? x : y)
+#define	mymin(x,y) ((x < y) ? x : y)
+
+struct rpt_topkey
+{
+char	node[TOPKEYMAXSTR];
+int	timesince;
+int	keyed;
+} ;
 
-struct timeval cancel_atimeout = { 0, 0 };
+struct rpt_xlat
+{
+char	funccharseq[MAXXLAT];
+char	endcharseq[MAXXLAT];
+char	passchars[MAXXLAT];
+int	funcindex;
+int	endindex;
+time_t	lastone;
+} ;
+
+static time_t	starttime = 0;
+
+static  pthread_t rpt_master_thread;
 
 struct rpt;
 
@@ -309,11 +532,17 @@ struct rpt_link
 	char	mode;			/* 1 if in tx mode */
 	char	isremote;
 	char	phonemode;
+	char	phonevox;		/* vox the phone */
 	char	name[MAXNODESTR];	/* identifier (routing) string */
 	char	lasttx;
+	char	lasttx1;
 	char	lastrx;
+	char	lastrealrx;
+	char	lastrx1;
 	char	connected;
 	char	hasconnected;
+	char	perma;
+	char	thisconnected;
 	char	outbound;
 	char	disced;
 	char	killme;
@@ -321,11 +550,31 @@ struct rpt_link
 	long	disctime;
 	long 	retrytimer;
 	long	retxtimer;
+	long	rerxtimer;
 	int	retries;
+	int	max_retries;
 	int	reconnects;
 	long long connecttime;
 	struct ast_channel *chan;	
 	struct ast_channel *pchan;	
+	char	linklist[MAXLINKLIST];
+	time_t	linklistreceived;
+	long	linklisttimer;
+	int	dtmfed;
+	int linkunkeytocttimer;
+	struct timeval lastlinktv;
+	struct	ast_frame *lastf1,*lastf2;
+	struct	rpt_chan_stat chan_stat[NRPTSTAT];
+	struct vox vox;
+	char wasvox;
+	int voxtotimer;
+	char voxtostate;
+	char newkey;
+#ifdef OLD_ASTERISK
+        AST_LIST_HEAD(, ast_frame) rxq;
+#else
+	AST_LIST_HEAD_NOLOCK(, ast_frame) rxq;
+#endif
 } ;
 
 struct rpt_lstat
@@ -337,7 +586,9 @@ struct rpt_lstat
 	char	mode;
 	char	outbound;
 	char	reconnects;
+	char	thisconnected;
 	long long	connecttime;
+	struct	rpt_chan_stat chan_stat[NRPTSTAT];
 } ;
 
 struct rpt_tele
@@ -349,6 +600,8 @@ struct rpt_tele
 	int	mode;
 	struct rpt_link mylink;
 	char param[TELEPARAMSIZE];
+	int	submode;
+	unsigned int parrot;
 	pthread_t threadid;
 } ;
 
@@ -374,85 +627,163 @@ struct telem_defaults
 } ;
 
 
+struct sysstate
+{
+	char txdisable;
+	char totdisable;
+	char linkfundisable;
+	char autopatchdisable;
+	char schedulerdisable;
+	char userfundisable;
+	char alternatetail;
+};
+
+/* rpt cmd support */
+#define CMD_DEPTH 1
+#define CMD_STATE_IDLE 0
+#define CMD_STATE_BUSY 1
+#define CMD_STATE_READY 2
+#define CMD_STATE_EXECUTING 3
+
+struct rpt_cmd_struct
+{
+    int state;
+    int functionNumber;
+    char param[MAXDTMF];
+    char digits[MAXDTMF];
+    int command_source;
+};
+
 static struct rpt
 {
 	ast_mutex_t lock;
+	ast_mutex_t remlock;
+	ast_mutex_t statpost_lock;
 	struct ast_config *cfg;
 	char reload;
+	char xlink;		 							// cross link state of a share repeater/remote radio
+	unsigned int statpost_seqno;
 
 	char *name;
 	char *rxchanname;
 	char *txchanname;
-	char *remote;
+	char remote;
+	char *remoterig;
+	struct	rpt_chan_stat chan_stat[NRPTSTAT];
+	unsigned int scram;
 
 	struct {
-		char ourcontext[80];
-		char ourcallerid[80];
-		char acctcode[21];
-		char ident[80];
-		char tonezone[80];
+		char *ourcontext;
+		char *ourcallerid;
+		char *acctcode;
+		char *ident;
+		char *tonezone;
 		char simple;
-		char functions[80];
-		char link_functions[80];
-		char phone_functions[80];
-		char dphone_functions[80];
-		char nodes[80];
+		char *functions;
+		char *link_functions;
+		char *phone_functions;
+		char *dphone_functions;
+		char *alt_functions;
+		char *nodes;
+		char *extnodes;
+		char *extnodefile;
 		int hangtime;
+		int althangtime;
 		int totime;
 		int idtime;
 		int tailmessagetime;
 		int tailsquashedtime;
 		int duplex;
 		int politeid;
-		char *tailmsgbuf;
-		AST_DECLARE_APP_ARGS(tailmsg,
-			AST_APP_ARG(msgs)[100];
-		);
-		char memory[80];
-		char macro[80];
-		char gosub[80];
-		char startupmacro[80];
-		char startupgosub[80];
+		char *tailmessages[500];
+		int tailmessagemax;
+		char	*memory;
+		char	*macro;
+		char	*tonemacro;
+		char	*startupmacro;
 		int iobase;
+		char *ioport;
 		char funcchar;
 		char endchar;
 		char nobusyout;
+		char notelemtx;
+		char propagate_dtmf;
+		char propagate_phonedtmf;
+		char linktolink;
+		unsigned char civaddr;
+		struct rpt_xlat inxlat;
+		struct rpt_xlat outxlat;
+		char *archivedir;
+		int authlevel;
+		char *csstanzaname;
+		char *skedstanzaname;
+		char *txlimitsstanzaname;
+		long monminblocks;
+		int remoteinacttimeout;
+		int remotetimeout;
+		int remotetimeoutwarning;
+		int remotetimeoutwarningfreq;
+		int sysstate_cur;
+		struct sysstate s[MAX_SYSSTATES];
+		char parrotmode;
+		int parrottime;
+		char *rptnode;
+		char remote_mars;
+		int voxtimeout_ms;
+		int voxrecover_ms;
+		int simplexpatchdelay;
+		int simplexphonedelay;
+		char *statpost_program;
+		char *statpost_url;
 	} p;
 	struct rpt_link links;
 	int unkeytocttimer;
+	time_t lastkeyedtime;
+	time_t lasttxkeyedtime;
 	char keyed;
+	char txkeyed;
 	char exttx;
 	char localtx;
 	char remoterx;
 	char remotetx;
 	char remoteon;
+	char remtxfreqok;
 	char tounkeyed;
 	char tonotify;
-	char enable;
 	char dtmfbuf[MAXDTMF];
 	char macrobuf[MAXMACRO];
-	char gosubbuf[MAXGOSUB];
 	char rem_dtmfbuf[MAXDTMF];
 	char lastdtmfcommand[MAXDTMF];
 	char cmdnode[50];
-	struct ast_channel *rxchannel, *txchannel;
-	struct ast_channel *pchannel, *txpchannel, *remchannel;
+	char nowchan;						// channel now
+	char waschan;						// channel selected initially or by command
+	char bargechan;						// barge in channel
+	char macropatch;					// autopatch via tonemacro state
+	char parrotstate;
+	int  parrottimer;
+	unsigned int parrotcnt;
+	struct ast_channel *rxchannel,*txchannel, *monchannel, *parrotchannel;
+	struct ast_channel *pchannel,*txpchannel, *zaprxchannel, *zaptxchannel;
+	struct ast_channel *voxchannel;
+	struct ast_frame *lastf1,*lastf2;
 	struct rpt_tele tele;
-	struct timeval lasttv, curtv;
-	pthread_t rpt_call_thread, rpt_thread;
-	time_t dtmf_time, rem_dtmf_time, dtmf_time_rem;
-	int tailtimer, totimer, idtimer, txconf, conf, callmode, cidx, scantimer, tmsgtimer, skedtimer;
-	int mustid, tailid;
+	struct timeval lasttv,curtv;
+	pthread_t rpt_call_thread,rpt_thread;
+	time_t dtmf_time,rem_dtmf_time,dtmf_time_rem;
+	int calldigittimer;
+	int tailtimer,totimer,idtimer,txconf,conf,callmode,cidx,scantimer,tmsgtimer,skedtimer;
+	int mustid,tailid;
 	int tailevent;
 	int telemrefcount;
-	int dtmfidx, rem_dtmfidx;
-	int dailytxtime, dailykerchunks, totalkerchunks, dailykeyups, totalkeyups, timeouts;
+	int dtmfidx,rem_dtmfidx;
+	int dailytxtime,dailykerchunks,totalkerchunks,dailykeyups,totalkeyups,timeouts;
 	int totalexecdcommands, dailyexecdcommands;
-	long retxtimer;
+	long	retxtimer;
+	long	rerxtimer;
 	long long totaltxtime;
 	char mydtmf;
 	char exten[AST_MAX_EXTENSION];
-	char freq[MAXREMSTR], rxpl[MAXREMSTR], txpl[MAXREMSTR];
+	char freq[MAXREMSTR],rxpl[MAXREMSTR],txpl[MAXREMSTR];
 	char offset;
 	char powerlevel;
 	char txplon;
@@ -461,16 +792,18 @@ static struct rpt
 	char tunerequest;
 	char hfscanmode;
 	int hfscanstatus;
+	char hfscanstop;
 	char lastlinknode[MAXNODESTR];
-	char stopgen;
+	char savednodes[MAXNODESTR];
+	int stopgen;
 	char patchfarenddisconnect;
 	char patchnoct;
 	char patchquiet;
 	char patchcontext[MAXPATCHCONTEXT];
 	int patchdialtime;
 	int macro_longest;
-	int gosub_longest;
 	int phone_longestfunc;
+	int alt_longestfunc;
 	int dphone_longestfunc;
 	int link_longestfunc;
 	int longestfunc;
@@ -479,31 +812,80 @@ static struct rpt
 	int tailmessagen;
 	time_t disgorgetime;
 	time_t lastthreadrestarttime;
-	long macrotimer;
-	long gosubtimer;
-	char lastnodewhichkeyedusup[MAXNODESTR];
+	long	macrotimer;
+	char	lastnodewhichkeyedusup[MAXNODESTR];
+	int	dtmf_local_timer;
+	char	dtmf_local_str[100];
+	struct ast_filestream *monstream,*parrotstream;
+	char	loginuser[50];
+	char	loginlevel[10];
+	long	authtelltimer;
+	long	authtimer;
+	int iofd;
+	time_t start_time,last_activity_time;
+	char	lasttone[32];
+	struct rpt_tele *active_telem;
+	struct 	rpt_topkey topkey[TOPKEYN];
+	int topkeystate;
+	time_t topkeytime;
+	int topkeylong;
+	struct vox vox;
+	char wasvox;
+	int voxtotimer;
+	char voxtostate;
+	int linkposttimer;			
+	int keyposttimer;			
+	char newkey;
+	char inpadtest;
+#ifdef OLD_ASTERISK
+	AST_LIST_HEAD(, ast_frame) txq;
+#else
+	AST_LIST_HEAD_NOLOCK(, ast_frame) txq;
+#endif
+	char txrealkeyed;
 #ifdef	__RPT_NOTCH
 	struct rptfilter
 	{
-		char desc[100];
-		float x0;
-		float x1;
-		float x2;
-		float y0;
-		float y1;
-		float y2;
-		float gain;
-		float const0;
-		float const1;
-		float const2;
+		char	desc[100];
+		float	x0;
+		float	x1;
+		float	x2;
+		float	y0;
+		float	y1;
+		float	y2;
+		float	gain;
+		float	const0;
+		float	const1;
+		float	const2;
 	} filters[MAXFILTERS];
 #endif
 #ifdef	_MDC_DECODE_H_
 	mdc_decoder_t *mdc;
 	unsigned short lastunit;
 #endif
+	struct rpt_cmd_struct cmdAction;
 } rpt_vars[MAXRPTS];	
 
+struct nodelog {
+struct nodelog *next;
+struct nodelog *prev;
+time_t	timestamp;
+char archivedir[MAXNODESTR];
+char str[MAXNODESTR * 2];
+} nodelog;
+
+static int service_scan(struct rpt *myrpt);
+static int set_mode_ft897(struct rpt *myrpt, char newmode);
+static int set_mode_ic706(struct rpt *myrpt, char newmode);
+static int simple_command_ft897(struct rpt *myrpt, char command);
+static int setrem(struct rpt *myrpt);
+static int setrtx_check(struct rpt *myrpt);
+static int channel_revert(struct rpt *myrpt);
+static int channel_steer(struct rpt *myrpt, char *data);
+
+AST_MUTEX_DEFINE_STATIC(nodeloglock);
+
+AST_MUTEX_DEFINE_STATIC(nodelookuplock);
 
 #ifdef	APP_RPT_LOCK_DEBUG
 
@@ -511,8 +893,8 @@ static struct rpt
 
 #define	MAXLOCKTHREAD 100
 
-#define	rpt_mutex_lock(x)	_rpt_mutex_lock(x, myrpt, __LINE__)
-#define	rpt_mutex_unlock(x)	_rpt_mutex_unlock(x, myrpt, __LINE__)
+#define rpt_mutex_lock(x) _rpt_mutex_lock(x,myrpt,__LINE__)
+#define rpt_mutex_unlock(x) _rpt_mutex_unlock(x,myrpt,__LINE__)
 
 struct lockthread
 {
@@ -531,40 +913,42 @@ struct by_lightning
 	struct lockthread lockthread;
 } lock_ring[32];
 
-
 int lock_ring_index = 0;
 
 AST_MUTEX_DEFINE_STATIC(locklock);
 
 static struct lockthread *get_lockthread(pthread_t id)
 {
-	int	i;
+int	i;
 
-	for (i = 0; i < MAXLOCKTHREAD; i++) {
-		if (lockthreads[i].id == id)
-			return(&lockthreads[i]);
+	for(i = 0; i < MAXLOCKTHREAD; i++)
+	{
+		if (lockthreads[i].id == id) return(&lockthreads[i]);
 	}
-	return NULL;
+	return(NULL);
 }
 
 static struct lockthread *put_lockthread(pthread_t id)
 {
-	int	i;
+int	i;
 
-	for (i = 0; i < MAXLOCKTHREAD; i++) {
+	for(i = 0; i < MAXLOCKTHREAD; i++)
+	{
 		if (lockthreads[i].id == id)
 			return(&lockthreads[i]);
 	}
-	for (i = 0; i < MAXLOCKTHREAD; i++) {
-		if (!lockthreads[i].id) {
+	for(i = 0; i < MAXLOCKTHREAD; i++)
+	{
+		if (!lockthreads[i].id)
+		{
 			lockthreads[i].lockcount = 0;
 			lockthreads[i].lastlock = 0;
 			lockthreads[i].lastunlock = 0;
 			lockthreads[i].id = id;
-			return &lockthreads[i];
+			return(&lockthreads[i]);
 		}
 	}
-	return NULL;
+	return(NULL);
 }
 
 
@@ -572,10 +956,9 @@ static void rpt_mutex_spew(void)
 {
 	struct by_lightning lock_ring_copy[32];
 	int lock_ring_index_copy;
-	int i, j;
+	int i,j;
 	long long diff;
-	char a[100] = "";
-	struct ast_tm tm;
+	char a[100];
 	struct timeval lasttv;
 
 	ast_mutex_lock(&locklock);
@@ -584,27 +967,30 @@ static void rpt_mutex_spew(void)
 	ast_mutex_unlock(&locklock);
 
 	lasttv.tv_sec = lasttv.tv_usec = 0;
-	for (i = 0; i < 32; i++) {
+	for(i = 0 ; i < 32 ; i++)
+	{
 		j = (i + lock_ring_index_copy) % 32;
-		ast_strftime(a, sizeof(a) - 1, "%m/%d/%Y %H:%M:%S",
-			ast_localtime(&lock_ring_copy[j].tv, &tm, NULL));
+		strftime(a,sizeof(a) - 1,"%m/%d/%Y %H:%M:%S",
+			localtime(&lock_ring_copy[j].tv.tv_sec));
 		diff = 0;
-		if (lasttv.tv_sec) {
-			diff = (lock_ring_copy[j].tv.tv_sec - lasttv.tv_sec) * 1000000;
+		if(lasttv.tv_sec)
+		{
+			diff = (lock_ring_copy[j].tv.tv_sec - lasttv.tv_sec)
+				* 1000000;
 			diff += (lock_ring_copy[j].tv.tv_usec - lasttv.tv_usec);
 		}
 		lasttv.tv_sec = lock_ring_copy[j].tv.tv_sec;
 		lasttv.tv_usec = lock_ring_copy[j].tv.tv_usec;
-		if (!lock_ring_copy[j].tv.tv_sec)
-			continue;
-		if (lock_ring_copy[j].line < 0) {
-			ast_log(LOG_NOTICE, "LOCKDEBUG [#%d] UNLOCK app_rpt.c:%d node %s pid %x diff %lld us at %s.%06d\n",
-				i - 31, -lock_ring_copy[j].line, lock_ring_copy[j].rpt->name,
-				(int) lock_ring_copy[j].lockthread.id, diff, a, (int)lock_ring_copy[j].tv.tv_usec);
-		} else {
-			ast_log(LOG_NOTICE, "LOCKDEBUG [#%d] LOCK app_rpt.c:%d node %s pid %x diff %lld us at %s.%06d\n",
-				i - 31, lock_ring_copy[j].line, lock_ring_copy[j].rpt->name,
-				(int) lock_ring_copy[j].lockthread.id, diff, a, (int)lock_ring_copy[j].tv.tv_usec);
+		if (!lock_ring_copy[j].tv.tv_sec) continue;
+		if (lock_ring_copy[j].line < 0)
+		{
+			ast_log(LOG_NOTICE,"LOCKDEBUG [#%d] UNLOCK app_rpt.c:%d node %s pid %x diff %lld us at %s.%06d\n",
+				i - 31,-lock_ring_copy[j].line,lock_ring_copy[j].rpt->name,(int) lock_ring_copy[j].lockthread.id,diff,a,(int)lock_ring_copy[j].tv.tv_usec);
+		}
+		else
+		{
+			ast_log(LOG_NOTICE,"LOCKDEBUG [#%d] LOCK app_rpt.c:%d node %s pid %x diff %lld us at %s.%06d\n",
+				i - 31,lock_ring_copy[j].line,lock_ring_copy[j].rpt->name,(int) lock_ring_copy[j].lockthread.id,diff,a,(int)lock_ring_copy[j].tv.tv_usec);
 		}
 	}
 }
@@ -612,21 +998,22 @@ static void rpt_mutex_spew(void)
 
 static void _rpt_mutex_lock(ast_mutex_t *lockp, struct rpt *myrpt, int line)
 {
-	struct lockthread *t;
-	pthread_t id;
+struct lockthread *t;
+pthread_t id;
 
 	id = pthread_self();
 	ast_mutex_lock(&locklock);
 	t = put_lockthread(id);
-	if (!t) {
+	if (!t)
+	{
 		ast_mutex_unlock(&locklock);
 		return;
 	}
-	if (t->lockcount) {
+	if (t->lockcount)
+	{
 		int lastline = t->lastlock;
 		ast_mutex_unlock(&locklock);
-		ast_log(LOG_NOTICE, "rpt_mutex_lock: Double lock request line %d node %s pid %x, last lock was line %d\n",
-				line, myrpt->name, (int) t->id, lastline);
+		ast_log(LOG_NOTICE,"rpt_mutex_lock: Double lock request line %d node %s pid %x, last lock was line %d\n",line,myrpt->name,(int) t->id,lastline);
 		rpt_mutex_spew();
 		return;
 	}
@@ -634,9 +1021,9 @@ static void _rpt_mutex_lock(ast_mutex_t *lockp, struct rpt *myrpt, int line)
 	t->lockcount = 1;
 	gettimeofday(&lock_ring[lock_ring_index].tv, NULL);
 	lock_ring[lock_ring_index].rpt = myrpt;
-	memcpy(&lock_ring[lock_ring_index].lockthread, t, sizeof(struct lockthread));
+	memcpy(&lock_ring[lock_ring_index].lockthread,t,sizeof(struct lockthread));
 	lock_ring[lock_ring_index++].line = line;
-	if (lock_ring_index == 32)
+	if(lock_ring_index == 32)
 		lock_ring_index = 0;
 	ast_mutex_unlock(&locklock);
 	ast_mutex_lock(lockp);
@@ -645,21 +1032,22 @@ static void _rpt_mutex_lock(ast_mutex_t *lockp, struct rpt *myrpt, int line)
 
 static void _rpt_mutex_unlock(ast_mutex_t *lockp, struct rpt *myrpt, int line)
 {
-	struct lockthread *t;
-	pthread_t id;
+struct lockthread *t;
+pthread_t id;
 
 	id = pthread_self();
 	ast_mutex_lock(&locklock);
 	t = put_lockthread(id);
-	if (!t) {
+	if (!t)
+	{
 		ast_mutex_unlock(&locklock);
 		return;
 	}
-	if (!t->lockcount) {
+	if (!t->lockcount)
+	{
 		int lastline = t->lastunlock;
 		ast_mutex_unlock(&locklock);
-		ast_log(LOG_NOTICE, "rpt_mutex_lock: Double un-lock request line %d node %s pid %x, last un-lock was line %d\n",
-				line, myrpt->name, (int) t->id, lastline);
+		ast_log(LOG_NOTICE,"rpt_mutex_lock: Double un-lock request line %d node %s pid %x, last un-lock was line %d\n",line,myrpt->name,(int) t->id,lastline);
 		rpt_mutex_spew();
 		return;
 	}
@@ -667,9 +1055,9 @@ static void _rpt_mutex_unlock(ast_mutex_t *lockp, struct rpt *myrpt, int line)
 	t->lockcount = 0;
 	gettimeofday(&lock_ring[lock_ring_index].tv, NULL);
 	lock_ring[lock_ring_index].rpt = myrpt;
-	memcpy(&lock_ring[lock_ring_index].lockthread, t, sizeof(struct lockthread));
+	memcpy(&lock_ring[lock_ring_index].lockthread,t,sizeof(struct lockthread));
 	lock_ring[lock_ring_index++].line = -line;
-	if (lock_ring_index == 32)
+	if(lock_ring_index == 32)
 		lock_ring_index = 0;
 	ast_mutex_unlock(&locklock);
 	ast_mutex_unlock(lockp);
@@ -683,25 +1071,205 @@ static void _rpt_mutex_unlock(ast_mutex_t *lockp, struct rpt *myrpt, int line)
 #endif  /* APP_RPT_LOCK_DEBUG */
 
 /*
+* Return 1 if rig is multimode capable
+*/
+
+static int multimode_capable(struct rpt *myrpt)
+{
+	if(!strcmp(myrpt->remoterig, remote_rig_ft897))
+		return 1;
+	if(!strcmp(myrpt->remoterig, remote_rig_ic706))
+		return 1;
+	return 0;
+}	
+
+static void voxinit_rpt(struct rpt *myrpt,char enable)
+{
+
+	myrpt->vox.speech_energy = 0.0;
+	myrpt->vox.noise_energy = 0.0;
+	myrpt->vox.enacount = 0;
+	myrpt->vox.voxena = 0;
+	if (!enable) myrpt->vox.voxena = -1;
+	myrpt->vox.lastvox = 0;
+	myrpt->vox.ondebcnt = VOX_ON_DEBOUNCE_COUNT;
+	myrpt->vox.offdebcnt = VOX_OFF_DEBOUNCE_COUNT;
+	myrpt->wasvox = 0;
+	myrpt->voxtotimer = 0;
+	myrpt->voxtostate = 0;
+}
+
+static void voxinit_link(struct rpt_link *mylink,char enable)
+{
+
+	mylink->vox.speech_energy = 0.0;
+	mylink->vox.noise_energy = 0.0;
+	mylink->vox.enacount = 0;
+	mylink->vox.voxena = 0;
+	if (!enable) mylink->vox.voxena = -1;
+	mylink->vox.lastvox = 0;
+	mylink->vox.ondebcnt = VOX_ON_DEBOUNCE_COUNT;
+	mylink->vox.offdebcnt = VOX_OFF_DEBOUNCE_COUNT;
+	mylink->wasvox = 0;
+	mylink->voxtotimer = 0;
+	mylink->voxtostate = 0;
+}
+
+static int dovox(struct vox *v,short *buf,int bs)
+{
+
+	int i;
+	float	esquare = 0.0;
+	float	energy = 0.0;
+	float	threshold = 0.0;
+	
+	if (v->voxena < 0) return(v->lastvox);
+	for(i = 0; i < bs; i++)
+	{
+		esquare += (float) buf[i] * (float) buf[i];
+	}
+	energy = sqrt(esquare);
+
+	if (energy >= v->speech_energy)
+		v->speech_energy += (energy - v->speech_energy) / 4;
+	else
+		v->speech_energy += (energy - v->speech_energy) / 64;
+
+	if (energy >= v->noise_energy)
+		v->noise_energy += (energy - v->noise_energy) / 64;
+	else
+		v->noise_energy += (energy - v->noise_energy) / 4;
+	
+	if (v->voxena) threshold = v->speech_energy / 8;
+	else
+	{
+		threshold = mymax(v->speech_energy / 16,v->noise_energy * 2);
+		threshold = mymin(threshold,VOX_MAX_THRESHOLD);
+	}
+	threshold = mymax(threshold,VOX_MIN_THRESHOLD);
+	if (energy > threshold)
+	{
+		if (v->voxena) v->noise_energy *= 0.75;
+		v->voxena = 1;
+	} else 	v->voxena = 0;
+	if (v->lastvox != v->voxena)
+	{
+		if (v->enacount++ >= ((v->lastvox) ? v->offdebcnt : v->ondebcnt))
+		{
+			v->lastvox = v->voxena;
+			v->enacount = 0;
+		}
+	} else v->enacount = 0;
+	return(v->lastvox);
+}
+
+
+
+
+/*
 * CLI extensions
 */
 
 /* Debug mode */
-static char *handle_cli_rpt_debug_level(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
-static char *handle_cli_rpt_dump(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
-static char *handle_cli_rpt_stats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
-static char *handle_cli_rpt_lstats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
-static char *handle_cli_rpt_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
-static char *handle_cli_rpt_restart(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
-
-static struct ast_cli_entry cli_rpt[] = {
-	AST_CLI_DEFINE(handle_cli_rpt_debug_level, "Enable app_rpt debuggin"),
-	AST_CLI_DEFINE(handle_cli_rpt_dump,        "Dump app_rpt structs for debugging"),
-	AST_CLI_DEFINE(handle_cli_rpt_stats,       "Dump node statistics"),
-	AST_CLI_DEFINE(handle_cli_rpt_lstats,      "Dump link statistics"),
-	AST_CLI_DEFINE(handle_cli_rpt_reload,      "Reload app_rpt config"),
-	AST_CLI_DEFINE(handle_cli_rpt_restart,     "Restart app_rpt")
-};
+static int rpt_do_debug(int fd, int argc, char *argv[]);
+static int rpt_do_dump(int fd, int argc, char *argv[]);
+static int rpt_do_stats(int fd, int argc, char *argv[]);
+static int rpt_do_lstats(int fd, int argc, char *argv[]);
+static int rpt_do_nodes(int fd, int argc, char *argv[]);
+static int rpt_do_local_nodes(int fd, int argc, char *argv[]);
+static int rpt_do_reload(int fd, int argc, char *argv[]);
+static int rpt_do_restart(int fd, int argc, char *argv[]);
+static int rpt_do_fun(int fd, int argc, char *argv[]);
+static int rpt_do_fun1(int fd, int argc, char *argv[]);
+static int rpt_do_cmd(int fd, int argc, char *argv[]);
+
+static char debug_usage[] =
+"Usage: rpt debug level {0-7}\n"
+"       Enables debug messages in app_rpt\n";
+
+static char dump_usage[] =
+"Usage: rpt dump <nodename>\n"
+"       Dumps struct debug info to log\n";
+
+static char dump_stats[] =
+"Usage: rpt stats <nodename>\n"
+"       Dumps node statistics to console\n";
+
+static char dump_lstats[] =
+"Usage: rpt lstats <nodename>\n"
+"       Dumps link statistics to console\n";
+
+static char dump_nodes[] =
+"Usage: rpt nodes <nodename>\n"
+"       Dumps a list of directly and indirectly connected nodes to the console\n";
+
+static char usage_local_nodes[] =
+"Usage: rpt localnodes\n"
+"       Dumps a list of the locally configured node numbers to the console.\n";
+
+static char reload_usage[] =
+"Usage: rpt reload\n"
+"       Reloads app_rpt running config parameters\n";
+
+static char restart_usage[] =
+"Usage: rpt restart\n"
+"       Restarts app_rpt\n";
+
+static char fun_usage[] =
+"Usage: rpt fun <nodename> <command>\n"
+"       Send a DTMF function to a node\n";
+
+static char cmd_usage[] =
+"Usage: rpt cmd <nodename> <cmd-name> <cmd-index> <cmd-args.\n"
+"       Send a command to a node.\n        i.e. rpt cmd 2000 ilink 3 2001\n";
+
+#ifndef	NEW_ASTERISK
+
+static struct ast_cli_entry  cli_debug =
+        { { "rpt", "debug", "level" }, rpt_do_debug, 
+		"Enable app_rpt debugging", debug_usage };
+
+static struct ast_cli_entry  cli_dump =
+        { { "rpt", "dump" }, rpt_do_dump,
+		"Dump app_rpt structs for debugging", dump_usage };
+
+static struct ast_cli_entry  cli_stats =
+        { { "rpt", "stats" }, rpt_do_stats,
+		"Dump node statistics", dump_stats };
+
+static struct ast_cli_entry  cli_nodes =
+        { { "rpt", "nodes" }, rpt_do_nodes,
+		"Dump node list", dump_nodes };
+
+static struct ast_cli_entry  cli_local_nodes =
+        { { "rpt", "localnodes" }, rpt_do_local_nodes,
+		"Dump list of local node numbers", usage_local_nodes };
+
+static struct ast_cli_entry  cli_lstats =
+        { { "rpt", "lstats" }, rpt_do_lstats,
+		"Dump link statistics", dump_lstats };
+
+static struct ast_cli_entry  cli_reload =
+        { { "rpt", "reload" }, rpt_do_reload,
+		"Reload app_rpt config", reload_usage };
+
+static struct ast_cli_entry  cli_restart =
+        { { "rpt", "restart" }, rpt_do_restart,
+		"Restart app_rpt", restart_usage };
+
+static struct ast_cli_entry  cli_fun =
+        { { "rpt", "fun" }, rpt_do_fun,
+		"Execute a DTMF function", fun_usage };
+
+static struct ast_cli_entry  cli_fun1 =
+        { { "rpt", "fun1" }, rpt_do_fun1,
+		"Execute a DTMF function", fun_usage };
+
+static struct ast_cli_entry  cli_cmd =
+        { { "rpt", "cmd" }, rpt_do_cmd,
+		"Execute a DTMF function", cmd_usage };
+
+#endif
 
 /*
 * Telemetry defaults
@@ -709,25 +1277,30 @@ static struct ast_cli_entry cli_rpt[] = {
 
 
 static struct telem_defaults tele_defs[] = {
-	{"ct1", "|t(350,0,100,3072)(500,0,100,3072)(660,0,100,3072)"},
-	{"ct2", "|t(660,880,150,3072)"},
-	{"ct3", "|t(440,0,150,3072)"},
-	{"ct4", "|t(550,0,150,3072)"},
-	{"ct5", "|t(660,0,150,3072)"},
-	{"ct6", "|t(880,0,150,3072)"},
-	{"ct7", "|t(660,440,150,3072)"},
-	{"ct8", "|t(700,1100,150,3072)"},
-	{"remotemon", "|t(1600,0,75,2048)"},
-	{"remotetx", "|t(2000,0,75,2048)(0,0,75,0)(1600,0,75,2048)"},
-	{"cmdmode", "|t(900,904,200,2048)"},
-	{"functcomplete", "|t(1000,0,100,2048)(0,0,100,0)(1000,0,100,2048)"}
+	{"ct1","|t(350,0,100,3072)(500,0,100,3072)(660,0,100,3072)"},
+	{"ct2","|t(660,880,150,3072)"},
+	{"ct3","|t(440,0,150,3072)"},
+	{"ct4","|t(550,0,150,3072)"},
+	{"ct5","|t(660,0,150,3072)"},
+	{"ct6","|t(880,0,150,3072)"},
+	{"ct7","|t(660,440,150,3072)"},
+	{"ct8","|t(700,1100,150,3072)"},
+	{"remotemon","|t(1600,0,75,2048)"},
+	{"remotetx","|t(2000,0,75,2048)(0,0,75,0)(1600,0,75,2048)"},
+	{"cmdmode","|t(900,904,200,2048)"},
+	{"functcomplete","|t(1000,0,100,2048)(0,0,100,0)(1000,0,100,2048)"}
 } ;
 
 /*
-* Forward decl's - these suppress compiler warnings when funcs coded further down the file than their invocation
+* Forward decl's - these suppress compiler warnings when funcs coded further down the file than thier invokation
 */
 
 static int setrbi(struct rpt *myrpt);
+static int set_ft897(struct rpt *myrpt);
+static int set_ic706(struct rpt *myrpt);
+static int setkenwood(struct rpt *myrpt);
+static int set_tm271(struct rpt *myrpt);
+static int setrbi_check(struct rpt *myrpt);
 
 
 
@@ -742,7 +1315,7 @@ static int function_status(struct rpt *myrpt, char *param, char *digitbuf, int c
 static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink);
 static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink);
 static int function_macro(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink);
-static int function_gosub(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink);
+static int function_playback(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink);
 /*
 * Function table
 */
@@ -755,30 +1328,747 @@ static struct function_table_tag function_table[] = {
 	{"status", function_status},
 	{"remote", function_remote},
 	{"macro", function_macro},
-	{"gosub", function_gosub},
+	{"playback", function_playback}
 } ;
 
+static long diskavail(struct rpt *myrpt)
+{
+struct	statfs statfsbuf;
+
+	if (!myrpt->p.archivedir) return(0);
+	if (statfs(myrpt->p.archivedir,&statfsbuf) == -1)
+	{
+		ast_log(LOG_WARNING,"Cannot get filesystem size for %s node %s\n",
+			myrpt->p.archivedir,myrpt->name);
+		return(-1);
+	}
+	return(statfsbuf.f_bavail);
+}
+
+static void flush_telem(struct rpt *myrpt)
+{
+	struct rpt_tele *telem;
+	if(debug > 2)
+		ast_log(LOG_NOTICE, "flush_telem()!!");
+	rpt_mutex_lock(&myrpt->lock);
+	telem = myrpt->tele.next;
+	while(telem != &myrpt->tele)
+	{
+		if (telem->mode != SETREMOTE) ast_softhangup(telem->chan,AST_SOFTHANGUP_DEV);
+		telem = telem->next;
+	}
+	rpt_mutex_unlock(&myrpt->lock);
+}
+/*
+	return via error priority
+*/
+static int priority_jump(struct rpt *myrpt, struct ast_channel *chan)
+{
+	int res=0;
+
+	// if (ast_test_flag(&flags,OPT_JUMP) && ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101) == 0){
+	if (ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101) == 0){
+		res = 0;
+	} else {
+		res = -1;
+	}
+	return res;
+}
+/*
+*/
+static int linkcount(struct rpt *myrpt)
+{
+	struct	rpt_link *l;
+	char *reverse_patch_state;
+ 	int numoflinks;
+
+	reverse_patch_state = "DOWN";
+	numoflinks = 0;
+	l = myrpt->links.next;
+	while(l && (l != &myrpt->links)){
+		if(numoflinks >= MAX_STAT_LINKS){
+			ast_log(LOG_WARNING,
+			"maximum number of links exceeds %d in rpt_do_stats()!",MAX_STAT_LINKS);
+			break;
+		}
+		//if (l->name[0] == '0'){ /* Skip '0' nodes */
+		//	reverse_patch_state = "UP";
+		//	l = l->next;
+		//	continue;
+		//}
+		numoflinks++;
+	 
+		l = l->next;
+	}
+	ast_log(LOG_NOTICE, "numoflinks=%i\n",numoflinks);
+	return numoflinks;
+}
+/*
+ * Retrieve a memory channel
+ * Return 0 if sucessful,
+ * -1 if channel not found,
+ *  1 if parse error
+ */
+static int retreive_memory(struct rpt *myrpt, char *memory)
+{
+	char tmp[30], *s, *s1, *val;
+
+	if (debug)ast_log(LOG_NOTICE, "memory=%s block=%s\n",memory,myrpt->p.memory);
+
+	val = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->p.memory, memory);
+	if (!val){
+		return -1;
+	}			
+	strncpy(tmp,val,sizeof(tmp) - 1);
+	tmp[sizeof(tmp)-1] = 0;
+
+	s = strchr(tmp,',');
+	if (!s)
+		return 1; 
+	*s++ = 0;
+	s1 = strchr(s,',');
+	if (!s1)
+		return 1;
+	*s1++ = 0;
+	strncpy(myrpt->freq, tmp, sizeof(myrpt->freq) - 1);
+	strncpy(myrpt->rxpl, s, sizeof(myrpt->rxpl) - 1);
+	strncpy(myrpt->txpl, s, sizeof(myrpt->rxpl) - 1);
+	myrpt->remmode = REM_MODE_FM;
+	myrpt->offset = REM_SIMPLEX;
+	myrpt->powerlevel = REM_MEDPWR;
+	myrpt->txplon = myrpt->rxplon = 0;
+	while(*s1){
+		switch(*s1++){
+			case 'A':
+			case 'a':
+				strcpy(myrpt->rxpl, "100.0");
+				strcpy(myrpt->txpl, "100.0");
+				myrpt->remmode = REM_MODE_AM;	
+				break;
+			case 'B':
+			case 'b':
+				strcpy(myrpt->rxpl, "100.0");
+				strcpy(myrpt->txpl, "100.0");
+				myrpt->remmode = REM_MODE_LSB;
+				break;
+			case 'F':
+				myrpt->remmode = REM_MODE_FM;
+				break;
+			case 'L':
+			case 'l':
+				myrpt->powerlevel = REM_LOWPWR;
+				break;					
+			case 'H':
+			case 'h':
+				myrpt->powerlevel = REM_HIPWR;
+				break;
+					
+			case 'M':
+			case 'm':
+				myrpt->powerlevel = REM_MEDPWR;
+				break;
+						
+			case '-':
+				myrpt->offset = REM_MINUS;
+				break;
+						
+			case '+':
+				myrpt->offset = REM_PLUS;
+				break;
+						
+			case 'S':
+			case 's':
+				myrpt->offset = REM_SIMPLEX;
+				break;
+						
+			case 'T':
+			case 't':
+				myrpt->txplon = 1;
+				break;
+						
+			case 'R':
+			case 'r':
+				myrpt->rxplon = 1;
+				break;
+
+			case 'U':
+			case 'u':
+				strcpy(myrpt->rxpl, "100.0");
+				strcpy(myrpt->txpl, "100.0");
+				myrpt->remmode = REM_MODE_USB;
+				break;
+			default:
+				return 1;
+		}
+	}
+	return 0;
+}
 /*
-* Match a keyword in a list, and return index of string plus 1 if there was a match,
-* else return 0. If param is passed in non-null, then it will be set to the first character past the match
+
+*/
+static void birdbath(struct rpt *myrpt)
+{
+	struct rpt_tele *telem;
+	if(debug > 2)
+		ast_log(LOG_NOTICE, "birdbath!!");
+	rpt_mutex_lock(&myrpt->lock);
+	telem = myrpt->tele.next;
+	while(telem != &myrpt->tele)
+	{
+		if (telem->mode == PARROT) ast_softhangup(telem->chan,AST_SOFTHANGUP_DEV);
+		telem = telem->next;
+	}
+	rpt_mutex_unlock(&myrpt->lock);
+}
+
+static void do_dtmf_phone(struct rpt *myrpt, struct rpt_link *mylink, char c)
+{
+struct        rpt_link *l;
+
+       l = myrpt->links.next;
+       /* go thru all the links */
+       while(l != &myrpt->links)
+       {
+               if (!l->phonemode)
+               {
+                       l = l->next;
+                       continue;
+               }
+               /* dont send to self */
+               if (mylink && (l == mylink))
+               {
+                       l = l->next;
+                       continue;
+               }
+#ifdef	NEW_ASTERISK
+               if (l->chan) ast_senddigit(l->chan,c,0);
+#else
+               if (l->chan) ast_senddigit(l->chan,c);
+#endif
+               l = l->next;
+       }
+       return;
+}
+
+/* node logging function */
+static void donodelog(struct rpt *myrpt,char *str)
+{
+struct nodelog *nodep;
+char	datestr[100];
+
+	if (!myrpt->p.archivedir) return;
+	nodep = (struct nodelog *)ast_malloc(sizeof(struct nodelog));
+	if (nodep == NULL)
+	{
+		ast_log(LOG_ERROR,"Cannot get memory for node log");
+		return;
+	}
+	time(&nodep->timestamp);
+	strncpy(nodep->archivedir,myrpt->p.archivedir,
+		sizeof(nodep->archivedir) - 1);
+	strftime(datestr,sizeof(datestr) - 1,"%Y%m%d%H%M%S",
+		localtime(&nodep->timestamp));
+	snprintf(nodep->str,sizeof(nodep->str) - 1,"%s %s,%s\n",
+		myrpt->name,datestr,str);
+	ast_mutex_lock(&nodeloglock);
+	insque((struct qelem *) nodep, (struct qelem *) nodelog.prev);
+	ast_mutex_unlock(&nodeloglock);
+}
+
+/* must be called locked */
+static void do_dtmf_local(struct rpt *myrpt, char c)
+{
+int	i;
+char	digit;
+static const char* dtmf_tones[] = {
+	"!941+1336/200,!0/200",	/* 0 */
+	"!697+1209/200,!0/200",	/* 1 */
+	"!697+1336/200,!0/200",	/* 2 */
+	"!697+1477/200,!0/200",	/* 3 */
+	"!770+1209/200,!0/200",	/* 4 */
+	"!770+1336/200,!0/200",	/* 5 */
+	"!770+1477/200,!0/200",	/* 6 */
+	"!852+1209/200,!0/200",	/* 7 */
+	"!852+1336/200,!0/200",	/* 8 */
+	"!852+1477/200,!0/200",	/* 9 */
+	"!697+1633/200,!0/200",	/* A */
+	"!770+1633/200,!0/200",	/* B */
+	"!852+1633/200,!0/200",	/* C */
+	"!941+1633/200,!0/200",	/* D */
+	"!941+1209/200,!0/200",	/* * */
+	"!941+1477/200,!0/200" };	/* # */
+
+
+	if (c)
+	{
+		snprintf(myrpt->dtmf_local_str + strlen(myrpt->dtmf_local_str),sizeof(myrpt->dtmf_local_str) - 1,"%c",c);
+		if (!myrpt->dtmf_local_timer) 
+			 myrpt->dtmf_local_timer = DTMF_LOCAL_STARTTIME;
+	}
+	/* if at timeout */
+	if (myrpt->dtmf_local_timer == 1)
+	{
+		if(debug > 6)
+			ast_log(LOG_NOTICE,"time out dtmf_local_timer=%i\n",myrpt->dtmf_local_timer);
+
+		/* if anything in the string */
+		if (myrpt->dtmf_local_str[0])
+		{
+			digit = myrpt->dtmf_local_str[0];
+			myrpt->dtmf_local_str[0] = 0;
+			for(i = 1; myrpt->dtmf_local_str[i]; i++)
+			{
+				myrpt->dtmf_local_str[i - 1] =
+					myrpt->dtmf_local_str[i];
+			}
+			myrpt->dtmf_local_str[i - 1] = 0;
+			myrpt->dtmf_local_timer = DTMF_LOCAL_TIME;
+			rpt_mutex_unlock(&myrpt->lock);
+			if (digit >= '0' && digit <='9')
+				ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[digit-'0'], 0);
+			else if (digit >= 'A' && digit <= 'D')
+				ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[digit-'A'+10], 0);
+			else if (digit == '*')
+				ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[14], 0);
+			else if (digit == '#')
+				ast_playtones_start(myrpt->txchannel, 0, dtmf_tones[15], 0);
+			else {
+				/* not handled */
+				ast_log(LOG_DEBUG, "Unable to generate DTMF tone '%c' for '%s'\n", digit, myrpt->txchannel->name);
+			}
+			rpt_mutex_lock(&myrpt->lock);
+		}
+		else
+		{
+			myrpt->dtmf_local_timer = 0;
+		}
+	}
+}
+
+static int setdtr(int fd, int enable)
+{
+struct termios mode;
+
+	if (fd < 0) return -1;
+	if (tcgetattr(fd, &mode)) {
+		ast_log(LOG_WARNING, "Unable to get serial parameters for dtr: %s\n", strerror(errno));
+		return -1;
+	}
+	if (enable)
+	{
+		cfsetspeed(&mode, B9600);
+	}
+	else
+	{
+		cfsetspeed(&mode, B0);
+		usleep(100000);
+	}
+	if (tcsetattr(fd, TCSADRAIN, &mode)) {
+		ast_log(LOG_WARNING, "Unable to set serial parameters for dtr: %s\n", strerror(errno));
+		return -1;
+	}
+	if (enable) usleep(100000);
+	return 0;
+}
+
+static int openserial(struct rpt *myrpt,char *fname)
+{
+	struct termios mode;
+	int fd;
+
+	fd = open(fname,O_RDWR);
+	if (fd == -1)
+	{
+		ast_log(LOG_WARNING,"Cannot open serial port %s\n",fname);
+		return -1;
+	}
+	memset(&mode, 0, sizeof(mode));
+	if (tcgetattr(fd, &mode)) {
+		ast_log(LOG_WARNING, "Unable to get serial parameters on %s: %s\n", fname, strerror(errno));
+		return -1;
+	}
+#ifndef	SOLARIS
+	cfmakeraw(&mode);
+#else
+        mode.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP
+                        |INLCR|IGNCR|ICRNL|IXON);
+        mode.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
+        mode.c_cflag &= ~(CSIZE|PARENB|CRTSCTS);
+        mode.c_cflag |= CS8;
+	mode.c_cc[VTIME] = 3;
+	mode.c_cc[VMIN] = 1; 
+#endif
+
+	cfsetispeed(&mode, B9600);
+	cfsetospeed(&mode, B9600);
+	if (tcsetattr(fd, TCSANOW, &mode)) 
+		ast_log(LOG_WARNING, "Unable to set serial parameters on %s: %s\n", fname, strerror(errno));
+	if(!strcmp(myrpt->remoterig, remote_rig_kenwood)) setdtr(fd,0); 
+	usleep(100000);
+	if (debug)ast_log(LOG_NOTICE,"Opened serial port %s\n",fname);
+	return(fd);	
+}
+
+static void mdc1200_notify(struct rpt *myrpt,char *fromnode, unsigned int unit)
+{
+	if (!fromnode)
+	{
+		ast_verbose("Got MDC-1200 ID %04X from local system (%s)\n",
+			unit,myrpt->name);
+	}
+	else
+	{
+		ast_verbose("Got MDC-1200 ID %04X from node %s (%s)\n",
+			unit,fromnode,myrpt->name);
+	}
+}
+
+#ifdef	_MDC_DECODE_H_
+
+static void mdc1200_send(struct rpt *myrpt, unsigned int unit)
+{
+struct rpt_link *l;
+struct	ast_frame wf;
+char	str[200];
+
+
+	sprintf(str,"I %s %04X",myrpt->name,unit);
+
+	wf.frametype = AST_FRAME_TEXT;
+	wf.subclass = 0;
+	wf.offset = 0;
+	wf.mallocd = 0;
+	wf.datalen = strlen(str) + 1;
+	wf.samples = 0;
+
+
+	l = myrpt->links.next;
+	/* otherwise, send it to all of em */
+	while(l != &myrpt->links)
+	{
+		if (l->name[0] == '0') 
+		{
+			l = l->next;
+			continue;
+		}
+		wf.data = str;
+		if (l->chan) ast_write(l->chan,&wf); 
+		l = l->next;
+	}
+	return;
+}
+
+#endif
+
+static char func_xlat(struct rpt *myrpt,char c,struct rpt_xlat *xlat)
+{
+time_t	now;
+int	gotone;
+
+	time(&now);
+	gotone = 0;
+	/* if too much time, reset the skate machine */
+	if ((now - xlat->lastone) > MAXXLATTIME)
+	{
+		xlat->funcindex = xlat->endindex = 0;
+	}
+	if (xlat->funccharseq[0] && (c == xlat->funccharseq[xlat->funcindex++]))
+	{
+		time(&xlat->lastone);
+		gotone = 1;
+		if (!xlat->funccharseq[xlat->funcindex])
+		{
+			xlat->funcindex = xlat->endindex = 0;
+			return(myrpt->p.funcchar);
+		}
+	} else xlat->funcindex = 0;
+	if (xlat->endcharseq[0] && (c == xlat->endcharseq[xlat->endindex++]))
+	{
+		time(&xlat->lastone);
+		gotone = 1;
+		if (!xlat->endcharseq[xlat->endindex])
+		{
+			xlat->funcindex = xlat->endindex = 0;
+			return(myrpt->p.endchar);
+		}
+	} else xlat->endindex = 0;
+	/* if in middle of decode seq, send nothing back */
+	if (gotone) return(0);
+	/* if no pass chars specified, return em all */
+	if (!xlat->passchars[0]) return(c);
+	/* if a "pass char", pass it */
+	if (strchr(xlat->passchars,c)) return(c);
+	return(0);
+}
+
+/*
+ * Return a pointer to the first non-whitespace character
+ */
+
+static char *eatwhite(char *s)
+{
+	while((*s == ' ') || (*s == 0x09)){ /* get rid of any leading white space */
+		if(!*s)
+			break;
+		s++;
+	}
+	return s;
+}
+
+/*
+* Break up a delimited string into a table of substrings
+*
+* str - delimited string ( will be modified )
+* strp- list of pointers to substrings (this is built by this function), NULL will be placed at end of list
+* limit- maximum number of substrings to process
+*/
+	
+
+
+static int finddelim(char *str, char *strp[], int limit)
+{
+int     i,l,inquo;
+
+        inquo = 0;
+        i = 0;
+        strp[i++] = str;
+        if (!*str)
+           {
+                strp[0] = 0;
+                return(0);
+           }
+        for(l = 0; *str && (l < limit) ; str++)
+           {
+                if (*str == QUOTECHR)
+                   {
+                        if (inquo)
+                           {
+                                *str = 0;
+                                inquo = 0;
+                           }
+                        else
+                           {
+                                strp[i - 1] = str + 1;
+                                inquo = 1;
+                           }
+		}
+                if ((*str == DELIMCHR) && (!inquo))
+                {
+                        *str = 0;
+			l++;
+                        strp[i++] = str + 1;
+                }
+           }
+        strp[i] = 0;
+        return(i);
+
+}
+/*
+	send asterisk frame text message on the current tx channel
+*/
+static int send_usb_txt(struct rpt *myrpt, char *txt) 
+{
+	struct ast_frame wf;
+ 
+	if (debug)ast_log(LOG_NOTICE, "send_usb_txt %s\n",txt);
+	wf.frametype = AST_FRAME_TEXT;
+	wf.subclass = 0;
+	wf.offset = 0;
+	wf.mallocd = 0;
+	wf.datalen = strlen(txt) + 1;
+	wf.data = txt;
+	wf.samples = 0;
+	ast_write(myrpt->txchannel,&wf); 
+	return 0;
+}
+/* must be called locked */
+static void __mklinklist(struct rpt *myrpt, struct rpt_link *mylink, char *buf)
+{
+struct rpt_link *l;
+char mode;
+int	i,spos;
+
+	buf[0] = 0; /* clear output buffer */
+	if (myrpt->remote) return;
+	/* go thru all links */
+	for(l = myrpt->links.next; l != &myrpt->links; l = l->next)
+	{
+		/* if is not a real link, ignore it */
+		if (l->name[0] == '0') continue;
+		/* dont count our stuff */
+		if (l == mylink) continue;
+		if (mylink && (!strcmp(l->name,mylink->name))) continue;
+		/* figure out mode to report */
+		mode = 'T'; /* use Tranceive by default */
+		if (!l->mode) mode = 'R'; /* indicate RX for our mode */
+		if (!l->thisconnected) 	mode = 'C'; /* indicate connecting */
+		spos = strlen(buf); /* current buf size (b4 we add our stuff) */
+		if (spos)
+		{
+			strcat(buf,",");
+			spos++;
+		}
+		/* add nodes into buffer */
+		if (l->linklist[0])
+		{
+			snprintf(buf + spos,MAXLINKLIST - spos,
+				"%c%s,%s",mode,l->name,l->linklist);
+		}
+		else /* if no nodes, add this node into buffer */
+		{
+			snprintf(buf + spos,MAXLINKLIST - spos,
+				"%c%s",mode,l->name);
+		}
+		/* if we are in tranceive mode, let all modes stand */
+		if (mode == 'T') continue;
+		/* downgrade everyone on this node if appropriate */
+		for(i = spos; buf[i]; i++)
+		{
+			if (buf[i] == 'T') buf[i] = mode;
+			if ((buf[i] == 'R') && (mode == 'C')) buf[i] = mode;
+		}
+	}
+	return;
+}
+
+/* must be called locked */
+static void __kickshort(struct rpt *myrpt)
+{
+struct rpt_link *l;
+
+	for(l = myrpt->links.next; l != &myrpt->links; l = l->next)
+	{
+		/* if is not a real link, ignore it */
+		if (l->name[0] == '0') continue;
+		l->linklisttimer = LINKLISTSHORTTIME;
+	}
+	myrpt->linkposttimer = LINKPOSTSHORTTIME;
+	return;
+}
+
+static void statpost(struct rpt *myrpt,char *pairs)
+{
+char *str,*astr;
+char *astrs[100];
+int	n,pid;
+time_t	now;
+unsigned int seq;
+
+	if (!myrpt->p.statpost_url) return;
+	str = ast_malloc(strlen(pairs) + strlen(myrpt->p.statpost_url) + 200);
+	astr = ast_strdup(myrpt->p.statpost_program);
+	if ((!str) || (!astr)) return;
+	n = finddelim(astr,astrs,100);
+	if (n < 1) return;
+	ast_mutex_lock(&myrpt->statpost_lock);
+	seq = ++myrpt->statpost_seqno;
+	ast_mutex_unlock(&myrpt->statpost_lock);
+	astrs[n++] = str;
+	astrs[n] = NULL;
+	time(&now);
+	sprintf(str,"%s?node=%s&time=%u&seqno=%u",myrpt->p.statpost_url,
+		myrpt->name,(unsigned int) now,seq);
+	if (pairs) sprintf(str + strlen(str),"&%s",pairs);
+	if (!(pid = fork()))
+	{
+		execv(astrs[0],astrs);
+		ast_log(LOG_ERROR, "exec of %s failed.\n", astrs[0]);
+		perror("asterisk");
+		exit(0);
+	}
+	ast_free(astr);
+	ast_free(str);
+	return;
+}
+
+static char *node_lookup(struct rpt *myrpt,char *digitbuf)
+{
+
+char *val;
+int longestnode,j;
+struct stat mystat;
+static time_t last = 0;
+static struct ast_config *ourcfg = NULL;
+struct ast_variable *vp;
+
+	/* try to look it up locally first */
+	val = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->p.nodes, digitbuf);
+	if (val) return(val);
+	ast_mutex_lock(&nodelookuplock);
+	/* if file does not exist */
+	if (stat(myrpt->p.extnodefile,&mystat) == -1)
+	{
+		if (ourcfg) ast_config_destroy(ourcfg);
+		ourcfg = NULL;
+		ast_mutex_unlock(&nodelookuplock);
+		return(NULL);
+	}
+	/* if we need to reload */
+	if (mystat.st_mtime > last)
+	{
+		if (ourcfg) ast_config_destroy(ourcfg);
+#ifdef	NEW_ASTERISK
+		ourcfg = ast_config_load(myrpt->p.extnodefile,config_flags);
+#else
+		ourcfg = ast_config_load(myrpt->p.extnodefile);
+#endif
+		/* if file not there, just bail */
+		if (!ourcfg)
+		{
+			ast_mutex_unlock(&nodelookuplock);
+			return(NULL);
+		}
+		/* reset "last" time */
+		last = mystat.st_mtime;
+
+		/* determine longest node length again */		
+		longestnode = 0;
+		vp = ast_variable_browse(myrpt->cfg, myrpt->p.nodes);
+		while(vp){
+			j = strlen(vp->name);
+			if (j > longestnode)
+				longestnode = j;
+			vp = vp->next;
+		}
+
+		vp = ast_variable_browse(ourcfg, myrpt->p.extnodes);
+		while(vp){
+			j = strlen(vp->name);
+			if (j > longestnode)
+				longestnode = j;
+			vp = vp->next;
+		}
+
+		myrpt->longestnode = longestnode;
+	}
+	val = NULL;
+	if (ourcfg)
+		val = (char *) ast_variable_retrieve(ourcfg, myrpt->p.extnodes, digitbuf);
+	ast_mutex_unlock(&nodelookuplock);
+	return(val);
+}
+
+/*
+* Match a keyword in a list, and return index of string plus 1 if there was a match,* else return 0.
+* If param is passed in non-null, then it will be set to the first character past the match
 */
 
 static int matchkeyword(char *string, char **param, char *keywords[])
 {
-	int	i, ls;
-	for (i = 0; keywords[i]; i++) {
+int	i,ls;
+	for( i = 0 ; keywords[i] ; i++){
 		ls = strlen(keywords[i]);
-		if (!ls) {
+		if(!ls){
 			*param = NULL;
 			return 0;
 		}
-		if (!strncmp(string, keywords[i], ls)) {
-			if (param)
+		if(!strncmp(string, keywords[i], ls)){
+			if(param)
 				*param = string + ls;
 			return i + 1; 
 		}
 	}
-	param = NULL;
+	*param = NULL;
 	return 0;
 }
 
@@ -789,15 +2079,15 @@ static int matchkeyword(char *string, char **param, char *keywords[])
 
 static char *skipchars(char *string, char *charlist)
 {
-	int i;	
-	while (*string) {
-		for (i = 0; charlist[i] ; i++) {
-			if (*string == charlist[i]) {
+int i;	
+	while(*string){
+		for(i = 0; charlist[i] ; i++){
+			if(*string == charlist[i]){
 				string++;
 				break;
 			}
 		}
-		if (!charlist[i])
+		if(!charlist[i])
 			return string;
 	}
 	return string;
@@ -805,37 +2095,54 @@ static char *skipchars(char *string, char *charlist)
 					
 
 
-static int myatoi(const char *str)
+static int myatoi(char *str)
 {
-	int	ret;
+int	ret;
 
-	if (str == NULL)
-		return -1;
+	if (str == NULL) return -1;
 	/* leave this %i alone, non-base-10 input is useful here */
-	if (sscanf(str, "%i", &ret) != 1)
-		return -1;
+	if (sscanf(str,"%i",&ret) != 1) return -1;
 	return ret;
 }
 
+static int mycompar(const void *a, const void *b)
+{
+char	**x = (char **) a;
+char	**y = (char **) b;
+int	xoff,yoff;
+
+	if ((**x < '0') || (**x > '9')) xoff = 1; else xoff = 0;
+	if ((**y < '0') || (**y > '9')) yoff = 1; else yoff = 0;
+	return(strcmp((*x) + xoff,(*y) + yoff));
+}
+
+static int topcompar(const void *a, const void *b)
+{
+struct rpt_topkey *x = (struct rpt_topkey *) a;
+struct rpt_topkey *y = (struct rpt_topkey *) b;
+
+	return(x->timesince - y->timesince);
+}
 
 #ifdef	__RPT_NOTCH
 
 /* rpt filter routine */
 static void rpt_filter(struct rpt *myrpt, volatile short *buf, int len)
 {
-	int	i, j;
-	struct rptfilter *f;
+int	i,j;
+struct	rptfilter *f;
 
-	for (i = 0; i < len; i++) {
-		for (j = 0; j < MAXFILTERS; j++) {
+	for(i = 0; i < len; i++)
+	{
+		for(j = 0; j < MAXFILTERS; j++)
+		{
 			f = &myrpt->filters[j];
-			if (!*f->desc)
-				continue;
+			if (!*f->desc) continue;
 			f->x0 = f->x1; f->x1 = f->x2;
-			f->x2 = ((float)buf[i]) / f->gain;
-			f->y0 = f->y1; f->y1 = f->y2;
-			f->y2 =   (f->x0 + f->x2)     +  f->const0 * f->x1
-			        + (f->const1 * f->y0) + (f->const2 * f->y1);
+		        f->x2 = ((float)buf[i]) / f->gain;
+		        f->y0 = f->y1; f->y1 = f->y2;
+		        f->y2 =   (f->x0 + f->x2) +   f->const0 * f->x1
+		                     + (f->const1 * f->y0) + (f->const2 * f->y1);
 			buf[i] = (short)f->y2;
 		}
 	}
@@ -843,55 +2150,112 @@ static void rpt_filter(struct rpt *myrpt, volatile short *buf, int len)
 
 #endif
 
-/* Retrieve an int from a config file */
-static int retrieve_astcfgint(struct rpt *myrpt, const char *category, const char *name, int min, int max, int defl)
+
+/*
+ Get the time for the machine's time zone
+ Note: Asterisk requires a copy of localtime
+ in the /etc directory for this to work properly.
+ If /etc/localtime is not present, you will get
+ GMT time! This is especially important on systems
+ running embedded linux distributions as they don't usually
+ have support for locales. 
+
+ If OLD_ASTERISK is defined, then the older localtime_r
+ function will be used. The /etc/localtime file is not
+ required in this case. This provides backward compatibility
+ with Asterisk 1.2 systems.
+
+*/
+
+#ifdef	NEW_ASTERISK
+static void rpt_localtime( time_t * t, struct ast_tm *lt)
 {
-	const char *var = ast_variable_retrieve(myrpt->cfg, category, name);
-	int ret;
+struct timeval tv;
 
-	if (var) {
-		ret = myatoi(var);
-		if (ret < min)
-			ret = min;
-		else if (ret > max)
-			ret = max;
-	} else
-		ret = defl;
-	return ret;
-}
+	tv.tv_sec = *t;
+	tv.tv_usec = 0;
+	ast_localtime(&tv, lt, NULL);
 
+}
 
-static void load_rpt_vars(int n, int init)
+#else
+static void rpt_localtime( time_t * t, struct tm *lt)
 {
-	int	j;
-	struct ast_variable *vp, *var;
-	struct ast_config *cfg;
-	struct ast_flags config_flags = { CONFIG_FLAG_NOCACHE };
-#ifdef	__RPT_NOTCH
-	AST_DECLARE_APP_ARGS(strs,
-		AST_APP_ARG(str)[100];
-	);
+#ifdef OLD_ASTERISK
+	localtime_r(t, lt);
+#else
+	ast_localtime(t, lt, NULL);
+#endif
+}
 #endif
 
-	ast_verb(3, "%s config for repeater %s\n",
-			(init) ? "Loading initial" : "Re-Loading", rpt_vars[n].name);
+
+/* Retrieve an int from a config file */
+                                                                                
+static int retrieve_astcfgint(struct rpt *myrpt,char *category, char *name, int min, int max, int defl)
+{
+        char *var;
+        int ret;
+	char include_zero = 0;
+
+	if(min < 0){ /* If min is negative, this means include 0 as a valid entry */
+		min = -min;
+		include_zero = 1;
+	}           
+                                                                     
+        var = (char *) ast_variable_retrieve(myrpt->cfg, category, name);
+        if(var){
+                ret = myatoi(var);
+		if(include_zero && !ret)
+			return 0;
+                if(ret < min)
+                        ret = min;
+                if(ret > max)
+                        ret = max;
+        }
+        else
+                ret = defl;
+        return ret;
+}
+
+
+static void load_rpt_vars(int n,int init)
+{
+char *this,*val;
+int	i,j,longestnode;
+struct ast_variable *vp;
+struct ast_config *cfg;
+char *strs[100];
+char s1[256];
+static char *cs_keywords[] = {"rptena","rptdis","apena","apdis","lnkena","lnkdis","totena","totdis","skena","skdis",
+				"ufena","ufdis","atena","atdis",NULL};
+
+	if (option_verbose > 2)
+		ast_verbose(VERBOSE_PREFIX_3 "%s config for repeater %s\n",
+			(init) ? "Loading initial" : "Re-Loading",rpt_vars[n].name);
 	ast_mutex_lock(&rpt_vars[n].lock);
-	if (rpt_vars[n].cfg)
-		ast_config_destroy(rpt_vars[n].cfg);
-	cfg = ast_config_load("rpt.conf", config_flags);
+	if (rpt_vars[n].cfg) ast_config_destroy(rpt_vars[n].cfg);
+#ifdef	NEW_ASTERISK
+	cfg = ast_config_load("rpt.conf",config_flags);
+#else
+	cfg = ast_config_load("rpt.conf");
+#endif
 	if (!cfg) {
 		ast_mutex_unlock(&rpt_vars[n].lock);
-		ast_log(LOG_NOTICE, "Unable to open radio repeater configuration rpt.conf.  Radio Repeater disabled.\n");
+ 		ast_log(LOG_NOTICE, "Unable to open radio repeater configuration rpt.conf.  Radio Repeater disabled.\n");
 		pthread_exit(NULL);
 	}
-	rpt_vars[n].cfg = cfg;
-	/* Free previously malloc'ed buffer */
-	if (!init && rpt_vars[n].p.tailmsgbuf)
-		ast_free(rpt_vars[n].p.tailmsgbuf);
-	memset(&rpt_vars[n].p, 0, sizeof(rpt_vars[n].p));
-	if (init) {
-		/* clear all the fields in the structure after 'p' */
-		memset(&rpt_vars[n].p + sizeof(rpt_vars[0].p), 0, sizeof(rpt_vars[0]) - sizeof(rpt_vars[0].p) - offsetof(typeof(rpt_vars[0]), p));
+	rpt_vars[n].cfg = cfg; 
+	this = rpt_vars[n].name;
+ 	memset(&rpt_vars[n].p,0,sizeof(rpt_vars[n].p));
+	if (init)
+	{
+		char *cp;
+		int savearea = (char *)&rpt_vars[n].p - (char *)&rpt_vars[n];
+
+		cp = (char *) &rpt_vars[n].p;
+		memset(cp + sizeof(rpt_vars[n].p),0,
+			sizeof(rpt_vars[n]) - (sizeof(rpt_vars[n].p) + savearea));
 		rpt_vars[n].tele.next = &rpt_vars[n].tele;
 		rpt_vars[n].tele.prev = &rpt_vars[n].tele;
 		rpt_vars[n].rpt_thread = AST_PTHREADT_NULL;
@@ -899,174 +2263,352 @@ static void load_rpt_vars(int n, int init)
 	}
 #ifdef	__RPT_NOTCH
 	/* zot out filters stuff */
-	memset(&rpt_vars[n].filters, 0, sizeof(rpt_vars[n].filters));
+	memset(&rpt_vars[n].filters,0,sizeof(rpt_vars[n].filters));
 #endif
-
-	/* Defaults */
-	ast_copy_string(rpt_vars[n].p.ourcontext, rpt_vars[n].name, sizeof(rpt_vars[n].p.ourcontext));
-	rpt_vars[n].p.hangtime = HANGTIME;
-	rpt_vars[n].p.totime = TOTIME;
-	rpt_vars[n].p.duplex = 2;
-	rpt_vars[n].p.idtime = IDTIME;
-	rpt_vars[n].p.politeid = POLITEID;
-	ast_copy_string(rpt_vars[n].p.memory, MEMORY, sizeof(rpt_vars[n].p.memory));
-	ast_copy_string(rpt_vars[n].p.macro, MACRO, sizeof(rpt_vars[n].p.macro));
-	ast_copy_string(rpt_vars[n].p.gosub, GOSUB, sizeof(rpt_vars[n].p.gosub));
-	rpt_vars[n].p.iobase = DEFAULT_IOBASE;
-	ast_copy_string(rpt_vars[n].p.functions, FUNCTIONS, sizeof(rpt_vars[n].p.functions));
-	rpt_vars[n].p.simple = 1;
-	rpt_vars[n].p.funcchar = FUNCCHAR;
-	rpt_vars[n].p.endchar = ENDCHAR;
-	ast_copy_string(rpt_vars[n].p.nodes, NODES, sizeof(rpt_vars[n].p.nodes));
-
-	for (var = ast_variable_browse(cfg, rpt_vars[n].name); var; var = var->next) {
-		if (!strcmp(var->name, "context")) {
-			ast_copy_string(rpt_vars[n].p.ourcontext, var->value, sizeof(rpt_vars[n].p.ourcontext));
-		} else if (!strcmp(var->name, "callerid")) {
-			ast_copy_string(rpt_vars[n].p.ourcallerid, var->value, sizeof(rpt_vars[n].p.ourcallerid));
-		} else if (!strcmp(var->name, "accountcode")) {
-			ast_copy_string(rpt_vars[n].p.acctcode, var->value, sizeof(rpt_vars[n].p.acctcode));
-		} else if (!strcmp(var->name, "idrecording")) {
-			ast_copy_string(rpt_vars[n].p.ident, var->value, sizeof(rpt_vars[n].p.ident));
-		} else if (!strcmp(var->name, "hangtime")) {
-			rpt_vars[n].p.hangtime = atoi(var->value);
-		} else if (!strcmp(var->name, "totime")) {
-			rpt_vars[n].p.totime = atoi(var->value);
-		} else if (!strcmp(var->name, "tailmessagetime")) {
-			rpt_vars[n].p.tailmessagetime = atoi(var->value);
-			if (rpt_vars[n].p.tailmessagetime < 0)
-				rpt_vars[n].p.tailmessagetime = 0;
-			else if (rpt_vars[n].p.tailmessagetime > 2400000)
-				rpt_vars[n].p.tailmessagetime = 2400000;
-		} else if (!strcmp(var->name, "tailsquashedtime")) {
-			rpt_vars[n].p.tailsquashedtime = atoi(var->value);
-			if (rpt_vars[n].p.tailsquashedtime < 0)
-				rpt_vars[n].p.tailsquashedtime = 0;
-			else if (rpt_vars[n].p.tailsquashedtime > 2400000)
-				rpt_vars[n].p.tailsquashedtime = 2400000;
-		} else if (!strcmp(var->name, "duplex")) {
-			rpt_vars[n].p.duplex = atoi(var->value);
-			if (rpt_vars[n].p.duplex < 0)
-				rpt_vars[n].p.duplex = 0;
-			else if (rpt_vars[n].p.duplex > 4)
-				rpt_vars[n].p.duplex = 4;
-		} else if (!strcmp(var->name, "idtime")) {
-			rpt_vars[n].p.idtime = atoi(var->value);
-			if (rpt_vars[n].p.idtime < 60000)
-				rpt_vars[n].p.idtime = 60000;
-			else if (rpt_vars[n].p.idtime > 2400000)
-				rpt_vars[n].p.idtime = 2400000;
-		} else if (!strcmp(var->name, "politeid")) {
-			rpt_vars[n].p.politeid = atoi(var->value);
-			if (rpt_vars[n].p.politeid < 30000)
-				rpt_vars[n].p.politeid = 30000;
-			else if (rpt_vars[n].p.politeid > 300000)
-				rpt_vars[n].p.politeid = 300000;
-		} else if (!strcmp(var->name, "tonezone")) {
-			ast_copy_string(rpt_vars[n].p.tonezone, var->value, sizeof(rpt_vars[n].p.tonezone));
-		} else if (!strcmp(var->name, "tailmessagelist")) {
-			rpt_vars[n].p.tailmsgbuf = ast_strdup(var->value);
-			AST_STANDARD_APP_ARGS(rpt_vars[n].p.tailmsg, rpt_vars[n].p.tailmsgbuf);
-		} else if (!strcmp(var->name, "memory")) {
-			ast_copy_string(rpt_vars[n].p.memory, var->value, sizeof(rpt_vars[n].p.memory));
-		} else if (!strcmp(var->name, "macro")) {
-			ast_copy_string(rpt_vars[n].p.macro, var->value, sizeof(rpt_vars[n].p.macro));
-		} else if (!strcmp(var->name, "gosub")) {
-			ast_copy_string(rpt_vars[n].p.gosub, var->value, sizeof(rpt_vars[n].p.gosub));
-		} else if (!strcmp(var->name, "startup_macro")) {
-			ast_copy_string(rpt_vars[n].p.startupmacro, var->value, sizeof(rpt_vars[n].p.startupmacro));
-		} else if (!strcmp(var->name, "startup_gosub")) {
-			ast_copy_string(rpt_vars[n].p.startupgosub, var->value, sizeof(rpt_vars[n].p.startupgosub));
-		} else if (!strcmp(var->name, "iobase")) {
-			/* do not use atoi() here, we need to be able to have
-			   the input specified in hex or decimal so we use
-			   sscanf with a %i */
-			if (sscanf(var->value, "%i", &rpt_vars[n].p.iobase) != 1)
-				rpt_vars[n].p.iobase = DEFAULT_IOBASE;
-		} else if (!strcmp(var->name, "functions")) {
-			rpt_vars[n].p.simple = 0;
-			ast_copy_string(rpt_vars[n].p.functions, var->value, sizeof(rpt_vars[n].p.functions));
-		} else if (!strcmp(var->name, "link_functions")) {
-			ast_copy_string(rpt_vars[n].p.link_functions, var->value, sizeof(rpt_vars[n].p.link_functions));
-		} else if (!strcmp(var->name, "phone_functions")) {
-			ast_copy_string(rpt_vars[n].p.phone_functions, var->value, sizeof(rpt_vars[n].p.phone_functions));
-		} else if (!strcmp(var->name, "dphone_functions")) {
-			ast_copy_string(rpt_vars[n].p.dphone_functions, var->value, sizeof(rpt_vars[n].p.dphone_functions));
-		} else if (!strcmp(var->name, "funcchar")) {
-			rpt_vars[n].p.funcchar = *var->value;
-		} else if (!strcmp(var->name, "endchar")) {
-			rpt_vars[n].p.endchar = *var->value;
-		} else if (!strcmp(var->name, "nobusyout")) {
-			rpt_vars[n].p.nobusyout = ast_true(var->value);
-		} else if (!strcmp(var->name, "nodes")) {
-			ast_copy_string(rpt_vars[n].p.nodes, var->value, sizeof(rpt_vars[n].p.nodes));
+	val = (char *) ast_variable_retrieve(cfg,this,"context");
+	if (val) rpt_vars[n].p.ourcontext = val;
+	else rpt_vars[n].p.ourcontext = this;
+	val = (char *) ast_variable_retrieve(cfg,this,"callerid");
+	if (val) rpt_vars[n].p.ourcallerid = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"accountcode");
+	if (val) rpt_vars[n].p.acctcode = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"idrecording");
+	if (val) rpt_vars[n].p.ident = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"hangtime");
+	if (val) rpt_vars[n].p.hangtime = atoi(val);
+		else rpt_vars[n].p.hangtime = HANGTIME;
+	val = (char *) ast_variable_retrieve(cfg,this,"althangtime");
+	if (val) rpt_vars[n].p.althangtime = atoi(val);
+		else rpt_vars[n].p.althangtime = HANGTIME;
+	val = (char *) ast_variable_retrieve(cfg,this,"totime");
+	if (val) rpt_vars[n].p.totime = atoi(val);
+		else rpt_vars[n].p.totime = TOTIME;
+	val = (char *) ast_variable_retrieve(cfg,this,"voxtimeout");
+	if (val) rpt_vars[n].p.voxtimeout_ms = atoi(val);
+		else rpt_vars[n].p.voxtimeout_ms = VOX_TIMEOUT_MS;
+	val = (char *) ast_variable_retrieve(cfg,this,"voxrecover");
+	if (val) rpt_vars[n].p.voxrecover_ms = atoi(val);
+		else rpt_vars[n].p.voxrecover_ms = VOX_RECOVER_MS;
+	val = (char *) ast_variable_retrieve(cfg,this,"simplexpatchdelay");
+	if (val) rpt_vars[n].p.simplexpatchdelay = atoi(val);
+		else rpt_vars[n].p.simplexpatchdelay = SIMPLEX_PATCH_DELAY;
+	val = (char *) ast_variable_retrieve(cfg,this,"simplexphonedelay");
+	if (val) rpt_vars[n].p.simplexphonedelay = atoi(val);
+		else rpt_vars[n].p.simplexphonedelay = SIMPLEX_PHONE_DELAY;
+	val = (char *) ast_variable_retrieve(cfg,this,"statpost_program");
+	if (val) rpt_vars[n].p.statpost_program = val;
+		else rpt_vars[n].p.statpost_program = STATPOST_PROGRAM;
+	rpt_vars[n].p.statpost_url = 
+		(char *) ast_variable_retrieve(cfg,this,"statpost_url");
+	rpt_vars[n].p.tailmessagetime = retrieve_astcfgint(&rpt_vars[n],this, "tailmessagetime", 0, 2400000, 0);		
+	rpt_vars[n].p.tailsquashedtime = retrieve_astcfgint(&rpt_vars[n],this, "tailsquashedtime", 0, 2400000, 0);		
+	rpt_vars[n].p.duplex = retrieve_astcfgint(&rpt_vars[n],this,"duplex",0,4,2);
+	rpt_vars[n].p.idtime = retrieve_astcfgint(&rpt_vars[n],this, "idtime", -60000, 2400000, IDTIME);	/* Enforce a min max including zero */
+	rpt_vars[n].p.politeid = retrieve_astcfgint(&rpt_vars[n],this, "politeid", 30000, 300000, POLITEID); /* Enforce a min max */
+	val = (char *) ast_variable_retrieve(cfg,this,"tonezone");
+	if (val) rpt_vars[n].p.tonezone = val;
+	rpt_vars[n].p.tailmessages[0] = 0;
+	rpt_vars[n].p.tailmessagemax = 0;
+	val = (char *) ast_variable_retrieve(cfg,this,"tailmessagelist");
+	if (val) rpt_vars[n].p.tailmessagemax = finddelim(val, rpt_vars[n].p.tailmessages, 500);
+	val = (char *) ast_variable_retrieve(cfg,this,"memory");
+	if (!val) val = MEMORY;
+	rpt_vars[n].p.memory = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"macro");
+	if (!val) val = MACRO;
+	rpt_vars[n].p.macro = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"tonemacro");
+	if (!val) val = TONEMACRO;
+	rpt_vars[n].p.tonemacro = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"startup_macro");
+	if (val) rpt_vars[n].p.startupmacro = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"iobase");
+	/* do not use atoi() here, we need to be able to have
+		the input specified in hex or decimal so we use
+		sscanf with a %i */
+	if ((!val) || (sscanf(val,"%i",&rpt_vars[n].p.iobase) != 1))
+		rpt_vars[n].p.iobase = DEFAULT_IOBASE;
+	val = (char *) ast_variable_retrieve(cfg,this,"ioport");
+	rpt_vars[n].p.ioport = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"functions");
+	if (!val)
+		{
+			val = FUNCTIONS;
+			rpt_vars[n].p.simple = 1;
+		} 
+	rpt_vars[n].p.functions = val;
+	val =  (char *) ast_variable_retrieve(cfg,this,"link_functions");
+	if (val) rpt_vars[n].p.link_functions = val;
+	else 
+		rpt_vars[n].p.link_functions = rpt_vars[n].p.functions;
+	val = (char *) ast_variable_retrieve(cfg,this,"phone_functions");
+	if (val) rpt_vars[n].p.phone_functions = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"dphone_functions");
+	if (val) rpt_vars[n].p.dphone_functions = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"alt_functions");
+	if (val) rpt_vars[n].p.alt_functions = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"funcchar");
+	if (!val) rpt_vars[n].p.funcchar = FUNCCHAR; else 
+		rpt_vars[n].p.funcchar = *val;		
+	val = (char *) ast_variable_retrieve(cfg,this,"endchar");
+	if (!val) rpt_vars[n].p.endchar = ENDCHAR; else 
+		rpt_vars[n].p.endchar = *val;		
+	val = (char *) ast_variable_retrieve(cfg,this,"nobusyout");
+	if (val) rpt_vars[n].p.nobusyout = ast_true(val);
+	val = (char *) ast_variable_retrieve(cfg,this,"notelemtx");
+	if (val) rpt_vars[n].p.notelemtx = ast_true(val);
+	val = (char *) ast_variable_retrieve(cfg,this,"propagate_dtmf");
+	if (val) rpt_vars[n].p.propagate_dtmf = ast_true(val);
+	val = (char *) ast_variable_retrieve(cfg,this,"propagate_phonedtmf");
+	if (val) rpt_vars[n].p.propagate_phonedtmf = ast_true(val);
+	val = (char *) ast_variable_retrieve(cfg,this,"linktolink");
+	if (val) rpt_vars[n].p.linktolink = ast_true(val);
+	val = (char *) ast_variable_retrieve(cfg,this,"nodes");
+	if (!val) val = NODES;
+	rpt_vars[n].p.nodes = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"extnodes");
+	if (!val) val = EXTNODES;
+	rpt_vars[n].p.extnodes = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"extnodefile");
+	if (!val) val = EXTNODEFILE;
+	rpt_vars[n].p.extnodefile = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"archivedir");
+	if (val) rpt_vars[n].p.archivedir = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"authlevel");
+	if (val) rpt_vars[n].p.authlevel = atoi(val); 
+	else rpt_vars[n].p.authlevel = 0;
+	val = (char *) ast_variable_retrieve(cfg,this,"parrot");
+	if (val) rpt_vars[n].p.parrotmode = ast_true(val) * 2;
+	else rpt_vars[n].p.parrotmode = 0;
+	val = (char *) ast_variable_retrieve(cfg,this,"parrottime");
+	if (val) rpt_vars[n].p.parrottime = atoi(val); 
+	else rpt_vars[n].p.parrottime = PARROTTIME;
+	val = (char *) ast_variable_retrieve(cfg,this,"rptnode");
+	rpt_vars[n].p.rptnode = val;
+	val = (char *) ast_variable_retrieve(cfg,this,"mars");
+	if (val) rpt_vars[n].p.remote_mars = atoi(val); 
+	else rpt_vars[n].p.remote_mars = 0;
+	val = (char *) ast_variable_retrieve(cfg,this,"monminblocks");
+	if (val) rpt_vars[n].p.monminblocks = atol(val); 
+	else rpt_vars[n].p.monminblocks = DEFAULT_MONITOR_MIN_DISK_BLOCKS;
+	val = (char *) ast_variable_retrieve(cfg,this,"remote_inact_timeout");
+	if (val) rpt_vars[n].p.remoteinacttimeout = atoi(val); 
+	else rpt_vars[n].p.remoteinacttimeout = DEFAULT_REMOTE_INACT_TIMEOUT;
+	val = (char *) ast_variable_retrieve(cfg,this,"civaddr");
+	if (val) rpt_vars[n].p.civaddr = atoi(val); 
+	else rpt_vars[n].p.civaddr = DEFAULT_CIV_ADDR;
+	val = (char *) ast_variable_retrieve(cfg,this,"remote_timeout");
+	if (val) rpt_vars[n].p.remotetimeout = atoi(val); 
+	else rpt_vars[n].p.remotetimeout = DEFAULT_REMOTE_TIMEOUT;
+	val = (char *) ast_variable_retrieve(cfg,this,"remote_timeout_warning");
+	if (val) rpt_vars[n].p.remotetimeoutwarning = atoi(val); 
+	else rpt_vars[n].p.remotetimeoutwarning = DEFAULT_REMOTE_TIMEOUT_WARNING;
+	val = (char *) ast_variable_retrieve(cfg,this,"remote_timeout_warning_freq");
+	if (val) rpt_vars[n].p.remotetimeoutwarningfreq = atoi(val); 
+	else rpt_vars[n].p.remotetimeoutwarningfreq = DEFAULT_REMOTE_TIMEOUT_WARNING_FREQ;
 #ifdef	__RPT_NOTCH
-		} else if (!strcmp(var->name, "rxnotch")) {
-			char *tmp = ast_strdupa(val);
-			AST_STANDARD_APP_ARGS(strs, tmp);
-			strs.argc &= ~1; /* force an even number, rounded down */
-			if (strs.argc >= 2) {
-				for (j = 0; j < strs.argc; j += 2) {
-					rpt_mknotch(atof(strs.str[j]), atof(strs.str[j + 1]),
-						&rpt_vars[n].filters[j >> 1].gain,
-						&rpt_vars[n].filters[j >> 1].const0,
-						&rpt_vars[n].filters[j >> 1].const1,
-						&rpt_vars[n].filters[j >> 1].const2);
-					sprintf(rpt_vars[n].filters[j >> 1].desc, "%s Hz, BW = %s",
-						strs.str[j], strs.str[j + 1]);
-				}
-			}
-#endif
+	val = (char *) ast_variable_retrieve(cfg,this,"rxnotch");
+	if (val) {
+		i = finddelim(val,strs,MAXFILTERS * 2);
+		i &= ~1; /* force an even number, rounded down */
+		if (i >= 2) for(j = 0; j < i; j += 2)
+		{
+			rpt_mknotch(atof(strs[j]),atof(strs[j + 1]),
+			  &rpt_vars[n].filters[j >> 1].gain,
+			    &rpt_vars[n].filters[j >> 1].const0,
+				&rpt_vars[n].filters[j >> 1].const1,
+				    &rpt_vars[n].filters[j >> 1].const2);
+			sprintf(rpt_vars[n].filters[j >> 1].desc,"%s Hz, BW = %s",
+				strs[j],strs[j + 1]);
 		}
+
 	}
+#endif
+	val = (char *) ast_variable_retrieve(cfg,this,"inxlat");
+	if (val) {
+		memset(&rpt_vars[n].p.inxlat,0,sizeof(struct rpt_xlat));
+		i = finddelim(val,strs,3);
+		if (i) strncpy(rpt_vars[n].p.inxlat.funccharseq,strs[0],MAXXLAT - 1);
+		if (i > 1) strncpy(rpt_vars[n].p.inxlat.endcharseq,strs[1],MAXXLAT - 1);
+		if (i > 2) strncpy(rpt_vars[n].p.inxlat.passchars,strs[2],MAXXLAT - 1);
+	}
+	val = (char *) ast_variable_retrieve(cfg,this,"outxlat");
+	if (val) {
+		memset(&rpt_vars[n].p.outxlat,0,sizeof(struct rpt_xlat));
+		i = finddelim(val,strs,3);
+		if (i) strncpy(rpt_vars[n].p.outxlat.funccharseq,strs[0],MAXXLAT - 1);
+		if (i > 1) strncpy(rpt_vars[n].p.outxlat.endcharseq,strs[1],MAXXLAT - 1);
+		if (i > 2) strncpy(rpt_vars[n].p.outxlat.passchars,strs[2],MAXXLAT - 1);
+	}
+	/* retreive the stanza name for the control states if there is one */
+	val = (char *) ast_variable_retrieve(cfg,this,"controlstates");
+	rpt_vars[n].p.csstanzaname = val;
+		
+	/* retreive the stanza name for the scheduler if there is one */
+	val = (char *) ast_variable_retrieve(cfg,this,"scheduler");
+	rpt_vars[n].p.skedstanzaname = val;
+
+	/* retreive the stanza name for the txlimits */
+	val = (char *) ast_variable_retrieve(cfg,this,"txlimits");
+	rpt_vars[n].p.txlimitsstanzaname = val;
 
-	/* If these aren't specified, copy them from the functions property. */
-	if (ast_strlen_zero(rpt_vars[n].p.link_functions))
-		ast_copy_string(rpt_vars[n].p.link_functions, rpt_vars[n].p.functions, sizeof(rpt_vars[n].p.link_functions));
+	longestnode = 0;
 
-	rpt_vars[n].longestnode = 0;
-	for (vp = ast_variable_browse(cfg, rpt_vars[n].p.nodes); vp; vp = vp->next) {
-		if ((j = strlen(vp->name)) > rpt_vars[n].longestnode)
-			rpt_vars[n].longestnode = j;
+	vp = ast_variable_browse(cfg, rpt_vars[n].p.nodes);
+		
+	while(vp){
+		j = strlen(vp->name);
+		if (j > longestnode)
+			longestnode = j;
+		vp = vp->next;
 	}
 
+	rpt_vars[n].longestnode = longestnode;
+		
 	/*
 	* For this repeater, Determine the length of the longest function 
 	*/
 	rpt_vars[n].longestfunc = 0;
-	for (vp = ast_variable_browse(cfg, rpt_vars[n].p.functions); vp; vp = vp->next) {
-		if ((j = strlen(vp->name)) > rpt_vars[n].longestfunc)
+	vp = ast_variable_browse(cfg, rpt_vars[n].p.functions);
+	while(vp){
+		j = strlen(vp->name);
+		if (j > rpt_vars[n].longestfunc)
 			rpt_vars[n].longestfunc = j;
+		vp = vp->next;
 	}
-
+	/*
+	* For this repeater, Determine the length of the longest function 
+	*/
 	rpt_vars[n].link_longestfunc = 0;
-	for (vp = ast_variable_browse(cfg, rpt_vars[n].p.link_functions); vp; vp = vp->next) {
-		if ((j = strlen(vp->name)) > rpt_vars[n].link_longestfunc)
+	vp = ast_variable_browse(cfg, rpt_vars[n].p.link_functions);
+	while(vp){
+		j = strlen(vp->name);
+		if (j > rpt_vars[n].link_longestfunc)
 			rpt_vars[n].link_longestfunc = j;
+		vp = vp->next;
 	}
-
 	rpt_vars[n].phone_longestfunc = 0;
-	for (vp = ast_variable_browse(cfg, rpt_vars[n].p.phone_functions); vp; vp = vp->next) {
-		if ((j = strlen(vp->name)) > rpt_vars[n].phone_longestfunc)
-			rpt_vars[n].phone_longestfunc = j;
+	if (rpt_vars[n].p.phone_functions)
+	{
+		vp = ast_variable_browse(cfg, rpt_vars[n].p.phone_functions);
+		while(vp){
+			j = strlen(vp->name);
+			if (j > rpt_vars[n].phone_longestfunc)
+				rpt_vars[n].phone_longestfunc = j;
+			vp = vp->next;
+		}
 	}
-
 	rpt_vars[n].dphone_longestfunc = 0;
-	for (vp = ast_variable_browse(cfg, rpt_vars[n].p.dphone_functions); vp; vp = vp->next) {
-		if ((j = strlen(vp->name)) > rpt_vars[n].dphone_longestfunc)
-			rpt_vars[n].dphone_longestfunc = j;
+	if (rpt_vars[n].p.dphone_functions)
+	{
+		vp = ast_variable_browse(cfg, rpt_vars[n].p.dphone_functions);
+		while(vp){
+			j = strlen(vp->name);
+			if (j > rpt_vars[n].dphone_longestfunc)
+				rpt_vars[n].dphone_longestfunc = j;
+			vp = vp->next;
+		}
+	}
+	rpt_vars[n].alt_longestfunc = 0;
+	if (rpt_vars[n].p.alt_functions)
+	{
+		vp = ast_variable_browse(cfg, rpt_vars[n].p.alt_functions);
+		while(vp){
+			j = strlen(vp->name);
+			if (j > rpt_vars[n].alt_longestfunc)
+				rpt_vars[n].alt_longestfunc = j;
+			vp = vp->next;
+		}
 	}
-
 	rpt_vars[n].macro_longest = 1;
-	for (vp = ast_variable_browse(cfg, rpt_vars[n].p.macro); vp; vp = vp->next) {
-		if ((j = strlen(vp->name)) > rpt_vars[n].macro_longest)
+	vp = ast_variable_browse(cfg, rpt_vars[n].p.macro);
+	while(vp){
+		j = strlen(vp->name);
+		if (j > rpt_vars[n].macro_longest)
 			rpt_vars[n].macro_longest = j;
+		vp = vp->next;
 	}
+	
+	/* Browse for control states */
+	if(rpt_vars[n].p.csstanzaname)
+		vp = ast_variable_browse(cfg, rpt_vars[n].p.csstanzaname);
+	else
+		vp = NULL;
+	for( i = 0 ; vp && (i < MAX_SYSSTATES) ; i++){ /* Iterate over the number of control state lines in the stanza */
+		int k,nukw,statenum;
+		statenum=atoi(vp->name);
+		strncpy(s1, vp->value, 255);
+		s1[255] = 0;
+		nukw  = finddelim(s1,strs,32);
+		
+		for (k = 0 ; k < nukw ; k++){ /* for each user specified keyword */	
+			for(j = 0 ; cs_keywords[j] != NULL ; j++){ /* try to match to one in our internal table */
+				if(!strcmp(strs[k],cs_keywords[j])){
+					switch(j){
+						case 0: /* rptena */
+							rpt_vars[n].p.s[statenum].txdisable = 0;
+							break;
+						case 1: /* rptdis */
+							rpt_vars[n].p.s[statenum].txdisable = 1;
+							break;
+			
+						case 2: /* apena */
+							rpt_vars[n].p.s[statenum].autopatchdisable = 0;
+							break;
+
+						case 3: /* apdis */
+							rpt_vars[n].p.s[statenum].autopatchdisable = 1;
+							break;
+
+						case 4: /* lnkena */
+							rpt_vars[n].p.s[statenum].linkfundisable = 0;
+							break;
+	
+						case 5: /* lnkdis */
+							rpt_vars[n].p.s[statenum].linkfundisable = 1;
+							break;
+
+						case 6: /* totena */
+							rpt_vars[n].p.s[statenum].totdisable = 0;
+							break;
+					
+						case 7: /* totdis */
+							rpt_vars[n].p.s[statenum].totdisable = 1;
+							break;
+
+						case 8: /* skena */
+							rpt_vars[n].p.s[statenum].schedulerdisable = 0;
+							break;
+
+						case 9: /* skdis */
+							rpt_vars[n].p.s[statenum].schedulerdisable = 1;
+							break;
+
+						case 10: /* ufena */
+							rpt_vars[n].p.s[statenum].userfundisable = 0;
+							break;
+
+						case 11: /* ufdis */
+							rpt_vars[n].p.s[statenum].userfundisable = 1;
+							break;
+
+						case 12: /* atena */
+							rpt_vars[n].p.s[statenum].alternatetail = 1;
+							break;
 
-	rpt_vars[n].gosub_longest = 1;
-	for (vp = ast_variable_browse(cfg, rpt_vars[n].p.gosub); vp; vp = vp->next) {
-		if ((j = strlen(vp->name)) > rpt_vars[n].gosub_longest)
-			rpt_vars[n].gosub_longest = j;
+						case 13: /* atdis */
+							rpt_vars[n].p.s[statenum].alternatetail = 0;
+							break;
+			
+						default:
+							ast_log(LOG_WARNING,
+								"Unhandled control state keyword %s", cs_keywords[i]);
+							break;
+					}
+				}
+			}
+		}
+		vp = vp->next;
 	}
 	ast_mutex_unlock(&rpt_vars[n].lock);
 }
@@ -1074,113 +2616,87 @@ static void load_rpt_vars(int n, int init)
 /*
 * Enable or disable debug output at a given level at the console
 */
-static char *handle_cli_rpt_debug_level(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+                                                                                                                                 
+static int rpt_do_debug(int fd, int argc, char *argv[])
 {
 	int newlevel;
 
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "rpt debug level";
-		e->usage =
-			"Usage: rpt debug level {0-7}\n"
-			"       Enables debug messages in app_rpt\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-	if (a->argc != e->args)
-		return CLI_SHOWUSAGE;
-	newlevel = myatoi(a->argv[3]);
-	if ((newlevel < 0) || (newlevel > 7))
-		return CLI_SHOWUSAGE;
-	if (newlevel)
-		ast_cli(a->fd, "app_rpt Debugging enabled, previous level: %d, new level: %d\n", debug, newlevel);
-	else
-		ast_cli(a->fd, "app_rpt Debugging disabled\n");
-
-	debug = newlevel;
-
-	return CLI_SUCCESS;
+        if (argc != 4)
+                return RESULT_SHOWUSAGE;
+        newlevel = myatoi(argv[3]);
+        if((newlevel < 0) || (newlevel > 7))
+                return RESULT_SHOWUSAGE;
+        if(newlevel)
+                ast_cli(fd, "app_rpt Debugging enabled, previous level: %d, new level: %d\n", debug, newlevel);
+        else
+                ast_cli(fd, "app_rpt Debugging disabled\n");
+
+        debug = newlevel;                                                                                                                          
+        return RESULT_SUCCESS;
 }
 
 /*
 * Dump rpt struct debugging onto console
 */
-static char *handle_cli_rpt_dump(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+                                                                                                                                 
+static int rpt_do_dump(int fd, int argc, char *argv[])
 {
 	int i;
 
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "rpt dump";
-		e->usage =
-			"Usage: rpt dump <nodename>\n"
-			"       Dumps struct debug info to log\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	if (a->argc != 3)
-		return CLI_SHOWUSAGE;
+        if (argc != 3)
+                return RESULT_SHOWUSAGE;
 
-	for (i = 0; i < nrpts; i++) {
-		if (!strcmp(a->argv[2], rpt_vars[i].name)) {
+	for(i = 0; i < nrpts; i++)
+	{
+		if (!strcmp(argv[2],rpt_vars[i].name))
+		{
 			rpt_vars[i].disgorgetime = time(NULL) + 10; /* Do it 10 seconds later */
-			ast_cli(a->fd, "app_rpt struct dump requested for node %s\n", a->argv[2]);
-			return CLI_SUCCESS;
+		        ast_cli(fd, "app_rpt struct dump requested for node %s\n",argv[2]);
+		        return RESULT_SUCCESS;
 		}
 	}
-	return CLI_FAILURE;
+	return RESULT_FAILURE;
 }
 
 /*
 * Dump statistics onto console
 */
-static char *handle_cli_rpt_stats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+
+static int rpt_do_stats(int fd, int argc, char *argv[])
 {
-	int i, j;
+	int i,j,numoflinks;
 	int dailytxtime, dailykerchunks;
+	time_t now;
 	int totalkerchunks, dailykeyups, totalkeyups, timeouts;
 	int totalexecdcommands, dailyexecdcommands, hours, minutes, seconds;
+	int uptime;
 	long long totaltxtime;
-	struct rpt_link *l;
+	struct	rpt_link *l;
 	char *listoflinks[MAX_STAT_LINKS];	
-	char *lastnodewhichkeyedusup, *lastdtmfcommand;
+	char *lastdtmfcommand,*parrot_ena;
 	char *tot_state, *ider_state, *patch_state;
-	char *reverse_patch_state, *enable_state, *input_signal, *called_number;
+	char *reverse_patch_state, *sys_ena, *tot_ena, *link_ena, *patch_ena;
+	char *sch_ena, *input_signal, *called_number, *user_funs, *tail_type;
 	struct rpt *myrpt;
 
 	static char *not_applicable = "N/A";
 
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "rpt stats";
-		e->usage =
-			"Usage: rpt stats <nodename>\n"
-			"       Dumps node statistics to console\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	if (a->argc != 3)
-		return CLI_SHOWUSAGE;
-
-	for (i = 0 ; i <= MAX_STAT_LINKS; i++)
-		listoflinks[i] = NULL;
+	if(argc != 3)
+		return RESULT_SHOWUSAGE;
 
 	tot_state = ider_state = 
 	patch_state = reverse_patch_state = 
-	input_signal = called_number = 
-	lastdtmfcommand = not_applicable;
+	input_signal = not_applicable;
+	called_number = lastdtmfcommand = NULL;
 
-	for (i = 0; i < nrpts; i++) {
-		if (!strcmp(a->argv[2], rpt_vars[i].name)) {
+	time(&now);
+	for(i = 0; i < nrpts; i++)
+	{
+		if (!strcmp(argv[2],rpt_vars[i].name)){
 			/* Make a copy of all stat variables while locked */
 			myrpt = &rpt_vars[i];
 			rpt_mutex_lock(&myrpt->lock); /* LOCK */
-
+			uptime = (int)(now - starttime);
 			dailytxtime = myrpt->dailytxtime;
 			totaltxtime = myrpt->totaltxtime;
 			dailykeyups = myrpt->dailykeyups;
@@ -1193,293 +2709,555 @@ static char *handle_cli_rpt_stats(struct ast_cli_entry *e, int cmd, struct ast_c
 
 			/* Traverse the list of connected nodes */
 			reverse_patch_state = "DOWN";
-			j = 0;
+			numoflinks = 0;
 			l = myrpt->links.next;
-			while (l != &myrpt->links) {
-				if (l->name[0] == '0') { /* Skip '0' nodes */
+			while(l && (l != &myrpt->links)){
+				if(numoflinks >= MAX_STAT_LINKS){
+					ast_log(LOG_NOTICE,
+					"maximum number of links exceeds %d in rpt_do_stats()!",MAX_STAT_LINKS);
+					break;
+				}
+				if (l->name[0] == '0'){ /* Skip '0' nodes */
 					reverse_patch_state = "UP";
 					l = l->next;
 					continue;
 				}
-				listoflinks[j] = ast_strdupa(l->name);
-				if (listoflinks[j])
-					j++;
+				listoflinks[numoflinks] = ast_strdup(l->name);
+				if(listoflinks[numoflinks] == NULL){
+					break;
+				}
+				else{
+					numoflinks++;
+				}
 				l = l->next;
 			}
 
-			lastnodewhichkeyedusup = ast_strdupa(myrpt->lastnodewhichkeyedusup);			
-			if ((!lastnodewhichkeyedusup) || (ast_strlen_zero(lastnodewhichkeyedusup)))
-				lastnodewhichkeyedusup = not_applicable;
-
-			if (myrpt->keyed)
+			if(myrpt->keyed)
 				input_signal = "YES";
 			else
 				input_signal = "NO";
 
-			if (myrpt->enable)
-				enable_state = "YES";
+			if(myrpt->p.parrotmode)
+				parrot_ena = "ENABLED";
+			else
+				parrot_ena = "DISABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].txdisable)
+				sys_ena = "DISABLED";
+			else
+				sys_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].totdisable)
+				tot_ena = "DISABLED";
+			else
+				tot_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].linkfundisable)
+				link_ena = "DISABLED";
+			else
+				link_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].autopatchdisable)
+				patch_ena = "DISABLED";
+			else
+				patch_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].schedulerdisable)
+				sch_ena = "DISABLED";
+			else
+				sch_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].userfundisable)
+				user_funs = "DISABLED";
+			else
+				user_funs = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].alternatetail)
+				tail_type = "ALTERNATE";
 			else
-				enable_state = "NO";
+				tail_type = "STANDARD";
 
-			if (!myrpt->totimer)
+			if(!myrpt->totimer)
 				tot_state = "TIMED OUT!";
-			else if (myrpt->totimer != myrpt->p.totime)
+			else if(myrpt->totimer != myrpt->p.totime)
 				tot_state = "ARMED";
 			else
 				tot_state = "RESET";
 
-			if (myrpt->tailid)
+			if(myrpt->tailid)
 				ider_state = "QUEUED IN TAIL";
-			else if (myrpt->mustid)
+			else if(myrpt->mustid)
 				ider_state = "QUEUED FOR CLEANUP";
 			else
 				ider_state = "CLEAN";
 
-			switch (myrpt->callmode) {
-			case 1:
-				patch_state = "DIALING";
-				break;
-			case 2:
-				patch_state = "CONNECTING";
-				break;
-			case 3:
-				patch_state = "UP";
-				break;
-			case 4:
-				patch_state = "CALL FAILED";
-				break;
-			default:
-				patch_state = "DOWN";
-			}
+			switch(myrpt->callmode){
+				case 1:
+					patch_state = "DIALING";
+					break;
+				case 2:
+					patch_state = "CONNECTING";
+					break;
+				case 3:
+					patch_state = "UP";
+					break;
 
-			if (!ast_strlen_zero(myrpt->exten))
-				called_number = ast_strdupa(myrpt->exten);
+				case 4:
+					patch_state = "CALL FAILED";
+					break;
+
+				default:
+					patch_state = "DOWN";
+			}
 
-			if (!ast_strlen_zero(myrpt->lastdtmfcommand))
-				lastdtmfcommand = ast_strdupa(myrpt->lastdtmfcommand);
+			if(strlen(myrpt->exten)){
+				called_number = ast_strdup(myrpt->exten);
+			}
 
+			if(strlen(myrpt->lastdtmfcommand)){
+				lastdtmfcommand = ast_strdup(myrpt->lastdtmfcommand);
+			}
 			rpt_mutex_unlock(&myrpt->lock); /* UNLOCK */
 
-			ast_cli(a->fd, "************************ NODE %s STATISTICS *************************\n\n", myrpt->name);
-			ast_cli(a->fd, "Signal on input..................................: %s\n", input_signal);
-			ast_cli(a->fd, "Transmitter enabled..............................: %s\n", enable_state);
-			ast_cli(a->fd, "Time out timer state.............................: %s\n", tot_state);
-			ast_cli(a->fd, "Time outs since system initialization............: %d\n", timeouts);
-			ast_cli(a->fd, "Identifier state.................................: %s\n", ider_state);
-			ast_cli(a->fd, "Kerchunks today..................................: %d\n", dailykerchunks);
-			ast_cli(a->fd, "Kerchunks since system initialization............: %d\n", totalkerchunks);
-			ast_cli(a->fd, "Keyups today.....................................: %d\n", dailykeyups);
-			ast_cli(a->fd, "Keyups since system initialization...............: %d\n", totalkeyups);
-			ast_cli(a->fd, "DTMF commands today..............................: %d\n", dailyexecdcommands);
-			ast_cli(a->fd, "DTMF commands since system initialization........: %d\n", totalexecdcommands);
-			ast_cli(a->fd, "Last DTMF command executed.......................: %s\n", lastdtmfcommand);
-
-			hours = dailytxtime / 3600000;
+			ast_cli(fd, "************************ NODE %s STATISTICS *************************\n\n", myrpt->name);
+			ast_cli(fd, "Selected system state............................: %d\n", myrpt->p.sysstate_cur);
+			ast_cli(fd, "Signal on input..................................: %s\n", input_signal);
+			ast_cli(fd, "System...........................................: %s\n", sys_ena);
+			ast_cli(fd, "Parrot Mode......................................: %s\n", parrot_ena);
+			ast_cli(fd, "Scheduler........................................: %s\n", sch_ena);
+			ast_cli(fd, "Tail Time........................................: %s\n", tail_type);
+			ast_cli(fd, "Time out timer...................................: %s\n", tot_ena);
+			ast_cli(fd, "Time out timer state.............................: %s\n", tot_state);
+			ast_cli(fd, "Time outs since system initialization............: %d\n", timeouts);
+			ast_cli(fd, "Identifier state.................................: %s\n", ider_state);
+			ast_cli(fd, "Kerchunks today..................................: %d\n", dailykerchunks);
+			ast_cli(fd, "Kerchunks since system initialization............: %d\n", totalkerchunks);
+			ast_cli(fd, "Keyups today.....................................: %d\n", dailykeyups);
+			ast_cli(fd, "Keyups since system initialization...............: %d\n", totalkeyups);
+			ast_cli(fd, "DTMF commands today..............................: %d\n", dailyexecdcommands);
+			ast_cli(fd, "DTMF commands since system initialization........: %d\n", totalexecdcommands);
+			ast_cli(fd, "Last DTMF command executed.......................: %s\n", 
+			(lastdtmfcommand && strlen(lastdtmfcommand)) ? lastdtmfcommand : not_applicable);
+			hours = dailytxtime/3600000;
 			dailytxtime %= 3600000;
-			minutes = dailytxtime / 60000;
+			minutes = dailytxtime/60000;
 			dailytxtime %= 60000;
-			seconds = dailytxtime / 1000;
+			seconds = dailytxtime/1000;
 			dailytxtime %= 1000;
 
-			ast_cli(a->fd, "TX time today ...................................: %02d:%02d:%02d.%d\n",
+			ast_cli(fd, "TX time today....................................: %02d:%02d:%02d.%d\n",
 				hours, minutes, seconds, dailytxtime);
 
-			hours = (int) totaltxtime / 3600000;
+			hours = (int) totaltxtime/3600000;
 			totaltxtime %= 3600000;
-			minutes = (int) totaltxtime / 60000;
+			minutes = (int) totaltxtime/60000;
 			totaltxtime %= 60000;
-			seconds = (int)  totaltxtime / 1000;
+			seconds = (int)  totaltxtime/1000;
 			totaltxtime %= 1000;
 
-			ast_cli(a->fd, "TX time since system initialization..............: %02d:%02d:%02d.%d\n",
+			ast_cli(fd, "TX time since system initialization..............: %02d:%02d:%02d.%d\n",
 				 hours, minutes, seconds, (int) totaltxtime);
-			ast_cli(a->fd, "Nodes currently connected to us..................: ");
-			for (j = 0;; j++) {
-				if (!listoflinks[j]) {
-					if (!j) {
-						ast_cli(a->fd, "<NONE>");
+
+                       	hours = uptime/3600;
+                        uptime %= 3600;
+                        minutes = uptime/60;
+                        uptime %= 60;
+
+                        ast_cli(fd, "Uptime...........................................: %02d:%02d:%02d\n",
+                                hours, minutes, uptime);
+
+			ast_cli(fd, "Nodes currently connected to us..................: ");
+                        if(!numoflinks){
+  	                      ast_cli(fd,"<NONE>");
+                        }
+			else{
+				for(j = 0 ;j < numoflinks; j++){
+					ast_cli(fd, "%s", listoflinks[j]);
+					if(j % 4 == 3){
+						ast_cli(fd, "\n");
+						ast_cli(fd, "                                                 : ");
+					}	
+					else{
+						if((numoflinks - 1) - j  > 0)
+							ast_cli(fd, ", ");
 					}
-					break;
-				}
-				ast_cli(a->fd, "%s", listoflinks[j]);
-				if (j % 4 == 3) {
-					ast_cli(a->fd, "\n");
-					ast_cli(a->fd, "                                                 : ");
-				} else {
-					if (listoflinks[j + 1])
-						ast_cli(a->fd, ", ");
 				}
 			}
-			ast_cli(a->fd, "\n");
-
-			ast_cli(a->fd, "Last node which transmitted to us................: %s\n", lastnodewhichkeyedusup);
-			ast_cli(a->fd, "Autopatch state..................................: %s\n", patch_state);
-			ast_cli(a->fd, "Autopatch called number..........................: %s\n", called_number);
-			ast_cli(a->fd, "Reverse patch/IAXRPT connected...................: %s\n\n", reverse_patch_state);
-
-			return CLI_SUCCESS;
+			ast_cli(fd,"\n");
+
+			ast_cli(fd, "Autopatch........................................: %s\n", patch_ena);
+			ast_cli(fd, "Autopatch state..................................: %s\n", patch_state);
+			ast_cli(fd, "Autopatch called number..........................: %s\n",
+			(called_number && strlen(called_number)) ? called_number : not_applicable);
+			ast_cli(fd, "Reverse patch/IAXRPT connected...................: %s\n", reverse_patch_state);
+			ast_cli(fd, "User linking commands............................: %s\n", link_ena);
+			ast_cli(fd, "User functions...................................: %s\n\n", user_funs);
+
+			for(j = 0; j < numoflinks; j++){ /* ast_free() all link names */
+				ast_free(listoflinks[j]);
+			}
+			if(called_number){
+				ast_free(called_number);
+			}
+			if(lastdtmfcommand){
+				ast_free(lastdtmfcommand);
+			}
+		        return RESULT_SUCCESS;
 		}
 	}
-	return CLI_FAILURE;
+	return RESULT_FAILURE;
 }
 
 /*
 * Link stats function
 */
-static char *handle_cli_rpt_lstats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+
+static int rpt_do_lstats(int fd, int argc, char *argv[])
 {
-	int i, j;
+	int i,j;
+	char *connstate;
 	struct rpt *myrpt;
 	struct rpt_link *l;
-	struct rpt_lstat *s, *t;
+	struct rpt_lstat *s,*t;
 	struct rpt_lstat s_head;
-
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "rpt lstats";
-		e->usage =
-			"Usage: rpt lstats <nodename>\n"
-			"       Dumps link statistics to console\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
-
-	if (a->argc != 3)
-		return CLI_SHOWUSAGE;
+	if(argc != 3)
+		return RESULT_SHOWUSAGE;
 
 	s = NULL;
 	s_head.next = &s_head;
 	s_head.prev = &s_head;
 
-	for (i = 0; i < nrpts; i++) {
-		if (!strcmp(a->argv[2], rpt_vars[i].name)) {
+	for(i = 0; i < nrpts; i++)
+	{
+		if (!strcmp(argv[2],rpt_vars[i].name)){
 			/* Make a copy of all stat variables while locked */
 			myrpt = &rpt_vars[i];
 			rpt_mutex_lock(&myrpt->lock); /* LOCK */
 			/* Traverse the list of connected nodes */
 			j = 0;
 			l = myrpt->links.next;
-			while (l != &myrpt->links) {
-				if (l->name[0] == '0') { /* Skip '0' nodes */
+			while(l && (l != &myrpt->links)){
+				if (l->name[0] == '0'){ /* Skip '0' nodes */
 					l = l->next;
 					continue;
 				}
-				if ((s = ast_calloc(1, sizeof(*s))) == NULL) {
+				if((s = (struct rpt_lstat *) ast_malloc(sizeof(struct rpt_lstat))) == NULL){
 					ast_log(LOG_ERROR, "Malloc failed in rpt_do_lstats\n");
 					rpt_mutex_unlock(&myrpt->lock); /* UNLOCK */
-					return CLI_FAILURE;
+					return RESULT_FAILURE;
 				}
-				ast_copy_string(s->name, l->name, MAXREMSTR);
-				pbx_substitute_variables_helper(l->chan, "${IAXPEER(CURRENTCHANNEL)}", s->peer, MAXPEERSTR - 1);
+				memset(s, 0, sizeof(struct rpt_lstat));
+				strncpy(s->name, l->name, MAXREMSTR - 1);
+				if (l->chan) pbx_substitute_variables_helper(l->chan, "${IAXPEER(CURRENTCHANNEL)}", s->peer, MAXPEERSTR - 1);
+				else strcpy(s->peer,"(none)");
 				s->mode = l->mode;
 				s->outbound = l->outbound;
 				s->reconnects = l->reconnects;
 				s->connecttime = l->connecttime;
+				s->thisconnected = l->thisconnected;
+				memcpy(s->chan_stat,l->chan_stat,NRPTSTAT * sizeof(struct rpt_chan_stat));
 				insque((struct qelem *) s, (struct qelem *) s_head.next);
+				memset(l->chan_stat,0,NRPTSTAT * sizeof(struct rpt_chan_stat));
 				l = l->next;
 			}
 			rpt_mutex_unlock(&myrpt->lock); /* UNLOCK */
-			ast_cli(a->fd, "NODE      PEER                RECONNECTS  DIRECTION  CONNECT TIME\n");
-			ast_cli(a->fd, "----      ----                ----------  ---------  ------------\n");
+			ast_cli(fd, "NODE      PEER                RECONNECTS  DIRECTION  CONNECT TIME        CONNECT STATE\n");
+			ast_cli(fd, "----      ----                ----------  ---------  ------------        -------------\n");
 
-			for (s = s_head.next; s != &s_head; s = s->next) {
+			for(s = s_head.next; s != &s_head; s = s->next){
 				int hours, minutes, seconds;
 				long long connecttime = s->connecttime;
-				char conntime[31];
+				char conntime[21];
 				hours = (int) connecttime/3600000;
 				connecttime %= 3600000;
 				minutes = (int) connecttime/60000;
 				connecttime %= 60000;
 				seconds = (int)  connecttime/1000;
 				connecttime %= 1000;
-				snprintf(conntime, sizeof(conntime), "%02d:%02d:%02d.%d",
+				snprintf(conntime, 20, "%02d:%02d:%02d.%d",
 					hours, minutes, seconds, (int) connecttime);
-				ast_cli(a->fd, "%-10s%-20s%-12d%-11s%-30s\n",
-					s->name, s->peer, s->reconnects, (s->outbound)? "OUT":"IN", conntime);
+				conntime[20] = 0;
+				if(s->thisconnected)
+					connstate  = "ESTABLISHED";
+				else
+					connstate = "CONNECTING";
+				ast_cli(fd, "%-10s%-20s%-12d%-11s%-20s%-20s\n",
+					s->name, s->peer, s->reconnects, (s->outbound)? "OUT":"IN", conntime, connstate);
 			}	
 			/* destroy our local link queue */
 			s = s_head.next;
-			while (s != &s_head) {
+			while(s != &s_head){
 				t = s;
 				s = s->next;
 				remque((struct qelem *)t);
 				ast_free(t);
 			}			
-			return CLI_SUCCESS;
+			return RESULT_SUCCESS;
 		}
 	}
+	return RESULT_FAILURE;
+}
+
+/*
+* List all nodes connected, directly or indirectly
+*/
+
+static int rpt_do_nodes(int fd, int argc, char *argv[])
+{
+	int i,j;
+	char ns;
+	char lbuf[MAXLINKLIST],*strs[MAXLINKLIST];
+	struct rpt *myrpt;
+	if(argc != 3)
+		return RESULT_SHOWUSAGE;
 
-	return CLI_FAILURE;
+	for(i = 0; i < nrpts; i++)
+	{
+		if (!strcmp(argv[2],rpt_vars[i].name)){
+			/* Make a copy of all stat variables while locked */
+			myrpt = &rpt_vars[i];
+			rpt_mutex_lock(&myrpt->lock); /* LOCK */
+			__mklinklist(myrpt,NULL,lbuf);
+			rpt_mutex_unlock(&myrpt->lock); /* UNLOCK */
+			/* parse em */
+			ns = finddelim(lbuf,strs,MAXLINKLIST);
+			/* sort em */
+			if (ns) qsort((void *)strs,ns,sizeof(char *),mycompar);
+			ast_cli(fd,"\n");
+			ast_cli(fd, "************************* CONNECTED NODES *************************\n\n");
+			for(j = 0 ;; j++){
+				if(!strs[j]){
+					if(!j){
+						ast_cli(fd,"<NONE>");
+					}
+					break;
+				}
+				ast_cli(fd, "%s", strs[j]);
+				if(j % 8 == 7){
+					ast_cli(fd, "\n");
+				}
+				else{
+					if(strs[j + 1])
+						ast_cli(fd, ", ");
+				}
+			}
+			ast_cli(fd,"\n\n");
+			return RESULT_SUCCESS;
+		}
+	}
+	return RESULT_FAILURE;
 }
 
 /*
+* List all locally configured nodes
+*/
+
+static int rpt_do_local_nodes(int fd, int argc, char *argv[])
+{
+
+    int i;
+    ast_cli(fd, "\nNode\n----\n");
+    for (i=0; i< nrpts; i++)
+    {
+        ast_cli(fd, "%s\n", rpt_vars[i].name);        
+    } /* for i */
+    ast_cli(fd,"\n");
+    return RESULT_SUCCESS;
+} 
+
+
+/*
 * reload vars 
 */
-static char *handle_cli_rpt_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+
+static int rpt_do_reload(int fd, int argc, char *argv[])
+{
+int	n;
+
+        if (argc > 2) return RESULT_SHOWUSAGE;
+
+	for(n = 0; n < nrpts; n++) rpt_vars[n].reload = 1;
+
+	return RESULT_FAILURE;
+}
+
+/*
+* restart app_rpt
+*/
+                                                                                                                                 
+static int rpt_do_restart(int fd, int argc, char *argv[])
 {
-	int	n;
+int	i;
 
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "rpt reload";
-		e->usage =
-			"Usage: rpt reload\n"
-			"       Reloads app_rpt running config parameters\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
+        if (argc > 2) return RESULT_SHOWUSAGE;
+	for(i = 0; i < nrpts; i++)
+	{
+		if (rpt_vars[i].rxchannel) ast_softhangup(rpt_vars[i].rxchannel,AST_SOFTHANGUP_DEV);
 	}
+	return RESULT_FAILURE;
+}
 
-	if (a->argc > 2)
-		return CLI_SHOWUSAGE;
 
-	for (n = 0; n < nrpts; n++)
-		rpt_vars[n].reload = 1;
+/*
+* send an app_rpt DTMF function from the CLI
+*/
+                                                                                                                                 
+static int rpt_do_fun(int fd, int argc, char *argv[])
+{
+	int	i,busy=0;
+
+        if (argc != 4) return RESULT_SHOWUSAGE;
 
-	return CLI_SUCCESS;
+	for(i = 0; i < nrpts; i++){
+		if(!strcmp(argv[2], rpt_vars[i].name)){
+			struct rpt *myrpt = &rpt_vars[i];
+			rpt_mutex_lock(&myrpt->lock);
+			if ((MAXMACRO - strlen(myrpt->macrobuf)) < strlen(argv[3])){
+				rpt_mutex_unlock(&myrpt->lock);
+				busy=1;
+			}
+			if(!busy){
+				myrpt->macrotimer = MACROTIME;
+				strncat(myrpt->macrobuf,argv[3],MAXMACRO - 1);
+			}
+			rpt_mutex_unlock(&myrpt->lock);
+		}
+	}
+	if(busy){
+		ast_cli(fd, "Function decoder busy");
+	}
+	return RESULT_FAILURE;
 }
+/*
+	the convention is that macros in the data from the rpt() application
+	are all at the end of the data, separated by the | and start with a *
+	when put into the macro buffer, the characters have their high bit
+	set so the macro processor knows they came from the application data
+	and to use the alt-functions table.
+	sph:
+*/
+static int rpt_push_alt_macro(struct rpt *myrpt, char *sptr)
+{
+	int	busy=0;
+
+	rpt_mutex_lock(&myrpt->lock);
+	if ((MAXMACRO - strlen(myrpt->macrobuf)) < strlen(sptr)){
+		rpt_mutex_unlock(&myrpt->lock);
+		busy=1;
+	}
+	if(!busy){
+		int x;
+		if (debug)ast_log(LOG_NOTICE, "rpt_push_alt_macro %s\n",sptr);
+		myrpt->macrotimer = MACROTIME;
+		for(x = 0; *(sptr + x); x++)
+		    myrpt->macrobuf[x] = *(sptr + x) | 0x80;
+		*(sptr + x) = 0;
+	}
+	rpt_mutex_unlock(&myrpt->lock);
 
+	if(busy)ast_log(LOG_WARNING, "Function decoder busy on app_rpt command macro.\n");
+
+	return busy;
+}
 /*
-* restart app_rpt
+	allows us to test rpt() application data commands
 */
-static char *handle_cli_rpt_restart(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+static int rpt_do_fun1(int fd, int argc, char *argv[])
 {
 	int	i;
 
-	switch (cmd) {
-	case CLI_INIT:
-		e->command = "rpt restart";
-		e->usage =
-			"Usage: rpt restart\n"
-			"       Restarts app_rpt\n";
-		return NULL;
-	case CLI_GENERATE:
-		return NULL;
-	}
+    if (argc != 4) return RESULT_SHOWUSAGE;
 
-	if (a->argc > 2)
-		return CLI_SHOWUSAGE;
-	for (i = 0; i < nrpts; i++) {
-		if (rpt_vars[i].rxchannel)
-			ast_softhangup(rpt_vars[i].rxchannel, AST_SOFTHANGUP_DEV);
+	for(i = 0; i < nrpts; i++){
+		if(!strcmp(argv[2], rpt_vars[i].name)){
+			struct rpt *myrpt = &rpt_vars[i];
+			rpt_push_alt_macro(myrpt,argv[3]);
+		}
 	}
-	return CLI_SUCCESS;
+	return RESULT_FAILURE;
 }
+/*
+* send an app_rpt **command** from the CLI
+*/
+
+static int rpt_do_cmd(int fd, int argc, char *argv[])
+{
+	int i, l;
+	int busy=0;
+	int maxActions = sizeof(function_table)/sizeof(struct function_table_tag);
+
+	int thisRpt = -1;
+	int thisAction = -1;
+	struct rpt *myrpt = NULL;
+	if (argc != 6) return RESULT_SHOWUSAGE;
+	
+	for(i = 0; i < nrpts; i++)
+	{
+		if(!strcmp(argv[2], rpt_vars[i].name))
+		{
+			thisRpt = i;
+			myrpt = &rpt_vars[i];
+			break;
+		} /* if !strcmp... */
+	} /* for i */
+
+	if (thisRpt < 0)
+	{
+		ast_cli(fd, "Unknown node number %s.\n", argv[2]);
+		return RESULT_FAILURE;
+	} /* if thisRpt < 0 */
+	
+	/* Look up the action */
+	l = strlen(argv[3]);
+	for(i = 0 ; i < maxActions; i++)
+	{
+		if(!strncasecmp(argv[3], function_table[i].action, l))
+		{
+			thisAction = i;
+			break;
+		} /* if !strncasecmp... */
+	} /* for i */
+	
+	if (thisAction < 0)
+	{
+		ast_cli(fd, "Unknown action name %s.\n", argv[3]);
+		return RESULT_FAILURE;
+	} /* if thisAction < 0 */
+
+	/* at this point, it looks like all the arguments make sense... */
+
+	rpt_mutex_lock(&myrpt->lock);
+
+	if (rpt_vars[thisRpt].cmdAction.state == CMD_STATE_IDLE)
+	{
+		rpt_vars[thisRpt].cmdAction.state = CMD_STATE_BUSY;
+		rpt_vars[thisRpt].cmdAction.functionNumber = thisAction;
+		strncpy(rpt_vars[thisRpt].cmdAction.param, argv[4], MAXDTMF);
+		strncpy(rpt_vars[thisRpt].cmdAction.digits, argv[5], MAXDTMF);
+		rpt_vars[thisRpt].cmdAction.command_source = SOURCE_RPT;
+		rpt_vars[thisRpt].cmdAction.state = CMD_STATE_READY;
+	} /* if (rpt_vars[thisRpt].cmdAction.state == CMD_STATE_IDLE */
+	else
+	{
+		busy = 1;
+	} /* if (rpt_vars[thisRpt].cmdAction.state == CMD_STATE_IDLE */
+	rpt_mutex_unlock(&myrpt->lock);
+
+	return (busy ? RESULT_FAILURE : RESULT_SUCCESS);
+} /* rpt_do_cmd() */
 
 static int play_tone_pair(struct ast_channel *chan, int f1, int f2, int duration, int amplitude)
 {
 	int res;
 
-	if ((res = ast_tonepair_start(chan, f1, f2, duration, amplitude)))
-		return res;
-
-	while (chan->generatordata) {
-		if (ast_safe_sleep(chan, 1))
-			return -1;
+        if ((res = ast_tonepair_start(chan, f1, f2, duration, amplitude)))
+                return res;
+                                                                                                                                            
+        while(chan->generatordata) {
+		if (ast_safe_sleep(chan,1)) return -1;
 	}
 
-	return 0;
+        return 0;
 }
 
 static int play_tone(struct ast_channel *chan, int freq, int duration, int amplitude)
@@ -1492,11 +3270,197 @@ static int play_silence(struct ast_channel *chan, int duration)
 	return play_tone_pair(chan, 0, 0, duration, 0);
 }
 
+#ifdef	NEW_ASTERISK
+
+static char *res2cli(int r)
+
+{
+	switch (r)
+	{
+	    case RESULT_SUCCESS:
+		return(CLI_SUCCESS);
+	    case RESULT_SHOWUSAGE:
+		return(CLI_SHOWUSAGE);
+	    default:
+		return(CLI_FAILURE);
+	}
+}
+
+static char *handle_cli_debug(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt debug level";
+                e->usage = debug_usage;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_debug(a->fd,a->argc,a->argv));
+}
+
+static char *handle_cli_dump(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt dump level";
+                e->usage = dump_usage;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_dump(a->fd,a->argc,a->argv));
+}
+
+
+static char *handle_cli_stats(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt stats";
+                e->usage = dump_stats;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_stats(a->fd,a->argc,a->argv));
+}
+
+static char *handle_cli_nodes(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt nodes";
+                e->usage = dump_nodes;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_nodes(a->fd,a->argc,a->argv));
+}
+
+static char *handle_cli_local_nodes(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt localnodes";
+                e->usage = usage_local_nodes;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_local_nodes(a->fd,a->argc,a->argv));
+}
+
+static char *handle_cli_lstats(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt lstats";
+                e->usage = dump_lstats;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_lstats(a->fd,a->argc,a->argv));
+}
+
+static char *handle_cli_reload(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt reload";
+                e->usage = reload_usage;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_reload(a->fd,a->argc,a->argv));
+}
+
+static char *handle_cli_restart(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt restart";
+                e->usage = restart_usage;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_restart(a->fd,a->argc,a->argv));
+}
+
+static char *handle_cli_fun(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt fun";
+                e->usage = fun_usage;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_fun(a->fd,a->argc,a->argv));
+}
+
+static char *handle_cli_fun1(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt fun1";
+                e->usage = fun_usage;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_fun1(a->fd,a->argc,a->argv));
+}
+
+static char *handle_cli_cmd(struct ast_cli_entry *e,
+	int cmd, struct ast_cli_args *a)
+{
+        switch (cmd) {
+        case CLI_INIT:
+                e->command = "rpt cmd";
+                e->usage = cmd_usage;
+                return NULL;
+        case CLI_GENERATE:
+                return NULL;
+	}
+	return res2cli(rpt_do_cmd(a->fd,a->argc,a->argv));
+}
+
+static struct ast_cli_entry rpt_cli[] = {
+	AST_CLI_DEFINE(handle_cli_debug,"Enable app_rpt debugging"),
+	AST_CLI_DEFINE(handle_cli_dump,"Dump app_rpt structs for debugging"),
+	AST_CLI_DEFINE(handle_cli_stats,"Dump node statistics"),
+	AST_CLI_DEFINE(handle_cli_nodes,"Dump node list"),
+	AST_CLI_DEFINE(handle_cli_local_nodes,	"Dump list of local node numbers"),
+	AST_CLI_DEFINE(handle_cli_lstats,"Dump link statistics"),
+	AST_CLI_DEFINE(handle_cli_reload,"Reload app_rpt config"),
+	AST_CLI_DEFINE(handle_cli_restart,"Restart app_rpt"),
+	AST_CLI_DEFINE(handle_cli_fun,"Execute a DTMF function"),
+	AST_CLI_DEFINE(handle_cli_fun1,"Execute a DTMF function"),
+	AST_CLI_DEFINE(handle_cli_cmd,"Execute a DTMF function")
+};
+
+#endif
 
-static int send_morse(struct ast_channel *chan, const char *string, int speed, int freq, int amplitude)
+static int send_morse(struct ast_channel *chan, char *string, int speed, int freq, int amplitude)
 {
 
-	static struct morse_bits mbits[] = {
+static struct morse_bits mbits[] = {
 		{0, 0}, /* SPACE */
 		{0, 0}, 
 		{6, 18},/* " */
@@ -1530,8 +3494,8 @@ static int send_morse(struct ast_channel *chan, const char *string, int speed, i
 		{0, 0},
 		{6, 12},/* ? */
 		{0, 0},
-		{2, 2}, /* A */
-		{4, 1}, /* B */
+        	{2, 2}, /* A */
+ 		{4, 1}, /* B */
 		{4, 5}, /* C */
 		{3, 1}, /* D */
 		{1, 0}, /* E */
@@ -1558,6 +3522,7 @@ static int send_morse(struct ast_channel *chan, const char *string, int speed, i
 		{4, 3}  /* Z */
 	};
 
+
 	int dottime;
 	int dashtime;
 	int intralettertime;
@@ -1573,33 +3538,33 @@ static int send_morse(struct ast_channel *chan, const char *string, int speed, i
 	
 	/* Approximate the dot time from the speed arg. */
 	
-	dottime = 900 / speed;
+	dottime = 900/speed;
 	
-	/* Establish timing relationships */
+	/* Establish timing releationships */
 	
 	dashtime = 3 * dottime;
 	intralettertime = dottime;
 	interlettertime = dottime * 4 ;
 	interwordtime = dottime * 7;
 	
-	for (; (*string) && (!res); string++) {
+	for(;(*string) && (!res); string++){
 	
 		c = *string;
 		
 		/* Convert lower case to upper case */
 		
-		if ((c >= 'a') && (c <= 'z'))
+		if((c >= 'a') && (c <= 'z'))
 			c -= 0x20;
 		
 		/* Can't deal with any char code greater than Z, skip it */
 		
-		if (c  > 'Z')
+		if(c  > 'Z')
 			continue;
 		
 		/* If space char, wait the inter word time */
 					
-		if (c == ' ') {
-			if (!res)
+		if(c == ' '){
+			if(!res)
 				res = play_silence(chan, interwordtime);
 			continue;
 		}
@@ -1615,17 +3580,17 @@ static int send_morse(struct ast_channel *chan, const char *string, int speed, i
 		
 		/* Send the character */
 		
-		for (; len ; len--) {
-			if (!res)
+		for(; len ; len--){
+			if(!res)
 				res = play_tone(chan, freq, (ddcomb & 1) ? dashtime : dottime, amplitude);
-			if (!res)
+			if(!res)
 				res = play_silence(chan, intralettertime);
 			ddcomb >>= 1;
 		}
 		
 		/* Wait the interletter time */
 		
-		if (!res)
+		if(!res)
 			res = play_silence(chan, interlettertime - intralettertime);
 	}
 	
@@ -1639,12 +3604,12 @@ static int send_morse(struct ast_channel *chan, const char *string, int speed, i
 	* Wait for the zaptel driver to physically write the tone blocks to the hardware
 	*/
 
-	for (i = 0; i < 20 ; i++) {
+	for(i = 0; i < 20 ; i++){
 		flags =  ZT_IOMUX_WRITEEMPTY | ZT_IOMUX_NOWAIT; 
 		res = ioctl(chan->fds[0], ZT_IOMUX, &flags);
-		if (flags & ZT_IOMUX_WRITEEMPTY)
+		if(flags & ZT_IOMUX_WRITEEMPTY)
 			break;
-		if ( ast_safe_sleep(chan, 50)) {
+		if( ast_safe_sleep(chan, 50)){
 			res = -1;
 			break;
 		}
@@ -1654,11 +3619,11 @@ static int send_morse(struct ast_channel *chan, const char *string, int speed, i
 	return res;
 }
 
-static int send_tone_telemetry(struct ast_channel *chan, const char *tonestring)
+static int send_tone_telemetry(struct ast_channel *chan, char *tonestring)
 {
-	char *stringp;
+	char *p,*stringp;
 	char *tonesubset;
-	int f1, f2;
+	int f1,f2;
 	int duration;
 	int amplitude;
 	int res;
@@ -1666,48 +3631,54 @@ static int send_tone_telemetry(struct ast_channel *chan, const char *tonestring)
 	int flags;
 	
 	res = 0;
+
+	if(!tonestring)
+		return res;
 	
-	stringp = ast_strdupa(tonestring);
+	p = stringp = ast_strdup(tonestring);
 
-	for (;tonestring;) {
-		tonesubset = strsep(&stringp, ")");
-		if (!tonesubset)
+	for(;tonestring;){
+		tonesubset = strsep(&stringp,")");
+		if(!tonesubset)
 			break;
-		if (sscanf(tonesubset, "(%d,%d,%d,%d", &f1, &f2, &duration, &amplitude) != 4)
+		if(sscanf(tonesubset,"(%d,%d,%d,%d", &f1, &f2, &duration, &amplitude) != 4)
 			break;
 		res = play_tone_pair(chan, f1, f2, duration, amplitude);
-		if (res)
+		if(res)
 			break;
 	}
-	if (!res)
+	if(p)
+		ast_free(p);
+	if(!res)
 		res = play_tone_pair(chan, 0, 0, 100, 0); /* This is needed to ensure the last tone segment is timed correctly */
 	
 	if (!res) 
 		res = ast_waitstream(chan, "");
+
 	ast_stopstream(chan);
 
 	/*
 	* Wait for the zaptel driver to physically write the tone blocks to the hardware
 	*/
 
-	for (i = 0; i < 20 ; i++) {
+	for(i = 0; i < 20 ; i++){
 		flags =  ZT_IOMUX_WRITEEMPTY | ZT_IOMUX_NOWAIT; 
 		res = ioctl(chan->fds[0], ZT_IOMUX, &flags);
-		if (flags & ZT_IOMUX_WRITEEMPTY)
+		if(flags & ZT_IOMUX_WRITEEMPTY)
 			break;
-		if (ast_safe_sleep(chan, 50)) {
+		if( ast_safe_sleep(chan, 50)){
 			res = -1;
 			break;
 		}
 	}
 		
 	return res;
+		
 }
-	
 
-static int sayfile(struct ast_channel *mychannel, const char *fname)
+static int sayfile(struct ast_channel *mychannel,char *fname)
 {
-	int	res;
+int	res;
 
 	res = ast_streamfile(mychannel, fname, mychannel->language);
 	if (!res) 
@@ -1718,11 +3689,11 @@ static int sayfile(struct ast_channel *mychannel, const char *fname)
 	return res;
 }
 
-static int saycharstr(struct ast_channel *mychannel, char *str)
+static int saycharstr(struct ast_channel *mychannel,char *str)
 {
-	int	res;
+int	res;
 
-	res = ast_say_character_str(mychannel, str, NULL, mychannel->language);
+	res = ast_say_character_str(mychannel,str,NULL,mychannel->language);
 	if (!res) 
 		res = ast_waitstream(mychannel, "");
 	else
@@ -1735,7 +3706,7 @@ static int saynum(struct ast_channel *mychannel, int num)
 {
 	int res;
 	res = ast_say_number(mychannel, num, NULL, mychannel->language, NULL);
-	if (!res)
+	if(!res)
 		res = ast_waitstream(mychannel, "");
 	else
 		ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
@@ -1743,20 +3714,26 @@ static int saynum(struct ast_channel *mychannel, int num)
 	return res;
 }
 
-static int saydigits(struct ast_channel *mychannel, int num)
+/* say a node and nodename. Try to look in dir referred to by nodenames in
+config, and see if there's a custom node file to play, and if so, play it */
+
+static int saynode(struct rpt *myrpt, struct ast_channel *mychannel, char *name)
 {
-	int res;
-	res = ast_say_digits(mychannel, num, NULL, mychannel->language);
-	if (!res)
-		res = ast_waitstream(mychannel, "");
-	else
-		ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
-	ast_stopstream(mychannel);
+int	res;
+char	*val,fname[300];
+
+	val = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->name, "nodenames");
+	if (!val) val = NODENAMES;
+	snprintf(fname,sizeof(fname) - 1,"%s/%s",val,name);
+	if (ast_fileexists(fname,NULL,mychannel->language) > 0)
+		return(sayfile(mychannel,fname));
+	res = sayfile(mychannel,"rpt/node");
+	if (!res) 
+		res = ast_say_character_str(mychannel,name,NULL,mychannel->language);
 	return res;
 }
 
-
-static int telem_any(struct rpt *myrpt, struct ast_channel *chan, const char *entry)
+static int telem_any(struct rpt *myrpt,struct ast_channel *chan, char *entry)
 {
 	int res;
 	char c;
@@ -1770,35 +3747,38 @@ static int telem_any(struct rpt *myrpt, struct ast_channel *chan, const char *en
 	
 	res = 0;
 	
-	if (!morseidfreq) { /* Get the morse parameters if not already loaded */
+	if(!morseidfreq){ /* Get the morse parameters if not already loaded */
 		morsespeed = retrieve_astcfgint(myrpt, mcat, "speed", 5, 20, 20);
-		morsefreq = retrieve_astcfgint(myrpt, mcat, "frequency", 300, 3000, 800);
-		morseampl = retrieve_astcfgint(myrpt, mcat, "amplitude", 200, 8192, 4096);
+        	morsefreq = retrieve_astcfgint(myrpt, mcat, "frequency", 300, 3000, 800);
+        	morseampl = retrieve_astcfgint(myrpt, mcat, "amplitude", 200, 8192, 4096);
 		morseidampl = retrieve_astcfgint(myrpt, mcat, "idamplitude", 200, 8192, 2048);
 		morseidfreq = retrieve_astcfgint(myrpt, mcat, "idfrequency", 300, 3000, 330);	
 	}
 	
 	/* Is it a file, or a tone sequence? */
 			
-	if (entry[0] == '|') {
+	if(entry[0] == '|'){
 		c = entry[1];
-		if ((c >= 'a') && (c <= 'z'))
+		if((c >= 'a')&&(c <= 'z'))
 			c -= 0x20;
 	
-		switch (c) {
-		case 'I': /* Morse ID */
-			res = send_morse(chan, entry + 2, morsespeed, morseidfreq, morseidampl);
-			break;
-		case 'M': /* Morse Message */
-			res = send_morse(chan, entry + 2, morsespeed, morsefreq, morseampl);
-			break;
-		case 'T': /* Tone sequence */
-			res = send_tone_telemetry(chan, entry + 2);
-			break;
-		default:
-			res = -1;
+		switch(c){
+			case 'I': /* Morse ID */
+				res = send_morse(chan, entry + 2, morsespeed, morseidfreq, morseidampl);
+				break;
+			
+			case 'M': /* Morse Message */
+				res = send_morse(chan, entry + 2, morsespeed, morsefreq, morseampl);
+				break;
+			
+			case 'T': /* Tone sequence */
+				res = send_tone_telemetry(chan, entry + 2);
+				break;
+			default:
+				res = -1;
 		}
-	} else
+	}
+	else
 		res = sayfile(chan, entry); /* File */
 	return res;
 }
@@ -1809,32 +3789,48 @@ static int telem_any(struct rpt *myrpt, struct ast_channel *chan, const char *en
 * 4 types of telemtry are handled: Morse ID, Morse Message, Tone Sequence, and a File containing a recording.
 */
 
-static int telem_lookup(struct rpt *myrpt, struct ast_channel *chan, const char *node, const char *name)
+static int telem_lookup(struct rpt *myrpt,struct ast_channel *chan, char *node, char *name)
 {
-	int res = 0;
+	
+	int res;
 	int i;
-	const char *entry = NULL;
-	const char *telemetry;
+	char *entry;
+	char *telemetry;
+	char *telemetry_save;
 
+	res = 0;
+	telemetry_save = NULL;
+	entry = NULL;
+	
 	/* Retrieve the section name for telemetry from the node section */
-	if ((telemetry = ast_variable_retrieve(myrpt->cfg, node, TELEMETRY)))
-		entry = ast_variable_retrieve(myrpt->cfg, telemetry, name);
-
+	telemetry = (char *) ast_variable_retrieve(myrpt->cfg, node, TELEMETRY);
+	if(telemetry ){
+		telemetry_save = ast_strdup(telemetry);
+		if(!telemetry_save){
+			ast_log(LOG_WARNING,"ast_strdup() failed in telem_lookup()\n");
+			return res;
+		}
+		entry = (char *) ast_variable_retrieve(myrpt->cfg, telemetry_save, name);
+	}
+	
 	/* Try to look up the telemetry name */	
 
-	if (!entry) {
+	if(!entry){
 		/* Telemetry name wasn't found in the config file, use the default */
-		for (i = 0; i < sizeof(tele_defs) / sizeof(struct telem_defaults); i++) {
-			if (!strcasecmp(tele_defs[i].name, name))
+		for(i = 0; i < sizeof(tele_defs)/sizeof(struct telem_defaults) ; i++){
+			if(!strcasecmp(tele_defs[i].name, name))
 				entry = tele_defs[i].value;
 		}
 	}
-	if (entry) {	
-		if (!ast_strlen_zero(entry))
-			telem_any(myrpt, chan, entry);
-	} else {
+	if(entry){	
+		if(strlen(entry))
+			if (chan) telem_any(myrpt,chan, entry);
+	}
+	else{
 		res = -1;
 	}
+	if(telemetry_save)
+		ast_free(telemetry_save);
 	return res;
 }
 
@@ -1844,175 +3840,285 @@ static int telem_lookup(struct rpt *myrpt, struct ast_channel *chan, const char
 
 static int get_wait_interval(struct rpt *myrpt, int type)
 {
-	int interval = 1000;
-	const char *wait_times = ast_variable_retrieve(myrpt->cfg, myrpt->name, "wait_times");
-
-	switch (type) {
-	case DLY_TELEM:
-		if (wait_times)
-			interval = retrieve_astcfgint(myrpt, wait_times, "telemwait", 500, 5000, 1000);
-		break;
-	case DLY_ID:
-		if (wait_times)
-			interval = retrieve_astcfgint(myrpt, wait_times, "idwait", 250, 5000, 500);
-		else
-			interval = 500;
-		break;
-	case DLY_UNKEY:
-		if (wait_times)
-			interval = retrieve_astcfgint(myrpt, wait_times, "unkeywait", 500, 5000, 1000);
-		break;
-	case DLY_CALLTERM:
-		if (wait_times)
-			interval = retrieve_astcfgint(myrpt, wait_times, "calltermwait", 500, 5000, 1500);
-		break;
-	default:
-		return 0;
-	}
+        int interval;
+        char *wait_times;
+        char *wait_times_save;
+                                                                                                                  
+        wait_times_save = NULL;
+        wait_times = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->name, "wait_times");
+                                                                                                                  
+        if(wait_times){
+                wait_times_save = ast_strdup(wait_times);
+                if(!wait_times_save)
+			return 0;
+                
+        }
+                                                                                                                  
+        switch(type){
+                case DLY_TELEM:
+                        if(wait_times)
+                                interval = retrieve_astcfgint(myrpt,wait_times_save, "telemwait", 500, 5000, 1000);
+                        else
+                                interval = 1000;
+                        break;
+                                                                                                                  
+                case DLY_ID:
+                        if(wait_times)
+                                interval = retrieve_astcfgint(myrpt,wait_times_save, "idwait",250,5000,500);
+                        else
+                                interval = 500;
+                        break;
+                                                                                                                  
+                case DLY_UNKEY:
+                        if(wait_times)
+                                interval = retrieve_astcfgint(myrpt,wait_times_save, "unkeywait",50,5000,1000);
+                        else
+                                interval = 1000;
+                        break;
+                                                                                                                  
+                case DLY_LINKUNKEY:
+                        if(wait_times)
+                                interval = retrieve_astcfgint(myrpt,wait_times_save, "linkunkeywait",500,5000,1000);
+                        else
+                                interval = 1000;
+                        break;
+                                                                                                                  
+                case DLY_CALLTERM:
+                        if(wait_times)
+                                interval = retrieve_astcfgint(myrpt,wait_times_save, "calltermwait",500,5000,1500);
+                        else
+                                interval = 1500;
+                        break;
+                                                                                                                  
+                case DLY_COMP:
+                        if(wait_times)
+                                interval = retrieve_astcfgint(myrpt,wait_times_save, "compwait",500,5000,200);
+                        else
+                                interval = 200;
+                        break;
+                                                                                                                  
+                case DLY_PARROT:
+                        if(wait_times)
+                                interval = retrieve_astcfgint(myrpt,wait_times_save, "parrotwait",500,5000,200);
+                        else
+                                interval = 200;
+                        break;
+                                                                                                                  
+                default:
+			interval = 0;
+			break;
+        }
+	if(wait_times_save)
+       		ast_free(wait_times_save);
 	return interval;
-}
+}                                                                                                                  
 
 
 /*
 * Wait a configurable interval of time 
 */
-
-
 static void wait_interval(struct rpt *myrpt, int type, struct ast_channel *chan)
 {
 	int interval;
 	interval = get_wait_interval(myrpt, type);
-	if (debug)
-		ast_log(LOG_NOTICE, " Delay interval = %d\n", interval);
-	if (interval)
-		ast_safe_sleep(chan, interval);
-	if (debug)
-		ast_log(LOG_NOTICE, "Delay complete\n");
+	if(debug)
+		ast_log(LOG_NOTICE,"Delay interval = %d\n", interval);
+	if(interval)
+		ast_safe_sleep(chan,interval);
+	if(debug)
+		ast_log(LOG_NOTICE,"Delay complete\n");
 	return;
 }
 
+static int split_freq(char *mhz, char *decimals, char *freq);
 
 static void *rpt_tele_thread(void *this)
 {
-	ZT_CONFINFO ci;  /* conference info */
-	int	res = 0, haslink, hastx, hasremote, imdone = 0, unkeys_queued, x;
-	struct rpt_tele *mytele = (struct rpt_tele *)this;
-	struct rpt_tele *tlist;
-	struct rpt *myrpt;
-	struct rpt_link *l, *m, linkbase;
-	struct ast_channel *mychannel;
-	const char *p, *ct;
-	struct timeval tv;
-	struct ast_tm localtm;
-#ifdef  APP_RPT_LOCK_DEBUG
-	struct lockthread *t;
+ZT_CONFINFO ci;  /* conference info */
+int	res = 0,haslink,hastx,hasremote,imdone = 0, unkeys_queued, x;
+struct	rpt_tele *mytele = (struct rpt_tele *)this;
+struct  rpt_tele *tlist;
+struct	rpt *myrpt;
+struct	rpt_link *l,*l1,linkbase;
+struct	ast_channel *mychannel;
+int id_malloc, vmajor, vminor, m;
+char *p,*ct,*ct_copy,*ident, *nodename,*cp;
+time_t t;
+#ifdef	NEW_ASTERISK
+struct ast_tm localtm;
+#else
+struct tm localtm;
 #endif
+char lbuf[MAXLINKLIST],*strs[MAXLINKLIST];
+int	i,ns,rbimode;
+char mhz[MAXREMSTR];
+char decimals[MAXREMSTR];
+char	mystr[200];
+struct zt_params par;
+
 
 	/* get a pointer to myrpt */
 	myrpt = mytele->rpt;
 
 	/* Snag copies of a few key myrpt variables */
 	rpt_mutex_lock(&myrpt->lock);
+	nodename = ast_strdup(myrpt->name);
+	if(!nodename)
+	{
+	    fprintf(stderr,"rpt:Sorry unable strdup nodename\n");
+	    rpt_mutex_lock(&myrpt->lock);
+	    remque((struct qelem *)mytele);
+	    ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
+	    rpt_mutex_unlock(&myrpt->lock);
+	    ast_free(mytele);
+	    pthread_exit(NULL);
+	}
+
+	if (myrpt->p.ident){
+		ident = ast_strdup(myrpt->p.ident);
+        	if(!ident)
+		{
+        	        fprintf(stderr,"rpt:Sorry unable strdup ident\n");
+			rpt_mutex_lock(&myrpt->lock);
+                	remque((struct qelem *)mytele);
+                	ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",
+			__LINE__, mytele->mode); /*@@@@@@@@@@@*/
+                	rpt_mutex_unlock(&myrpt->lock);
+			ast_free(nodename);
+                	ast_free(mytele);
+                	pthread_exit(NULL);
+        	}
+		else{
+			id_malloc = 1;
+		}
+	}
+	else
+	{
+		ident = "";
+		id_malloc = 0;
+	}
 	rpt_mutex_unlock(&myrpt->lock);
-	
+		
+
+
 	/* allocate a pseudo-channel thru asterisk */
-	mychannel = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
-	if (!mychannel) {
-		ast_log(LOG_WARNING, "rpt: unable to obtain pseudo channel\n");
+	mychannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!mychannel)
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
 		rpt_mutex_lock(&myrpt->lock);
 		remque((struct qelem *)mytele);
-		ast_log(LOG_NOTICE, "Telemetry thread aborted at line %d, mode: %d\n", __LINE__, mytele->mode); /*@@@@@@@@@@@*/
+		ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
 		rpt_mutex_unlock(&myrpt->lock);
-		ast_free(mytele);
+		ast_free(nodename);
+		if(id_malloc)
+			ast_free(ident);
+		ast_free(mytele);		
 		pthread_exit(NULL);
 	}
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (mychannel->cdr) 
+		ast_set_flag(mychannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
 	rpt_mutex_lock(&myrpt->lock);
-	mytele->chan = mychannel; /* Save a copy of the channel so we can access it externally if need be */
+	mytele->chan = mychannel;
 	rpt_mutex_unlock(&myrpt->lock);
-	
+
+	while((mytele->mode != SETREMOTE) && (mytele->mode != UNKEY) &&
+		(mytele->mode != LINKUNKEY))
+	{	
+                rpt_mutex_lock(&myrpt->lock);
+		if (!myrpt->active_telem)
+		{
+			myrpt->active_telem = mytele;
+	                rpt_mutex_unlock(&myrpt->lock);
+			break;
+		}
+                rpt_mutex_unlock(&myrpt->lock);
+		usleep(100000);
+	}
+
 	/* make a conference for the tx */
 	ci.chan = 0;
-	/* If there's an ID queued, or tail message queued, */
+	/* If the telemetry is only intended for a local audience, */
 	/* only connect the ID audio to the local tx conference so */
 	/* linked systems can't hear it */
 	ci.confno = (((mytele->mode == ID) || (mytele->mode == IDTALKOVER) || (mytele->mode == UNKEY) || 
-		(mytele->mode == TAILMSG)) ?
+		(mytele->mode == TAILMSG) || (mytele->mode == LINKUNKEY) || (mytele->mode == TIMEOUT) || 
+		(mytele->mode == PARROT) || (mytele->mode == STATS_TIME_LOCAL)) ? 
 		 	myrpt->txconf : myrpt->conf);
 	ci.confmode = ZT_CONF_CONFANN;
 	/* first put the channel on the conference in announce mode */
-	if (ioctl(mychannel->fds[0], ZT_SETCONF, &ci) == -1) {
+	if (ioctl(mychannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
 		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 		rpt_mutex_lock(&myrpt->lock);
+		myrpt->active_telem = NULL;
 		remque((struct qelem *)mytele);
 		rpt_mutex_unlock(&myrpt->lock);
-		ast_log(LOG_NOTICE, "Telemetry thread aborted at line %d, mode: %d\n", __LINE__, mytele->mode); /*@@@@@@@@@@@*/
-		ast_free(mytele);
+		ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
+		ast_free(nodename);
+		if(id_malloc)
+			ast_free(ident);
+		ast_free(mytele);		
 		ast_hangup(mychannel);
 		pthread_exit(NULL);
 	}
 	ast_stopstream(mychannel);
-	switch (mytele->mode) {
-	case ID:
-	case ID1:
+	switch(mytele->mode)
+	{
+	    case ID:
+	    case ID1:
 		/* wait a bit */
-		wait_interval(myrpt, (mytele->mode == ID) ? DLY_ID : DLY_TELEM, mychannel);
-		res = telem_any(myrpt, mychannel, myrpt->p.ident); 
+		wait_interval(myrpt, (mytele->mode == ID) ? DLY_ID : DLY_TELEM,mychannel);
+		res = telem_any(myrpt,mychannel, ident); 
 		imdone=1;	
 		break;
 		
-	case TAILMSG:
-		res = ast_streamfile(mychannel, myrpt->p.tailmsg.msgs[myrpt->tailmessagen], mychannel->language); 
+	    case TAILMSG:
+		res = ast_streamfile(mychannel, myrpt->p.tailmessages[myrpt->tailmessagen], mychannel->language); 
 		break;
 		
-	case IDTALKOVER:
-		p = ast_variable_retrieve(myrpt->cfg, myrpt->name, "idtalkover");
-		if (p)
-			res = telem_any(myrpt, mychannel, p); 
-		imdone = 1;	
-		break;
-	case PROC:
+	    case IDTALKOVER:
+	    	p = (char *) ast_variable_retrieve(myrpt->cfg, nodename, "idtalkover");
+	    	if(p)
+			res = telem_any(myrpt,mychannel, p); 
+		imdone=1;	
+	    	break;
+	    		
+	    case PROC:
 		/* wait a little bit longer */
 		wait_interval(myrpt, DLY_TELEM, mychannel);
 		res = telem_lookup(myrpt, mychannel, myrpt->name, "patchup");
-		if (res < 0) { /* Then default message */
+		if(res < 0){ /* Then default message */
 			res = ast_streamfile(mychannel, "rpt/callproceeding", mychannel->language);
 		}
 		break;
-	case TERM:
+	    case TERM:
 		/* wait a little bit longer */
 		wait_interval(myrpt, DLY_CALLTERM, mychannel);
 		res = telem_lookup(myrpt, mychannel, myrpt->name, "patchdown");
-		if (res < 0) { /* Then default message */
+		if(res < 0){ /* Then default message */
 			res = ast_streamfile(mychannel, "rpt/callterminated", mychannel->language);
 		}
 		break;
-	case COMPLETE:
+	    case COMPLETE:
 		/* wait a little bit */
 		wait_interval(myrpt, DLY_TELEM, mychannel);
-		res = telem_lookup(myrpt, mychannel, myrpt->name, "functcomplete");
+		res = telem_lookup(myrpt,mychannel, myrpt->name, "functcomplete");
 		break;
-	case MACRO_NOTFOUND:
+	    case MACRO_NOTFOUND:
 		/* wait a little bit */
 		wait_interval(myrpt, DLY_TELEM, mychannel);
 		res = ast_streamfile(mychannel, "rpt/macro_notfound", mychannel->language);
 		break;
-	case GOSUB_NOTFOUND:
-		/* wait a little bit */
-		wait_interval(myrpt, DLY_TELEM, mychannel);
-		res = ast_streamfile(mychannel, "rpt/gosub_notfound", mychannel->language);
-		break;
-	case MACRO_BUSY:
+	    case MACRO_BUSY:
 		/* wait a little bit */
 		wait_interval(myrpt, DLY_TELEM, mychannel);
 		res = ast_streamfile(mychannel, "rpt/macro_busy", mychannel->language);
 		break;
-	case GOSUB_BUSY:
-		/* wait a little bit */
-		wait_interval(myrpt, DLY_TELEM, mychannel);
-		res = ast_streamfile(mychannel, "rpt/gosub_busy", mychannel->language);
-		break;
-	case UNKEY:
-		if (myrpt->patchnoct && myrpt->callmode) { /* If no CT during patch configured, then don't send one */
+	    case UNKEY:
+		if(myrpt->patchnoct && myrpt->callmode){ /* If no CT during patch configured, then don't send one */
 			imdone = 1;
 			break;
 		}
@@ -2032,31 +4138,32 @@ static void *rpt_tele_thread(void *this)
 
 		tlist = myrpt->tele.next;
 		unkeys_queued = 0;
-		if (tlist != &myrpt->tele) {
-			rpt_mutex_lock(&myrpt->lock);
-			while (tlist != &myrpt->tele) {
-				if (tlist->mode == UNKEY)
-					unkeys_queued++;
-				tlist = tlist->next;
-			}
-			rpt_mutex_unlock(&myrpt->lock);
-		}
-		if (unkeys_queued > 1) {
+                if (tlist != &myrpt->tele)
+                {
+                        rpt_mutex_lock(&myrpt->lock);
+                        while(tlist != &myrpt->tele){
+                                if (tlist->mode == UNKEY) unkeys_queued++;
+                                tlist = tlist->next;
+                        }
+                        rpt_mutex_unlock(&myrpt->lock);
+		}
+		if( unkeys_queued > 1){
 			imdone = 1;
 			break;
 		}
 
 		/* Wait for the telemetry timer to expire */
 		/* Periodically check the timer since it can be re-initialized above */
-		while (myrpt->unkeytocttimer) {
+		while(myrpt->unkeytocttimer)
+		{
 			int ctint;
-			if (myrpt->unkeytocttimer > 100)
+			if(myrpt->unkeytocttimer > 100)
 				ctint = 100;
 			else
 				ctint = myrpt->unkeytocttimer;
 			ast_safe_sleep(mychannel, ctint);
 			rpt_mutex_lock(&myrpt->lock);
-			if (myrpt->unkeytocttimer < ctint)
+			if(myrpt->unkeytocttimer < ctint)
 				myrpt->unkeytocttimer = 0;
 			else
 				myrpt->unkeytocttimer -= ctint;
@@ -2067,7 +4174,7 @@ static void *rpt_tele_thread(void *this)
 		* Now, the carrier on the rptr rx should be gone. 
 		* If it re-appeared, then forget about sending the CT
 		*/
-		if (myrpt->keyed) {
+		if(myrpt->keyed){
 			imdone = 1;
 			break;
 		}
@@ -2081,143 +4188,609 @@ static void *rpt_tele_thread(void *this)
 		hastx = 0;
 		hasremote = 0;		
 		l = myrpt->links.next;
-		if (l != &myrpt->links) {
+		if (l != &myrpt->links)
+		{
 			rpt_mutex_lock(&myrpt->lock);
-			while (l != &myrpt->links) {
-				if (l->name[0] == '0') {
+			while(l != &myrpt->links)
+			{
+				if (l->name[0] == '0')
+				{
 					l = l->next;
 					continue;
 				}
 				haslink = 1;
 				if (l->mode) {
 					hastx++;
-					if (l->isremote)
-						hasremote++;
+					if (l->isremote) hasremote++;
 				}
 				l = l->next;
 			}
 			rpt_mutex_unlock(&myrpt->lock);
 		}
-		if (haslink) {
-			res = telem_lookup(myrpt, mychannel, myrpt->name, (!hastx) ? "remotemon" : "remotetx");
-			if (res)
-				ast_log(LOG_WARNING, "telem_lookup:remotexx failed on %s\n", mychannel->name);
+		if (haslink)
+		{
 
+			res = telem_lookup(myrpt,mychannel, myrpt->name, (!hastx) ? "remotemon" : "remotetx");
+			if(res)
+				ast_log(LOG_WARNING, "telem_lookup:remotexx failed on %s\n", mychannel->name);
+			
+		
 			/* if in remote cmd mode, indicate it */
-			if (myrpt->cmdnode[0]) {
-				ast_safe_sleep(mychannel, 200);
-				res = telem_lookup(myrpt, mychannel, myrpt->name, "cmdmode");
-				if (res)
+			if (myrpt->cmdnode[0])
+			{
+				ast_safe_sleep(mychannel,200);
+				res = telem_lookup(myrpt,mychannel, myrpt->name, "cmdmode");
+				if(res)
 				 	ast_log(LOG_WARNING, "telem_lookup:cmdmode failed on %s\n", mychannel->name);
 				ast_stopstream(mychannel);
 			}
-		} else if ((ct = ast_variable_retrieve(myrpt->cfg, myrpt->name, "unlinkedct"))) { /* Unlinked Courtesy Tone */
-			res = telem_lookup(myrpt, mychannel, myrpt->name, ct);
-			if (res)
+		}
+		else if((ct = (char *) ast_variable_retrieve(myrpt->cfg, nodename, "unlinkedct"))){ /* Unlinked Courtesy Tone */
+			ct_copy = ast_strdup(ct);
+			if(ct_copy)
+			{
+				res = telem_lookup(myrpt,mychannel, myrpt->name, ct_copy);
+				ast_free(ct_copy);
+			}
+			else
+				res = -1;
+			if(res)
 			 	ast_log(LOG_WARNING, "telem_lookup:ctx failed on %s\n", mychannel->name);		
 		}	
-		if (hasremote && (!myrpt->cmdnode[0])) {
+		if (hasremote && (!myrpt->cmdnode[0]))
+		{
 			/* set for all to hear */
 			ci.chan = 0;
 			ci.confno = myrpt->conf;
 			ci.confmode = ZT_CONF_CONFANN;
 			/* first put the channel on the conference in announce mode */
-			if (ioctl(mychannel->fds[0], ZT_SETCONF, &ci) == -1) {
+			if (ioctl(mychannel->fds[0],ZT_SETCONF,&ci) == -1)
+			{
 				ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 				rpt_mutex_lock(&myrpt->lock);
+				myrpt->active_telem = NULL;
 				remque((struct qelem *)mytele);
 				rpt_mutex_unlock(&myrpt->lock);
-				ast_log(LOG_NOTICE, "Telemetry thread aborted at line %d, mode: %d\n", __LINE__, mytele->mode); /*@@@@@@@@@@@*/
-				ast_free(mytele);
+				ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
+				ast_free(nodename);
+				if(id_malloc)
+					ast_free(ident);
+				ast_free(mytele);		
 				ast_hangup(mychannel);
 				pthread_exit(NULL);
 			}
-			if ((ct = ast_variable_retrieve(myrpt->cfg, myrpt->name, "remotect"))) { /* Unlinked Courtesy Tone */
-				ast_safe_sleep(mychannel, 200);
-				res = telem_lookup(myrpt, mychannel, myrpt->name, ct);
-				if (res)
+			if((ct = (char *) ast_variable_retrieve(myrpt->cfg, nodename, "remotect"))){ /* Unlinked Courtesy Tone */
+				ast_safe_sleep(mychannel,200);
+				ct_copy = ast_strdup(ct);
+				if(ct_copy)
+				{
+					res = telem_lookup(myrpt,mychannel, myrpt->name, ct_copy);
+					ast_free(ct_copy);
+				}
+				else
+					res = -1;
+		
+				if(res)
 				 	ast_log(LOG_WARNING, "telem_lookup:ctx failed on %s\n", mychannel->name);		
 			}	
 		}
-#ifdef	_MDC_DECODE_H_
-		if (myrpt->lastunit) {
+#if	defined(_MDC_DECODE_H_) && defined(MDC_SAY_WHEN_DOING_CT)
+		if (myrpt->lastunit)
+		{
 			char mystr[10];
 
-			ast_safe_sleep(mychannel, 200);
+			ast_safe_sleep(mychannel,200);
 			/* set for all to hear */
 			ci.chan = 0;
 			ci.confno = myrpt->txconf;
 			ci.confmode = ZT_CONF_CONFANN;
 			/* first put the channel on the conference in announce mode */
-			if (ioctl(mychannel->fds[0], ZT_SETCONF, &ci) == -1) {
+			if (ioctl(mychannel->fds[0],ZT_SETCONF,&ci) == -1)
+			{
 				ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 				rpt_mutex_lock(&myrpt->lock);
+				myrpt->active_telem = NULL;
 				remque((struct qelem *)mytele);
 				rpt_mutex_unlock(&myrpt->lock);
-				ast_log(LOG_NOTICE, "Telemetry thread aborted at line %d, mode: %d\n", __LINE__, mytele->mode); /*@@@@@@@@@@@*/
+				ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
+				ast_free(nodename);
+				if(id_malloc)
+					ast_free(ident);
 				ast_free(mytele);		
 				ast_hangup(mychannel);
 				pthread_exit(NULL);
 			}
-			snprintf(mystr, sizeof(mystr), "%04x", myrpt->lastunit);
+			sprintf(mystr,"%04x",myrpt->lastunit);
 			myrpt->lastunit = 0;
-			ast_say_character_str(mychannel, mystr, NULL, mychannel->language);
+			ast_say_character_str(mychannel,mystr,NULL,mychannel->language);
 			break;
 		}
 #endif
 		imdone = 1;
 		break;
-	case REMDISC:
+	    case LINKUNKEY:
+		if(myrpt->patchnoct && myrpt->callmode){ /* If no CT during patch configured, then don't send one */
+			imdone = 1;
+			break;
+		}
+			
+		/*
+		* Reset the Unkey to CT timer
+		*/
+
+		x = get_wait_interval(myrpt, DLY_LINKUNKEY);
+		mytele->mylink.linkunkeytocttimer = x; /* Must be protected as it is changed below */
+
+		/*
+		* If there's one already queued, don't do another
+		*/
+
+		tlist = myrpt->tele.next;
+		unkeys_queued = 0;
+                if (tlist != &myrpt->tele)
+                {
+                        rpt_mutex_lock(&myrpt->lock);
+                        while(tlist != &myrpt->tele){
+                                if (tlist->mode == LINKUNKEY) unkeys_queued++;
+                                tlist = tlist->next;
+                        }
+                        rpt_mutex_unlock(&myrpt->lock);
+		}
+		if( unkeys_queued > 1){
+			imdone = 1;
+			break;
+		}
+
+		/* Wait for the telemetry timer to expire */
+		/* Periodically check the timer since it can be re-initialized above */
+		while(mytele->mylink.linkunkeytocttimer)
+		{
+			int ctint;
+			if(mytele->mylink.linkunkeytocttimer > 100)
+				ctint = 100;
+			else
+				ctint = mytele->mylink.linkunkeytocttimer;
+			ast_safe_sleep(mychannel, ctint);
+			rpt_mutex_lock(&myrpt->lock);
+			if(mytele->mylink.linkunkeytocttimer < ctint)
+				mytele->mylink.linkunkeytocttimer = 0;
+			else
+				mytele->mylink.linkunkeytocttimer -= ctint;
+			rpt_mutex_unlock(&myrpt->lock);
+		}
+	
+		if((ct = (char *) ast_variable_retrieve(myrpt->cfg, nodename, "linkunkeyct"))){ /* Unlinked Courtesy Tone */
+			ct_copy = ast_strdup(ct);
+			if(ct_copy){
+				res = telem_lookup(myrpt,mychannel, myrpt->name, ct_copy);
+				ast_free(ct_copy);
+			}
+			else
+				res = -1;
+			if(res)
+			 	ast_log(LOG_WARNING, "telem_lookup:ctx failed on %s\n", mychannel->name);		
+		}	
+		imdone = 1;
+		break;
+	    case REMDISC:
 		/* wait a little bit */
 		wait_interval(myrpt, DLY_TELEM, mychannel);
-		res = ast_streamfile(mychannel, "rpt/node", mychannel->language);
+		l = myrpt->links.next;
+		haslink = 0;
+		/* dont report if a link for this one still on system */
+		if (l != &myrpt->links)
+		{
+			rpt_mutex_lock(&myrpt->lock);
+			while(l != &myrpt->links)
+			{
+				if (l->name[0] == '0')
+				{
+					l = l->next;
+					continue;
+				}
+				if (!strcmp(l->name,mytele->mylink.name))
+				{
+					haslink = 1;
+					break;
+				}
+				l = l->next;
+			}
+			rpt_mutex_unlock(&myrpt->lock);
+		}
+		if (haslink)
+		{
+			imdone = 1;
+			break;
+		}
+		res = saynode(myrpt,mychannel,mytele->mylink.name);
 		if (!res) 
-			res = ast_waitstream(mychannel, "");
-		else
-			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
-		ast_stopstream(mychannel);
-		ast_say_character_str(mychannel, mytele->mylink.name, NULL, mychannel->language);
-		res = ast_streamfile(mychannel, ((mytele->mylink.connected) ? 
+		    res = ast_streamfile(mychannel, ((mytele->mylink.hasconnected) ? 
 			"rpt/remote_disc" : "rpt/remote_busy"), mychannel->language);
 		break;
-	case REMALREADY:
+	    case REMALREADY:
 		/* wait a little bit */
 		wait_interval(myrpt, DLY_TELEM, mychannel);
 		res = ast_streamfile(mychannel, "rpt/remote_already", mychannel->language);
 		break;
-	case REMNOTFOUND:
+	    case REMNOTFOUND:
 		/* wait a little bit */
 		wait_interval(myrpt, DLY_TELEM, mychannel);
 		res = ast_streamfile(mychannel, "rpt/remote_notfound", mychannel->language);
 		break;
-	case REMGO:
+	    case REMGO:
 		/* wait a little bit */
 		wait_interval(myrpt, DLY_TELEM, mychannel);
 		res = ast_streamfile(mychannel, "rpt/remote_go", mychannel->language);
 		break;
-	case CONNECTED:
+	    case CONNECTED:
 		/* wait a little bit */
 		wait_interval(myrpt, DLY_TELEM,  mychannel);
-		res = ast_streamfile(mychannel, "rpt/node", mychannel->language);
+		res = saynode(myrpt,mychannel,mytele->mylink.name);
+		if (!res)
+		    res = ast_streamfile(mychannel, "rpt/connected", mychannel->language);
 		if (!res) 
 			res = ast_waitstream(mychannel, "");
 		else
 			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 		ast_stopstream(mychannel);
-		ast_say_character_str(mychannel, mytele->mylink.name, NULL, mychannel->language);
-		res = ast_streamfile(mychannel, "rpt/connected", mychannel->language);
-		break;
-	case CONNFAIL:
-		res = ast_streamfile(mychannel, "rpt/node", mychannel->language);
+		res = ast_streamfile(mychannel, "digits/2", mychannel->language);
 		if (!res) 
 			res = ast_waitstream(mychannel, "");
 		else
 			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 		ast_stopstream(mychannel);
-		ast_say_character_str(mychannel, mytele->mylink.name, NULL, mychannel->language);
-		res = ast_streamfile(mychannel, "rpt/connection_failed", mychannel->language);
+		res = saynode(myrpt,mychannel,myrpt->name);
+		imdone = 1;
+		break;
+	    case CONNFAIL:
+		res = saynode(myrpt,mychannel,mytele->mylink.name);
+		if (!res) 
+		    res = ast_streamfile(mychannel, "rpt/connection_failed", mychannel->language);
+		break;
+	    case MEMNOTFOUND:
+		/* wait a little bit */
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		res = ast_streamfile(mychannel, "rpt/memory_notfound", mychannel->language);
+		break;
+	    case PLAYBACK:
+		/* wait a little bit */
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		res = ast_streamfile(mychannel, mytele->param, mychannel->language);
+		break;
+	    case TOPKEY:
+		/* wait a little bit */
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		for(i = 0; i < TOPKEYN; i++)
+		{
+			if (!myrpt->topkey[i].node[0]) continue;
+			if ((!myrpt->topkeylong) && (myrpt->topkey[i].keyed)) continue;
+			res = saynode(myrpt, mychannel,	myrpt->topkey[i].node);
+			if (!res) res = sayfile(mychannel,(myrpt->topkey[i].keyed) ?
+				"rpt/keyedfor" : "rpt/unkeyedfor");
+			if (!res) res = saynum(mychannel,
+				myrpt->topkey[i].timesince);
+			if (!res) res = sayfile(mychannel,"rpt/seconds");
+			if (!myrpt->topkeylong) break;
+		}
+		imdone = 1;
+		break;
+	    case SETREMOTE:
+		ast_mutex_lock(&myrpt->remlock);
+		res = 0;
+		if(!strcmp(myrpt->remoterig, remote_rig_ft897))
+		{
+			res = set_ft897(myrpt);
+		}
+		else if(!strcmp(myrpt->remoterig, remote_rig_tm271))
+		{
+			res = set_tm271(myrpt);
+		}
+		else if(!strcmp(myrpt->remoterig, remote_rig_ic706))
+		{
+			res = set_ic706(myrpt);
+		}
+		else if(!strcmp(myrpt->remoterig, remote_rig_rbi)||!strcmp(myrpt->remoterig, remote_rig_ppp16))
+		{
+			if (ioperm(myrpt->p.iobase,1,1) == -1)
+			{
+				rpt_mutex_unlock(&myrpt->lock);
+				ast_log(LOG_WARNING, "Cant get io permission on IO port %x hex\n",myrpt->p.iobase);
+				res = -1;
+			}
+			else res = setrbi(myrpt);
+		}
+		else if(!strcmp(myrpt->remoterig, remote_rig_kenwood))
+		{
+			if (myrpt->iofd >= 0) setdtr(myrpt->iofd,1);
+			res = setkenwood(myrpt);
+			if (myrpt->iofd >= 0) setdtr(myrpt->iofd,0);
+			if (ast_safe_sleep(mychannel,200) == -1)
+			{
+				ast_mutex_unlock(&myrpt->remlock);
+				res = -1;
+				break;
+			}
+			if (myrpt->iofd < 0)
+			{
+				i = ZT_FLUSH_EVENT;
+				if (ioctl(myrpt->zaptxchannel->fds[0],ZT_FLUSH,&i) == -1)
+				{
+					ast_mutex_unlock(&myrpt->remlock);
+					ast_log(LOG_ERROR,"Cant flush events");
+					res = -1;
+					break;
+				}
+				if (ioctl(myrpt->zaprxchannel->fds[0],ZT_GET_PARAMS,&par) == -1)
+				{
+					ast_mutex_unlock(&myrpt->remlock);
+					ast_log(LOG_ERROR,"Cant get params");
+					res = -1;
+					break;
+				}
+				myrpt->remoterx = 
+					(par.rxisoffhook || (myrpt->tele.next != &myrpt->tele));
+			}
+		}
+
+		ast_mutex_unlock(&myrpt->remlock);
+		if (!res)
+		{
+			imdone = 1;
+			break;
+		}
+		/* fall thru to invalid freq */
+	    case INVFREQ:
+		/* wait a little bit */
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		res = ast_streamfile(mychannel, "rpt/invalid-freq", mychannel->language);
+		break;
+	    case REMMODE:
+		cp = 0;
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		switch(myrpt->remmode)
+		{
+		    case REM_MODE_FM:
+			saycharstr(mychannel,"FM");
+			break;
+		    case REM_MODE_USB:
+			saycharstr(mychannel,"USB");
+			break;
+		    case REM_MODE_LSB:
+			saycharstr(mychannel,"LSB");
+			break;
+		    case REM_MODE_AM:
+			saycharstr(mychannel,"AM");
+			break;
+		}
+		wait_interval(myrpt, DLY_COMP, mychannel);
+		if (!res) res = telem_lookup(myrpt,mychannel, myrpt->name, "functcomplete");
+		break;
+	    case LOGINREQ:
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		sayfile(mychannel,"rpt/login");
+		saycharstr(mychannel,myrpt->name);
+		break;
+	    case REMLOGIN:
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		saycharstr(mychannel,myrpt->loginuser);
+		saynode(myrpt,mychannel,myrpt->name);
+		wait_interval(myrpt, DLY_COMP, mychannel);
+		if (!res) res = telem_lookup(myrpt,mychannel, myrpt->name, "functcomplete");
+		break;
+	    case REMXXX:
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		res = 0;
+		switch(mytele->submode)
+		{
+		    case 100: /* RX PL Off */
+			sayfile(mychannel, "rpt/rxpl");
+			sayfile(mychannel, "rpt/off");
+			break;
+		    case 101: /* RX PL On */
+			sayfile(mychannel, "rpt/rxpl");
+			sayfile(mychannel, "rpt/on");
+			break;
+		    case 102: /* TX PL Off */
+			sayfile(mychannel, "rpt/txpl");
+			sayfile(mychannel, "rpt/off");
+			break;
+		    case 103: /* TX PL On */
+			sayfile(mychannel, "rpt/txpl");
+			sayfile(mychannel, "rpt/on");
+			break;
+		    case 104: /* Low Power */
+			sayfile(mychannel, "rpt/lopwr");
+			break;
+		    case 105: /* Medium Power */
+			sayfile(mychannel, "rpt/medpwr");
+			break;
+		    case 106: /* Hi Power */
+			sayfile(mychannel, "rpt/hipwr");
+			break;
+		    case 113: /* Scan down slow */
+			sayfile(mychannel,"rpt/down");
+			sayfile(mychannel, "rpt/slow");
+			break;
+		    case 114: /* Scan down quick */
+			sayfile(mychannel,"rpt/down");
+			sayfile(mychannel, "rpt/quick");
+			break;
+		    case 115: /* Scan down fast */
+			sayfile(mychannel,"rpt/down");
+			sayfile(mychannel, "rpt/fast");
+			break;
+		    case 116: /* Scan up slow */
+			sayfile(mychannel,"rpt/up");
+			sayfile(mychannel, "rpt/slow");
+			break;
+		    case 117: /* Scan up quick */
+			sayfile(mychannel,"rpt/up");
+			sayfile(mychannel, "rpt/quick");
+			break;
+		    case 118: /* Scan up fast */
+			sayfile(mychannel,"rpt/up");
+			sayfile(mychannel, "rpt/fast");
+			break;
+		    default:
+			res = -1;
+		}
+		wait_interval(myrpt, DLY_COMP, mychannel);
+		if (!res) res = telem_lookup(myrpt,mychannel, myrpt->name, "functcomplete");
+		break;
+	    case SCAN:
+		ast_mutex_lock(&myrpt->remlock);
+		if (myrpt->hfscanstop)
+		{
+			myrpt->hfscanstatus = 0;
+			myrpt->hfscanmode = 0;
+			myrpt->hfscanstop = 0;
+			mytele->mode = SCANSTAT;
+			ast_mutex_unlock(&myrpt->remlock);
+			if (ast_safe_sleep(mychannel,1000) == -1) break;
+			sayfile(mychannel, "rpt/stop"); 
+			imdone = 1;
+			break;
+		}
+		if (myrpt->hfscanstatus > -2) service_scan(myrpt);
+		i = myrpt->hfscanstatus;
+		myrpt->hfscanstatus = 0;
+		if (i) mytele->mode = SCANSTAT;
+		ast_mutex_unlock(&myrpt->remlock);
+		if (i < 0) sayfile(mychannel, "rpt/stop"); 
+		else if (i > 0) saynum(mychannel,i);
+		imdone = 1;
+		break;
+	    case TUNE:
+		ast_mutex_lock(&myrpt->remlock);
+		if (!strcmp(myrpt->remoterig,remote_rig_ic706))
+		{
+			set_mode_ic706(myrpt, REM_MODE_AM);
+			if(play_tone(mychannel, 800, 6000, 8192) == -1) break;
+			ast_safe_sleep(mychannel,500);
+			set_mode_ic706(myrpt, myrpt->remmode);
+			myrpt->tunerequest = 0;
+			ast_mutex_unlock(&myrpt->remlock);
+			imdone = 1;
+			break;
+		}
+		set_mode_ft897(myrpt, REM_MODE_AM);
+		simple_command_ft897(myrpt, 8);
+		if(play_tone(mychannel, 800, 6000, 8192) == -1) break;
+		simple_command_ft897(myrpt, 0x88);
+		ast_safe_sleep(mychannel,500);
+		set_mode_ft897(myrpt, myrpt->remmode);
+		myrpt->tunerequest = 0;
+		ast_mutex_unlock(&myrpt->remlock);
+		imdone = 1;
+		break;
+	    case REMSHORTSTATUS:
+	    case REMLONGSTATUS:	
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		res = saynode(myrpt,mychannel,myrpt->name);
+		if(!res)
+			res = sayfile(mychannel,"rpt/frequency");
+		if(!res)
+			res = split_freq(mhz, decimals, myrpt->freq);
+		if (!multimode_capable(myrpt)) decimals[3] = 0;
+		if(!res){
+			m = atoi(mhz);
+			if(m < 100)
+				res = saynum(mychannel, m);
+			else
+				res = saycharstr(mychannel, mhz);
+		}
+		if(!res)
+			res = sayfile(mychannel, "letters/dot");
+		if(!res)
+			res = saycharstr(mychannel, decimals);
+	
+		if(res)	break;
+		if(myrpt->remmode == REM_MODE_FM){ /* Mode FM? */
+			switch(myrpt->offset){
+	
+				case REM_MINUS:
+					res = sayfile(mychannel,"rpt/minus");
+					break;
+				
+				case REM_SIMPLEX:
+					res = sayfile(mychannel,"rpt/simplex");
+					break;
+					
+				case REM_PLUS:
+					res = sayfile(mychannel,"rpt/plus");
+					break;
+					
+				default:
+					break;
+			}
+		}
+		else{ /* Must be USB, LSB, or AM */
+			switch(myrpt->remmode){
+
+				case REM_MODE_USB:
+					res = saycharstr(mychannel, "USB");
+					break;
+
+				case REM_MODE_LSB:
+					res = saycharstr(mychannel, "LSB");
+					break;
+
+				case REM_MODE_AM:
+					res = saycharstr(mychannel, "AM");
+					break;
+
+
+				default:
+					break;
+			}
+		}
+
+		if (res == -1) break;
+
+		if(mytele->mode == REMSHORTSTATUS){ /* Short status? */
+			wait_interval(myrpt, DLY_COMP, mychannel);
+			if (!res) res = telem_lookup(myrpt,mychannel, myrpt->name, "functcomplete");
+			break;
+		}
+
+		if (strcmp(myrpt->remoterig,remote_rig_ic706))
+		{
+			switch(myrpt->powerlevel){
+
+				case REM_LOWPWR:
+					res = sayfile(mychannel,"rpt/lopwr") ;
+					break;
+				case REM_MEDPWR:
+					res = sayfile(mychannel,"rpt/medpwr");
+					break;
+				case REM_HIPWR:
+					res = sayfile(mychannel,"rpt/hipwr"); 
+					break;
+				}
+		}
+
+		rbimode = ((!strncmp(myrpt->remoterig,remote_rig_rbi,3))
+		  || (!strncmp(myrpt->remoterig,remote_rig_ic706,3)));
+		if (res || (sayfile(mychannel,"rpt/rxpl") == -1)) break;
+		if (rbimode && (sayfile(mychannel,"rpt/txpl") == -1)) break;
+		if ((sayfile(mychannel,"rpt/frequency") == -1) ||
+			(saycharstr(mychannel,myrpt->rxpl) == -1)) break;
+		if ((!rbimode) && ((sayfile(mychannel,"rpt/txpl") == -1) ||
+			(sayfile(mychannel,"rpt/frequency") == -1) ||
+			(saycharstr(mychannel,myrpt->txpl) == -1))) break;
+		if(myrpt->remmode == REM_MODE_FM){ /* Mode FM? */
+			if ((sayfile(mychannel,"rpt/rxpl") == -1) ||
+				(sayfile(mychannel,((myrpt->rxplon) ? "rpt/on" : "rpt/off")) == -1) ||
+				(sayfile(mychannel,"rpt/txpl") == -1) ||
+				(sayfile(mychannel,((myrpt->txplon) ? "rpt/on" : "rpt/off")) == -1))
+				{
+					break;
+				}
+		}
+		wait_interval(myrpt, DLY_COMP, mychannel);
+		if (!res) res = telem_lookup(myrpt,mychannel, myrpt->name, "functcomplete");
 		break;
-	case STATUS:
+	    case STATUS:
 		/* wait a little bit */
 		wait_interval(myrpt, DLY_TELEM, mychannel);
 		hastx = 0;
@@ -2226,73 +4799,132 @@ static void *rpt_tele_thread(void *this)
 		rpt_mutex_lock(&myrpt->lock);
 		/* make our own list of links */
 		l = myrpt->links.next;
-		while (l != &myrpt->links) {
-			if (l->name[0] == '0') {
+		while(l != &myrpt->links)
+		{
+			if (l->name[0] == '0')
+			{
 				l = l->next;
 				continue;
 			}
-			m = ast_malloc(sizeof(*m));
-			if (!m) {
+			l1 = ast_malloc(sizeof(struct rpt_link));
+			if (!l1)
+			{
 				ast_log(LOG_WARNING, "Cannot alloc memory on %s\n", mychannel->name);
 				remque((struct qelem *)mytele);
+				myrpt->active_telem = NULL;
 				rpt_mutex_unlock(&myrpt->lock);
-				ast_log(LOG_NOTICE, "Telemetry thread aborted at line %d, mode: %d\n", __LINE__, mytele->mode); /*@@@@@@@@@@@*/
-				ast_free(mytele);
+				ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
+				ast_free(nodename);
+				if(id_malloc)
+					ast_free(ident);
+				ast_free(mytele);		
 				ast_hangup(mychannel);
 				pthread_exit(NULL);
 			}
-			memcpy(m, l, sizeof(struct rpt_link));
-			m->next = m->prev = NULL;
-			insque((struct qelem *)m, (struct qelem *)linkbase.next);
+			memcpy(l1,l,sizeof(struct rpt_link));
+			l1->next = l1->prev = NULL;
+			insque((struct qelem *)l1,(struct qelem *)linkbase.next);
 			l = l->next;
 		}
 		rpt_mutex_unlock(&myrpt->lock);
-		res = ast_streamfile(mychannel, "rpt/node", mychannel->language);
-		if (!res)
-			res = ast_waitstream(mychannel, "");
-		else
-			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
-		ast_stopstream(mychannel);
-		ast_say_character_str(mychannel, myrpt->name, NULL, mychannel->language);
-		if (!res) 
-			res = ast_waitstream(mychannel, "");
-		else
-			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
-		ast_stopstream(mychannel);
-		if (myrpt->callmode) {
+		res = saynode(myrpt,mychannel,myrpt->name);
+		if (myrpt->callmode)
+		{
 			hastx = 1;
 			res = ast_streamfile(mychannel, "rpt/autopatch_on", mychannel->language);
-			if (!res)
+			if (!res) 
 				res = ast_waitstream(mychannel, "");
 			else
 				 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 			ast_stopstream(mychannel);
 		}
 		l = linkbase.next;
-		while (l != &linkbase) {
+		while(l != &linkbase)
+		{
+			char *s;
+
 			hastx = 1;
-			res = ast_streamfile(mychannel, "rpt/node", mychannel->language);
+			res = saynode(myrpt,mychannel,l->name);
+			s = "rpt/tranceive";
+			if (!l->mode) s = "rpt/monitor";
+			if (!l->thisconnected) s = "rpt/connecting";
+			res = ast_streamfile(mychannel, s, mychannel->language);
 			if (!res) 
 				res = ast_waitstream(mychannel, "");
 			else
 				ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 			ast_stopstream(mychannel);
-			ast_say_character_str(mychannel, l->name, NULL, mychannel->language);
+			l = l->next;
+		}			
+		if (!hastx)
+		{
+			res = ast_streamfile(mychannel, "rpt/repeat_only", mychannel->language);
 			if (!res) 
 				res = ast_waitstream(mychannel, "");
 			else
 				 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 			ast_stopstream(mychannel);
-			res = ast_streamfile(mychannel, ((l->mode) ? 
-				"rpt/tranceive" : "rpt/monitor"), mychannel->language);
+		}
+		/* destroy our local link queue */
+		l = linkbase.next;
+		while(l != &linkbase)
+		{
+			l1 = l;
+			l = l->next;
+			remque((struct qelem *)l1);
+			ast_free(l1);
+		}			
+		imdone = 1;
+		break;
+	    case FULLSTATUS:
+		rpt_mutex_lock(&myrpt->lock);
+		/* get all the nodes */
+		__mklinklist(myrpt,NULL,lbuf);
+		rpt_mutex_unlock(&myrpt->lock);
+		/* parse em */
+		ns = finddelim(lbuf,strs,MAXLINKLIST);
+		/* sort em */
+		if (ns) qsort((void *)strs,ns,sizeof(char *),mycompar);
+		/* wait a little bit */
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		hastx = 0;
+		res = saynode(myrpt,mychannel,myrpt->name);
+		if (myrpt->callmode)
+		{
+			hastx = 1;
+			res = ast_streamfile(mychannel, "rpt/autopatch_on", mychannel->language);
+			if (!res) 
+				res = ast_waitstream(mychannel, "");
+			else
+				 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
+			ast_stopstream(mychannel);
+		}
+		/* go thru all the nodes in list */
+		for(i = 0; i < ns; i++)
+		{
+			char *s,mode = 'T';
+
+			/* if a mode spec at first, handle it */
+			if ((*strs[i] < '0') || (*strs[i] > '9'))
+			{
+				mode = *strs[i];
+				strs[i]++;
+			}
+
+			hastx = 1;
+			res = saynode(myrpt,mychannel,strs[i]);
+			s = "rpt/tranceive";
+			if (mode == 'R') s = "rpt/monitor";
+			if (mode == 'C') s = "rpt/connecting";
+			res = ast_streamfile(mychannel, s, mychannel->language);
 			if (!res) 
 				res = ast_waitstream(mychannel, "");
 			else
 				ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 			ast_stopstream(mychannel);
-			l = l->next;
 		}			
-		if (!hastx) {
+		if (!hastx)
+		{
 			res = ast_streamfile(mychannel, "rpt/repeat_only", mychannel->language);
 			if (!res) 
 				res = ast_waitstream(mychannel, "");
@@ -2300,139 +4932,210 @@ static void *rpt_tele_thread(void *this)
 				 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 			ast_stopstream(mychannel);
 		}
-		/* destroy our local link queue */
-		l = linkbase.next;
-		while (l != &linkbase) {
-			m = l;
-			l = l->next;
-			remque((struct qelem *)m);
-			ast_free(m);
-		}			
 		imdone = 1;
 		break;
 
-	case LASTNODEKEY: /* Identify last node which keyed us up */
+	    case LASTNODEKEY: /* Identify last node which keyed us up */
 		rpt_mutex_lock(&myrpt->lock);
-		if (myrpt->lastnodewhichkeyedusup)
-			p = ast_strdupa(myrpt->lastnodewhichkeyedusup); /* Make a local copy of the node name */
+		if(myrpt->lastnodewhichkeyedusup){
+			p = ast_strdup(myrpt->lastnodewhichkeyedusup); /* Make a local copy of the node name */
+			if(!p){
+				ast_log(LOG_WARNING, "ast_strdup failed in telemetery LASTNODEKEY");
+				imdone = 1;
+				break;
+			}
+		}
 		else
 			p = NULL;
 		rpt_mutex_unlock(&myrpt->lock);
-		if (!p) {
+		if(!p){
 			imdone = 1; /* no node previously keyed us up, or the node which did has been disconnected */
 			break;
 		}
 		wait_interval(myrpt, DLY_TELEM, mychannel);
-		res = ast_streamfile(mychannel, "rpt/node", mychannel->language);
+		res = saynode(myrpt,mychannel,p);
+		ast_free(p);
+		imdone = 1;
+		break;		
+
+	    case UNAUTHTX: /* Say unauthorized transmit frequency */
+		wait_interval(myrpt, DLY_TELEM, mychannel);
+		res = ast_streamfile(mychannel, "rpt/unauthtx", mychannel->language);
 		if (!res) 
 			res = ast_waitstream(mychannel, "");
 		else
 			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 		ast_stopstream(mychannel);
-		ast_say_character_str(mychannel, p, NULL, mychannel->language);
+		imdone = 1;
+		break;
+
+	    case PARROT: /* Repeat stuff */
+
+		sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot);
+		if (ast_fileexists(mystr,NULL,mychannel->language) <= 0)
+		{
+			imdone = 1;
+			myrpt->parrotstate = 0;
+			break;
+		}
+		wait_interval(myrpt, DLY_PARROT, mychannel);
+		sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot);
+		res = ast_streamfile(mychannel, mystr, mychannel->language);
 		if (!res) 
 			res = ast_waitstream(mychannel, "");
 		else
-			ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
+			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 		ast_stopstream(mychannel);
+		sprintf(mystr,PARROTFILE,myrpt->name,mytele->parrot);
+		strcat(mystr,".wav");
+		unlink(mystr);			
 		imdone = 1;
-		break;		
+		myrpt->parrotstate = 0;
+		break;
+
+	    case TIMEOUT:
+		res = saynode(myrpt,mychannel,myrpt->name);
+		if (!res)
+		   res = ast_streamfile(mychannel, "rpt/timeout", mychannel->language);
+		break;
+		
+	    case TIMEOUT_WARNING:
+		time(&t);
+		res = saynode(myrpt,mychannel,myrpt->name);
+		if (!res)
+		   res = ast_streamfile(mychannel, "rpt/timeout-warning", mychannel->language);
+		if (!res) 
+			res = ast_waitstream(mychannel, "");
+		else
+			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
+		ast_stopstream(mychannel);
+		if(!res) /* Say number of seconds */
+			ast_say_number(mychannel, myrpt->p.remotetimeout - 
+			    (t - myrpt->last_activity_time), 
+				"", mychannel->language, (char *) NULL);
+		if (!res) 
+			res = ast_waitstream(mychannel, "");
+		ast_stopstream(mychannel);	
+		res = ast_streamfile(mychannel, "queue-seconds", mychannel->language);
+		break;
 
-	case TIMEOUT:
-		res = ast_streamfile(mychannel, "rpt/node", mychannel->language);
+	    case ACT_TIMEOUT_WARNING:
+		time(&t);
+		res = saynode(myrpt,mychannel,myrpt->name);
+		if (!res)
+		    res = ast_streamfile(mychannel, "rpt/act-timeout-warning", mychannel->language);
 		if (!res) 
 			res = ast_waitstream(mychannel, "");
 		else
 			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 		ast_stopstream(mychannel);
-		ast_say_character_str(mychannel, myrpt->name, NULL, mychannel->language);
-		res = ast_streamfile(mychannel, "rpt/timeout", mychannel->language);
+		if(!res) /* Say number of seconds */
+			ast_say_number(mychannel, myrpt->p.remoteinacttimeout - 
+			    (t - myrpt->last_activity_time), 
+				"", mychannel->language, (char *) NULL);
+		if (!res) 
+			res = ast_waitstream(mychannel, "");
+		ast_stopstream(mychannel);	
+		res = ast_streamfile(mychannel, "queue-seconds", mychannel->language);
 		break;
 		
-	case STATS_TIME:
-		wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
-		tv = ast_tvnow();
-		ast_localtime(&tv, &localtm, NULL);
+	    case STATS_TIME:
+            case STATS_TIME_LOCAL:
+	    	wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
+		t = time(NULL);
+		rpt_localtime(&t, &localtm);
 		/* Say the phase of the day is before the time */
-		if ((localtm.tm_hour >= 0) && (localtm.tm_hour < 12))
+		if((localtm.tm_hour >= 0) && (localtm.tm_hour < 12))
 			p = "rpt/goodmorning";
-		else if ((localtm.tm_hour >= 12) && (localtm.tm_hour < 18))
+		else if((localtm.tm_hour >= 12) && (localtm.tm_hour < 18))
 			p = "rpt/goodafternoon";
 		else
 			p = "rpt/goodevening";
-		if (sayfile(mychannel, p) == -1) {
+		if (sayfile(mychannel,p) == -1)
+		{
 			imdone = 1;
 			break;
 		}
 		/* Say the time is ... */		
-		if (sayfile(mychannel, "rpt/thetimeis") == -1) {
+		if (sayfile(mychannel,"rpt/thetimeis") == -1)
+		{
 			imdone = 1;
 			break;
 		}
 		/* Say the time */				
-		res = ast_say_time(mychannel, tv.tv_sec, "", mychannel->language);
+	    	res = ast_say_time(mychannel, t, "", mychannel->language);
 		if (!res) 
 			res = ast_waitstream(mychannel, "");
 		ast_stopstream(mychannel);		
 		imdone = 1;
 	    	break;
-	case STATS_VERSION:
-		wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
+	    case STATS_VERSION:
+		p = strstr(tdesc, "version");	
+		if(!p)
+			break;	
+		if(sscanf(p, "version %d.%d", &vmajor, &vminor) != 2)
+			break;
+    		wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
 		/* Say "version" */
-		if (sayfile(mychannel, "rpt/version") == -1) {
+		if (sayfile(mychannel,"rpt/version") == -1)
+		{
 			imdone = 1;
 			break;
 		}
-		if (!res) /* Say "X" */
+		if(!res) /* Say "X" */
 			ast_say_number(mychannel, vmajor, "", mychannel->language, (char *) NULL);
 		if (!res) 
 			res = ast_waitstream(mychannel, "");
 		ast_stopstream(mychannel);	
-		if (saycharstr(mychannel, ".") == -1) {
+		if (saycharstr(mychannel,".") == -1)
+		{
 			imdone = 1;
 			break;
 		}
-		if (!res) /* Say "Y" */
+		if(!res) /* Say "Y" */
 			ast_say_number(mychannel, vminor, "", mychannel->language, (char *) NULL);
-		if (!res) {
+		if (!res){
 			res = ast_waitstream(mychannel, "");
 			ast_stopstream(mychannel);
-		} else
+		}	
+		else
 			 ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", mychannel->name);
 		imdone = 1;
+	    	break;
+	    case ARB_ALPHA:
+	    	wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
+	    	if(mytele->param)
+	    		saycharstr(mychannel, mytele->param);
+	    	imdone = 1;
 		break;
-	case ARB_ALPHA:
-		wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
-		if (mytele->param)
-			saycharstr(mychannel, mytele->param);
-		imdone = 1;
-		break;
-	case REV_PATCH:
-		wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
-		if (mytele->param) {
+	    case REV_PATCH:
+	    	wait_interval(myrpt, DLY_TELEM, mychannel); /* Wait a little bit */
+	    	if(mytele->param) {
+
 			/* Parts of this section taken from app_parkandannounce */
 			char *tpl_working, *tpl_current;
 			char *tmp[100], *myparm;
-			int looptemp=0, i = 0, dres = 0;
+			int looptemp=0,i=0, dres = 0;
+	
 
-			tpl_working = ast_strdupa(mytele->param);
-			myparm = strsep(&tpl_working, ",");
-			tpl_current = strsep(&tpl_working, ":");
+			tpl_working = ast_strdup(mytele->param);
+			myparm = strsep(&tpl_working,",");
+			tpl_current=strsep(&tpl_working, ":");
 
-			while (tpl_current && looptemp < sizeof(tmp)) {
-				tmp[looptemp] = tpl_current;
+			while(tpl_current && looptemp < sizeof(tmp)) {
+				tmp[looptemp]=tpl_current;
 				looptemp++;
-				tpl_current = strsep(&tpl_working, ":");
+				tpl_current=strsep(&tpl_working,":");
 			}
 
-			for (i = 0; i < looptemp; i++) {
-				if (!strcmp(tmp[i], "PARKED")) {
+			for(i=0; i<looptemp; i++) {
+				if(!strcmp(tmp[i], "PARKED")) {
 					ast_say_digits(mychannel, atoi(myparm), "", mychannel->language);
-				} else if (!strcmp(tmp[i], "NODE")) {
+				} else if(!strcmp(tmp[i], "NODE")) {
 					ast_say_digits(mychannel, atoi(myrpt->name), "", mychannel->language);
 				} else {
 					dres = ast_streamfile(mychannel, tmp[i], mychannel->language);
-					if (!dres) {
+					if(!dres) {
 						dres = ast_waitstream(mychannel, "");
 					} else {
 						ast_log(LOG_WARNING, "ast_streamfile of %s failed on %s\n", tmp[i], mychannel->name);
@@ -2440,25 +5143,30 @@ static void *rpt_tele_thread(void *this)
 					}
 				}
 			}
+			ast_free(tpl_working);
 		}
-		imdone = 1;
+	    	imdone = 1;
 		break;
-	case TEST_TONE:
+	    case TEST_TONE:
 		imdone = 1;
-		myrpt->stopgen = 0;
-		if ((res = ast_tonepair_start(mychannel, 1004.0, 0, 99999999, 7200.0))) 
+		if (myrpt->stopgen) break;
+		myrpt->stopgen = -1;
+	        if ((res = ast_tonepair_start(mychannel, 1004.0, 0, 99999999, 7200.0))) 
+		{
+			myrpt->stopgen = 0;
 			break;
-		while (mychannel->generatordata && (!myrpt->stopgen)) {
-			if (ast_safe_sleep(mychannel, 1)) break;
-			imdone = 1;
 		}
+	        while(mychannel->generatordata && (myrpt->stopgen <= 0)) {
+			if (ast_safe_sleep(mychannel,1)) break;
+		    	imdone = 1;
+			}
+		myrpt->stopgen = 0;
 		break;
-	default:
-		break;
+	    default:
+	    	break;
 	}
-
-	myrpt->stopgen = 0;
-	if (!imdone) {
+	if (!imdone)
+	{
 		if (!res) 
 			res = ast_waitstream(mychannel, "");
 		else {
@@ -2468,125 +5176,192 @@ static void *rpt_tele_thread(void *this)
 	}
 	ast_stopstream(mychannel);
 	rpt_mutex_lock(&myrpt->lock);
-	if (mytele->mode == TAILMSG) {
-		if (!res) {
+	if (mytele->mode == TAILMSG)
+	{
+		if (!res)
+		{
 			myrpt->tailmessagen++;
-			if (myrpt->tailmessagen >= myrpt->p.tailmsg.argc)
-				myrpt->tailmessagen = 0;
-		} else {
+			if(myrpt->tailmessagen >= myrpt->p.tailmessagemax) myrpt->tailmessagen = 0;
+		}
+		else
+		{
 			myrpt->tmsgtimer = myrpt->p.tailsquashedtime;
 		}
 	}
 	remque((struct qelem *)mytele);
+	myrpt->active_telem = NULL;
 	rpt_mutex_unlock(&myrpt->lock);
+	ast_free(nodename);
+	if(id_malloc)
+		ast_free(ident);
 	ast_free(mytele);		
 	ast_hangup(mychannel);
 #ifdef  APP_RPT_LOCK_DEBUG
-	sleep(5);
-	ast_mutex_lock(&locklock);
-	t = get_lockthread(pthread_self());
-	if (t)
-		memset(t, 0, sizeof(struct lockthread));
-	ast_mutex_unlock(&locklock);
+	{
+		struct lockthread *t;
+
+		sleep(5);
+		ast_mutex_lock(&locklock);
+		t = get_lockthread(pthread_self());
+		if (t) memset(t,0,sizeof(struct lockthread));
+		ast_mutex_unlock(&locklock);
+	}			
 #endif
 	pthread_exit(NULL);
 }
 
-static void rpt_telemetry(struct rpt *myrpt, int mode, void *data)
+static void rpt_telemetry(struct rpt *myrpt,int mode, void *data)
 {
-	struct rpt_tele *tele;
-	struct rpt_link *mylink = (struct rpt_link *) data;
-	int res;
+struct rpt_tele *tele;
+struct rpt_link *mylink = NULL;
+int res;
+pthread_attr_t attr;
+char *v1, *v2;
 
-	tele = ast_calloc(1, sizeof(*tele));
-	if (!tele) {
+	if(debug > 6)
+		ast_log(LOG_NOTICE,"mode=%i  data=%s\n",mode, (char *)data);
+
+	switch(mode)
+	{
+	    case UNKEY:
+		/* if any of the following are defined, go ahead and do it,
+		   otherwise, dont bother */
+		v1 = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->name, 
+			"unlinkedct");
+		v2 = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->name, 
+			"remotect");
+		if (telem_lookup(myrpt,NULL, myrpt->name, "remotemon") &&
+		  telem_lookup(myrpt,NULL, myrpt->name, "remotetx") &&
+		  telem_lookup(myrpt,NULL, myrpt->name, "cmdmode") &&
+		  (!(v1 && telem_lookup(myrpt,NULL, myrpt->name, v1))) && 
+		  (!(v2 && telem_lookup(myrpt,NULL, myrpt->name, v2)))) return;
+		break;
+	    case LINKUNKEY:
+		if (!ast_variable_retrieve(myrpt->cfg, myrpt->name, "linkunkeyct"))
+			return;
+		break;
+	    default:
+		break;
+	}
+	tele = ast_malloc(sizeof(struct rpt_tele));
+	if (!tele)
+	{
 		ast_log(LOG_WARNING, "Unable to allocate memory\n");
 		pthread_exit(NULL);
+		return;
 	}
+	/* zero it out */
+	memset((char *)tele,0,sizeof(struct rpt_tele));
 	tele->rpt = myrpt;
 	tele->mode = mode;
+	if (mode == PARROT) tele->parrot = (unsigned int) data;
+	else mylink = (struct rpt_link *) data;
 	rpt_mutex_lock(&myrpt->lock);
-	if ((mode == CONNFAIL) || (mode == REMDISC) || (mode == CONNECTED)) {
-		if (mylink) {
-			memcpy(&tele->mylink, mylink, sizeof(struct rpt_link));
+	if((mode == CONNFAIL) || (mode == REMDISC) || (mode == CONNECTED) ||
+	    (mode == LINKUNKEY)){
+		memset(&tele->mylink,0,sizeof(struct rpt_link));
+		if (mylink){
+			memcpy(&tele->mylink,mylink,sizeof(struct rpt_link));
 		}
-	} else if ((mode == ARB_ALPHA) || (mode == REV_PATCH)) {
-		ast_copy_string(tele->param, (char *) data, sizeof(tele->param));
 	}
+	else if ((mode == ARB_ALPHA) || (mode == REV_PATCH) || (mode == PLAYBACK)) {
+		strncpy(tele->param, (char *) data, TELEPARAMSIZE - 1);
+		tele->param[TELEPARAMSIZE - 1] = 0;
+	}
+	if (mode == REMXXX) tele->submode = (int) data;
 	insque((struct qelem *)tele, (struct qelem *)myrpt->tele.next);
 	rpt_mutex_unlock(&myrpt->lock);
-	res = ast_pthread_create_detached(&tele->threadid, NULL, rpt_tele_thread, (void *) tele);
-	if (res != 0) {
+        pthread_attr_init(&attr);
+        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+	res = ast_pthread_create(&tele->threadid,&attr,rpt_tele_thread,(void *) tele);
+	if(res < 0){
 		rpt_mutex_lock(&myrpt->lock);
 		remque((struct qlem *) tele); /* We don't like stuck transmitters, remove it from the queue */
 		rpt_mutex_unlock(&myrpt->lock);	
-		ast_log(LOG_WARNING, "Could not create telemetry thread: %s\n", strerror(res));
+		ast_log(LOG_WARNING, "Could not create telemetry thread: %s",strerror(res));
 	}
 	return;
 }
 
 static void *rpt_call(void *this)
 {
-	ZT_CONFINFO ci;  /* conference info */
-	struct rpt *myrpt = (struct rpt *)this;
-	int	res;
-	struct ast_frame wf;
-	int stopped, congstarted, dialtimer, lastcidx, aborted;
-	struct ast_channel *mychannel, *genchannel;
+ZT_CONFINFO ci;  /* conference info */
+struct	rpt *myrpt = (struct rpt *)this;
+int	res;
+int stopped,congstarted,dialtimer,lastcidx,aborted;
+struct ast_channel *mychannel,*genchannel;
 
 	myrpt->mydtmf = 0;
 	/* allocate a pseudo-channel thru asterisk */
-	mychannel = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
-	if (!mychannel) {
-		ast_log(LOG_ERROR, "rpt: unable to obtain pseudo channel\n");
+	mychannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!mychannel)
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
 		pthread_exit(NULL);
 	}
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (mychannel->cdr)
+		ast_set_flag(mychannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
 	ci.chan = 0;
 	ci.confno = myrpt->conf; /* use the pseudo conference */
+#if	0
 	ci.confmode = ZT_CONF_REALANDPSEUDO | ZT_CONF_TALKER | ZT_CONF_LISTENER
 		| ZT_CONF_PSEUDO_TALKER | ZT_CONF_PSEUDO_LISTENER; 
+#endif
+	ci.confmode = ZT_CONF_CONF | ZT_CONF_TALKER | ZT_CONF_LISTENER;
 	/* first put the channel on the conference */
-	if (ioctl(mychannel->fds[0], ZT_SETCONF, &ci) == -1) {
+	if (ioctl(mychannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
 		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 		ast_hangup(mychannel);
 		myrpt->callmode = 0;
 		pthread_exit(NULL);
 	}
 	/* allocate a pseudo-channel thru asterisk */
-	genchannel = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
-	if (!genchannel) {
-		ast_log(LOG_ERROR, "rpt: unable to obtain pseudo channel\n");
+	genchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!genchannel)
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
 		ast_hangup(mychannel);
 		pthread_exit(NULL);
 	}
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (genchannel->cdr)
+		ast_set_flag(genchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
 	ci.chan = 0;
 	ci.confno = myrpt->conf;
 	ci.confmode = ZT_CONF_REALANDPSEUDO | ZT_CONF_TALKER | ZT_CONF_LISTENER
 		| ZT_CONF_PSEUDO_TALKER | ZT_CONF_PSEUDO_LISTENER; 
 	/* first put the channel on the conference */
-	if (ioctl(genchannel->fds[0], ZT_SETCONF, &ci) == -1) {
+	if (ioctl(genchannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
 		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 		ast_hangup(mychannel);
 		ast_hangup(genchannel);
 		myrpt->callmode = 0;
 		pthread_exit(NULL);
 	}
-	if (myrpt->p.tonezone && (tone_zone_set_zone(mychannel->fds[0], myrpt->p.tonezone) == -1)) {
-		ast_log(LOG_WARNING, "Unable to set tone zone %s\n", myrpt->p.tonezone);
+	if (myrpt->p.tonezone && (tone_zone_set_zone(mychannel->fds[0],myrpt->p.tonezone) == -1))
+	{
+		ast_log(LOG_WARNING, "Unable to set tone zone %s\n",myrpt->p.tonezone);
 		ast_hangup(mychannel);
 		ast_hangup(genchannel);
 		myrpt->callmode = 0;
 		pthread_exit(NULL);
 	}
-	if (myrpt->p.tonezone && (tone_zone_set_zone(genchannel->fds[0], myrpt->p.tonezone) == -1)) {
-		ast_log(LOG_WARNING, "Unable to set tone zone %s\n", myrpt->p.tonezone);
+	if (myrpt->p.tonezone && (tone_zone_set_zone(genchannel->fds[0],myrpt->p.tonezone) == -1))
+	{
+		ast_log(LOG_WARNING, "Unable to set tone zone %s\n",myrpt->p.tonezone);
 		ast_hangup(mychannel);
 		ast_hangup(genchannel);
 		myrpt->callmode = 0;
 		pthread_exit(NULL);
 	}
 	/* start dialtone if patchquiet is 0. Special patch modes don't send dial tone */
-	if ((!myrpt->patchquiet) && (tone_zone_play_tone(mychannel->fds[0], ZT_TONE_DIALTONE) < 0)) {
+	if ((!myrpt->patchquiet) && (tone_zone_play_tone(genchannel->fds[0],ZT_TONE_DIALTONE) < 0))
+	{
 		ast_log(LOG_WARNING, "Cannot start dialtone\n");
 		ast_hangup(mychannel);
 		ast_hangup(genchannel);
@@ -2597,15 +5372,19 @@ static void *rpt_call(void *this)
 	congstarted = 0;
 	dialtimer = 0;
 	lastcidx = 0;
+	myrpt->calldigittimer = 0;
 	aborted = 0;
 
-	while ((myrpt->callmode == 1) || (myrpt->callmode == 4)) {
-		if ((myrpt->patchdialtime) && (myrpt->callmode == 1) && (myrpt->cidx != lastcidx)) {
+	while ((myrpt->callmode == 1) || (myrpt->callmode == 4))
+	{
+		if((myrpt->patchdialtime)&&(myrpt->callmode == 1)&&(myrpt->cidx != lastcidx)){
 			dialtimer = 0;
 			lastcidx = myrpt->cidx;
 		}		
 
-		if ((myrpt->patchdialtime) && (dialtimer >= myrpt->patchdialtime)) { 
+		if((myrpt->patchdialtime)&&(dialtimer >= myrpt->patchdialtime)){ 
+		    if(debug)
+		    	ast_log(LOG_NOTICE, "dialtimer %i > patchdialtime %i\n", dialtimer,myrpt->patchdialtime);
 			rpt_mutex_lock(&myrpt->lock);
 			aborted = 1;
 			myrpt->callmode = 0;
@@ -2613,20 +5392,36 @@ static void *rpt_call(void *this)
 			break;
 		}
 	
-		if ((!myrpt->patchquiet) && (!stopped) && (myrpt->callmode == 1) && (myrpt->cidx > 0)) {
+		if ((!myrpt->patchquiet) && (!stopped) && (myrpt->callmode == 1) && (myrpt->cidx > 0))
+		{
 			stopped = 1;
 			/* stop dial tone */
-			tone_zone_play_tone(mychannel->fds[0], -1);
+			tone_zone_play_tone(genchannel->fds[0],-1);
+		}
+		if (myrpt->callmode == 1)
+		{
+			if(myrpt->calldigittimer > PATCH_DIALPLAN_TIMEOUT)
+			{
+				myrpt->callmode = 2;
+				break;
+			}
+			/* bump timer if active */
+			if (myrpt->calldigittimer) 
+				myrpt->calldigittimer += MSWAIT;
 		}
-		if (myrpt->callmode == 4) {
-			if (!congstarted) {
+		if (myrpt->callmode == 4)
+		{
+			if(!congstarted){
 				congstarted = 1;
 				/* start congestion tone */
-				tone_zone_play_tone(mychannel->fds[0], ZT_TONE_CONGESTION);
+				tone_zone_play_tone(genchannel->fds[0],ZT_TONE_CONGESTION);
 			}
 		}
 		res = ast_safe_sleep(mychannel, MSWAIT);
-		if (res < 0) {
+		if (res < 0)
+		{
+		    if(debug)
+		    	ast_log(LOG_NOTICE, "ast_safe_sleep=%i\n", res);
 			ast_hangup(mychannel);
 			ast_hangup(genchannel);
 			rpt_mutex_lock(&myrpt->lock);
@@ -2637,31 +5432,36 @@ static void *rpt_call(void *this)
 		dialtimer += MSWAIT;
 	}
 	/* stop any tone generation */
-	tone_zone_play_tone(mychannel->fds[0], -1);
+	tone_zone_play_tone(genchannel->fds[0],-1);
 	/* end if done */
-	if (!myrpt->callmode) {
+	if (!myrpt->callmode)
+	{
+		if(debug)
+			ast_log(LOG_NOTICE, "callmode==0\n");
 		ast_hangup(mychannel);
 		ast_hangup(genchannel);
 		rpt_mutex_lock(&myrpt->lock);
 		myrpt->callmode = 0;
+		myrpt->macropatch=0;
+		channel_revert(myrpt);
 		rpt_mutex_unlock(&myrpt->lock);
-		if ((!myrpt->patchquiet) && aborted)
+		if((!myrpt->patchquiet) && aborted)
 			rpt_telemetry(myrpt, TERM, NULL);
 		pthread_exit(NULL);			
 	}
 
-	if (myrpt->p.ourcallerid && *myrpt->p.ourcallerid) {
+	if (myrpt->p.ourcallerid && *myrpt->p.ourcallerid){
 		char *name, *loc, *instr;
 		instr = ast_strdup(myrpt->p.ourcallerid);
-		if (instr) {
+		if(instr){
 			ast_callerid_parse(instr, &name, &loc);
-			if (loc) {
-				if (mychannel->cid.cid_num)
+			if(loc){
+				if(mychannel->cid.cid_num)
 					ast_free(mychannel->cid.cid_num);
 				mychannel->cid.cid_num = ast_strdup(loc);
 			}
-			if (name) {
-				if (mychannel->cid.cid_name)
+			if(name){
+				if(mychannel->cid.cid_name)
 					ast_free(mychannel->cid.cid_name);
 				mychannel->cid.cid_name = ast_strdup(name);
 			}
@@ -2669,14 +5469,15 @@ static void *rpt_call(void *this)
 		}
 	}
 
-	ast_copy_string(mychannel->exten, myrpt->exten, sizeof(mychannel->exten));
-	ast_copy_string(mychannel->context, myrpt->patchcontext, sizeof(mychannel->context));
+	ast_copy_string(mychannel->exten, myrpt->exten, sizeof(mychannel->exten) - 1);
+	ast_copy_string(mychannel->context, myrpt->patchcontext, sizeof(mychannel->context) - 1);
 	
 	if (myrpt->p.acctcode)
-		ast_string_field_set(mychannel, accountcode, myrpt->p.acctcode);
+		ast_cdr_setaccount(mychannel,myrpt->p.acctcode);
 	mychannel->priority = 1;
 	ast_channel_undefer_dtmf(mychannel);
-	if (ast_pbx_start(mychannel) < 0) {
+	if (ast_pbx_start(mychannel) < 0)
+	{
 		ast_log(LOG_WARNING, "Unable to start PBX!!\n");
 		ast_hangup(mychannel);
 		ast_hangup(genchannel);
@@ -2694,40 +5495,68 @@ static void *rpt_call(void *this)
 	ci.confmode = (myrpt->p.duplex == 2) ? ZT_CONF_CONFANNMON :
 		(ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER);
 	/* first put the channel on the conference in announce mode */
-	if (ioctl(myrpt->pchannel->fds[0], ZT_SETCONF, &ci) == -1) {
+	if (ioctl(myrpt->pchannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
 		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 		ast_hangup(mychannel);
 		ast_hangup(genchannel);
 		myrpt->callmode = 0;
 		pthread_exit(NULL);
 	}
-	while (myrpt->callmode) {
-		if ((!mychannel->pbx) && (myrpt->callmode != 4)) {
-			if (myrpt->patchfarenddisconnect) { /* If patch is setup for far end disconnect */
+	/* get its channel number */
+	if (ioctl(mychannel->fds[0],ZT_CHANNO,&res) == -1)
+	{
+		ast_log(LOG_WARNING, "Unable to get autopatch channel number\n");
+		ast_hangup(mychannel);
+		myrpt->callmode = 0;
+		pthread_exit(NULL);
+	}
+	ci.chan = 0;
+	ci.confno = res;
+	ci.confmode = ZT_CONF_MONITOR;
+	/* put vox channel monitoring on the channel  */
+	if (ioctl(myrpt->voxchannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
+		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
+		ast_hangup(mychannel);
+		myrpt->callmode = 0;
+		pthread_exit(NULL);
+	}
+	while(myrpt->callmode)
+	{
+		if ((!mychannel->pbx) && (myrpt->callmode != 4))
+		{
+		    /* If patch is setup for far end disconnect */
+			if(myrpt->patchfarenddisconnect || (myrpt->p.duplex < 2)){ 
+				if(debug)ast_log(LOG_NOTICE,"callmode=%i, patchfarenddisconnect=%i, duplex=%i\n",\
+						myrpt->callmode,myrpt->patchfarenddisconnect,myrpt->p.duplex);
 				myrpt->callmode = 0;
-				if (!myrpt->patchquiet) {
+				myrpt->macropatch=0;
+				if(!myrpt->patchquiet){
 					rpt_mutex_unlock(&myrpt->lock);
 					rpt_telemetry(myrpt, TERM, NULL);
 					rpt_mutex_lock(&myrpt->lock);
 				}
-			} else { /* Send congestion until patch is downed by command */
+			}
+			else{ /* Send congestion until patch is downed by command */
 				myrpt->callmode = 4;
 				rpt_mutex_unlock(&myrpt->lock);
 				/* start congestion tone */
-				tone_zone_play_tone(genchannel->fds[0], ZT_TONE_CONGESTION);
+				tone_zone_play_tone(genchannel->fds[0],ZT_TONE_CONGESTION);
 				rpt_mutex_lock(&myrpt->lock);
 			}
 		}
-		if (myrpt->mydtmf) {
-			wf.frametype = AST_FRAME_DTMF;
+		if (myrpt->mydtmf)
+		{
+			struct ast_frame wf = {AST_FRAME_DTMF, } ;
 			wf.subclass = myrpt->mydtmf;
-			wf.offset = 0;
-			wf.mallocd = 0;
-			wf.data = NULL;
-			wf.datalen = 0;
-			wf.samples = 0;
 			rpt_mutex_unlock(&myrpt->lock);
-			ast_write(genchannel, &wf); 
+			ast_queue_frame(mychannel,&wf);
+#ifdef	NEW_ASTERISK
+			ast_senddigit(genchannel,myrpt->mydtmf,0);
+#else
+			ast_senddigit(genchannel,myrpt->mydtmf);
+#endif
 			rpt_mutex_lock(&myrpt->lock);
 			myrpt->mydtmf = 0;
 		}
@@ -2735,13 +5564,16 @@ static void *rpt_call(void *this)
 		usleep(MSWAIT * 1000);
 		rpt_mutex_lock(&myrpt->lock);
 	}
+	if(debug)
+		ast_log(LOG_NOTICE, "exit channel loop\n");
 	rpt_mutex_unlock(&myrpt->lock);
-	tone_zone_play_tone(genchannel->fds[0], -1);
-	if (mychannel->pbx)
-		ast_softhangup(mychannel, AST_SOFTHANGUP_DEV);
+	tone_zone_play_tone(genchannel->fds[0],-1);
+	if (mychannel->pbx) ast_softhangup(mychannel,AST_SOFTHANGUP_DEV);
 	ast_hangup(genchannel);
 	rpt_mutex_lock(&myrpt->lock);
 	myrpt->callmode = 0;
+	myrpt->macropatch=0;
+	channel_revert(myrpt);
 	rpt_mutex_unlock(&myrpt->lock);
 	/* set appropriate conference for the pseudo */
 	ci.chan = 0;
@@ -2749,393 +5581,566 @@ static void *rpt_call(void *this)
 	ci.confmode = ((myrpt->p.duplex == 2) || (myrpt->p.duplex == 4)) ? ZT_CONF_CONFANNMON :
 		(ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER);
 	/* first put the channel on the conference in announce mode */
-	if (ioctl(myrpt->pchannel->fds[0], ZT_SETCONF, &ci) == -1) {
+	if (ioctl(myrpt->pchannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
 		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 	}
 	pthread_exit(NULL);
 }
 
-static void send_link_dtmf(struct rpt *myrpt, char c)
+static void send_link_dtmf(struct rpt *myrpt,char c)
 {
-	char str[300];
-	struct ast_frame wf;
-	struct rpt_link *l;
+char	str[300];
+struct	ast_frame wf;
+struct	rpt_link *l;
 
 	snprintf(str, sizeof(str), "D %s %s %d %c", myrpt->cmdnode, myrpt->name, ++(myrpt->dtmfidx), c);
 	wf.frametype = AST_FRAME_TEXT;
 	wf.subclass = 0;
 	wf.offset = 0;
-	wf.mallocd = 1;
+	wf.mallocd = 0;
 	wf.datalen = strlen(str) + 1;
 	wf.samples = 0;
 	l = myrpt->links.next;
 	/* first, see if our dude is there */
-	while (l != &myrpt->links) {
-		if (l->name[0] == '0') {
+	while(l != &myrpt->links)
+	{
+		if (l->name[0] == '0') 
+		{
 			l = l->next;
 			continue;
 		}
 		/* if we found it, write it and were done */
-		if (!strcmp(l->name, myrpt->cmdnode)) {
-			wf.data = ast_strdup(str);
-			if (l->chan)
-				ast_write(l->chan, &wf);
+		if (!strcmp(l->name,myrpt->cmdnode))
+		{
+			wf.data = str;
+			if (l->chan) ast_write(l->chan,&wf);
 			return;
 		}
 		l = l->next;
 	}
 	l = myrpt->links.next;
 	/* if not, give it to everyone */
-	while (l != &myrpt->links) {
-		wf.data = ast_strdup(str);
-		if (l->chan)
-			ast_write(l->chan, &wf);
+	while(l != &myrpt->links)
+	{
+		wf.data = str;
+		if (l->chan) ast_write(l->chan,&wf);
 		l = l->next;
 	}
 	return;
 }
 
-/*
-* Internet linking function 
-*/
+static void send_link_keyquery(struct rpt *myrpt)
+{
+char	str[300];
+struct	ast_frame wf;
+struct	rpt_link *l;
 
-static int function_ilink(struct rpt *myrpt, char *param, char *digits, int command_source, struct rpt_link *mylink)
+	rpt_mutex_lock(&myrpt->lock);
+	memset(myrpt->topkey,0,sizeof(myrpt->topkey));
+	myrpt->topkeystate = 1;
+	time(&myrpt->topkeytime);
+	rpt_mutex_unlock(&myrpt->lock);
+	snprintf(str, sizeof(str), "K? * %s 0 0", myrpt->name);
+	wf.frametype = AST_FRAME_TEXT;
+	wf.subclass = 0;
+	wf.offset = 0;
+	wf.mallocd = 0;
+	wf.datalen = strlen(str) + 1;
+	wf.samples = 0;
+	l = myrpt->links.next;
+	/* give it to everyone */
+	while(l != &myrpt->links)
+	{
+		wf.data = str;
+		if (l->chan) ast_write(l->chan,&wf);
+		l = l->next;
+	}
+	return;
+}
+
+/* send newkey request */
+
+static void send_newkey(struct ast_channel *chan)
+{
+
+	/* ast_safe_sleep(chan,10); */
+	ast_sendtext(chan,newkeystr);
+	return;
+}
+
+
+/* 
+ * Connect a link 
+ *
+ * Return values:
+ * -2: Attempt to connect to self 
+ * -1: No such node
+ *  0: Success
+ *  1: No match yet
+ *  2: Already connected to this node
+ */
+
+static int connect_link(struct rpt *myrpt, char* node, int mode, int perma)
 {
-	const char *val;
-	char *s, *tele;
-	char deststr[300] = "", modechange = 0;
-	char digitbuf[MAXNODESTR];
+	char *val, *s, *s1, *s2, *tele;
+	char lstr[MAXLINKLIST],*strs[MAXLINKLIST];
+	char tmp[300], deststr[300] = "",modechange = 0;
+	char sx[320],*sy;
 	struct rpt_link *l;
 	int reconnects = 0;
+	int i,n;
 	ZT_CONFINFO ci;  /* conference info */
-	AST_DECLARE_APP_ARGS(args,
-		AST_APP_ARG(s1);
-		AST_APP_ARG(s2); /* XXX Never used.  Scratch? XXX */
-	);
-
-	if (!param)
-		return DC_ERROR;
 
-	if (!myrpt->enable)
-		return DC_ERROR;
+	val = node_lookup(myrpt,node);
+	if (!val){
+		if(strlen(node) >= myrpt->longestnode)
+			return -1; /* No such node */
+		return 1; /* No match yet */
+	}
 
-	ast_copy_string(digitbuf, digits, sizeof(digitbuf));
-	ast_debug(1, "@@@@ ilink param = %s, digitbuf = %s\n", S_OR(param, "(null)"), digitbuf);
+	if(!strcmp(myrpt->name,node)) /* Do not allow connections to self */
+		return -2;
+		
+	if(debug > 3){
+		ast_log(LOG_NOTICE,"Connect attempt to node %s\n", node);
+		ast_log(LOG_NOTICE,"Mode: %s\n",(mode)?"Transceive":"Monitor");
+		ast_log(LOG_NOTICE,"Connection type: %s\n",(perma)?"Permalink":"Normal");
+	}
 
-	switch (myatoi(param)) {
-	case 1: /* Link off */
-		if ((digitbuf[0] == '0') && (myrpt->lastlinknode[0]))
-			strcpy(digitbuf, myrpt->lastlinknode);
-		val = ast_variable_retrieve(myrpt->cfg, myrpt->p.nodes, digitbuf);
-		if (!val) {
-			if (strlen(digitbuf) >= myrpt->longestnode)
-				return DC_ERROR;
+	strncpy(tmp,val,sizeof(tmp) - 1);
+	s = tmp;
+	s1 = strsep(&s,",");
+	if (!strchr(s1,':') && strchr(s1,'/') && strncasecmp(s1, "local/", 6))
+	{
+		sy = strchr(s1,'/');		
+		*sy = 0;
+		sprintf(sx,"%s:4569/%s",s1,sy + 1);
+		s1 = sx;
+	}
+	s2 = strsep(&s,",");
+	rpt_mutex_lock(&myrpt->lock);
+	l = myrpt->links.next;
+	/* try to find this one in queue */
+	while(l != &myrpt->links){
+		if (l->name[0] == '0') 
+		{
+			l = l->next;
+			continue;
+		}
+	/* if found matching string */
+		if (!strcmp(l->name, node))
 			break;
+		l = l->next;
+	}
+	/* if found */
+	if (l != &myrpt->links){ 
+	/* if already in this mode, just ignore */
+		if ((l->mode) || (!l->chan)) {
+			rpt_mutex_unlock(&myrpt->lock);
+			return 2; /* Already linked */
 		}
-		rpt_mutex_lock(&myrpt->lock);
-		l = myrpt->links.next;
-		/* try to find this one in queue */
-		while (l != &myrpt->links) {
-			if (l->name[0] == '0') {
-				l = l->next;
-				continue;
+		reconnects = l->reconnects;
+		rpt_mutex_unlock(&myrpt->lock);
+		if (l->chan) ast_softhangup(l->chan, AST_SOFTHANGUP_DEV);
+		l->retries = l->max_retries + 1;
+		l->disced = 2;
+		modechange = 1;
+	} else
+	{
+		__mklinklist(myrpt,NULL,lstr);
+		rpt_mutex_unlock(&myrpt->lock);
+		n = finddelim(lstr,strs,MAXLINKLIST);
+		for(i = 0; i < n; i++)
+		{
+			if ((*strs[i] < '0') || 
+			    (*strs[i] > '9')) strs[i]++;
+			if (!strcmp(strs[i],node))
+			{
+				return 2; /* Already linked */
 			}
-			/* if found matching string */
-			if (!strcmp(l->name, digitbuf))
-				break;
-			l = l->next;
 		}
-		if (l != &myrpt->links) { /* if found */
-			struct ast_frame wf;
-			ast_copy_string(myrpt->lastlinknode, digitbuf, MAXNODESTR);
-			l->retries = MAX_RETRIES + 1;
-			l->disced = 1;
-			rpt_mutex_unlock(&myrpt->lock);
-			wf.frametype = AST_FRAME_TEXT;
-			wf.subclass = 0;
-			wf.offset = 0;
-			wf.mallocd = 1;
-			wf.datalen = strlen(discstr) + 1;
-			wf.samples = 0;
-			wf.data = ast_strdup(discstr);
-			if (l->chan) {
-				ast_write(l->chan, &wf);
-				if (ast_safe_sleep(l->chan, 250) == -1)
+	}
+	strncpy(myrpt->lastlinknode,node,MAXNODESTR - 1);
+	/* establish call */
+	l = ast_malloc(sizeof(struct rpt_link));
+	if (!l)
+	{
+		ast_log(LOG_WARNING, "Unable to malloc\n");
+		return -1;
+	}
+	/* zero the silly thing */
+	memset((char *)l,0,sizeof(struct rpt_link));
+	l->mode = mode;
+	l->outbound = 1;
+	l->thisconnected = 0;
+	voxinit_link(l,1);
+	strncpy(l->name, node, MAXNODESTR - 1);
+	l->isremote = (s && ast_true(s));
+	if (modechange) l->connected = 1;
+	l->hasconnected = l->perma = perma;
+#ifdef ALLOW_LOCAL_CHANNELS
+	if ((strncasecmp(s1,"iax2/", 5) == 0) || (strncasecmp(s1, "local/", 6) == 0))
+        	strncpy(deststr, s1, sizeof(deststr));
+	else
+	        snprintf(deststr, sizeof(deststr), "IAX2/%s", s1);
+#else
+	snprintf(deststr, sizeof(deststr), "IAX2/%s", s1);
+#endif
+	tele = strchr(deststr, '/');
+	if (!tele){
+		ast_log(LOG_WARNING,"link3:Dial number (%s) must be in format tech/number\n",deststr);
+		ast_free(l);
+		return -1;
+	}
+	*tele++ = 0;
+	l->chan = ast_request(deststr, AST_FORMAT_SLINEAR, tele,NULL);
+	if (l->chan){
+		ast_set_read_format(l->chan, AST_FORMAT_SLINEAR);
+		ast_set_write_format(l->chan, AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+		if (l->chan->cdr)
+			ast_set_flag(l->chan->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+#ifndef	NEW_ASTERISK
+		l->chan->whentohangup = 0;
+#endif
+		l->chan->appl = "Apprpt";
+		l->chan->data = "(Remote Rx)";
+		if (debug > 3)
+			ast_log(LOG_NOTICE, "rpt (remote) initiating call to %s/%s on %s\n",
+		deststr, tele, l->chan->name);
+		if(l->chan->cid.cid_num)
+			ast_free(l->chan->cid.cid_num);
+		l->chan->cid.cid_num = ast_strdup(myrpt->name);
+		ast_call(l->chan,tele,999);
+	}
+	else {
+		if(debug > 3) 
+			ast_log(LOG_NOTICE, "Unable to place call to %s/%s on %s\n",
+		deststr,tele,l->chan->name);
+		if (myrpt->p.archivedir)
+		{
+			char str[100];
+			sprintf(str,"LINKFAIL,%s",l->name);
+			donodelog(myrpt,str);
+		}
+		ast_free(l);
+		return -1;
+	}
+	/* allocate a pseudo-channel thru asterisk */
+	l->pchan = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!l->pchan){
+		ast_log(LOG_WARNING,"rpt connect: Sorry unable to obtain pseudo channel\n");
+		ast_hangup(l->chan);
+		ast_free(l);
+		return -1;
+	}
+	ast_set_read_format(l->pchan, AST_FORMAT_SLINEAR);
+	ast_set_write_format(l->pchan, AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (l->pchan->cdr)
+		ast_set_flag(l->pchan->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+	/* make a conference for the tx */
+	ci.chan = 0;
+	ci.confno = myrpt->conf;
+	ci.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER;
+	/* first put the channel on the conference in proper mode */
+	if (ioctl(l->pchan->fds[0], ZT_SETCONF, &ci) == -1)
+	{
+		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
+		ast_hangup(l->chan);
+		ast_hangup(l->pchan);
+		ast_free(l);
+		return -1;
+	}
+	rpt_mutex_lock(&myrpt->lock);
+	l->reconnects = reconnects;
+	/* insert at end of queue */
+	l->max_retries = MAX_RETRIES;
+	if (perma)
+		l->max_retries = MAX_RETRIES_PERM;
+	if (l->isremote) l->retries = l->max_retries + 1;
+	insque((struct qelem *)l,(struct qelem *)myrpt->links.next);
+	__kickshort(myrpt);
+	rpt_mutex_unlock(&myrpt->lock);
+	if (!l->phonemode) send_newkey(l->chan);
+	return 0;
+}
+
+
+
+/*
+* Internet linking function 
+*/
+
+static int function_ilink(struct rpt *myrpt, char *param, char *digits, int command_source, struct rpt_link *mylink)
+{
+
+	char *val, *s, *s1, *s2;
+	char tmp[300];
+	char digitbuf[MAXNODESTR],*strs[MAXLINKLIST];
+	char mode,perma;
+	char sx[320],*sy;
+	struct rpt_link *l;
+	int i,r;
+
+	if(!param)
+		return DC_ERROR;
+		
+			
+	if (myrpt->p.s[myrpt->p.sysstate_cur].txdisable || myrpt->p.s[myrpt->p.sysstate_cur].linkfundisable )
+		return DC_ERROR;
+
+	strncpy(digitbuf,digits,MAXNODESTR - 1);
+
+	if(debug > 6)
+		printf("@@@@ ilink param = %s, digitbuf = %s\n", (param)? param : "(null)", digitbuf);
+		
+	switch(myatoi(param)){
+		case 11: /* Perm Link off */
+		case 1: /* Link off */
+			if ((digitbuf[0] == '0') && (myrpt->lastlinknode[0]))
+				strcpy(digitbuf,myrpt->lastlinknode);
+			val = node_lookup(myrpt,digitbuf);
+			if (!val){
+				if(strlen(digitbuf) >= myrpt->longestnode)
 					return DC_ERROR;
-				ast_softhangup(l->chan, AST_SOFTHANGUP_DEV);
+				break;
 			}
-			rpt_telemetry(myrpt, COMPLETE, NULL);
-			return DC_COMPLETE;
-		}
-		rpt_mutex_unlock(&myrpt->lock);	
-		return DC_COMPLETE;
-	case 2: /* Link Monitor */
-		if ((digitbuf[0] == '0') && (myrpt->lastlinknode[0]))
-			strcpy(digitbuf, myrpt->lastlinknode);
-		val = ast_variable_retrieve(myrpt->cfg, myrpt->p.nodes, digitbuf);
-		if (!val) {
-			if (strlen(digitbuf) >= myrpt->longestnode)
-				return DC_ERROR;
-			break;
-		}
-		s = ast_strdupa(val);
-		AST_STANDARD_APP_ARGS(args, s);
-		rpt_mutex_lock(&myrpt->lock);
-		l = myrpt->links.next;
-		/* try to find this one in queue */
-		while (l != &myrpt->links) {
-			if (l->name[0] == '0') {
+			strncpy(tmp,val,sizeof(tmp) - 1);
+			s = tmp;
+			s1 = strsep(&s,",");
+			if (!strchr(s1,':') && strchr(s1,'/') && strncasecmp(s1, "local/", 6))
+			{
+				sy = strchr(s1,'/');		
+				*sy = 0;
+				sprintf(sx,"%s:4569/%s",s1,sy + 1);
+				s1 = sx;
+			}
+			s2 = strsep(&s,",");
+			rpt_mutex_lock(&myrpt->lock);
+			l = myrpt->links.next;
+			/* try to find this one in queue */
+			while(l != &myrpt->links){
+				if (l->name[0] == '0') 
+				{
+					l = l->next;
+					continue;
+				}
+				/* if found matching string */
+				if (!strcmp(l->name, digitbuf))
+					break;
 				l = l->next;
-				continue;
 			}
-			/* if found matching string */
-			if (!strcmp(l->name, digitbuf))
-				break;
-			l = l->next;
-		}
-		/* if found */
-		if (l != &myrpt->links) {
-			/* if already in this mode, just ignore */
-			if ((!l->mode) || (!l->chan)) {
+			if (l != &myrpt->links){ /* if found */
+				struct	ast_frame wf;
+
+				/* must use perm command on perm link */
+				if ((myatoi(param) < 10) && 
+				    (l->max_retries > MAX_RETRIES))
+				{
+					rpt_mutex_unlock(&myrpt->lock);
+					return DC_COMPLETE;
+				}
+				strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1);
+				l->retries = l->max_retries + 1;
+				l->disced = 1;
 				rpt_mutex_unlock(&myrpt->lock);
-				rpt_telemetry(myrpt, REMALREADY, NULL);
+				wf.frametype = AST_FRAME_TEXT;
+				wf.subclass = 0;
+				wf.offset = 0;
+				wf.mallocd = 0;
+				wf.datalen = strlen(discstr) + 1;
+				wf.samples = 0;
+				wf.data = discstr;
+				if (l->chan)
+				{
+					ast_write(l->chan,&wf);
+					if (ast_safe_sleep(l->chan,250) == -1) return DC_ERROR;
+					ast_softhangup(l->chan,AST_SOFTHANGUP_DEV);
+				}
+				rpt_telemetry(myrpt, COMPLETE, NULL);
 				return DC_COMPLETE;
 			}
-			reconnects = l->reconnects;
-			rpt_mutex_unlock(&myrpt->lock);
-			if (l->chan)
-				ast_softhangup(l->chan, AST_SOFTHANGUP_DEV);
-			l->retries = MAX_RETRIES + 1;
-			l->disced = 2;
-			modechange = 1;
-		} else
-			rpt_mutex_unlock(&myrpt->lock);
-		ast_copy_string(myrpt->lastlinknode, digitbuf, MAXNODESTR);
-		/* establish call in monitor mode */
-		l = ast_calloc(1, sizeof(*l));
-		if (!l) {
-			ast_log(LOG_WARNING, "Unable to malloc\n");
-			return DC_ERROR;
-		}
-		snprintf(deststr, sizeof(deststr), "IAX2/%s", args.s1);
-		tele = strchr(deststr, '/');
-		if (!tele) {
-			ast_log(LOG_ERROR, "link2:Dial number (%s) must be in format tech/number\n", deststr);
-			return DC_ERROR;
-		}
-		*tele++ = 0;
-		l->isremote = (s && ast_true(s));
-		ast_copy_string(l->name, digitbuf, MAXNODESTR);
-		l->chan = ast_request(deststr, AST_FORMAT_SLINEAR, tele, NULL);
-		if (modechange)
-			l->connected = 1;
-		if (l->chan) {
-			ast_set_read_format(l->chan, AST_FORMAT_SLINEAR);
-			ast_set_write_format(l->chan, AST_FORMAT_SLINEAR);
-			ast_channel_setwhentohangup_tv(l->chan, cancel_atimeout);
-			l->chan->appl = "Apprpt";
-			l->chan->data = "(Remote Rx)";
-			ast_verb(3, "rpt (remote) initiating call to %s/%s on %s\n",
-					deststr, tele, l->chan->name);
-			if (l->chan->cid.cid_num)
-				ast_free(l->chan->cid.cid_num);
-			l->chan->cid.cid_num = ast_strdup(myrpt->name);
-			ast_call(l->chan, tele, 0);
-		} else {
-			rpt_telemetry(myrpt, CONNFAIL, l);
-			ast_free(l);
-			ast_verb(3, "Unable to place call to %s/%s on %s\n",
-					deststr, tele, l->chan->name);
-			return DC_ERROR;
-		}
-		/* allocate a pseudo-channel thru asterisk */
-		l->pchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
-		if (!l->pchan) {
-			ast_log(LOG_ERROR, "rpt:Sorry unable to obtain pseudo channel\n");
-			ast_hangup(l->chan);
-			ast_free(l);
-			return DC_ERROR;
-		}
-		ast_set_read_format(l->pchan, AST_FORMAT_SLINEAR);
-		ast_set_write_format(l->pchan, AST_FORMAT_SLINEAR);
-		/* make a conference for the pseudo-one */
-		ci.chan = 0;
-		ci.confno = myrpt->conf;
-		ci.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER;
-		/* first put the channel on the conference in proper mode */
-		if (ioctl(l->pchan->fds[0], ZT_SETCONF, &ci) == -1) {
-			ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
-			ast_hangup(l->chan);
-			ast_hangup(l->pchan);
-			ast_free(l);
-			return DC_ERROR;
-		}
-		rpt_mutex_lock(&myrpt->lock);
-		l->reconnects = reconnects;
-		/* insert at end of queue */
-		insque((struct qelem *)l, (struct qelem *)myrpt->links.next);
-		rpt_mutex_unlock(&myrpt->lock);
-		rpt_telemetry(myrpt, COMPLETE, NULL);
-		return DC_COMPLETE;
-	case 3: /* Link transceive */
-		if ((digitbuf[0] == '0') && (myrpt->lastlinknode[0]))
-			strcpy(digitbuf, myrpt->lastlinknode);
-		val = ast_variable_retrieve(myrpt->cfg, myrpt->p.nodes, digitbuf);
-		if (!val) {
-			if (strlen(digitbuf) >= myrpt->longestnode)
-				return DC_ERROR;
-			break;
-		}
-		s = ast_strdupa(val);
-		AST_STANDARD_APP_ARGS(args, s);
-		rpt_mutex_lock(&myrpt->lock);
-		l = myrpt->links.next;
-		/* try to find this one in queue */
-		while (l != &myrpt->links) {
-			if (l->name[0] == '0') {
-				l = l->next;
-				continue;
+			rpt_mutex_unlock(&myrpt->lock);	
+			return DC_COMPLETE;
+		case 2: /* Link Monitor */
+		case 3: /* Link transceive */
+		case 12: /* Link Monitor permanent */
+		case 13: /* Link transceive permanent */
+			if ((digitbuf[0] == '0') && (myrpt->lastlinknode[0]))
+				strcpy(digitbuf,myrpt->lastlinknode);
+			/* Attempt connection  */
+			perma = (atoi(param) > 10) ? 1 : 0;
+			mode = (atoi(param) & 1) ? 1 : 0;
+			r = connect_link(myrpt, digitbuf, mode, perma);
+			switch(r){
+				case -2: /* Attempt to connect to self */
+					return DC_COMPLETE; /* Silent error */
+
+				case 0:
+					rpt_telemetry(myrpt, COMPLETE, NULL);
+					return DC_COMPLETE;
+
+				case 1:
+					break;
+				
+				case 2:
+					rpt_telemetry(myrpt, REMALREADY, NULL);
+					return DC_COMPLETE;
+				
+				default:
+					rpt_telemetry(myrpt, CONNFAIL, NULL);
+					return DC_COMPLETE;
 			}
-			/* if found matching string */
-			if (!strcmp(l->name, digitbuf))
-				break;
-			l = l->next;
-		}
-		/* if found */
-		if (l != &myrpt->links) { 
-			/* if already in this mode, just ignore */
-			if ((l->mode) || (!l->chan)) {
-				rpt_mutex_unlock(&myrpt->lock);
+			break;
+
+		case 4: /* Enter Command Mode */
+		
+			/* if doesnt allow link cmd, or no links active, return */
+ 			if (((command_source != SOURCE_RPT) && 
+				(command_source != SOURCE_PHONE) &&
+				(command_source != SOURCE_ALT) &&
+				(command_source != SOURCE_DPHONE)) ||
+				 (myrpt->links.next == &myrpt->links))
+				return DC_COMPLETE;
+			
+			/* if already in cmd mode, or selected self, fughetabahtit */
+			if ((myrpt->cmdnode[0]) || (!strcmp(myrpt->name, digitbuf))){
+			
 				rpt_telemetry(myrpt, REMALREADY, NULL);
 				return DC_COMPLETE;
 			}
-			reconnects = l->reconnects;
-			rpt_mutex_unlock(&myrpt->lock);
-			if (l->chan)
-				ast_softhangup(l->chan, AST_SOFTHANGUP_DEV);
-			l->retries = MAX_RETRIES + 1;
-			l->disced = 2;
-			modechange = 1;
-		} else
+			if ((digitbuf[0] == '0') && (myrpt->lastlinknode[0]))
+				strcpy(digitbuf,myrpt->lastlinknode);
+			/* node must at least exist in list */
+			val = node_lookup(myrpt,digitbuf);
+			if (!val){
+				if(strlen(digitbuf) >= myrpt->longestnode)
+					return DC_ERROR;
+				break;
+			
+			}
+			rpt_mutex_lock(&myrpt->lock);
+			strcpy(myrpt->lastlinknode,digitbuf);
+			strncpy(myrpt->cmdnode, digitbuf, sizeof(myrpt->cmdnode) - 1);
 			rpt_mutex_unlock(&myrpt->lock);
-		ast_copy_string(myrpt->lastlinknode, digitbuf, MAXNODESTR);
-		/* establish call in tranceive mode */
-		l = ast_calloc(1, sizeof(*l));
-		if (!l) {
-			ast_log(LOG_WARNING, "Unable to malloc\n");
-			return DC_ERROR;
-		}
-		l->mode = 1;
-		l->outbound = 1;
-		ast_copy_string(l->name, digitbuf, MAXNODESTR);
-		l->isremote = (s && ast_true(s));
-		if (modechange)
-			l->connected = 1;
-		snprintf(deststr, sizeof(deststr), "IAX2/%s", args.s1);
-		tele = strchr(deststr, '/');
-		if (!tele) {
-			ast_log(LOG_ERROR, "link3:Dial number (%s) must be in format tech/number\n", deststr);
-			ast_free(l);
-			return DC_ERROR;
-		}
-		*tele++ = 0;
-		l->chan = ast_request(deststr, AST_FORMAT_SLINEAR, tele, NULL);
-		if (l->chan) {
-			ast_set_read_format(l->chan, AST_FORMAT_SLINEAR);
-			ast_set_write_format(l->chan, AST_FORMAT_SLINEAR);
-			ast_channel_setwhentohangup_tv(l->chan, cancel_atimeout);
-			l->chan->appl = "Apprpt";
-			l->chan->data = "(Remote Rx)";
-			ast_verb(3, "rpt (remote) initiating call to %s/%s on %s\n",
-					deststr, tele, l->chan->name);
-			if (l->chan->cid.cid_num)
-				ast_free(l->chan->cid.cid_num);
-			l->chan->cid.cid_num = ast_strdup(myrpt->name);
-			ast_call(l->chan, tele, 999);
-		} else {
-			rpt_telemetry(myrpt, CONNFAIL, l);
-			ast_free(l);
-			ast_verb(3, "Unable to place call to %s/%s on %s\n",
-					deststr, tele, l->chan->name);
-			return DC_ERROR;
-		}
-		/* allocate a pseudo-channel thru asterisk */
-		l->pchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
-		if (!l->pchan) {
-			ast_log(LOG_ERROR, "rpt:Sorry unable to obtain pseudo channel\n");
-			ast_hangup(l->chan);
-			ast_free(l);
-			return DC_ERROR;
-		}
-		ast_set_read_format(l->pchan, AST_FORMAT_SLINEAR);
-		ast_set_write_format(l->pchan, AST_FORMAT_SLINEAR);
-		/* make a conference for the tx */
-		ci.chan = 0;
-		ci.confno = myrpt->conf;
-		ci.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER;
-		/* first put the channel on the conference in proper mode */
-		if (ioctl(l->pchan->fds[0], ZT_SETCONF, &ci) == -1) {
-			ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
-			ast_hangup(l->chan);
-			ast_hangup(l->pchan);
-			ast_free(l);
-			return DC_ERROR;
-		}
-		rpt_mutex_lock(&myrpt->lock);
-		l->reconnects = reconnects;
-		/* insert at end of queue */
-		insque((struct qelem *)l, (struct qelem *)myrpt->links.next);
-		rpt_mutex_unlock(&myrpt->lock);
-		rpt_telemetry(myrpt, COMPLETE, NULL);
-		return DC_COMPLETE;
-	case 4: /* Enter Command Mode */
-		/* if doesnt allow link cmd, or no links active, return */
- 		if (((command_source != SOURCE_RPT) &&
-			 (command_source != SOURCE_PHONE) &&
-			 (command_source != SOURCE_DPHONE)) ||
-			(myrpt->links.next == &myrpt->links))
+			rpt_telemetry(myrpt, REMGO, NULL);	
 			return DC_COMPLETE;
-		/* if already in cmd mode, or selected self, fughetabahtit */
-		if ((myrpt->cmdnode[0]) || (!strcmp(myrpt->name, digitbuf))) {
-			rpt_telemetry(myrpt, REMALREADY, NULL);
+			
+		case 5: /* Status */
+			rpt_telemetry(myrpt, STATUS, NULL);
 			return DC_COMPLETE;
-		}
-		if ((digitbuf[0] == '0') && (myrpt->lastlinknode[0]))
-			strcpy(digitbuf, myrpt->lastlinknode);
-		/* node must at least exist in list */
-		val = ast_variable_retrieve(myrpt->cfg, myrpt->p.nodes, digitbuf);
-		if (!val) {
-			if (strlen(digitbuf) >= myrpt->longestnode)
-				return DC_ERROR;
+
+		case 15: /* Full Status */
+			rpt_telemetry(myrpt, FULLSTATUS, NULL);
+			return DC_COMPLETE;
+			
+			
+		case 6: /* All Links Off, including permalinks */
+                       rpt_mutex_lock(&myrpt->lock);
+			myrpt->savednodes[0] = 0;
+                        l = myrpt->links.next;
+                        /* loop through all links */
+                        while(l != &myrpt->links){
+				struct	ast_frame wf;
+                                if (l->name[0] == '0') /* Skip any IAXRPT monitoring */
+                                {
+                                        l = l->next;
+                                        continue;
+                                }
+				/* Make a string of disconnected nodes for possible restoration */
+				sprintf(tmp,"%c%c%s",(l->mode) ? 'X' : 'M',(l->perma) ? 'P':'T',l->name);
+				if(strlen(tmp) + strlen(myrpt->savednodes) + 1 < MAXNODESTR){ 
+					if(myrpt->savednodes[0])
+						strcat(myrpt->savednodes, ",");
+					strcat(myrpt->savednodes, tmp);
+				}
+                           	l->retries = l->max_retries + 1;
+                                l->disced = 2; /* Silently disconnect */
+                                rpt_mutex_unlock(&myrpt->lock);
+				/* ast_log(LOG_NOTICE,"dumping link %s\n",l->name); */
+                                
+                                wf.frametype = AST_FRAME_TEXT;
+                                wf.subclass = 0;
+                                wf.offset = 0;
+                                wf.mallocd = 0;
+                                wf.datalen = strlen(discstr) + 1;
+                                wf.samples = 0;
+                                wf.data = discstr;
+                                if (l->chan)
+                                {
+                                        ast_write(l->chan,&wf);
+                                        ast_safe_sleep(l->chan,250); /* It's dead already, why check the return value? */
+                                        ast_softhangup(l->chan,AST_SOFTHANGUP_DEV);
+                                }
+				rpt_mutex_lock(&myrpt->lock);
+                                l = l->next;
+                        }
+			rpt_mutex_unlock(&myrpt->lock);
+			if(debug > 3)
+				ast_log(LOG_NOTICE,"Nodes disconnected: %s\n",myrpt->savednodes);
+                        rpt_telemetry(myrpt, COMPLETE, NULL);
+			return DC_COMPLETE;
+
+		case 7: /* Identify last node which keyed us up */
+			rpt_telemetry(myrpt, LASTNODEKEY, NULL);
 			break;
-		}
-		rpt_mutex_lock(&myrpt->lock);
-		strcpy(myrpt->lastlinknode, digitbuf);
-		ast_copy_string(myrpt->cmdnode, digitbuf, sizeof(myrpt->cmdnode));
-		rpt_mutex_unlock(&myrpt->lock);
-		rpt_telemetry(myrpt, REMGO, NULL);	
-		return DC_COMPLETE;
-	case 5: /* Status */
-		rpt_telemetry(myrpt, STATUS, NULL);
-		return DC_COMPLETE;
-	case 6: /* All Links Off */
-		l = myrpt->links.next;
-		while (l != &myrpt->links) { /* This code is broke and needs to be changed to work with the reconnect kludge */
-			if (l->chan)
-				ast_softhangup(l->chan, AST_SOFTHANGUP_DEV); /* Hang 'em up */
-			l = l->next;
-		}
-		rpt_telemetry(myrpt, COMPLETE, NULL);
-		break;
-	case 7: /* Identify last node which keyed us up */
-		rpt_telemetry(myrpt, LASTNODEKEY, NULL);
-		break;
-	default:
-		return DC_ERROR;
-	}
 
+
+#ifdef	_MDC_DECODE_H_
+		case 8:
+			myrpt->lastunit = 0xd00d; 
+			mdc1200_notify(myrpt,NULL,myrpt->lastunit);
+			mdc1200_send(myrpt,myrpt->lastunit);
+			break;
+#endif
+
+		case 16: /* Restore links disconnected with "disconnect all links" command */
+			strcpy(tmp, myrpt->savednodes); /* Make a copy */
+			finddelim(tmp, strs, MAXLINKLIST); /* convert into substrings */
+			for(i = 0; tmp[0] && strs[i] != NULL && i < MAXLINKLIST; i++){
+				s1 = strs[i];
+				mode = (s1[0] == 'X') ? 1 : 0;
+				perma = (s1[1] == 'P') ? 1 : 0;
+				connect_link(myrpt, s1 + 2, mode, perma); /* Try to reconnect */
+			}
+                        rpt_telemetry(myrpt, COMPLETE, NULL);
+			break;
+	
+		case 200:
+		case 201:
+		case 202:
+		case 203:
+		case 204:
+		case 205:
+		case 206:
+		case 207:
+		case 208:
+		case 209:
+		case 210:
+		case 211:
+		case 212:
+		case 213:
+		case 214:
+		case 215:
+			if (((myrpt->p.propagate_dtmf) && 
+			     (command_source == SOURCE_LNK)) ||
+			    ((myrpt->p.propagate_phonedtmf) &&
+				((command_source == SOURCE_PHONE) ||
+				  (command_source == SOURCE_ALT) ||
+				    (command_source == SOURCE_DPHONE))))
+					do_dtmf_local(myrpt,
+						remdtmfstr[myatoi(param) - 200]);
+		default:
+			return DC_ERROR;
+			
+	}
+	
 	return DC_INDETERMINATE;
-}
+}	
 
 /*
 * Autopatch up
@@ -3143,11 +6148,11 @@ static int function_ilink(struct rpt *myrpt, char *param, char *digits, int comm
 
 static int function_autopatchup(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
 {
-	int i, index;
+	pthread_attr_t attr;
+	int i, index, paramlength;
+	char *lparam;
 	char *value = NULL;
-	AST_DECLARE_APP_ARGS(params,
-		AST_APP_ARG(list)[20];
-	);
+	char *paramlist[20];
 
 	static char *keywords[] = {
 	"context",
@@ -3158,47 +6163,59 @@ static int function_autopatchup(struct rpt *myrpt, char *param, char *digitbuf,
 	NULL
 	};
 		
-	if (!myrpt->enable)
+	if (myrpt->p.s[myrpt->p.sysstate_cur].txdisable || myrpt->p.s[myrpt->p.sysstate_cur].autopatchdisable)
 		return DC_ERROR;
+		
+	if(debug)
+		printf("@@@@ Autopatch up\n");
 
-	ast_debug(1, "@@@@ Autopatch up\n");
-
-	if (!myrpt->callmode) {
+	if(!myrpt->callmode){
 		/* Set defaults */
 		myrpt->patchnoct = 0;
 		myrpt->patchdialtime = 0;
 		myrpt->patchfarenddisconnect = 0;
 		myrpt->patchquiet = 0;
-		ast_copy_string(myrpt->patchcontext, myrpt->p.ourcontext, sizeof(myrpt->patchcontext));
+		strncpy(myrpt->patchcontext, myrpt->p.ourcontext, MAXPATCHCONTEXT);
 
-		if (param) {
+		if(param){
 			/* Process parameter list */
-			char *tmp = ast_strdupa(param);
-			AST_STANDARD_APP_ARGS(params, tmp);
-			for (i = 0; i < params.argc; i++) {
-				index = matchkeyword(params.list[i], &value, keywords);
-				if (value)
+			lparam = ast_strdup(param);
+			if(!lparam){
+				ast_log(LOG_ERROR,"App_rpt out of memory on line %d\n",__LINE__);
+				return DC_ERROR;	
+			}
+			paramlength = finddelim(lparam, paramlist, 20); 			
+			for(i = 0; i < paramlength; i++){
+				index = matchkeyword(paramlist[i], &value, keywords);
+				if(value)
 					value = skipchars(value, "= ");
-				switch (index) {
-				case 1: /* context */
-					ast_copy_string(myrpt->patchcontext, value, sizeof(myrpt->patchcontext)) ;
-					break;
-				case 2: /* dialtime */
-					myrpt->patchdialtime = atoi(value);
-					break;
-				case 3: /* farenddisconnect */
-					myrpt->patchfarenddisconnect = atoi(value);
-					break;
-				case 4:	/* noct */
-					myrpt->patchnoct = atoi(value);
-					break;
-				case 5: /* quiet */
-					myrpt->patchquiet = atoi(value);
-					break;
-				default:
-					break;
+				switch(index){
+
+					case 1: /* context */
+						strncpy(myrpt->patchcontext, value, MAXPATCHCONTEXT - 1) ;
+						break;
+						
+					case 2: /* dialtime */
+						myrpt->patchdialtime = atoi(value);
+						break;
+
+					case 3: /* farenddisconnect */
+						myrpt->patchfarenddisconnect = atoi(value);
+						break;
+
+					case 4:	/* noct */
+						myrpt->patchnoct = atoi(value);
+						break;
+
+					case 5: /* quiet */
+						myrpt->patchquiet = atoi(value);
+						break;
+				 					
+					default:
+						break;
 				}
 			}
+		ast_free(lparam);
 		}
 	}
 					
@@ -3206,10 +6223,10 @@ static int function_autopatchup(struct rpt *myrpt, char *param, char *digitbuf,
 
 	/* if on call, force * into current audio stream */
 	
-	if ((myrpt->callmode == 2) || (myrpt->callmode == 3)) {
-		myrpt->mydtmf = myrpt->p.funcchar;
+	if ((myrpt->callmode == 2) || (myrpt->callmode == 3)){
+		myrpt->mydtmf = myrpt->p.endchar;
 	}
-	if (myrpt->callmode) {
+	if (myrpt->callmode){
 		rpt_mutex_unlock(&myrpt->lock);
 		return DC_COMPLETE;
 	}
@@ -3217,7 +6234,9 @@ static int function_autopatchup(struct rpt *myrpt, char *param, char *digitbuf,
 	myrpt->cidx = 0;
 	myrpt->exten[myrpt->cidx] = 0;
 	rpt_mutex_unlock(&myrpt->lock);
-	ast_pthread_create_detached(&myrpt->rpt_call_thread, NULL, rpt_call, (void *) myrpt);
+	pthread_attr_init(&attr);
+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+	ast_pthread_create(&myrpt->rpt_call_thread,&attr,rpt_call,(void *) myrpt);
 	return DC_COMPLETE;
 }
 
@@ -3227,19 +6246,23 @@ static int function_autopatchup(struct rpt *myrpt, char *param, char *digitbuf,
 
 static int function_autopatchdn(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
 {
-	if (!myrpt->enable)
+	if (myrpt->p.s[myrpt->p.sysstate_cur].txdisable || myrpt->p.s[myrpt->p.sysstate_cur].autopatchdisable)
 		return DC_ERROR;
 	
-	ast_debug(1, "@@@@ Autopatch down\n");
+	if(debug)
+		printf("@@@@ Autopatch down\n");
 		
 	rpt_mutex_lock(&myrpt->lock);
 	
-	if (!myrpt->callmode) {
+	myrpt->macropatch=0;
+
+	if (!myrpt->callmode){
 		rpt_mutex_unlock(&myrpt->lock);
 		return DC_COMPLETE;
 	}
 	
 	myrpt->callmode = 0;
+	channel_revert(myrpt);
 	rpt_mutex_unlock(&myrpt->lock);
 	rpt_telemetry(myrpt, TERM, NULL);
 	return DC_COMPLETE;
@@ -3255,121 +6278,94 @@ static int function_status(struct rpt *myrpt, char *param, char *digitbuf, int c
 	if (!param)
 		return DC_ERROR;
 
-	if (!myrpt->enable)
+	if ((myrpt->p.s[myrpt->p.sysstate_cur].txdisable) || (myrpt->p.s[myrpt->p.sysstate_cur].userfundisable))
 		return DC_ERROR;
 
-	ast_debug(1, "@@@@ status param = %s, digitbuf = %s\n", (param)? param : "(null)", digitbuf);
+	if(debug)
+		printf("@@@@ status param = %s, digitbuf = %s\n", (param)? param : "(null)", digitbuf);
 	
-	switch (myatoi(param)) {
-	case 1: /* System ID */
-		rpt_telemetry(myrpt, ID1, NULL);
-		return DC_COMPLETE;
-	case 2: /* System Time */
-		rpt_telemetry(myrpt, STATS_TIME, NULL);
-		return DC_COMPLETE;
-	case 3: /* app_rpt.c version */
-		rpt_telemetry(myrpt, STATS_VERSION, NULL);
-	default:
-		return DC_ERROR;
+	switch(myatoi(param)){
+		case 1: /* System ID */
+			rpt_telemetry(myrpt, ID1, NULL);
+			return DC_COMPLETE;
+		case 2: /* System Time */
+			rpt_telemetry(myrpt, STATS_TIME, NULL);
+			return DC_COMPLETE;
+		case 3: /* app_rpt.c version */
+			rpt_telemetry(myrpt, STATS_VERSION, NULL);
+			return DC_COMPLETE;
+		case 11: /* System ID (local only)*/
+		    rpt_telemetry(myrpt, ID , NULL);
+            return DC_COMPLETE;
+        case 12: /* System Time (local only)*/
+            rpt_telemetry(myrpt, STATS_TIME_LOCAL, NULL);
+            return DC_COMPLETE;
+		default:
+			return DC_ERROR;
 	}
-
-	/* Never reached */
 	return DC_INDETERMINATE;
 }
-
 /*
 *  Macro-oni (without Salami)
 */
-
 static int function_macro(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
 {
-
-	const char *val;
-	int	i;
-	struct ast_channel *mychannel;
-
-	if ((!myrpt->remote) && (!myrpt->enable))
+char	*val;
+int	i;
+	if (myrpt->remote)
 		return DC_ERROR;
 
-	ast_debug(1, "@@@@ macro-oni param = %s, digitbuf = %s\n", (param)? param : "(null)", digitbuf);
+	if(debug) 
+		printf("@@@@ macro-oni param = %s, digitbuf = %s\n", (param)? param : "(null)", digitbuf);
 	
-	mychannel = myrpt->remchannel;
-
-	if (ast_strlen_zero(digitbuf)) /* needs 1 digit */
+	if(strlen(digitbuf) < 1) /* needs 1 digit */
 		return DC_INDETERMINATE;
 			
-	for (i = 0; i < digitbuf[i]; i++) {
-		if ((digitbuf[i] < '0') || (digitbuf[i] > '9'))
+	for(i = 0 ; i < digitbuf[i] ; i++) {
+		if((digitbuf[i] < '0') || (digitbuf[i] > '9'))
 			return DC_ERROR;
 	}
    
-	if (*digitbuf == '0')
-		val = myrpt->p.startupmacro;
-	else
-		val = ast_variable_retrieve(myrpt->cfg, myrpt->p.macro, digitbuf);
+	if (*digitbuf == '0') val = myrpt->p.startupmacro;
+	else val = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->p.macro, digitbuf);
 	/* param was 1 for local buf */
-	if (!val) {
+	if (!val){
+                if (strlen(digitbuf) < myrpt->macro_longest)
+                        return DC_INDETERMINATE;
 		rpt_telemetry(myrpt, MACRO_NOTFOUND, NULL);
 		return DC_COMPLETE;
 	}			
 	rpt_mutex_lock(&myrpt->lock);
-	if ((sizeof(myrpt->macrobuf) - strlen(myrpt->macrobuf)) < strlen(val)) {
+	if ((MAXMACRO - strlen(myrpt->macrobuf)) < strlen(val))
+	{
 		rpt_mutex_unlock(&myrpt->lock);
 		rpt_telemetry(myrpt, MACRO_BUSY, NULL);
 		return DC_ERROR;
 	}
 	myrpt->macrotimer = MACROTIME;
-	strncat(myrpt->macrobuf, val, sizeof(myrpt->macrobuf) - strlen(myrpt->macrobuf) - 1);
+	strncat(myrpt->macrobuf,val,MAXMACRO - 1);
 	rpt_mutex_unlock(&myrpt->lock);
 	return DC_COMPLETE;	
 }
 
 /*
-*  Gosub
+*  Playback a recording
 */
 
-static int function_gosub(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
+static int function_playback(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
 {
 
-	const char *val;
-	int	i;
-	struct ast_channel *mychannel;
-
-	if ((!myrpt->remote) && (!myrpt->enable))
+	if (myrpt->remote)
 		return DC_ERROR;
 
-	if (debug) 
-		ast_log(LOG_DEBUG, "@@@@ gosub param = %s, digitbuf = %s\n", (param)? param : "(null)", digitbuf);
+	if(debug) 
+		printf("@@@@ playback param = %s, digitbuf = %s\n", (param)? param : "(null)", digitbuf);
 	
-	mychannel = myrpt->remchannel;
-
-	if (ast_strlen_zero(digitbuf)) /* needs 1 digit */
-		return DC_INDETERMINATE;
-			
-	for (i = 0; i < digitbuf[i]; i++) {
-		if ((digitbuf[i] < '0') || (digitbuf[i] > '9'))
-			return DC_ERROR;
-	}
-   
-	if (*digitbuf == '0')
-		val = myrpt->p.startupgosub;
-	else
-		val = ast_variable_retrieve(myrpt->cfg, myrpt->p.gosub, digitbuf);
-	/* param was 1 for local buf */
-	if (!val) {
-		rpt_telemetry(myrpt, GOSUB_NOTFOUND, NULL);
-		return DC_COMPLETE;
-	}			
-	rpt_mutex_lock(&myrpt->lock);
-	if ((sizeof(myrpt->gosubbuf) - strlen(myrpt->gosubbuf)) < strlen(val)) {
-		rpt_mutex_unlock(&myrpt->lock);
-		rpt_telemetry(myrpt, GOSUB_BUSY, NULL);
+	if (ast_fileexists(param,NULL,myrpt->rxchannel->language) <= 0)
 		return DC_ERROR;
-	}
-	myrpt->gosubtimer = GOSUBTIME;
-	strncat(myrpt->gosubbuf, val, sizeof(myrpt->gosubbuf) - strlen(myrpt->gosubbuf) - 1);
-	rpt_mutex_unlock(&myrpt->lock);
-	return DC_COMPLETE;	
+
+	rpt_telemetry(myrpt,PLAYBACK,param);
+	return DC_COMPLETE;
 }
 
 /*
@@ -3378,163 +6374,510 @@ static int function_gosub(struct rpt *myrpt, char *param, char *digitbuf, int co
 
 static int function_cop(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
 {
-	if (!param)
+	char string[16];
+
+	int i, r;
+
+	if(!param)
 		return DC_ERROR;
 	
-	switch(myatoi(param)) {
-	case 1: /* System reset */
-		ast_cli_command(STDERR_FILENO, "restart now"); /* A little less drastic than what was previously here. */
-		return DC_COMPLETE;
-	case 2:
-		myrpt->enable = 1;
-		rpt_telemetry(myrpt, ARB_ALPHA, (void *) "RPTENA");
-		return DC_COMPLETE;
-	case 3:
-		myrpt->enable = 0;
-		return DC_COMPLETE;
-	case 4: /* test tone on */
-		rpt_telemetry(myrpt, TEST_TONE, NULL);
-		return DC_COMPLETE;
-	case 5: /* Disgorge variables to log for debug purposes */
-		myrpt->disgorgetime = time(NULL) + 10; /* Do it 10 seconds later */
-		return DC_COMPLETE;
-	case 6: /* Simulate COR being activated (phone only) */
-		if (command_source != SOURCE_PHONE)
-			return DC_INDETERMINATE;
-		return DC_DOKEY;	
+	switch(myatoi(param)){
+		case 1: /* System reset */
+			system("killall -9 asterisk");
+			return DC_COMPLETE;
+
+		case 2:
+			myrpt->p.s[myrpt->p.sysstate_cur].txdisable = 0;
+			rpt_telemetry(myrpt, ARB_ALPHA, (void *) "RPTENA");
+			return DC_COMPLETE;
+			
+		case 3:
+			myrpt->p.s[myrpt->p.sysstate_cur].txdisable = 1;
+			return DC_COMPLETE;
+			
+		case 4: /* test tone on */
+			if (myrpt->stopgen < 0) 
+			{
+				myrpt->stopgen = 1;
+			}
+			else 
+			{
+				myrpt->stopgen = 0;
+				rpt_telemetry(myrpt, TEST_TONE, NULL);
+			}
+			return DC_COMPLETE;
+
+		case 5: /* Disgorge variables to log for debug purposes */
+			myrpt->disgorgetime = time(NULL) + 10; /* Do it 10 seconds later */
+			return DC_COMPLETE;
+
+		case 6: /* Simulate COR being activated (phone only) */
+			if (command_source != SOURCE_PHONE) return DC_INDETERMINATE;
+			return DC_DOKEY;	
+
+
+		case 7: /* Time out timer enable */
+			myrpt->p.s[myrpt->p.sysstate_cur].totdisable = 0;
+			rpt_telemetry(myrpt, ARB_ALPHA, (void *) "TOTENA");
+			return DC_COMPLETE;
+			
+		case 8: /* Time out timer disable */
+			myrpt->p.s[myrpt->p.sysstate_cur].totdisable = 1;
+			rpt_telemetry(myrpt, ARB_ALPHA, (void *) "TOTDIS");
+			return DC_COMPLETE;
+
+                case 9: /* Autopatch enable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].autopatchdisable = 0;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "APENA");
+                        return DC_COMPLETE;
+
+                case 10: /* Autopatch disable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].autopatchdisable = 1;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "APDIS");
+                        return DC_COMPLETE;
+
+                case 11: /* Link Enable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].linkfundisable = 0;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "LNKENA");
+                        return DC_COMPLETE;
+
+                case 12: /* Link Disable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].linkfundisable = 1;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "LNKDIS");
+                        return DC_COMPLETE;
+
+		case 13: /* Query System State */
+			string[0] = string[1] = 'S';
+			string[2] = myrpt->p.sysstate_cur + '0';
+			string[3] = '\0';
+			rpt_telemetry(myrpt, ARB_ALPHA, (void *) string);
+			return DC_COMPLETE;
+
+		case 14: /* Change System State */
+			if(strlen(digitbuf) == 0)
+				break;
+			if((digitbuf[0] < '0') || (digitbuf[0] > '9'))
+				return DC_ERROR;
+			myrpt->p.sysstate_cur = digitbuf[0] - '0';
+                        string[0] = string[1] = 'S';
+                        string[2] = myrpt->p.sysstate_cur + '0';
+                        string[3] = '\0';
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) string);
+                        return DC_COMPLETE;
+
+                case 15: /* Scheduler Enable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].schedulerdisable = 0;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "SKENA");
+                        return DC_COMPLETE;
+
+                case 16: /* Scheduler Disable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].schedulerdisable = 1;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "SKDIS");
+                        return DC_COMPLETE;
+
+                case 17: /* User functions Enable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].userfundisable = 0;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "UFENA");
+                        return DC_COMPLETE;
+
+                case 18: /* User Functions Disable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].userfundisable = 1;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "UFDIS");
+                        return DC_COMPLETE;
+
+                case 19: /* Alternate Tail Enable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].alternatetail = 1;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "ATENA");
+                        return DC_COMPLETE;
+
+                case 20: /* Alternate Tail Disable */
+                        myrpt->p.s[myrpt->p.sysstate_cur].alternatetail = 0;
+                        rpt_telemetry(myrpt, ARB_ALPHA, (void *) "ATDIS");
+                        return DC_COMPLETE;
+
+                case 21: /* Parrot Mode Disable */
+			birdbath(myrpt);
+			if (myrpt->p.parrotmode < 2)
+			{
+				myrpt->p.parrotmode = 0;
+				rpt_telemetry(myrpt,COMPLETE,NULL);
+				return DC_COMPLETE;
+			}
+			break;
+
+                case 22: /* Parrot Mode Enable */
+			birdbath(myrpt);
+			if (myrpt->p.parrotmode < 2)
+			{
+				myrpt->p.parrotmode = 1;
+				rpt_telemetry(myrpt,COMPLETE,NULL);
+				return DC_COMPLETE;
+			}
+			break;
+		case 23: /* flush parrot in progress */
+			birdbath(myrpt);
+			rpt_telemetry(myrpt,COMPLETE,NULL);
+			return DC_COMPLETE;
+		case 24: /* flush all telemetry */
+			flush_telem(myrpt);
+			rpt_telemetry(myrpt,COMPLETE,NULL);
+			return DC_COMPLETE;
+		case 25: /* request keying info (brief) */
+			send_link_keyquery(myrpt);
+			myrpt->topkeylong = 0;
+			rpt_telemetry(myrpt,COMPLETE,NULL);
+			return DC_COMPLETE;
+		case 26: /* request keying info (full) */
+			send_link_keyquery(myrpt);
+			myrpt->topkeylong = 1;
+			rpt_telemetry(myrpt,COMPLETE,NULL);
+			return DC_COMPLETE;
+
+		case 30: /* recall memory location on programmable radio */
+
+		  	if(strlen(digitbuf) < 2) /* needs 2 digits */
+				break;
+			
+			for(i = 0 ; i < 2 ; i++){
+				if((digitbuf[i] < '0') || (digitbuf[i] > '9'))
+					return DC_ERROR;
+			}
+	    
+			r = retreive_memory(myrpt, digitbuf);
+			if (r < 0){
+				rpt_telemetry(myrpt,MEMNOTFOUND,NULL);
+				return DC_COMPLETE;
+			}
+			if (r > 0){
+				return DC_ERROR;
+			}
+			if (setrem(myrpt) == -1) return DC_ERROR;
+			return DC_COMPLETE;	
+
+		case 31: 
+		    /* set channel. note that it's going to change channel 
+		       then confirm on the new channel! */
+		  	if(strlen(digitbuf) < 2) /* needs 2 digits */
+				break;
+			
+			for(i = 0 ; i < 2 ; i++){
+				if((digitbuf[i] < '0') || (digitbuf[i] > '9'))
+					return DC_ERROR;
+			}
+			channel_steer(myrpt,digitbuf);
+			return DC_COMPLETE;	
+
+		case 32: /* Touch Tone Pad Test */
+			i = strlen(digitbuf);
+			if(!i){
+				if(debug > 3)
+				ast_log(LOG_NOTICE,"Padtest entered");
+				myrpt->inpadtest = 1;
+			}
+			else{
+				if(debug > 3)
+					ast_log(LOG_NOTICE,"Padtest len= %d digits=%s",i,digitbuf);
+				if(digitbuf[i-1] != myrpt->p.endchar)
+					break;
+				rpt_telemetry(myrpt, ARB_ALPHA, digitbuf);
+				myrpt->inpadtest = 0;
+				if(debug > 3)
+					ast_log(LOG_NOTICE,"Padtest exited");
+				return DC_COMPLETE;
+			}
 	}	
 	return DC_INDETERMINATE;
 }
-
 /*
 * Collect digits one by one until something matches
 */
-
-static int collect_function_digits(struct rpt *myrpt, char *digits, int command_source, struct rpt_link *mylink)
+static int collect_function_digits(struct rpt *myrpt, char *digits, 
+	int command_source, struct rpt_link *mylink)
 {
-	int i;
-	char *stringp, *functiondigits;
+	int i,rv;
+	char *stringp,*action,*param,*functiondigits;
 	char function_table_name[30] = "";
+	char workstring[200];
+	
 	struct ast_variable *vp;
-	AST_DECLARE_APP_ARGS(args,
-		AST_APP_ARG(action);
-		AST_APP_ARG(param);
-	);
 	
-	ast_debug(1, "@@@@ Digits collected: %s, source: %d\n", digits, command_source);
+	if (debug > 6) ast_log(LOG_NOTICE,"digits=%s  source=%d\n",digits, command_source);
+
+	//if(debug)	
+	//	printf("@@@@ Digits collected: %s, source: %d\n", digits, command_source);
 	
 	if (command_source == SOURCE_DPHONE) {
-		if (!myrpt->p.dphone_functions)
-			return DC_INDETERMINATE;
-		ast_copy_string(function_table_name, myrpt->p.dphone_functions, sizeof(function_table_name));
-	} else if (command_source == SOURCE_PHONE) {
-		if (!myrpt->p.phone_functions)
-			return DC_INDETERMINATE;
-		ast_copy_string(function_table_name, myrpt->p.phone_functions, sizeof(function_table_name));
-	} else if (command_source == SOURCE_LNK)
-		ast_copy_string(function_table_name, myrpt->p.link_functions, sizeof(function_table_name));
+		if (!myrpt->p.dphone_functions) return DC_INDETERMINATE;
+		strncpy(function_table_name, myrpt->p.dphone_functions, sizeof(function_table_name) - 1);
+		}
+	else if (command_source == SOURCE_ALT) {
+		if (!myrpt->p.alt_functions) return DC_INDETERMINATE;
+		strncpy(function_table_name, myrpt->p.alt_functions, sizeof(function_table_name) - 1);
+		}
+	else if (command_source == SOURCE_PHONE) {
+		if (!myrpt->p.phone_functions) return DC_INDETERMINATE;
+		strncpy(function_table_name, myrpt->p.phone_functions, sizeof(function_table_name) - 1);
+		}
+	else if (command_source == SOURCE_LNK)
+		strncpy(function_table_name, myrpt->p.link_functions, sizeof(function_table_name) - 1);
 	else
-		ast_copy_string(function_table_name, myrpt->p.functions, sizeof(function_table_name));
-
-	for (vp = ast_variable_browse(myrpt->cfg, function_table_name); vp; vp = vp->next) {
-		if (!strncasecmp(vp->name, digits, strlen(vp->name)))
+		strncpy(function_table_name, myrpt->p.functions, sizeof(function_table_name) - 1);
+    /* find context for function table in rpt.conf file */
+	vp = ast_variable_browse(myrpt->cfg, function_table_name);
+	while(vp) {
+		if(!strncasecmp(vp->name, digits, strlen(vp->name)))
 			break;
+		vp = vp->next;
 	}	
-	if (!vp) {
+	/* if function context not found */
+	if(!vp) {
 		int n;
 
 		n = myrpt->longestfunc;
-		if (command_source == SOURCE_LNK)
-			n = myrpt->link_longestfunc;
-		else if (command_source == SOURCE_PHONE)
-			n = myrpt->phone_longestfunc;
-		else if (command_source == SOURCE_DPHONE)
-			n = myrpt->dphone_longestfunc;
-
-		if (strlen(digits) >= n)
+		if (command_source == SOURCE_LNK) n = myrpt->link_longestfunc;
+		else 
+		if (command_source == SOURCE_PHONE) n = myrpt->phone_longestfunc;
+		else 
+		if (command_source == SOURCE_ALT) n = myrpt->alt_longestfunc;
+		else 
+		if (command_source == SOURCE_DPHONE) n = myrpt->dphone_longestfunc;
+		
+		if(strlen(digits) >= n)
 			return DC_ERROR;
 		else
 			return DC_INDETERMINATE;
-	}
-
+	}	
 	/* Found a match, retrieve value part and parse */
-	stringp = ast_strdupa(vp->value);
-	AST_STANDARD_APP_ARGS(args, stringp);
-
-	ast_debug(1, "@@@@ action: %s, param = %s\n", args.action, S_OR(args.param, "(null)"));
+	strncpy(workstring, vp->value, sizeof(workstring) - 1 );
+	stringp = workstring;
+	action = strsep(&stringp, ",");
+	param = stringp;
+	if(debug)
+		printf("@@@@ action: %s, param = %s\n",action, (param) ? param : "(null)");
 	/* Look up the action */
-	for (i = 0; i < (sizeof(function_table) / sizeof(struct function_table_tag)); i++) {
-		if (!strncasecmp(args.action, function_table[i].action, strlen(args.action)))
+	for(i = 0 ; i < (sizeof(function_table)/sizeof(struct function_table_tag)); i++){
+		if(!strncasecmp(action, function_table[i].action, strlen(action)))
 			break;
 	}
-	ast_debug(1, "@@@@ table index i = %d\n", i);
-	if (i == (sizeof(function_table) / sizeof(struct function_table_tag))) {
+	if(debug)
+		printf("@@@@ table index i = %d\n",i);
+	if(i == (sizeof(function_table)/sizeof(struct function_table_tag))){
 		/* Error, action not in table */
 		return DC_ERROR;
 	}
-	if (function_table[i].function == NULL) {
+	if(function_table[i].function == NULL){
 		/* Error, function undefined */
-		ast_debug(1, "@@@@ NULL for action: %s\n", args.action);
+		if(debug)
+			printf("@@@@ NULL for action: %s\n",action);
 		return DC_ERROR;
 	}
 	functiondigits = digits + strlen(vp->name);
-	return (*function_table[i].function)(myrpt, args.param, functiondigits, command_source, mylink);
+	rv=(*function_table[i].function)(myrpt, param, functiondigits, command_source, mylink);
+	if (debug > 6) ast_log(LOG_NOTICE,"rv=%i\n",rv);
+	return(rv);
 }
 
 
-static void handle_link_data(struct rpt *myrpt, struct rpt_link *mylink, char *str)
+static void handle_link_data(struct rpt *myrpt, struct rpt_link *mylink,
+	char *str)
 {
-	char cmd[300] = "", dest[300], src[300], c;
-	int	seq, res;
-	struct rpt_link *l;
-	struct ast_frame wf;
+char	tmp[512],tmp1[512],cmd[300] = "",dest[300],src[300],c;
+int	i,seq, res, ts;
+struct rpt_link *l;
+struct	ast_frame wf;
 
 	wf.frametype = AST_FRAME_TEXT;
 	wf.subclass = 0;
 	wf.offset = 0;
-	wf.mallocd = 1;
+	wf.mallocd = 0;
 	wf.datalen = strlen(str) + 1;
 	wf.samples = 0;
-	if (!strcmp(str, discstr)) {
-		mylink->disced = 1;
-		mylink->retries = MAX_RETRIES + 1;
-		ast_softhangup(mylink->chan, AST_SOFTHANGUP_DEV);
+ 	/* put string in our buffer */
+	strncpy(tmp,str,sizeof(tmp) - 1);
+
+        if (!strcmp(tmp,discstr))
+        {
+                mylink->disced = 1;
+		mylink->retries = mylink->max_retries + 1;
+                ast_softhangup(mylink->chan,AST_SOFTHANGUP_DEV);
+                return;
+        }
+        if (!strcmp(tmp,newkeystr))
+        {
+		mylink->newkey = 1;
+                return;
+        }
+	if (tmp[0] == 'L')
+	{
+		rpt_mutex_lock(&myrpt->lock);
+		strcpy(mylink->linklist,tmp + 2);
+		time(&mylink->linklistreceived);
+		rpt_mutex_unlock(&myrpt->lock);
+		if (debug > 6) ast_log(LOG_NOTICE,"@@@@ node %s recieved node list %s from node %s\n",
+			myrpt->name,tmp,mylink->name);
 		return;
 	}
-	if (sscanf(str, "%s %s %s %d %c", cmd, dest, src, &seq, &c) != 5) {
-		ast_log(LOG_WARNING, "Unable to parse link string %s\n", str);
+	if (tmp[0] == 'K')
+	{
+		if (sscanf(tmp,"%s %s %s %d %d",cmd,dest,src,&seq,&ts) != 5)
+		{
+			ast_log(LOG_WARNING, "Unable to parse keying string %s\n",str);
+			return;
+		}
+		if (dest[0] == '0')
+		{
+			strcpy(dest,myrpt->name);
+		}		
+		/* if not for me, redistribute to all links */
+		if (strcmp(dest,myrpt->name))
+		{
+			l = myrpt->links.next;
+			/* see if this is one in list */
+			while(l != &myrpt->links)
+			{
+				if (l->name[0] == '0') 
+				{
+					l = l->next;
+					continue;
+				}
+				/* dont send back from where it came */
+				if ((l == mylink) || (!strcmp(l->name,mylink->name)))
+				{
+					l = l->next;
+					continue;
+				}
+				/* if it is, send it and we're done */
+				if (!strcmp(l->name,dest))
+				{
+					/* send, but not to src */
+					if (strcmp(l->name,src)) {
+						wf.data = str;
+						if (l->chan) ast_write(l->chan,&wf);
+					}
+					return;
+				}
+				l = l->next;
+			}
+		}
+		/* if not for me, or is broadcast, redistribute to all links */
+		if ((strcmp(dest,myrpt->name)) || (dest[0] == '*'))
+		{
+			l = myrpt->links.next;
+			/* otherwise, send it to all of em */
+			while(l != &myrpt->links)
+			{
+				if (l->name[0] == '0') 
+				{
+					l = l->next;
+					continue;
+				}
+				/* dont send back from where it came */
+				if ((l == mylink) || (!strcmp(l->name,mylink->name)))
+				{
+					l = l->next;
+					continue;
+				}
+				/* send, but not to src */
+				if (strcmp(l->name,src)) {
+					wf.data = str;
+					if (l->chan) ast_write(l->chan,&wf); 
+				}
+				l = l->next;
+			}
+		}
+		/* if not for me, end here */
+		if (strcmp(dest,myrpt->name) && (dest[0] != '*')) return;
+		if (cmd[1] == '?')
+		{
+			time_t now;
+			int n = 0;
+
+			time(&now);
+			if (myrpt->lastkeyedtime)
+			{
+				n = (int)(now - myrpt->lastkeyedtime);
+			}
+			sprintf(tmp1,"K %s %s %d %d",src,myrpt->name,myrpt->keyed,n);
+			wf.data = tmp1;
+			wf.datalen = strlen(tmp1) + 1;
+			if (mylink->chan) ast_write(mylink->chan,&wf); 
+			return;
+		}
+		if (myrpt->topkeystate != 1) return;
+		rpt_mutex_lock(&myrpt->lock);
+		for(i = 0; i < TOPKEYN; i++)
+		{
+			if (!strcmp(myrpt->topkey[i].node,src)) break;
+		}
+		if (i >= TOPKEYN)
+		{
+			for(i = 0; i < TOPKEYN; i++)
+			{
+				if (!myrpt->topkey[i].node[0]) break;
+			}
+		}
+		if (i < TOPKEYN)
+		{
+			strncpy(myrpt->topkey[i].node,src,TOPKEYMAXSTR - 1);
+			myrpt->topkey[i].timesince = ts;
+			myrpt->topkey[i].keyed = seq;
+		}
+		rpt_mutex_unlock(&myrpt->lock);
 		return;
 	}
-	if (strcmp(cmd, "D")) {
-		ast_log(LOG_WARNING, "Unable to parse link string %s\n", str);
-		return;
+	if (tmp[0] == 'I')
+	{
+		if (sscanf(tmp,"%s %s %x",cmd,src,&seq) != 3)
+		{
+			ast_log(LOG_WARNING, "Unable to parse ident string %s\n",str);
+			return;
+		}
+		mdc1200_notify(myrpt,src,seq);
+		strcpy(dest,"*");
 	}
-
-	if (dest[0] == '0') {
-		strcpy(dest, myrpt->name);
+	else
+	{
+		if (sscanf(tmp,"%s %s %s %d %c",cmd,dest,src,&seq,&c) != 5)
+		{
+			ast_log(LOG_WARNING, "Unable to parse link string %s\n",str);
+			return;
+		}
+		if (strcmp(cmd,"D"))
+		{
+			ast_log(LOG_WARNING, "Unable to parse link string %s\n",str);
+			return;
+		}
 	}
+	if (dest[0] == '0')
+	{
+		strcpy(dest,myrpt->name);
+	}		
 
 	/* if not for me, redistribute to all links */
-	if (strcmp(dest, myrpt->name)) {
+	if (strcmp(dest,myrpt->name))
+	{
 		l = myrpt->links.next;
 		/* see if this is one in list */
-		while (l != &myrpt->links) {
-			if (l->name[0] == '0') {
+		while(l != &myrpt->links)
+		{
+			if (l->name[0] == '0') 
+			{
 				l = l->next;
 				continue;
 			}
 			/* dont send back from where it came */
-			if ((l == mylink) || (!strcmp(l->name, mylink->name))) {
+			if ((l == mylink) || (!strcmp(l->name,mylink->name)))
+			{
 				l = l->next;
 				continue;
 			}
 			/* if it is, send it and we're done */
-			if (!strcmp(l->name, dest)) {
+			if (!strcmp(l->name,dest))
+			{
 				/* send, but not to src */
-				if (strcmp(l->name, src)) {
-					wf.data = ast_strdup(str);
-					if (l->chan)
-						ast_write(l->chan, &wf);
+				if (strcmp(l->name,src)) {
+					wf.data = str;
+					if (l->chan) ast_write(l->chan,&wf);
 				}
 				return;
 			}
@@ -3542,89 +6885,130 @@ static void handle_link_data(struct rpt *myrpt, struct rpt_link *mylink, char *s
 		}
 		l = myrpt->links.next;
 		/* otherwise, send it to all of em */
-		while (l != &myrpt->links) {
-			if (l->name[0] == '0') {
+		while(l != &myrpt->links)
+		{
+			if (l->name[0] == '0') 
+			{
 				l = l->next;
 				continue;
 			}
 			/* dont send back from where it came */
-			if ((l == mylink) || (!strcmp(l->name, mylink->name))) {
+			if ((l == mylink) || (!strcmp(l->name,mylink->name)))
+			{
 				l = l->next;
 				continue;
 			}
 			/* send, but not to src */
-			if (strcmp(l->name, src)) {
-				wf.data = ast_strdup(str);
-				if (l->chan)
-					ast_write(l->chan, &wf);
+			if (strcmp(l->name,src)) {
+				wf.data = str;
+				if (l->chan) ast_write(l->chan,&wf); 
 			}
 			l = l->next;
 		}
 		return;
 	}
+	if (myrpt->p.archivedir)
+	{
+		char str[100];
+
+		sprintf(str,"DTMF,%s,%c",mylink->name,c);
+		donodelog(myrpt,str);
+	}
+	c = func_xlat(myrpt,c,&myrpt->p.outxlat);
+	if (!c) return;
 	rpt_mutex_lock(&myrpt->lock);
-	if (c == myrpt->p.endchar)
-		myrpt->stopgen = 1;
-	if (myrpt->callmode == 1) {
+	if (c == myrpt->p.endchar) myrpt->stopgen = 1;
+	if (myrpt->callmode == 1)
+	{
 		myrpt->exten[myrpt->cidx++] = c;
 		myrpt->exten[myrpt->cidx] = 0;
 		/* if this exists */
-		if (ast_exists_extension(myrpt->pchannel, myrpt->patchcontext, myrpt->exten, 1, NULL)) {
-			myrpt->callmode = 2;
-			if (!myrpt->patchquiet) {
-				rpt_mutex_unlock(&myrpt->lock);
-				rpt_telemetry(myrpt, PROC, NULL); 
-				rpt_mutex_lock(&myrpt->lock);
+		if (ast_exists_extension(myrpt->pchannel,myrpt->patchcontext,myrpt->exten,1,NULL))
+		{
+			/* if this really it, end now */
+			if (!ast_matchmore_extension(myrpt->pchannel,myrpt->patchcontext,
+				myrpt->exten,1,NULL)) 
+			{
+				myrpt->callmode = 2;
+				if(!myrpt->patchquiet)
+				{
+					rpt_mutex_unlock(&myrpt->lock);
+					rpt_telemetry(myrpt,PROC,NULL); 
+					rpt_mutex_lock(&myrpt->lock);
+				}
+			}
+			else /* othewise, reset timer */
+			{
+				myrpt->calldigittimer = 1;
 			}
 		}
 		/* if can continue, do so */
-		if (!ast_canmatch_extension(myrpt->pchannel, myrpt->patchcontext, myrpt->exten, 1, NULL)) {
+		if (!ast_canmatch_extension(myrpt->pchannel,myrpt->patchcontext,myrpt->exten,1,NULL))
+		{
 			/* call has failed, inform user */
 			myrpt->callmode = 4;
 		}
 	}
-	if ((myrpt->callmode == 2) || (myrpt->callmode == 3)) {
-		myrpt->mydtmf = c;
-	}
-	if (c == myrpt->p.funcchar) {
+	if ((!myrpt->inpadtest) &&(c == myrpt->p.funcchar))
+	{
 		myrpt->rem_dtmfidx = 0;
 		myrpt->rem_dtmfbuf[myrpt->rem_dtmfidx] = 0;
 		time(&myrpt->rem_dtmf_time);
 		rpt_mutex_unlock(&myrpt->lock);
 		return;
-	} else if ((c != myrpt->p.endchar) && (myrpt->rem_dtmfidx >= 0)) {
+	} 
+	else if (myrpt->rem_dtmfidx < 0)
+	{
+		if ((myrpt->callmode == 2) || (myrpt->callmode == 3))
+		{
+			myrpt->mydtmf = c;
+		}
+		if (myrpt->p.propagate_dtmf) do_dtmf_local(myrpt,c);
+		if (myrpt->p.propagate_phonedtmf) do_dtmf_phone(myrpt,mylink,c);
+		rpt_mutex_unlock(&myrpt->lock);
+		return;
+	}
+	else if (((myrpt->inpadtest) || (c != myrpt->p.endchar)) && (myrpt->rem_dtmfidx >= 0))
+	{
 		time(&myrpt->rem_dtmf_time);
-		if (myrpt->rem_dtmfidx < MAXDTMF) {
+		if (myrpt->rem_dtmfidx < MAXDTMF)
+		{
 			myrpt->rem_dtmfbuf[myrpt->rem_dtmfidx++] = c;
 			myrpt->rem_dtmfbuf[myrpt->rem_dtmfidx] = 0;
 			
 			rpt_mutex_unlock(&myrpt->lock);
-			ast_copy_string(cmd, myrpt->rem_dtmfbuf, sizeof(cmd));
+			strncpy(cmd, myrpt->rem_dtmfbuf, sizeof(cmd) - 1);
 			res = collect_function_digits(myrpt, cmd, SOURCE_LNK, mylink);
 			rpt_mutex_lock(&myrpt->lock);
 			
-			switch (res) {
-			case DC_INDETERMINATE:
-				break;
-			case DC_REQ_FLUSH:
-				myrpt->rem_dtmfidx = 0;
-				myrpt->rem_dtmfbuf[0] = 0;
-				break;
-			case DC_COMPLETE:
-				myrpt->totalexecdcommands++;
-				myrpt->dailyexecdcommands++;
-				ast_copy_string(myrpt->lastdtmfcommand, cmd, MAXDTMF);
-				myrpt->lastdtmfcommand[MAXDTMF-1] = '\0';
-				myrpt->rem_dtmfbuf[0] = 0;
-				myrpt->rem_dtmfidx = -1;
-				myrpt->rem_dtmf_time = 0;
-				break;
-			case DC_ERROR:
-			default:
-				myrpt->rem_dtmfbuf[0] = 0;
-				myrpt->rem_dtmfidx = -1;
-				myrpt->rem_dtmf_time = 0;
-				break;
+			switch(res){
+
+				case DC_INDETERMINATE:
+					break;
+				
+				case DC_REQ_FLUSH:
+					myrpt->rem_dtmfidx = 0;
+					myrpt->rem_dtmfbuf[0] = 0;
+					break;
+				
+				
+				case DC_COMPLETE:
+				case DC_COMPLETEQUIET:
+					myrpt->totalexecdcommands++;
+					myrpt->dailyexecdcommands++;
+					strncpy(myrpt->lastdtmfcommand, cmd, MAXDTMF-1);
+					myrpt->lastdtmfcommand[MAXDTMF-1] = '\0';
+					myrpt->rem_dtmfbuf[0] = 0;
+					myrpt->rem_dtmfidx = -1;
+					myrpt->rem_dtmf_time = 0;
+					break;
+				
+				case DC_ERROR:
+				default:
+					myrpt->rem_dtmfbuf[0] = 0;
+					myrpt->rem_dtmfidx = -1;
+					myrpt->rem_dtmf_time = 0;
+					break;
 			}
 		}
 
@@ -3633,109 +7017,173 @@ static void handle_link_data(struct rpt *myrpt, struct rpt_link *mylink, char *s
 	return;
 }
 
-static void handle_link_phone_dtmf(struct rpt *myrpt, struct rpt_link *mylink, char c)
+static void handle_link_phone_dtmf(struct rpt *myrpt, struct rpt_link *mylink,
+	char c)
 {
-	char cmd[300];
-	int	res;
 
+char	cmd[300];
+int	res;
+
+	if (myrpt->p.archivedir)
+	{
+		char str[100];
+
+		sprintf(str,"DTMF(P),%s,%c",mylink->name,c);
+		donodelog(myrpt,str);
+	}
 	rpt_mutex_lock(&myrpt->lock);
-	if (c == myrpt->p.endchar) {
-		if (mylink->lastrx) {
-			mylink->lastrx = 0;
+
+	if (mylink->phonemode == 3) /*If in simplex dumb phone mode */
+	{
+		if(c == myrpt->p.endchar) /* If end char */
+		{
+			mylink->lastrealrx = 0; /* Keying state = off */
 			rpt_mutex_unlock(&myrpt->lock);
 			return;
 		}
-		myrpt->stopgen = 1;
-		if (myrpt->cmdnode[0]) {
-			myrpt->cmdnode[0] = 0;
-			myrpt->dtmfidx = -1;
-			myrpt->dtmfbuf[0] = 0;
+
+		if(c == myrpt->p.funcchar) /* If lead-in char */
+		{
+			mylink->lastrealrx = !mylink->lastrealrx; /* Toggle keying state */
 			rpt_mutex_unlock(&myrpt->lock);
-			rpt_telemetry(myrpt, COMPLETE, NULL);
 			return;
 		}
 	}
-	if (myrpt->cmdnode[0]) {
+	else
+	{
+		if (c == myrpt->p.endchar)
+		{
+			if (mylink->lastrx)
+			{
+				mylink->lastrealrx = 0;
+				rpt_mutex_unlock(&myrpt->lock);
+				return;
+			}
+			myrpt->stopgen = 1;
+			if (myrpt->cmdnode[0])
+			{
+				myrpt->cmdnode[0] = 0;
+				myrpt->dtmfidx = -1;
+				myrpt->dtmfbuf[0] = 0;
+				rpt_mutex_unlock(&myrpt->lock);
+				rpt_telemetry(myrpt,COMPLETE,NULL);
+				return;
+			}
+		}
+	}
+	if (myrpt->cmdnode[0])
+	{
 		rpt_mutex_unlock(&myrpt->lock);
-		send_link_dtmf(myrpt, c);
+		send_link_dtmf(myrpt,c);
 		return;
 	}
-	if (myrpt->callmode == 1) {
+	if (myrpt->callmode == 1)
+	{
 		myrpt->exten[myrpt->cidx++] = c;
 		myrpt->exten[myrpt->cidx] = 0;
 		/* if this exists */
-		if (ast_exists_extension(myrpt->pchannel, myrpt->patchcontext, myrpt->exten, 1, NULL)) {
-			myrpt->callmode = 2;
-			if (!myrpt->patchquiet) {
-				rpt_mutex_unlock(&myrpt->lock);
-				rpt_telemetry(myrpt, PROC, NULL); 
-				rpt_mutex_lock(&myrpt->lock);
+		if (ast_exists_extension(myrpt->pchannel,myrpt->patchcontext,myrpt->exten,1,NULL))
+		{
+			/* if this really it, end now */
+			if (!ast_matchmore_extension(myrpt->pchannel,myrpt->patchcontext,
+				myrpt->exten,1,NULL)) 
+			{
+				myrpt->callmode = 2;
+				if(!myrpt->patchquiet)
+				{
+					rpt_mutex_unlock(&myrpt->lock);
+					rpt_telemetry(myrpt,PROC,NULL); 
+					rpt_mutex_lock(&myrpt->lock);
+				}
+			}
+			else /* othewise, reset timer */
+			{
+				myrpt->calldigittimer = 1;
 			}
 		}
 		/* if can continue, do so */
-		if (!ast_canmatch_extension(myrpt->pchannel, myrpt->patchcontext, myrpt->exten, 1, NULL)) {
+		if (!ast_canmatch_extension(myrpt->pchannel,myrpt->patchcontext,myrpt->exten,1,NULL))
+		{
 			/* call has failed, inform user */
 			myrpt->callmode = 4;
 		}
 	}
-	if ((myrpt->callmode == 2) || (myrpt->callmode == 3)) {
+	if ((myrpt->callmode == 2) || (myrpt->callmode == 3))
+	{
 		myrpt->mydtmf = c;
 	}
-	if (c == myrpt->p.funcchar) {
+	if ((!myrpt->inpadtest) && (c == myrpt->p.funcchar))
+	{
 		myrpt->rem_dtmfidx = 0;
 		myrpt->rem_dtmfbuf[myrpt->rem_dtmfidx] = 0;
 		time(&myrpt->rem_dtmf_time);
 		rpt_mutex_unlock(&myrpt->lock);
 		return;
-	} else if ((c != myrpt->p.endchar) && (myrpt->rem_dtmfidx >= 0)) {
+	} 
+	else if (((myrpt->inpadtest) || (c != myrpt->p.endchar)) && (myrpt->rem_dtmfidx >= 0))
+	{
 		time(&myrpt->rem_dtmf_time);
-		if (myrpt->rem_dtmfidx < MAXDTMF) {
+		if (myrpt->rem_dtmfidx < MAXDTMF)
+		{
 			myrpt->rem_dtmfbuf[myrpt->rem_dtmfidx++] = c;
 			myrpt->rem_dtmfbuf[myrpt->rem_dtmfidx] = 0;
 			
 			rpt_mutex_unlock(&myrpt->lock);
-			ast_copy_string(cmd, myrpt->rem_dtmfbuf, sizeof(cmd));
-			switch(mylink->phonemode) {
-		    case 1:
+			strncpy(cmd, myrpt->rem_dtmfbuf, sizeof(cmd) - 1);
+			switch(mylink->phonemode)
+			{
+			    case 1:
 				res = collect_function_digits(myrpt, cmd, 
 					SOURCE_PHONE, mylink);
 				break;
-		    case 2:
+			    case 2:
 				res = collect_function_digits(myrpt, cmd, 
-					SOURCE_DPHONE, mylink);
+					SOURCE_DPHONE,mylink);
 				break;
-		    default:
+			    case 4:
+				res = collect_function_digits(myrpt, cmd, 
+					SOURCE_ALT,mylink);
+				break;
+			    default:
 				res = collect_function_digits(myrpt, cmd, 
 					SOURCE_LNK, mylink);
 				break;
 			}
 
 			rpt_mutex_lock(&myrpt->lock);
+			
+			switch(res){
 
-			switch(res) {
-			case DC_INDETERMINATE:
-				break;
-			case DC_DOKEY:
-				mylink->lastrx = 1;
-				break;
-			case DC_REQ_FLUSH:
-				myrpt->rem_dtmfidx = 0;
-				myrpt->rem_dtmfbuf[0] = 0;
-				break;
-			case DC_COMPLETE:
-				myrpt->totalexecdcommands++;
-				myrpt->dailyexecdcommands++;
-				ast_copy_string(myrpt->lastdtmfcommand, cmd, MAXDTMF);
-				myrpt->rem_dtmfbuf[0] = 0;
-				myrpt->rem_dtmfidx = -1;
-				myrpt->rem_dtmf_time = 0;
-				break;
-			case DC_ERROR:
-			default:
-				myrpt->rem_dtmfbuf[0] = 0;
-				myrpt->rem_dtmfidx = -1;
-				myrpt->rem_dtmf_time = 0;
-				break;
+				case DC_INDETERMINATE:
+					break;
+				
+				case DC_DOKEY:
+					mylink->lastrealrx = 1;
+					break;
+				
+				case DC_REQ_FLUSH:
+					myrpt->rem_dtmfidx = 0;
+					myrpt->rem_dtmfbuf[0] = 0;
+					break;
+				
+				
+				case DC_COMPLETE:
+				case DC_COMPLETEQUIET:
+					myrpt->totalexecdcommands++;
+					myrpt->dailyexecdcommands++;
+					strncpy(myrpt->lastdtmfcommand, cmd, MAXDTMF-1);
+					myrpt->lastdtmfcommand[MAXDTMF-1] = '\0';
+					myrpt->rem_dtmfbuf[0] = 0;
+					myrpt->rem_dtmfidx = -1;
+					myrpt->rem_dtmf_time = 0;
+					break;
+				
+				case DC_ERROR:
+				default:
+					myrpt->rem_dtmfbuf[0] = 0;
+					myrpt->rem_dtmfidx = -1;
+					myrpt->rem_dtmf_time = 0;
+					break;
 			}
 		}
 
@@ -3777,33 +7225,34 @@ static void handle_link_phone_dtmf(struct rpt *myrpt, struct rpt_link *mylink, c
 
 static int rbi_mhztoband(char *str)
 {
-	int	i;
+int	i;
 
 	i = atoi(str) / 10; /* get the 10's of mhz */
-	switch (i) {
-	case 2:
+	switch(i)
+	{
+	    case 2:
 		return 10;
-	case 5:
+	    case 5:
 		return 11;
-	case 14:
+	    case 14:
 		return 2;
-	case 22:
+	    case 22:
 		return 3;
-	case 44:
+	    case 44:
 		return 4;
-	case 124:
+	    case 124:
 		return 0;
-	case 125:
+	    case 125:
 		return 1;
-	case 126:
+	    case 126:
 		return 8;
-	case 127:
+	    case 127:
 		return 5;
-	case 128:
+	    case 128:
 		return 6;
-	case 129:
+	    case 129:
 		return 7;
-	default:
+	    default:
 		break;
 	}
 	return -1;
@@ -3812,90 +7261,90 @@ static int rbi_mhztoband(char *str)
 /* take a PL frequency and turn it into a code */
 static int rbi_pltocode(char *str)
 {
-	int i;
-	char *s;
+int i;
+char *s;
 
-	s = strchr(str, '.');
+	s = strchr(str,'.');
 	i = 0;
-	if (s)
-		i = atoi(s + 1);
+	if (s) i = atoi(s + 1);
 	i += atoi(str) * 10;
-	switch(i) {
-	case 670:
+	switch(i)
+	{
+	    case 670:
 		return 0;
-	case 719:
+	    case 719:
 		return 1;
-	case 744:
+	    case 744:
 		return 2;
-	case 770:
+	    case 770:
 		return 3;
-	case 797:
+	    case 797:
 		return 4;
-	case 825:
+	    case 825:
 		return 5;
-	case 854:
+	    case 854:
 		return 6;
-	case 885:
+	    case 885:
 		return 7;
-	case 915:
+	    case 915:
 		return 8;
-	case 948:
+	    case 948:
 		return 9;
-	case 974:
+	    case 974:
 		return 10;
-	case 1000:
+	    case 1000:
 		return 11;
-	case 1035:
+	    case 1035:
 		return 12;
-	case 1072:
+	    case 1072:
 		return 13;
-	case 1109:
+	    case 1109:
 		return 14;
-	case 1148:
+	    case 1148:
 		return 15;
-	case 1188:
+	    case 1188:
 		return 16;
-	case 1230:
+	    case 1230:
 		return 17;
-	case 1273:
+	    case 1273:
 		return 18;
-	case 1318:
+	    case 1318:
 		return 19;
-	case 1365:
+	    case 1365:
 		return 20;
-	case 1413:
+	    case 1413:
 		return 21;
-	case 1462:
+	    case 1462:
 		return 22;
-	case 1514:
+	    case 1514:
 		return 23;
-	case 1567:
+	    case 1567:
 		return 24;
-	case 1622:
+	    case 1622:
 		return 25;
-	case 1679:
+	    case 1679:
 		return 26;
-	case 1738:
+	    case 1738:
 		return 27;
-	case 1799:
+	    case 1799:
 		return 28;
-	case 1862:
+	    case 1862:
 		return 29;
-	case 1928:
+	    case 1928:
 		return 30;
-	case 2035:
+	    case 2035:
 		return 31;
-	case 2107:
+	    case 2107:
 		return 32;
-	case 2181:
+	    case 2181:
 		return 33;
-	case 2257:
+	    case 2257:
 		return 34;
-	case 2336:
+	    case 2336:
 		return 35;
-	case 2418:
+	    case 2418:
 		return 36;
-	case 2503:
+	    case 2503:
 		return 37;
 	}
 	return -1;
@@ -3905,166 +7354,769 @@ static int rbi_pltocode(char *str)
 * Shift out a formatted serial bit stream
 */
 
-static void rbi_out_parallel(struct rpt *myrpt, unsigned char *data)
-{
-	int i, j;
-	unsigned char od, d;
-
-	for (i = 0; i < 5; i++) {
-		od = *data++; 
-		for (j = 0; j < 8; j++) {
-			d = od & 1;
-			outb(d, myrpt->p.iobase);
-			usleep(15);
-			od >>= 1;
-			outb(d | 2, myrpt->p.iobase);
-			usleep(30);
-			outb(d, myrpt->p.iobase);
-			usleep(10);
-		}
-	}
+static void rbi_out_parallel(struct rpt *myrpt,unsigned char *data)
+    {
+#ifdef __i386__
+    int i,j;
+    unsigned char od,d;
+    static volatile long long delayvar;
+
+    for(i = 0 ; i < 5 ; i++){
+        od = *data++; 
+        for(j = 0 ; j < 8 ; j++){
+            d = od & 1;
+            outb(d,myrpt->p.iobase);
+	    /* >= 15 us */
+	    for(delayvar = 1; delayvar < 15000; delayvar++); 
+            od >>= 1;
+            outb(d | 2,myrpt->p.iobase);
+	    /* >= 30 us */
+	    for(delayvar = 1; delayvar < 30000; delayvar++); 
+            outb(d,myrpt->p.iobase);
+	    /* >= 10 us */
+	    for(delayvar = 1; delayvar < 10000; delayvar++); 
+            }
+        }
 	/* >= 50 us */
-	usleep(50);
-}
+        for(delayvar = 1; delayvar < 50000; delayvar++); 
+#endif
+    }
 
-static void rbi_out(struct rpt *myrpt, unsigned char *data)
+static void rbi_out(struct rpt *myrpt,unsigned char *data)
 {
-	struct zt_radio_param r = { 0, };
+struct zt_radio_param r;
 
+	memset(&r,0,sizeof(struct zt_radio_param));
 	r.radpar = ZT_RADPAR_REMMODE;
 	r.data = ZT_RADPAR_REM_RBI1;
 	/* if setparam ioctl fails, its probably not a pciradio card */
-	if (ioctl(myrpt->rxchannel->fds[0], ZT_RADIO_SETPARAM, &r) == -1) {
-		rbi_out_parallel(myrpt, data);
+	if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&r) == -1)
+	{
+		rbi_out_parallel(myrpt,data);
 		return;
 	}
 	r.radpar = ZT_RADPAR_REMCOMMAND;
-	memcpy(&r.data, data, 5);
-	if (ioctl(myrpt->rxchannel->fds[0], ZT_RADIO_SETPARAM, &r) == -1) {
-		ast_log(LOG_WARNING, "Cannot send RBI command for channel %s\n", myrpt->rxchannel->name);
+	memcpy(&r.data,data,5);
+	if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&r) == -1)
+	{
+		ast_log(LOG_WARNING,"Cannot send RBI command for channel %s\n",myrpt->zaprxchannel->name);
 		return;
 	}
 }
 
-static int serial_remote_io(struct rpt *myrpt, unsigned char *txbuf, int txbytes, char *rxbuf, int rxmaxbytes, int asciiflag)
+static int serial_remote_io(struct rpt *myrpt, unsigned char *txbuf, int txbytes, 
+	unsigned char *rxbuf, int rxmaxbytes, int asciiflag)
 {
-	int i;
+	int i,j,index,oldmode,olddata;
 	struct zt_radio_param prm;
+	char c;
 
-	char *buf = alloca(30 + txbytes * 3);
-	int len;
-	ast_copy_string(buf, "String output was: ", 30 + txbytes * 3);
-	len = strlen(buf);
-	for (i = 0; i < txbytes; i++)
-		len += snprintf(buf + len, 30 + txbytes * 3 - len, "%02X ", (unsigned char) txbuf[i]);
-	strcat(buf + len, "\n");
-	ast_debug(1, "%s", buf);
-
-	prm.radpar = ZT_RADPAR_REMMODE;
-	if (asciiflag)
-		prm.data = ZT_RADPAR_REM_SERIAL_ASCII;
-	else
-		prm.data = ZT_RADPAR_REM_SERIAL;
-	if (ioctl(myrpt->rxchannel->fds[0], ZT_RADIO_SETPARAM, &prm) == -1)
-		return -1;
-	prm.radpar = ZT_RADPAR_REMCOMMAND;
-	prm.data = rxmaxbytes;
-	memcpy(prm.buf, txbuf, txbytes);
-	prm.index = txbytes;
-	if (ioctl(myrpt->rxchannel->fds[0], ZT_RADIO_SETPARAM, &prm) == -1)
-		return -1;
-	if (rxbuf) {
-		*rxbuf = 0;
-		memcpy(rxbuf, prm.buf, prm.index);
+	 if(debug) {
+	    ast_log(LOG_NOTICE, "ioport=%s  iofd=0x%x\n",myrpt->p.ioport,myrpt->iofd);
+		printf("String output was:\n");
+		for(i = 0; i < txbytes; i++)
+			printf("%02X ", (unsigned char ) txbuf[i]);
+		printf("\n");
+	}
+
+	if (myrpt->iofd >= 0)  /* if to do out a serial port */
+	{
+		if (write(myrpt->iofd,txbuf,txbytes) != txbytes)
+		{
+			return -1;
+		}
+		if ((!rxmaxbytes) || (rxbuf == NULL)) 
+		{
+			return(0);
+		}
+		memset(rxbuf,0,rxmaxbytes);
+		for(i = 0; i < rxmaxbytes; i++)
+		{
+			j = read(myrpt->iofd,&c,1);
+			if (j < 1) 
+			{
+				return(i);
+			}
+			rxbuf[i] = c;
+			if (asciiflag & 1)
+			{
+				rxbuf[i + 1] = 0;
+				if (c == '\r') break;
+			}
+		}					
+		if(debug) {
+			printf("String returned was:\n");
+			for(j = 0; j < i; j++)
+				printf("%02X ", (unsigned char ) rxbuf[j]);
+			printf("\n");
+		}
+		return(i);
+	}
+
+	/* if not a zap channel, cant use pciradio stuff */
+	if (myrpt->rxchannel != myrpt->zaprxchannel) return -1;	
+
+	prm.radpar = ZT_RADPAR_UIOMODE;
+	if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_GETPARAM,&prm) == -1) return -1;
+	oldmode = prm.data;
+	prm.radpar = ZT_RADPAR_UIODATA;
+	if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_GETPARAM,&prm) == -1) return -1;
+	olddata = prm.data;
+        prm.radpar = ZT_RADPAR_REMMODE;
+        if (asciiflag & 1)  prm.data = ZT_RADPAR_REM_SERIAL_ASCII;
+        else prm.data = ZT_RADPAR_REM_SERIAL;
+	if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1;
+	if (asciiflag & 2)
+	{
+		i = ZT_ONHOOK;
+		if (ioctl(myrpt->zaprxchannel->fds[0],ZT_HOOK,&i) == -1) return -1;
+		usleep(100000);
+	}
+        prm.radpar = ZT_RADPAR_REMCOMMAND;
+        prm.data = rxmaxbytes;
+        memcpy(prm.buf,txbuf,txbytes);
+        prm.index = txbytes;
+	if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1;
+        if (rxbuf)
+        {
+                *rxbuf = 0;
+                memcpy(rxbuf,prm.buf,prm.index);
+        }
+	index = prm.index;
+        prm.radpar = ZT_RADPAR_REMMODE;
+        prm.data = ZT_RADPAR_REM_NONE;
+	if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1;
+	if (asciiflag & 2)
+	{
+		i = ZT_OFFHOOK;
+		if (ioctl(myrpt->zaprxchannel->fds[0],ZT_HOOK,&i) == -1) return -1;
+	}
+	prm.radpar = ZT_RADPAR_UIOMODE;
+	prm.data = oldmode;
+	if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1;
+	prm.radpar = ZT_RADPAR_UIODATA;
+	prm.data = olddata;
+	if (ioctl(myrpt->zaprxchannel->fds[0],ZT_RADIO_SETPARAM,&prm) == -1) return -1;
+        return(index);
+}
+
+static int civ_cmd(struct rpt *myrpt,unsigned char *cmd, int cmdlen)
+{
+unsigned char rxbuf[100];
+int	i,rv ;
+
+	rv = serial_remote_io(myrpt,cmd,cmdlen,rxbuf,cmdlen + 6,0);
+	if (rv == -1) return(-1);
+	if (rv != (cmdlen + 6)) return(1);
+	for(i = 0; i < 6; i++)
+		if (rxbuf[i] != cmd[i]) return(1);
+	if (rxbuf[cmdlen] != 0xfe) return(1);
+	if (rxbuf[cmdlen + 1] != 0xfe) return(1);
+	if (rxbuf[cmdlen + 4] != 0xfb) return(1);
+	if (rxbuf[cmdlen + 5] != 0xfd) return(1);
+	return(0);
+}
+
+static int sendkenwood(struct rpt *myrpt,char *txstr, char *rxstr)
+{
+int	i;
+
+ast_log(LOG_NOTICE,"Sent to kenwood: %s\n",txstr);
+	if (debug) printf("Send to kenwood: %s\n",txstr);
+	i = serial_remote_io(myrpt, (unsigned char *)txstr, strlen(txstr), 
+		(unsigned char *)rxstr,RAD_SERIAL_BUFLEN - 1,3);
+	if (i < 0) return -1;
+	if ((i > 0) && (rxstr[i - 1] == '\r'))
+		rxstr[i-- - 1] = 0;
+	if (debug) printf("Got from kenwood: %s\n",rxstr);
+ast_log(LOG_NOTICE,"Got from kenwood: %s\n",rxstr);
+	return(i);
+}
+
+/* take a PL frequency and turn it into a code */
+static int kenwood_pltocode(char *str)
+{
+int i;
+char *s;
+
+	s = strchr(str,'.');
+	i = 0;
+	if (s) i = atoi(s + 1);
+	i += atoi(str) * 10;
+	switch(i)
+	{
+	    case 670:
+		return 1;
+	    case 719:
+		return 3;
+	    case 744:
+		return 4;
+	    case 770:
+		return 5;
+	    case 797:
+		return 6;
+	    case 825:
+		return 7;
+	    case 854:
+		return 8;
+	    case 885:
+		return 9;
+	    case 915:
+		return 10;
+	    case 948:
+		return 11;
+	    case 974:
+		return 12;
+	    case 1000:
+		return 13;
+	    case 1035:
+		return 14;
+	    case 1072:
+		return 15;
+	    case 1109:
+		return 16;
+	    case 1148:
+		return 17;
+	    case 1188:
+		return 18;
+	    case 1230:
+		return 19;
+	    case 1273:
+		return 20;
+	    case 1318:
+		return 21;
+	    case 1365:
+		return 22;
+	    case 1413:
+		return 23;
+	    case 1462:
+		return 24;
+	    case 1514:
+		return 25;
+	    case 1567:
+		return 26;
+	    case 1622:
+		return 27;
+	    case 1679:
+		return 28;
+	    case 1738:
+		return 29;
+	    case 1799:
+		return 30;
+	    case 1862:
+		return 31;
+	    case 1928:
+		return 32;
+	    case 2035:
+		return 33;
+	    case 2107:
+		return 34;
+	    case 2181:
+		return 35;
+	    case 2257:
+		return 36;
+	    case 2336:
+		return 37;
+	    case 2418:
+		return 38;
+	    case 2503:
+		return 39;
+	}
+	return -1;
+}
+
+static int sendrxkenwood(struct rpt *myrpt, char *txstr, char *rxstr, 
+	char *cmpstr)
+{
+int	i,j;
+
+	for(i = 0;i < KENWOOD_RETRIES;i++)
+	{
+		j = sendkenwood(myrpt,txstr,rxstr);
+		if (j < 0) return(j);
+		if (j == 0) continue;
+		if (!strncmp(rxstr,cmpstr,strlen(cmpstr))) return(0);
+	}
+	return(-1);
+}		
+
+static int setkenwood(struct rpt *myrpt)
+{
+char rxstr[RAD_SERIAL_BUFLEN],txstr[RAD_SERIAL_BUFLEN],freq[20];
+char mhz[MAXREMSTR],offset[20],band,decimals[MAXREMSTR],band1,band2;
+int myrxpl;
+	
+int offsets[] = {0,2,1};
+int powers[] = {2,1,0};
+
+	if (sendrxkenwood(myrpt,"VMC 0,0\r",rxstr,"VMC") < 0) return -1;
+	split_freq(mhz, decimals, myrpt->freq);
+	if (atoi(mhz) > 400)
+	{
+		band = '6';
+		band1 = '1';
+		band2 = '5';
+		strcpy(offset,"005000000");
 	}
-	return(prm.index);
+	else
+	{
+		band = '2';
+		band1 = '0';
+		band2 = '2';
+		strcpy(offset,"000600000");
+	}
+	strcpy(freq,"000000");
+	strncpy(freq,decimals,strlen(decimals));
+	myrxpl = myrpt->rxplon;
+	if (IS_XPMR(myrpt)) myrxpl = 0;
+	sprintf(txstr,"VW %c,%05d%s,0,%d,0,%d,%d,,%02d,,%02d,%s\r",
+		band,atoi(mhz),freq,offsets[(int)myrpt->offset],
+		(myrpt->txplon != 0),myrxpl,
+		kenwood_pltocode(myrpt->txpl),kenwood_pltocode(myrpt->rxpl),
+		offset);
+	if (sendrxkenwood(myrpt,txstr,rxstr,"VW") < 0) return -1;
+	sprintf(txstr,"RBN %c\r",band2);
+	if (sendrxkenwood(myrpt,txstr,rxstr,"RBN") < 0) return -1;
+	sprintf(txstr,"PC %c,%d\r",band1,powers[(int)myrpt->powerlevel]);
+	if (sendrxkenwood(myrpt,txstr,rxstr,"PC") < 0) return -1;
+	return 0;
+}
+
+static int set_tm271(struct rpt *myrpt)
+{
+char rxstr[RAD_SERIAL_BUFLEN],txstr[RAD_SERIAL_BUFLEN],freq[20];
+char mhz[MAXREMSTR],decimals[MAXREMSTR];
+	
+int offsets[] = {0,2,1};
+int powers[] = {2,1,0};
+
+	split_freq(mhz, decimals, myrpt->freq);
+	strcpy(freq,"000000");
+	strncpy(freq,decimals,strlen(decimals));
+
+	sprintf(txstr,"VF %04d%s,4,%d,0,%d,0,0,%d,%d,000,00600000,0,0\r",
+		atoi(mhz),freq,offsets[(int)myrpt->offset],
+		(myrpt->txplon != 0),kenwood_pltocode(myrpt->txpl),
+		kenwood_pltocode(myrpt->rxpl));
+
+	if (sendrxkenwood(myrpt,txstr,rxstr,"VF") < 0) return -1;
+	if (sendrxkenwood(myrpt,"VM 0\r",rxstr,"VM") < 0) return -1;
+	sprintf(txstr,"PC %d\r",powers[(int)myrpt->powerlevel]);
+	if (sendrxkenwood(myrpt,txstr,rxstr,"PC") < 0) return -1;
+	return 0;
 }
 
 static int setrbi(struct rpt *myrpt)
 {
-	char tmp[MAXREMSTR] = "", *s;
-	unsigned char rbicmd[5];
-	int	band, txoffset = 0, txpower = 0, txpl;
+char tmp[MAXREMSTR] = "",*s;
+unsigned char rbicmd[5];
+int	band,txoffset = 0,txpower = 0,rxpl;
 
 	/* must be a remote system */
-	if (!myrpt->remote)
-		return(0);
+	if (!myrpt->remoterig) return(0);
+	if (!myrpt->remoterig[0]) return(0);
 	/* must have rbi hardware */
-	if (strncmp(myrpt->remote, remote_rig_rbi, 3))
-		return(0);
-	ast_copy_string(tmp, myrpt->freq, sizeof(tmp));
-	s = strchr(tmp, '.');
+	if (strncmp(myrpt->remoterig,remote_rig_rbi,3)) return(0);
+	if (setrbi_check(myrpt) == -1) return(-1);
+	strncpy(tmp, myrpt->freq, sizeof(tmp) - 1);
+	s = strchr(tmp,'.');
 	/* if no decimal, is invalid */
 	
-	if (s == NULL) {
-		ast_debug(1, "@@@@ Frequency needs a decimal\n");
+	if (s == NULL){
+		if(debug)
+			printf("@@@@ Frequency needs a decimal\n");
 		return -1;
 	}
 	
 	*s++ = 0;
-	if (strlen(tmp) < 2) {
-		ast_debug(1, "@@@@ Bad MHz digits: %s\n", tmp);
+	if (strlen(tmp) < 2){
+		if(debug)
+			printf("@@@@ Bad MHz digits: %s\n", tmp);
 	 	return -1;
 	}
 	 
-	if (strlen(s) < 3) {
-		ast_debug(1, "@@@@ Bad KHz digits: %s\n", s);
+	if (strlen(s) < 3){
+		if(debug)
+			printf("@@@@ Bad KHz digits: %s\n", s);
 	 	return -1;
 	}
 
-	if ((s[2] != '0') && (s[2] != '5')) {
-		ast_debug(1, "@@@@ KHz must end in 0 or 5: %c\n", s[2]);
+	if ((s[2] != '0') && (s[2] != '5')){
+		if(debug)
+			printf("@@@@ KHz must end in 0 or 5: %c\n", s[2]);
 	 	return -1;
 	}
 	 
 	band = rbi_mhztoband(tmp);
-	if (band == -1) {
-		ast_debug(1, "@@@@ Bad Band: %s\n", tmp);
+	if (band == -1){
+		if(debug)
+			printf("@@@@ Bad Band: %s\n", tmp);
 	 	return -1;
 	}
 	
-	txpl = rbi_pltocode(myrpt->txpl);
+	rxpl = rbi_pltocode(myrpt->rxpl);
 	
-	if (txpl == -1) {
-		ast_debug(1, "@@@@ Bad TX PL: %s\n", myrpt->txpl);
+	if (rxpl == -1){
+		if(debug)
+			printf("@@@@ Bad TX PL: %s\n", myrpt->rxpl);
 	 	return -1;
 	}
 
 	
-	switch (myrpt->offset) {
-	case REM_MINUS:
+	switch(myrpt->offset)
+	{
+	    case REM_MINUS:
 		txoffset = 0;
 		break;
-	case REM_PLUS:
+	    case REM_PLUS:
 		txoffset = 0x10;
 		break;
-	case REM_SIMPLEX:
+	    case REM_SIMPLEX:
 		txoffset = 0x20;
 		break;
 	}
-	switch(myrpt->powerlevel) {
-	case REM_LOWPWR:
+	switch(myrpt->powerlevel)
+	{
+	    case REM_LOWPWR:
 		txpower = 0;
 		break;
-	case REM_MEDPWR:
+	    case REM_MEDPWR:
 		txpower = 0x20;
 		break;
-	case REM_HIPWR:
+	    case REM_HIPWR:
 		txpower = 0x10;
 		break;
 	}
 	rbicmd[0] = 0;
 	rbicmd[1] = band | txpower | 0xc0;
 	rbicmd[2] = (*(s - 2) - '0') | txoffset | 0x80;
-	if (s[2] == '5')
-		rbicmd[2] |= 0x40;
+	if (s[2] == '5') rbicmd[2] |= 0x40;
 	rbicmd[3] = ((*s - '0') << 4) + (s[1] - '0');
-	rbicmd[4] = txpl;
-	if (myrpt->txplon)
-		rbicmd[4] |= 0x40;
-	if (myrpt->rxplon)
-		rbicmd[4] |= 0x80;
-	rbi_out(myrpt, rbicmd);
+	rbicmd[4] = rxpl;
+	if (myrpt->txplon) rbicmd[4] |= 0x40;
+	if (myrpt->rxplon) rbicmd[4] |= 0x80;
+	rbi_out(myrpt,rbicmd);
+	return 0;
+}
+
+static int setrtx(struct rpt *myrpt)
+{
+char tmp[MAXREMSTR] = "",*s,rigstr[200],pwr,res = 0;
+int	band,txoffset = 0,txpower = 0,rxpl,txpl;
+float ofac;
+double txfreq;
+
+	/* must be a remote system */
+	if (!myrpt->remoterig) return(0);
+	if (!myrpt->remoterig[0]) return(0);
+	/* must have rtx hardware */
+	if (!ISRIG_RTX(myrpt->remoterig)) return(0);
+	/* must be a usbradio interface type */
+	if (!IS_XPMR(myrpt)) return(0);
+	strncpy(tmp, myrpt->freq, sizeof(tmp) - 1);
+	s = strchr(tmp,'.');
+	/* if no decimal, is invalid */
+	
+	if(debug)printf("setrtx() %s %s\n",myrpt->name,myrpt->remoterig);
+
+	if (s == NULL){
+		if(debug)
+			printf("@@@@ Frequency needs a decimal\n");
+		return -1;
+	}
+	*s++ = 0;
+	if (strlen(tmp) < 2){
+		if(debug)
+			printf("@@@@ Bad MHz digits: %s\n", tmp);
+	 	return -1;
+	}
+	 
+	if (strlen(s) < 3){
+		if(debug)
+			printf("@@@@ Bad KHz digits: %s\n", s);
+	 	return -1;
+	}
+
+	if ((s[2] != '0') && (s[2] != '5')){
+		if(debug)
+			printf("@@@@ KHz must end in 0 or 5: %c\n", s[2]);
+	 	return -1;
+	}
+	 
+	band = rbi_mhztoband(tmp);
+	if (band == -1){
+		if(debug)
+			printf("@@@@ Bad Band: %s\n", tmp);
+	 	return -1;
+	}
+	
+	rxpl = rbi_pltocode(myrpt->rxpl);
+	
+	if (rxpl == -1){
+		if(debug)
+			printf("@@@@ Bad RX PL: %s\n", myrpt->rxpl);
+	 	return -1;
+	}
+
+	txpl = rbi_pltocode(myrpt->txpl);
+	
+	if (txpl == -1){
+		if(debug)
+			printf("@@@@ Bad TX PL: %s\n", myrpt->txpl);
+	 	return -1;
+	}
+	
+	switch(myrpt->offset)
+	{
+	    case REM_MINUS:
+		txoffset = 0;
+		break;
+	    case REM_PLUS:
+		txoffset = 0x10;
+		break;
+	    case REM_SIMPLEX:
+		txoffset = 0x20;
+		break;
+	}
+	switch(myrpt->powerlevel)
+	{
+	    case REM_LOWPWR:
+		txpower = 0;
+		break;
+	    case REM_MEDPWR:
+		txpower = 0x20;
+		break;
+	    case REM_HIPWR:
+		txpower = 0x10;
+		break;
+	}
+
+	res = setrtx_check(myrpt);
+	if (res < 0) return res;
+	ofac = 0.0;
+	if (myrpt->offset == REM_MINUS) ofac = -1.0;
+	if (myrpt->offset == REM_PLUS) ofac = 1.0;
+
+	if (!strcmp(myrpt->remoterig,remote_rig_rtx450))
+		txfreq = atof(myrpt->freq) +  (ofac * 5.0);
+	else
+		txfreq = atof(myrpt->freq) +  (ofac * 0.6);
+
+	pwr = 'L';
+	if (myrpt->powerlevel == REM_HIPWR) pwr = 'H';
+	if (!res)
+	{
+		sprintf(rigstr,"SETFREQ %s %f %s %s %c",myrpt->freq,txfreq,
+			(myrpt->rxplon) ? myrpt->rxpl : "0.0",
+			(myrpt->txplon) ? myrpt->txpl : "0.0",pwr);
+		send_usb_txt(myrpt,rigstr);
+		rpt_telemetry(myrpt,COMPLETE,NULL);
+		res = 0;
+	}
+	return 0;
+}
+#if 0
+/*
+	sets current signaling code for xpmr routines
+	under development for new radios.
+*/
+static int setxpmr(struct rpt *myrpt)
+{
+	char rigstr[200];
+	int rxpl,txpl;
+
+	/* must be a remote system */
+	if (!myrpt->remoterig) return(0);
+	if (!myrpt->remoterig[0]) return(0);
+	/* must not have rtx hardware */
+	if (ISRIG_RTX(myrpt->remoterig)) return(0);
+	/* must be a usbradio interface type */
+	if (!IS_XPMR(myrpt)) return(0);
+	
+	if(debug)printf("setxpmr() %s %s\n",myrpt->name,myrpt->remoterig );
+
+	rxpl = rbi_pltocode(myrpt->rxpl);
+	
+	if (rxpl == -1){
+		if(debug)
+			printf("@@@@ Bad RX PL: %s\n", myrpt->rxpl);
+	 	return -1;
+	}
+
+	txpl = rbi_pltocode(myrpt->txpl);
+	if (txpl == -1){
+		if(debug)
+			printf("@@@@ Bad TX PL: %s\n", myrpt->txpl);
+	 	return -1;
+	}
+	sprintf(rigstr,"SETFREQ 0.0 0.0 %s %s L",
+		(myrpt->rxplon) ? myrpt->rxpl : "0.0",
+		(myrpt->txplon) ? myrpt->txpl : "0.0");
+	send_usb_txt(myrpt,rigstr);
+	return 0;
+}
+#endif
+
+static int setrbi_check(struct rpt *myrpt)
+{
+char tmp[MAXREMSTR] = "",*s;
+int	band,txpl;
+
+	/* must be a remote system */
+	if (!myrpt->remote) return(0);
+	/* must have rbi hardware */
+	if (strncmp(myrpt->remoterig,remote_rig_rbi,3)) return(0);
+	strncpy(tmp, myrpt->freq, sizeof(tmp) - 1);
+	s = strchr(tmp,'.');
+	/* if no decimal, is invalid */
+	
+	if (s == NULL){
+		if(debug)
+			printf("@@@@ Frequency needs a decimal\n");
+		return -1;
+	}
+	
+	*s++ = 0;
+	if (strlen(tmp) < 2){
+		if(debug)
+			printf("@@@@ Bad MHz digits: %s\n", tmp);
+	 	return -1;
+	}
+	 
+	if (strlen(s) < 3){
+		if(debug)
+			printf("@@@@ Bad KHz digits: %s\n", s);
+	 	return -1;
+	}
+
+	if ((s[2] != '0') && (s[2] != '5')){
+		if(debug)
+			printf("@@@@ KHz must end in 0 or 5: %c\n", s[2]);
+	 	return -1;
+	}
+	 
+	band = rbi_mhztoband(tmp);
+	if (band == -1){
+		if(debug)
+			printf("@@@@ Bad Band: %s\n", tmp);
+	 	return -1;
+	}
+	
+	txpl = rbi_pltocode(myrpt->txpl);
+	
+	if (txpl == -1){
+		if(debug)
+			printf("@@@@ Bad TX PL: %s\n", myrpt->txpl);
+	 	return -1;
+	}
+	return 0;
+}
+
+static int setrtx_check(struct rpt *myrpt)
+{
+char tmp[MAXREMSTR] = "",*s;
+int	band,txpl,rxpl;
+
+	/* must be a remote system */
+	if (!myrpt->remote) return(0);
+	/* must have rbi hardware */
+	if (strncmp(myrpt->remoterig,remote_rig_rbi,3)) return(0);
+	strncpy(tmp, myrpt->freq, sizeof(tmp) - 1);
+	s = strchr(tmp,'.');
+	/* if no decimal, is invalid */
+	
+	if (s == NULL){
+		if(debug)
+			printf("@@@@ Frequency needs a decimal\n");
+		return -1;
+	}
+	
+	*s++ = 0;
+	if (strlen(tmp) < 2){
+		if(debug)
+			printf("@@@@ Bad MHz digits: %s\n", tmp);
+	 	return -1;
+	}
+	 
+	if (strlen(s) < 3){
+		if(debug)
+			printf("@@@@ Bad KHz digits: %s\n", s);
+	 	return -1;
+	}
+
+	if ((s[2] != '0') && (s[2] != '5')){
+		if(debug)
+			printf("@@@@ KHz must end in 0 or 5: %c\n", s[2]);
+	 	return -1;
+	}
+	 
+	band = rbi_mhztoband(tmp);
+	if (band == -1){
+		if(debug)
+			printf("@@@@ Bad Band: %s\n", tmp);
+	 	return -1;
+	}
+	
+	txpl = rbi_pltocode(myrpt->txpl);
+	
+	if (txpl == -1){
+		if(debug)
+			printf("@@@@ Bad TX PL: %s\n", myrpt->txpl);
+	 	return -1;
+	}
+
+	rxpl = rbi_pltocode(myrpt->rxpl);
+	
+	if (rxpl == -1){
+		if(debug)
+			printf("@@@@ Bad RX PL: %s\n", myrpt->rxpl);
+	 	return -1;
+	}
+	return 0;
+}
+
+static int check_freq_kenwood(int m, int d, int *defmode)
+{
+	int dflmd = REM_MODE_FM;
+
+	if (m == 144){ /* 2 meters */
+		if(d < 10100)
+			return -1;
+	}
+	else if((m >= 145) && (m < 148)){
+		;
+	}
+	else if((m >= 430) && (m < 450)){ /* 70 centimeters */
+		;
+	}
+	else
+		return -1;
+	
+	if(defmode)
+		*defmode = dflmd;	
+
+
+	return 0;
+}
+
+
+static int check_freq_tm271(int m, int d, int *defmode)
+{
+	int dflmd = REM_MODE_FM;
+
+	if (m == 144){ /* 2 meters */
+		if(d < 10100)
+			return -1;
+	}
+	else if((m >= 145) && (m < 148)){
+		;
+	}
+		return -1;
+	
+	if(defmode)
+		*defmode = dflmd;	
+
+
 	return 0;
 }
 
@@ -4076,55 +8128,138 @@ static int check_freq_rbi(int m, int d, int *defmode)
 {
 	int dflmd = REM_MODE_FM;
 
-	if (m == 50) { /* 6 meters */
-		if (d < 10100)
+	if(m == 50){ /* 6 meters */
+		if(d < 10100)
 			return -1;
-	} else if ((m >= 51) && ( m < 54)) {
-		/* nada */
-	} else if (m == 144) { /* 2 meters */
-		if (d < 10100)
+	}
+	else if((m >= 51) && ( m < 54)){
+                ;
+	}
+	else if(m == 144){ /* 2 meters */
+		if(d < 10100)
 			return -1;
-	} else if ((m >= 145) && (m < 148)) {
-		/* nada */
-	} else if ((m >= 222) && (m < 225)) { /* 1.25 meters */
-		/* nada */
-	} else if ((m >= 430) && (m < 450)) { /* 70 centimeters */
-		/* nada */
-	} else if ((m >= 1240) && (m < 1300)) { /* 23 centimeters */
-		/* nada */
-	} else
+	}
+	else if((m >= 145) && (m < 148)){
+		;
+	}
+ 	else if((m >= 222) && (m < 225)){ /* 1.25 meters */
+		;
+	}
+	else if((m >= 430) && (m < 450)){ /* 70 centimeters */
+		;
+	}
+	else if((m >= 1240) && (m < 1300)){ /* 23 centimeters */
+		;
+	}
+	else
 		return -1;
 	
-	if (defmode)
+	if(defmode)
 		*defmode = dflmd;	
 
+
 	return 0;
 }
 
-static int split_decimal(char *input, int *ints, int *decs, int places)
+/* Check for valid rtx frequency */
+/* Hard coded limits now, configurable later, maybe? */
+
+static int check_freq_rtx(int m, int d, int *defmode, struct rpt *myrpt)
 {
-	double input2 = 0.0;
-	long long modifier = (long long)pow(10.0, (double)places);
-	if (sscanf(input, "%lf", &input2) == 1) {
-		long long input3 = input2 * modifier;
-		*ints = input3 / modifier;
-		*decs = input3 % modifier;
+	int dflmd = REM_MODE_FM;
+
+	if (!strcmp(myrpt->remoterig,remote_rig_rtx150))
+	{
+
+		if(m == 144){ /* 2 meters */
+			if(d < 10100)
+				return -1;
+		}
+		else if((m >= 145) && (m < 148)){
+			;
+		}
+		else
+			return -1;
+	}
+	else 
+	{
+		if((m >= 430) && (m < 450)){ /* 70 centimeters */
+			;
+		}
+		else
+			return -1;
+	}
+	if(defmode)
+		*defmode = dflmd;	
+
+
+	return 0;
+}
+
+/*
+ * Convert decimals of frequency to int
+ */
+
+static int decimals2int(char *fraction)
+{
+	int i;
+	char len = strlen(fraction);
+	int multiplier = 100000;
+	int res = 0;
+
+	if(!len)
 		return 0;
-	} else
-		return -1;
+	for( i = 0 ; i < len ; i++, multiplier /= 10)
+		res += (fraction[i] - '0') * multiplier;
+	return res;
 }
 
+
 /*
 * Split frequency into mhz and decimals
 */
  
-#define split_freq(mhz, decimal, freq)	split_decimal(freq, mhz, decimal, 5)
+static int split_freq(char *mhz, char *decimals, char *freq)
+{
+	char freq_copy[MAXREMSTR];
+	char *decp;
+
+	decp = strchr(strncpy(freq_copy, freq, MAXREMSTR),'.');
+	if(decp){
+		*decp++ = 0;
+		strncpy(mhz, freq_copy, MAXREMSTR);
+		strcpy(decimals, "00000");
+		strncpy(decimals, decp, strlen(decp));
+		decimals[5] = 0;
+		return 0;
+	}
+	else
+		return -1;
 
+}
+	
 /*
 * Split ctcss frequency into hertz and decimal
 */
  
-#define split_ctcss_freq(hertz, decimal, freq)	split_decimal(freq, hertz, decimal, 1)
+static int split_ctcss_freq(char *hertz, char *decimal, char *freq)
+{
+	char freq_copy[MAXREMSTR];
+	char *decp;
+
+	decp = strchr(strncpy(freq_copy, freq, MAXREMSTR),'.');
+	if(decp){
+		*decp++ = 0;
+		strncpy(hertz, freq_copy, MAXREMSTR);
+		strncpy(decimal, decp, strlen(decp));
+		decimal[strlen(decp)] = '\0';
+		return 0;
+	}
+	else
+		return -1;
+}
+
+
 
 /*
 * FT-897 I/O handlers
@@ -4133,77 +8268,87 @@ static int split_decimal(char *input, int *ints, int *decs, int places)
 /* Check to see that the frequency is valid */
 /* Hard coded limits now, configurable later, maybe? */
 
+
 static int check_freq_ft897(int m, int d, int *defmode)
 {
 	int dflmd = REM_MODE_FM;
 
-	if (m == 1) { /* 160 meters */
+	if(m == 1){ /* 160 meters */
 		dflmd =	REM_MODE_LSB; 
-		if (d < 80001)
+		if(d < 80000)
 			return -1;
-	} else if (m == 3) { /* 80 meters */
+	}
+	else if(m == 3){ /* 80 meters */
 		dflmd = REM_MODE_LSB;
-		if (d < 75001)
+		if(d < 50000)
 			return -1;
-	} else if (m == 7) { /* 40 meters */
+	}
+	else if(m == 7){ /* 40 meters */
 		dflmd = REM_MODE_LSB;
-		if ((d < 15001) || (d > 29999))
+		if(d > 30000)
 			return -1;
-	} else if (m == 14) { /* 20 meters */
+	}
+	else if(m == 14){ /* 20 meters */
 		dflmd = REM_MODE_USB;
-		if ((d < 15001) || (d > 34999))
+		if(d > 35000)
 			return -1;
-	} else if (m == 18) { /* 17 meters */
+	}
+	else if(m == 18){ /* 17 meters */
 		dflmd = REM_MODE_USB;
-		if ((d < 11001) || (d > 16797))
+		if((d < 6800) || (d > 16800))
 			return -1;
-	} else if (m == 21) { /* 15 meters */
+	}
+	else if(m == 21){ /* 15 meters */
 		dflmd = REM_MODE_USB;
-		if ((d < 20001) || (d > 44999))
+		if((d < 20000) || (d > 45000))
 			return -1;
-	} else if (m == 24) { /* 12 meters */
+	}
+	else if(m == 24){ /* 12 meters */
 		dflmd = REM_MODE_USB;
-		if ((d < 93001) || (d > 98999))
+		if((d < 89000) || (d > 99000))
 			return -1;
-	} else if (m == 28) { /* 10 meters */
+	}
+	else if(m == 28){ /* 10 meters */
 		dflmd = REM_MODE_USB;
-		if (d < 30001)
-			return -1;
-	} else if (m == 29) { 
-		if (d >= 51000)
+	}
+	else if(m == 29){ 
+		if(d >= 51000)
 			dflmd = REM_MODE_FM;
 		else
 			dflmd = REM_MODE_USB;
-		if (d > 69999)
-			return -1;
-	} else if (m == 50) { /* 6 meters */
-		if (d < 10100)
+		if(d > 70000)
 			return -1;
-		if (d >= 30000)
+	}
+	else if(m == 50){ /* 6 meters */
+		if(d >= 30000)
 			dflmd = REM_MODE_FM;
 		else
 			dflmd = REM_MODE_USB;
-	} else if ((m >= 51) && ( m < 54)) {
+
+	}
+	else if((m >= 51) && ( m < 54)){
 		dflmd = REM_MODE_FM;
-	} else if (m == 144) { /* 2 meters */
-		if (d < 10100)
-			return -1;
-		if (d >= 30000)
+	}
+	else if(m == 144){ /* 2 meters */
+		if(d >= 30000)
 			dflmd = REM_MODE_FM;
 		else
 			dflmd = REM_MODE_USB;
-	} else if ((m >= 145) && (m < 148)) {
+	}
+	else if((m >= 145) && (m < 148)){
 		dflmd = REM_MODE_FM;
-	} else if ((m >= 430) && (m < 450)) { /* 70 centimeters */
-		if (m  < 438)
+	}
+	else if((m >= 430) && (m < 450)){ /* 70 centimeters */
+		if(m  < 438)
 			dflmd = REM_MODE_USB;
 		else
 			dflmd = REM_MODE_FM;
 		;
-	} else
+	}
+	else
 		return -1;
 
-	if (defmode)
+	if(defmode)
 		*defmode = dflmd;
 
 	return 0;
@@ -4216,52 +8361,69 @@ static int check_freq_ft897(int m, int d, int *defmode)
 static int set_freq_ft897(struct rpt *myrpt, char *newfreq)
 {
 	unsigned char cmdstr[5];
-	int fd, m, d;
+	int fd,m,d;
+	char mhz[MAXREMSTR];
+	char decimals[MAXREMSTR];
 
 	fd = 0;
-	ast_debug(1, "New frequency: %s\n", newfreq);
+	if(debug) 
+		printf("New frequency: %s\n",newfreq);
 
-	if (split_freq(&m, &d, newfreq))
+	if(split_freq(mhz, decimals, newfreq))
 		return -1; 
 
+	m = atoi(mhz);
+	d = atoi(decimals);
+
 	/* The FT-897 likes packed BCD frequencies */
 
-	cmdstr[0] = ((m / 100) << 4) + ((m % 100) / 10);              /* 100MHz 10Mhz */
-	cmdstr[1] = ((m % 10) << 4) + (d / 10000);                    /* 1MHz 100KHz */
-	cmdstr[2] = (((d % 10000) / 1000) << 4) + ((d % 1000) / 100); /* 10KHz 1KHz */
-	cmdstr[3] = (((d % 100) / 10) << 4) + (d % 10);               /* 100Hz 10Hz */
-	cmdstr[4] = 0x01;                                             /* command */
+	cmdstr[0] = ((m / 100) << 4) + ((m % 100)/10);			/* 100MHz 10Mhz */
+	cmdstr[1] = ((m % 10) << 4) + (d / 10000);			/* 1MHz 100KHz */
+	cmdstr[2] = (((d % 10000)/1000) << 4) + ((d % 1000)/ 100);	/* 10KHz 1KHz */
+	cmdstr[3] = (((d % 100)/10) << 4) + (d % 10);			/* 100Hz 10Hz */
+	cmdstr[4] = 0x01;						/* command */
 
 	return serial_remote_io(myrpt, cmdstr, 5, NULL, 0, 0);
+
 }
 
 /* ft-897 simple commands */
 
 static int simple_command_ft897(struct rpt *myrpt, char command)
 {
-	unsigned char cmdstr[5] = { 0, 0, 0, 0, command };
+	unsigned char cmdstr[5];
+	
+	memset(cmdstr, 0, 5);
+
+	cmdstr[4] = command;	
 
 	return serial_remote_io(myrpt, cmdstr, 5, NULL, 0, 0);
+
 }
 
 /* ft-897 offset */
 
 static int set_offset_ft897(struct rpt *myrpt, char offset)
 {
-	unsigned char cmdstr[5] = "";
+	unsigned char cmdstr[5];
+	
+	memset(cmdstr, 0, 5);
 
-	switch (offset) {
-	case REM_SIMPLEX:
-		cmdstr[0] = 0x89;
-		break;
-	case REM_MINUS:
-		cmdstr[0] = 0x09;
-		break;
-	case REM_PLUS:
-		cmdstr[0] = 0x49;
-		break;	
-	default:
-		return -1;
+	switch(offset){
+		case	REM_SIMPLEX:
+			cmdstr[0] = 0x89;
+			break;
+
+		case	REM_MINUS:
+			cmdstr[0] = 0x09;
+			break;
+		
+		case	REM_PLUS:
+			cmdstr[0] = 0x49;
+			break;	
+
+		default:
+			return -1;
 	}
 
 	cmdstr[4] = 0x09;	
@@ -4273,24 +8435,31 @@ static int set_offset_ft897(struct rpt *myrpt, char offset)
 
 static int set_mode_ft897(struct rpt *myrpt, char newmode)
 {
-	unsigned char cmdstr[5] = { 0, 0, 0, 0, 0x07 };
+	unsigned char cmdstr[5];
+	
+	memset(cmdstr, 0, 5);
+	
+	switch(newmode){
+		case	REM_MODE_FM:
+			cmdstr[0] = 0x08;
+			break;
 
-	switch (newmode) {
-	case REM_MODE_FM:
-		cmdstr[0] = 0x08;
-		break;
-	case REM_MODE_USB:
-		cmdstr[0] = 0x01;
-		break;
-	case REM_MODE_LSB:
-		cmdstr[0] = 0x00;
-		break;
-	case REM_MODE_AM:
-		cmdstr[0] = 0x04;
-		break;
-	default:
-		return -1;
+		case	REM_MODE_USB:
+			cmdstr[0] = 0x01;
+			break;
+
+		case	REM_MODE_LSB:
+			cmdstr[0] = 0x00;
+			break;
+
+		case	REM_MODE_AM:
+			cmdstr[0] = 0x04;
+			break;
+		
+		default:
+			return -1;
 	}
+	cmdstr[4] = 0x07;	
 
 	return serial_remote_io(myrpt, cmdstr, 5, NULL, 0, 0);
 }
@@ -4299,9 +8468,11 @@ static int set_mode_ft897(struct rpt *myrpt, char newmode)
 
 static int set_ctcss_mode_ft897(struct rpt *myrpt, char txplon, char rxplon)
 {
-	unsigned char cmdstr[5] = { 0, 0, 0, 0, 0x0A };
-
-	if (rxplon && txplon)
+	unsigned char cmdstr[5];
+	
+	memset(cmdstr, 0, 5);
+	
+	if(rxplon && txplon)
 		cmdstr[0] = 0x2A; /* Encode and Decode */
 	else if (!rxplon && txplon)
 		cmdstr[0] = 0x4A; /* Encode only */
@@ -4310,6 +8481,8 @@ static int set_ctcss_mode_ft897(struct rpt *myrpt, char txplon, char rxplon)
 	else
 		cmdstr[0] = 0x8A; /* OFF */
 
+	cmdstr[4] = 0x0A;	
+
 	return serial_remote_io(myrpt, cmdstr, 5, NULL, 0, 0);
 }
 
@@ -4318,22 +8491,33 @@ static int set_ctcss_mode_ft897(struct rpt *myrpt, char txplon, char rxplon)
 
 static int set_ctcss_freq_ft897(struct rpt *myrpt, char *txtone, char *rxtone)
 {
-	unsigned char cmdstr[5] = { 0, 0, 0, 0, 0x0B };
-	int hertz, decimal;
+	unsigned char cmdstr[5];
+	char hertz[MAXREMSTR],decimal[MAXREMSTR];
+	int h,d;	
 
-	if (split_ctcss_freq(&hertz, &decimal, txtone))
+	memset(cmdstr, 0, 5);
+
+	if(split_ctcss_freq(hertz, decimal, txtone))
 		return -1; 
 
-	cmdstr[0] = ((hertz / 100) << 4) + (hertz % 100) / 10;
-	cmdstr[1] = ((hertz % 10) << 4) + (decimal % 10);
+	h = atoi(hertz);
+	d = atoi(decimal);
+	
+	cmdstr[0] = ((h / 100) << 4) + (h % 100)/ 10;
+	cmdstr[1] = ((h % 10) << 4) + (d % 10);
 	
-	if (rxtone) {
-		if (split_ctcss_freq(&hertz, &decimal, rxtone))
+	if(rxtone){
+	
+		if(split_ctcss_freq(hertz, decimal, rxtone))
 			return -1; 
 
-		cmdstr[2] = ((hertz / 100) << 4) + (hertz % 100)/ 10;
-		cmdstr[3] = ((hertz % 10) << 4) + (decimal % 10);
+		h = atoi(hertz);
+		d = atoi(decimal);
+	
+		cmdstr[2] = ((h / 100) << 4) + (h % 100)/ 10;
+		cmdstr[3] = ((h % 10) << 4) + (d % 10);
 	}
+	cmdstr[4] = 0x0B;	
 
 	return serial_remote_io(myrpt, cmdstr, 5, NULL, 0, 0);
 }	
@@ -4344,44 +8528,53 @@ static int set_ft897(struct rpt *myrpt)
 {
 	int res;
 	
-	ast_debug(1, "@@@@ lock on\n");
+	if(debug)
+		printf("@@@@ lock on\n");
 
-	res = simple_command_ft897(myrpt, 0x00);				/* LOCK on */	
+	res = simple_command_ft897(myrpt, 0x00);	/* LOCK on */	
 
-	ast_debug(1, "@@@@ ptt off\n");
+	if(debug)
+		printf("@@@@ ptt off\n");
 
-	if (!res)
+	if(!res)
 		res = simple_command_ft897(myrpt, 0x88);		/* PTT off */
 
-	ast_debug(1, "Modulation mode\n");
+	if(debug)
+		printf("Modulation mode\n");
 
-	if (!res)
+	if(!res)
 		res = set_mode_ft897(myrpt, myrpt->remmode);		/* Modulation mode */
 
-	ast_debug(1, "Split off\n");
+	if(debug)
+		printf("Split off\n");
 
-	if (!res)
+	if(!res)
 		simple_command_ft897(myrpt, 0x82);			/* Split off */
 
-	ast_debug(1, "Frequency\n");
+	if(debug)
+		printf("Frequency\n");
 
-	if (!res)
+	if(!res)
 		res = set_freq_ft897(myrpt, myrpt->freq);		/* Frequency */
-	if ((myrpt->remmode == REM_MODE_FM)) {
-		ast_debug(1, "Offset\n");
-		if (!res)
+	if((myrpt->remmode == REM_MODE_FM)){
+		if(debug)
+			printf("Offset\n");
+		if(!res)
 			res = set_offset_ft897(myrpt, myrpt->offset);	/* Offset if FM */
-		if ((!res)&&(myrpt->rxplon || myrpt->txplon)) {
-			ast_debug(1, "CTCSS tone freqs.\n");
+		if((!res)&&(myrpt->rxplon || myrpt->txplon)){
+			if(debug)
+				printf("CTCSS tone freqs.\n");
 			res = set_ctcss_freq_ft897(myrpt, myrpt->txpl, myrpt->rxpl); /* CTCSS freqs if CTCSS is enabled */
 		}
-		if (!res) {
-			ast_debug(1, "CTCSS mode\n");
+		if(!res){
+			if(debug)
+				printf("CTCSS mode\n");
 			res = set_ctcss_mode_ft897(myrpt, myrpt->txplon, myrpt->rxplon); /* CTCSS mode */
 		}
 	}
-	if ((myrpt->remmode == REM_MODE_USB)||(myrpt->remmode == REM_MODE_LSB)) {
-		ast_debug(1, "Clarifier off\n");
+	if((myrpt->remmode == REM_MODE_USB)||(myrpt->remmode == REM_MODE_LSB)){
+		if(debug)
+			printf("Clarifier off\n");
 		simple_command_ft897(myrpt, 0x85);			/* Clarifier off if LSB or USB */
 	}
 	return res;
@@ -4401,29 +8594,38 @@ static int closerem_ft897(struct rpt *myrpt)
 
 static int multimode_bump_freq_ft897(struct rpt *myrpt, int interval)
 {
-	int m, d;
+	int m,d;
+	char mhz[MAXREMSTR], decimals[MAXREMSTR];
 
-	ast_debug(1, "Before bump: %s\n", myrpt->freq);
+	if(debug)
+		printf("Before bump: %s\n", myrpt->freq);
 
-	if (split_freq(&m, &d, myrpt->freq))
+	if(split_freq(mhz, decimals, myrpt->freq))
 		return -1;
 	
+	m = atoi(mhz);
+	d = atoi(decimals);
+
 	d += (interval / 10); /* 10Hz resolution */
-	if (d < 0) {
+	if(d < 0){
 		m--;
 		d += 100000;
-	} else if (d >= 100000) {
+	}
+	else if(d >= 100000){
 		m++;
 		d -= 100000;
 	}
 
-	if (check_freq_ft897(m, d, NULL)) {
-		ast_debug(1, "Bump freq invalid\n");
+	if(check_freq_ft897(m, d, NULL)){
+		if(debug)
+			printf("Bump freq invalid\n");
 		return -1;
 	}
 
 	snprintf(myrpt->freq, MAXREMSTR, "%d.%05d", m, d);
-	ast_debug(1, "After bump: %s\n", myrpt->freq);
+
+	if(debug)
+		printf("After bump: %s\n", myrpt->freq);
 
 	return set_freq_ft897(myrpt, myrpt->freq);	
 }
@@ -4431,893 +8633,1543 @@ static int multimode_bump_freq_ft897(struct rpt *myrpt, int interval)
 
 
 /*
-* Dispatch to correct I/O handler 
+* IC-706 I/O handlers
 */
 
-static int setrem(struct rpt *myrpt)
+/* Check to see that the frequency is valid */
+/* returns 0 if frequency is valid          */
+
+static int check_freq_ic706(int m, int d, int *defmode, char mars)
 {
-	return 0; /* XXX BROKEN!! */
-	if (!strcmp(myrpt->remote, remote_rig_ft897))
-		return set_ft897(myrpt);
-	else if (!strcmp(myrpt->remote, remote_rig_rbi))
-		return setrbi(myrpt);
-	else
-		return -1;
+	int dflmd = REM_MODE_FM;
+	int rv=0;
+
+	if(debug > 6)
+		ast_log(LOG_NOTICE,"(%i,%i,%i,%i)\n",m,d,*defmode,mars);
+
+	/* first test for standard amateur radio bands */
+
+	if(m == 1){ 					/* 160 meters */
+		dflmd =	REM_MODE_LSB; 
+		if(d < 80000)rv=-1;
+	}
+	else if(m == 3){ 				/* 80 meters */
+		dflmd = REM_MODE_LSB;
+		if(d < 50000)rv=-1;
+	}
+	else if(m == 7){ 				/* 40 meters */
+		dflmd = REM_MODE_LSB;
+		if(d > 30000)rv=-1;
+	}
+	else if(m == 14){ 				/* 20 meters */
+		dflmd = REM_MODE_USB;
+		if(d > 35000)rv=-1;
+	}
+	else if(m == 18){ 							/* 17 meters */
+		dflmd = REM_MODE_USB;
+		if((d < 6800) || (d > 16800))rv=-1;
+	}
+	else if(m == 21){ /* 15 meters */
+		dflmd = REM_MODE_USB;
+		if((d < 20000) || (d > 45000))rv=-1;
+	}
+	else if(m == 24){ /* 12 meters */
+		dflmd = REM_MODE_USB;
+		if((d < 89000) || (d > 99000))rv=-1;
+	}
+	else if(m == 28){ 							/* 10 meters */
+		dflmd = REM_MODE_USB;
+	}
+	else if(m == 29){ 
+		if(d >= 51000)
+			dflmd = REM_MODE_FM;
+		else
+			dflmd = REM_MODE_USB;
+		if(d > 70000)rv=-1;
+	}
+	else if(m == 50){ 							/* 6 meters */
+		if(d >= 30000)
+			dflmd = REM_MODE_FM;
+		else
+			dflmd = REM_MODE_USB;
+	}
+	else if((m >= 51) && ( m < 54)){
+		dflmd = REM_MODE_FM;
+	}
+	else if(m == 144){ /* 2 meters */
+		if(d >= 30000)
+			dflmd = REM_MODE_FM;
+		else
+			dflmd = REM_MODE_USB;
+	}
+	else if((m >= 145) && (m < 148)){
+		dflmd = REM_MODE_FM;
+	}
+	else if((m >= 430) && (m < 450)){ 			/* 70 centimeters */
+		if(m  < 438)
+			dflmd = REM_MODE_USB;
+		else
+			dflmd = REM_MODE_FM;
+	}
+
+	/* check expanded coverage */
+	if(mars && rv<0){
+		if((m >= 450) && (m < 470)){ 			/* LMR */
+			dflmd = REM_MODE_FM;
+			rv=0;
+		}
+		else if((m >= 148) && (m < 174)){ 		/* LMR */
+			dflmd = REM_MODE_FM;
+			rv=0;
+		}
+		else if((m >= 138) && (m < 144)){ 		/* VHF-AM AIRCRAFT */
+			dflmd = REM_MODE_AM;
+			rv=0;
+		}
+		else if((m >= 108) && (m < 138)){ 		/* VHF-AM AIRCRAFT */
+			dflmd = REM_MODE_AM;
+			rv=0;
+		}
+		else if( (m==0 && d>=55000) || (m==1 && d<=75000) ){ 	/* AM BCB*/
+			dflmd = REM_MODE_AM;
+			rv=0;
+		}
+  		else if( (m == 1 && d>75000) || (m>1 && m<30) ){ 		/* HF SWL*/
+			dflmd = REM_MODE_AM;
+			rv=0;
+		}
+	}
+
+	if(defmode)
+		*defmode = dflmd;
+
+	if(debug > 1)
+		ast_log(LOG_NOTICE,"(%i,%i,%i,%i) returning %i\n",m,d,*defmode,mars,rv);
+
+	return rv;
 }
 
-static int closerem(struct rpt *myrpt)
+/* take a PL frequency and turn it into a code */
+static int ic706_pltocode(char *str)
 {
-	return 0; /* XXX BROKEN!! */
-	if (!strcmp(myrpt->remote, remote_rig_ft897))
-		return closerem_ft897(myrpt);
-	else
-		return 0;
+	int i;
+	char *s;
+	int rv=-1;
+
+	s = strchr(str,'.');
+	i = 0;
+	if (s) i = atoi(s + 1);
+	i += atoi(str) * 10;
+	switch(i)
+	{
+	    case 670:
+			rv=0;
+	    case 693:
+			rv=1;
+	    case 719:
+			rv=2;
+	    case 744:
+			rv=3;
+	    case 770:
+			rv=4;
+	    case 797:
+			rv=5;
+	    case 825:
+			rv=6;
+	    case 854:
+			rv=7;
+	    case 885:
+			rv=8;
+	    case 915:
+			rv=9;
+	    case 948:
+			rv=10;
+	    case 974:
+			rv=11;
+	    case 1000:
+			rv=12;
+	    case 1035:
+			rv=13;
+	    case 1072:
+			rv=14;
+	    case 1109:
+			rv=15;
+	    case 1148:
+			rv=16;
+	    case 1188:
+			rv=17;
+	    case 1230:
+			rv=18;
+	    case 1273:
+			rv=19;
+	    case 1318:
+			rv=20;
+	    case 1365:
+			rv=21;
+	    case 1413:
+			rv=22;
+	    case 1462:
+			rv=23;
+	    case 1514:
+			rv=24;
+	    case 1567:
+			rv=25;
+	    case 1598:
+			rv=26;
+	    case 1622:
+			rv=27;
+	    case 1655:
+			rv=28;		
+	    case 1679:
+			rv=29;
+	    case 1713:
+			rv=30;
+	    case 1738:
+			rv=31;
+	    case 1773:
+			rv=32;
+	    case 1799:
+			rv=33;
+        case 1835:
+			rv=34;
+	    case 1862:
+			rv=35;
+	    case 1899:
+			rv=36;
+	    case 1928:
+			rv=37;
+	    case 1966:
+			rv=38;
+	    case 1995:
+			rv=39;
+	    case 2035:
+			rv=40;
+	    case 2065:
+			rv=41;
+	    case 2107:
+			rv=42;
+	    case 2181:
+			rv=43;
+	    case 2257:
+			rv=44;
+	    case 2291:
+			rv=45;
+	    case 2336:
+			rv=46;
+	    case 2418:
+			rv=47;
+	    case 2503:
+			rv=48;
+	    case 2541:
+			rv=49;
+	}
+	if(debug > 1)
+		ast_log(LOG_NOTICE,"%i  rv=%i\n",i, rv);
+
+	return rv;
 }
 
-/*
-* Dispatch to correct frequency checker
-*/
+/* ic-706 simple commands */
 
-static int check_freq(struct rpt *myrpt, int m, int d, int *defmode)
+static int simple_command_ic706(struct rpt *myrpt, char command, char subcommand)
 {
-	if (!strcmp(myrpt->remote, remote_rig_ft897))
-		return check_freq_ft897(m, d, defmode);
-	else if (!strcmp(myrpt->remote, remote_rig_rbi))
-		return check_freq_rbi(m, d, defmode);
-	else
-		return -1;
+	unsigned char cmdstr[10];
+	
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = command;
+	cmdstr[5] = subcommand;
+	cmdstr[6] = 0xfd;
+
+	return(civ_cmd(myrpt,cmdstr,7));
 }
 
 /*
-* Return 1 if rig is multimode capable
+* Set a new frequency for the ic706
 */
 
-static int multimode_capable(struct rpt *myrpt)
+static int set_freq_ic706(struct rpt *myrpt, char *newfreq)
 {
-	if (!strcmp(myrpt->remote, remote_rig_ft897))
-		return 1;
-	return 0;
-}	
+	unsigned char cmdstr[20];
+	char mhz[MAXREMSTR], decimals[MAXREMSTR];
+	int fd,m,d;
 
-/*
-* Dispatch to correct frequency bumping function
-*/
+	fd = 0;
+	if(debug) 
+		ast_log(LOG_NOTICE,"newfreq:%s\n",newfreq); 			
 
-static int multimode_bump_freq(struct rpt *myrpt, int interval)
-{
-	if (!strcmp(myrpt->remote, remote_rig_ft897))
-		return multimode_bump_freq_ft897(myrpt, interval);
-	else
-		return -1;
-}
+	if(split_freq(mhz, decimals, newfreq))
+		return -1; 
 
+	m = atoi(mhz);
+	d = atoi(decimals);
 
-/*
-* Queue announcment that scan has been stopped 
-*/
+	/* The ic-706 likes packed BCD frequencies */
 
-static void stop_scan(struct rpt *myrpt, int flag)
-{
-	myrpt->hfscanmode = 0;
-	myrpt->hfscanstatus = ((flag) ? -2 : -1);
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = 5;
+	cmdstr[5] = ((d % 10) << 4);
+	cmdstr[6] = (((d % 1000)/ 100) << 4) + ((d % 100)/10);
+	cmdstr[7] = ((d / 10000) << 4) + ((d % 10000)/1000);
+	cmdstr[8] = (((m % 100)/10) << 4) + (m % 10);
+	cmdstr[9] = (m / 100);
+	cmdstr[10] = 0xfd;
+
+	return(civ_cmd(myrpt,cmdstr,11));
 }
 
-/*
-* This is called periodically when in scan mode
-*/
+/* ic-706 offset */
 
-static int service_scan(struct rpt *myrpt)
+static int set_offset_ic706(struct rpt *myrpt, char offset)
 {
-	int res, interval, mhz, decimals;
-	char k10=0, k100=0;
+	unsigned char c;
 
-	switch (myrpt->hfscanmode) {
+	if(debug > 6)
+		ast_log(LOG_NOTICE,"offset=%i\n",offset);
 
-	case HF_SCAN_DOWN_SLOW:
-		interval = -10; /* 100Hz /sec */
-		break;
+	switch(offset){
+		case	REM_SIMPLEX:
+			c = 0x10;
+			break;
 
-	case HF_SCAN_DOWN_QUICK:
-		interval = -50; /* 500Hz /sec */
-		break;
+		case	REM_MINUS:
+			c = 0x11;
+			break;
+		
+		case	REM_PLUS:
+			c = 0x12;
+			break;	
 
-	case HF_SCAN_DOWN_FAST:
-		interval = -200; /* 2KHz /sec */
-		break;
+		default:
+			return -1;
+	}
 
-	case HF_SCAN_UP_SLOW:
-		interval = 10; /* 100Hz /sec */
-		break;
+	return simple_command_ic706(myrpt,0x0f,c);
 
-	case HF_SCAN_UP_QUICK:
-		interval = 50; /* 500 Hz/sec */
-		break;
+}
 
-	case HF_SCAN_UP_FAST:
-		interval = 200; /* 2KHz /sec */
-		break;
+/* ic-706 mode */
 
-	default:
-		myrpt->hfscanmode = 0; /* Huh? */
-		return -1;
-	}
+static int set_mode_ic706(struct rpt *myrpt, char newmode)
+{
+	unsigned char c;
+	
+	if(debug > 6)
+		ast_log(LOG_NOTICE,"newmode=%i\n",newmode);
 
-	res = split_freq(&mhz, &decimals, myrpt->freq);
-		
-	if (!res) {
-		k100 = decimals / 10000;
-		k10 = (decimals / 1000) % 10;
-		res = multimode_bump_freq(myrpt, interval);
-	}
+	switch(newmode){
+		case	REM_MODE_FM:
+			c = 5;
+			break;
 
-	if (!res)
-		res = split_freq(&mhz, &decimals, myrpt->freq);
+		case	REM_MODE_USB:
+			c = 1;
+			break;
 
-	if (res) {
-		stop_scan(myrpt, 1);
-		return -1;
-	}
+		case	REM_MODE_LSB:
+			c = 0;
+			break;
 
-	/* Announce 10KHz boundaries */
-	if (k10 != (decimals / 1000) % 10) {
-		int myhund = (interval < 0) ? k100 : decimals / 10000;
-		int myten = (interval < 0) ? k10 : (decimals / 1000) % 10;
-		myrpt->hfscanstatus = (myten == 0) ? (myhund) * 100 : (myten) * 10;
+		case	REM_MODE_AM:
+			c = 2;
+			break;
+		
+		default:
+			return -1;
 	}
-	return res;
-
+	return simple_command_ic706(myrpt,6,c);
 }
 
+/* Set tone encode and decode modes */
 
-static int rmt_telem_start(struct rpt *myrpt, struct ast_channel *chan, int delay)
+static int set_ctcss_mode_ic706(struct rpt *myrpt, char txplon, char rxplon)
 {
-	myrpt->remotetx = 0;
-	ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_UNKEY);
-	if (!myrpt->remoterx)
-		ast_indicate(chan, AST_CONTROL_RADIO_KEY);
-	if (ast_safe_sleep(chan, delay) == -1)
-			return -1;
-	return 0;
+	unsigned char cmdstr[10];
+	int rv;
+
+	if(debug > 6)
+		ast_log(LOG_NOTICE,"txplon=%i  rxplon=%i \n",txplon,rxplon);
+
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = 0x16;
+	cmdstr[5] = 0x42;
+	cmdstr[6] = (txplon != 0);
+	cmdstr[7] = 0xfd;
+
+	rv = civ_cmd(myrpt,cmdstr,8);
+	if (rv) return(-1);
+
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = 0x16;
+	cmdstr[5] = 0x43;
+	cmdstr[6] = (rxplon != 0);
+	cmdstr[7] = 0xfd;
+
+	return(civ_cmd(myrpt,cmdstr,8));
 }
 
+#if 0
+/* Set transmit and receive ctcss tone frequencies */
 
-static int rmt_telem_finish(struct rpt *myrpt, struct ast_channel *chan)
+static int set_ctcss_freq_ic706(struct rpt *myrpt, char *txtone, char *rxtone)
 {
-	struct zt_params par;
+	unsigned char cmdstr[10];
+	char hertz[MAXREMSTR],decimal[MAXREMSTR];
+	int h,d,rv;
 
-	if (ioctl(myrpt->txchannel->fds[0], ZT_GET_PARAMS, &par) == -1) {
-		return -1;
+	memset(cmdstr, 0, 5);
 
-	}
-	if (!par.rxisoffhook) {
-		ast_indicate(myrpt->remchannel, AST_CONTROL_RADIO_UNKEY);
-		myrpt->remoterx = 0;
-	} else {
-		myrpt->remoterx = 1;
-	}
-	return 0;
-}
+	if(debug > 6)
+		ast_log(LOG_NOTICE,"txtone=%s  rxtone=%s \n",txtone,rxtone);
+
+	if(split_ctcss_freq(hertz, decimal, txtone))
+		return -1; 
+
+	h = atoi(hertz);
+	d = atoi(decimal);
+	
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = 0x1b;
+	cmdstr[5] = 0;
+	cmdstr[6] = ((h / 100) << 4) + (h % 100)/ 10;
+	cmdstr[7] = ((h % 10) << 4) + (d % 10);
+	cmdstr[8] = 0xfd;
+
+	rv = civ_cmd(myrpt,cmdstr,9);
+	if (rv) return(-1);
+
+	if (!rxtone) return(0);
 
+	if(split_ctcss_freq(hertz, decimal, rxtone))
+		return -1; 
+
+	h = atoi(hertz);
+	d = atoi(decimal);
+
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = 0x1b;
+	cmdstr[5] = 1;
+	cmdstr[6] = ((h / 100) << 4) + (h % 100)/ 10;
+	cmdstr[7] = ((h % 10) << 4) + (d % 10);
+	cmdstr[8] = 0xfd;
+	return(civ_cmd(myrpt,cmdstr,9));
+}	
+#endif
 
-static int rmt_sayfile(struct rpt *myrpt, struct ast_channel *chan, int delay, char *filename)
+static int vfo_ic706(struct rpt *myrpt)
 {
-	int res;
+	unsigned char cmdstr[10];
+	
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = 7;
+	cmdstr[5] = 0xfd;
 
-	res = rmt_telem_start(myrpt, chan, delay);
+	return(civ_cmd(myrpt,cmdstr,6));
+}
 
-	if (!res)
-		res = sayfile(chan, filename);
+static int mem2vfo_ic706(struct rpt *myrpt)
+{
+	unsigned char cmdstr[10];
 	
-	if (!res)
-		res = rmt_telem_finish(myrpt, chan);
-	return res;
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = 0x0a;
+	cmdstr[5] = 0xfd;
+
+	return(civ_cmd(myrpt,cmdstr,6));
 }
 
-static int rmt_saycharstr(struct rpt *myrpt, struct ast_channel *chan, int delay, char *charstr)
+static int select_mem_ic706(struct rpt *myrpt, int slot)
 {
-	int res;
+	unsigned char cmdstr[10];
+	
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = 8;
+	cmdstr[5] = 0;
+	cmdstr[6] = ((slot / 10) << 4) + (slot % 10);
+	cmdstr[7] = 0xfd;
+
+	return(civ_cmd(myrpt,cmdstr,8));
+}
 
-	res = rmt_telem_start(myrpt, chan, delay);
+static int set_ic706(struct rpt *myrpt)
+{
+	int res = 0,i;
+	
+	if(debug)ast_log(LOG_NOTICE, "Set to VFO A iobase=%i\n",myrpt->p.iobase);
 
 	if (!res)
-		res = saycharstr(chan, charstr);
-	
+		res = simple_command_ic706(myrpt,7,0);
+
+	if((myrpt->remmode == REM_MODE_FM))
+	{
+		i = ic706_pltocode(myrpt->rxpl);
+		if (i == -1) return -1;
+		if(debug)
+			printf("Select memory number\n");
+		if (!res)
+			res = select_mem_ic706(myrpt,i + IC706_PL_MEMORY_OFFSET);
+		if(debug)
+			printf("Transfer memory to VFO\n");
+		if (!res)
+			res = mem2vfo_ic706(myrpt);
+	}
+		
+	if(debug)
+		printf("Set to VFO\n");
+
+	if (!res)
+		res = vfo_ic706(myrpt);
+
+	if(debug)
+		printf("Modulation mode\n");
+
 	if (!res)
-		res = rmt_telem_finish(myrpt, chan);
+		res = set_mode_ic706(myrpt, myrpt->remmode);		/* Modulation mode */
+
+	if(debug)
+		printf("Split off\n");
+
+	if(!res)
+		simple_command_ic706(myrpt, 0x82,0);			/* Split off */
+
+	if(debug)
+		printf("Frequency\n");
+
+	if(!res)
+		res = set_freq_ic706(myrpt, myrpt->freq);		/* Frequency */
+	if((myrpt->remmode == REM_MODE_FM)){
+		if(debug)
+			printf("Offset\n");
+		if(!res)
+			res = set_offset_ic706(myrpt, myrpt->offset);	/* Offset if FM */
+		if(!res){
+			if(debug)
+				printf("CTCSS mode\n");
+			res = set_ctcss_mode_ic706(myrpt, myrpt->txplon, myrpt->rxplon); /* CTCSS mode */
+		}
+	}
 	return res;
 }
 
 /*
-* Remote base function
+* Bump frequency up or down by a small amount 
+* Return 0 if the new frequnecy is valid, or -1 if invalid
+* Interval is in Hz, resolution is 10Hz 
 */
 
-static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
+static int multimode_bump_freq_ic706(struct rpt *myrpt, int interval)
 {
-	char *s, *modestr;
-	const char *val;
-	int i, j, ht, k, l, ls2, res, offset, offsave, modesave, defmode = 0;
-	char multimode = 0;
-	char oc;
-	char tmp[20], freq[20] = "", savestr[20] = "";
-	int mhz = 0, decimals = 0;
-	struct ast_channel *mychannel;
-	AST_DECLARE_APP_ARGS(args1,
-		AST_APP_ARG(freq);
-		AST_APP_ARG(xpl);
-		AST_APP_ARG(mode);
-	);
-	AST_DECLARE_APP_ARGS(args,
-		AST_APP_ARG(s1);
-		AST_APP_ARG(s2);
-	);
-
-	if ((!param) || (command_source == SOURCE_RPT) || (command_source == SOURCE_LNK))
-		return DC_ERROR;
-		
-	multimode = multimode_capable(myrpt);
-	mychannel = myrpt->remchannel;
+	int m,d;
+	char mhz[MAXREMSTR], decimals[MAXREMSTR];
+	unsigned char cmdstr[20];
 
-	switch (myatoi(param)) {
-	case 1:  /* retrieve memory */
-		if (strlen(digitbuf) < 2) /* needs 2 digits */
-			break;
-			
-		for (i = 0 ; i < 2 ; i++) {
-			if ((digitbuf[i] < '0') || (digitbuf[i] > '9'))
-				return DC_ERROR;
-		}
+	if(debug)
+		printf("Before bump: %s\n", myrpt->freq);
 
-		val = ast_variable_retrieve(myrpt->cfg, myrpt->p.memory, digitbuf);
-		if (!val) {
-			if (ast_safe_sleep(mychannel, 1000) == -1)
-				return DC_ERROR;
-			sayfile(mychannel, "rpt/memory_notfound");
-			return DC_COMPLETE;
-		}
-		s = ast_strdupa(val);
-		AST_STANDARD_APP_ARGS(args1, s);
-		if (args1.argc < 3)
-			return DC_ERROR;
-		ast_copy_string(myrpt->freq, args1.freq, sizeof(myrpt->freq));
-		ast_copy_string(myrpt->rxpl, args1.xpl, sizeof(myrpt->rxpl));
-		ast_copy_string(myrpt->txpl, args1.xpl, sizeof(myrpt->rxpl));
-		myrpt->remmode = REM_MODE_FM;
-		myrpt->offset = REM_SIMPLEX;
-		myrpt->powerlevel = REM_MEDPWR;
-		myrpt->txplon = myrpt->rxplon = 0;
-		modestr = args1.mode;
-		while (*modestr) {
-			switch (*modestr++) {
-			case 'A':
-			case 'a':
-				strcpy(myrpt->rxpl, "100.0");
-				strcpy(myrpt->txpl, "100.0");
-				myrpt->remmode = REM_MODE_AM;	
-				break;
+	if(split_freq(mhz, decimals, myrpt->freq))
+		return -1;
+	
+	m = atoi(mhz);
+	d = atoi(decimals);
 
-			case 'B':
-			case 'b':
-				strcpy(myrpt->rxpl, "100.0");
-				strcpy(myrpt->txpl, "100.0");
-				myrpt->remmode = REM_MODE_LSB;
-				break;
+	d += (interval / 10); /* 10Hz resolution */
+	if(d < 0){
+		m--;
+		d += 100000;
+	}
+	else if(d >= 100000){
+		m++;
+		d -= 100000;
+	}
 
-			case 'F':
-				myrpt->remmode = REM_MODE_FM;
-				break;
+	if(check_freq_ic706(m, d, NULL,myrpt->p.remote_mars)){
+		if(debug)
+			printf("Bump freq invalid\n");
+		return -1;
+	}
 
-			case 'L':
-			case 'l':
-				myrpt->powerlevel = REM_LOWPWR;
-				break;					
-			case 'H':
-			case 'h':
-				myrpt->powerlevel = REM_HIPWR;
-				break;
+	snprintf(myrpt->freq, MAXREMSTR, "%d.%05d", m, d);
 
-			case 'M':
-			case 'm':
-				myrpt->powerlevel = REM_MEDPWR;
-				break;
+	if(debug)
+		printf("After bump: %s\n", myrpt->freq);
 
-			case '-':
-				myrpt->offset = REM_MINUS;
-				break;
+	/* The ic-706 likes packed BCD frequencies */
 
-			case '+':
-				myrpt->offset = REM_PLUS;
-				break;
+	cmdstr[0] = cmdstr[1] = 0xfe;
+	cmdstr[2] = myrpt->p.civaddr;
+	cmdstr[3] = 0xe0;
+	cmdstr[4] = 0;
+	cmdstr[5] = ((d % 10) << 4);
+	cmdstr[6] = (((d % 1000)/ 100) << 4) + ((d % 100)/10);
+	cmdstr[7] = ((d / 10000) << 4) + ((d % 10000)/1000);
+	cmdstr[8] = (((m % 100)/10) << 4) + (m % 10);
+	cmdstr[9] = (m / 100);
+	cmdstr[10] = 0xfd;
 
-			case 'S':
-			case 's':
-				myrpt->offset = REM_SIMPLEX;
-				break;
+	return(serial_remote_io(myrpt,cmdstr,11,NULL,0,0));
+}
 
-			case 'T':
-			case 't':
-				myrpt->txplon = 1;
-				break;
 
-			case 'R':
-			case 'r':
-				myrpt->rxplon = 1;
-				break;
 
-			case 'U':
-			case 'u':
-				strcpy(myrpt->rxpl, "100.0");
-				strcpy(myrpt->txpl, "100.0");
-				myrpt->remmode = REM_MODE_USB;
-				break;
-			}
+/*
+* Dispatch to correct I/O handler 
+*/
+static int setrem(struct rpt *myrpt)
+{
+char	str[300];
+char	*offsets[] = {"SIMPLEX","MINUS","PLUS"};
+char	*powerlevels[] = {"LOW","MEDIUM","HIGH"};
+char	*modes[] = {"FM","USB","LSB","AM"};
+int	res = -1;
+
+#if	0
+printf("FREQ,%s,%s,%s,%s,%s,%s,%d,%d\n",myrpt->freq,
+	modes[(int)myrpt->remmode],
+	myrpt->txpl,myrpt->rxpl,offsets[(int)myrpt->offset],
+	powerlevels[(int)myrpt->powerlevel],myrpt->txplon,
+	myrpt->rxplon);
+#endif
+	if (myrpt->p.archivedir)
+	{
+		sprintf(str,"FREQ,%s,%s,%s,%s,%s,%s,%d,%d",myrpt->freq,
+			modes[(int)myrpt->remmode],
+			myrpt->txpl,myrpt->rxpl,offsets[(int)myrpt->offset],
+			powerlevels[(int)myrpt->powerlevel],myrpt->txplon,
+			myrpt->rxplon);
+		donodelog(myrpt,str);
+	}
+	if(!strcmp(myrpt->remoterig, remote_rig_ft897))
+	{
+		rpt_telemetry(myrpt,SETREMOTE,NULL);
+		res = 0;
+	}
+	if(!strcmp(myrpt->remoterig, remote_rig_ic706))
+	{
+		rpt_telemetry(myrpt,SETREMOTE,NULL);
+		res = 0;
+	}
+	if(!strcmp(myrpt->remoterig, remote_rig_tm271))
+	{
+		rpt_telemetry(myrpt,SETREMOTE,NULL);
+		res = 0;
+	}
+	else if(!strcmp(myrpt->remoterig, remote_rig_rbi))
+	{
+		res = setrbi_check(myrpt);
+		if (!res)
+		{
+			rpt_telemetry(myrpt,SETREMOTE,NULL);
+			res = 0;
 		}
+	}
+	else if(ISRIG_RTX(myrpt->remoterig))
+	{
+		setrtx(myrpt);
+		res = 0;
+	}
+	else if(!strcmp(myrpt->remoterig, remote_rig_kenwood)) {
+		rpt_telemetry(myrpt,SETREMOTE,NULL);
+		res = 0;
+	}
+	else
+		res = 0;
 
-		if (setrem(myrpt) == -1)
-			return DC_ERROR;
+	if (res < 0) ast_log(LOG_ERROR,"Unable to send remote command on node %s\n",myrpt->name);
 
-		return DC_COMPLETE;	
+	return res;
+}
 
-	case 2:  /* set freq and offset */
-		for (i = 0, j = 0, k = 0, l = 0 ; digitbuf[i] ; i++) { /* look for M+*K+*O or M+*H+* depending on mode */
-			if (digitbuf[i] == '*') {
-				j++;
-				continue;
-			}
-			if ((digitbuf[i] < '0') || (digitbuf[i] > '9'))
-				goto invalid_freq;
-			else {
-				if (j == 0)
-					l++; /* # of digits before first * */
-				if (j == 1)
-					k++; /* # of digits after first * */
-			}
-		}
+static int closerem(struct rpt *myrpt)
+{
+	if(!strcmp(myrpt->remoterig, remote_rig_ft897))
+		return closerem_ft897(myrpt);
+	else
+		return 0;
+}
 
-		i = strlen(digitbuf) - 1;
-		if (multimode) {
-			if ((j > 2) || (l > 3) || (k > 6))
-				goto invalid_freq; /* &^@#! */
- 		} else {
-			if ((j > 2) || (l > 4) || (k > 3))
-				goto invalid_freq; /* &^@#! */
-		}
+/*
+* Dispatch to correct RX frequency checker
+*/
 
-		/* Wait for M+*K+* */
+static int check_freq(struct rpt *myrpt, int m, int d, int *defmode)
+{
+	if(!strcmp(myrpt->remoterig, remote_rig_ft897))
+		return check_freq_ft897(m, d, defmode);
+	else if(!strcmp(myrpt->remoterig, remote_rig_ic706))
+		return check_freq_ic706(m, d, defmode,myrpt->p.remote_mars);
+	else if(!strcmp(myrpt->remoterig, remote_rig_rbi))
+		return check_freq_rbi(m, d, defmode);
+	else if(!strcmp(myrpt->remoterig, remote_rig_kenwood))
+		return check_freq_kenwood(m, d, defmode);
+	else if(!strcmp(myrpt->remoterig, remote_rig_tm271))
+		return check_freq_tm271(m, d, defmode);
+	else if(ISRIG_RTX(myrpt->remoterig))
+		return check_freq_rtx(m, d, defmode, myrpt);
+	else
+		return -1;
+}
 
-		if (j < 2)
-			break; /* Not yet */
+/*
+ * Check TX frequency before transmitting
+   rv=1 if tx frequency in ok.
+*/
 
-		/* We have a frequency */
+static char check_tx_freq(struct rpt *myrpt)
+{
+	int i,rv=0;
+	int radio_mhz, radio_decimals, ulimit_mhz, ulimit_decimals, llimit_mhz, llimit_decimals;
+	char radio_mhz_char[MAXREMSTR];
+	char radio_decimals_char[MAXREMSTR];
+	char limit_mhz_char[MAXREMSTR];
+	char limit_decimals_char[MAXREMSTR];
+	char limits[256];
+	char *limit_ranges[40];
+	struct ast_variable *limitlist;
+	
+	if(debug > 3){
+		ast_log(LOG_NOTICE, "myrpt->freq = %s\n", myrpt->freq);
+	}
 
-		s = ast_strdupa(digitbuf);
-		AST_NONSTANDARD_APP_ARGS(args, s, '*');
-		ls2 = strlen(args.s2);	
+	/* Must have user logged in and tx_limits defined */
 
-		switch (ls2) { /* Allow partial entry of khz and hz digits for laziness support */
-		case 1:
-			ht = 0;
-			k = 100 * atoi(args.s2);
-			break;
-		case 2:
-			ht = 0;
-			k = 10 * atoi(args.s2);
-			break;
-		case 3:
-			if (!multimode) {
-				if ((args.s2[2] != '0') && (args.s2[2] != '5'))
-					goto invalid_freq;
-			}
-			ht = 0;
-			k = atoi(args.s2);
-				break;
-		case 4:
-			k = atoi(args.s2) / 10;
-			ht = 10 * (atoi(args.s2 + (ls2 - 1)));
-			break;
-		case 5:
-			k = atoi(args.s2) / 100;
-			ht = (atoi(args.s2 + (ls2 - 2)));
-			break;
-		default:
-			goto invalid_freq;
+	if(!myrpt->p.txlimitsstanzaname || !myrpt->loginuser[0] || !myrpt->loginlevel[0]){
+		if(debug > 3){
+			ast_log(LOG_NOTICE, "No tx band table defined, or no user logged in. rv=1\n");
 		}
+		rv=1;
+		return 1; /* Assume it's ok otherwise */
+	}
 
-		/* Check frequency for validity and establish a default mode */
-			
-		snprintf(freq, sizeof(freq), "%s.%03d%02d", args.s1, k, ht);
-		ast_debug(1, "New frequency: %s\n", freq);		
-	
-		split_freq(&mhz, &decimals, freq);
-
-		if (check_freq(myrpt, mhz, decimals, &defmode)) /* Check to see if frequency entered is legit */
-			goto invalid_freq;
-
-		if ((defmode == REM_MODE_FM) && (digitbuf[i] == '*')) /* If FM, user must enter and additional offset digit */
-			break; /* Not yet */
+	/* Retrieve the band table for the loginlevel */
+	limitlist = ast_variable_browse(myrpt->cfg, myrpt->p.txlimitsstanzaname);
 
-		offset = REM_SIMPLEX; /* Assume simplex */
+	if(!limitlist){
+		ast_log(LOG_WARNING, "No entries in %s band table stanza. rv=0\n", myrpt->p.txlimitsstanzaname);
+		rv=0;
+		return 0;
+	}
 
-		if (defmode == REM_MODE_FM) {
-			oc = *s; /* Pick off offset */
-			if (oc) {
-				switch (oc) {
-				case '1':
-					offset = REM_MINUS;
-					break;
-				case '2':
-					offset = REM_SIMPLEX;
-					break;
-				case '3':
-					offset = REM_PLUS;
-					break;
-				default:
-					goto invalid_freq;
-				} 
-			} 
-		}	
-		offsave = myrpt->offset;
-		modesave = myrpt->remmode;
-		ast_copy_string(savestr, myrpt->freq, sizeof(savestr));
-		ast_copy_string(myrpt->freq, freq, sizeof(myrpt->freq));
-		myrpt->offset = offset;
-		myrpt->remmode = defmode;
+	split_freq(radio_mhz_char, radio_decimals_char, myrpt->freq);
+	radio_mhz = atoi(radio_mhz_char);
+	radio_decimals = decimals2int(radio_decimals_char);
 
-		if (setrem(myrpt) == -1) {
-			myrpt->offset = offsave;
-			myrpt->remmode = modesave;
-			ast_copy_string(myrpt->freq, savestr, sizeof(myrpt->freq));
-			goto invalid_freq;
-		}
+	if(debug > 3){
+		ast_log(LOG_NOTICE, "Login User = %s, login level = %s\n", myrpt->loginuser, myrpt->loginlevel);
+	}
 
-		return DC_COMPLETE;
+	/* Find our entry */
 
-invalid_freq:
-		rmt_sayfile(myrpt, mychannel, 1000, "rpt/invalid-freq");
+	for(;limitlist; limitlist=limitlist->next){
+		if(!strcmp(limitlist->name, myrpt->loginlevel))
+			break;
+	}
 
-		return DC_ERROR; 
-		
-	case 3: /* set rx PL tone */
+	if(!limitlist){
+		ast_log(LOG_WARNING, "Can't find %s entry in band table stanza %s. rv=0\n", myrpt->loginlevel, myrpt->p.txlimitsstanzaname);
+		rv=0;
+	    return 0;
+	}
+	
+	if(debug > 3){
+		ast_log(LOG_NOTICE, "Auth: %s = %s\n", limitlist->name, limitlist->value);
+	}
+
+	/* Parse the limits */
+
+	strncpy(limits, limitlist->value, 256);
+	limits[255] = 0;
+	finddelim(limits, limit_ranges, 40);
+	for(i = 0; i < 40 && limit_ranges[i] ; i++){
+		char range[40];
+		char *r,*s;
+		strncpy(range, limit_ranges[i], 40);
+		range[39] = 0;
+        if(debug > 3) 
+        	ast_log(LOG_NOTICE, "Check %s within %s\n", myrpt->freq, range);
+	
+		r = strchr(range, '-');
+		if(!r){
+			ast_log(LOG_WARNING, "Malformed range in %s tx band table entry. rv=0\n", limitlist->name);
+			rv=0;
+			break;
+		}
+		*r++ = 0;
+		s = eatwhite(range);
+		r = eatwhite(r);
+		split_freq(limit_mhz_char, limit_decimals_char, s);
+		llimit_mhz = atoi(limit_mhz_char);
+		llimit_decimals = decimals2int(limit_decimals_char);
+		split_freq(limit_mhz_char, limit_decimals_char, r);
+		ulimit_mhz = atoi(limit_mhz_char);
+		ulimit_decimals = decimals2int(limit_decimals_char);
 			
-		for (i = 0, j = 0, k = 0, l = 0 ; digitbuf[i] ; i++) { /* look for N+*N */
-			if (digitbuf[i] == '*') {
-				j++;
-				continue;
+		if((radio_mhz >= llimit_mhz) && (radio_mhz <= ulimit_mhz)){
+			if(radio_mhz == llimit_mhz){ /* CASE 1: TX freq is in llimit mhz portion of band */
+				if(radio_decimals >= llimit_decimals){ /* Cannot be below llimit decimals */
+					if(llimit_mhz == ulimit_mhz){ /* If bandwidth < 1Mhz, check ulimit decimals */
+						if(radio_decimals <= ulimit_decimals){
+							rv=1;
+							break;
+						}
+						else{
+							if(debug > 3)
+								ast_log(LOG_NOTICE, "Invalid TX frequency, debug msg 1\n");
+							rv=0;
+							break;
+						}
+					}
+					else{
+						rv=1;
+						break;
+					}
+				}
+				else{ /* Is below llimit decimals */
+					if(debug > 3)
+						ast_log(LOG_NOTICE, "Invalid TX frequency, debug msg 2\n");
+					rv=0;
+					break;
+				}
 			}
-			if ((digitbuf[i] < '0') || (digitbuf[i] > '9'))
-				return DC_ERROR;
-			else {
-				if (j)
-					l++;
-				else
-					k++;
-			}
-		}
-		if ((j > 1) || (k > 3) || (l > 1))
-			return DC_ERROR; /* &$@^! */
-		i = strlen(digitbuf) - 1;
-		if ((j != 1) || (k < 2)|| (l != 1))
-			break; /* Not yet */
-		ast_debug(1, "PL digits entered %s\n", digitbuf);
- 		
-		ast_copy_string(tmp, digitbuf, sizeof(tmp));
-		/* see if we have at least 1 */
-		s = strchr(tmp, '*');
-		if (s)
-			*s = '.';
-		ast_copy_string(savestr, myrpt->rxpl, sizeof(savestr));
-		ast_copy_string(myrpt->rxpl, tmp, sizeof(myrpt->rxpl));
-
-		if (setrem(myrpt) == -1) {
-			ast_copy_string(myrpt->rxpl, savestr, sizeof(myrpt->rxpl));
-			return DC_ERROR;
-		}
-
-		return DC_COMPLETE;
-	case 4: /* set tx PL tone */
-		for (i = 0, j = 0, k = 0, l = 0 ; digitbuf[i] ; i++) { /* look for N+*N */
-			if (digitbuf[i] == '*') {
-				j++;
-				continue;
+			else if(radio_mhz == ulimit_mhz){ /* CASE 2: TX freq not in llimit mhz portion of band */
+				if(radio_decimals <= ulimit_decimals){
+					if(debug > 3)
+						ast_log(LOG_NOTICE, "radio_decimals <= ulimit_decimals\n");
+					rv=1;
+					break;
+				}
+				else{ /* Is above ulimit decimals */
+					if(debug > 3)
+						ast_log(LOG_NOTICE, "Invalid TX frequency, debug msg 3\n");
+					rv=0;
+					break;
+				}
 			}
-			if ((digitbuf[i] < '0') || (digitbuf[i] > '9'))
-				return DC_ERROR;
-			else {
-				if (j)
-					l++;
-				else
-					k++;
-			}
-		}
-		if ((j > 1) || (k > 3) || (l > 1))
-			return DC_ERROR; /* &$@^! */
-		i = strlen(digitbuf) - 1;
-		if ((j != 1) || (k < 2)|| (l != 1))
-			break; /* Not yet */
-		ast_debug(1, "PL digits entered %s\n", digitbuf);
-
-		ast_copy_string(tmp, digitbuf, sizeof(tmp));
-		/* see if we have at least 1 */
-		s = strchr(tmp, '*');
-		if (s)
-			*s = '.';
-		ast_copy_string(savestr, myrpt->txpl, sizeof(savestr));
-		ast_copy_string(myrpt->txpl, tmp, sizeof(myrpt->txpl));
-			
-		if (setrem(myrpt) == -1) {
-			ast_copy_string(myrpt->txpl, savestr, sizeof(myrpt->txpl));
-			return DC_ERROR;
+			else /* CASE 3: TX freq within a multi-Mhz band and ok */
+				if(debug > 3)
+						ast_log(LOG_NOTICE, "Valid TX freq within a multi-Mhz band and ok.\n");
+				rv=1;
+				break;
 		}
+	}
+	if(debug > 3)  
+		ast_log(LOG_NOTICE, "rv=%i\n",rv);
 
-		return DC_COMPLETE;
+	return rv;
+}
 
-	case 6: /* MODE (FM,USB,LSB,AM) */
-		if (strlen(digitbuf) < 1)
-			break;
 
-		if (!multimode)
-			return DC_ERROR; /* Multimode radios only */
+/*
+* Dispatch to correct frequency bumping function
+*/
 
-		switch (*digitbuf) {
-		case '1':
-			split_freq(&mhz, &decimals, myrpt->freq); 
-			if (mhz < 29) /* No FM allowed below 29MHz! */
-				return DC_ERROR;
-			myrpt->remmode = REM_MODE_FM;
-			res = rmt_saycharstr(myrpt, mychannel, 1000, "FM");
-			break;
+static int multimode_bump_freq(struct rpt *myrpt, int interval)
+{
+	if(!strcmp(myrpt->remoterig, remote_rig_ft897))
+		return multimode_bump_freq_ft897(myrpt, interval);
+	else if(!strcmp(myrpt->remoterig, remote_rig_ic706))
+		return multimode_bump_freq_ic706(myrpt, interval);
+	else
+		return -1;
+}
 
-		case '2':
-			myrpt->remmode = REM_MODE_USB;
-			res = rmt_saycharstr(myrpt, mychannel, 1000, "USB");
-			break;	
 
-		case '3':
-			myrpt->remmode = REM_MODE_LSB;
-			res = rmt_saycharstr(myrpt, mychannel, 1000, "LSB");
-			break;
+/*
+* Queue announcment that scan has been stopped 
+*/
 
-		case '4':
-			myrpt->remmode = REM_MODE_AM;
-			res = rmt_saycharstr(myrpt, mychannel, 1000, "AM");
-			break;
+static void stop_scan(struct rpt *myrpt)
+{
+	myrpt->hfscanstop = 1;
+	rpt_telemetry(myrpt,SCAN,0);
+}
 
-		default:
-			return DC_ERROR;
-		}
-		if (res)
-			return DC_ERROR;
+/*
+* This is called periodically when in scan mode
+*/
 
-		if (setrem(myrpt))
-			return DC_ERROR;
-		return DC_COMPLETE;
 
-	case 100: /* other stuff */
-	case 101:
-	case 102:
-	case 103:
-	case 104:
-	case 105:
-	case 106:
- 		res = rmt_telem_start(myrpt, mychannel, 1000);
-		switch (myatoi(param)) { /* Quick commands requiring a setrem call */
-		case 100: /* RX PL Off */
-			myrpt->rxplon = 0;
-			if (!res)
-				res = sayfile(mychannel, "rpt/rxpl");
-			if (!res)
-				sayfile(mychannel, "rpt/off");
-			break;
+static int service_scan(struct rpt *myrpt)
+{
+	int res, interval;
+	char mhz[MAXREMSTR], decimals[MAXREMSTR], k10=0i, k100=0;
 
-		case 101: /* RX PL On */
-			myrpt->rxplon = 1;
-			if (!res)
-				res = sayfile(mychannel, "rpt/rxpl");
-			if (!res)
-				sayfile(mychannel, "rpt/on");
+	switch(myrpt->hfscanmode){
+
+		case HF_SCAN_DOWN_SLOW:
+			interval = -10; /* 100Hz /sec */
 			break;
 
-		case 102: /* TX PL Off */
-			myrpt->txplon = 0;
-			if (!res)
-				res = sayfile(mychannel, "rpt/txpl");
-			if (!res)
-				sayfile(mychannel, "rpt/off");
+		case HF_SCAN_DOWN_QUICK:
+			interval = -50; /* 500Hz /sec */
 			break;
 
-		case 103: /* TX PL On */
-			myrpt->txplon = 1;
-			if (!res)
-				res = sayfile(mychannel, "rpt/txpl");
-			if (!res)
-				sayfile(mychannel, "rpt/on");
+		case HF_SCAN_DOWN_FAST:
+			interval = -200; /* 2KHz /sec */
 			break;
 
-		case 104: /* Low Power */
-			myrpt->powerlevel = REM_LOWPWR;
-			if (!res)
-				res = sayfile(mychannel, "rpt/lopwr");
+		case HF_SCAN_UP_SLOW:
+			interval = 10; /* 100Hz /sec */
 			break;
 
-		case 105: /* Medium Power */
-			myrpt->powerlevel = REM_MEDPWR;
-			if (!res)
-				res = sayfile(mychannel, "rpt/medpwr");
+		case HF_SCAN_UP_QUICK:
+			interval = 50; /* 500 Hz/sec */
 			break;
 
-		case 106: /* Hi Power */
-			myrpt->powerlevel = REM_HIPWR;
-			if (!res)
-				res = sayfile(mychannel, "rpt/hipwr");
+		case HF_SCAN_UP_FAST:
+			interval = 200; /* 2KHz /sec */
 			break;
 
 		default:
-			if (!res)
-				rmt_telem_finish(myrpt, mychannel);
-			return DC_ERROR;
-		}
-		if (!res)
-			res = rmt_telem_finish(myrpt, mychannel);
-		if (res)
-			return DC_ERROR;
+			myrpt->hfscanmode = 0; /* Huh? */
+			return -1;
+	}
 
-		if (setrem(myrpt) == -1) 
-			return DC_ERROR;
-		return DC_COMPLETE;
+	res = split_freq(mhz, decimals, myrpt->freq);
+		
+	if(!res){
+		k100 =decimals[0];
+		k10 = decimals[1];
+		res = multimode_bump_freq(myrpt, interval);
+	}
 
-	case 107: /* Bump down 20Hz */
-		multimode_bump_freq(myrpt, -20);
-		return DC_COMPLETE;
+	if(!res)
+		res = split_freq(mhz, decimals, myrpt->freq);
 
-	case 108: /* Bump down 100Hz */
-		multimode_bump_freq(myrpt, -100);
-		return DC_COMPLETE;
 
-	case 109: /* Bump down 500Hz */
-		multimode_bump_freq(myrpt, -500);
-		return DC_COMPLETE;
+	if(res){
+		myrpt->hfscanmode = 0;
+		myrpt->hfscanstatus = -2;
+		return -1;
+	}
 
-	case 110: /* Bump up 20Hz */
-		multimode_bump_freq(myrpt, 20);
-		return DC_COMPLETE;
-				
-	case 111: /* Bump up 100Hz */
-		multimode_bump_freq(myrpt, 100);
-		return DC_COMPLETE;
+	/* Announce 10KHz boundaries */
+	if(k10 != decimals[1]){
+		int myhund = (interval < 0) ? k100 : decimals[0];
+		int myten = (interval < 0) ? k10 : decimals[1];
+		myrpt->hfscanstatus = (myten == '0') ? (myhund - '0') * 100 : (myten - '0') * 10;
+	} else myrpt->hfscanstatus = 0;
+	return res;
 
-	case 112: /* Bump up 500Hz */
-		multimode_bump_freq(myrpt, 500);
-		return DC_COMPLETE;
+}
+/*
+	retrieve memory setting and set radio
+*/
+static int get_mem_set(struct rpt *myrpt, char *digitbuf)
+{
+	int res=0;
+	if(debug)ast_log(LOG_NOTICE," digitbuf=%s\n", digitbuf);
+	res = retreive_memory(myrpt, digitbuf);
+	if(!res)res=setrem(myrpt);	
+	if(debug)ast_log(LOG_NOTICE," freq=%s  res=%i\n", myrpt->freq, res);
+	return res;
+}
+/*
+	steer the radio selected channel to either one programmed into the radio
+	or if the radio is VFO agile, to an rpt.conf memory location.
+*/
+static int channel_steer(struct rpt *myrpt, char *data)
+{
+	int res=0;
 
-	case 113:
-	case 114:
-	case 115:
-	case 116:
-	case 117:
-	case 118:
-		myrpt->remotetx = 0;
-		ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_UNKEY);
-		if (!myrpt->remoterx)
-			ast_indicate(mychannel, AST_CONTROL_RADIO_KEY);
-		if (ast_safe_sleep(mychannel, 1000) == -1)
-				return DC_ERROR;
+	if(debug)ast_log(LOG_NOTICE,"remoterig=%s, data=%s\n",myrpt->remoterig,data);
+	if (!myrpt->remoterig) return(0);
+	if(data<=0)
+	{
+		res=-1;
+	}
+	else
+	{
+		myrpt->nowchan=strtod(data,NULL);
+		if(!strcmp(myrpt->remoterig, remote_rig_ppp16))
+		{
+			char string[16];
+			sprintf(string,"SETCHAN %d ",myrpt->nowchan);
+			send_usb_txt(myrpt,string);	
+		}
+		else
+		{
+			if(get_mem_set(myrpt, data))res=-1;
+		}
+	}
+	if(debug)ast_log(LOG_NOTICE,"nowchan=%i  res=%i\n",myrpt->nowchan, res);
+	return res;
+}
+/*
+*/
+static int channel_revert(struct rpt *myrpt)
+{
+	int res=0;
+	if(debug)ast_log(LOG_NOTICE,"remoterig=%s, nowchan=%02d, waschan=%02d\n",myrpt->remoterig,myrpt->nowchan,myrpt->waschan);
+	if (!myrpt->remoterig) return(0);
+	if(myrpt->nowchan!=myrpt->waschan)
+	{
+		char data[8];
+        if(debug)ast_log(LOG_NOTICE,"reverting.\n");
+		sprintf(data,"%02d",myrpt->waschan);
+		myrpt->nowchan=myrpt->waschan;
+		channel_steer(myrpt,data);
+		res=1;
+	}
+	return(res);
+}
+/*
+* Remote base function
+*/
 
-		switch (myatoi(param)) {
-		case 113: /* Scan down slow */
-			res = sayfile(mychannel, "rpt/down");
-			if (!res)
-				res = sayfile(mychannel, "rpt/slow");
-			if (!res) {
-				myrpt->scantimer = REM_SCANTIME;
-				myrpt->hfscanmode = HF_SCAN_DOWN_SLOW;
-			}
-			break;
+static int function_remote(struct rpt *myrpt, char *param, char *digitbuf, int command_source, struct rpt_link *mylink)
+{
+	char *s,*s1,*s2;
+	int i,j,p,r,ht,k,l,ls2,m,d,offset,offsave, modesave, defmode;
+	char multimode = 0;
+	char oc,*cp,*cp1,*cp2;
+	char tmp[20], freq[20] = "", savestr[20] = "";
+	char mhz[MAXREMSTR], decimals[MAXREMSTR];
 
-		case 114: /* Scan down quick */
-			res = sayfile(mychannel, "rpt/down");
-			if (!res)
-				res = sayfile(mychannel, "rpt/quick");
-			if (!res) {
-				myrpt->scantimer = REM_SCANTIME;
-				myrpt->hfscanmode = HF_SCAN_DOWN_QUICK;
-			}
-			break;
+    if(debug > 6) {
+    	ast_log(LOG_NOTICE,"%s param=%s digitbuf=%s source=%i\n",myrpt->name,param,digitbuf,command_source);
+	}
 
-		case 115: /* Scan down fast */
-			res = sayfile(mychannel, "rpt/down");
-			if (!res)
-				res = sayfile(mychannel, "rpt/fast");
-			if (!res) {
-				myrpt->scantimer = REM_SCANTIME;
-				myrpt->hfscanmode = HF_SCAN_DOWN_FAST;
-			}
-			break;
+	if((!param) || (command_source == SOURCE_RPT) || (command_source == SOURCE_LNK))
+		return DC_ERROR;
+		
+	p = myatoi(param);
 
-		case 116: /* Scan up slow */
-			res = sayfile(mychannel, "rpt/up");
-			if (!res)
-				res = sayfile(mychannel, "rpt/slow");
-			if (!res) {
-				myrpt->scantimer = REM_SCANTIME;
-				myrpt->hfscanmode = HF_SCAN_UP_SLOW;
-			}
-			break;
+	if ((p != 99) && (p != 5) && (p != 140) && myrpt->p.authlevel && 
+		(!myrpt->loginlevel[0])) return DC_ERROR;
+	multimode = multimode_capable(myrpt);
 
-		case 117: /* Scan up quick */
-			res = sayfile(mychannel, "rpt/up");
-			if (!res)
-				res = sayfile(mychannel, "rpt/quick");
-			if (!res) {
-				myrpt->scantimer = REM_SCANTIME;
-				myrpt->hfscanmode = HF_SCAN_UP_QUICK;
+	switch(p){
+
+		case 1:  /* retrieve memory */
+			if(strlen(digitbuf) < 2) /* needs 2 digits */
+				break;
+			
+			for(i = 0 ; i < 2 ; i++){
+				if((digitbuf[i] < '0') || (digitbuf[i] > '9'))
+					return DC_ERROR;
+			}
+	    	r=get_mem_set(myrpt, digitbuf);
+			if (r < 0){
+				rpt_telemetry(myrpt,MEMNOTFOUND,NULL);
+				return DC_COMPLETE;
+			}
+			else if (r > 0){
+				return DC_ERROR;
+			}
+			return DC_COMPLETE;	
+			
+		case 2:  /* set freq and offset */
+	   
+			
+	    		for(i = 0, j = 0, k = 0, l = 0 ; digitbuf[i] ; i++){ /* look for M+*K+*O or M+*H+* depending on mode */
+				if(digitbuf[i] == '*'){
+					j++;
+					continue;
+				}
+				if((digitbuf[i] < '0') || (digitbuf[i] > '9'))
+					goto invalid_freq;
+				else{
+					if(j == 0)
+						l++; /* # of digits before first * */
+					if(j == 1)
+						k++; /* # of digits after first * */
+				}
+			}
+		
+			i = strlen(digitbuf) - 1;
+			if(multimode){
+				if((j > 2) || (l > 3) || (k > 6))
+					goto invalid_freq; /* &^@#! */
+ 			}
+			else{
+				if((j > 2) || (l > 4) || (k > 3))
+					goto invalid_freq; /* &^@#! */
 			}
-			break;
 
-		case 118: /* Scan up fast */
-			res = sayfile(mychannel, "rpt/up");
-			if (!res)
-				res = sayfile(mychannel, "rpt/fast");
-			if (!res) {
-				myrpt->scantimer = REM_SCANTIME;
-				myrpt->hfscanmode = HF_SCAN_UP_FAST;
+			/* Wait for M+*K+* */
+
+			if(j < 2)
+				break; /* Not yet */
+
+			/* We have a frequency */
+
+			strncpy(tmp, digitbuf ,sizeof(tmp) - 1);
+			
+			s = tmp;
+			s1 = strsep(&s, "*"); /* Pick off MHz */
+			s2 = strsep(&s,"*"); /* Pick off KHz and Hz */
+			ls2 = strlen(s2);	
+			
+			switch(ls2){ /* Allow partial entry of khz and hz digits for laziness support */
+				case 1:
+					ht = 0;
+					k = 100 * atoi(s2);
+					break;
+				
+				case 2:
+					ht = 0;
+					k = 10 * atoi(s2);
+					break;
+					
+				case 3:
+					if(!multimode){
+						if((s2[2] != '0')&&(s2[2] != '5'))
+							goto invalid_freq;
+					}
+					ht = 0;
+					k = atoi(s2);
+						break;
+				case 4:
+					k = atoi(s2)/10;
+					ht = 10 * (atoi(s2+(ls2-1)));
+					break;
+
+				case 5:
+					k = atoi(s2)/100;
+					ht = (atoi(s2+(ls2-2)));
+					break;
+					
+				default:
+					goto invalid_freq;
 			}
-			break;
-		}
-		rmt_telem_finish(myrpt, mychannel);
-		return DC_COMPLETE;
 
+			/* Check frequency for validity and establish a default mode */
+			
+			snprintf(freq, sizeof(freq), "%s.%03d%02d",s1, k, ht);
 
-	case 119: /* Tune Request */
-		myrpt->tunerequest = 1;
-		return DC_COMPLETE;
+			if(debug)
+				ast_log(LOG_NOTICE, "New frequency: %s\n", freq);
+	
+			split_freq(mhz, decimals, freq);
+			m = atoi(mhz);
+			d = atoi(decimals);
 
-	case 5: /* Long Status */
-	case 140: /* Short Status */
-		res = rmt_telem_start(myrpt, mychannel, 1000);
+			if(check_freq(myrpt, m, d, &defmode)) /* Check to see if frequency entered is legit */
+			        goto invalid_freq;
 
-		res = sayfile(mychannel, "rpt/node");
-		if (!res)
-			res = saycharstr(mychannel, myrpt->name);
-		if (!res)
-			res = sayfile(mychannel, "rpt/frequency");
-		if (!res)
-			res = split_freq(&mhz, &decimals, myrpt->freq);
-		if (!res) {
-			if (mhz < 100)
-				res = saynum(mychannel, mhz);
-			else
-				res = saydigits(mychannel, mhz);
-		}
-		if (!res)
-			res = sayfile(mychannel, "letters/dot");
-		if (!res)
-			res = saydigits(mychannel, decimals);
 
-		if (res) {	
-			rmt_telem_finish(myrpt, mychannel);
-			return DC_ERROR;
-		}
-		if (myrpt->remmode == REM_MODE_FM) { /* Mode FM? */
-			switch (myrpt->offset) {
-			case REM_MINUS:
-				res = sayfile(mychannel, "rpt/minus");
-				break;
+ 			if((defmode == REM_MODE_FM) && (digitbuf[i] == '*')) /* If FM, user must enter and additional offset digit */
+				break; /* Not yet */
 
-			case REM_SIMPLEX:
-				res = sayfile(mychannel, "rpt/simplex");
-				break;
 
-			case REM_PLUS:
-				res = sayfile(mychannel, "rpt/plus");
-				break;
+			offset = REM_SIMPLEX; /* Assume simplex */
 
-			default:
-				return DC_ERROR;
+			if(defmode == REM_MODE_FM){
+				oc = *s; /* Pick off offset */
+			
+				if (oc){
+					switch(oc){
+						case '1':
+							offset = REM_MINUS;
+							break;
+						
+						case '2':
+							offset = REM_SIMPLEX;
+						break;
+						
+						case '3':
+							offset = REM_PLUS;
+							break;
+						
+						default:
+							goto invalid_freq;
+					} 
+				} 
+			}	
+			offsave = myrpt->offset;
+			modesave = myrpt->remmode;
+			strncpy(savestr, myrpt->freq, sizeof(savestr) - 1);
+			strncpy(myrpt->freq, freq, sizeof(myrpt->freq) - 1);
+			myrpt->offset = offset;
+			myrpt->remmode = defmode;
+
+			if (setrem(myrpt) == -1){
+				myrpt->offset = offsave;
+				myrpt->remmode = modesave;
+				strncpy(myrpt->freq, savestr, sizeof(myrpt->freq) - 1);
+				goto invalid_freq;
+			}
+
+			return DC_COMPLETE;
 
+invalid_freq:
+			rpt_telemetry(myrpt,INVFREQ,NULL);
+			return DC_ERROR; 
+		
+		case 3: /* set rx PL tone */
+	    		for(i = 0, j = 0, k = 0, l = 0 ; digitbuf[i] ; i++){ /* look for N+*N */
+				if(digitbuf[i] == '*'){
+					j++;
+					continue;
+				}
+				if((digitbuf[i] < '0') || (digitbuf[i] > '9'))
+					return DC_ERROR;
+				else{
+					if(j)
+						l++;
+					else
+						k++;
+				}
 			}
-		} else { /* Must be USB, LSB, or AM */
-			switch (myrpt->remmode) {
-			case REM_MODE_USB:
-				res = saycharstr(mychannel, "USB");
-				break;
-			case REM_MODE_LSB:
-				res = saycharstr(mychannel, "LSB");
-				break;
-			case REM_MODE_AM:
-				res = saycharstr(mychannel, "AM");
-				break;
-			default:
+			if((j > 1) || (k > 3) || (l > 1))
+				return DC_ERROR; /* &$@^! */
+			i = strlen(digitbuf) - 1;
+			if((j != 1) || (k < 2)|| (l != 1))
+				break; /* Not yet */
+			if(debug)
+				printf("PL digits entered %s\n", digitbuf);
+	    		
+			strncpy(tmp, digitbuf, sizeof(tmp) - 1);
+			/* see if we have at least 1 */
+			s = strchr(tmp,'*');
+			if(s)
+				*s = '.';
+			strncpy(savestr, myrpt->rxpl, sizeof(savestr) - 1);
+			strncpy(myrpt->rxpl, tmp, sizeof(myrpt->rxpl) - 1);
+			if(!strcmp(myrpt->remoterig, remote_rig_rbi))
+			{
+				strncpy(myrpt->txpl, tmp, sizeof(myrpt->txpl) - 1);
+			}
+			if (setrem(myrpt) == -1){
+				strncpy(myrpt->rxpl, savestr, sizeof(myrpt->rxpl) - 1);
 				return DC_ERROR;
 			}
-		}
+			return DC_COMPLETE;
+		
+		case 4: /* set tx PL tone */
+			/* cant set tx tone on RBI (rx tone does both) */
+			if(!strcmp(myrpt->remoterig, remote_rig_rbi))
+				return DC_ERROR;
+			/*  eventually for the ic706 instead of just throwing the exception
+				we can check if we are in encode only mode and allow the tx
+				ctcss code to be changed. but at least the warning message is
+				issued for now.
+			*/
+			if(!strcmp(myrpt->remoterig, remote_rig_ic706))
+			{
+				if(debug)
+					ast_log(LOG_WARNING,"Setting IC706 Tx CTCSS Code Not Supported. Set Rx Code for both.\n");
+				return DC_ERROR;
+			}
+	    	for(i = 0, j = 0, k = 0, l = 0 ; digitbuf[i] ; i++){ /* look for N+*N */
+				if(digitbuf[i] == '*'){
+					j++;
+					continue;
+				}
+				if((digitbuf[i] < '0') || (digitbuf[i] > '9'))
+					return DC_ERROR;
+				else{
+					if(j)
+						l++;
+					else
+						k++;
+				}
+			}
+			if((j > 1) || (k > 3) || (l > 1))
+				return DC_ERROR; /* &$@^! */
+			i = strlen(digitbuf) - 1;
+			if((j != 1) || (k < 2)|| (l != 1))
+				break; /* Not yet */
+			if(debug)
+				printf("PL digits entered %s\n", digitbuf);
+	    		
+			strncpy(tmp, digitbuf, sizeof(tmp) - 1);
+			/* see if we have at least 1 */
+			s = strchr(tmp,'*');
+			if(s)
+				*s = '.';
+			strncpy(savestr, myrpt->txpl, sizeof(savestr) - 1);
+			strncpy(myrpt->txpl, tmp, sizeof(myrpt->txpl) - 1);
+			
+			if (setrem(myrpt) == -1){
+				strncpy(myrpt->txpl, savestr, sizeof(myrpt->txpl) - 1);
+				return DC_ERROR;
+			}
+			return DC_COMPLETE;
+		
 
-		if (res == -1) {
-			rmt_telem_finish(myrpt, mychannel);
-			return DC_ERROR;
-		}
+		case 6: /* MODE (FM,USB,LSB,AM) */
+			if(strlen(digitbuf) < 1)
+				break;
+
+			if(!multimode)
+				return DC_ERROR; /* Multimode radios only */
+
+			switch(*digitbuf){
+				case '1':
+					split_freq(mhz, decimals, myrpt->freq); 
+					m=atoi(mhz);
+					if(m < 29) /* No FM allowed below 29MHz! */
+						return DC_ERROR;
+					myrpt->remmode = REM_MODE_FM;
+					
+					rpt_telemetry(myrpt,REMMODE,NULL);
+					break;
+
+				case '2':
+					myrpt->remmode = REM_MODE_USB;
+					rpt_telemetry(myrpt,REMMODE,NULL);
+					break;	
+
+				case '3':
+					myrpt->remmode = REM_MODE_LSB;
+					rpt_telemetry(myrpt,REMMODE,NULL);
+					break;
+				
+				case '4':
+					myrpt->remmode = REM_MODE_AM;
+					rpt_telemetry(myrpt,REMMODE,NULL);
+					break;
+		
+				default:
+					return DC_ERROR;
+			}
 
-		if (myatoi(param) == 140) { /* Short status? */
-			if (!res)
-				res = rmt_telem_finish(myrpt, mychannel);
-			if (res)
+			if(setrem(myrpt))
+				return DC_ERROR;
+			return DC_COMPLETEQUIET;
+		case 99:
+			/* cant log in when logged in */
+			if (myrpt->loginlevel[0]) 
+				return DC_ERROR;
+			*myrpt->loginuser = 0;
+			myrpt->loginlevel[0] = 0;
+			cp = ast_strdup(param);
+			cp1 = strchr(cp,',');
+			ast_mutex_lock(&myrpt->lock);
+			if (cp1) 
+			{
+				*cp1 = 0;
+				cp2 = strchr(cp1 + 1,',');
+				if (cp2) 
+				{
+					*cp2 = 0;
+					strncpy(myrpt->loginlevel,cp2 + 1,
+						sizeof(myrpt->loginlevel) - 1);
+				}
+				strncpy(myrpt->loginuser,cp1 + 1,sizeof(myrpt->loginuser));
+				ast_mutex_unlock(&myrpt->lock);
+				if (myrpt->p.archivedir)
+				{
+					char str[100];
+
+					sprintf(str,"LOGIN,%s,%s",
+					    myrpt->loginuser,myrpt->loginlevel);
+					donodelog(myrpt,str);
+				}
+				if (debug) 
+					printf("loginuser %s level %s\n",myrpt->loginuser,myrpt->loginlevel);
+				rpt_telemetry(myrpt,REMLOGIN,NULL);
+			}
+			ast_free(cp);
+			return DC_COMPLETEQUIET;
+		case 100: /* RX PL Off */
+			myrpt->rxplon = 0;
+			setrem(myrpt);
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 101: /* RX PL On */
+			myrpt->rxplon = 1;
+			setrem(myrpt);
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 102: /* TX PL Off */
+			myrpt->txplon = 0;
+			setrem(myrpt);
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 103: /* TX PL On */
+			myrpt->txplon = 1;
+			setrem(myrpt);
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 104: /* Low Power */
+			if(!strcmp(myrpt->remoterig, remote_rig_ic706))
+				return DC_ERROR;
+			myrpt->powerlevel = REM_LOWPWR;
+			setrem(myrpt);
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 105: /* Medium Power */
+			if(!strcmp(myrpt->remoterig, remote_rig_ic706))
+				return DC_ERROR;
+			if (ISRIG_RTX(myrpt->remoterig)) return DC_ERROR;
+			myrpt->powerlevel = REM_MEDPWR;
+			setrem(myrpt);
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 106: /* Hi Power */
+			if(!strcmp(myrpt->remoterig, remote_rig_ic706))
 				return DC_ERROR;
+			myrpt->powerlevel = REM_HIPWR;
+			setrem(myrpt);
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 107: /* Bump down 20Hz */
+			multimode_bump_freq(myrpt, -20);
 			return DC_COMPLETE;
-		}
-
-		switch (myrpt->powerlevel) {
-		case REM_LOWPWR:
-			res = sayfile(mychannel, "rpt/lopwr") ;
-			break;
-		case REM_MEDPWR:
-			res = sayfile(mychannel, "rpt/medpwr");
-			break;
-		case REM_HIPWR:
-			res = sayfile(mychannel, "rpt/hipwr"); 
+		case 108: /* Bump down 100Hz */
+			multimode_bump_freq(myrpt, -100);
+			return DC_COMPLETE;
+		case 109: /* Bump down 500Hz */
+			multimode_bump_freq(myrpt, -500);
+			return DC_COMPLETE;
+		case 110: /* Bump up 20Hz */
+			multimode_bump_freq(myrpt, 20);
+			return DC_COMPLETE;
+		case 111: /* Bump up 100Hz */
+			multimode_bump_freq(myrpt, 100);
+			return DC_COMPLETE;
+		case 112: /* Bump up 500Hz */
+			multimode_bump_freq(myrpt, 500);
+			return DC_COMPLETE;
+		case 113: /* Scan down slow */
+			myrpt->scantimer = REM_SCANTIME;
+			myrpt->hfscanmode = HF_SCAN_DOWN_SLOW;
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 114: /* Scan down quick */
+			myrpt->scantimer = REM_SCANTIME;
+			myrpt->hfscanmode = HF_SCAN_DOWN_QUICK;
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 115: /* Scan down fast */
+			myrpt->scantimer = REM_SCANTIME;
+			myrpt->hfscanmode = HF_SCAN_DOWN_FAST;
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 116: /* Scan up slow */
+			myrpt->scantimer = REM_SCANTIME;
+			myrpt->hfscanmode = HF_SCAN_UP_SLOW;
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 117: /* Scan up quick */
+			myrpt->scantimer = REM_SCANTIME;
+			myrpt->hfscanmode = HF_SCAN_UP_QUICK;
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 118: /* Scan up fast */
+			myrpt->scantimer = REM_SCANTIME;
+			myrpt->hfscanmode = HF_SCAN_UP_FAST;
+			rpt_telemetry(myrpt,REMXXX,(void *)p);
+			return DC_COMPLETEQUIET;
+		case 119: /* Tune Request */
+			if(debug > 3)
+				ast_log(LOG_NOTICE,"TUNE REQUEST\n");
+			/* if not currently going, and valid to do */
+			if((!myrpt->tunerequest) && 
+			    ((!strcmp(myrpt->remoterig, remote_rig_ft897) || 
+				!strcmp(myrpt->remoterig, remote_rig_ic706)) )) { 
+				myrpt->remotetx = 0;
+				ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_UNKEY);
+				myrpt->tunerequest = 1;
+				rpt_telemetry(myrpt,TUNE,NULL);
+				return DC_COMPLETEQUIET;
+			}
+			return DC_ERROR;			
+		case 5: /* Long Status */
+			rpt_telemetry(myrpt,REMLONGSTATUS,NULL);
+			return DC_COMPLETEQUIET;
+		case 140: /* Short Status */
+			rpt_telemetry(myrpt,REMSHORTSTATUS,NULL);
+			return DC_COMPLETEQUIET;
+		case 200:
+		case 201:
+		case 202:
+		case 203:
+		case 204:
+		case 205:
+		case 206:
+		case 207:
+		case 208:
+		case 209:
+		case 210:
+		case 211:
+		case 212:
+		case 213:
+		case 214:
+		case 215:
+			do_dtmf_local(myrpt,remdtmfstr[p - 200]);
+			return DC_COMPLETEQUIET;
+		default:
 			break;
-		}
-		if (res || (sayfile(mychannel, "rpt/rxpl") == -1) ||
-			(sayfile(mychannel, "rpt/frequency") == -1) ||
-			(saycharstr(mychannel, myrpt->rxpl) == -1) ||
-			(sayfile(mychannel, "rpt/txpl") == -1) ||
-			(sayfile(mychannel, "rpt/frequency") == -1) ||
-			(saycharstr(mychannel, myrpt->txpl) == -1) ||
-			(sayfile(mychannel, "rpt/txpl") == -1) ||
-			(sayfile(mychannel, ((myrpt->txplon) ? "rpt/on" : "rpt/off")) == -1) ||
-			(sayfile(mychannel, "rpt/rxpl") == -1) ||
-			(sayfile(mychannel, ((myrpt->rxplon) ? "rpt/on" : "rpt/off")) == -1))
-			{
-			rmt_telem_finish(myrpt, mychannel);
-			return DC_ERROR;
-		}
-		if (!res)
-			res = rmt_telem_finish(myrpt, mychannel);
-		if (res)
-			return DC_ERROR;
-
-		return DC_COMPLETE;
-	default:
-		return DC_ERROR;
 	}
-
 	return DC_INDETERMINATE;
 }
 
-static int handle_remote_dtmf_digit(struct rpt *myrpt, char c, char *keyed, int phonemode)
+
+static int handle_remote_dtmf_digit(struct rpt *myrpt,char c, char *keyed, int phonemode)
 {
-	time_t now;
-	int	ret, res = 0, src;
+time_t	now;
+int	ret,res = 0,src;
 
+	if(debug > 6)
+		ast_log(LOG_NOTICE,"c=%c  phonemode=%i  dtmfidx=%i\n",c,phonemode,myrpt->dtmfidx);
+
+	time(&myrpt->last_activity_time);
 	/* Stop scan mode if in scan mode */
-	if (myrpt->hfscanmode) {
-		stop_scan(myrpt, 0);
+	if(myrpt->hfscanmode){
+		stop_scan(myrpt);
 		return 0;
 	}
 
 	time(&now);
 	/* if timed-out */
-	if ((myrpt->dtmf_time_rem + DTMF_TIMEOUT) < now) {
+	if ((myrpt->dtmf_time_rem + DTMF_TIMEOUT) < now)
+	{
 		myrpt->dtmfidx = -1;
 		myrpt->dtmfbuf[0] = 0;
 		myrpt->dtmf_time_rem = 0;
 	}
 	/* if decode not active */
-	if (myrpt->dtmfidx == -1) {
+	if (myrpt->dtmfidx == -1)
+	{
 		/* if not lead-in digit, dont worry */
 		if (c != myrpt->p.funcchar)
+		{
+			if (!myrpt->p.propagate_dtmf)
+			{
+				rpt_mutex_lock(&myrpt->lock);
+				do_dtmf_local(myrpt,c);
+				rpt_mutex_unlock(&myrpt->lock);
+			}
 			return 0;
+		}
 		myrpt->dtmfidx = 0;
 		myrpt->dtmfbuf[0] = 0;
 		myrpt->dtmf_time_rem = now;
 		return 0;
 	}
 	/* if too many in buffer, start over */
-	if (myrpt->dtmfidx >= MAXDTMF) {
+	if (myrpt->dtmfidx >= MAXDTMF)
+	{
 		myrpt->dtmfidx = 0;
 		myrpt->dtmfbuf[0] = 0;
 		myrpt->dtmf_time_rem = now;
 	}
-	if (c == myrpt->p.funcchar) {
+	if (c == myrpt->p.funcchar)
+	{
 		/* if star at beginning, or 2 together, erase buffer */
-		if ((myrpt->dtmfidx < 1) || (myrpt->dtmfbuf[myrpt->dtmfidx - 1] == myrpt->p.funcchar)) {
+		if ((myrpt->dtmfidx < 1) || 
+			(myrpt->dtmfbuf[myrpt->dtmfidx - 1] == myrpt->p.funcchar))
+		{
 			myrpt->dtmfidx = 0;
 			myrpt->dtmfbuf[0] = 0;
 			myrpt->dtmf_time_rem = now;
@@ -5330,41 +10182,48 @@ static int handle_remote_dtmf_digit(struct rpt *myrpt, char c, char *keyed, int
 	
 	
 	src = SOURCE_RMT;
-	if (phonemode > 1)
-		src = SOURCE_DPHONE;
-	else if (phonemode)
-		src = SOURCE_PHONE;
+	if (phonemode == 2) src = SOURCE_DPHONE;
+	else if (phonemode) src = SOURCE_PHONE;
+	else if (phonemode == 4) src = SOURCE_ALT;
 	ret = collect_function_digits(myrpt, myrpt->dtmfbuf, src, NULL);
 	
-	switch(ret) {
-	case DC_INDETERMINATE:
-		res = 0;
-		break;
-	case DC_DOKEY:
-		if (keyed)
-			*keyed = 1;
-		res = 0;
-		break;
-	case DC_REQ_FLUSH:
-		myrpt->dtmfidx = 0;
-		myrpt->dtmfbuf[0] = 0;
-		res = 0;
-		break;
-	case DC_COMPLETE:
-		myrpt->totalexecdcommands++;
-		myrpt->dailyexecdcommands++;
-		ast_copy_string(myrpt->lastdtmfcommand, myrpt->dtmfbuf, MAXDTMF);
-		myrpt->dtmfbuf[0] = 0;
-		myrpt->dtmfidx = -1;
-		myrpt->dtmf_time_rem = 0;
-		res = 1;
-		break;
-	case DC_ERROR:
-	default:
-		myrpt->dtmfbuf[0] = 0;
-		myrpt->dtmfidx = -1;
-		myrpt->dtmf_time_rem = 0;
-		res = 0;
+	switch(ret){
+	
+		case DC_INDETERMINATE:
+			res = 0;
+			break;
+				
+		case DC_DOKEY:
+			if (keyed) *keyed = 1;
+			res = 0;
+			break;
+				
+		case DC_REQ_FLUSH:
+			myrpt->dtmfidx = 0;
+			myrpt->dtmfbuf[0] = 0;
+			res = 0;
+			break;
+				
+				
+		case DC_COMPLETE:
+			res = 1;
+		case DC_COMPLETEQUIET:
+			myrpt->totalexecdcommands++;
+			myrpt->dailyexecdcommands++;
+			strncpy(myrpt->lastdtmfcommand, myrpt->dtmfbuf, MAXDTMF-1);
+			myrpt->lastdtmfcommand[MAXDTMF-1] = '\0';
+			myrpt->dtmfbuf[0] = 0;
+			myrpt->dtmfidx = -1;
+			myrpt->dtmf_time_rem = 0;
+			break;
+				
+		case DC_ERROR:
+		default:
+			myrpt->dtmfbuf[0] = 0;
+			myrpt->dtmfidx = -1;
+			myrpt->dtmf_time_rem = 0;
+			res = 0;
+			break;
 	}
 
 	return res;
@@ -5372,74 +10231,110 @@ static int handle_remote_dtmf_digit(struct rpt *myrpt, char c, char *keyed, int
 
 static int handle_remote_data(struct rpt *myrpt, char *str)
 {
-	char cmd[300], dest[300], src[300], c;
-	int	seq, res;
-
-	if (!strcmp(str, discstr))
+char	tmp[300],cmd[300],dest[300],src[300],c;
+int	seq,res;
+
+ 	/* put string in our buffer */
+	strncpy(tmp,str,sizeof(tmp) - 1);
+	if (!strcmp(tmp,discstr)) return 0;
+        if (!strcmp(tmp,newkeystr))
+        {
+		myrpt->newkey = 1;
+                return 0;
+        }
+
+#ifndef	DO_NOT_NOTIFY_MDC1200_ON_REMOTE_BASES
+	if (tmp[0] == 'I')
+	{
+		if (sscanf(tmp,"%s %s %x",cmd,src,&seq) != 3)
+		{
+			ast_log(LOG_WARNING, "Unable to parse ident string %s\n",str);
+			return 0;
+		}
+		mdc1200_notify(myrpt,src,seq);
 		return 0;
-	if (sscanf(str, "%s %s %s %d %c", cmd, dest, src, &seq, &c) != 5) {
-		ast_log(LOG_WARNING, "Unable to parse link string %s\n", str);
+	}
+#endif
+	if (sscanf(tmp,"%s %s %s %d %c",cmd,dest,src,&seq,&c) != 5)
+	{
+		ast_log(LOG_WARNING, "Unable to parse link string %s\n",str);
 		return 0;
 	}
-	if (strcmp(cmd, "D")) {
-		ast_log(LOG_WARNING, "Unable to parse link string %s\n", str);
+	if (strcmp(cmd,"D"))
+	{
+		ast_log(LOG_WARNING, "Unable to parse link string %s\n",str);
 		return 0;
 	}
 	/* if not for me, ignore */
-	if (strcmp(dest, myrpt->name))
-		return 0;
-	res = handle_remote_dtmf_digit(myrpt, c, NULL, 0);
+	if (strcmp(dest,myrpt->name)) return 0;
+	if (myrpt->p.archivedir)
+	{
+		char str[100];
+
+		sprintf(str,"DTMF,%c",c);
+		donodelog(myrpt,str);
+	}
+	c = func_xlat(myrpt,c,&myrpt->p.outxlat);
+	if (!c) return(0);
+	res = handle_remote_dtmf_digit(myrpt,c, NULL, 0);
 	if (res != 1)
 		return res;
-	myrpt->remotetx = 0;
-	ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_UNKEY);
-	if (!myrpt->remoterx) {
-		ast_indicate(myrpt->remchannel, AST_CONTROL_RADIO_KEY);
-	}
-	if (ast_safe_sleep(myrpt->remchannel, 1000) == -1)
-		return -1;
-	res = telem_lookup(myrpt, myrpt->remchannel, myrpt->name, "functcomplete");
-	rmt_telem_finish(myrpt, myrpt->remchannel);
-	return res;
+	rpt_telemetry(myrpt,COMPLETE,NULL);
+	return 0;
 }
 
 static int handle_remote_phone_dtmf(struct rpt *myrpt, char c, char *keyed, int phonemode)
 {
-	int	res;
+int	res;
 
-	if (keyed && *keyed && (c == myrpt->p.endchar)) {
-		*keyed = 0;
-		return DC_INDETERMINATE;
+
+	if(phonemode == 3) /* simplex phonemode, funcchar key/unkey toggle */
+	{
+		if (keyed && *keyed && ((c == myrpt->p.funcchar) || (c == myrpt->p.endchar)))
+		{
+			*keyed = 0; /* UNKEY */
+			return 0;
+		}
+		else if (keyed && !*keyed && (c = myrpt->p.funcchar))
+		{
+			*keyed = 1; /* KEY */
+			return 0;
+		}
+	}
+	else /* endchar unkey */
+	{
+
+		if (keyed && *keyed && (c == myrpt->p.endchar))
+		{
+			*keyed = 0;
+			return DC_INDETERMINATE;
+		}
 	}
+	if (myrpt->p.archivedir)
+	{
+		char str[100];
 
-	res = handle_remote_dtmf_digit(myrpt, c, keyed, phonemode);
+		sprintf(str,"DTMF(P),%c",c);
+		donodelog(myrpt,str);
+	}
+	res = handle_remote_dtmf_digit(myrpt,c,keyed, phonemode);
 	if (res != 1)
 		return res;
-	myrpt->remotetx = 0;
-	ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_UNKEY);
-	if (!myrpt->remoterx) {
-		ast_indicate(myrpt->remchannel, AST_CONTROL_RADIO_KEY);
-	}
-	if (ast_safe_sleep(myrpt->remchannel, 1000) == -1)
-		return -1;
-	res = telem_lookup(myrpt, myrpt->remchannel, myrpt->name, "functcomplete");
-	rmt_telem_finish(myrpt, myrpt->remchannel);
-	return res;
+	rpt_telemetry(myrpt,COMPLETE,NULL);
+	return 0;
 }
 
 static int attempt_reconnect(struct rpt *myrpt, struct rpt_link *l)
 {
-	const char *val;
-	char *s, *tele;
-	char deststr[300] = "";
-	AST_DECLARE_APP_ARGS(args,
-		AST_APP_ARG(channel);
-		AST_APP_ARG(extra);
-	);
-
-	val = ast_variable_retrieve(myrpt->cfg, myrpt->p.nodes, l->name);
-	if (!val) {
-		ast_log(LOG_ERROR, "attempt_reconnect: cannot find node %s\n", l->name);
+	char *val, *s, *s1, *s2, *tele;
+	char tmp[300], deststr[300] = "";
+	char sx[320],*sy;
+
+
+	val = node_lookup(myrpt,l->name);
+	if (!val)
+	{
+		fprintf(stderr,"attempt_reconnect: cannot find node %s\n",l->name);
 		return -1;
 	}
 
@@ -5447,165 +10342,238 @@ static int attempt_reconnect(struct rpt *myrpt, struct rpt_link *l)
 	/* remove from queue */
 	remque((struct qelem *) l);
 	rpt_mutex_unlock(&myrpt->lock);
-	s = ast_strdupa(val);
-	AST_STANDARD_APP_ARGS(args, s);
-
-	/* XXX This section doesn't make any sense.  Why not just use args.channel? XXX */
-	snprintf(deststr, sizeof(deststr), "IAX2/%s", args.channel);
+	strncpy(tmp,val,sizeof(tmp) - 1);
+	s = tmp;
+	s1 = strsep(&s,",");
+	if (!strchr(s1,':') && strchr(s1,'/') && strncasecmp(s1, "local/", 6))
+	{
+		sy = strchr(s1,'/');		
+		*sy = 0;
+		sprintf(sx,"%s:4569/%s",s1,sy + 1);
+		s1 = sx;
+	}
+	s2 = strsep(&s,",");
+	snprintf(deststr, sizeof(deststr), "IAX2/%s", s1);
 	tele = strchr(deststr, '/');
 	if (!tele) {
-		ast_log(LOG_ERROR, "attempt_reconnect:Dial number (%s) must be in format tech/number\n", deststr);
+		fprintf(stderr,"attempt_reconnect:Dial number (%s) must be in format tech/number\n",deststr);
 		return -1;
 	}
 	*tele++ = 0;
 	l->elaptime = 0;
 	l->connecttime = 0;
-	l->chan = ast_request(deststr, AST_FORMAT_SLINEAR, tele, NULL);
-	if (l->chan) {
+	l->thisconnected = 0;
+	l->newkey = 0;
+	l->chan = ast_request(deststr, AST_FORMAT_SLINEAR, tele,NULL);
+	if (l->chan){
 		ast_set_read_format(l->chan, AST_FORMAT_SLINEAR);
 		ast_set_write_format(l->chan, AST_FORMAT_SLINEAR);
-		ast_channel_setwhentohangup_tv(l->chan, cancel_atimeout);
+#ifndef	NEW_ASTERISK
+		l->chan->whentohangup = 0;
+#endif
 		l->chan->appl = "Apprpt";
 		l->chan->data = "(Remote Rx)";
-		ast_verb(3, "rpt (attempt_reconnect) initiating call to %s/%s on %s\n",
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "rpt (attempt_reconnect) initiating call to %s/%s on %s\n",
 				deststr, tele, l->chan->name);
-		if (l->chan->cid.cid_num)
+		if(l->chan->cid.cid_num)
 			ast_free(l->chan->cid.cid_num);
 		l->chan->cid.cid_num = ast_strdup(myrpt->name);
-		ast_call(l->chan, tele, 999); 
+                ast_call(l->chan,tele,999); 
 
-	} else {
-		ast_verb(3, "Unable to place call to %s/%s on %s\n",
-				deststr, tele, l->chan->name);
+	}
+	else 
+	{
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "Unable to place call to %s/%s on %s\n",
+				deststr,tele,l->chan->name);
 		return -1;
 	}
 	rpt_mutex_lock(&myrpt->lock);
 	/* put back in queue */
-	insque((struct qelem *)l, (struct qelem *)myrpt->links.next);
+	insque((struct qelem *)l,(struct qelem *)myrpt->links.next);
 	rpt_mutex_unlock(&myrpt->lock);
-	ast_log(LOG_NOTICE, "Reconnect Attempt to %s in process\n", l->name);
+	ast_log(LOG_WARNING,"Reconnect Attempt to %s in process\n",l->name);
+	if (!l->phonemode) send_newkey(l->chan);
 	return 0;
 }
 
 /* 0 return=continue, 1 return = break, -1 return = error */
-static void local_dtmf_helper(struct rpt *myrpt, char c)
+static void local_dtmf_helper(struct rpt *myrpt,char c_in)
 {
-	int	res;
-	char cmd[MAXDTMF+1] = "";
+int	res;
+pthread_attr_t	attr;
+char	cmd[MAXDTMF+1] = "",c;
+
+
+	c = c_in & 0x7f;
+	if (myrpt->p.archivedir)
+	{
+		char str[100];
 
-	if (c == myrpt->p.endchar) {
+		sprintf(str,"DTMF,MAIN,%c",c);
+		donodelog(myrpt,str);
+	}
+	if (c == myrpt->p.endchar)
+	{
 	/* if in simple mode, kill autopatch */
-		if (myrpt->p.simple && myrpt->callmode) {
+		if (myrpt->p.simple && myrpt->callmode)
+		{   
+			if(debug)
+				ast_log(LOG_WARNING, "simple mode autopatch kill\n");
 			rpt_mutex_lock(&myrpt->lock);
 			myrpt->callmode = 0;
+			myrpt->macropatch=0;
+			channel_revert(myrpt);
 			rpt_mutex_unlock(&myrpt->lock);
-			rpt_telemetry(myrpt, TERM, NULL);
+			rpt_telemetry(myrpt,TERM,NULL);
 			return;
 		}
 		rpt_mutex_lock(&myrpt->lock);
 		myrpt->stopgen = 1;
-		if (myrpt->cmdnode[0]) {
+		if (myrpt->cmdnode[0])
+		{
 			myrpt->cmdnode[0] = 0;
 			myrpt->dtmfidx = -1;
 			myrpt->dtmfbuf[0] = 0;
 			rpt_mutex_unlock(&myrpt->lock);
-			rpt_telemetry(myrpt, COMPLETE, NULL);
-		} else
+			rpt_telemetry(myrpt,COMPLETE,NULL);
+			return;
+		} 
+		else if(!myrpt->inpadtest)
+                {
+                        rpt_mutex_unlock(&myrpt->lock);
+                        if (myrpt->p.propagate_phonedtmf)
+                               do_dtmf_phone(myrpt,NULL,c);
+			return;
+                }
+		else
 			rpt_mutex_unlock(&myrpt->lock);
-		return;
 	}
 	rpt_mutex_lock(&myrpt->lock);
-	if (myrpt->cmdnode[0]) {
+	if (myrpt->cmdnode[0])
+	{
 		rpt_mutex_unlock(&myrpt->lock);
-		send_link_dtmf(myrpt, c);
+		send_link_dtmf(myrpt,c);
 		return;
 	}
-	if (!myrpt->p.simple) {
-		if (c == myrpt->p.funcchar) {
+	if (!myrpt->p.simple)
+	{
+		if ((!myrpt->inpadtest)&&(c == myrpt->p.funcchar))
+		{
 			myrpt->dtmfidx = 0;
 			myrpt->dtmfbuf[myrpt->dtmfidx] = 0;
 			rpt_mutex_unlock(&myrpt->lock);
 			time(&myrpt->dtmf_time);
 			return;
-		} else if ((c != myrpt->p.endchar) && (myrpt->dtmfidx >= 0)) {
+		} 
+		else if (((myrpt->inpadtest)||(c != myrpt->p.endchar)) && (myrpt->dtmfidx >= 0))
+		{
 			time(&myrpt->dtmf_time);
+			
+			if (myrpt->dtmfidx < MAXDTMF)
+			{
+				int src;
 
-			if (myrpt->dtmfidx < MAXDTMF) {
 				myrpt->dtmfbuf[myrpt->dtmfidx++] = c;
 				myrpt->dtmfbuf[myrpt->dtmfidx] = 0;
-
-				ast_copy_string(cmd, myrpt->dtmfbuf, sizeof(cmd));
-
+				
+				strncpy(cmd, myrpt->dtmfbuf, sizeof(cmd) - 1);
+				
 				rpt_mutex_unlock(&myrpt->lock);
-				res = collect_function_digits(myrpt, cmd, SOURCE_RPT, NULL);
+				src = SOURCE_RPT;
+				if (c_in & 0x80) src = SOURCE_ALT;
+				res = collect_function_digits(myrpt, cmd, src, NULL);
 				rpt_mutex_lock(&myrpt->lock);
-				switch(res) {
-				case DC_INDETERMINATE:
+				switch(res){
+				    case DC_INDETERMINATE:
 					break;
-				case DC_REQ_FLUSH:
+				    case DC_REQ_FLUSH:
 					myrpt->dtmfidx = 0;
 					myrpt->dtmfbuf[0] = 0;
 					break;
-				case DC_COMPLETE:
+				    case DC_COMPLETE:
+				    case DC_COMPLETEQUIET:
 					myrpt->totalexecdcommands++;
 					myrpt->dailyexecdcommands++;
-					ast_copy_string(myrpt->lastdtmfcommand, cmd, MAXDTMF);
+					strncpy(myrpt->lastdtmfcommand, cmd, MAXDTMF-1);
+					myrpt->lastdtmfcommand[MAXDTMF-1] = '\0';
 					myrpt->dtmfbuf[0] = 0;
 					myrpt->dtmfidx = -1;
 					myrpt->dtmf_time = 0;
 					break;
 
-				case DC_ERROR:
-				default:
+				    case DC_ERROR:
+				    default:
 					myrpt->dtmfbuf[0] = 0;
 					myrpt->dtmfidx = -1;
 					myrpt->dtmf_time = 0;
 					break;
 				}
-				if (res != DC_INDETERMINATE) {
+				if(res != DC_INDETERMINATE) {
 					rpt_mutex_unlock(&myrpt->lock);
 					return;
 				}
 			} 
 		}
-	} else /* if simple */ {
-		if ((!myrpt->callmode) && (c == myrpt->p.funcchar)) {
+	}
+	else /* if simple */
+	{
+		if ((!myrpt->callmode) && (c == myrpt->p.funcchar))
+		{
 			myrpt->callmode = 1;
 			myrpt->patchnoct = 0;
 			myrpt->patchquiet = 0;
 			myrpt->patchfarenddisconnect = 0;
 			myrpt->patchdialtime = 0;
-			ast_copy_string(myrpt->patchcontext, myrpt->p.ourcontext, sizeof(myrpt->patchcontext));
+			strncpy(myrpt->patchcontext, myrpt->p.ourcontext, MAXPATCHCONTEXT);
 			myrpt->cidx = 0;
 			myrpt->exten[myrpt->cidx] = 0;
 			rpt_mutex_unlock(&myrpt->lock);
-			ast_pthread_create_detached(&myrpt->rpt_call_thread, NULL, rpt_call, (void *)myrpt);
+		        pthread_attr_init(&attr);
+		        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+			ast_pthread_create(&myrpt->rpt_call_thread,&attr,rpt_call,(void *)myrpt);
 			return;
 		}
 	}
-	if (myrpt->callmode == 1) {
+	if (myrpt->callmode == 1)
+	{
 		myrpt->exten[myrpt->cidx++] = c;
 		myrpt->exten[myrpt->cidx] = 0;
 		/* if this exists */
-		if (ast_exists_extension(myrpt->pchannel, myrpt->patchcontext, myrpt->exten, 1, NULL)) {
-			myrpt->callmode = 2;
-			rpt_mutex_unlock(&myrpt->lock);
-			if (!myrpt->patchquiet)
-				rpt_telemetry(myrpt, PROC, NULL); 
-			return;
+		if (ast_exists_extension(myrpt->pchannel,myrpt->patchcontext,myrpt->exten,1,NULL))
+		{
+			/* if this really it, end now */
+			if (!ast_matchmore_extension(myrpt->pchannel,myrpt->patchcontext,
+				myrpt->exten,1,NULL)) 
+			{
+				myrpt->callmode = 2;
+				rpt_mutex_unlock(&myrpt->lock);
+				if(!myrpt->patchquiet)
+					rpt_telemetry(myrpt,PROC,NULL); 
+				return;
+			}
+			else /* othewise, reset timer */
+			{
+				myrpt->calldigittimer = 1;
+			}
 		}
 		/* if can continue, do so */
-		if (!ast_canmatch_extension(myrpt->pchannel, myrpt->patchcontext, myrpt->exten, 1, NULL)) {
+		if (!ast_canmatch_extension(myrpt->pchannel,myrpt->patchcontext,myrpt->exten,1,NULL))
+		{
 			/* call has failed, inform user */
 			myrpt->callmode = 4;
 		}
 		rpt_mutex_unlock(&myrpt->lock);
 		return;
 	}
-	if ((myrpt->callmode == 2) || (myrpt->callmode == 3)) {
+	if ((myrpt->callmode == 2) || (myrpt->callmode == 3))
+	{
 		myrpt->mydtmf = c;
 	}
 	rpt_mutex_unlock(&myrpt->lock);
+	if ((myrpt->dtmfidx < 0) && myrpt->p.propagate_phonedtmf)
+		do_dtmf_phone(myrpt,NULL,c);
 	return;
 }
 
@@ -5614,163 +10582,361 @@ static void local_dtmf_helper(struct rpt *myrpt, char c)
 
 static void queue_id(struct rpt *myrpt)
 {
-	myrpt->mustid = myrpt->tailid = 0;
-	myrpt->idtimer = myrpt->p.idtime; /* Reset our ID timer */
-	rpt_mutex_unlock(&myrpt->lock);
-	rpt_telemetry(myrpt, ID, NULL);
-	rpt_mutex_lock(&myrpt->lock);
+	if(myrpt->p.idtime){ /* ID time must be non-zero */
+		myrpt->mustid = myrpt->tailid = 0;
+		myrpt->idtimer = myrpt->p.idtime; /* Reset our ID timer */
+		rpt_mutex_unlock(&myrpt->lock);
+		rpt_telemetry(myrpt,ID,NULL);
+		rpt_mutex_lock(&myrpt->lock);
+	}
 }
 
 /* Scheduler */
+/* must be called locked */
 
 static void do_scheduler(struct rpt *myrpt)
 {
-	int res;
+	int i,res;
+
+#ifdef	NEW_ASTERISK
 	struct ast_tm tmnow;
+#else
+	struct tm tmnow;
+#endif
+	struct ast_variable *skedlist;
+	char *strs[5],*vp,*val,value[100];
 
 	memcpy(&myrpt->lasttv, &myrpt->curtv, sizeof(struct timeval));
 	
-	if ( (res = gettimeofday(&myrpt->curtv, NULL)) < 0)
+	if( (res = gettimeofday(&myrpt->curtv, NULL)) < 0)
 		ast_log(LOG_NOTICE, "Scheduler gettime of day returned: %s\n", strerror(res));
 
 	/* Try to get close to a 1 second resolution */
 	
-	if (myrpt->lasttv.tv_sec == myrpt->curtv.tv_sec)
+	if(myrpt->lasttv.tv_sec == myrpt->curtv.tv_sec)
 		return;
 
-	ast_localtime(&myrpt->curtv, &tmnow, NULL);
+	rpt_localtime(&myrpt->curtv.tv_sec, &tmnow);
 
 	/* If midnight, then reset all daily statistics */
 	
-	if ((tmnow.tm_hour == 0) && (tmnow.tm_min == 0) && (tmnow.tm_sec == 0)) {
+	if((tmnow.tm_hour == 0)&&(tmnow.tm_min == 0)&&(tmnow.tm_sec == 0)){
 		myrpt->dailykeyups = 0;
 		myrpt->dailytxtime = 0;
 		myrpt->dailykerchunks = 0;
 		myrpt->dailyexecdcommands = 0;
 	}
-}
 
+	if(tmnow.tm_sec != 0)
+		return;
+
+	/* Code below only executes once per minute */
+
+
+	/* Don't schedule if remote */
+
+        if (myrpt->remote)
+                return;
+
+	/* Don't schedule if disabled */
+
+        if(myrpt->p.s[myrpt->p.sysstate_cur].schedulerdisable){
+		if(debug > 6)
+			ast_log(LOG_NOTICE, "Scheduler disabled\n");
+		return;
+	}
+
+	if(!myrpt->p.skedstanzaname){ /* No stanza means we do nothing */
+		if(debug > 6)
+			ast_log(LOG_NOTICE,"No stanza for scheduler in rpt.conf\n");
+		return;
+	}
+
+    /* get pointer to linked list of scheduler entries */
+    skedlist = ast_variable_browse(myrpt->cfg, myrpt->p.skedstanzaname);
+
+	if(debug > 6){
+		ast_log(LOG_NOTICE, "Time now: %02d:%02d %02d %02d %02d\n",
+			tmnow.tm_hour,tmnow.tm_min,tmnow.tm_mday,tmnow.tm_mon + 1, tmnow.tm_wday); 
+	}
+	/* walk the list */
+	for(; skedlist; skedlist = skedlist->next){
+		if(debug > 6)
+			ast_log(LOG_NOTICE, "Scheduler entry %s = %s being considered\n",skedlist->name, skedlist->value);
+		strncpy(value,skedlist->value,99);
+		value[99] = 0;
+		/* point to the substrings for minute, hour, dom, month, and dow */
+		for( i = 0, vp = value ; i < 5; i++){
+			if(!*vp)
+				break;
+			while((*vp == ' ') || (*vp == 0x09)) /* get rid of any leading white space */
+				vp++;
+			strs[i] = vp; /* save pointer to beginning of substring */
+			while((*vp != ' ') && (*vp != 0x09) && (*vp != 0)) /* skip over substring */
+				vp++;
+			if(*vp)
+				*vp++ = 0; /* mark end of substring */
+		}
+		if(debug > 6)
+			ast_log(LOG_NOTICE, "i = %d, min = %s, hour = %s, mday=%s, mon=%s, wday=%s\n",i,
+				strs[0], strs[1], strs[2], strs[3], strs[4]); 
+ 		if(i == 5){
+			if((*strs[0] != '*')&&(atoi(strs[0]) != tmnow.tm_min))
+				continue;
+			if((*strs[1] != '*')&&(atoi(strs[1]) != tmnow.tm_hour))
+				continue;
+			if((*strs[2] != '*')&&(atoi(strs[2]) != tmnow.tm_mday))
+				continue;
+			if((*strs[3] != '*')&&(atoi(strs[3]) != tmnow.tm_mon + 1))
+				continue;
+			if(atoi(strs[4]) == 7)
+				strs[4] = "0";
+			if((*strs[4] != '*')&&(atoi(strs[4]) != tmnow.tm_wday))
+				continue;
+			if(debug)
+				ast_log(LOG_NOTICE, "Executing scheduler entry %s = %s\n", skedlist->name, skedlist->value);
+			if(atoi(skedlist->name) == 0)
+				return; /* Zero is reserved for the startup macro */
+			val = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->p.macro, skedlist->name);
+			if (!val){
+				ast_log(LOG_WARNING,"Scheduler could not find macro %s\n",skedlist->name);
+				return; /* Macro not found */
+			}
+			if ((MAXMACRO - strlen(myrpt->macrobuf)) < strlen(val)){
+				ast_log(LOG_WARNING, "Scheduler could not execute macro %s: Macro buffer full\n",
+					skedlist->name);
+				return; /* Macro buffer full */
+			}
+			myrpt->macrotimer = MACROTIME;
+			strncat(myrpt->macrobuf,val,MAXMACRO - 1);
+		}
+		else{
+			ast_log(LOG_WARNING,"Malformed scheduler entry in rpt.conf: %s = %s\n",
+				skedlist->name, skedlist->value);
+		}
+	}
+
+}
 
 /* single thread with one file (request) to dial */
 static void *rpt(void *this)
 {
-	struct rpt *myrpt = (struct rpt *)this;
-	char *tele, c;
-	const char *idtalkover;
-	int ms = MSWAIT, i, lasttx=0, val, remrx=0, identqueued, othertelemqueued, tailmessagequeued, ctqueued;
-	struct ast_channel *who;
-	ZT_CONFINFO ci;  /* conference info */
-	time_t t;
-	struct rpt_link *l, *m;
-	struct rpt_tele *telem;
-	char tmpstr[300];
-
+struct	rpt *myrpt = (struct rpt *)this;
+char *tele,*idtalkover,c,myfirst,*p;
+int ms = MSWAIT,i,lasttx=0,val,remrx=0,identqueued,othertelemqueued;
+int tailmessagequeued,ctqueued,dtmfed,lastmyrx,localmsgqueued;
+struct ast_channel *who;
+ZT_CONFINFO ci;  /* conference info */
+time_t	t;
+struct rpt_link *l,*m;
+struct rpt_tele *telem;
+char tmpstr[300],lstr[MAXLINKLIST];
+
+
+	if (myrpt->p.archivedir) mkdir(myrpt->p.archivedir,0600);
+	sprintf(tmpstr,"%s/%s",myrpt->p.archivedir,myrpt->name);
+	mkdir(tmpstr,0600);
 	rpt_mutex_lock(&myrpt->lock);
 
 	telem = myrpt->tele.next;
-	while (telem != &myrpt->tele) {
-		ast_softhangup(telem->chan, AST_SOFTHANGUP_DEV);
+	while(telem != &myrpt->tele)
+	{
+		ast_softhangup(telem->chan,AST_SOFTHANGUP_DEV);
 		telem = telem->next;
 	}
 	rpt_mutex_unlock(&myrpt->lock);
 	/* find our index, and load the vars initially */
-	for (i = 0; i < nrpts; i++) {
-		if (&rpt_vars[i] == myrpt) {
-			load_rpt_vars(i, 0);
+	for(i = 0; i < nrpts; i++)
+	{
+		if (&rpt_vars[i] == myrpt)
+		{
+			load_rpt_vars(i,0);
 			break;
 		}
 	}
+
 	rpt_mutex_lock(&myrpt->lock);
-	ast_copy_string(tmpstr, myrpt->rxchanname, sizeof(tmpstr));
-	tele = strchr(tmpstr, '/');
-	if (!tele) {
-		ast_log(LOG_ERROR, "rpt:Rxchannel Dial number (%s) must be in format tech/number\n", myrpt->rxchanname);
+	while(myrpt->xlink)
+	{
+		myrpt->xlink = 3;
+		rpt_mutex_unlock(&myrpt->lock);
+		usleep(100000);
+		rpt_mutex_lock(&myrpt->lock);
+	}	
+	if ((!strcmp(myrpt->remoterig, remote_rig_rbi)) &&
+	  (ioperm(myrpt->p.iobase,1,1) == -1))
+	{
+		rpt_mutex_unlock(&myrpt->lock);
+		ast_log(LOG_WARNING, "Cant get io permission on IO port %x hex\n",myrpt->p.iobase);
+		myrpt->rpt_thread = AST_PTHREADT_STOP;
+		pthread_exit(NULL);
+	}
+	strncpy(tmpstr,myrpt->rxchanname,sizeof(tmpstr) - 1);
+	tele = strchr(tmpstr,'/');
+	if (!tele)
+	{
+		fprintf(stderr,"rpt:Rxchannel Dial number (%s) must be in format tech/number\n",myrpt->rxchanname);
 		rpt_mutex_unlock(&myrpt->lock);
 		myrpt->rpt_thread = AST_PTHREADT_STOP;
 		pthread_exit(NULL);
 	}
 	*tele++ = 0;
-	myrpt->rxchannel = ast_request(tmpstr, AST_FORMAT_SLINEAR, tele, NULL);
-	if (myrpt->rxchannel) {
-		if (myrpt->rxchannel->_state == AST_STATE_BUSY) {
-			ast_log(LOG_ERROR, "rpt:Sorry unable to obtain Rx channel\n");
+	myrpt->rxchannel = ast_request(tmpstr,AST_FORMAT_SLINEAR,tele,NULL);
+	myrpt->zaprxchannel = NULL;
+	if (!strcasecmp(tmpstr,"Zap"))
+		myrpt->zaprxchannel = myrpt->rxchannel;
+	if (myrpt->rxchannel)
+	{
+		if (myrpt->rxchannel->_state == AST_STATE_BUSY)
+		{
+			fprintf(stderr,"rpt:Sorry unable to obtain Rx channel\n");
 			rpt_mutex_unlock(&myrpt->lock);
 			ast_hangup(myrpt->rxchannel);
 			myrpt->rpt_thread = AST_PTHREADT_STOP;
 			pthread_exit(NULL);
 		}
-		ast_set_read_format(myrpt->rxchannel, AST_FORMAT_SLINEAR);
-		ast_set_write_format(myrpt->rxchannel, AST_FORMAT_SLINEAR);
-		ast_channel_setwhentohangup_tv(myrpt->rxchannel, cancel_atimeout);
+		ast_set_read_format(myrpt->rxchannel,AST_FORMAT_SLINEAR);
+		ast_set_write_format(myrpt->rxchannel,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+		if (myrpt->rxchannel->cdr)
+			ast_set_flag(myrpt->rxchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+#ifndef	NEW_ASTERISK
+		myrpt->rxchannel->whentohangup = 0;
+#endif
 		myrpt->rxchannel->appl = "Apprpt";
 		myrpt->rxchannel->data = "(Repeater Rx)";
-		ast_verb(3, "rpt (Rx) initiating call to %s/%s on %s\n",
-				tmpstr, tele, myrpt->rxchannel->name);
-		ast_call(myrpt->rxchannel, tele, 999);
-		if (myrpt->rxchannel->_state != AST_STATE_UP) {
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "rpt (Rx) initiating call to %s/%s on %s\n",
+				tmpstr,tele,myrpt->rxchannel->name);
+		ast_call(myrpt->rxchannel,tele,999);
+		if (myrpt->rxchannel->_state != AST_STATE_UP)
+		{
 			rpt_mutex_unlock(&myrpt->lock);
 			ast_hangup(myrpt->rxchannel);
 			myrpt->rpt_thread = AST_PTHREADT_STOP;
 			pthread_exit(NULL);
 		}
-	} else {
-		ast_log(LOG_ERROR, "rpt:Sorry unable to obtain Rx channel\n");
+	}
+	else
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain Rx channel\n");
 		rpt_mutex_unlock(&myrpt->lock);
 		myrpt->rpt_thread = AST_PTHREADT_STOP;
 		pthread_exit(NULL);
 	}
-	if (myrpt->txchanname) {
-		ast_copy_string(tmpstr, myrpt->txchanname, sizeof(tmpstr));
-		tele = strchr(tmpstr, '/');
-		if (!tele) {
-			ast_log(LOG_ERROR, "rpt:Txchannel Dial number (%s) must be in format tech/number\n", myrpt->txchanname);
+	myrpt->zaptxchannel = NULL;
+	if (myrpt->txchanname)
+	{
+		strncpy(tmpstr,myrpt->txchanname,sizeof(tmpstr) - 1);
+		tele = strchr(tmpstr,'/');
+		if (!tele)
+		{
+			fprintf(stderr,"rpt:Txchannel Dial number (%s) must be in format tech/number\n",myrpt->txchanname);
 			rpt_mutex_unlock(&myrpt->lock);
 			ast_hangup(myrpt->rxchannel);
 			myrpt->rpt_thread = AST_PTHREADT_STOP;
 			pthread_exit(NULL);
 		}
 		*tele++ = 0;
-		myrpt->txchannel = ast_request(tmpstr, AST_FORMAT_SLINEAR, tele, NULL);
-		if (myrpt->txchannel) {
-			if (myrpt->txchannel->_state == AST_STATE_BUSY) {
-				ast_log(LOG_ERROR, "rpt:Sorry unable to obtain Tx channel\n");
+		myrpt->txchannel = ast_request(tmpstr,AST_FORMAT_SLINEAR,tele,NULL);
+		if (!strcasecmp(tmpstr,"Zap"))
+			myrpt->zaptxchannel = myrpt->txchannel;
+		if (myrpt->txchannel)
+		{
+			if (myrpt->txchannel->_state == AST_STATE_BUSY)
+			{
+				fprintf(stderr,"rpt:Sorry unable to obtain Tx channel\n");
 				rpt_mutex_unlock(&myrpt->lock);
 				ast_hangup(myrpt->txchannel);
 				ast_hangup(myrpt->rxchannel);
 				myrpt->rpt_thread = AST_PTHREADT_STOP;
 				pthread_exit(NULL);
 			}			
-			ast_set_read_format(myrpt->txchannel, AST_FORMAT_SLINEAR);
-			ast_set_write_format(myrpt->txchannel, AST_FORMAT_SLINEAR);
-			ast_channel_setwhentohangup_tv(myrpt->txchannel, cancel_atimeout);
+			ast_set_read_format(myrpt->txchannel,AST_FORMAT_SLINEAR);
+			ast_set_write_format(myrpt->txchannel,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+			if (myrpt->txchannel->cdr)
+				ast_set_flag(myrpt->txchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+#ifndef	NEW_ASTERISK
+			myrpt->txchannel->whentohangup = 0;
+#endif
 			myrpt->txchannel->appl = "Apprpt";
 			myrpt->txchannel->data = "(Repeater Tx)";
-			ast_verb(3, "rpt (Tx) initiating call to %s/%s on %s\n",
-					tmpstr, tele, myrpt->txchannel->name);
-			ast_call(myrpt->txchannel, tele, 999);
-			if (myrpt->rxchannel->_state != AST_STATE_UP) {
+			if (option_verbose > 2)
+				ast_verbose(VERBOSE_PREFIX_3 "rpt (Tx) initiating call to %s/%s on %s\n",
+					tmpstr,tele,myrpt->txchannel->name);
+			ast_call(myrpt->txchannel,tele,999);
+			if (myrpt->rxchannel->_state != AST_STATE_UP)
+			{
 				rpt_mutex_unlock(&myrpt->lock);
 				ast_hangup(myrpt->rxchannel);
 				ast_hangup(myrpt->txchannel);
 				myrpt->rpt_thread = AST_PTHREADT_STOP;
 				pthread_exit(NULL);
 			}
-		} else {
-			ast_log(LOG_ERROR, "rpt:Sorry unable to obtain Tx channel\n");
+		}
+		else
+		{
+			fprintf(stderr,"rpt:Sorry unable to obtain Tx channel\n");
 			rpt_mutex_unlock(&myrpt->lock);
 			ast_hangup(myrpt->rxchannel);
 			myrpt->rpt_thread = AST_PTHREADT_STOP;
 			pthread_exit(NULL);
 		}
-	} else {
+	}
+	else
+	{
 		myrpt->txchannel = myrpt->rxchannel;
+		if (!strncasecmp(myrpt->rxchanname,"Zap",3))
+			myrpt->zaptxchannel = myrpt->txchannel;
+	}
+	ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_KEY);
+	ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_UNKEY);
+	/* allocate a pseudo-channel thru asterisk */
+	myrpt->pchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!myrpt->pchannel)
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
+		rpt_mutex_unlock(&myrpt->lock);
+		if (myrpt->txchannel != myrpt->rxchannel) 
+			ast_hangup(myrpt->txchannel);
+		ast_hangup(myrpt->rxchannel);
+		myrpt->rpt_thread = AST_PTHREADT_STOP;
+		pthread_exit(NULL);
+	}
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (myrpt->pchannel->cdr)
+		ast_set_flag(myrpt->pchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+	if (!myrpt->zaprxchannel) myrpt->zaprxchannel = myrpt->pchannel;
+	if (!myrpt->zaptxchannel)
+	{
+		/* allocate a pseudo-channel thru asterisk */
+		myrpt->zaptxchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+		if (!myrpt->zaptxchannel)
+		{
+			fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
+			rpt_mutex_unlock(&myrpt->lock);
+			if (myrpt->txchannel != myrpt->rxchannel) 
+				ast_hangup(myrpt->txchannel);
+			ast_hangup(myrpt->rxchannel);
+			myrpt->rpt_thread = AST_PTHREADT_STOP;
+			pthread_exit(NULL);
+		}
+		ast_set_read_format(myrpt->zaptxchannel,AST_FORMAT_SLINEAR);
+		ast_set_write_format(myrpt->zaptxchannel,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+		if (myrpt->zaptxchannel->cdr)
+			ast_set_flag(myrpt->zaptxchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
 	}
-	ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_KEY);
-	ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_UNKEY);
 	/* allocate a pseudo-channel thru asterisk */
-	myrpt->pchannel = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
-	if (!myrpt->pchannel) {
-		ast_log(LOG_ERROR, "rpt:Sorry unable to obtain pseudo channel\n");
+	myrpt->monchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!myrpt->monchannel)
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
 		rpt_mutex_unlock(&myrpt->lock);
 		if (myrpt->txchannel != myrpt->rxchannel) 
 			ast_hangup(myrpt->txchannel);
@@ -5778,15 +10944,23 @@ static void *rpt(void *this)
 		myrpt->rpt_thread = AST_PTHREADT_STOP;
 		pthread_exit(NULL);
 	}
+	ast_set_read_format(myrpt->monchannel,AST_FORMAT_SLINEAR);
+	ast_set_write_format(myrpt->monchannel,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (myrpt->monchannel->cdr)
+		ast_set_flag(myrpt->monchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
 	/* make a conference for the tx */
 	ci.chan = 0;
 	ci.confno = -1; /* make a new conf */
 	ci.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER;
 	/* first put the channel on the conference in proper mode */
-	if (ioctl(myrpt->txchannel->fds[0], ZT_SETCONF, &ci) == -1) {
+	if (ioctl(myrpt->zaptxchannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
 		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 		rpt_mutex_unlock(&myrpt->lock);
 		ast_hangup(myrpt->pchannel);
+		ast_hangup(myrpt->monchannel);
 		if (myrpt->txchannel != myrpt->rxchannel) 
 			ast_hangup(myrpt->txchannel);
 		ast_hangup(myrpt->rxchannel);
@@ -5801,10 +10975,12 @@ static void *rpt(void *this)
 	ci.confmode = ((myrpt->p.duplex == 2) || (myrpt->p.duplex == 4)) ? ZT_CONF_CONFANNMON :
 		(ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER);
 	/* first put the channel on the conference in announce mode */
-	if (ioctl(myrpt->pchannel->fds[0], ZT_SETCONF, &ci) == -1) {
+	if (ioctl(myrpt->pchannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
 		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 		rpt_mutex_unlock(&myrpt->lock);
 		ast_hangup(myrpt->pchannel);
+		ast_hangup(myrpt->monchannel);
 		if (myrpt->txchannel != myrpt->rxchannel) 
 			ast_hangup(myrpt->txchannel);
 		ast_hangup(myrpt->rxchannel);
@@ -5813,34 +10989,127 @@ static void *rpt(void *this)
 	}
 	/* save pseudo channel conference number */
 	myrpt->conf = ci.confno;
+	/* make a conference for the pseudo */
+	ci.chan = 0;
+	if ((strstr(myrpt->txchannel->name,"pseudo") == NULL) &&
+		(myrpt->zaptxchannel == myrpt->txchannel))
+	{
+		/* get tx channel's port number */
+		if (ioctl(myrpt->txchannel->fds[0],ZT_CHANNO,&ci.confno) == -1)
+		{
+			ast_log(LOG_WARNING, "Unable to set tx channel's chan number\n");
+			rpt_mutex_unlock(&myrpt->lock);
+			ast_hangup(myrpt->pchannel);
+			ast_hangup(myrpt->monchannel);
+			if (myrpt->txchannel != myrpt->rxchannel) 
+				ast_hangup(myrpt->txchannel);
+			ast_hangup(myrpt->rxchannel);
+			myrpt->rpt_thread = AST_PTHREADT_STOP;
+			pthread_exit(NULL);
+		}
+		ci.confmode = ZT_CONF_MONITORTX;
+	}
+	else
+	{
+		ci.confno = myrpt->txconf;
+		ci.confmode = ZT_CONF_CONFANNMON;
+	}
+	/* first put the channel on the conference in announce mode */
+	if (ioctl(myrpt->monchannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
+		ast_log(LOG_WARNING, "Unable to set conference mode for monitor\n");
+		rpt_mutex_unlock(&myrpt->lock);
+		ast_hangup(myrpt->pchannel);
+		ast_hangup(myrpt->monchannel);
+		if (myrpt->txchannel != myrpt->rxchannel) 
+			ast_hangup(myrpt->txchannel);
+		ast_hangup(myrpt->rxchannel);
+		myrpt->rpt_thread = AST_PTHREADT_STOP;
+		pthread_exit(NULL);
+	}
+	/* allocate a pseudo-channel thru asterisk */
+	myrpt->parrotchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!myrpt->parrotchannel)
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
+		rpt_mutex_unlock(&myrpt->lock);
+		if (myrpt->txchannel != myrpt->rxchannel) 
+			ast_hangup(myrpt->txchannel);
+		ast_hangup(myrpt->rxchannel);
+		myrpt->rpt_thread = AST_PTHREADT_STOP;
+		pthread_exit(NULL);
+	}
+	ast_set_read_format(myrpt->parrotchannel,AST_FORMAT_SLINEAR);
+	ast_set_write_format(myrpt->parrotchannel,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (myrpt->parrotchannel->cdr)
+		ast_set_flag(myrpt->parrotchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
 	/* allocate a pseudo-channel thru asterisk */
-	myrpt->txpchannel = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
-	if (!myrpt->txpchannel) {
-		ast_log(LOG_ERROR, "rpt:Sorry unable to obtain pseudo channel\n");
+	myrpt->voxchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!myrpt->voxchannel)
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
+		rpt_mutex_unlock(&myrpt->lock);
+		if (myrpt->txchannel != myrpt->rxchannel) 
+			ast_hangup(myrpt->txchannel);
+		ast_hangup(myrpt->rxchannel);
+		myrpt->rpt_thread = AST_PTHREADT_STOP;
+		pthread_exit(NULL);
+	}
+	ast_set_read_format(myrpt->voxchannel,AST_FORMAT_SLINEAR);
+	ast_set_write_format(myrpt->voxchannel,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (myrpt->voxchannel->cdr)
+		ast_set_flag(myrpt->voxchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+	/* allocate a pseudo-channel thru asterisk */
+	myrpt->txpchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!myrpt->txpchannel)
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
 		rpt_mutex_unlock(&myrpt->lock);
 		ast_hangup(myrpt->pchannel);
+		ast_hangup(myrpt->monchannel);
 		if (myrpt->txchannel != myrpt->rxchannel) 
 			ast_hangup(myrpt->txchannel);
 		ast_hangup(myrpt->rxchannel);
 		myrpt->rpt_thread = AST_PTHREADT_STOP;
 		pthread_exit(NULL);
 	}
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (myrpt->txpchannel->cdr)
+		ast_set_flag(myrpt->txpchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
 	/* make a conference for the tx */
 	ci.chan = 0;
 	ci.confno = myrpt->txconf;
 	ci.confmode = ZT_CONF_CONF | ZT_CONF_TALKER ;
  	/* first put the channel on the conference in proper mode */
-	if (ioctl(myrpt->txpchannel->fds[0], ZT_SETCONF, &ci) == -1) {
+	if (ioctl(myrpt->txpchannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
 		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 		rpt_mutex_unlock(&myrpt->lock);
 		ast_hangup(myrpt->txpchannel);
-		ast_hangup(myrpt->pchannel);
+		ast_hangup(myrpt->monchannel);
 		if (myrpt->txchannel != myrpt->rxchannel) 
 			ast_hangup(myrpt->txchannel);
 		ast_hangup(myrpt->rxchannel);
 		myrpt->rpt_thread = AST_PTHREADT_STOP;
 		pthread_exit(NULL);
 	}
+	/* if serial io port, open it */
+	myrpt->iofd = -1;
+	if (myrpt->p.ioport && ((myrpt->iofd = openserial(myrpt,myrpt->p.ioport)) == -1))
+	{
+		ast_log(LOG_ERROR, "Unable to open %s\n",myrpt->p.ioport);
+		rpt_mutex_unlock(&myrpt->lock);
+		ast_hangup(myrpt->pchannel);
+		if (myrpt->txchannel != myrpt->rxchannel) 
+			ast_hangup(myrpt->txchannel);
+		ast_hangup(myrpt->rxchannel);
+		pthread_exit(NULL);
+	}
 	/* Now, the idea here is to copy from the physical rx channel buffer
 	   into the pseudo tx buffer, and from the pseudo rx buffer into the 
 	   tx channel buffer */
@@ -5855,18 +11124,24 @@ static void *rpt(void *this)
 	myrpt->tounkeyed = 0;
 	myrpt->tonotify = 0;
 	myrpt->retxtimer = 0;
+	myrpt->rerxtimer = 0;
 	myrpt->skedtimer = 0;
 	myrpt->tailevent = 0;
 	lasttx = 0;
 	myrpt->keyed = 0;
-	idtalkover = ast_variable_retrieve(myrpt->cfg, myrpt->name, "idtalkover");
+	myrpt->txkeyed = 0;
+	time(&myrpt->lastkeyedtime);
+	myrpt->lastkeyedtime -= RPT_LOCKOUT_SECS;
+	time(&myrpt->lasttxkeyedtime);
+	myrpt->lasttxkeyedtime -= RPT_LOCKOUT_SECS;
+	idtalkover = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->name, "idtalkover");
 	myrpt->dtmfidx = -1;
 	myrpt->dtmfbuf[0] = 0;
 	myrpt->rem_dtmfidx = -1;
 	myrpt->rem_dtmfbuf[0] = 0;
 	myrpt->dtmf_time = 0;
 	myrpt->rem_dtmf_time = 0;
-	myrpt->enable = 1;
+	myrpt->inpadtest = 0;
 	myrpt->disgorgetime = 0;
 	myrpt->lastnodewhichkeyedusup[0] = '\0';
 	myrpt->dailytxtime = 0;
@@ -5880,90 +11155,102 @@ static void *rpt(void *this)
 	myrpt->timeouts = 0;
 	myrpt->exten[0] = '\0';
 	myrpt->lastdtmfcommand[0] = '\0';
-	if (myrpt->p.startupmacro) {
-		snprintf(myrpt->macrobuf, sizeof(myrpt->macrobuf), "PPPP%s", myrpt->p.startupmacro);
-	}
-	if (myrpt->p.startupgosub) {
-		snprintf(myrpt->gosubbuf, sizeof(myrpt->gosubbuf), "PPPP%s", myrpt->p.startupgosub);
+	voxinit_rpt(myrpt,1);
+	myrpt->wasvox = 0;
+	if (myrpt->p.startupmacro)
+	{
+		snprintf(myrpt->macrobuf,MAXMACRO - 1,"PPPP%s",myrpt->p.startupmacro);
 	}
 	rpt_mutex_unlock(&myrpt->lock);
-	val = 0;
-	ast_channel_setoption(myrpt->rxchannel, AST_OPTION_TONE_VERIFY, &val, sizeof(char), 0);
 	val = 1;
-	ast_channel_setoption(myrpt->rxchannel, AST_OPTION_RELAXDTMF, &val, sizeof(char), 0);
-	while (ms >= 0) {
-		struct ast_frame *f;
-		struct ast_channel *cs[300];
-		int totx=0, elap=0, n, toexit = 0;
+	ast_channel_setoption(myrpt->rxchannel,AST_OPTION_RELAXDTMF,&val,sizeof(char),0);
+	val = 1;
+	ast_channel_setoption(myrpt->rxchannel,AST_OPTION_TONE_VERIFY,&val,sizeof(char),0);
+	if (myrpt->p.archivedir) donodelog(myrpt,"STARTUP");
+	dtmfed = 0;
+	if (myrpt->remoterig && !ISRIG_RTX(myrpt->remoterig)) setrem(myrpt);
+	lastmyrx = 0;
+	myfirst = 0;
+	while (ms >= 0)
+	{
+		struct ast_frame *f,*f1,*f2;
+		struct ast_channel *cs[300],*cs1[300];
+		int totx=0,elap=0,n,x,toexit=0;
 
 		/* DEBUG Dump */
-		if ((myrpt->disgorgetime) && (time(NULL) >= myrpt->disgorgetime)) {
+		if((myrpt->disgorgetime) && (time(NULL) >= myrpt->disgorgetime)){
 			struct rpt_link *zl;
 			struct rpt_tele *zt;
 
 			myrpt->disgorgetime = 0;
-			ast_log(LOG_NOTICE, "********** Variable Dump Start (app_rpt) **********\n");
-			ast_log(LOG_NOTICE, "totx = %d\n", totx);
-			ast_log(LOG_NOTICE, "remrx = %d\n", remrx);
-			ast_log(LOG_NOTICE, "lasttx = %d\n", lasttx);
-			ast_log(LOG_NOTICE, "elap = %d\n", elap);
-			ast_log(LOG_NOTICE, "toexit = %d\n", toexit);
-
-			ast_log(LOG_NOTICE, "myrpt->keyed = %d\n", myrpt->keyed);
-			ast_log(LOG_NOTICE, "myrpt->localtx = %d\n", myrpt->localtx);
-			ast_log(LOG_NOTICE, "myrpt->callmode = %d\n", myrpt->callmode);
-			ast_log(LOG_NOTICE, "myrpt->enable = %d\n", myrpt->enable);
-			ast_log(LOG_NOTICE, "myrpt->mustid = %d\n", myrpt->mustid);
-			ast_log(LOG_NOTICE, "myrpt->tounkeyed = %d\n", myrpt->tounkeyed);
-			ast_log(LOG_NOTICE, "myrpt->tonotify = %d\n", myrpt->tonotify);
-			ast_log(LOG_NOTICE, "myrpt->retxtimer = %ld\n", myrpt->retxtimer);
-			ast_log(LOG_NOTICE, "myrpt->totimer = %d\n", myrpt->totimer);
-			ast_log(LOG_NOTICE, "myrpt->tailtimer = %d\n", myrpt->tailtimer);
-			ast_log(LOG_NOTICE, "myrpt->tailevent = %d\n", myrpt->tailevent);
+			ast_log(LOG_NOTICE,"********** Variable Dump Start (app_rpt) **********\n");
+			ast_log(LOG_NOTICE,"totx = %d\n",totx);
+			ast_log(LOG_NOTICE,"remrx = %d\n",remrx);
+			ast_log(LOG_NOTICE,"lasttx = %d\n",lasttx);
+			ast_log(LOG_NOTICE,"elap = %d\n",elap);
+			ast_log(LOG_NOTICE,"toexit = %d\n",toexit);
+
+			ast_log(LOG_NOTICE,"myrpt->keyed = %d\n",myrpt->keyed);
+			ast_log(LOG_NOTICE,"myrpt->localtx = %d\n",myrpt->localtx);
+			ast_log(LOG_NOTICE,"myrpt->callmode = %d\n",myrpt->callmode);
+			ast_log(LOG_NOTICE,"myrpt->mustid = %d\n",myrpt->mustid);
+			ast_log(LOG_NOTICE,"myrpt->tounkeyed = %d\n",myrpt->tounkeyed);
+			ast_log(LOG_NOTICE,"myrpt->tonotify = %d\n",myrpt->tonotify);
+			ast_log(LOG_NOTICE,"myrpt->retxtimer = %ld\n",myrpt->retxtimer);
+			ast_log(LOG_NOTICE,"myrpt->totimer = %d\n",myrpt->totimer);
+			ast_log(LOG_NOTICE,"myrpt->tailtimer = %d\n",myrpt->tailtimer);
+			ast_log(LOG_NOTICE,"myrpt->tailevent = %d\n",myrpt->tailevent);
 
 			zl = myrpt->links.next;
-			while (zl != &myrpt->links) {
-				ast_log(LOG_NOTICE, "*** Link Name: %s ***\n", zl->name);
-				ast_log(LOG_NOTICE, "        link->lasttx %d\n", zl->lasttx);
-				ast_log(LOG_NOTICE, "        link->lastrx %d\n", zl->lastrx);
-				ast_log(LOG_NOTICE, "        link->connected %d\n", zl->connected);
-				ast_log(LOG_NOTICE, "        link->hasconnected %d\n", zl->hasconnected);
-				ast_log(LOG_NOTICE, "        link->outbound %d\n", zl->outbound);
-				ast_log(LOG_NOTICE, "        link->disced %d\n", zl->disced);
-				ast_log(LOG_NOTICE, "        link->killme %d\n", zl->killme);
-				ast_log(LOG_NOTICE, "        link->disctime %ld\n", zl->disctime);
-				ast_log(LOG_NOTICE, "        link->retrytimer %ld\n", zl->retrytimer);
-				ast_log(LOG_NOTICE, "        link->retries = %d\n", zl->retries);
-				ast_log(LOG_NOTICE, "        link->reconnects = %d\n", zl->reconnects);
-				zl = zl->next;
-			}
-
+              		while(zl != &myrpt->links){
+				ast_log(LOG_NOTICE,"*** Link Name: %s ***\n",zl->name);
+				ast_log(LOG_NOTICE,"        link->lasttx %d\n",zl->lasttx);
+				ast_log(LOG_NOTICE,"        link->lastrx %d\n",zl->lastrx);
+				ast_log(LOG_NOTICE,"        link->connected %d\n",zl->connected);
+				ast_log(LOG_NOTICE,"        link->hasconnected %d\n",zl->hasconnected);
+				ast_log(LOG_NOTICE,"        link->outbound %d\n",zl->outbound);
+				ast_log(LOG_NOTICE,"        link->disced %d\n",zl->disced);
+				ast_log(LOG_NOTICE,"        link->killme %d\n",zl->killme);
+				ast_log(LOG_NOTICE,"        link->disctime %ld\n",zl->disctime);
+				ast_log(LOG_NOTICE,"        link->retrytimer %ld\n",zl->retrytimer);
+				ast_log(LOG_NOTICE,"        link->retries = %d\n",zl->retries);
+				ast_log(LOG_NOTICE,"        link->reconnects = %d\n",zl->reconnects);
+				ast_log(LOG_NOTICE,"        link->newkey = %d\n",zl->newkey);
+                        	zl = zl->next;
+                	}
+                                                                                                                               
 			zt = myrpt->tele.next;
-			if (zt != &myrpt->tele)
-				ast_log(LOG_NOTICE, "*** Telemetry Queue ***\n");
-			while (zt != &myrpt->tele) {
-				ast_log(LOG_NOTICE, "        Telemetry mode: %d\n", zt->mode);
-				zt = zt->next;
-			}
-			ast_log(LOG_NOTICE, "******* Variable Dump End (app_rpt) *******\n");
+			if(zt != &myrpt->tele)
+				ast_log(LOG_NOTICE,"*** Telemetry Queue ***\n");
+              		while(zt != &myrpt->tele){
+				ast_log(LOG_NOTICE,"        Telemetry mode: %d\n",zt->mode);
+                        	zt = zt->next;
+                	}
+			ast_log(LOG_NOTICE,"******* Variable Dump End (app_rpt) *******\n");
+
 		}	
 
-		if (myrpt->reload) {
+
+		if (myrpt->reload)
+		{
 			struct rpt_tele *telem;
 
 			rpt_mutex_lock(&myrpt->lock);
 			telem = myrpt->tele.next;
-			while (telem != &myrpt->tele) {
-				ast_softhangup(telem->chan, AST_SOFTHANGUP_DEV);
+			while(telem != &myrpt->tele)
+			{
+				ast_softhangup(telem->chan,AST_SOFTHANGUP_DEV);
 				telem = telem->next;
 			}
 			myrpt->reload = 0;
 			rpt_mutex_unlock(&myrpt->lock);
 			usleep(10000);
 			/* find our index, and load the vars */
-			for (i = 0; i < nrpts; i++) {
-				if (&rpt_vars[i] == myrpt) {
-					load_rpt_vars(i, 0);
+			for(i = 0; i < nrpts; i++)
+			{
+				if (&rpt_vars[i] == myrpt)
+				{
+					load_rpt_vars(i,0);
 					break;
 				}
 			}
@@ -5973,40 +11260,87 @@ static void *rpt(void *this)
 		if (ast_check_hangup(myrpt->rxchannel)) break;
 		if (ast_check_hangup(myrpt->txchannel)) break;
 		if (ast_check_hangup(myrpt->pchannel)) break;
+		if (ast_check_hangup(myrpt->monchannel)) break;
+		if (myrpt->parrotchannel && 
+			ast_check_hangup(myrpt->parrotchannel)) break;
+		if (myrpt->voxchannel && 
+			ast_check_hangup(myrpt->voxchannel)) break;
 		if (ast_check_hangup(myrpt->txpchannel)) break;
+		if (myrpt->zaptxchannel && ast_check_hangup(myrpt->zaptxchannel)) break;
 
-		/* Update local tx with keyed if not parsing a command */
-		myrpt->localtx = myrpt->keyed && (myrpt->dtmfidx == -1) && (!myrpt->cmdnode[0]);
+		/* Set local tx with keyed */
+		myrpt->localtx = myrpt->keyed;
 		/* If someone's connected, and they're transmitting from their end to us, set remrx true */
 		l = myrpt->links.next;
 		remrx = 0;
-		while (l != &myrpt->links) {
-			if (l->lastrx) {
+		while(l != &myrpt->links)
+		{
+			if (l->lastrx){
 				remrx = 1;
-				if (l->name[0] != '0') /* Ignore '0' nodes */
+				if(l->name[0] != '0') /* Ignore '0' nodes */
 					strcpy(myrpt->lastnodewhichkeyedusup, l->name); /* Note the node which is doing the key up */
 			}
 			l = l->next;
 		}
 		/* Create a "must_id" flag for the cleanup ID */		
-		myrpt->mustid |= (myrpt->idtimer) && (myrpt->keyed || remrx) ;
+		if(myrpt->p.idtime) /* ID time must be non-zero */
+			myrpt->mustid |= (myrpt->idtimer) && (myrpt->keyed || remrx) ;
 		/* Build a fresh totx from myrpt->keyed and autopatch activated */
-		totx = myrpt->callmode;
 		/* If full duplex, add local tx to totx */
-		if (myrpt->p.duplex > 1) totx = totx || myrpt->localtx;
+		if (myrpt->p.duplex > 1) 
+		{
+			totx = myrpt->callmode;
+			totx = totx || myrpt->localtx;
+		}
+		else
+		{
+			int myrx = myrpt->localtx || remrx || (!myrpt->callmode);
+
+			if (lastmyrx != myrx)
+			{
+				voxinit_rpt(myrpt,!myrx);
+				lastmyrx = myrx;
+			}
+			totx = 0;
+			if (myrpt->callmode && (myrpt->voxtotimer <= 0))
+			{
+				if (myrpt->voxtostate)
+				{
+					myrpt->voxtotimer = myrpt->p.voxtimeout_ms;
+					myrpt->voxtostate = 0;
+				}				
+				else
+				{
+					myrpt->voxtotimer = myrpt->p.voxrecover_ms;
+					myrpt->voxtostate = 1;
+				}
+			}
+			if (!myrpt->voxtostate)
+				totx = myrpt->callmode && myrpt->wasvox;
+		}
 		/* Traverse the telemetry list to see what's queued */
 		identqueued = 0;
+		localmsgqueued = 0;
 		othertelemqueued = 0;
 		tailmessagequeued = 0;
 		ctqueued = 0;
 		telem = myrpt->tele.next;
-		while (telem != &myrpt->tele) {
-			if ((telem->mode == ID) || (telem->mode == IDTALKOVER)) {
+		while(telem != &myrpt->tele)
+		{
+			if((telem->mode == ID) || (telem->mode == IDTALKOVER)){
 				identqueued = 1; /* Identification telemetry */
-			} else if (telem->mode == TAILMSG) {
+			}
+			else if(telem->mode == TAILMSG)
+			{
 				tailmessagequeued = 1; /* Tail message telemetry */
-			} else {
-				if (telem->mode != UNKEY)
+			}
+			else if(telem->mode == STATS_TIME_LOCAL) 
+			{
+				localmsgqueued = 1; /* Local message */
+			}
+			else
+			{
+				if ((telem->mode != UNKEY) && (telem->mode != LINKUNKEY))
 					othertelemqueued = 1;  /* Other telemetry */
 				else
 					ctqueued = 1; /* Courtesy tone telemetry */
@@ -6014,42 +11348,58 @@ static void *rpt(void *this)
 			telem = telem->next;
 		}
 	
-		/* Add in any "other" telemetry, if 3/4 or full duplex */
-		if (myrpt->p.duplex > 0)
-			totx = totx || othertelemqueued;
-		/* Update external (to links) transmitter PTT state with everything but ID, CT, and tailmessage telemetry */
+		/* Add in any "other" telemetry, unless specified otherwise */
+		if (!myrpt->p.notelemtx) totx = totx || othertelemqueued;
+		/* Update external (to links) transmitter PTT state with everything but */
+		/* ID, CT, local messages, and tailmessage telemetry */
 		myrpt->exttx = totx;
+		totx = totx || myrpt->dtmf_local_timer;
 		/* If half or 3/4 duplex, add localtx to external link tx */
-		if (myrpt->p.duplex < 2)
-			myrpt->exttx = myrpt->exttx || myrpt->localtx;
+		if (myrpt->p.duplex < 2) myrpt->exttx = myrpt->exttx || myrpt->localtx;
 		/* Add in ID telemetry to local transmitter */
 		totx = totx || remrx;
-		/* If 3/4 or full duplex, add in ident and CT telemetry */
+		/* If 3/4 or full duplex, add in ident, CT telemetry, and local messages */
 		if (myrpt->p.duplex > 0)
-			totx = totx || identqueued || ctqueued;
+			totx = totx || identqueued || ctqueued || localmsgqueued;
+		/* If full duplex, add local dtmf stuff active */
+		if (myrpt->p.duplex > 1) 
+		{
+			totx = totx || (myrpt->dtmfidx > -1) ||
+				myrpt->cmdnode[0];
+		}
+		/* add in parrot stuff */
+		totx = totx || (myrpt->parrotstate > 1);
 		/* Reset time out timer variables if there is no activity */
-		if (!totx) {
+		if (!totx) 
+		{
 			myrpt->totimer = myrpt->p.totime;
 			myrpt->tounkeyed = 0;
 			myrpt->tonotify = 0;
-		} else
-			myrpt->tailtimer = myrpt->p.hangtime; /* Initialize tail timer */
+		}
+		else{
+			myrpt->tailtimer = myrpt->p.s[myrpt->p.sysstate_cur].alternatetail ?
+				myrpt->p.althangtime : /* Initialize tail timer */
+				myrpt->p.hangtime;
+		}
 		/* Disable the local transmitter if we are timed out */
 		totx = totx && myrpt->totimer;
 		/* if timed-out and not said already, say it */
-		if ((!myrpt->totimer) && (!myrpt->tonotify)) {
+		if ((!myrpt->totimer) && (!myrpt->tonotify))
+		{
 			myrpt->tonotify = 1;
 			myrpt->timeouts++;
 			rpt_mutex_unlock(&myrpt->lock);
-			rpt_telemetry(myrpt, TIMEOUT, NULL);
+			rpt_telemetry(myrpt,TIMEOUT,NULL);
 			rpt_mutex_lock(&myrpt->lock);
 		}
 
 		/* If unkey and re-key, reset time out timer */
-		if ((!totx) && (!myrpt->totimer) && (!myrpt->tounkeyed) && (!myrpt->keyed)) {
+		if ((!totx) && (!myrpt->totimer) && (!myrpt->tounkeyed) && (!myrpt->keyed))
+		{
 			myrpt->tounkeyed = 1;
 		}
-		if ((!totx) && (!myrpt->totimer) && myrpt->tounkeyed && myrpt->keyed) {
+		if ((!totx) && (!myrpt->totimer) && myrpt->tounkeyed && myrpt->keyed)
+		{
 			myrpt->totimer = myrpt->p.totime;
 			myrpt->tounkeyed = 0;
 			myrpt->tonotify = 0;
@@ -6057,38 +11407,37 @@ static void *rpt(void *this)
 			continue;
 		}
 		/* if timed-out and in circuit busy after call */
-		if ((!totx) && (!myrpt->totimer) && (myrpt->callmode == 4)) {
+		if ((!totx) && (!myrpt->totimer) && (myrpt->callmode == 4))
+		{
+		    if(debug)
+				ast_log(LOG_NOTICE, "timed-out and in circuit busy after call\n");
 			myrpt->callmode = 0;
+			myrpt->macropatch=0;
+			channel_revert(myrpt);
 		}
 		/* get rid of tail if timed out */
-		if (!myrpt->totimer)
-			myrpt->tailtimer = 0;
+		if (!myrpt->totimer) myrpt->tailtimer = 0;
 		/* if not timed-out, add in tail */
-		if (myrpt->totimer)
-			totx = totx || myrpt->tailtimer;
+		if (myrpt->totimer) totx = totx || myrpt->tailtimer;
 		/* If user or links key up or are keyed up over standard ID, switch to talkover ID, if one is defined */
 		/* If tail message, kill the message if someone keys up over it */ 
 		if ((myrpt->keyed || remrx) && ((identqueued && idtalkover) || (tailmessagequeued))) {
-			int hasid = 0, hastalkover = 0;
+			int hasid = 0,hastalkover = 0;
 
 			telem = myrpt->tele.next;
-			while (telem != &myrpt->tele) {
-				if (telem->mode == ID) {
-					if (telem->chan)
-						ast_softhangup(telem->chan, AST_SOFTHANGUP_DEV); /* Whoosh! */
+			while(telem != &myrpt->tele){
+				if(telem->mode == ID){
+					if (telem->chan) ast_softhangup(telem->chan, AST_SOFTHANGUP_DEV); /* Whoosh! */
 					hasid = 1;
 				}
-				if (telem->mode == TAILMSG) {
-					if (telem->chan)
-						ast_softhangup(telem->chan, AST_SOFTHANGUP_DEV); /* Whoosh! */
-				}
-				if (telem->mode == IDTALKOVER)
-					hastalkover = 1;
+				if(telem->mode == TAILMSG){
+                                        if (telem->chan) ast_softhangup(telem->chan, AST_SOFTHANGUP_DEV); /* Whoosh! */
+                                }
+				if (telem->mode == IDTALKOVER) hastalkover = 1;
 				telem = telem->next;
 			}
 			rpt_mutex_unlock(&myrpt->lock);
-			if (hasid && (!hastalkover))
-				rpt_telemetry(myrpt, IDTALKOVER, NULL); /* Start Talkover ID */
+			if (hasid && (!hastalkover)) rpt_telemetry(myrpt, IDTALKOVER, NULL); /* Start Talkover ID */
 			rpt_mutex_lock(&myrpt->lock);
 		}
 		/* Try to be polite */
@@ -6096,24 +11445,25 @@ static void *rpt(void *this)
 		/* If within 30 seconds of the time to ID, try do it in the tail */
 		/* else if at ID time limit, do it right over the top of them */
 		/* Lastly, if the repeater has been keyed, and the ID timer is expired, do a clean up ID */
-		if (myrpt->mustid && (!myrpt->idtimer))
+		if(myrpt->mustid && (!myrpt->idtimer))
 			queue_id(myrpt);
 
-		if ((totx && (!myrpt->exttx) &&
-			 (myrpt->idtimer <= myrpt->p.politeid) && myrpt->tailtimer)) {
-			myrpt->tailid = 1;
-		}
+		if ((myrpt->p.idtime && totx && (!myrpt->exttx) &&
+			 (myrpt->idtimer <= myrpt->p.politeid) && myrpt->tailtimer)) /* ID time must be non-zero */ 
+			{
+				myrpt->tailid = 1;
+			}
 
 		/* If tail timer expires, then check for tail messages */
 
-		if (myrpt->tailevent) {
+		if(myrpt->tailevent){
 			myrpt->tailevent = 0;
-			if (myrpt->tailid) {
+			if(myrpt->tailid){
 				totx = 1;
 				queue_id(myrpt);
 			}
-			else if ((myrpt->p.tailmsg.msgs[0]) &&
-				(myrpt->p.tailmessagetime) && (myrpt->tmsgtimer == 0)) {
+			else if ((myrpt->p.tailmessages[0]) &&
+				(myrpt->p.tailmessagetime) && (myrpt->tmsgtimer == 0)){
 					totx = 1;
 					myrpt->tmsgtimer = myrpt->p.tailmessagetime;	
 					rpt_mutex_unlock(&myrpt->lock);
@@ -6125,48 +11475,115 @@ static void *rpt(void *this)
 		/* Main TX control */
 
 		/* let telemetry transmit anyway (regardless of timeout) */
-		if (myrpt->p.duplex > 0)
-			totx = totx || (myrpt->tele.next != &myrpt->tele);
-		if (totx && (!lasttx)) {
+		if (myrpt->p.duplex > 0) totx = totx || (myrpt->tele.next != &myrpt->tele);
+		totx = totx && !myrpt->p.s[myrpt->p.sysstate_cur].txdisable;
+		myrpt->txrealkeyed = totx;
+		totx = totx || (!AST_LIST_EMPTY(&myrpt->txq));
+		if (totx && (!lasttx))
+		{
+			char mydate[100],myfname[100];
+			time_t myt;
+
+			if (myrpt->monstream) ast_closestream(myrpt->monstream);
+			if (myrpt->p.archivedir)
+			{
+				long blocksleft;
+
+				time(&myt);
+				strftime(mydate,sizeof(mydate) - 1,"%Y%m%d%H%M%S",
+					localtime(&myt));
+				sprintf(myfname,"%s/%s/%s",myrpt->p.archivedir,
+					myrpt->name,mydate);
+				myrpt->monstream = ast_writefile(myfname,"wav49",
+					"app_rpt Air Archive",O_CREAT | O_APPEND,0,0600);
+				if (myrpt->p.monminblocks)
+				{
+					blocksleft = diskavail(myrpt);
+					if (blocksleft >= myrpt->p.monminblocks)
+						donodelog(myrpt,"TXKEY,MAIN");
+				} else donodelog(myrpt,"TXKEY,MAIN");
+			}
 			lasttx = 1;
+			myrpt->txkeyed = 1;
+			time(&myrpt->lasttxkeyedtime);
 			myrpt->dailykeyups++;
 			myrpt->totalkeyups++;
 			rpt_mutex_unlock(&myrpt->lock);
-			ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_KEY);
+			ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_KEY);
 			rpt_mutex_lock(&myrpt->lock);
 		}
-		totx = totx && myrpt->enable;
-		if ((!totx) && lasttx) {
+		if ((!totx) && lasttx)
+		{
+			if (myrpt->monstream) ast_closestream(myrpt->monstream);
+			myrpt->monstream = NULL;
+
 			lasttx = 0;
+			myrpt->txkeyed = 0;
+			time(&myrpt->lasttxkeyedtime);
 			rpt_mutex_unlock(&myrpt->lock);
-			ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_UNKEY);
+			ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_UNKEY);
 			rpt_mutex_lock(&myrpt->lock);
+			donodelog(myrpt,"TXUNKEY,MAIN");
 		}
 		time(&t);
 		/* if DTMF timeout */
-		if ((!myrpt->cmdnode[0]) && (myrpt->dtmfidx >= 0) && ((myrpt->dtmf_time + DTMF_TIMEOUT) < t)) {
+		if ((!myrpt->cmdnode[0]) && (myrpt->dtmfidx >= 0) && ((myrpt->dtmf_time + DTMF_TIMEOUT) < t))
+		{
+			myrpt->inpadtest = 0;
 			myrpt->dtmfidx = -1;
 			myrpt->dtmfbuf[0] = 0;
 		}			
 		/* if remote DTMF timeout */
-		if ((myrpt->rem_dtmfidx >= 0) && ((myrpt->rem_dtmf_time + DTMF_TIMEOUT) < t)) {
+		if ((myrpt->rem_dtmfidx >= 0) && ((myrpt->rem_dtmf_time + DTMF_TIMEOUT) < t))
+		{
+			myrpt->inpadtest = 0;
 			myrpt->rem_dtmfidx = -1;
 			myrpt->rem_dtmfbuf[0] = 0;
 		}	
 
+		if (myrpt->exttx && myrpt->parrotchannel && 
+			myrpt->p.parrotmode && (!myrpt->parrotstate))
+		{
+			char myfname[300];
+
+			ci.confno = myrpt->conf;
+			ci.confmode = ZT_CONF_CONFANNMON;
+			ci.chan = 0;
+
+			/* first put the channel on the conference in announce mode */
+			if (ioctl(myrpt->parrotchannel->fds[0],ZT_SETCONF,&ci) == -1)
+			{
+				ast_log(LOG_WARNING, "Unable to set conference mode for parrot\n");
+				break;
+			}
+
+			sprintf(myfname,PARROTFILE,myrpt->name,myrpt->parrotcnt);
+			strcat(myfname,".wav");
+			unlink(myfname);			
+			sprintf(myfname,PARROTFILE,myrpt->name,myrpt->parrotcnt);
+			myrpt->parrotstate = 1;
+			myrpt->parrottimer = myrpt->p.parrottime;
+			if (myrpt->parrotstream) 
+				ast_closestream(myrpt->parrotstream);
+			myrpt->parrotstream = NULL;
+			myrpt->parrotstream = ast_writefile(myfname,"wav",
+				"app_rpt Parrot",O_CREAT | O_TRUNC,0,0600);
+		}
+
 		/* Reconnect */
 	
 		l = myrpt->links.next;
-		while (l != &myrpt->links) {
-			if (l->killme) {
+		while(l != &myrpt->links)
+		{
+			if (l->killme)
+			{
 				/* remove from queue */
 				remque((struct qelem *) l);
-				if (!strcmp(myrpt->cmdnode, l->name))
+				if (!strcmp(myrpt->cmdnode,l->name))
 					myrpt->cmdnode[0] = 0;
 				rpt_mutex_unlock(&myrpt->lock);
 				/* hang-up on call to device */
-				if (l->chan)
-					ast_hangup(l->chan);
+				if (l->chan) ast_hangup(l->chan);
 				ast_hangup(l->pchan);
 				ast_free(l);
 				rpt_mutex_lock(&myrpt->lock);
@@ -6179,277 +11596,659 @@ static void *rpt(void *this)
 		n = 0;
 		cs[n++] = myrpt->rxchannel;
 		cs[n++] = myrpt->pchannel;
+		cs[n++] = myrpt->monchannel;
+		if (myrpt->parrotchannel) cs[n++] = myrpt->parrotchannel;
+		if (myrpt->voxchannel) cs[n++] = myrpt->voxchannel;
 		cs[n++] = myrpt->txpchannel;
-		if (myrpt->txchannel != myrpt->rxchannel)
-			cs[n++] = myrpt->txchannel;
+		if (myrpt->txchannel != myrpt->rxchannel) cs[n++] = myrpt->txchannel;
+		if (myrpt->zaptxchannel != myrpt->txchannel)
+			cs[n++] = myrpt->zaptxchannel;
 		l = myrpt->links.next;
-		while (l != &myrpt->links) {
-			if ((!l->killme) && (!l->disctime) && l->chan) {
+		while(l != &myrpt->links)
+		{
+			if ((!l->killme) && (!l->disctime) && l->chan)
+			{
 				cs[n++] = l->chan;
 				cs[n++] = l->pchan;
 			}
 			l = l->next;
 		}
+		if ((myrpt->topkeystate == 1) && 
+		    ((t - myrpt->topkeytime) > TOPKEYWAIT))
+		{
+			myrpt->topkeystate = 2;
+			qsort(myrpt->topkey,TOPKEYN,sizeof(struct rpt_topkey),
+				topcompar);
+		}
 		rpt_mutex_unlock(&myrpt->lock);
+
+		if (myrpt->topkeystate == 2)
+		{
+			rpt_telemetry(myrpt,TOPKEY,NULL);
+			myrpt->topkeystate = 3;
+		}
 		ms = MSWAIT;
-		who = ast_waitfor_n(cs, n, &ms);
-		if (who == NULL)
-			ms = 0;
+		for(x = 0; x < n; x++)
+		{
+			int s = -(-x - myrpt->scram - 1) % n;
+			cs1[x] = cs[s];
+		}
+		myrpt->scram++;
+		who = ast_waitfor_n(cs1,n,&ms);
+		if (who == NULL) ms = 0;
 		elap = MSWAIT - ms;
 		rpt_mutex_lock(&myrpt->lock);
 		l = myrpt->links.next;
-		while (l != &myrpt->links) {
-			if (!l->lasttx) {
-				if ((l->retxtimer += elap) >= REDUNDANT_TX_TIME) {
+		while(l != &myrpt->links)
+		{
+			int myrx;
+
+			if (l->voxtotimer) l->voxtotimer -= elap;
+			if (l->voxtotimer < 0) l->voxtotimer = 0;
+
+			if (l->lasttx != l->lasttx1)
+			{
+				voxinit_link(l,!l->lasttx);
+				l->lasttx1 = l->lasttx;
+			}
+			myrx = l->lastrealrx;
+			if ((l->phonemode) && (l->phonevox))
+			{
+				myrx = myrx || (!AST_LIST_EMPTY(&l->rxq));
+				if (l->voxtotimer <= 0)
+				{
+					if (l->voxtostate)
+					{
+						l->voxtotimer = myrpt->p.voxtimeout_ms;
+						l->voxtostate = 0;
+					}				
+					else
+					{
+						l->voxtotimer = myrpt->p.voxrecover_ms;
+						l->voxtostate = 1;
+					}
+				}
+				if (!l->voxtostate)
+					myrx = myrx || l->wasvox ;
+			}
+			l->lastrx = myrx;
+			if (l->linklisttimer)
+			{
+				l->linklisttimer -= elap;
+				if (l->linklisttimer < 0) l->linklisttimer = 0;
+			}
+			if ((!l->linklisttimer) && (l->name[0] != '0') && (!l->isremote))
+			{
+				struct	ast_frame lf;
+
+				memset(&lf,0,sizeof(lf));
+				lf.frametype = AST_FRAME_TEXT;
+				lf.subclass = 0;
+				lf.offset = 0;
+				lf.mallocd = 0;
+				lf.samples = 0;
+				l->linklisttimer = LINKLISTTIME;
+				strcpy(lstr,"L ");
+				__mklinklist(myrpt,l,lstr + 2);
+				if (l->chan)
+				{
+					lf.datalen = strlen(lstr) + 1;
+					lf.data = lstr;
+					ast_write(l->chan,&lf);
+					if (debug > 6) ast_log(LOG_NOTICE,
+						"@@@@ node %s sent node string %s to node %s\n",
+							myrpt->name,lstr,l->name);
+				}
+			}
+			if (l->newkey)
+			{
+				if ((l->retxtimer += elap) >= REDUNDANT_TX_TIME)
+				{
 					l->retxtimer = 0;
-					if (l->chan)
-						ast_indicate(l->chan, AST_CONTROL_RADIO_UNKEY);
+					if (l->chan && l->phonemode == 0) 
+					{
+						if (l->lasttx)
+							ast_indicate(l->chan,AST_CONTROL_RADIO_KEY);
+						else
+							ast_indicate(l->chan,AST_CONTROL_RADIO_UNKEY);
+					}
+				}
+				if ((l->rerxtimer += elap) >= (REDUNDANT_TX_TIME * 5))
+				{
+					if (debug == 7) printf("@@@@ rx un-key\n");
+					l->lastrealrx = 0;
+					l->rerxtimer = 0;
+					if (l->lastrx1)
+					{
+						if (myrpt->p.archivedir)
+						{
+							char str[100];
+	
+							sprintf(str,"RXUNKEY(T),%s",l->name);
+							donodelog(myrpt,str);
+						}
+						if(myrpt->p.duplex) 
+							rpt_telemetry(myrpt,LINKUNKEY,l);
+						l->lastrx1 = 0;
+					}
 				}
-			} else
-				l->retxtimer = 0;
-			if (l->disctime) { /* Disconnect timer active on a channel ? */
+			}
+			if (l->disctime) /* Disconnect timer active on a channel ? */
+			{
 				l->disctime -= elap;
 				if (l->disctime <= 0) /* Disconnect timer expired on inbound channel ? */
 					l->disctime = 0; /* Yep */
 			}
 
-			if (l->retrytimer) {
+			if (l->retrytimer)
+			{
 				l->retrytimer -= elap;
-				if (l->retrytimer < 0)
-					l->retrytimer = 0;
+				if (l->retrytimer < 0) l->retrytimer = 0;
 			}
 
 			/* Tally connect time */
 			l->connecttime += elap;
 
 			/* ignore non-timing channels */
-			if (l->elaptime < 0) {
+			if (l->elaptime < 0)
+			{
 				l = l->next;
 				continue;
 			}
 			l->elaptime += elap;
 			/* if connection has taken too long */
 			if ((l->elaptime > MAXCONNECTTIME) && 
-			   ((!l->chan) || (l->chan->_state != AST_STATE_UP))) {
+			   ((!l->chan) || (l->chan->_state != AST_STATE_UP)))
+			{
 				l->elaptime = 0;
 				rpt_mutex_unlock(&myrpt->lock);
-				if (l->chan)
-					ast_softhangup(l->chan, AST_SOFTHANGUP_DEV);
+				if (l->chan) ast_softhangup(l->chan,AST_SOFTHANGUP_DEV);
 				rpt_mutex_lock(&myrpt->lock);
 				break;
 			}
 			if ((!l->chan) && (!l->retrytimer) && l->outbound && 
-				(l->retries++ < MAX_RETRIES) && (l->hasconnected)) {
-				if (l->chan)
-					ast_hangup(l->chan);
+				(l->retries++ < l->max_retries) && (l->hasconnected))
+			{
+				if (l->chan) ast_hangup(l->chan);
+				l->chan = 0;
 				rpt_mutex_unlock(&myrpt->lock);
-				if ((l->name[0] != '0') && (!l->isremote)) {
-					l->retrytimer = MAX_RETRIES + 1;
-				} else {
-					if (attempt_reconnect(myrpt, l) == -1) {
+				if ((l->name[0] != '0') && (!l->isremote))
+				{
+					if (attempt_reconnect(myrpt,l) == -1)
+					{
 						l->retrytimer = RETRY_TIMER_MS;
-					}
+					} 
+				}
+				else 
+				{
+					l->retrytimer = l->max_retries + 1;
 				}
+
 				rpt_mutex_lock(&myrpt->lock);
 				break;
 			}
-			if ((!l->chan) && (!l->retrytimer) && l->outbound && (l->retries >= MAX_RETRIES)) {
+			if ((!l->chan) && (!l->retrytimer) && l->outbound &&
+				(l->retries >= l->max_retries))
+			{
 				/* remove from queue */
 				remque((struct qelem *) l);
-				if (!strcmp(myrpt->cmdnode, l->name))
+				if (!strcmp(myrpt->cmdnode,l->name))
 					myrpt->cmdnode[0] = 0;
 				rpt_mutex_unlock(&myrpt->lock);
-				if (l->name[0] != '0') {
+				if (l->name[0] != '0')
+				{
 					if (!l->hasconnected)
-						rpt_telemetry(myrpt, CONNFAIL, l);
+						rpt_telemetry(myrpt,CONNFAIL,l);
+					else rpt_telemetry(myrpt,REMDISC,l);
+				}
+				if (myrpt->p.archivedir)
+				{
+					char str[100];
+
+					if (!l->hasconnected)
+						sprintf(str,"LINKFAIL,%s",l->name);
 					else
-						rpt_telemetry(myrpt, REMDISC, l);
+						sprintf(str,"LINKDISC,%s",l->name);
+					donodelog(myrpt,str);
 				}
 				/* hang-up on call to device */
 				ast_hangup(l->pchan);
 				ast_free(l);
-				rpt_mutex_lock(&myrpt->lock);
+                                rpt_mutex_lock(&myrpt->lock);
 				break;
 			}
-			if ((!l->chan) && (!l->disctime) && (!l->outbound)) {
-				/* remove from queue */
-				remque((struct qelem *) l);
-				if (!strcmp(myrpt->cmdnode, l->name))
-					myrpt->cmdnode[0] = 0;
-				rpt_mutex_unlock(&myrpt->lock);
-				if (l->name[0] != '0') {
-					rpt_telemetry(myrpt, REMDISC, l);
+            if ((!l->chan) && (!l->disctime) && (!l->outbound))
+            {
+				if(debug)ast_log(LOG_NOTICE, "LINKDISC AA\n");
+                /* remove from queue */
+                remque((struct qelem *) l);
+				if(myrpt->links.next==&myrpt->links)channel_revert(myrpt);
+                if (!strcmp(myrpt->cmdnode,l->name))myrpt->cmdnode[0] = 0;
+                rpt_mutex_unlock(&myrpt->lock);
+				if (l->name[0] != '0') 
+				{
+	            	rpt_telemetry(myrpt,REMDISC,l);
 				}
-				/* hang-up on call to device */
-				ast_hangup(l->pchan);
-				ast_free(l);
-				rpt_mutex_lock(&myrpt->lock);
+				if (myrpt->p.archivedir)
+				{
+					char str[100];
+					sprintf(str,"LINKDISC,%s",l->name);
+					donodelog(myrpt,str);
+				}
+                /* hang-up on call to device */
+                ast_hangup(l->pchan);
+                ast_free(l);
+                rpt_mutex_lock(&myrpt->lock);
+                break;
+            }
+			l = l->next;
+		}
+		if (myrpt->linkposttimer)
+		{
+			myrpt->linkposttimer -= elap;
+			if (myrpt->linkposttimer < 0) myrpt->linkposttimer = 0;
+		}
+		if (myrpt->linkposttimer <= 0)
+		{
+			int nstr;
+			char lst,*str;
+			time_t now;
+
+			myrpt->linkposttimer = LINKPOSTTIME;
+			nstr = 0;
+			for(l = myrpt->links.next; l != &myrpt->links; l = l->next)
+			{
+				/* if is not a real link, ignore it */
+				if (l->name[0] == '0') continue;
+				nstr += strlen(l->name) + 1;
+			}
+			str = ast_malloc(nstr + 256);
+			if (!str)
+			{
+				ast_log(LOG_NOTICE,"Cannot ast_malloc()\n");
 				break;
 			}
-			l = l->next;
+			nstr = 0;
+			strcpy(str,"nodes=");
+			for(l = myrpt->links.next; l != &myrpt->links; l = l->next)
+			{
+				/* if is not a real link, ignore it */
+				if (l->name[0] == '0') continue;
+				lst = 'T';
+				if (!l->mode) lst = 'R';
+				if (!l->thisconnected) lst = 'C';
+				if (nstr) strcat(str,",");
+				sprintf(str + strlen(str),"%c%s",lst,l->name);
+				nstr = 1;
+			}
+                	p = strstr(tdesc, "version");
+                	if(p){
+				int vmajor,vminor;
+				if(sscanf(p, "version %d.%d", &vmajor, &vminor) == 2)
+					sprintf(str + strlen(str),"&apprptvers=%d.%d",vmajor,vminor);
+			}
+			time(&now);
+			sprintf(str + strlen(str),"&apprptuptime=%d",(int)(now-starttime));
+			sprintf(str + strlen(str),
+			"&totalkerchunks=%d&totalkeyups=%d&totaltxtime=%d&timeouts=%d&totalexecdcommands=%d",
+			myrpt->totalkerchunks,myrpt->totalkeyups,(int) myrpt->totaltxtime/1000,
+			myrpt->timeouts,myrpt->totalexecdcommands);
+			rpt_mutex_unlock(&myrpt->lock);
+			statpost(myrpt,str);
+			rpt_mutex_lock(&myrpt->lock);
+			ast_free(str);
+		}
+		if (myrpt->keyposttimer)
+		{
+			myrpt->keyposttimer -= elap;
+			if (myrpt->keyposttimer < 0) myrpt->keyposttimer = 0;
+		}
+		if (myrpt->keyposttimer <= 0)
+		{
+			char str[100];
+			int n = 0;
+			time_t now;
+
+			myrpt->keyposttimer = KEYPOSTTIME;
+			time(&now);
+			if (myrpt->lastkeyedtime)
+			{
+				n = (int)(now - myrpt->lastkeyedtime);
+			}
+			sprintf(str,"keyed=%d&keytime=%d",myrpt->keyed,n);
+			rpt_mutex_unlock(&myrpt->lock);
+			statpost(myrpt,str);
+			rpt_mutex_lock(&myrpt->lock);
 		}
-		if (totx) {
+		if(totx){
 			myrpt->dailytxtime += elap;
 			myrpt->totaltxtime += elap;
 		}
 		i = myrpt->tailtimer;
-		if (myrpt->tailtimer)
-			myrpt->tailtimer -= elap;
-		if (myrpt->tailtimer < 0)
-			myrpt->tailtimer = 0;
-		if ((i) && (myrpt->tailtimer == 0))
+		if (myrpt->tailtimer) myrpt->tailtimer -= elap;
+		if (myrpt->tailtimer < 0) myrpt->tailtimer = 0;
+		if((i) && (myrpt->tailtimer == 0))
 			myrpt->tailevent = 1;
-		if (myrpt->totimer)
-			myrpt->totimer -= elap;
-		if (myrpt->totimer < 0)
-			myrpt->totimer = 0;
-		if (myrpt->idtimer)
-			myrpt->idtimer -= elap;
-		if (myrpt->idtimer < 0)
-			myrpt->idtimer = 0;
-		if (myrpt->tmsgtimer)
-			myrpt->tmsgtimer -= elap;
-		if (myrpt->tmsgtimer < 0)
-			myrpt->tmsgtimer = 0;
+		if ((!myrpt->p.s[myrpt->p.sysstate_cur].totdisable) && myrpt->totimer) myrpt->totimer -= elap;
+		if (myrpt->totimer < 0) myrpt->totimer = 0;
+		if (myrpt->idtimer) myrpt->idtimer -= elap;
+		if (myrpt->idtimer < 0) myrpt->idtimer = 0;
+		if (myrpt->tmsgtimer) myrpt->tmsgtimer -= elap;
+		if (myrpt->tmsgtimer < 0) myrpt->tmsgtimer = 0;
+		if (myrpt->voxtotimer) myrpt->voxtotimer -= elap;
+		if (myrpt->voxtotimer < 0) myrpt->voxtotimer = 0;
+		if (myrpt->exttx)
+		{
+			myrpt->parrottimer = myrpt->p.parrottime;
+		}
+		else
+		{
+			if (myrpt->parrottimer) myrpt->parrottimer -= elap;
+			if (myrpt->parrottimer < 0) myrpt->parrottimer = 0;
+		}
 		/* do macro timers */
-		if (myrpt->macrotimer)
-			myrpt->macrotimer -= elap;
-		if (myrpt->macrotimer < 0)
-			myrpt->macrotimer = 0;
-		/* do gosub timers */
-		if (myrpt->gosubtimer)
-			myrpt->gosubtimer -= elap;
-		if (myrpt->gosubtimer < 0)
-			myrpt->gosubtimer = 0;
+		if (myrpt->macrotimer) myrpt->macrotimer -= elap;
+		if (myrpt->macrotimer < 0) myrpt->macrotimer = 0;
+		/* do local dtmf timer */
+		if (myrpt->dtmf_local_timer)
+		{
+			if (myrpt->dtmf_local_timer > 1) myrpt->dtmf_local_timer -= elap;
+			if (myrpt->dtmf_local_timer < 1) myrpt->dtmf_local_timer = 1;
+		}
+		do_dtmf_local(myrpt,0);
 		/* Execute scheduler appx. every 2 tenths of a second */
-		if (myrpt->skedtimer <= 0) {
+		if (myrpt->skedtimer <= 0){
 			myrpt->skedtimer = 200;
 			do_scheduler(myrpt);
-		} else
-			myrpt->skedtimer -= elap;
-		if (!ms) {
+		}
+		else
+			myrpt->skedtimer -=elap;
+		if (!ms) 
+		{
 			rpt_mutex_unlock(&myrpt->lock);
 			continue;
 		}
+		if (myrpt->p.parrotmode && (myrpt->parrotstate == 1) &&
+			(myrpt->parrottimer <= 0))
+		{
+
+			ci.confno = 0;
+			ci.confmode = 0;
+			ci.chan = 0;
+
+			/* first put the channel on the conference in announce mode */
+			if (ioctl(myrpt->parrotchannel->fds[0],ZT_SETCONF,&ci) == -1)
+			{
+				ast_log(LOG_WARNING, "Unable to set conference mode for parrot\n");
+				break;
+			}
+			if (myrpt->parrotstream) 
+				ast_closestream(myrpt->parrotstream);
+			myrpt->parrotstream = NULL;
+			myrpt->parrotstate = 2;
+			rpt_telemetry(myrpt,PARROT,(struct rpt_link *) myrpt->parrotcnt++); 
+		}			
+		if (myrpt->cmdAction.state == CMD_STATE_READY)
+		{ /* there is a command waiting to be processed */
+			int status;
+			myrpt->cmdAction.state = CMD_STATE_EXECUTING;
+			// lose the lock
+			rpt_mutex_unlock(&myrpt->lock);
+			// do the function
+			status = (*function_table[myrpt->cmdAction.functionNumber].function)(myrpt,myrpt->cmdAction.param, myrpt->cmdAction.digits, myrpt->cmdAction.command_source, NULL);
+			// get the lock again
+			rpt_mutex_lock(&myrpt->lock);
+			myrpt->cmdAction.state = CMD_STATE_IDLE;
+		} /* if myrpt->cmdAction.state == CMD_STATE_READY */
+		
 		c = myrpt->macrobuf[0];
-		if (c && (!myrpt->macrotimer)) {
+		time(&t);
+		if (c && (!myrpt->macrotimer) && 
+			starttime && (t > (starttime + START_DELAY)))
+		{
+			char cin = c & 0x7f;
 			myrpt->macrotimer = MACROTIME;
-			memmove(myrpt->macrobuf, myrpt->macrobuf + 1, sizeof(myrpt->macrobuf) - 1);
-			if ((c == 'p') || (c == 'P'))
+			memmove(myrpt->macrobuf,myrpt->macrobuf + 1,MAXMACRO - 1);
+			if ((cin == 'p') || (cin == 'P'))
 				myrpt->macrotimer = MACROPTIME;
 			rpt_mutex_unlock(&myrpt->lock);
-			local_dtmf_helper(myrpt, c);
-		} else
-			rpt_mutex_unlock(&myrpt->lock);
-		c = myrpt->gosubbuf[0];
-		if (c && (!myrpt->gosubtimer)) {
-			myrpt->gosubtimer = GOSUBTIME;
-			memmove(myrpt->gosubbuf, myrpt->gosubbuf + 1, sizeof(myrpt->gosubbuf) - 1);
-			if ((c == 'p') || (c == 'P'))
-				myrpt->gosubtimer = GOSUBPTIME;
-			rpt_mutex_unlock(&myrpt->lock);
-			local_dtmf_helper(myrpt, c);
-		} else
-			rpt_mutex_unlock(&myrpt->lock);
-		if (who == myrpt->rxchannel) { /* if it was a read from rx */
+			if (myrpt->p.archivedir)
+			{
+				char str[100];
+
+				sprintf(str,"DTMF(M),MAIN,%c",cin);
+				donodelog(myrpt,str);
+			}
+			local_dtmf_helper(myrpt,c);
+		} else rpt_mutex_unlock(&myrpt->lock);
+		if (who == myrpt->rxchannel) /* if it was a read from rx */
+		{
+			int ismuted;
+
 			f = ast_read(myrpt->rxchannel);
-			if (!f) {
-				ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (!f)
+			{
+				if (debug) printf("@@@@ rpt:Hung Up\n");
 				break;
 			}
-			if (f->frametype == AST_FRAME_VOICE) {
+			if (f->frametype == AST_FRAME_VOICE)
+			{
 #ifdef	_MDC_DECODE_H_
 				unsigned char ubuf[2560];
 				short *sp;
 				int n;
 #endif
 
-				if (!myrpt->localtx) {
-					memset(f->data, 0, f->datalen);
+				if ((!myrpt->localtx) && (!myrpt->p.linktolink)) {
+					memset(f->data,0,f->datalen);
 				}
 
 #ifdef	_MDC_DECODE_H_
 				sp = (short *) f->data;
 				/* convert block to unsigned char */
-				for (n = 0; n < f->datalen / 2; n++) {
+				for(n = 0; n < f->datalen / 2; n++)
+				{
 					ubuf[n] = (*sp++ >> 8) + 128;
 				}
-				n = mdc_decoder_process_samples(myrpt->mdc, ubuf, f->datalen / 2);
-				if (n == 1) {
-					unsigned char op, arg;
-					unsigned short unitID;
-
-					mdc_decoder_get_packet(myrpt->mdc, &op, &arg, &unitID);
-					if (debug > 2) {
-						ast_log(LOG_NOTICE, "Got (single-length) packet:\n");
-						ast_log(LOG_NOTICE, "op: %02x, arg: %02x, UnitID: %04x\n", op & 255, arg & 255, unitID);
-					}
-					if ((op == 1) && (arg == 0)) {
-						myrpt->lastunit = unitID;
-					}
+				n = mdc_decoder_process_samples(myrpt->mdc,ubuf,f->datalen / 2);
+				if (n == 1)
+				{
+						unsigned char op,arg;
+						unsigned short unitID;
+
+						mdc_decoder_get_packet(myrpt->mdc,&op,&arg,&unitID);
+						if (debug > 2)
+						{
+							ast_log(LOG_NOTICE,"Got (single-length) packet:\n");
+							ast_log(LOG_NOTICE,"op: %02x, arg: %02x, UnitID: %04x\n",
+								op & 255,arg & 255,unitID);
+						}
+						if ((op == 1) && (arg == 0))
+						{
+							myrpt->lastunit = unitID;
+							mdc1200_notify(myrpt,NULL,myrpt->lastunit);
+							mdc1200_send(myrpt,myrpt->lastunit);
+						}
 				}
-				if ((debug > 2) && (i == 2)) {
-					unsigned char op, arg, ex1, ex2, ex3, ex4;
+				if ((debug > 2) && (i == 2))
+				{
+					unsigned char op,arg,ex1,ex2,ex3,ex4;
 					unsigned short unitID;
 
-					mdc_decoder_get_double_packet(myrpt->mdc, &op, &arg, &unitID, &ex1, &ex2, &ex3, &ex4);
-					ast_log(LOG_NOTICE, "Got (double-length) packet:\n");
-					ast_log(LOG_NOTICE, "op: %02x, arg: %02x, UnitID: %04x\n", op & 255, arg & 255, unitID);
-					ast_log(LOG_NOTICE, "ex1: %02x, ex2: %02x, ex3: %02x, ex4: %02x\n",
+					mdc_decoder_get_double_packet(myrpt->mdc,&op,&arg,&unitID,
+						&ex1,&ex2,&ex3,&ex4);
+					ast_log(LOG_NOTICE,"Got (double-length) packet:\n");
+					ast_log(LOG_NOTICE,"op: %02x, arg: %02x, UnitID: %04x\n",
+						op & 255,arg & 255,unitID);
+					ast_log(LOG_NOTICE,"ex1: %02x, ex2: %02x, ex3: %02x, ex4: %02x\n",
 						ex1 & 255, ex2 & 255, ex3 & 255, ex4 & 255);
 				}
 #endif
 #ifdef	__RPT_NOTCH
 				/* apply inbound filters, if any */
-				rpt_filter(myrpt, f->data, f->datalen / 2);
+				rpt_filter(myrpt,f->data,f->datalen / 2);
+#endif
+				if (ioctl(myrpt->zaprxchannel->fds[0], ZT_GETCONFMUTE, &ismuted) == -1)
+				{
+					ismuted = 0;
+				}
+				if (dtmfed) ismuted = 1;
+				dtmfed = 0;
+				if (ismuted)
+				{
+					memset(f->data,0,f->datalen);
+					if (myrpt->lastf1)
+						memset(myrpt->lastf1->data,0,myrpt->lastf1->datalen);
+					if (myrpt->lastf2)
+						memset(myrpt->lastf2->data,0,myrpt->lastf2->datalen);
+				} 
+				if (f) f2 = ast_frdup(f);
+				else f2 = NULL;
+				f1 = myrpt->lastf2;
+				myrpt->lastf2 = myrpt->lastf1;
+				myrpt->lastf1 = f2;
+				if (ismuted)
+				{
+					if (myrpt->lastf1)
+						memset(myrpt->lastf1->data,0,myrpt->lastf1->datalen);
+					if (myrpt->lastf2)
+						memset(myrpt->lastf2->data,0,myrpt->lastf2->datalen);
+				}
+				if (f1)
+				{
+					ast_write(myrpt->pchannel,f1);
+					ast_frfree(f1);
+				}
+			}
+#ifndef	OLD_ASTERISK
+			else if (f->frametype == AST_FRAME_DTMF_BEGIN)
+			{
+				if (myrpt->lastf1)
+					memset(myrpt->lastf1->data,0,myrpt->lastf1->datalen);
+				if (myrpt->lastf2)
+					memset(myrpt->lastf2->data,0,myrpt->lastf2->datalen);
+				dtmfed = 1;
+			}
 #endif
-				ast_write(myrpt->pchannel, f);
-			} else if (f->frametype == AST_FRAME_DTMF) {
+			else if (f->frametype == AST_FRAME_DTMF)
+			{
 				c = (char) f->subclass; /* get DTMF char */
 				ast_frfree(f);
-				if (!myrpt->keyed)
-					continue;
-				local_dtmf_helper(myrpt, c);
+				if (myrpt->lastf1)
+					memset(myrpt->lastf1->data,0,myrpt->lastf1->datalen);
+				if (myrpt->lastf2)
+					memset(myrpt->lastf2->data,0,myrpt->lastf2->datalen);
+				dtmfed = 1;
+				if (!myrpt->keyed) continue;
+				c = func_xlat(myrpt,c,&myrpt->p.inxlat);
+				if (c) local_dtmf_helper(myrpt,c);
 				continue;
-			} else if (f->frametype == AST_FRAME_CONTROL) {
-				if (f->subclass == AST_CONTROL_HANGUP) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+			}						
+			else if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);
 					break;
 				}
 				/* if RX key */
-				if (f->subclass == AST_CONTROL_RADIO_KEY) {
-					if ((!lasttx) || (myrpt->p.duplex > 1)) {
-						ast_debug(8, "@@@@ rx key\n");
+				if (f->subclass == AST_CONTROL_RADIO_KEY)
+				{
+					if ((!lasttx) || (myrpt->p.duplex > 1) || (myrpt->p.linktolink)) 
+					{
+						if (debug == 7) printf("@@@@ rx key\n");
 						myrpt->keyed = 1;
+						time(&myrpt->lastkeyedtime);
+						myrpt->keyposttimer = KEYPOSTSHORTTIME;
+					}
+					if (myrpt->p.archivedir)
+					{
+						donodelog(myrpt,"RXKEY,MAIN");
 					}
+					if (f->datalen && f->data)
+					{
+						char *val, busy = 0;
+
+						if (debug) ast_log(LOG_NOTICE,"Got PL %s on node %s\n",(char *)f->data,myrpt->name);
+						// ctcss code autopatch initiate
+						if (strstr((char *)f->data,"/M/")&& !myrpt->macropatch)
+						{
+						    char val[16];
+							strcat(val,"*6");
+							myrpt->macropatch=1;
+							rpt_mutex_lock(&myrpt->lock);
+							if ((MAXMACRO - strlen(myrpt->macrobuf)) < strlen(val)){
+								rpt_mutex_unlock(&myrpt->lock);
+								busy=1;
+							}
+							if(!busy){
+								myrpt->macrotimer = MACROTIME;
+								strncat(myrpt->macrobuf,val,MAXMACRO - 1);
+								if (!busy) strcpy(myrpt->lasttone,(char*)f->data);
+							}
+							rpt_mutex_unlock(&myrpt->lock);
+						}
+						else if (strcmp((char *)f->data,myrpt->lasttone))
+						{
+							val = (char *) ast_variable_retrieve(myrpt->cfg, myrpt->p.tonemacro, (char *)f->data);
+							if (val) 
+							{
+								if (debug) ast_log(LOG_NOTICE,"Tone %s doing %s on node %s\n",(char *) f->data,val,myrpt->name);
+								rpt_mutex_lock(&myrpt->lock);
+								if ((MAXMACRO - strlen(myrpt->macrobuf)) < strlen(val)){
+									rpt_mutex_unlock(&myrpt->lock);
+									busy=1;
+								}
+								if(!busy){
+									myrpt->macrotimer = MACROTIME;
+									strncat(myrpt->macrobuf,val,MAXMACRO - 1);
+								}
+								rpt_mutex_unlock(&myrpt->lock);
+							}
+						 	if (!busy) strcpy(myrpt->lasttone,(char*)f->data);
+						}
+					} else myrpt->lasttone[0] = 0;
 				}
 				/* if RX un-key */
-				if (f->subclass == AST_CONTROL_RADIO_UNKEY) {
-					if ((!lasttx) || (myrpt->p.duplex > 1)) {
-						ast_debug(8, "@@@@ rx un-key\n");
-						if (myrpt->keyed) {
-							rpt_telemetry(myrpt, UNKEY, NULL);
+				if (f->subclass == AST_CONTROL_RADIO_UNKEY)
+				{
+					if ((!lasttx) || (myrpt->p.duplex > 1) || (myrpt->p.linktolink))
+					{
+						if (debug == 7) printf("@@@@ rx un-key\n");
+						if(myrpt->p.duplex && myrpt->keyed) {
+							rpt_telemetry(myrpt,UNKEY,NULL);
 						}
-						myrpt->keyed = 0;
+					}
+					myrpt->keyed = 0;
+					time(&myrpt->lastkeyedtime);
+					myrpt->keyposttimer = KEYPOSTSHORTTIME;
+					if (myrpt->p.archivedir)
+					{
+						donodelog(myrpt,"RXUNKEY,MAIN");
 					}
 				}
 			}
 			ast_frfree(f);
 			continue;
 		}
-		if (who == myrpt->pchannel) { /* if it was a read from pseudo */
+		if (who == myrpt->pchannel) /* if it was a read from pseudo */
+		{
 			f = ast_read(myrpt->pchannel);
-			if (!f) {
-				ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (!f)
+			{
+				if (debug) printf("@@@@ rpt:Hung Up\n");
 				break;
 			}
-			if (f->frametype == AST_FRAME_VOICE) {
-				ast_write(myrpt->txpchannel, f);
+			if (f->frametype == AST_FRAME_VOICE)
+			{
+				ast_write(myrpt->txpchannel,f);
 			}
-			if (f->frametype == AST_FRAME_CONTROL) {
-				if (f->subclass == AST_CONTROL_HANGUP) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);
 					break;
 				}
@@ -6457,15 +12256,85 @@ static void *rpt(void *this)
 			ast_frfree(f);
 			continue;
 		}
-		if (who == myrpt->txchannel) { /* if it was a read from tx */
+		if (who == myrpt->txchannel) /* if it was a read from tx */
+		{
 			f = ast_read(myrpt->txchannel);
-			if (!f) {
-				ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (!f)
+			{
+				if (debug) printf("@@@@ rpt:Hung Up\n");
+				break;
+			}
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
+					ast_frfree(f);
+					break;
+				}
+			}
+			ast_frfree(f);
+			continue;
+		}
+		if (who == myrpt->zaptxchannel) /* if it was a read from pseudo-tx */
+		{
+			f = ast_read(myrpt->zaptxchannel);
+			if (!f)
+			{
+				if (debug) printf("@@@@ rpt:Hung Up\n");
 				break;
 			}
-			if (f->frametype == AST_FRAME_CONTROL) {
-				if (f->subclass == AST_CONTROL_HANGUP) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (f->frametype == AST_FRAME_VOICE)
+			{
+				struct ast_frame *f1;
+
+				if (myrpt->p.duplex < 2)
+				{
+					if (myrpt->txrealkeyed) 
+					{
+						if ((!myfirst) && myrpt->callmode)
+						{
+						    x = 0;
+						    AST_LIST_TRAVERSE(&myrpt->txq, f1,
+							frame_list) x++;
+						    for(;x < myrpt->p.simplexpatchdelay; x++)
+						    {
+								f1 = ast_frdup(f);
+								memset(f1->data,0,f1->datalen);
+								AST_LIST_INSERT_TAIL(&myrpt->txq,f1,frame_list);
+						    }
+						    myfirst = 1;
+						}
+						f1 = ast_frdup(f);
+						AST_LIST_INSERT_TAIL(&myrpt->txq,
+							f1,frame_list);
+					} else myfirst = 0;
+					x = 0;
+					AST_LIST_TRAVERSE(&myrpt->txq, f1,
+						frame_list) x++;
+					if (!x)
+					{
+						memset(f->data,0,f->datalen);
+					}
+					else
+					{
+						ast_frfree(f);
+						f = AST_LIST_REMOVE_HEAD(&myrpt->txq,
+							frame_list);
+					}
+				}
+				else
+				{
+					while((f1 = AST_LIST_REMOVE_HEAD(&myrpt->txq,
+						frame_list))) ast_frfree(f1);
+				}
+				ast_write(myrpt->txchannel,f);
+			}
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);
 					break;
 				}
@@ -6476,35 +12345,72 @@ static void *rpt(void *this)
 		toexit = 0;
 		rpt_mutex_lock(&myrpt->lock);
 		l = myrpt->links.next;
-		while (l != &myrpt->links) {
-			if (l->disctime) {
+		while(l != &myrpt->links)
+		{
+			int remnomute;
+			struct timeval now;
+
+			if (l->disctime)
+			{
 				l = l->next;
 				continue;
 			}
-			if (who == l->chan) { /* if it was a read from rx */
-				remrx = 0;
-				/* see if any other links are receiving */
-				m = myrpt->links.next;
-				while (m != &myrpt->links) {
-					/* if not us, count it */
-					if ((m != l) && (m->lastrx))
-						remrx = 1;
-					m = m->next;
-				}
-				rpt_mutex_unlock(&myrpt->lock);
-				totx = (((l->isremote) ? myrpt->localtx : 
+
+			remrx = 0;
+			/* see if any other links are receiving */
+			m = myrpt->links.next;
+			while(m != &myrpt->links)
+			{
+				/* if not us, count it */
+				if ((m != l) && (m->lastrx)) remrx = 1;
+				m = m->next;
+			}
+			rpt_mutex_unlock(&myrpt->lock);
+			now = ast_tvnow();
+			if ((who == l->chan) || (!l->lastlinktv.tv_sec) ||
+				(ast_tvdiff_ms(now,l->lastlinktv) >= 19))
+			{
+				l->lastlinktv = now;
+				remnomute = myrpt->localtx && 
+				    (!(myrpt->cmdnode[0] || 
+					(myrpt->dtmfidx > -1)));
+				totx = (((l->isremote) ? (remnomute) : 
 					myrpt->exttx) || remrx) && l->mode;
-				if (l->chan && (l->lasttx != totx)) {
-					if (totx) {
-						ast_indicate(l->chan, AST_CONTROL_RADIO_KEY);
-					} else {
-						ast_indicate(l->chan, AST_CONTROL_RADIO_UNKEY);
+				if (l->phonemode == 0 && l->chan && (l->lasttx != totx))
+				{
+					if (totx)
+					{
+						ast_indicate(l->chan,AST_CONTROL_RADIO_KEY);
+					}
+					else
+					{
+						ast_indicate(l->chan,AST_CONTROL_RADIO_UNKEY);
+					}
+					if (myrpt->p.archivedir)
+					{
+						char str[100];
+
+						if (totx)
+							sprintf(str,"TXKEY,%s",l->name);
+						else
+							sprintf(str,"TXUNKEY,%s",l->name);
+						donodelog(myrpt,str);
 					}
 				}
 				l->lasttx = totx;
+			}
+			rpt_mutex_lock(&myrpt->lock);
+			if (who == l->chan) /* if it was a read from rx */
+			{
+				rpt_mutex_unlock(&myrpt->lock);
 				f = ast_read(l->chan);
-				if (!f) {
-					if ((!l->disced) && (!l->outbound)) {
+				if (!f)
+				{
+					rpt_mutex_lock(&myrpt->lock);
+					__kickshort(myrpt);
+					rpt_mutex_unlock(&myrpt->lock);
+					if ((!l->disced) && (!l->outbound))
+					{
 						if ((l->name[0] == '0') || l->isremote)
 							l->disctime = 1;
 						else
@@ -6515,31 +12421,49 @@ static void *rpt(void *this)
 						break;
 					}
 
-					if (l->retrytimer) {
+					if (l->retrytimer) 
+					{
+						ast_hangup(l->chan);
+						l->chan = 0;
 						rpt_mutex_lock(&myrpt->lock);
 						break; 
 					}
-					if (l->outbound && (l->retries++ < MAX_RETRIES) && (l->hasconnected)) {
+					if (l->outbound && (l->retries++ < l->max_retries) && (l->hasconnected))
+					{
 						rpt_mutex_lock(&myrpt->lock);
-						ast_hangup(l->chan);
+						if (l->chan) ast_hangup(l->chan);
 						l->chan = 0;
-						rpt_mutex_unlock(&myrpt->lock);
-						if (attempt_reconnect(myrpt, l) == -1) {
-							l->retrytimer = RETRY_TIMER_MS;
-						}
-						rpt_mutex_lock(&myrpt->lock);
+						l->hasconnected = 1;
+						l->retrytimer = RETRY_TIMER_MS;
+						l->elaptime = 0;
+						l->connecttime = 0;
+						l->thisconnected = 0;
 						break;
 					}
 					rpt_mutex_lock(&myrpt->lock);
 					/* remove from queue */
 					remque((struct qelem *) l);
-					if (!strcmp(myrpt->cmdnode, l->name))
+					if (!strcmp(myrpt->cmdnode,l->name))
 						myrpt->cmdnode[0] = 0;
+					__kickshort(myrpt);
 					rpt_mutex_unlock(&myrpt->lock);
 					if (!l->hasconnected)
-						rpt_telemetry(myrpt, CONNFAIL, l);
-					else if (l->disced != 2)
-						rpt_telemetry(myrpt, REMDISC, l);
+						rpt_telemetry(myrpt,CONNFAIL,l);
+					else if (l->disced != 2) rpt_telemetry(myrpt,REMDISC,l);
+					if (myrpt->p.archivedir)
+					{
+						char str[100];
+
+						if (!l->hasconnected)
+							sprintf(str,"LINKFAIL,%s",l->name);
+						else
+							sprintf(str,"LINKDISC,%s",l->name);
+						donodelog(myrpt,str);
+					}
+					if (l->lastf1) ast_frfree(l->lastf1);
+					l->lastf1 = NULL;
+					if (l->lastf2) ast_frfree(l->lastf2);
+					l->lastf2 = NULL;
 					/* hang-up on call to device */
 					ast_hangup(l->chan);
 					ast_hangup(l->pchan);
@@ -6547,43 +12471,192 @@ static void *rpt(void *this)
 					rpt_mutex_lock(&myrpt->lock);
 					break;
 				}
-				if (f->frametype == AST_FRAME_VOICE) {
-					if (!l->lastrx) {
-						memset(f->data, 0, f->datalen);
+				if (f->frametype == AST_FRAME_VOICE)
+				{
+					int ismuted,n1;
+
+					if ((l->phonemode) && (l->phonevox))
+					{
+						n1 = dovox(&l->vox,
+							f->data,f->datalen / 2);
+						if (n1 != l->wasvox)
+						{
+							if (debug)ast_log(LOG_DEBUG,"Link Node %s, vox %d\n",l->name,n1);
+							l->wasvox = n1;
+							l->voxtostate = 0;
+							if (n1) l->voxtotimer = myrpt->p.voxtimeout_ms;
+							else l->voxtotimer = 0;
+						}
+						if (l->lastrealrx || n1)
+						{
+							if (!myfirst)
+							{
+							    x = 0;
+							    AST_LIST_TRAVERSE(&l->rxq, f1,
+								frame_list) x++;
+							    for(;x < myrpt->p.simplexphonedelay; x++)
+								{
+									f1 = ast_frdup(f);
+									memset(f1->data,0,f1->datalen);
+									AST_LIST_INSERT_TAIL(&l->rxq,
+										f1,frame_list);
+							    }
+							    myfirst = 1;
+							}
+							f1 = ast_frdup(f);
+							AST_LIST_INSERT_TAIL(&l->rxq,f1,frame_list);
+						} else myfirst = 0; 
+						x = 0;
+						AST_LIST_TRAVERSE(&l->rxq, f1,frame_list) x++;
+						if (!x)
+						{
+							memset(f->data,0,f->datalen);
+						}
+						else
+						{
+							ast_frfree(f);
+							f = AST_LIST_REMOVE_HEAD(&l->rxq,frame_list);
+						}
+						if (ioctl(l->chan->fds[0], ZT_GETCONFMUTE, &ismuted) == -1)
+						{
+							ismuted = 0;
+						}
+						/* if not receiving, zero-out audio */
+						ismuted |= (!l->lastrx);
+						if (l->dtmfed && l->phonemode) ismuted = 1;
+						l->dtmfed = 0;
+						if (ismuted)
+						{
+							memset(f->data,0,f->datalen);
+							if (l->lastf1)
+								memset(l->lastf1->data,0,l->lastf1->datalen);
+							if (l->lastf2)
+								memset(l->lastf2->data,0,l->lastf2->datalen);
+						} 
+						if (f) f2 = ast_frdup(f);
+						else f2 = NULL;
+						f1 = l->lastf2;
+						l->lastf2 = l->lastf1;
+						l->lastf1 = f2;
+						if (ismuted)
+						{
+							if (l->lastf1)
+								memset(l->lastf1->data,0,l->lastf1->datalen);
+							if (l->lastf2)
+								memset(l->lastf2->data,0,l->lastf2->datalen);
+						}
+						if (f1)
+						{
+							ast_write(l->pchan,f1);
+							ast_frfree(f1);
+						}
+					}
+					else
+					{
+						if (!l->lastrx)
+							memset(f->data,0,f->datalen);
+						ast_write(l->pchan,f);
 					}
-					ast_write(l->pchan, f);
 				}
-				if (f->frametype == AST_FRAME_TEXT) {
-					handle_link_data(myrpt, l, f->data);
+#ifndef	OLD_ASTERISK
+				else if (f->frametype == AST_FRAME_DTMF_BEGIN)
+				{
+					if (l->lastf1)
+						memset(l->lastf1->data,0,l->lastf1->datalen);
+					if (l->lastf2)
+						memset(l->lastf2->data,0,l->lastf2->datalen);
+					l->dtmfed = 1;
+				}
+#endif
+				if (f->frametype == AST_FRAME_TEXT)
+				{
+					handle_link_data(myrpt,l,f->data);
 				}
-				if (f->frametype == AST_FRAME_DTMF) {
-					handle_link_phone_dtmf(myrpt, l, f->subclass);
+				if (f->frametype == AST_FRAME_DTMF)
+				{
+					if (l->lastf1)
+						memset(l->lastf1->data,0,l->lastf1->datalen);
+					if (l->lastf2)
+						memset(l->lastf2->data,0,l->lastf2->datalen);
+					l->dtmfed = 1;
+					handle_link_phone_dtmf(myrpt,l,f->subclass);
 				}
-				if (f->frametype == AST_FRAME_CONTROL) {
-					if (f->subclass == AST_CONTROL_ANSWER) {
+				if (f->frametype == AST_FRAME_CONTROL)
+				{
+					if (f->subclass == AST_CONTROL_ANSWER)
+					{
 						char lconnected = l->connected;
+
+						__kickshort(myrpt);
 						l->connected = 1;
 						l->hasconnected = 1;
+						l->thisconnected = 1;
 						l->elaptime = -1;
-						l->retries = 0;
+						if (!l->phonemode) send_newkey(l->chan);
+						if (!l->isremote) l->retries = 0;
 						if (!lconnected) 
-							rpt_telemetry(myrpt, CONNECTED, l);
+						{
+							rpt_telemetry(myrpt,CONNECTED,l);
+							if (myrpt->p.archivedir)
+							{
+								char str[100];
+
+								if (l->mode)
+									sprintf(str,"LINKTRX,%s",l->name);
+								else
+									sprintf(str,"LINKMONITOR,%s",l->name);
+								donodelog(myrpt,str);
+							}
+						}		
 						else
 							l->reconnects++;
 					}
 					/* if RX key */
-					if (f->subclass == AST_CONTROL_RADIO_KEY) {
-						ast_debug(8, "@@@@ rx key\n");
-						l->lastrx = 1;
+					if (f->subclass == AST_CONTROL_RADIO_KEY)
+					{
+						if (debug == 7 ) printf("@@@@ rx key\n");
+						l->lastrealrx = 1;
+						l->rerxtimer = 0;
+						if (!l->lastrx1)
+						{
+							if (myrpt->p.archivedir)
+							{
+								char str[100];
+
+								sprintf(str,"RXKEY,%s",l->name);
+								donodelog(myrpt,str);
+							}
+							l->lastrx1 = 1;
+						}
 					}
 					/* if RX un-key */
-					if (f->subclass == AST_CONTROL_RADIO_UNKEY) {
-						ast_debug(8, "@@@@ rx un-key\n");
-						l->lastrx = 0;
+					if (f->subclass == AST_CONTROL_RADIO_UNKEY)
+					{
+						if (debug == 7) printf("@@@@ rx un-key\n");
+						l->lastrealrx = 0;
+						l->rerxtimer = 0;
+						if (l->lastrx1)
+						{
+							if (myrpt->p.archivedir)
+							{
+								char str[100];
+
+								sprintf(str,"RXUNKEY,%s",l->name);
+								donodelog(myrpt,str);
+							}
+							l->lastrx1 = 0;
+							if(myrpt->p.duplex) 
+								rpt_telemetry(myrpt,LINKUNKEY,l);
+						}
 					}
-					if (f->subclass == AST_CONTROL_HANGUP) {
+					if (f->subclass == AST_CONTROL_HANGUP)
+					{
 						ast_frfree(f);
-						if ((!l->outbound) && (!l->disced)) {
+						rpt_mutex_lock(&myrpt->lock);
+						__kickshort(myrpt);
+						rpt_mutex_unlock(&myrpt->lock);
+						if ((!l->outbound) && (!l->disced))
+						{
 							if ((l->name[0] == '0') || l->isremote)
 								l->disctime = 1;
 							else
@@ -6593,31 +12666,49 @@ static void *rpt(void *this)
 							l->chan = 0;
 							break;
 						}
-						if (l->retrytimer) {
+						if (l->retrytimer) 
+						{
+							if (l->chan) ast_hangup(l->chan);
+							l->chan = 0;
 							rpt_mutex_lock(&myrpt->lock);
 							break;
 						}
-						if (l->outbound && (l->retries++ < MAX_RETRIES) && (l->hasconnected)) {
+						if (l->outbound && (l->retries++ < l->max_retries) && (l->hasconnected))
+						{
 							rpt_mutex_lock(&myrpt->lock);
-							ast_hangup(l->chan);
+							if (l->chan) ast_hangup(l->chan);
 							l->chan = 0;
-							rpt_mutex_unlock(&myrpt->lock);
-							if (attempt_reconnect(myrpt, l) == -1) {
-								l->retrytimer = RETRY_TIMER_MS;
-							}
-							rpt_mutex_lock(&myrpt->lock);
+							l->hasconnected = 1;
+							l->elaptime = 0;
+							l->retrytimer = RETRY_TIMER_MS;
+							l->connecttime = 0;
+							l->thisconnected = 0;
 							break;
 						}
 						rpt_mutex_lock(&myrpt->lock);
 						/* remove from queue */
 						remque((struct qelem *) l);
-						if (!strcmp(myrpt->cmdnode, l->name))
+						if (!strcmp(myrpt->cmdnode,l->name))
 							myrpt->cmdnode[0] = 0;
+						__kickshort(myrpt);
 						rpt_mutex_unlock(&myrpt->lock);
 						if (!l->hasconnected)
-							rpt_telemetry(myrpt, CONNFAIL, l);
-						else if (l->disced != 2)
-							rpt_telemetry(myrpt, REMDISC, l);
+							rpt_telemetry(myrpt,CONNFAIL,l);
+						else if (l->disced != 2) rpt_telemetry(myrpt,REMDISC,l);
+						if (myrpt->p.archivedir)
+						{
+							char str[100];
+
+							if (!l->hasconnected)
+								sprintf(str,"LINKFAIL,%s",l->name);
+							else
+								sprintf(str,"LINKDISC,%s",l->name);
+							donodelog(myrpt,str);
+						}
+						if (l->lastf1) ast_frfree(l->lastf1);
+						l->lastf1 = NULL;
+						if (l->lastf2) ast_frfree(l->lastf2);
+						l->lastf2 = NULL;
 						/* hang-up on call to device */
 						ast_hangup(l->chan);
 						ast_hangup(l->pchan);
@@ -6630,22 +12721,26 @@ static void *rpt(void *this)
 				rpt_mutex_lock(&myrpt->lock);
 				break;
 			}
-			if (who == l->pchan) {
+			if (who == l->pchan) 
+			{
 				rpt_mutex_unlock(&myrpt->lock);
 				f = ast_read(l->pchan);
-				if (!f) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+				if (!f)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					toexit = 1;
 					rpt_mutex_lock(&myrpt->lock);
 					break;
 				}
-				if (f->frametype == AST_FRAME_VOICE) {
-					if (l->chan)
-						ast_write(l->chan, f);
+				if (f->frametype == AST_FRAME_VOICE)
+				{
+					if (l->chan) ast_write(l->chan,f);
 				}
-				if (f->frametype == AST_FRAME_CONTROL) {
-					if (f->subclass == AST_CONTROL_HANGUP) {
-						ast_debug(1, "@@@@ rpt:Hung Up\n");
+				if (f->frametype == AST_FRAME_CONTROL)
+				{
+					if (f->subclass == AST_CONTROL_HANGUP)
+					{
+						if (debug) printf("@@@@ rpt:Hung Up\n");
 						ast_frfree(f);
 						toexit = 1;
 						rpt_mutex_lock(&myrpt->lock);
@@ -6659,17 +12754,114 @@ static void *rpt(void *this)
 			l = l->next;
 		}
 		rpt_mutex_unlock(&myrpt->lock);
-		if (toexit)
-			break;
-		if (who == myrpt->txpchannel) { /* if it was a read from remote tx */
+		if (toexit) break;
+		if (who == myrpt->monchannel) 
+		{
+			f = ast_read(myrpt->monchannel);
+			if (!f)
+			{
+				if (debug) printf("@@@@ rpt:Hung Up\n");
+				break;
+			}
+			if (f->frametype == AST_FRAME_VOICE)
+			{
+				if (myrpt->monstream) 
+					ast_writestream(myrpt->monstream,f);
+			}
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
+					ast_frfree(f);
+					break;
+				}
+			}
+			ast_frfree(f);
+			continue;
+		}
+		if (myrpt->parrotchannel && (who == myrpt->parrotchannel))
+		{
+			f = ast_read(myrpt->parrotchannel);
+			if (!f)
+			{
+				if (debug) printf("@@@@ rpt:Hung Up\n");
+				break;
+			}
+			if (!myrpt->p.parrotmode)
+			{
+				char myfname[300];
+
+				if (myrpt->parrotstream)
+				{
+					ast_closestream(myrpt->parrotstream);
+					myrpt->parrotstream = 0;
+				}
+				sprintf(myfname,PARROTFILE,myrpt->name,myrpt->parrotcnt);
+				strcat(myfname,".wav");
+				unlink(myfname);			
+			} else if (f->frametype == AST_FRAME_VOICE)
+			{
+				if (myrpt->parrotstream) 
+					ast_writestream(myrpt->parrotstream,f);
+			}
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
+					ast_frfree(f);
+					break;
+				}
+			}
+			ast_frfree(f);
+			continue;
+		}
+		if (myrpt->voxchannel && (who == myrpt->voxchannel))
+		{
+			f = ast_read(myrpt->voxchannel);
+			if (!f)
+			{
+				if (debug) printf("@@@@ rpt:Hung Up\n");
+				break;
+			}
+			if (f->frametype == AST_FRAME_VOICE)
+			{
+				n = dovox(&myrpt->vox,f->data,f->datalen / 2);
+				if (n != myrpt->wasvox)
+				{
+					if (debug) ast_log(LOG_DEBUG,"Node %s, vox %d\n",myrpt->name,n);
+					myrpt->wasvox = n;
+					myrpt->voxtostate = 0;
+					if (n) myrpt->voxtotimer = myrpt->p.voxtimeout_ms;
+					else myrpt->voxtotimer = 0;
+				}
+			}
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
+					ast_frfree(f);
+					break;
+				}
+			}
+			ast_frfree(f);
+			continue;
+		}
+		if (who == myrpt->txpchannel) /* if it was a read from remote tx */
+		{
 			f = ast_read(myrpt->txpchannel);
-			if (!f) {
-				ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (!f)
+			{
+				if (debug) printf("@@@@ rpt:Hung Up\n");
 				break;
 			}
-			if (f->frametype == AST_FRAME_CONTROL) {
-				if (f->subclass == AST_CONTROL_HANGUP) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);
 					break;
 				}
@@ -6680,66 +12872,93 @@ static void *rpt(void *this)
 	}
 	usleep(100000);
 	ast_hangup(myrpt->pchannel);
+	ast_hangup(myrpt->monchannel);
+	if (myrpt->parrotchannel) ast_hangup(myrpt->parrotchannel);
+	myrpt->parrotstate = 0;
+	if (myrpt->voxchannel) ast_hangup(myrpt->voxchannel);
 	ast_hangup(myrpt->txpchannel);
-	if (myrpt->txchannel != myrpt->rxchannel)
-		ast_hangup(myrpt->txchannel);
+	if (myrpt->txchannel != myrpt->rxchannel) ast_hangup(myrpt->txchannel);
+	if (myrpt->zaptxchannel != myrpt->txchannel) ast_hangup(myrpt->zaptxchannel);
+	if (myrpt->lastf1) ast_frfree(myrpt->lastf1);
+	myrpt->lastf1 = NULL;
+	if (myrpt->lastf2) ast_frfree(myrpt->lastf2);
+	myrpt->lastf2 = NULL;
 	ast_hangup(myrpt->rxchannel);
 	rpt_mutex_lock(&myrpt->lock);
 	l = myrpt->links.next;
-	while (l != &myrpt->links) {
+	while(l != &myrpt->links)
+	{
 		struct rpt_link *ll = l;
 		/* remove from queue */
 		remque((struct qelem *) l);
 		/* hang-up on call to device */
-		if (l->chan)
-			ast_hangup(l->chan);
+		if (l->chan) ast_hangup(l->chan);
 		ast_hangup(l->pchan);
 		l = l->next;
 		ast_free(ll);
 	}
+	if (myrpt->xlink  == 1) myrpt->xlink = 2;
 	rpt_mutex_unlock(&myrpt->lock);
-	ast_debug(1, "@@@@ rpt:Hung up channel\n");
+	if (debug) printf("@@@@ rpt:Hung up channel\n");
 	myrpt->rpt_thread = AST_PTHREADT_STOP;
 	pthread_exit(NULL); 
 	return NULL;
 }
 
 	
-static void *rpt_master(void *config)
+static void *rpt_master(void *ignore)
 {
-	int	i, n;
-	struct ast_config *cfg;
-	char *this;
-	const char *val;
+int	i,n;
+pthread_attr_t attr;
+struct ast_config *cfg;
+char *this,*val;
 
+	/* init nodelog queue */
+	nodelog.next = nodelog.prev = &nodelog;
 	/* go thru all the specified repeaters */
 	this = NULL;
 	n = 0;
-	rpt_vars[n].cfg = config;
+#ifndef OLD_ASTERISK
+	/* wait until asterisk starts */
+        while(!ast_test_flag(&ast_options,AST_OPT_FLAG_FULLY_BOOTED))
+                usleep(250000);
+#endif
+#ifdef	NEW_ASTERISK
+	rpt_vars[n].cfg = ast_config_load("rpt.conf",config_flags);
+#else
+	rpt_vars[n].cfg = ast_config_load("rpt.conf");
+#endif
 	cfg = rpt_vars[n].cfg;
 	if (!cfg) {
 		ast_log(LOG_NOTICE, "Unable to open radio repeater configuration rpt.conf.  Radio Repeater disabled.\n");
 		pthread_exit(NULL);
 	}
-	while ((this = ast_category_browse(cfg, this)) != NULL) {
-		for (i = 0; i < strlen(this); i++) {
-			if ((this[i] < '0') || (this[i] > '9'))
+	while((this = ast_category_browse(cfg,this)) != NULL)
+	{
+		for(i = 0 ; i < strlen(this) ; i++){
+			if((this[i] < '0') || (this[i] > '9'))
 				break;
 		}
-		if (i != strlen(this))
-			continue; /* Not a node defn */
-		memset(&rpt_vars[n], 0, sizeof(rpt_vars[n]));
+		if(i != strlen(this)) continue; /* Not a node defn */
+		memset(&rpt_vars[n],0,sizeof(rpt_vars[n]));
 		rpt_vars[n].name = ast_strdup(this);
-		val = ast_variable_retrieve(cfg, this, "rxchannel");
-		if (val)
-			rpt_vars[n].rxchanname = ast_strdup(val);
-		val = ast_variable_retrieve(cfg, this, "txchannel");
-		if (val)
-			rpt_vars[n].txchanname = ast_strdup(val);
-		val = ast_variable_retrieve(cfg, this, "remote");
-		if (val)
-			rpt_vars[n].remote = ast_strdup(val);
+		val = (char *) ast_variable_retrieve(cfg,this,"rxchannel");
+		if (val) rpt_vars[n].rxchanname = ast_strdup(val);
+		val = (char *) ast_variable_retrieve(cfg,this,"txchannel");
+		if (val) rpt_vars[n].txchanname = ast_strdup(val);
+		rpt_vars[n].remote = 0;
+		rpt_vars[n].remoterig = "";
+		val = (char *) ast_variable_retrieve(cfg,this,"remote");
+		if (val) 
+		{
+			rpt_vars[n].remoterig = ast_strdup(val);
+			rpt_vars[n].remote = 1;
+		}
+		val = (char *) ast_variable_retrieve(cfg,this,"radiotype");
+		if (val) rpt_vars[n].remoterig = ast_strdup(val);
 		ast_mutex_init(&rpt_vars[n].lock);
+		ast_mutex_init(&rpt_vars[n].remlock);
+		ast_mutex_init(&rpt_vars[n].statpost_lock);
 		rpt_vars[n].tele.next = &rpt_vars[n].tele;
 		rpt_vars[n].tele.prev = &rpt_vars[n].tele;
 		rpt_vars[n].rpt_thread = AST_PTHREADT_NULL;
@@ -6753,55 +12972,137 @@ static void *rpt_master(void *config)
 	ast_config_destroy(cfg);
 
 	/* start em all */
-	for (i = 0; i < n; i++) {
-		load_rpt_vars(i, 1);
+	for(i = 0; i < n; i++)
+	{
+		load_rpt_vars(i,1);
 
 		/* if is a remote, dont start one for it */
-		if (rpt_vars[i].remote) {
-			ast_copy_string(rpt_vars[i].freq, "146.580", sizeof(rpt_vars[i].freq));
-			ast_copy_string(rpt_vars[i].rxpl, "100.0", sizeof(rpt_vars[i].rxpl));
-			ast_copy_string(rpt_vars[i].txpl, "100.0", sizeof(rpt_vars[i].txpl));
-			rpt_vars[i].remmode = REM_MODE_FM;
-			rpt_vars[i].offset = REM_SIMPLEX;
-			rpt_vars[i].powerlevel = REM_MEDPWR;
+		if (rpt_vars[i].remote)
+		{
+			if(retreive_memory(&rpt_vars[i],"init")){ /* Try to retreive initial memory channel */
+				if (!strcmp(rpt_vars[i].remoterig,remote_rig_rtx450))
+					strncpy(rpt_vars[i].freq, "446.500", sizeof(rpt_vars[i].freq) - 1);
+				else
+					strncpy(rpt_vars[i].freq, "146.580", sizeof(rpt_vars[i].freq) - 1);
+				strncpy(rpt_vars[i].rxpl, "100.0", sizeof(rpt_vars[i].rxpl) - 1);
+
+				strncpy(rpt_vars[i].txpl, "100.0", sizeof(rpt_vars[i].txpl) - 1);
+				rpt_vars[i].remmode = REM_MODE_FM;
+				rpt_vars[i].offset = REM_SIMPLEX;
+				rpt_vars[i].powerlevel = REM_LOWPWR;
+			}
 			continue;
 		}
-		if (!rpt_vars[i].p.ident) {
-			ast_log(LOG_WARNING, "Did not specify ident for node %s\n", rpt_vars[i].name);
+		else /* is a normal repeater */
+		{
+		    rpt_vars[i].p.memory = rpt_vars[i].name;
+			if(retreive_memory(&rpt_vars[i],"radiofreq")){ /* Try to retreive initial memory channel */
+				if (!strcmp(rpt_vars[i].remoterig,remote_rig_rtx450))
+					strncpy(rpt_vars[i].freq, "446.500", sizeof(rpt_vars[i].freq) - 1);
+				else if (!strcmp(rpt_vars[i].remoterig,remote_rig_rtx150))
+					strncpy(rpt_vars[i].freq, "146.580", sizeof(rpt_vars[i].freq) - 1);
+				strncpy(rpt_vars[i].rxpl, "100.0", sizeof(rpt_vars[i].rxpl) - 1);
+
+				strncpy(rpt_vars[i].txpl, "100.0", sizeof(rpt_vars[i].txpl) - 1);
+				rpt_vars[i].remmode = REM_MODE_FM;
+				rpt_vars[i].offset = REM_SIMPLEX;
+				rpt_vars[i].powerlevel = REM_LOWPWR;
+			}
+			ast_log(LOG_NOTICE,"Normal Repeater Init  %s  %s  %s\n",rpt_vars[i].name, rpt_vars[i].remoterig, rpt_vars[i].freq);
+		}
+		if (!rpt_vars[i].p.ident)
+		{
+			ast_log(LOG_WARNING,"Did not specify ident for node %s\n",rpt_vars[i].name);
 			ast_config_destroy(cfg);
 			pthread_exit(NULL);
 		}
-		ast_pthread_create_detached(&rpt_vars[i].rpt_thread, NULL, rpt, (void *) &rpt_vars[i]);
+	        pthread_attr_init(&attr);
+	        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+		ast_pthread_create(&rpt_vars[i].rpt_thread,&attr,rpt,(void *) &rpt_vars[i]);
 	}
 	usleep(500000);
-	for (;;) {
+	time(&starttime);
+	for(;;)
+	{
 		/* Now monitor each thread, and restart it if necessary */
-		for (i = 0; i < n; i++) { 
+		for(i = 0; i < n; i++)
+		{ 
 			int rv;
-			if (rpt_vars[i].remote)
-				continue;
+			if (rpt_vars[i].remote) continue;
 			if (rpt_vars[i].rpt_thread == AST_PTHREADT_STOP) 
 				rv = -1;
 			else
-				rv = pthread_kill(rpt_vars[i].rpt_thread, 0);
-			if (rv) {
-				if (time(NULL) - rpt_vars[i].lastthreadrestarttime <= 15) {
-					if (rpt_vars[i].threadrestarts >= 5) {
-						ast_log(LOG_ERROR, "Continual RPT thread restarts, killing Asterisk\n");
-						ast_cli_command(STDERR_FILENO, "restart now");
-					} else {
-						ast_log(LOG_NOTICE, "RPT thread restarted on %s\n", rpt_vars[i].name);
+				rv = pthread_kill(rpt_vars[i].rpt_thread,0);
+			if (rv)
+			{
+				if(time(NULL) - rpt_vars[i].lastthreadrestarttime <= 15)
+				{
+					if(rpt_vars[i].threadrestarts >= 5)
+					{
+						ast_log(LOG_ERROR,"Continual RPT thread restarts, killing Asterisk\n");
+						exit(1); /* Stuck in a restart loop, kill Asterisk and start over */
+					}
+					else
+					{
+						ast_log(LOG_NOTICE,"RPT thread restarted on %s\n",rpt_vars[i].name);
 						rpt_vars[i].threadrestarts++;
 					}
-				} else
+				}
+				else
 					rpt_vars[i].threadrestarts = 0;
 
 				rpt_vars[i].lastthreadrestarttime = time(NULL);
-				ast_pthread_create_detached(&rpt_vars[i].rpt_thread, NULL, rpt, (void *) &rpt_vars[i]);
-				ast_log(LOG_WARNING, "rpt_thread restarted on node %s\n", rpt_vars[i].name);
+			        pthread_attr_init(&attr);
+	 		        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+				ast_pthread_create(&rpt_vars[i].rpt_thread,&attr,rpt,(void *) &rpt_vars[i]);
+				/* if (!rpt_vars[i].xlink) */
+					ast_log(LOG_WARNING, "rpt_thread restarted on node %s\n", rpt_vars[i].name);
 			}
 
 		}
+		for(;;)
+		{
+			struct nodelog *nodep;
+			char *space,datestr[100],fname[300];
+			int fd;
+
+			ast_mutex_lock(&nodeloglock);
+			nodep = nodelog.next;
+			if(nodep == &nodelog) /* if nothing in queue */
+			{
+				ast_mutex_unlock(&nodeloglock);
+				break;
+			}
+			remque((struct qelem *)nodep);
+			ast_mutex_unlock(&nodeloglock);
+			space = strchr(nodep->str,' ');
+			if (!space) 
+			{
+				ast_free(nodep);
+				continue;
+			}
+			*space = 0;
+			strftime(datestr,sizeof(datestr) - 1,"%Y%m%d",
+				localtime(&nodep->timestamp));
+			sprintf(fname,"%s/%s/%s.txt",nodep->archivedir,
+				nodep->str,datestr);
+			fd = open(fname,O_WRONLY | O_CREAT | O_APPEND,0600);
+			if (fd == -1)
+			{
+				ast_log(LOG_ERROR,"Cannot open node log file %s for write",space + 1);
+				ast_free(nodep);
+				continue;
+			}
+			if (write(fd,space + 1,strlen(space + 1)) !=
+				strlen(space + 1))
+			{
+				ast_log(LOG_ERROR,"Cannot write node log file %s for write",space + 1);
+				ast_free(nodep);
+				continue;
+			}
+			close(fd);
+			ast_free(nodep);
+		}
 		usleep(2000000);
 	}
 	ast_config_destroy(cfg);
@@ -6810,182 +13111,426 @@ static void *rpt_master(void *config)
 
 static int rpt_exec(struct ast_channel *chan, void *data)
 {
-	int res = -1, i, rem_totx, n, phone_mode = 0;
-	char *tmp, keyed = 0;
-	char *options = NULL, *tele, c;
-	struct rpt *myrpt;
-	struct ast_frame *f;
+	int res=-1,i,rem_totx,rem_rx,remkeyed,n,phone_mode = 0;
+	int iskenwood_pci4,authtold,authreq,setting,notremming,reming;
+	int ismuted,dtmfed,phone_vox = 0;
+#ifdef	OLD_ASTERISK
+	struct localuser *u;
+#endif
+	char tmp[256], keyed = 0,keyed1 = 0;
+	char *options,*stringp,*tele,c,*altp,*memp;
+	char sx[320],*sy;
+	struct	rpt *myrpt;
+	struct ast_frame *f,*f1,*f2;
 	struct ast_channel *who;
 	struct ast_channel *cs[20];
-	struct rpt_link *l;
+	struct	rpt_link *l;
 	ZT_CONFINFO ci;  /* conference info */
 	ZT_PARAMS par;
-	int ms, elap;
-	AST_DECLARE_APP_ARGS(args,
-		AST_APP_ARG(node);
-		AST_APP_ARG(options);
-	);
+	int ms,elap,nullfd;
+	time_t t,last_timeout_warning;
+	struct	zt_radio_param z;
+	struct rpt_tele *telem;
+	int	numlinks;
 
+	nullfd = open("/dev/null",O_RDWR);
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "Rpt requires an argument (system node)\n");
 		return -1;
 	}
-	tmp = ast_strdupa((char *)data);
-	AST_STANDARD_APP_ARGS(args, tmp);
+
+	strncpy(tmp, (char *)data, sizeof(tmp)-1);
+	time(&t);
+	/* if time has externally shifted negative, screw it */
+	if (t < starttime) t = starttime + START_DELAY;
+	if ((!starttime) || (t < (starttime + START_DELAY)))
+	{
+		ast_log(LOG_NOTICE,"Node %s rejecting call: too soon!\n",tmp);
+		ast_safe_sleep(chan,3000);
+		return -1;
+	}
+
+	ast_log(LOG_NOTICE,"parsing argument=%s \n",tmp);
+
+	altp=strstr(tmp, "|*");
+	if(altp){
+		altp[0]=0;
+		altp++;
+    }
+
+	memp=strstr(tmp, "|M");
+	if(memp){
+		memp[0]=0;
+		memp+=2;
+    }
+
+	stringp=tmp;
+	strsep(&stringp, "|");
+	options = stringp;
+
+	ast_log(LOG_NOTICE,"options=%s \n",options);
+	if(memp>0)ast_log(LOG_NOTICE,"memp=%s \n",memp);
+	if(altp>0)ast_log(LOG_NOTICE,"altp=%s \n",altp);
+
 	myrpt = NULL;
 	/* see if we can find our specified one */
-	for (i = 0; i < nrpts; i++) {
+	for(i = 0; i < nrpts; i++)
+	{
 		/* if name matches, assign it and exit loop */
-		if (!strcmp(args.node, rpt_vars[i].name)) {
+		if (!strcmp(tmp,rpt_vars[i].name))
+		{
 			myrpt = &rpt_vars[i];
 			break;
 		}
 	}
-	if (myrpt == NULL) {
-		ast_log(LOG_WARNING, "Cannot find specified system node %s\n", args.node);
-		return -1;
+
+	pbx_builtin_setvar_helper(chan, "RPT_STAT_ERR", "");
+
+	if (myrpt == NULL)
+	{
+		pbx_builtin_setvar_helper(chan, "RPT_STAT_ERR", "NODE_NOT_FOUND");
+		ast_log(LOG_WARNING, "Cannot find specified system node %s\n",tmp);
+		return (priority_jump(NULL,chan));
+	}
+
+	numlinks=linkcount(myrpt);
+
+	if(options && *options == 'q')
+	{
+		int res=0;
+	 	char buf2[128];
+
+		if(myrpt->keyed)
+			pbx_builtin_setvar_helper(chan, "RPT_STAT_RXKEYED", "1");
+		else
+			pbx_builtin_setvar_helper(chan, "RPT_STAT_RXKEYED", "0");	
+
+		if(myrpt->txkeyed)
+			pbx_builtin_setvar_helper(chan, "RPT_STAT_TXKEYED", "1");
+		else
+			pbx_builtin_setvar_helper(chan, "RPT_STAT_TXKEYED", "0");	
+
+		snprintf(buf2,sizeof(buf2),"%s=%i", "RPT_STAT_XLINK", myrpt->xlink);
+		pbx_builtin_setvar(chan, buf2);
+		snprintf(buf2,sizeof(buf2),"%s=%i", "RPT_STAT_LINKS", numlinks);
+		pbx_builtin_setvar(chan, buf2);
+		snprintf(buf2,sizeof(buf2),"%s=%d", "RPT_STAT_WASCHAN", myrpt->waschan);
+		pbx_builtin_setvar(chan, buf2);
+		snprintf(buf2,sizeof(buf2),"%s=%d", "RPT_STAT_NOWCHAN", myrpt->nowchan);
+		pbx_builtin_setvar(chan, buf2);
+		snprintf(buf2,sizeof(buf2),"%s=%d", "RPT_STAT_DUPLEX", myrpt->p.duplex);
+		pbx_builtin_setvar(chan, buf2);
+		snprintf(buf2,sizeof(buf2),"%s=%d", "RPT_STAT_PARROT", myrpt->p.parrotmode);
+		pbx_builtin_setvar(chan, buf2);
+		//snprintf(buf2,sizeof(buf2),"%s=%d", "RPT_STAT_PHONEVOX", myrpt->phonevox);
+		//pbx_builtin_setvar(chan, buf2);
+		//snprintf(buf2,sizeof(buf2),"%s=%d", "RPT_STAT_CONNECTED", myrpt->connected);
+		//pbx_builtin_setvar(chan, buf2);
+		snprintf(buf2,sizeof(buf2),"%s=%d", "RPT_STAT_CALLMODE", myrpt->callmode);
+		pbx_builtin_setvar(chan, buf2);
+		snprintf(buf2,sizeof(buf2),"%s=%s", "RPT_STAT_LASTTONE", myrpt->lasttone);
+		pbx_builtin_setvar(chan, buf2);
+
+		res=priority_jump(myrpt,chan);
+		return res;
+	}
+
+	if(options && *options == 'o')
+	{
+		return(channel_revert(myrpt));
+	}
+
+	#if 0
+	if((altp)&&(*options == 'Z'))
+	{
+		rpt_push_alt_macro(myrpt,altp);
+		return 0;
 	}
+	#endif
+
 
 	/* if not phone access, must be an IAX connection */
-	if (options && ((*options == 'P') || (*options == 'D') || (*options == 'R'))) {
+	if (options && ((*options == 'P') || (*options == 'D') || (*options == 'R') || (*options == 'S')))
+	{
+		int val;
+
+		pbx_builtin_setvar_helper(chan, "RPT_STAT_BUSY", "0");
+		 
+		myrpt->bargechan=0;
+		if(options && strstr(options, "f")>0)
+		{
+			myrpt->bargechan=1;		
+		}
+
+		if(memp>0)
+		{
+			char radiochan;
+			radiochan=strtod(data,NULL);
+			// if(myrpt->nowchan!=0 && radiochan!=myrpt->nowchan && !myrpt->bargechan)
+
+			if(numlinks>0 && radiochan!=myrpt->nowchan && !myrpt->bargechan)
+			{
+				pbx_builtin_setvar_helper(chan, "RPT_STAT_BUSY", "1");
+				ast_log(LOG_NOTICE, "Radio Channel Busy.\n");
+				return (priority_jump(myrpt,chan));
+			}
+			else if(radiochan!=myrpt->nowchan || myrpt->bargechan)
+			{
+				channel_steer(myrpt,memp);	
+			}
+		}
+		if(altp)rpt_push_alt_macro(myrpt,altp);
 		phone_mode = 1;
-		if (*options == 'D')
-			phone_mode = 2;
-		ast_set_callerid(chan, "0", "app_rpt user", "0");
-	} else {
-		if (strncmp(chan->name, "IAX2", 4)) {
+		if (*options == 'D') phone_mode = 2;
+		if (*options == 'S') phone_mode = 3;
+		ast_set_callerid(chan,"0","app_rpt user","0");
+		val = 1;
+		ast_channel_setoption(chan,AST_OPTION_TONE_VERIFY,&val,sizeof(char),0);
+		if ((*(options + 1) == 'V') || (*(options + 1) == 'v')) phone_vox = 1;
+	}
+	else
+	{
+#ifdef ALLOW_LOCAL_CHANNELS
+	        /* Check to insure the connection is IAX2 or Local*/
+	        if ( (strncmp(chan->name,"IAX2",4)) && (strncmp(chan->name,"Local",5)) ) {
+	            ast_log(LOG_WARNING, "We only accept links via IAX2 or Local!!\n");
+	            return -1;
+	        }
+#else
+		if (strncmp(chan->name,"IAX2",4))
+		{
 			ast_log(LOG_WARNING, "We only accept links via IAX2!!\n");
 			return -1;
 		}
+#endif
+	        if(myrpt->p.s[myrpt->p.sysstate_cur].txdisable){ /* Do not allow incoming radio connections if disabled */
+        	        ast_log(LOG_NOTICE, "Connect attempt to node %s  with tx disabled", myrpt->name);
+                	return -1;
+        	}	
 	}
-	if (*args.options == 'R') {
+	if (options && (*options == 'R'))
+	{
 		/* Parts of this section taken from app_parkandannounce */
-		int m, lot, timeout = 0;
-		char tmp[256];
-		char *s;
-		AST_DECLARE_APP_ARGS(optionarg,
-			AST_APP_ARG(template);
-			AST_APP_ARG(timeout);
-			AST_APP_ARG(return_context);
-		);
+		char *return_context;
+		int l, m, lot, timeout = 0;
+		char tmp[256],*template;
+		char *working, *context, *exten, *priority;
+		char *s,*orig_s;
 
 		rpt_mutex_lock(&myrpt->lock);
 		m = myrpt->callmode;
 		rpt_mutex_unlock(&myrpt->lock);
 
-		if ((!myrpt->p.nobusyout) && m) {
-			if (chan->_state != AST_STATE_UP) {
-				ast_indicate(chan, AST_CONTROL_BUSY);
-			}
-			while (ast_safe_sleep(chan, 10000) != -1) {
-				/* This used to be a busy loop.  It's probably better to yield the processor here. */
-				usleep(1);
+		if ((!myrpt->p.nobusyout) && m)
+		{
+			if (chan->_state != AST_STATE_UP)
+			{
+				ast_indicate(chan,AST_CONTROL_BUSY);
 			}
+			while(ast_safe_sleep(chan,10000) != -1);
 			return -1;
 		}
 
-		if (chan->_state != AST_STATE_UP) {
+		if (chan->_state != AST_STATE_UP)
+		{
 			ast_answer(chan);
+			if (!phone_mode) send_newkey(chan);
+		}
+
+		l=strlen(options)+2;
+		orig_s=ast_malloc(l);
+		if(!orig_s) {
+			ast_log(LOG_WARNING, "Out of memory\n");
+			return -1;
 		}
+		s=orig_s;
+		strncpy(s,options,l);
 
-		s = ast_strdupa(options);
-		AST_STANDARD_APP_ARGS(optionarg, s);
-		if (optionarg.argc == 0 || ast_strlen_zero(optionarg.template)) {
+		template=strsep(&s,"|");
+		if(!template) {
 			ast_log(LOG_WARNING, "An announce template must be defined\n");
+			ast_free(orig_s);
 			return -1;
 		} 
   
-		if (optionarg.argc >= 2) {
-			timeout = atoi(optionarg.timeout) * 1000;
+		if(s) {
+			timeout = atoi(strsep(&s, "|"));
+			timeout *= 1000;
 		}
 	
-		if (!ast_strlen_zero(optionarg.return_context)) {
-			if (ast_parseable_goto(chan, optionarg.return_context)) {
-				ast_verb(3, "Warning: Return Context Invalid, call will return to default|s\n");
+		return_context = s;
+  
+		if(return_context != NULL) {
+			/* set the return context. Code borrowed from the Goto builtin */
+    
+			working = return_context;
+			context = strsep(&working, "|");
+			exten = strsep(&working, "|");
+			if(!exten) {
+				/* Only a priority in this one */
+				priority = context;
+				exten = NULL;
+				context = NULL;
+			} else {
+				priority = strsep(&working, "|");
+				if(!priority) {
+					/* Only an extension and priority in this one */
+					priority = exten;
+					exten = context;
+					context = NULL;
 			}
 		}
+		if(atoi(priority) < 0) {
+			ast_log(LOG_WARNING, "Priority '%s' must be a number > 0\n", priority);
+			ast_free(orig_s);
+			return -1;
+		}
+		/* At this point we have a priority and maybe an extension and a context */
+		chan->priority = atoi(priority);
+#ifdef OLD_ASTERISK
+		if(exten && strcasecmp(exten, "BYEXTENSION"))
+#else
+		if(exten)
+#endif
+			strncpy(chan->exten, exten, sizeof(chan->exten)-1);
+		if(context)
+			strncpy(chan->context, context, sizeof(chan->context)-1);
+		} else {  /* increment the priority by default*/
+			chan->priority++;
+		}
 
+		if(option_verbose > 2) {
+			ast_verbose( VERBOSE_PREFIX_3 "Return Context: (%s,%s,%d) ID: %s\n", chan->context,chan->exten, chan->priority, chan->cid.cid_num);
+			if(!ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
+				ast_verbose( VERBOSE_PREFIX_3 "Warning: Return Context Invalid, call will return to default|s\n");
+			}
+		}
+  
 		/* we are using masq_park here to protect * from touching the channel once we park it.  If the channel comes out of timeout
 		before we are done announcing and the channel is messed with, Kablooeee.  So we use Masq to prevent this.  */
 
 		ast_masq_park_call(chan, NULL, timeout, &lot);
-		ast_verb(3, "Call Parking Called, lot: %d, timeout: %d, context: %s\n", lot, timeout, optionarg.return_context);
 
-		snprintf(tmp, sizeof(tmp), "%d,%s", lot, optionarg.template + 1);
-		rpt_telemetry(myrpt, REV_PATCH, tmp);
+		if (option_verbose > 2) ast_verbose( VERBOSE_PREFIX_3 "Call Parking Called, lot: %d, timeout: %d, context: %s\n", lot, timeout, return_context);
+
+		snprintf(tmp,sizeof(tmp) - 1,"%d,%s",lot,template + 1);
+
+		rpt_telemetry(myrpt,REV_PATCH,tmp);
+
+		ast_free(orig_s);
 
 		return 0;
+
 	}
 
-	if (!options) {
-		struct ast_hostent ahp;
-		struct hostent *hp;
-		struct in_addr ia;
-		char hisip[100], nodeip[100];
-		const char *val;
-		char *s, *s1, *s2;
+	if (!options)
+	{
+        struct ast_hostent ahp;
+        struct hostent *hp;
+        struct in_addr ia;
+        char hisip[100],nodeip[100],*val, *s, *s1, *s2, *s3, *b,*b1;
 
 		/* look at callerid to see what node this comes from */
-		if (!chan->cid.cid_num) { /* if doesn't have caller id */
-			ast_log(LOG_WARNING, "Doesn't have callerid on %s\n", args.node);
+		if (!chan->cid.cid_num) /* if doesn't have caller id */
+		{
+			ast_log(LOG_WARNING, "Does not have callerid on %s\n",tmp);
 			return -1;
 		}
-
 		/* get his IP from IAX2 module */
-		pbx_substitute_variables_helper(chan, "${IAXPEER(CURRENTCHANNEL)}", hisip, sizeof(hisip) - 1);
-		if (ast_strlen_zero(hisip)) {
+		memset(hisip,0,sizeof(hisip));
+#ifdef ALLOW_LOCAL_CHANNELS
+        /* set IP address if this is a local connection*/
+        if (strncmp(chan->name,"Local",5)==0) {
+            strcpy(hisip,"127.0.0.1");
+        } else {
+			pbx_substitute_variables_helper(chan,"${IAXPEER(CURRENTCHANNEL)}",hisip,sizeof(hisip) - 1);
+		}
+#else
+		pbx_substitute_variables_helper(chan,"${IAXPEER(CURRENTCHANNEL)}",hisip,sizeof(hisip) - 1);
+#endif
+
+		if (!hisip[0])
+		{
 			ast_log(LOG_WARNING, "Link IP address cannot be determined!!\n");
 			return -1;
 		}
 		
-		if (!strcmp(myrpt->name, chan->cid.cid_num)) {
+		ast_callerid_parse(chan->cid.cid_num,&b,&b1);
+		ast_shrink_phone_number(b1);
+		if (!strcmp(myrpt->name,b1))
+		{
 			ast_log(LOG_WARNING, "Trying to link to self!!\n");
 			return -1;
 		}
 
-		if (*(chan->cid.cid_num) < '1') {
-			ast_log(LOG_WARNING, "Node %s Invalid for connection here!!\n", chan->cid.cid_num);
+		if (*b1 < '1')
+		{
+			ast_log(LOG_WARNING, "Node %s Invalid for connection here!!\n",b1);
 			return -1;
 		}
 
+
 		/* look for his reported node string */
-		val = ast_variable_retrieve(myrpt->cfg, myrpt->p.nodes, chan->cid.cid_num);
-		if (!val) {
-			ast_log(LOG_WARNING, "Reported node %s cannot be found!!\n", chan->cid.cid_num);
+		val = node_lookup(myrpt,b1);
+		if (!val)
+		{
+			ast_log(LOG_WARNING, "Reported node %s cannot be found!!\n",b1);
 			return -1;
 		}
-		ast_copy_string(tmp, val, sizeof(tmp));
+		strncpy(tmp,val,sizeof(tmp) - 1);
 		s = tmp;
-		s1 = strsep(&s, ",");
-		s2 = strsep(&s, ",");
-		if (!s2) {
-			ast_log(LOG_WARNING, "Reported node %s not in correct format!!\n", chan->cid.cid_num);
+		s1 = strsep(&s,",");
+		if (!strchr(s1,':') && strchr(s1,'/') && strncasecmp(s1, "local/", 6))
+		{
+			sy = strchr(s1,'/');		
+			*sy = 0;
+			sprintf(sx,"%s:4569/%s",s1,sy + 1);
+			s1 = sx;
+		}
+		s2 = strsep(&s,",");
+		if (!s2)
+		{
+			ast_log(LOG_WARNING, "Reported node %s not in correct format!!\n",b1);
 			return -1;
 		}
-		if (strcmp(s2, "NONE")) {
+                if (strcmp(s2,"NONE")) {
 			hp = ast_gethostbyname(s2, &ahp);
-			if (!hp) {
-				ast_log(LOG_WARNING, "Reported node %s, name %s cannot be found!!\n", chan->cid.cid_num, s2);
+			if (!hp)
+			{
+				ast_log(LOG_WARNING, "Reported node %s, name %s cannot be found!!\n",b1,s2);
 				return -1;
 			}
-			memcpy(&ia, hp->h_addr, sizeof(in_addr_t));
-			ast_copy_string(nodeip, ast_inet_ntoa(ia), sizeof(nodeip));
-			if (strcmp(hisip, nodeip)) {
-				char *s3 = strchr(s1, '@');
-				if (s3)
-					s1 = s3 + 1;
-				s3 = strchr(s1, '/');
-				if (s3)
-					*s3 = 0;
+			memcpy(&ia,hp->h_addr,sizeof(in_addr_t));
+#ifdef	OLD_ASTERISK
+			ast_inet_ntoa(nodeip,sizeof(nodeip) - 1,ia);
+#else
+			strncpy(nodeip,ast_inet_ntoa(ia),sizeof(nodeip) - 1);
+#endif
+			s3 = strchr(hisip,':');
+			if (s3) *s3 = 0;
+			if (strcmp(hisip,nodeip))
+			{
+				s3 = strchr(s1,'@');
+				if (s3) s1 = s3 + 1;
+				s3 = strchr(s1,'/');
+				if (s3) *s3 = 0;
+				s3 = strchr(s1,':');
+				if (s3) *s3 = 0;
 				hp = ast_gethostbyname(s1, &ahp);
-				if (!hp) {
-					ast_log(LOG_WARNING, "Reported node %s, name %s cannot be found!!\n", chan->cid.cid_num, s1);
+				if (!hp)
+				{
+					ast_log(LOG_WARNING, "Reported node %s, name %s cannot be found!!\n",b1,s1);
 					return -1;
 				}
-				memcpy(&ia, hp->h_addr, sizeof(in_addr_t));
-				ast_copy_string(nodeip, ast_inet_ntoa(ia), sizeof(nodeip));
-				if (strcmp(hisip, nodeip)) {
-					ast_log(LOG_WARNING, "Node %s IP %s does not match link IP %s!!\n", chan->cid.cid_num, nodeip, hisip);
+				memcpy(&ia,hp->h_addr,sizeof(in_addr_t));
+#ifdef	OLD_ASTERISK
+				ast_inet_ntoa(nodeip,sizeof(nodeip) - 1,ia);
+#else
+				strncpy(nodeip,ast_inet_ntoa(ia),sizeof(nodeip) - 1);
+#endif
+				if (strcmp(hisip,nodeip))
+				{
+					ast_log(LOG_WARNING, "Node %s IP %s does not match link IP %s!!\n",b1,nodeip,hisip);
 					return -1;
 				}
 			}
@@ -6993,423 +13538,987 @@ static int rpt_exec(struct ast_channel *chan, void *data)
 	}
 
 	/* if is not a remote */
-	if (!myrpt->remote) {
+	if (!myrpt->remote)
+	{
+		char *b,*b1;
 		int reconnects = 0;
 
+		rpt_mutex_lock(&myrpt->lock);
+		i = myrpt->xlink;
+		rpt_mutex_unlock(&myrpt->lock);
+		if (i)
+		{
+			ast_log(LOG_WARNING, "Cannot connect to node %s, system busy\n",myrpt->name);
+			return -1;
+		}
 		/* look at callerid to see what node this comes from */
-		if (!chan->cid.cid_num) { /* if doesn't have caller id */
-			ast_log(LOG_WARNING, "Doesnt have callerid on %s\n", args.node);
+		if (!chan->cid.cid_num) /* if doesn't have caller id */
+		{
+			ast_log(LOG_WARNING, "Doesnt have callerid on %s\n",tmp);
 			return -1;
 		}
 
-		if (!strcmp(myrpt->name, chan->cid.cid_num)) {
+		ast_callerid_parse(chan->cid.cid_num,&b,&b1);
+		ast_shrink_phone_number(b1);
+		if (!strcmp(myrpt->name,b1))
+		{
 			ast_log(LOG_WARNING, "Trying to link to self!!\n");
 			return -1;
 		}
 		rpt_mutex_lock(&myrpt->lock);
 		l = myrpt->links.next;
 		/* try to find this one in queue */
-		while (l != &myrpt->links) {
-			if (l->name[0] == '0') {
+		while(l != &myrpt->links)
+		{
+			if (l->name[0] == '0') 
+			{
 				l = l->next;
 				continue;
 			}
 			/* if found matching string */
-			if (!strcmp(l->name, chan->cid.cid_num))
-				break;
+			if (!strcmp(l->name,b1)) break;
 			l = l->next;
 		}
 		/* if found */
-		if (l != &myrpt->links) {
+		if (l != &myrpt->links) 
+		{
 			l->killme = 1;
-			l->retries = MAX_RETRIES + 1;
+			l->retries = l->max_retries + 1;
 			l->disced = 2;
 			reconnects = l->reconnects;
 			reconnects++;
-			rpt_mutex_unlock(&myrpt->lock);
+                        rpt_mutex_unlock(&myrpt->lock);
 			usleep(500000);	
 		} else 
 			rpt_mutex_unlock(&myrpt->lock);
 		/* establish call in tranceive mode */
-		l = ast_calloc(1, sizeof(*l));
-		if (!l) {
+		l = ast_malloc(sizeof(struct rpt_link));
+		if (!l)
+		{
 			ast_log(LOG_WARNING, "Unable to malloc\n");
 			pthread_exit(NULL);
 		}
+		/* zero the silly thing */
+		memset((char *)l,0,sizeof(struct rpt_link));
 		l->mode = 1;
-		ast_copy_string(l->name, chan->cid.cid_num, sizeof(l->name));
+		strncpy(l->name,b1,MAXNODESTR - 1);
 		l->isremote = 0;
 		l->chan = chan;
 		l->connected = 1;
+		l->thisconnected = 1;
 		l->hasconnected = 1;
 		l->reconnects = reconnects;
 		l->phonemode = phone_mode;
-		ast_set_read_format(l->chan, AST_FORMAT_SLINEAR);
-		ast_set_write_format(l->chan, AST_FORMAT_SLINEAR);
+		l->phonevox = phone_vox;
+		l->lastf1 = NULL;
+		l->lastf2 = NULL;
+		l->dtmfed = 0;
+		voxinit_link(l,1);
+		ast_set_read_format(l->chan,AST_FORMAT_SLINEAR);
+		ast_set_write_format(l->chan,AST_FORMAT_SLINEAR);
 		/* allocate a pseudo-channel thru asterisk */
-		l->pchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
-		if (!l->pchan) {
-			ast_log(LOG_ERROR, "rpt:Sorry unable to obtain pseudo channel\n");
+		l->pchan = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+		if (!l->pchan)
+		{
+			fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
 			pthread_exit(NULL);
 		}
-		ast_set_read_format(l->pchan, AST_FORMAT_SLINEAR);
-		ast_set_write_format(l->pchan, AST_FORMAT_SLINEAR);
+		ast_set_read_format(l->pchan,AST_FORMAT_SLINEAR);
+		ast_set_write_format(l->pchan,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+		if (l->pchan->cdr)
+			ast_set_flag(l->pchan->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
 		/* make a conference for the tx */
 		ci.chan = 0;
 		ci.confno = myrpt->conf;
 		ci.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER | ZT_CONF_TALKER;
 		/* first put the channel on the conference in proper mode */
-		if (ioctl(l->pchan->fds[0], ZT_SETCONF, &ci) == -1) {
+		if (ioctl(l->pchan->fds[0],ZT_SETCONF,&ci) == -1)
+		{
 			ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
 			pthread_exit(NULL);
 		}
 		rpt_mutex_lock(&myrpt->lock);
-		if (phone_mode > 1)
-			l->lastrx = 1;
+		if ((phone_mode == 2) && (!phone_vox)) l->lastrealrx = 1;
+		l->max_retries = MAX_RETRIES;
 		/* insert at end of queue */
-		insque((struct qelem *)l, (struct qelem *)myrpt->links.next);
+		insque((struct qelem *)l,(struct qelem *)myrpt->links.next);
+		__kickshort(myrpt);
 		rpt_mutex_unlock(&myrpt->lock);
 		if (chan->_state != AST_STATE_UP) {
 			ast_answer(chan);
+			if (!phone_mode) send_newkey(chan);
 		}
+		if (myrpt->p.archivedir)
+		{
+			char str[100];
+
+			if (l->phonemode)
+				sprintf(str,"LINK(P),%s",l->name);
+			else
+				sprintf(str,"LINK,%s",l->name);
+			donodelog(myrpt,str);
+		}
+		if (!phone_mode) send_newkey(chan);
 		return AST_PBX_KEEPALIVE;
 	}
+	/* well, then it is a remote */
 	rpt_mutex_lock(&myrpt->lock);
 	/* if remote, error if anyone else already linked */
-	if (myrpt->remoteon) {
+	if (myrpt->remoteon)
+	{
 		rpt_mutex_unlock(&myrpt->lock);
 		usleep(500000);
-		if (myrpt->remoteon) {
-			ast_log(LOG_WARNING, "Trying to use busy link on %s\n", args.node);
+		if (myrpt->remoteon)
+		{
+			ast_log(LOG_WARNING, "Trying to use busy link on %s\n",tmp);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+			if (chan->cdr)
+				ast_set_flag(chan->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
 			return -1;
 		}		
 		rpt_mutex_lock(&myrpt->lock);
 	}
-	myrpt->remoteon = 1;
-	if (ioperm(myrpt->p.iobase, 1, 1) == -1) {
+	if (myrpt->p.rptnode)
+	{
+		char killedit = 0;
+		time_t now;
+
+		time(&now);
+		for(i = 0; i < nrpts; i++)
+		{
+			if (!strcasecmp(rpt_vars[i].name,myrpt->p.rptnode))
+			{
+				if ((rpt_vars[i].links.next != &rpt_vars[i].links) ||
+				   rpt_vars[i].keyed ||
+				    ((rpt_vars[i].lastkeyedtime + RPT_LOCKOUT_SECS) > now) ||
+				     rpt_vars[i].txkeyed ||
+				      ((rpt_vars[i].lasttxkeyedtime + RPT_LOCKOUT_SECS) > now))
+				{
+					rpt_mutex_unlock(&myrpt->lock);
+					ast_log(LOG_WARNING, "Trying to use busy link (repeater node %s) on %s\n",rpt_vars[i].name,tmp);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+					if (chan->cdr)
+						ast_set_flag(chan->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+					return -1;
+				}
+				while(rpt_vars[i].xlink != 3)
+				{
+					if (!killedit)
+					{
+						ast_softhangup(rpt_vars[i].rxchannel,AST_SOFTHANGUP_DEV);
+						rpt_vars[i].xlink = 1;
+						killedit = 1;
+					}
+					rpt_mutex_unlock(&myrpt->lock);
+					if (ast_safe_sleep(chan,500) == -1)
+					{
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+						if (chan->cdr)
+							ast_set_flag(chan->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+						return -1;
+					}
+					rpt_mutex_lock(&myrpt->lock);
+				}
+				break;
+			}
+		}
+	}
+
+	if ( (!strcmp(myrpt->remoterig, remote_rig_rbi)||!strcmp(myrpt->remoterig, remote_rig_ppp16)) &&
+	  (ioperm(myrpt->p.iobase,1,1) == -1))
+	{
 		rpt_mutex_unlock(&myrpt->lock);
-		ast_log(LOG_WARNING, "Cant get io permission on IO port %x hex\n", myrpt->p.iobase);
+		ast_log(LOG_WARNING, "Can't get io permission on IO port %x hex\n",myrpt->p.iobase);
 		return -1;
 	}
+	myrpt->remoteon = 1;
+#ifdef	OLD_ASTERISK
+	LOCAL_USER_ADD(u);
+#endif
 	rpt_mutex_unlock(&myrpt->lock);
 	/* find our index, and load the vars initially */
-	for (i = 0; i < nrpts; i++) {
-		if (&rpt_vars[i] == myrpt) {
-			load_rpt_vars(i, 0);
+	for(i = 0; i < nrpts; i++)
+	{
+		if (&rpt_vars[i] == myrpt)
+		{
+			load_rpt_vars(i,0);
 			break;
 		}
 	}
 	rpt_mutex_lock(&myrpt->lock);
-	tele = strchr(myrpt->rxchanname, '/');
-	if (!tele) {
-		ast_log(LOG_ERROR, "rpt:Dial number must be in format tech/number\n");
+	tele = strchr(myrpt->rxchanname,'/');
+	if (!tele)
+	{
+		fprintf(stderr,"rpt:Dial number must be in format tech/number\n");
 		rpt_mutex_unlock(&myrpt->lock);
 		pthread_exit(NULL);
 	}
 	*tele++ = 0;
-	myrpt->rxchannel = ast_request(myrpt->rxchanname, AST_FORMAT_SLINEAR, tele, NULL);
-	if (myrpt->rxchannel) {
-		ast_set_read_format(myrpt->rxchannel, AST_FORMAT_SLINEAR);
-		ast_set_write_format(myrpt->rxchannel, AST_FORMAT_SLINEAR);
-		ast_channel_setwhentohangup_tv(myrpt->rxchannel, cancel_atimeout);
+	myrpt->rxchannel = ast_request(myrpt->rxchanname,AST_FORMAT_SLINEAR,tele,NULL);
+	myrpt->zaprxchannel = NULL;
+	if (!strcasecmp(myrpt->rxchanname,"Zap"))
+		myrpt->zaprxchannel = myrpt->rxchannel;
+	if (myrpt->rxchannel)
+	{
+		ast_set_read_format(myrpt->rxchannel,AST_FORMAT_SLINEAR);
+		ast_set_write_format(myrpt->rxchannel,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+		if (myrpt->rxchannel->cdr)
+			ast_set_flag(myrpt->rxchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+#ifndef	NEW_ASTERISK
+		myrpt->rxchannel->whentohangup = 0;
+#endif
 		myrpt->rxchannel->appl = "Apprpt";
 		myrpt->rxchannel->data = "(Link Rx)";
-		ast_verb(3, "rpt (Rx) initiating call to %s/%s on %s\n",
-				myrpt->rxchanname, tele, myrpt->rxchannel->name);
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "rpt (Rx) initiating call to %s/%s on %s\n",
+				myrpt->rxchanname,tele,myrpt->rxchannel->name);
 		rpt_mutex_unlock(&myrpt->lock);
-		ast_call(myrpt->rxchannel, tele, 999);
+		ast_call(myrpt->rxchannel,tele,999);
 		rpt_mutex_lock(&myrpt->lock);
-	} else {
-		ast_log(LOG_ERROR, "rpt:Sorry unable to obtain Rx channel\n");
+	}
+	else
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain Rx channel\n");
 		rpt_mutex_unlock(&myrpt->lock);
 		pthread_exit(NULL);
 	}
 	*--tele = '/';
-	if (myrpt->txchanname) {
-		tele = strchr(myrpt->txchanname, '/');
-		if (!tele) {
-			ast_log(LOG_ERROR, "rpt:Dial number must be in format tech/number\n");
+	myrpt->zaptxchannel = NULL;
+	if (myrpt->txchanname)
+	{
+		tele = strchr(myrpt->txchanname,'/');
+		if (!tele)
+		{
+			fprintf(stderr,"rpt:Dial number must be in format tech/number\n");
 			rpt_mutex_unlock(&myrpt->lock);
 			ast_hangup(myrpt->rxchannel);
 			pthread_exit(NULL);
 		}
 		*tele++ = 0;
-		myrpt->txchannel = ast_request(myrpt->txchanname, AST_FORMAT_SLINEAR, tele, NULL);
-		if (myrpt->txchannel) {
-			ast_set_read_format(myrpt->txchannel, AST_FORMAT_SLINEAR);
-			ast_set_write_format(myrpt->txchannel, AST_FORMAT_SLINEAR);
-			ast_channel_setwhentohangup_tv(myrpt->txchannel, cancel_atimeout);
+		myrpt->txchannel = ast_request(myrpt->txchanname,AST_FORMAT_SLINEAR,tele,NULL);
+		if (!strncasecmp(myrpt->txchanname,"Zap",3))
+			myrpt->zaptxchannel = myrpt->txchannel;
+		if (myrpt->txchannel)
+		{
+			ast_set_read_format(myrpt->txchannel,AST_FORMAT_SLINEAR);
+			ast_set_write_format(myrpt->txchannel,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+			if (myrpt->txchannel->cdr)
+				ast_set_flag(myrpt->txchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+#ifndef	NEW_ASTERISK
+			myrpt->txchannel->whentohangup = 0;
+#endif
 			myrpt->txchannel->appl = "Apprpt";
 			myrpt->txchannel->data = "(Link Tx)";
-			ast_verb(3, "rpt (Tx) initiating call to %s/%s on %s\n",
-					myrpt->txchanname, tele, myrpt->txchannel->name);
+			if (option_verbose > 2)
+				ast_verbose(VERBOSE_PREFIX_3 "rpt (Tx) initiating call to %s/%s on %s\n",
+					myrpt->txchanname,tele,myrpt->txchannel->name);
 			rpt_mutex_unlock(&myrpt->lock);
-			ast_call(myrpt->txchannel, tele, 999);
+			ast_call(myrpt->txchannel,tele,999);
 			rpt_mutex_lock(&myrpt->lock);
-		} else {
-			ast_log(LOG_ERROR, "rpt:Sorry unable to obtain Tx channel\n");
+		}
+		else
+		{
+			fprintf(stderr,"rpt:Sorry unable to obtain Tx channel\n");
 			rpt_mutex_unlock(&myrpt->lock);
 			ast_hangup(myrpt->rxchannel);
 			pthread_exit(NULL);
 		}
 		*--tele = '/';
-	} else {
+	}
+	else
+	{
 		myrpt->txchannel = myrpt->rxchannel;
+		if (!strncasecmp(myrpt->rxchanname,"Zap",3))
+			myrpt->zaptxchannel = myrpt->rxchannel;
+	}
+	/* allocate a pseudo-channel thru asterisk */
+	myrpt->pchannel = ast_request("zap",AST_FORMAT_SLINEAR,"pseudo",NULL);
+	if (!myrpt->pchannel)
+	{
+		fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
+		rpt_mutex_unlock(&myrpt->lock);
+		if (myrpt->txchannel != myrpt->rxchannel) 
+			ast_hangup(myrpt->txchannel);
+		ast_hangup(myrpt->rxchannel);
+		pthread_exit(NULL);
+	}
+	ast_set_read_format(myrpt->pchannel,AST_FORMAT_SLINEAR);
+	ast_set_write_format(myrpt->pchannel,AST_FORMAT_SLINEAR);
+#ifdef	AST_CDR_FLAG_POST_DISABLED
+	if (myrpt->pchannel->cdr)
+		ast_set_flag(myrpt->pchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
+#endif
+	if (!myrpt->zaprxchannel) myrpt->zaprxchannel = myrpt->pchannel;
+	if (!myrpt->zaptxchannel) myrpt->zaptxchannel = myrpt->pchannel;
+	/* make a conference for the pseudo */
+	ci.chan = 0;
+	ci.confno = -1; /* make a new conf */
+	ci.confmode = ZT_CONF_CONFANNMON ;
+	/* first put the channel on the conference in announce/monitor mode */
+	if (ioctl(myrpt->pchannel->fds[0],ZT_SETCONF,&ci) == -1)
+	{
+		ast_log(LOG_WARNING, "Unable to set conference mode to Announce\n");
+		rpt_mutex_unlock(&myrpt->lock);
+		ast_hangup(myrpt->pchannel);
+		if (myrpt->txchannel != myrpt->rxchannel) 
+			ast_hangup(myrpt->txchannel);
+		ast_hangup(myrpt->rxchannel);
+		pthread_exit(NULL);
+	}
+	/* save pseudo channel conference number */
+	myrpt->conf = myrpt->txconf = ci.confno;
+	/* if serial io port, open it */
+	myrpt->iofd = -1;
+	if (myrpt->p.ioport && ((myrpt->iofd = openserial(myrpt,myrpt->p.ioport)) == -1))
+	{
+		rpt_mutex_unlock(&myrpt->lock);
+		ast_hangup(myrpt->pchannel);
+		if (myrpt->txchannel != myrpt->rxchannel) 
+			ast_hangup(myrpt->txchannel);
+		ast_hangup(myrpt->rxchannel);
+		pthread_exit(NULL);
+	}
+	iskenwood_pci4 = 0;
+	memset(&z,0,sizeof(z));
+	if ((myrpt->iofd < 1) && (myrpt->txchannel == myrpt->zaptxchannel))
+	{
+		z.radpar = ZT_RADPAR_REMMODE;
+		z.data = ZT_RADPAR_REM_NONE;
+		res = ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z);
+		/* if PCIRADIO and kenwood selected */
+		if ((!res) && (!strcmp(myrpt->remoterig,remote_rig_kenwood)))
+		{
+			z.radpar = ZT_RADPAR_UIOMODE;
+			z.data = 1;
+			if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1)
+			{
+				ast_log(LOG_ERROR,"Cannot set UIOMODE\n");
+				return -1;
+			}
+			z.radpar = ZT_RADPAR_UIODATA;
+			z.data = 3;
+			if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1)
+			{
+				ast_log(LOG_ERROR,"Cannot set UIODATA\n");
+				return -1;
+			}
+			i = ZT_OFFHOOK;
+			if (ioctl(myrpt->zaptxchannel->fds[0],ZT_HOOK,&i) == -1)
+			{
+				ast_log(LOG_ERROR,"Cannot set hook\n");
+				return -1;
+			}
+			iskenwood_pci4 = 1;
+		}
+	}
+	if (myrpt->txchannel == myrpt->zaptxchannel)
+	{
+		i = ZT_ONHOOK;
+		ioctl(myrpt->zaptxchannel->fds[0],ZT_HOOK,&i);
+		/* if PCIRADIO and Yaesu ft897/ICOM IC-706 selected */
+		if ((myrpt->iofd < 1) && (!res) &&
+		   ((!strcmp(myrpt->remoterig,remote_rig_ft897)) ||
+		      (!strcmp(myrpt->remoterig,remote_rig_ic706)) ||
+		         (!strcmp(myrpt->remoterig,remote_rig_tm271))))
+		{
+			z.radpar = ZT_RADPAR_UIOMODE;
+			z.data = 1;
+			if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1)
+			{
+				ast_log(LOG_ERROR,"Cannot set UIOMODE\n");
+				return -1;
+			}
+			z.radpar = ZT_RADPAR_UIODATA;
+			z.data = 3;
+			if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1)
+			{
+				ast_log(LOG_ERROR,"Cannot set UIODATA\n");
+				return -1;
+			}
+		}
 	}
 	myrpt->remoterx = 0;
 	myrpt->remotetx = 0;
 	myrpt->retxtimer = 0;
+	myrpt->rerxtimer = 0;
 	myrpt->remoteon = 1;
 	myrpt->dtmfidx = -1;
 	myrpt->dtmfbuf[0] = 0;
 	myrpt->dtmf_time_rem = 0;
 	myrpt->hfscanmode = 0;
 	myrpt->hfscanstatus = 0;
-	if (myrpt->p.startupmacro) {
-		myrpt->remchannel = chan; /* Save copy of channel */
-		snprintf(myrpt->macrobuf, sizeof(myrpt->macrobuf), "PPPP%s", myrpt->p.startupmacro);
-	}
-	if (myrpt->p.startupgosub) {
-		myrpt->remchannel = chan; /* Save copy of channel */
-		snprintf(myrpt->gosubbuf, sizeof(myrpt->gosubbuf), "PPPP%s", myrpt->p.startupgosub);
+	if (myrpt->p.startupmacro)
+	{
+		snprintf(myrpt->macrobuf,MAXMACRO - 1,"PPPP%s",myrpt->p.startupmacro);
 	}
+	time(&myrpt->start_time);
+	myrpt->last_activity_time = myrpt->start_time;
+	last_timeout_warning = 0;
 	myrpt->reload = 0;
+	myrpt->tele.next = &myrpt->tele;
+	myrpt->tele.prev = &myrpt->tele;
+	myrpt->newkey = 0;
 	rpt_mutex_unlock(&myrpt->lock);
-	setrem(myrpt); 
 	ast_set_write_format(chan, AST_FORMAT_SLINEAR);
 	ast_set_read_format(chan, AST_FORMAT_SLINEAR);
+	rem_rx = 0;
+	remkeyed = 0;
 	/* if we are on 2w loop and are a remote, turn EC on */
-	if (myrpt->remote && (myrpt->rxchannel == myrpt->txchannel)) {
+	if (myrpt->remote && (myrpt->rxchannel == myrpt->txchannel))
+	{
 		i = 128;
-		ioctl(myrpt->rxchannel->fds[0], ZT_ECHOCANCEL, &i);
+		ioctl(myrpt->zaprxchannel->fds[0],ZT_ECHOCANCEL,&i);
 	}
 	if (chan->_state != AST_STATE_UP) {
 		ast_answer(chan);
+		if (!phone_mode) send_newkey(chan);
 	}
 
-	if (ioctl(myrpt->txchannel->fds[0], ZT_GET_PARAMS, &par) != -1) {
-		if (par.rxisoffhook) {
-			ast_indicate(chan, AST_CONTROL_RADIO_KEY);
-			myrpt->remoterx = 1;
+	if (myrpt->rxchannel == myrpt->zaprxchannel)
+	{
+		if (ioctl(myrpt->zaprxchannel->fds[0],ZT_GET_PARAMS,&par) != -1)
+		{
+			if (par.rxisoffhook)
+			{
+				ast_indicate(chan,AST_CONTROL_RADIO_KEY);
+				myrpt->remoterx = 1;
+				remkeyed = 1;
+			}
 		}
 	}
+	if (myrpt->p.archivedir)
+	{
+		char mycmd[100],mydate[100],*b,*b1;
+		time_t myt;
+		long blocksleft;
+
+
+		mkdir(myrpt->p.archivedir,0600);
+		sprintf(mycmd,"%s/%s",myrpt->p.archivedir,myrpt->name);
+		mkdir(mycmd,0600);
+		time(&myt);
+		strftime(mydate,sizeof(mydate) - 1,"%Y%m%d%H%M%S",
+			localtime(&myt));
+		sprintf(mycmd,"mixmonitor start %s %s/%s/%s.wav49 a",chan->name,
+			myrpt->p.archivedir,myrpt->name,mydate);
+		if (myrpt->p.monminblocks)
+		{
+			blocksleft = diskavail(myrpt);
+			if (myrpt->p.remotetimeout)
+			{
+				blocksleft -= (myrpt->p.remotetimeout *
+					MONITOR_DISK_BLOCKS_PER_MINUTE) / 60;
+			}
+			if (blocksleft >= myrpt->p.monminblocks)
+				ast_cli_command(nullfd,mycmd);
+		} else ast_cli_command(nullfd,mycmd);
+		/* look at callerid to see what node this comes from */
+		if (!chan->cid.cid_num) /* if doesn't have caller id */
+		{
+			b1 = "0";
+		} else {
+			ast_callerid_parse(chan->cid.cid_num,&b,&b1);
+			ast_shrink_phone_number(b1);
+		}
+		sprintf(mycmd,"CONNECT,%s",b1);
+		donodelog(myrpt,mycmd);
+	}
+	myrpt->loginuser[0] = 0;
+	myrpt->loginlevel[0] = 0;
+	myrpt->authtelltimer = 0;
+	myrpt->authtimer = 0;
+	authtold = 0;
+	authreq = 0;
+	if (myrpt->p.authlevel > 1) authreq = 1;
+	setrem(myrpt); 
 	n = 0;
+	dtmfed = 0;
 	cs[n++] = chan;
 	cs[n++] = myrpt->rxchannel;
+	cs[n++] = myrpt->pchannel;
 	if (myrpt->rxchannel != myrpt->txchannel)
 		cs[n++] = myrpt->txchannel;
-	for (;;) {
-		if (ast_check_hangup(chan))
-			break;
-		if (ast_check_hangup(myrpt->rxchannel))
-			break;
-		if (myrpt->reload) {
+	if (!phone_mode) send_newkey(chan);
+	/* start un-locked */
+	for(;;) 
+	{
+		if (ast_check_hangup(chan)) break;
+		if (ast_check_hangup(myrpt->rxchannel)) break;
+		notremming = 0;
+		setting = 0;
+		reming = 0;
+		telem = myrpt->tele.next;
+		while(telem != &myrpt->tele)
+		{
+			if (telem->mode == SETREMOTE) setting = 1;
+			if ((telem->mode == SETREMOTE) ||
+			    (telem->mode == SCAN) ||
+				(telem->mode == TUNE))  reming = 1;
+			else notremming = 1;
+			telem = telem->next;
+		}
+		if (myrpt->reload)
+		{
 			myrpt->reload = 0;
-			rpt_mutex_unlock(&myrpt->lock);
 			/* find our index, and load the vars */
-			for (i = 0; i < nrpts; i++) {
-				if (&rpt_vars[i] == myrpt) {
-					load_rpt_vars(i, 0);
+			for(i = 0; i < nrpts; i++)
+			{
+				if (&rpt_vars[i] == myrpt)
+				{
+					load_rpt_vars(i,0);
 					break;
 				}
 			}
-			rpt_mutex_lock(&myrpt->lock);
+		}
+		time(&t);
+		if (myrpt->p.remotetimeout)
+		{ 
+			time_t r;
+
+			r = (t - myrpt->start_time);
+			if (r >= myrpt->p.remotetimeout)
+			{
+				saynode(myrpt,chan,myrpt->name);
+				sayfile(chan,"rpt/timeout");
+				ast_safe_sleep(chan,1000);
+				break;
+			}
+			if ((myrpt->p.remotetimeoutwarning) && 
+			    (r >= (myrpt->p.remotetimeout -
+				myrpt->p.remotetimeoutwarning)) &&
+				    (r <= (myrpt->p.remotetimeout - 
+				    	myrpt->p.remotetimeoutwarningfreq)))
+			{
+				if (myrpt->p.remotetimeoutwarningfreq)
+				{
+				    if ((t - last_timeout_warning) >=
+					myrpt->p.remotetimeoutwarningfreq)
+				    {
+					time(&last_timeout_warning);
+					rpt_telemetry(myrpt,TIMEOUT_WARNING,0);
+				    }
+				}
+				else
+				{
+				    if (!last_timeout_warning)
+				    {
+					time(&last_timeout_warning);
+					rpt_telemetry(myrpt,TIMEOUT_WARNING,0);
+				    }
+				}
+			}
+		}
+		if (myrpt->p.remoteinacttimeout && myrpt->last_activity_time)
+		{ 
+			time_t r;
+
+			r = (t - myrpt->last_activity_time);
+			if (r >= myrpt->p.remoteinacttimeout)
+			{
+				saynode(myrpt,chan,myrpt->name);
+				ast_safe_sleep(chan,1000);
+				break;
+			}
+			if ((myrpt->p.remotetimeoutwarning) && 
+			    (r >= (myrpt->p.remoteinacttimeout -
+				myrpt->p.remotetimeoutwarning)) &&
+				    (r <= (myrpt->p.remoteinacttimeout - 
+				    	myrpt->p.remotetimeoutwarningfreq)))
+			{
+				if (myrpt->p.remotetimeoutwarningfreq)
+				{
+				    if ((t - last_timeout_warning) >=
+					myrpt->p.remotetimeoutwarningfreq)
+				    {
+					time(&last_timeout_warning);
+					rpt_telemetry(myrpt,ACT_TIMEOUT_WARNING,0);
+				    }
+				}
+				else
+				{
+				    if (!last_timeout_warning)
+				    {
+					time(&last_timeout_warning);
+					rpt_telemetry(myrpt,ACT_TIMEOUT_WARNING,0);
+				    }
+				}
+			}
 		}
 		ms = MSWAIT;
-		who = ast_waitfor_n(cs, n, &ms);
-		if (who == NULL)
-			ms = 0;
+		who = ast_waitfor_n(cs,n,&ms);
+		if (who == NULL) ms = 0;
 		elap = MSWAIT - ms;
-		if (myrpt->macrotimer)
-			myrpt->macrotimer -= elap;
-		if (myrpt->macrotimer < 0)
-			myrpt->macrotimer = 0;
-		if (myrpt->gosubtimer)
-			myrpt->gosubtimer -= elap;
-		if (myrpt->gosubtimer < 0)
-			myrpt->gosubtimer = 0;
+		if (myrpt->macrotimer) myrpt->macrotimer -= elap;
+		if (myrpt->macrotimer < 0) myrpt->macrotimer = 0;
+		if (!ms) continue;
+		/* do local dtmf timer */
+		if (myrpt->dtmf_local_timer)
+		{
+			if (myrpt->dtmf_local_timer > 1) myrpt->dtmf_local_timer -= elap;
+			if (myrpt->dtmf_local_timer < 1) myrpt->dtmf_local_timer = 1;
+		}
+		rpt_mutex_lock(&myrpt->lock);
+		do_dtmf_local(myrpt,0);
 		rpt_mutex_unlock(&myrpt->lock);
-		if (!ms)
-			continue;
-		rem_totx = keyed;
-		
-		
-		if ((!myrpt->remoterx) && (!myrpt->remotetx)) {
-			if ((myrpt->retxtimer += elap) >= REDUNDANT_TX_TIME) {
-				myrpt->retxtimer = 0;
-				ast_indicate(chan, AST_CONTROL_RADIO_UNKEY);
+		//
+		rem_totx =  myrpt->dtmf_local_timer && (!phone_mode);
+		rem_totx |= keyed && (!myrpt->tunerequest);
+		rem_rx = (remkeyed && (!setting)) || (myrpt->tele.next != &myrpt->tele);
+		if(!strcmp(myrpt->remoterig, remote_rig_ic706))
+			rem_totx |= myrpt->tunerequest;
+		//
+	    if((debug > 6) && rem_totx) {
+	    	ast_log(LOG_NOTICE,"Set rem_totx=%i.  dtmf_local_timer=%i phone_mode=%i keyed=%i tunerequest=%i\n",rem_totx,myrpt->dtmf_local_timer,phone_mode,keyed,myrpt->tunerequest);
+		}
+		if (keyed && (!keyed1))
+		{
+			keyed1 = 1;
+		}
+
+		if (!keyed && (keyed1))
+		{
+			time_t myt;
+
+			keyed1 = 0;
+			time(&myt);
+			/* if login necessary, and not too soon */
+			if ((myrpt->p.authlevel) && 
+			    (!myrpt->loginlevel[0]) &&
+				(myt > (t + 3)))
+			{
+				authreq = 1;
+				authtold = 0;
+				myrpt->authtelltimer = AUTHTELLTIME - AUTHTXTIME;
 			}
-		} else
-			myrpt->retxtimer = 0;
-		if (rem_totx && (!myrpt->remotetx)) { /* Remote base radio TX key */
-			myrpt->remotetx = 1;
-			ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_KEY);
 		}
-		if ((!rem_totx) && myrpt->remotetx) { /* Remote base radio TX unkey */
-			myrpt->remotetx = 0;
-			ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_UNKEY);
+
+		if (rem_rx && (!myrpt->remoterx))
+		{
+			myrpt->remoterx = 1;
+			ast_indicate(chan,AST_CONTROL_RADIO_KEY);
+		}
+		if ((!rem_rx) && (myrpt->remoterx))
+		{
+			myrpt->remoterx = 0;
+			ast_indicate(chan,AST_CONTROL_RADIO_UNKEY);
+		}
+		/* if auth requested, and not authed yet */
+		if (authreq && (!myrpt->loginlevel[0]))
+		{
+			if ((!authtold) && ((myrpt->authtelltimer += elap)
+				 >= AUTHTELLTIME))
+			{
+				authtold = 1;
+				rpt_telemetry(myrpt,LOGINREQ,NULL);
+			}
+			if ((myrpt->authtimer += elap) >= AUTHLOGOUTTIME)
+			{
+				break; /* if not logged in, hang up after a time */
+			}
 		}
+		if (myrpt->newkey)
+		{
+			if ((myrpt->retxtimer += elap) >= REDUNDANT_TX_TIME)
+			{
+				myrpt->retxtimer = 0;
+				if ((myrpt->remoterx) && (!myrpt->remotetx))
+					ast_indicate(chan,AST_CONTROL_RADIO_KEY);
+				else
+					ast_indicate(chan,AST_CONTROL_RADIO_UNKEY);
+			}
 
-		if (myrpt->tunerequest && (!strcmp(myrpt->remote, remote_rig_ft897))) { /* ft-897 specific for now... */
-			myrpt->tunerequest = 0;
-			set_mode_ft897(myrpt, REM_MODE_AM);
-			simple_command_ft897(myrpt, 8);
+			if ((myrpt->rerxtimer += elap) >= (REDUNDANT_TX_TIME * 2))
+			{
+				keyed = 0;
+				myrpt->rerxtimer = 0;
+			}
+		}
+		if (rem_totx && (!myrpt->remotetx))
+		{
+			/* if not authed, and needed, do not transmit */
+			if ((!myrpt->p.authlevel) || myrpt->loginlevel[0])
+			{
+				if(debug > 6)
+					ast_log(LOG_NOTICE,"Handle rem_totx=%i.  dtmf_local_timer=%i  tunerequest=%i\n",rem_totx,myrpt->dtmf_local_timer,myrpt->tunerequest);
+
+				myrpt->remotetx = 1;
+				/* asdf maw ??? is this really what you want? Doesn't it always get executed? */
+				if((myrpt->remtxfreqok = check_tx_freq(myrpt)))
+				{
+					time(&myrpt->last_activity_time);
+					if ((iskenwood_pci4) && (myrpt->txchannel == myrpt->zaptxchannel))
+					{
+						z.radpar = ZT_RADPAR_UIODATA;
+						z.data = 1;
+						if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1)
+						{
+							ast_log(LOG_ERROR,"Cannot set UIODATA\n");
+							return -1;
+						}
+					}
+					else
+					{
+						ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_KEY);
+					}
+					if (myrpt->p.archivedir) donodelog(myrpt,"TXKEY");
+				}
+			}
+		}
+		if ((!rem_totx) && myrpt->remotetx) /* Remote base radio TX unkey */
+		{
 			myrpt->remotetx = 0;
-			ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_UNKEY);
-			if (!myrpt->remoterx)
-				ast_indicate(chan, AST_CONTROL_RADIO_KEY);
-			if (play_tone(chan, 800, 6000, 8192) == -1)
-				break;
-
-			rmt_telem_finish(myrpt, chan);
-			set_mode_ft897(myrpt, 0x88);
-			setrem(myrpt);
+			if(!myrpt->remtxfreqok){
+				rpt_telemetry(myrpt,UNAUTHTX,NULL);
+			}
+			if ((iskenwood_pci4) && (myrpt->txchannel == myrpt->zaptxchannel))
+			{
+				z.radpar = ZT_RADPAR_UIODATA;
+				z.data = 3;
+				if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1)
+				{
+					ast_log(LOG_ERROR,"Cannot set UIODATA\n");
+					return -1;
+				}
+			}
+			else
+			{
+				ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_UNKEY);
+			}
+			if (myrpt->p.archivedir) donodelog(myrpt,"TXUNKEY");
 		}
-	
-		if (myrpt->hfscanmode) {
+		if (myrpt->hfscanmode){
 			myrpt->scantimer -= elap;
-			if (myrpt->scantimer <= 0) {
-				myrpt->scantimer = REM_SCANTIME;
-				service_scan(myrpt);
+			if(myrpt->scantimer <= 0){
+				if (!reming)
+				{
+					myrpt->scantimer = REM_SCANTIME;
+					rpt_telemetry(myrpt,SCAN,0);
+				} else myrpt->scantimer = 1;
 			}
 		}
-		if (who == chan) { /* if it was a read from incoming */
+		rpt_mutex_lock(&myrpt->lock);
+		c = myrpt->macrobuf[0];
+		if (c && (!myrpt->macrotimer))
+		{
+			myrpt->macrotimer = MACROTIME;
+			memmove(myrpt->macrobuf,myrpt->macrobuf + 1,MAXMACRO - 1);
+			if ((c == 'p') || (c == 'P'))
+				myrpt->macrotimer = MACROPTIME;
+			rpt_mutex_unlock(&myrpt->lock);
+			if (myrpt->p.archivedir)
+			{
+				char str[100];
+					sprintf(str,"DTMF(M),%c",c);
+				donodelog(myrpt,str);
+			}
+			if (handle_remote_dtmf_digit(myrpt,c,&keyed,0) == -1) break;
+			continue;
+		} else rpt_mutex_unlock(&myrpt->lock);
+		if (who == chan) /* if it was a read from incomming */
+		{
 			f = ast_read(chan);
-			if (!f) {
-				ast_debug(1, "@@@@ link:Hung Up\n");
+			if (!f)
+			{
+				if (debug) printf("@@@@ link:Hung Up\n");
 				break;
 			}
-			if (f->frametype == AST_FRAME_VOICE) {
+			if (f->frametype == AST_FRAME_VOICE)
+			{
+				if (ioctl(chan->fds[0], ZT_GETCONFMUTE, &ismuted) == -1)
+				{
+					ismuted = 0;
+				}
 				/* if not transmitting, zero-out audio */
-				if (!myrpt->remotetx)
-					memset(f->data, 0, f->datalen);
-				ast_write(myrpt->txchannel, f);
-			}
-			if (f->frametype == AST_FRAME_DTMF) {
-				myrpt->remchannel = chan; /* Save copy of channel */
-				if (handle_remote_phone_dtmf(myrpt, f->subclass, &keyed, phone_mode) == -1) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+				ismuted |= (!myrpt->remotetx);
+				if (dtmfed && phone_mode) ismuted = 1;
+				dtmfed = 0;
+				if (ismuted)
+				{
+					memset(f->data,0,f->datalen);
+					if (myrpt->lastf1)
+						memset(myrpt->lastf1->data,0,myrpt->lastf1->datalen);
+					if (myrpt->lastf2)
+						memset(myrpt->lastf2->data,0,myrpt->lastf2->datalen);
+				} 
+				if (f) f2 = ast_frdup(f);
+				else f2 = NULL;
+				f1 = myrpt->lastf2;
+				myrpt->lastf2 = myrpt->lastf1;
+				myrpt->lastf1 = f2;
+				if (ismuted)
+				{
+					if (myrpt->lastf1)
+						memset(myrpt->lastf1->data,0,myrpt->lastf1->datalen);
+					if (myrpt->lastf2)
+						memset(myrpt->lastf2->data,0,myrpt->lastf2->datalen);
+				}
+				if (f1)
+				{
+					if (phone_mode)
+						ast_write(myrpt->txchannel,f1);
+					else
+						ast_write(myrpt->txchannel,f);
+					ast_frfree(f1);
+				}
+			}
+#ifndef	OLD_ASTERISK
+			else if (f->frametype == AST_FRAME_DTMF_BEGIN)
+			{
+				if (myrpt->lastf1)
+					memset(myrpt->lastf1->data,0,myrpt->lastf1->datalen);
+				if (myrpt->lastf2)
+					memset(myrpt->lastf2->data,0,myrpt->lastf2->datalen);
+				dtmfed = 1;
+			}
+#endif
+			if (f->frametype == AST_FRAME_DTMF)
+			{
+				if (myrpt->lastf1)
+					memset(myrpt->lastf1->data,0,myrpt->lastf1->datalen);
+				if (myrpt->lastf2)
+					memset(myrpt->lastf2->data,0,myrpt->lastf2->datalen);
+				dtmfed = 1;
+				if (handle_remote_phone_dtmf(myrpt,f->subclass,&keyed,phone_mode) == -1)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);
 					break;
 				}
 			}
-			if (f->frametype == AST_FRAME_TEXT) {
-				myrpt->remchannel = chan; /* Save copy of channel */
-				if (handle_remote_data(myrpt, f->data) == -1) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (f->frametype == AST_FRAME_TEXT)
+			{
+				if (handle_remote_data(myrpt,f->data) == -1)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);
 					break;
 				}
 			}
-			if (f->frametype == AST_FRAME_CONTROL) {
-				if (f->subclass == AST_CONTROL_HANGUP) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);
 					break;
 				}
 				/* if RX key */
-				if (f->subclass == AST_CONTROL_RADIO_KEY) {
-					ast_debug(8, "@@@@ rx key\n");
+				if (f->subclass == AST_CONTROL_RADIO_KEY)
+				{
+					if (debug == 7) printf("@@@@ rx key\n");
 					keyed = 1;
+					myrpt->rerxtimer = 0;
 				}
 				/* if RX un-key */
-				if (f->subclass == AST_CONTROL_RADIO_UNKEY) {
-					ast_debug(8, "@@@@ rx un-key\n");
+				if (f->subclass == AST_CONTROL_RADIO_UNKEY)
+				{
+					myrpt->rerxtimer = 0;
+					if (debug == 7) printf("@@@@ rx un-key\n");
 					keyed = 0;
 				}
 			}
-			if (myrpt->hfscanstatus) {
-				myrpt->remchannel = chan; /* Save copy of channel */
-				myrpt->remotetx = 0;
-				ast_indicate(myrpt->txchannel, AST_CONTROL_RADIO_UNKEY);
-				if (!myrpt->remoterx) {
-					ast_indicate(myrpt->remchannel, AST_CONTROL_RADIO_KEY);
-				}
-				if (myrpt->hfscanstatus < 0) {
-					if (myrpt->hfscanstatus == -1) {
-						if (ast_safe_sleep(myrpt->remchannel, 1000) == -1)
-							break;
-					}
-					sayfile(myrpt->remchannel, "rpt/stop");
-				} else {
-					saynum(myrpt->remchannel, myrpt->hfscanstatus );
-				}	
-				rmt_telem_finish(myrpt, myrpt->remchannel);
-				myrpt->hfscanstatus = 0;
-			}
 			ast_frfree(f);
-			rpt_mutex_lock(&myrpt->lock);
-			c = myrpt->macrobuf[0];
-			if (c && (!myrpt->macrotimer)) {
-				myrpt->macrotimer = MACROTIME;
-				memmove(myrpt->macrobuf, myrpt->macrobuf + 1, sizeof(myrpt->macrobuf) - 1);
-				if ((c == 'p') || (c == 'P'))
-					myrpt->macrotimer = MACROPTIME;
-				rpt_mutex_unlock(&myrpt->lock);
-				if (handle_remote_dtmf_digit(myrpt, c, &keyed, 0) == -1)
-					break;
-				continue;
-			}
-			c = myrpt->gosubbuf[0];
-			if (c && (!myrpt->gosubtimer)) {
-				myrpt->gosubtimer = GOSUBTIME;
-				memmove(myrpt->gosubbuf, myrpt->gosubbuf + 1, sizeof(myrpt->gosubbuf) - 1);
-				if ((c == 'p') || (c == 'P'))
-					myrpt->gosubtimer = GOSUBPTIME;
-				rpt_mutex_unlock(&myrpt->lock);
-				if (handle_remote_dtmf_digit(myrpt, c, &keyed, 0) == -1)
-					break;
-				continue;
-			} 
-			rpt_mutex_unlock(&myrpt->lock);
 			continue;
 		}
-		if (who == myrpt->rxchannel) { /* if it was a read from radio */
+		if (who == myrpt->rxchannel) /* if it was a read from radio */
+		{
 			f = ast_read(myrpt->rxchannel);
-			if (!f) {
-				ast_debug(1, "@@@@ link:Hung Up\n");
+			if (!f)
+			{
+				if (debug) printf("@@@@ link:Hung Up\n");
 				break;
 			}
-			if (f->frametype == AST_FRAME_VOICE) {
-				if ((myrpt->remote) && (myrpt->remotetx))
-					memset(f->data, 0, f->datalen);
-				 ast_write(chan, f);
-			} else if (f->frametype == AST_FRAME_CONTROL) {
-				if (f->subclass == AST_CONTROL_HANGUP) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (f->frametype == AST_FRAME_VOICE)
+			{
+				int myreming = 0;
+
+				if(!strcmp(myrpt->remoterig, remote_rig_kenwood))
+					myreming = reming;
+
+				if (myreming || (!remkeyed) ||
+				((myrpt->remote) && (myrpt->remotetx)) ||
+				  ((myrpt->remmode != REM_MODE_FM) &&
+				    notremming))
+					memset(f->data,0,f->datalen); 
+				 ast_write(myrpt->pchannel,f);
+			}
+			else if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);
 					break;
 				}
 				/* if RX key */
-				if (f->subclass == AST_CONTROL_RADIO_KEY) {
-					ast_debug(8, "@@@@ remote rx key\n");
-					if (!myrpt->remotetx) {
-						ast_indicate(chan, AST_CONTROL_RADIO_KEY);
-						myrpt->remoterx = 1;
+				if (f->subclass == AST_CONTROL_RADIO_KEY)
+				{
+					if (debug == 7) printf("@@@@ remote rx key\n");
+					if (!myrpt->remotetx)
+					{
+						remkeyed = 1;
 					}
 				}
 				/* if RX un-key */
-				if (f->subclass == AST_CONTROL_RADIO_UNKEY) {
-					ast_debug(8, "@@@@ remote rx un-key\n");
-					if (!myrpt->remotetx) {
-						ast_indicate(chan, AST_CONTROL_RADIO_UNKEY);
-						myrpt->remoterx = 0;
+				if (f->subclass == AST_CONTROL_RADIO_UNKEY)
+				{
+					if (debug == 7) printf("@@@@ remote rx un-key\n");
+					if (!myrpt->remotetx) 
+					{
+						remkeyed = 0;
 					}
 				}
 			}
 			ast_frfree(f);
 			continue;
 		}
-		if ((myrpt->rxchannel != myrpt->txchannel) && (who == myrpt->txchannel)) {
-			/* do this cuz you have to */
+		if (who == myrpt->pchannel) /* if is remote mix output */
+		{
+			f = ast_read(myrpt->pchannel);
+			if (!f)
+			{
+				if (debug) printf("@@@@ link:Hung Up\n");
+				break;
+			}
+			if (f->frametype == AST_FRAME_VOICE)
+			{
+				ast_write(chan,f);
+			}
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
+					ast_frfree(f);
+					break;
+				}
+			}
+			ast_frfree(f);
+			continue;
+		}
+		if ((myrpt->rxchannel != myrpt->txchannel) && 
+			(who == myrpt->txchannel)) /* do this cuz you have to */
+		{
 			f = ast_read(myrpt->txchannel);
-			if (!f) {
-				ast_debug(1, "@@@@ link:Hung Up\n");
+			if (!f)
+			{
+				if (debug) printf("@@@@ link:Hung Up\n");
 				break;
 			}
-			if (f->frametype == AST_FRAME_CONTROL) {
-				if (f->subclass == AST_CONTROL_HANGUP) {
-					ast_debug(1, "@@@@ rpt:Hung Up\n");
+			if (f->frametype == AST_FRAME_CONTROL)
+			{
+				if (f->subclass == AST_CONTROL_HANGUP)
+				{
+					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);
 					break;
 				}
@@ -7417,64 +14526,684 @@ static int rpt_exec(struct ast_channel *chan, void *data)
 			ast_frfree(f);
 			continue;
 		}
+	}
+	if (myrpt->p.archivedir)
+	{
+		char mycmd[100],*b,*b1;
 
+		/* look at callerid to see what node this comes from */
+		if (!chan->cid.cid_num) /* if doesn't have caller id */
+		{
+			b1 = "0";
+		} else {
+			ast_callerid_parse(chan->cid.cid_num,&b,&b1);
+			ast_shrink_phone_number(b1);
+		}
+		sprintf(mycmd,"DISCONNECT,%s",b1);
+		donodelog(myrpt,mycmd);
 	}
+	/* wait for telem to be done */
+	while(myrpt->tele.next != &myrpt->tele) usleep(100000);
+	sprintf(tmp,"mixmonitor stop %s",chan->name);
+	ast_cli_command(nullfd,tmp);
+	close(nullfd);
 	rpt_mutex_lock(&myrpt->lock);
-	if (myrpt->rxchannel != myrpt->txchannel)
-		ast_hangup(myrpt->txchannel);
-	ast_hangup(myrpt->rxchannel);
 	myrpt->hfscanmode = 0;
 	myrpt->hfscanstatus = 0;
 	myrpt->remoteon = 0;
 	rpt_mutex_unlock(&myrpt->lock);
+	if (myrpt->lastf1) ast_frfree(myrpt->lastf1);
+	myrpt->lastf1 = NULL;
+	if (myrpt->lastf2) ast_frfree(myrpt->lastf2);
+	myrpt->lastf2 = NULL;
+	if ((iskenwood_pci4) && (myrpt->txchannel == myrpt->zaptxchannel))
+	{
+		z.radpar = ZT_RADPAR_UIOMODE;
+		z.data = 3;
+		if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1)
+		{
+			ast_log(LOG_ERROR,"Cannot set UIOMODE\n");
+			return -1;
+		}
+		z.radpar = ZT_RADPAR_UIODATA;
+		z.data = 3;
+		if (ioctl(myrpt->zaptxchannel->fds[0],ZT_RADIO_SETPARAM,&z) == -1)
+		{
+			ast_log(LOG_ERROR,"Cannot set UIODATA\n");
+			return -1;
+		}
+		i = ZT_OFFHOOK;
+		if (ioctl(myrpt->zaptxchannel->fds[0],ZT_HOOK,&i) == -1)
+		{
+			ast_log(LOG_ERROR,"Cannot set hook\n");
+			return -1;
+		}
+	}
+	if (myrpt->iofd) close(myrpt->iofd);
+	myrpt->iofd = -1;
+	ast_hangup(myrpt->pchannel);
+	if (myrpt->rxchannel != myrpt->txchannel) ast_hangup(myrpt->txchannel);
+	ast_hangup(myrpt->rxchannel);
 	closerem(myrpt);
+	if (myrpt->p.rptnode)
+	{
+		rpt_mutex_lock(&myrpt->lock);
+		for(i = 0; i < nrpts; i++)
+		{
+			if (!strcasecmp(rpt_vars[i].name,myrpt->p.rptnode))
+			{
+				rpt_vars[i].xlink = 0;
+				break;
+			}
+		}
+		rpt_mutex_unlock(&myrpt->lock);
+	}
+#ifdef	OLD_ASTERISK
+	LOCAL_USER_REMOVE(u);
+#endif
 	return res;
 }
 
+#ifndef OLD_ASTERISK
+/*!\brief callback to display list of locally configured nodes
+   \addtogroup Group_AMI
+ */
+static int manager_rpt_local_nodes(struct mansession *s, const struct message *m)
+{
+    int i;
+    astman_append(s, "<?xml version=\"1.0\"?>\r\n");
+    astman_append(s, "<nodes>\r\n");
+    for (i=0; i< nrpts; i++)
+    {
+        astman_append(s, "  <node>%s</node>\r\n", rpt_vars[i].name);        
+    } /* for i */
+    astman_append(s, "</nodes>\r\n");
+    astman_append(s, "\r\n");	/* Properly terminate Manager output */
+    return RESULT_SUCCESS;
+} /* manager_rpt_local_nodes() */
+
+
+
+/*
+ * Append Success and ActionID to manager response message
+ */
+
+static void rpt_manager_success(struct mansession *s, const struct message *m)
+{
+	const char *id = astman_get_header(m, "ActionID");
+	if (!ast_strlen_zero(id))
+		astman_append(s, "ActionID: %s\r\n", id);
+	astman_append(s, "Response: Success\r\n");
+}
+
+/*
+* Dump statistics to manager session
+*/
+
+static int rpt_manager_do_stats(struct mansession *s, const struct message *m, char *str)
+{
+	int i,j,numoflinks;
+	int dailytxtime, dailykerchunks;
+	time_t now;
+	int totalkerchunks, dailykeyups, totalkeyups, timeouts;
+	int totalexecdcommands, dailyexecdcommands, hours, minutes, seconds;
+	long long totaltxtime;
+	struct	rpt_link *l;
+	char *listoflinks[MAX_STAT_LINKS];	
+	char *lastdtmfcommand,*parrot_ena;
+	char *tot_state, *ider_state, *patch_state;
+	char *reverse_patch_state, *sys_ena, *tot_ena, *link_ena, *patch_ena;
+	char *sch_ena, *input_signal, *called_number, *user_funs, *tail_type;
+	char *transmitterkeyed;
+	const char *node = astman_get_header(m, "Node");
+	struct rpt *myrpt;
+
+	static char *not_applicable = "N/A";
+
+	tot_state = ider_state = 
+	patch_state = reverse_patch_state = 
+	input_signal = not_applicable;
+	called_number = lastdtmfcommand = transmitterkeyed = NULL;
+
+	time(&now);
+	for(i = 0; i < nrpts; i++)
+	{
+		if ((node)&&(!strcmp(node,rpt_vars[i].name))){
+			rpt_manager_success(s,m);
+
+			myrpt = &rpt_vars[i];
+
+			if(myrpt->remote){ /* Remote base ? */
+				char *loginuser, *loginlevel, *freq, *rxpl, *txpl, *modestr;
+				char offset,powerlevel,rxplon,txplon,remoteon,remmode,reportfmstuff;
+				char offsetc,powerlevelc;
+
+				loginuser = loginlevel = freq = rxpl = txpl = NULL;
+				/* Make a copy of all stat variables while locked */
+				rpt_mutex_lock(&myrpt->lock); /* LOCK */
+				if((remoteon = myrpt->remoteon)){
+					if(!ast_strlen_zero(myrpt->loginuser))
+						loginuser = ast_strdup(myrpt->loginuser);
+					if(!ast_strlen_zero(myrpt->loginlevel))
+						loginlevel = ast_strdup(myrpt->loginlevel);
+					if(!ast_strlen_zero(myrpt->freq))
+						freq = ast_strdup(myrpt->freq);
+					if(!ast_strlen_zero(myrpt->rxpl))
+						rxpl = ast_strdup(myrpt->rxpl);
+					if(!ast_strlen_zero(myrpt->txpl))
+						txpl = ast_strdup(myrpt->txpl);
+					remmode = myrpt->remmode;
+					offset = myrpt->offset;
+					powerlevel = myrpt->powerlevel;
+					rxplon = myrpt->rxplon;
+					txplon = myrpt->txplon;			
+				}
+				rpt_mutex_unlock(&myrpt->lock); /* UNLOCK */
+				astman_append(s, "IsRemoteBase: YES\r\n");
+				astman_append(s, "RemoteOn: %s\r\n",(remoteon) ? "YES": "NO");
+				if(remoteon){
+					if(loginuser){
+						astman_append(s, "LogInUser: %s\r\n", loginuser);
+						ast_free(loginuser);
+					}
+					if(loginlevel){
+						astman_append(s, "LogInLevel: %s\r\n", loginlevel);
+						ast_free(loginlevel);
+					}
+					if(freq){
+						astman_append(s, "Freq: %s\r\n", freq);
+						ast_free(freq);
+					}
+					reportfmstuff = 0;
+					switch(remmode){
+						case REM_MODE_FM:
+							modestr = "FM";	
+							reportfmstuff = 1;
+							break;
+						case REM_MODE_AM:
+							modestr = "AM";
+							break;
+						case REM_MODE_USB:
+							modestr = "USB";
+							break;
+						default:
+							modestr = "LSB";
+							break;
+					}
+					astman_append(s, "RemMode: %s\r\n", modestr);
+					if(reportfmstuff){
+						switch(offset){
+							case REM_SIMPLEX:
+								offsetc = 'S';
+								break;
+							case REM_MINUS:
+								offsetc = '-';
+								break;
+							default:
+								offsetc = '+';
+								break;
+						}
+						astman_append(s, "RemOffset: %c\r\n", offsetc);
+						if(rxplon && rxpl){
+							astman_append(s, "RxPl: %s\r\n",rxpl);
+							free(rxpl);
+						}
+						if(txplon && txpl){
+							astman_append(s, "TxPl: %s\r\n",txpl);
+							free(txpl);
+						}
+					}
+					switch(powerlevel){
+						case REM_LOWPWR:
+							powerlevelc = 'L';
+							break;
+						case REM_MEDPWR:
+							powerlevelc = 'M';
+							break;
+						default:
+							powerlevelc = 'H';
+							break;
+					}
+					astman_append(s,"PowerLevel: %c\r\n", powerlevelc);
+				}
+				astman_append(s, "\r\n");
+				return 0; /* End of remote base status reporting */
+			}	
+
+			/* ELSE Process as a repeater node */
+			/* Make a copy of all stat variables while locked */
+			rpt_mutex_lock(&myrpt->lock); /* LOCK */
+			dailytxtime = myrpt->dailytxtime;
+			totaltxtime = myrpt->totaltxtime;
+			dailykeyups = myrpt->dailykeyups;
+			totalkeyups = myrpt->totalkeyups;
+			dailykerchunks = myrpt->dailykerchunks;
+			totalkerchunks = myrpt->totalkerchunks;
+			dailyexecdcommands = myrpt->dailyexecdcommands;
+			totalexecdcommands = myrpt->totalexecdcommands;
+			timeouts = myrpt->timeouts;
+
+
+			/* Traverse the list of connected nodes */
+			reverse_patch_state = "DOWN";
+			numoflinks = 0;
+			l = myrpt->links.next;
+			while(l && (l != &myrpt->links)){
+				if(numoflinks >= MAX_STAT_LINKS){
+					ast_log(LOG_NOTICE,
+					"maximum number of links exceeds %d in rpt_do_stats()!",MAX_STAT_LINKS);
+					break;
+				}
+				if (l->name[0] == '0'){ /* Skip '0' nodes */
+					reverse_patch_state = "UP";
+					l = l->next;
+					continue;
+				}
+				listoflinks[numoflinks] = ast_strdup(l->name);
+				if(listoflinks[numoflinks] == NULL){
+					break;
+				}
+				else{
+					numoflinks++;
+				}
+				l = l->next;
+			}
+
+			if(myrpt->keyed)
+				input_signal = "YES";
+			else
+				input_signal = "NO";
+			
+			if(myrpt->txkeyed)
+				transmitterkeyed = "YES";
+			else
+				transmitterkeyed = "NO";
+
+			if(myrpt->p.parrotmode)
+				parrot_ena = "ENABLED";
+			else
+				parrot_ena = "DISABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].txdisable)
+				sys_ena = "DISABLED";
+			else
+				sys_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].totdisable)
+				tot_ena = "DISABLED";
+			else
+				tot_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].linkfundisable)
+				link_ena = "DISABLED";
+			else
+				link_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].autopatchdisable)
+				patch_ena = "DISABLED";
+			else
+				patch_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].schedulerdisable)
+				sch_ena = "DISABLED";
+			else
+				sch_ena = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].userfundisable)
+				user_funs = "DISABLED";
+			else
+				user_funs = "ENABLED";
+
+			if(myrpt->p.s[myrpt->p.sysstate_cur].alternatetail)
+				tail_type = "ALTERNATE";
+			else
+				tail_type = "STANDARD";
+
+			if(!myrpt->totimer)
+				tot_state = "TIMED OUT!";
+			else if(myrpt->totimer != myrpt->p.totime)
+				tot_state = "ARMED";
+			else
+				tot_state = "RESET";
+
+			if(myrpt->tailid)
+				ider_state = "QUEUED IN TAIL";
+			else if(myrpt->mustid)
+				ider_state = "QUEUED FOR CLEANUP";
+			else
+				ider_state = "CLEAN";
+
+			switch(myrpt->callmode){
+				case 1:
+					patch_state = "DIALING";
+					break;
+				case 2:
+					patch_state = "CONNECTING";
+					break;
+				case 3:
+					patch_state = "UP";
+					break;
+
+				case 4:
+					patch_state = "CALL FAILED";
+					break;
+
+				default:
+					patch_state = "DOWN";
+			}
+
+			if(strlen(myrpt->exten)){
+				called_number = ast_strdup(myrpt->exten);
+			}
+
+			if(strlen(myrpt->lastdtmfcommand)){
+				lastdtmfcommand = ast_strdup(myrpt->lastdtmfcommand);
+			}
+			rpt_mutex_unlock(&myrpt->lock); /* UNLOCK */
+
+			astman_append(s, "IsRemoteBase: NO\r\n");
+			astman_append(s, "NodeState: %d\r\n", myrpt->p.sysstate_cur);
+			astman_append(s, "SignalOnInput: %s\r\n", input_signal);
+			astman_append(s, "TransmitterKeyed: %s\r\n", transmitterkeyed);
+			astman_append(s, "Transmitter: %s\r\n", sys_ena);
+			astman_append(s, "Parrot: %s\r\n", parrot_ena);
+			astman_append(s, "Scheduler: %s\r\n", sch_ena);
+			astman_append(s, "TailLength: %s\r\n", tail_type);
+			astman_append(s, "TimeOutTimer: %s\r\n", tot_ena);
+			astman_append(s, "TimeOutTimerState: %s\r\n", tot_state);
+			astman_append(s, "TimeOutsSinceSystemInitialization: %d\r\n", timeouts);
+			astman_append(s, "IdentifierState: %s\r\n", ider_state);
+			astman_append(s, "KerchunksToday: %d\r\n", dailykerchunks);
+			astman_append(s, "KerchunksSinceSystemInitialization: %d\r\n", totalkerchunks);
+			astman_append(s, "KeyupsToday: %d\r\n", dailykeyups);
+			astman_append(s, "KeyupsSinceSystemInitialization: %d\r\n", totalkeyups);
+			astman_append(s, "DtmfCommandsToday: %d\r\n", dailyexecdcommands);
+			astman_append(s, "DtmfCommandsSinceSystemInitialization: %d\r\n", totalexecdcommands);
+			astman_append(s, "LastDtmfCommandExecuted: %s\r\n", 
+			(lastdtmfcommand && strlen(lastdtmfcommand)) ? lastdtmfcommand : not_applicable);
+			hours = dailytxtime/3600000;
+			dailytxtime %= 3600000;
+			minutes = dailytxtime/60000;
+			dailytxtime %= 60000;
+			seconds = dailytxtime/1000;
+			dailytxtime %= 1000;
+
+			astman_append(s, "TxTimeToday: %02d:%02d:%02d.%d\r\n",
+				hours, minutes, seconds, dailytxtime);
+
+			hours = (int) totaltxtime/3600000;
+			totaltxtime %= 3600000;
+			minutes = (int) totaltxtime/60000;
+			totaltxtime %= 60000;
+			seconds = (int)  totaltxtime/1000;
+			totaltxtime %= 1000;
+
+			astman_append(s, "TxTimeSinceSystemInitialization: %02d:%02d:%02d.%d\r\n",
+				 hours, minutes, seconds, (int) totaltxtime);
+
+  			sprintf(str, "NodesCurrentlyConnectedToUs: ");
+                        if(!numoflinks){
+  	                      strcat(str,"<NONE>");
+                        }
+			else{
+				for(j = 0 ;j < numoflinks; j++){
+					sprintf(str+strlen(str), "%s", listoflinks[j]);
+					if(j < numoflinks - 1)
+						strcat(str,",");
+				}
+			}
+			astman_append(s,"%s\r\n", str);
+
+			astman_append(s, "Autopatch: %s\r\n", patch_ena);
+			astman_append(s, "AutopatchState: %s\r\n", patch_state);
+			astman_append(s, "AutopatchCalledNumber: %s\r\n",
+			(called_number && strlen(called_number)) ? called_number : not_applicable);
+			astman_append(s, "ReversePatchIaxrptConnected: %s\r\n", reverse_patch_state);
+			astman_append(s, "UserLinkingCommands: %s\r\n", link_ena);
+			astman_append(s, "UserFunctions: %s\r\n", user_funs);
+
+			for(j = 0; j < numoflinks; j++){ /* ast_free() all link names */
+				ast_free(listoflinks[j]);
+			}
+			if(called_number){
+				ast_free(called_number);
+			}
+			if(lastdtmfcommand){
+				ast_free(lastdtmfcommand);
+			}
+			astman_append(s, "\r\n"); /* We're Done! */
+		        return 0;
+		}
+	}
+	astman_send_error(s, m, "RptStatus unknown or missing node");
+	return -1;
+}
+
+
+
+/*
+ * Implement the RptStatus Manager Interface
+ */
+
+static int manager_rpt_status(struct mansession *s, const struct message *m)
+{
+	int i,res,len,index;
+	int uptime,hours,minutes;
+	time_t now;
+	const char *cmd = astman_get_header(m, "Command");
+	char *str;
+	enum {MGRCMD_RPTSTAT,MGRCMD_NODESTAT};
+	struct mgrcmdtbl{
+		const char *cmd;
+		int index;
+	};
+	static struct mgrcmdtbl mct[] = {
+		{"RptStat",MGRCMD_RPTSTAT},
+		{"NodeStat",MGRCMD_NODESTAT},
+		{NULL,0} /* NULL marks end of command table */
+	};
+
+	time(&now);
+
+	len = 1024; /* Allocate a working buffer */
+	if(!(str = ast_malloc(len)))
+		return -1;
+
+	/* Check for Command */
+	if(ast_strlen_zero(cmd)){
+		astman_send_error(s, m, "RptStatus missing command");
+		ast_free(str);
+		return 0;
+	}
+	/* Try to find the command in the table */
+	for(i = 0 ; mct[i].cmd ; i++){
+		if(!strcmp(mct[i].cmd, cmd))
+			break;
+	}
+
+	if(!mct[i].cmd){ /* Found or not found ? */
+		astman_send_error(s, m, "RptStatus unknown command");
+		ast_free(str);
+		return 0;
+	}
+	else
+		index = mct[i].index;
+
+	switch(index){ /* Use the index to go to the correct command */
+
+		case MGRCMD_RPTSTAT:
+			/* Return Nodes: and a comma separated list of nodes */
+			if((res = snprintf(str, len, "Nodes: ")) > -1)
+				len -= res;
+			else{
+				ast_free(str);
+				return 0;
+			}
+			for(i = 0; i < nrpts; i++){
+				if(i < nrpts - 1){
+					if((res = snprintf(str+strlen(str), len, "%s,",rpt_vars[i].name)) < 0){
+						ast_free(str);
+						return 0;
+					}
+				}
+				else{
+					if((res = snprintf(str+strlen(str), len, "%s",rpt_vars[i].name)) < 0){
+						ast_free(str);
+						return 0;
+					}
+				}
+				len -= res;
+			}
+
+			rpt_manager_success(s,m);
+			
+			if(!nrpts)
+				astman_append(s, "<NONE>\r\n");
+			else
+				astman_append(s, "%s\r\n", str);
+
+			uptime = (int)(now - starttime);
+                     	hours = uptime/3600;
+                        uptime %= 3600;
+                        minutes = uptime/60;
+                        uptime %= 60;
+
+                        astman_append(s, "RptUptime: %02d:%02d:%02d\r\n",
+                                hours, minutes, uptime);
+
+			astman_append(s, "\r\n");
+			break;		
+
+		case	MGRCMD_NODESTAT:
+			res = rpt_manager_do_stats(s,m,str);
+			ast_free(str);
+			return res;
+
+		default:
+			astman_send_error(s, m, "RptStatus invalid command");
+			break;
+	}
+	ast_free(str);
+	return 0;
+}
+
+#endif
+
+#ifdef	OLD_ASTERISK
+int unload_module()
+#else
 static int unload_module(void)
+#endif
 {
-	int i;
+	int i, res;
 
-	for (i = 0; i < nrpts; i++) {
-		if (!strcmp(rpt_vars[i].name, rpt_vars[i].p.nodes))
-			continue;
-		ast_mutex_destroy(&rpt_vars[i].lock);
+#ifdef	OLD_ASTERISK
+	STANDARD_HANGUP_LOCALUSERS;
+#endif
+	for(i = 0; i < nrpts; i++) {
+		if (!strcmp(rpt_vars[i].name,rpt_vars[i].p.nodes)) continue;
+                ast_mutex_destroy(&rpt_vars[i].lock);
+                ast_mutex_destroy(&rpt_vars[i].remlock);
 	}
-	i = ast_unregister_application(app);
+	res = ast_unregister_application(app);
 
+#ifdef	NEW_ASTERISK
+	ast_cli_unregister_multiple(rpt_cli,sizeof(rpt_cli) / 
+		sizeof(struct ast_cli_entry));
+#else
 	/* Unregister cli extensions */
-	ast_cli_unregister_multiple(cli_rpt, sizeof(cli_rpt) / sizeof(struct ast_cli_entry));
-
-	return i;
+	ast_cli_unregister(&cli_debug);
+	ast_cli_unregister(&cli_dump);
+	ast_cli_unregister(&cli_stats);
+	ast_cli_unregister(&cli_lstats);
+	ast_cli_unregister(&cli_nodes);
+	ast_cli_unregister(&cli_local_nodes);
+	ast_cli_unregister(&cli_reload);
+	ast_cli_unregister(&cli_restart);
+	ast_cli_unregister(&cli_fun);
+	ast_cli_unregister(&cli_fun1);
+	res |= ast_cli_unregister(&cli_cmd);
+#endif
+#ifndef OLD_ASTERISK
+	res |= ast_manager_unregister("RptLocalNodes");
+	res |= ast_manager_unregister("RptStatus");
+#endif
+	return res;
 }
 
+#ifdef	OLD_ASTERISK
+int load_module()
+#else
 static int load_module(void)
+#endif
 {
-	struct ast_flags config_flags = { CONFIG_FLAG_NOCACHE };
-	struct ast_config *cfg = ast_config_load("rpt.conf", config_flags);
-	if (!cfg) {
-		ast_log(LOG_WARNING, "No such configuration file rpt.conf\n");
-		return AST_MODULE_LOAD_DECLINE;
-	}
-	ast_pthread_create(&rpt_master_thread, NULL, rpt_master, cfg);
+	int res;
+	ast_pthread_create(&rpt_master_thread,NULL,rpt_master,NULL);
 
+#ifdef	NEW_ASTERISK
+	ast_cli_register_multiple(rpt_cli,sizeof(rpt_cli) / 
+		sizeof(struct ast_cli_entry));
+	res = 0;
+#else
 	/* Register cli extensions */
-	ast_cli_register_multiple(cli_rpt, sizeof(cli_rpt) / sizeof(struct ast_cli_entry));
+	ast_cli_register(&cli_debug);
+	ast_cli_register(&cli_dump);
+	ast_cli_register(&cli_stats);
+	ast_cli_register(&cli_lstats);
+	ast_cli_register(&cli_nodes);
+	ast_cli_register(&cli_local_nodes);
+	ast_cli_register(&cli_reload);
+	ast_cli_register(&cli_restart);
+	ast_cli_register(&cli_fun);
+	ast_cli_register(&cli_fun1);
+	res = ast_cli_register(&cli_cmd);
+#endif
+#ifndef OLD_ASTERISK
+	res |= ast_manager_register("RptLocalNodes", 0, manager_rpt_local_nodes, "List local node numbers");
+	res |= ast_manager_register("RptStatus", 0, manager_rpt_status, "Return Rpt Status for CGI");
+
+#endif
+	res |= ast_register_application(app, rpt_exec, synopsis, descrip);
+	return res;
+}
+
+#ifdef	OLD_ASTERISK
+char *description()
+{
+	return tdesc;
+}
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
 
-	return ast_register_application(app, rpt_exec, synopsis, descrip);
+char *key()
+{
+	return ASTERISK_GPL_KEY;
 }
+#endif
 
+#ifdef	OLD_ASTERISK
+int reload()
+#else
 static int reload(void)
+#endif
 {
-	int n;
+int	n;
 
-	for (n = 0; n < nrpts; n++)
-		rpt_vars[n].reload = 1;
+	for(n = 0; n < nrpts; n++) rpt_vars[n].reload = 1;
 	return(0);
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Radio Repeater / Remote Base",
+
+#ifndef	OLD_ASTERISK
+/* STD_MOD(MOD_1, reload, NULL, NULL); */
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Radio Repeater/Remote Base Application",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
-	);
+	       );
+#endif
+