19 files changed, 0 insertions, 2618 deletions
diff --git a/usr/local/sbin/cleargmirror.sh b/usr/local/sbin/cleargmirror.sh
deleted file mode 100755
index a00cc93..0000000
--- a/usr/local/sbin/cleargmirror.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-clear_disk() {
-	local _disk="${1}"
-	local _mirror=$(/sbin/gmirror dump ${_disk} 2>/dev/null | sed '/name: /!d; s,^.*: ,,')
-
-	if [ -n "${_mirror}" ]; then
-		/sbin/gmirror destroy -f ${_mirror} >/dev/null 2>&1
-	fi
-	/sbin/gmirror clear ${_disk} >/dev/null 2>&1
-}
-
-mirror="${1}"
-disk1="${2}"
-disk2="${3}"
-
-if [ -z "${mirror}" -o -z "${disk1}" -o -z "${disk2}" ]; then
-	echo "You must specify mirror name, and disks that should be cleared"
-	exit 1
-fi
-
-/sbin/gmirror destroy -f ${mirror} >/dev/null 2>&1
-clear_disk ${disk1}
-clear_disk ${disk2}
-
-exit 0
diff --git a/usr/local/sbin/cleargpt.sh b/usr/local/sbin/cleargpt.sh
deleted file mode 100755
index 07d530a..0000000
--- a/usr/local/sbin/cleargpt.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-DISK=$1
-if [ "$DISK" = "" ]; then
-	echo "You must specify the disk that should be formatted/cleared."
-	exit 1
-fi
-for PART in `/sbin/gpart show $DISK | grep -v '=>' | awk '{ print $3 }'`; do
-	if [ "$PART" != "" ]; then
-		/sbin/gpart delete -i $PART $DISK >/dev/null
-	fi
-done
-/sbin/gpart destroy $DISK >/dev/null
-exit 0
diff --git a/usr/local/sbin/gmirror_status_check.php b/usr/local/sbin/gmirror_status_check.php
deleted file mode 100644
index f19a5d1..0000000
--- a/usr/local/sbin/gmirror_status_check.php
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/local/bin/php-cgi -f
-<?php
-/*
-	gmirror_status_check.php
-	Copyright (C) 2014 Jim Pingle
-	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INClUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-	pfSense_BUILDER_BINARIES:	/sbin/gmirror	/sbin/geom	/usr/bin/grep	/usr/bin/egrep	/usr/bin/cut	/usr/bin/head
-	pfSense_BUILDER_BINARIES:	/sbin/mount	/usr/bin/awk	/usr/bin/sed
-	pfSense_MODULE:	gmirror
-*/
-
-require_once("config.inc");
-require_once("notices.inc");
-require_once("globals.inc");
-require_once("gmirror.inc");
-
-global $g;
-$status_file = "{$g['varrun_path']}/gmirror.status";
-
-$mirror_status = gmirror_get_status();
-$mirror_list = array_keys($mirror_status);
-sort($mirror_list);
-$notices = array();
-
-// Check for gmirror.status
-if (file_exists($status_file)) {
-	// If it exists, read status in
-	$previous_mirror_status = unserialize(file_get_contents($status_file));
-	$previous_mirror_list = array_keys($previous_mirror_status);
-	sort($previous_mirror_list);
-	if (count($previous_mirror_status) > 0) {
-		// Check list of current mirrors vs old mirrors, notify if one has appeared/disappeared
-		if ($mirror_list != $previous_mirror_list) {
-			$notices[] = sprintf(gettext("List of mirrors changed. Old: (%s) New: (%s)"), implode(", ", $previous_mirror_list), implode(", ", $mirror_list));
-		}
-
-		// For each mirror, check the mirror status, notify if changed
-		foreach ($mirror_list as $mirror) {
-			if (is_array($previous_mirror_status[$mirror])) {
-				// Notify if the status changed
-				if ($mirror_status[$mirror]['status'] != $previous_mirror_status[$mirror]['status']) {
-					$notices[] = sprintf(gettext("Mirror %s status changed from %s to %s."), $mirror, $previous_mirror_status[$mirror]['status'], $mirror_status[$mirror]['status']);
-				}
-				// Notify if the drive count changed
-				if (count($mirror_status[$mirror]['components']) != count($previous_mirror_status[$mirror]['components'])) {
-					// Notify if the consumer count changed.
-					$notices[] = sprintf(gettext("Mirror %s consumer count changed from %d to %d."), $mirror, count($previous_mirror_status[$mirror]['components']), count($mirror_status[$mirror]['components']));
-				}
-				if (strtoupper($mirror_status[$mirror]['status']) == "DEGRADED") {
-					// Check the drive status as it may be different.
-					asort($mirror_status[$mirror]['components']);
-					asort($previous_mirror_status[$mirror]['components']);
-					if ($mirror_status[$mirror]['components'] != $previous_mirror_status[$mirror]['components']) {
-						$notices[] = sprintf(gettext("Mirror %s drive status changed. Old: (%s) New: (%s)"),
-								$mirror,
-								implode(", ", $previous_mirror_status[$mirror]['components']),
-								implode(", ", $mirror_status[$mirror]['components']));
-					}
-				}
-			}
-		}
-	}
-}
-if (count($notices)) {
-	file_notice("gmirror", implode("\n ", $notices), "GEOM Mirror Status Change", 1);
-}
-// Write out current status if changed
-if ($mirror_status != $previous_mirror_status) {
-	file_put_contents($status_file, serialize($mirror_status));
-}
-
-?>
diff --git a/usr/local/sbin/mpd.script b/usr/local/sbin/mpd.script
deleted file mode 100644
index 28054d7..0000000
--- a/usr/local/sbin/mpd.script
+++ /dev/null
@@ -1,1642 +0,0 @@
-#################################################################
-#
-# $Id: mpd.script.sample,v 1.9 2009/10/04 19:36:04 amotin Exp $
-#
-# Copyright (c) 1995-1999 Whistle Communications, Inc. All rights reserved.
-# See ``COPYRIGHT.whistle''
-#
-#################################################################
-
-##
-## MPD Modem script variables:
-##
-##  $DialPrefix		Modem dialing prefix (eg. "DT")
-##  $Telephone		Telephone number to dial (not duplicated using &)
-##  $ConnectTimeout	Wait-for-connect timeout, in seconds (default 45 secs)
-##  $SpeakerOff		Set to "yes" to quiet modem speakers
-##  $Serial230K		If "yes", we can support 230K serial port speed
-##  $CountryCode	Country code for Winmodem
-##  $InitString		External initialization string
-##  $LoginScript	If "yes", look for script login
-##
-## pfSense specific variables:
-##	$APN			Access Point (host)Name for 3G connections
-##	$APNum			Access Point Number, typically "1", might not matter
-##	$SimPin			SIM card PIN number
-##	$PinWait		Wait for SIM to connect to network after PIN entered
-##
-## ISDN Terminal Adapter specific variables (all start with "TA_"):
-##
-##  $TA_Bonding		Bonding on TA: "yes" or "no"
-##  $TA_NoDoubleTelno	When $TA_Bonding, don't double the dialed number
-##  $TA_56K		Restrict to 56K on TA: "yes" or "no"
-##  $TA_VoiceCall	Originate calls using voice mode
-##  $TA_AuthChap	Tell TA to use CHAP: "yes" or "no"
-##  $TA_Dirno1		TA directory #1
-##  $TA_Dirno2		TA directory #2
-##  $TA_SPID1		SPID #1
-##  $TA_SPID2		SPID #2
-##  $TA_SwitchType	One of these values
-##				"NI-1"
-##				"DMS-100"
-##				"5ESS P2P"
-##				"5ESS MP"
-##  $TA_NewSwitch	Means the switch type is new, initiate auto-detect
-##			(3Com Impact IQ only)
-##
-## We set $OptimizeNextTime to "yes" after a successful connection so we
-## can avoid verifing configuration when things are working good.
-##
-## Internal variables:
-##
-##  $ModemSetupFunc	Routine to set up modem for dialing out
-##  $ModemAnsSetupFunc	Routine to set up modem for answer mode (if different)
-##  $ModemDetectRing	Routine to detect an incoming call for ringback
-##  $ModemIsAnalog	If "yes" modem is analog (ie, not terminal adapter)
-##
-
-#################################################################
-#
-#	MODEM DIALING
-#
-#################################################################
-
-DialPeer:
-	set $CallingID ""
-	set $CalledID $Telephone
-	if $Telephone == "00000" goto DialNullModem
-	set $optimize $OptimizeNextTime
-	set $OptimizeNextTime "no"
-
-	if $optimize == "yes" goto DialPeer2
-	call ModemFind
-	if $ErrorMsg == "" goto DialPeer1
-	log $ErrorMsg
-	failure
-DialPeer1:
-	set $ModTelephone $Telephone
-	call ModemIdent
-	if $ModemDescription != "" goto DialPeer2
-	log "No match found in the ModemIdent function in the chat script."
-	failure
-
-DialPeer2:
-	log "Detected $ModemDescription."
-	call $ModemSetupFunc
-	log "Dialing server at $Telephone..."
-	call ModemDial
-	if $dialResult == "OK" goto DialPeerOK
-	set $optimize "no"
-	failure
-
-DialPeerOK:
-	if $ConnectionSpeed == "" log "Connected at an unknown speed."
-	if $ConnectionSpeed == "" goto DialPeer3
-	log "Connected at $ConnectionSpeed."
-DialPeer3:
-	if $LoginScript == "yes" call AutoLogin
-	set $OptimizeNextTime "yes"
-	success
-
-DialPeerSetPin:
-	set $modemCmd "+CPIN?"
-	log $modemCmd
-	call ModemQuery
-	log $modemQuery
-	if $modemQuery match ".*READY.*" goto DialPinReady
-	set $modemCmd "+CPIN=\"$SimPin\""
-	call ModemCmd2
-	wait $PinWait
-
-DialPinReady:
-	return
-
-DialPeerSetAPN:
-	set $modemCmd "+CGDCONT=$APNum,\"IP\",\"$APN\""
-	log $modemCmd
-	call ModemCmd2
-	return
-	
-# Null-modem connection
-DialNullModem:
-	log "Connected via null modem connection."
-	success
-
-##
-## Dial modem
-##
-## Variables:
-##
-##  $DialPrefix		Modem dialing prefix (eg. "DT")
-##  $ModTelephone	Telephone number to dial
-##  $ConnectTimeout	Wait-for-connect timeout, in seconds (default 45 secs)
-##  $noDialToneSubr	(optional) Subroutine to call if NO DIALTONE
-##  $dialErrorSubr	(optional) Subroutine to call if ERR
-##
-## Returns:
-##
-##  $dialResult		"OK" or "FAIL"
-##  $ConnectionSpeed	Connection speed reported by modem (possibly empty)
-##
-
-ModemDial:
-	set $dialResult "FAIL"
-	set $ConnectionSpeed ""
-	if $ConnectTimeout == "" set $ConnectTimeout 45
-	print "AT${DialPrefix}${ModTelephone}\r\n"
-	log "AT${DialPrefix}${ModTelephone}"
-	match "NO CARRIER" DialAbortNoCar
-	match "NO DIAL" DialAbortNoDial
-	match "BUSY" DialAbortBusy
-	regex "CONNECT *([0-9]*).*$" DialConnect
-	match "ERR" DialError
-	wait $ConnectTimeout
-	log "No response from the modem after dialing."
-	return
-DialAbortNoCar:
-	log "The remote modem did not answer."
-	return
-DialAbortNoDial:
-	if $noDialToneSubr != "" goto $noDialToneSubr
-	log "No dialtone. Is the modem plugged in?"
-	return
-DialError:
-	if ${ModTelephone} != "" goto DialErrorInit
-	log "Invalid empty telephone number."
-	return
-DialErrorInit:
-	if $dialErrorSubr != "" goto $dialErrorSubr
-	log "Invalid dial init string."
-	return
-DialAbortBusy:
-	log "The line was busy."
-	return
-DialConnect:
-	set $ConnectionSpeed $matchedString1
-	set $dialResult "OK"
-	return
-
-#################################################################
-#
-#	MODEM ANSWERING
-#
-#################################################################
-
-##
-## This is an idle script that waits for an incoming call and answers it
-##
-## Variables:
-##
-##  $RingTimeout	How long to wait for a RING before giving up
-##  $ConnectTimeout	Wait-for-connect timeout, in seconds (default 45 secs)
-##
-
-AnswerCall:
-	set $CallingID ""
-	set $CalledID ""
-	set $optimize $OptimizeNextTime
-	set $OptimizeNextTime "no"
-
-# Skip modem detection if we connected successfully last time
-
-	if $optimize == "yes" goto AnswerCall2
-	call ModemFind
-	if $ErrorMsg == "" goto AnswerCall0
-	log $ErrorMsg
-	failure
-AnswerCall0:
-	call ModemIdent
-	if $ModemDescription != "" goto AnswerCall1
-	log "The modem is not responding."
-	failure
-AnswerCall1:
-	log "Detected $ModemDescription."
-
-AnswerCall2:
-	if $ModemAnsSetupFunc == "" set $ModemAnsSetupFunc $ModemSetupFunc
-	call $ModemAnsSetupFunc
-	log "Waiting for ring..."
-	call ModemAnswer
-	if $answerReturn == "OK" goto AnswerCallOK
-	set $IdleResult ""
-	set $optimize "no"
-	failure
-
-AnswerCallOK:
-	log "Connected at $ConnectionSpeed."
-	set $OptimizeNextTime "yes"
-	set $IdleResult "answer"
-	success
-
-#################################################################
-#
-#	MODEM RINGBACK
-#
-#################################################################
-
-##
-## This is an idle script that implements the ringback feature.
-## When we're idle, and we detect an incoming call, then call back
-## to bring up the link. For analog modems, we have to wait until
-## the ringing stops before dialing back (otherwise we'd answer the
-## call, which we don't want to do).
-##
-## Variables:
-##
-##  $RingbackTimeout	How long before giving up (reset and try again).
-##			Default: 60 minutes
-##  $RingStoppedTime	Max time between consecutive "RING"s (if analog)
-##			Default: 8 seconds
-##
-
-Ringback:
-	set $CallingID ""
-	set $CalledID ""
-	if $RingbackTimeout == "" set $RingbackTimeout "3600"
-	if $RingStoppedTime == "" set $RingStoppedTime "8"
-	set $ModemDetectRing RingbackWait
-	call ModemFind
-	if $ErrorMsg == "" goto Ringback1
-	log $ErrorMsg
-	failure
-Ringback1:
-	call ModemIdent
-	if $ModemDescription != "" goto Ringback2
-	log "The modem is not responding."
-	failure
-
-Ringback2:
-	log "Detected $ModemDescription."
-	goto $ModemDetectRing
-
-# Detect an incoming call by waiting for a "RING" indication
-# On an analog modem, we have to wait for the ringing to stop
-
-RingbackWait:
-	match "RING\r\n" RingbackGotRings
-	log "Remote Dial-Back mode enabled; waiting for incoming call."
-	wait $RingbackTimeout
-	failure
-
-# We saw it ring; wait for the ringing to stop (analog modems only).
-
-RingbackGotRings:
-	log "Incoming call detected..."
-	if $ModemIsAnalog != "yes" goto RingbackDone
-RingbackWaitStop:
-	match "RING\r\n" RingbackWaitStop
-	wait $RingStoppedTime
-RingbackDone:
-	set $IdleResult "ringback"
-	success
-
-# Strip leading and trailing spaces and log calling party number
-
-RingbackDetectCID:
-	if $cid match " *(.*) *" nop
-	set $cid $matchedString1
-	if $cid == "" goto RingbackDetectNoCID
-	log "Incoming call detected from $cid..."
-	success
-
-# We couldn't determine calling party number
-
-RingbackDetectNoCID:
-	log "Incoming call detected..."
-	success
-
-#################################################################
-#
-#	MODEM IDENTIFICATION
-#
-#################################################################
-
-##
-## Identify
-##
-## This is meant to be called from the top level, to just identify
-## what's on the serial port and print out some info about it.
-##
-
-Identify:
-	call ModemFind
-	if $ErrorMsg == "" goto Identify1
-	failure
-Identify1:
-	call ModemIdent
-	if $ModemDescription == "" failure
-	log "ANALOG=$ModemIsAnalog"
-	log "DESCRIPTION=$ModemDescription"
-	success
-
-##
-## ModemIdent
-##
-## This identifies the type of modem and sets these variables accordingly:
-##
-##	$ModemDescription
-##	$ModemSetupFunc
-##	$ModemAnsSetupFunc
-##	$ModemDetectRing
-##	$ModemIsAnalog
-##
-## If no response seen, this sets $ModemDescription to the empty string.
-##
-
-ModemIdent:
-	set $ModemDescription ""
-	set $ModemSetupFunc ""
-	set $ModemAnsSetupFunc ""
-	set $ModemDetectRing ""
-	set $ModemIsAnalog "yes"
-	if $InitString != "" goto ModemIdentCustom
-	print "ATI\r\n"
-	match "ADTRAN EXPRESS XR" ModemIdentAdtranXRT
-	match "Model: Ovation MC950D Card" ModemIdentMC950D
-	match "ERR" ModemIdentGeneric
-	match "OK\r\n" ModemIdentGeneric
-	wait 3
-	print "ATI1\r\n"
-	match "NTK omni.net" ModemIdentNTK
-	match "ERR" ModemIdentGeneric
-	match "OK\r\n" ModemIdentGeneric
-	wait 3
-	print "ATI3\r\n"
-	match "Courier" ModemIdentUsr
-	match "Sportster" ModemIdentUsr
-	match "3ComImpact IQ" ModemIdentImpactIQ
-	match "U.S. Robotics 56K" ModemIdentUsr
-	match "ZOOM V.90" ModemIdentZoom56
-	match "LT V.90" ModemIdentLucent
-	match "ERR"
-	match "OK\r\n"
-	wait 3
-	print "ATI4\r\n"
-	match "AtermIT NEC Corporation" ModemIdentAterm
-	match "INSMATEV-7 NTT Corporation" ModemIdentAterm
-	match "MNP Class 10 V.34 Modem" ModemIdentDeskPorte
-	match "Smart One 56" ModemIdentSmartOne
-	match "ERR"
-	match "OK\r\n"
-	wait 3
-	print "ATI5\r\n"
-	match "C885" ModemIdentC885
-	match "ERR"
-	match "OK\r\n" ModemIdentGeneric
-	wait 3
-	print "ATI8\r\n"
-	match "BitSURFR PRO\r" ModemIdentBitsurfr
-	match "BitSURFR PRO EZ" ModemIdentBitsurfrEZ
-	match "3C882" ModemIdentImpactIQ
-	match "ERR"
-	match "OK\r\n"
-	wait 3
-	log "The modem is not responding to any ATI[1,3-5,8] commands."
-	failure
-
-ModemIdentGeneric:
-	set $ModemDescription "Hayes compatible modem"
-	if $SimPin != "" call DialPeerSetPin
-	if $APN != "" call DialPeerSetAPN
-	set $ModemSetupFunc GenericSetup
-	return
-
-ModemIdentCustom:
-	set $ModemDescription "Custom modem"
-	set $ModemSetupFunc CustomSetup
-	return
-
-ModemIdentUsr:
-	set $SportsterHack "no"
-	if $matchedString == "Sportster" set $SportsterHack "yes"
-	set $ModemDescription "USR $matchedString modem"
-	call GetOK
-	set $ModemSetupFunc UsrSetup
-	return
-ModemIdentC885:
-	set $ModemDescription "Sierra Wireless Compass $matchedString USB 3G modem"
-	set $ModemSetupFunc GenericSetup
-	return
-ModemIdentMC950D:
-	set $ModemDescription "Novatel Wireless $matchedString USB 3G modem"
-	set $ModemSetupFunc GenericSetup
-	return
-ModemIdentBitsurfrEZ:
-	set $bitsEZ "yes"
-ModemIdentBitsurfr:
-	set $ModemDescription "Motorola $matchedString"
-	call GetOK
-	set $ModemSetupFunc BitsurfrSetup
-	set $ModemIsAnalog "no"
-	set $ModemDetectRing BitsurfrDetectRing
-	return
-
-ModemIdentImpactIQ:
-	set $matchedString "3ComImpact IQ"
-	set $ModemDescription "$matchedString"
-	call GetOK
-	set $ModemSetupFunc ImpactIQSetup
-	set $ModemIsAnalog "no"
-	set $ModemDetectRing ImpactIQDetectRing
-	return
-
-ModemIdentAdtranXRT:
-	set $ModemDescription "AdTran Express XR/XRT"
-	call GetOK
-	set $ModemSetupFunc AdtranXRTSetup
-	set $ModemIsAnalog "no"
-	return
-
-ModemIdentAterm:
-	set $ModemDescription "NEC Aterm TA"
-	call GetOK
-	set $ModemSetupFunc AtermSetup
-	set $ModemIsAnalog "no"
-	return
-
-ModemIdentNTK:
-	set $ModemDescription "$matchedString"
-	call GetOK
-	set $ModemSetupFunc NTKSetup
-	set $ModemIsAnalog "no"
-	return
-
-ModemIdentDeskPorte:
-	set $ModemDescription "$matchedString"
-	call GetOK
-	set $ModemSetupFunc DeskPorteSetup
-	return
-
-ModemIdentZoom56:
-ModemIdentSmartOne:
-	set $ModemDescription "$matchedString"
-	call GetOK
-	set $ModemSetupFunc Modem56Setup
-	return
-
-# Support the Lucent Winmodem, Xircom 56k
-ModemIdentLucent:
-	set $ModemDescription "$matchedString"
-	call GetOK
-	set $ModemSetupFunc ModemLucentSetup
-	return
-
-#################################################################
-#
-#	GENERIC MODEM SETUP
-#
-#################################################################
-
-GenericSetup:
-	set $noDialToneSubr GenericNoDialtone
-	set $temp "M1"
-	if $SpeakerOff == "yes" set $temp "M0"
-	set $modemCmd "&F&C1&D2E0S0=0${temp}"
-	call ModemCmd2
-	return
-
-CustomSetup:
-	set $noDialToneSubr GenericNoDialtone
-	set $modemCmd "${InitString}"
-	call ModemCmd2
-	return
-
-GenericNoDialtone:
-	log "No dialtone. Is the modem plugged in?"
-	return
-
-#################################################################
-#
-#	USR MODEM SETUP
-#
-#################################################################
-
-UsrSetup:
-# Lower baudrate to 57600 for crappy internal Sportster modem
-	if $SportsterHack != "yes" goto UsrSetup2
-	if $modemDevice != "/dev/cuad2" goto UsrSetup2
-	set $Baudrate 57600
-	set $modemCmd ""
-	call ModemCmd2
-UsrSetup2:
-	set $noDialToneSubr GenericNoDialtone
-	set $temp "M1"
-	if $SpeakerOff == "yes" set $temp "M0"
-	set $modemCmd "&F1&C1&D2E0S0=0S13.0=1L0S6=5${temp}"
-	call ModemCmd2
-	return
-
-#################################################################
-#
-#	GENERAL 56K MODEM SETUP
-#
-#################################################################
-
-Modem56Setup:
-	set $noDialToneSubr GenericNoDialtone
-	set $temp "M1"
-	if $SpeakerOff == "yes" set $temp "M0"
-	set $modemCmd "&FL2W2E0${temp}"
-	call ModemCmd2
-	return
-
-#################################################################
-#
-#	LUCENT WINMODEM AND XIRCOM 56K SETUP
-#
-#################################################################
-
-ModemLucentSetup:
-	set $noDialToneSubr GenericNoDialtone
-	set $temp "M1"
-	if $SpeakerOff == "yes" set $temp "M0"
-	set $tempCountryCode ""
-	if $CountryCode != "" set $tempCountryCode "+GCI=${CountryCode}"
-	if $CountryCode != "" log "Use country ${CountryCode}"
-	set $modemCmd "&FL2W2E0${temp}${tempCountryCode}"
-	call ModemCmd2
-	return
-
-#################################################################
-#
-#	BITSURFR PRO AND BITSURFR PRO EZ SETUP
-#
-#################################################################
-
-BitsurfrSetup:
-	set $noDialToneSubr BitsurfrNoDialtone
-	set $factory "1"
-	if $bitsEZ == "yes" set $factory "0"
-	set $modemCmd "Z&F${factory}&C1&D2E0W1X2%A2=95S0=0"
-	call ModemCmd2
-
-# Set to 230K baud if we support it
-
-	if $bitsEZ != "yes" goto BitsurfrSetup1
-	set $modemCmd "@P2=230400"
-	set $newBaudrate "230400"
-	call SetBaudrate
-
-# Check software revision and ISDN settings
-
-BitsurfrSetup1:
-	if $optimize == "yes" goto BitsurfrSetup2
-	if $bitsEZ != "yes" call BitsurfrCheckRev
-	call BitsurfrCheckConfig
-
-# Set the PAP/CHAP, multi-link, and 56K/64K settings, and return
-
-BitsurfrSetup2:
-	set $authCmd "@M2=P"
-	if $TA_AuthChap == "yes" set $authCmd "@M2=C"
-	set $bondCmd "@B0=1"
-	if $TA_Bonding == "yes" set $bondCmd "@B0=2"
-	set $bearCmd "%A4=0"
-	if $TA_56K == "yes" set $bearCmd "%A4=1"
-	if $TA_VoiceCall == "yes" set $bearCmd "%A4=1"
-	set $voiceCmd "%A98=D%A96=0"
-	if $TA_VoiceCall == "yes" set $voiceCmd "%A98=S%A96=1"
-
-# BS PRO EZ changes
-
-	if $bitsEZ == "yes" set $authCmd "${authCmd}@M20=\"\""
-	set $modemCmd "$authCmd$bondCmd$bearCmd$voiceCmd"
-	call ModemCmd2
-	if $TA_NoDoubleTelno == "yes" return
-	if $TA_Bonding == "yes" set $ModTelephone "${Telephone}&${Telephone}"
-	return
-
-##
-## What to do when NO DIALTONE
-##
-
-BitsurfrNoDialtone:
-	log "ISDN initialization failed (or BitSURFR restarting). Please verify proper line connection and ISDN settings."
-	return
-
-##
-## BitsurfrCheckConfig
-##
-## Verify and adjust ISDN configuration as necessary
-##
-
-BitsurfrCheckConfig:
-	log "Checking the BitSURFR's ISDN configuration..."
-	set $valueChanged "no"
-
-# Check switch type
-
-	set $checkCmd "!C0"
-	set $checkValue "000"
-	set $checkValueNew "0"
-	if $TA_SwitchType == "DMS-100" set $checkValue "001"
-	if $TA_SwitchType == "DMS-100" set $checkValueNew "1"
-	if $TA_SwitchType == "NI-1" set $checkValue "002"
-	if $TA_SwitchType == "NI-1" set $checkValueNew "2"
-	set $checkMsg "Reprogramming switch type ($TA_SwitchType)..."
-	call ModemCheckValue
-
-	set $checkCmd "!C1"
-	set $checkValue "004"
-	set $checkValueNew "4"
-	if $TA_SwitchType == "DMS-100" set $checkValue "003"
-	if $TA_SwitchType == "DMS-100" set $checkValueNew "3"
-	if $TA_SwitchType == "5ESS P2P" set $checkValue "000"
-	if $TA_SwitchType == "5ESS P2P" set $checkValueNew "0"
-	if $TA_SwitchType == "5ESS MP" set $checkValue "001"
-	if $TA_SwitchType == "5ESS MP" set $checkValueNew "1"
-	set $checkMsg "Reprogramming switch software version..."
-	call ModemCheckValue
-
-# Check directory numbers
-
-	set $checkCmd "*1!N1"
-	set $checkValue $TA_Dirno1
-	set $checkValueNew $TA_Dirno1
-	set $checkMsg "Reprogramming voice line #1 directory number..."
-	call ModemCheckValue
-
-	set $checkCmd "*2!N1"
-	set $checkValue $TA_Dirno2
-	set $checkValueNew $TA_Dirno2
-	set $checkMsg "Reprogramming voice line #2 directory number..."
-	call ModemCheckValue
-	set $checkCmd "!N1"
-	set $checkMsg "Reprogramming data line directory number..."
-	call ModemCheckValue
-
-# Check SPIDs
-
-	set $checkCmd "*1!C6"
-	set $checkValue $TA_SPID1
-	set $checkValueNew $TA_SPID1
-	set $checkMsg "Reprogramming voice line #1 SPID..."
-	call ModemCheckValue
-
-	set $checkCmd "*2!C6"
-	set $checkValue $TA_SPID2
-	set $checkValueNew $TA_SPID2
-	set $checkMsg "Reprogramming voice line #2 SPID..."
-	call ModemCheckValue
-	set $checkCmd "!C6"
-	set $checkMsg "Reprogramming data line SPID..."
-	call ModemCheckValue
-
-# Restart if necessary
-
-	if $valueChanged == "no" return
-	log "Restarting BitSURFR Pro with new configuration..."
-	set $modemCmd ">W"
-	call ModemCmd2
-	set $modemCmd ">Z"
-	call ModemCmd2
-	failure
-
-##
-## Verify the BitSURFR's software revision. Only do this
-## once, the first time we try to dial.
-##
-
-BitsurfrCheckRev:
-	log "Checking the BitSURFR's software revision..."
-	print "ATI3\r\n"
-	match "-1A" BitsurfrCheckRevOld
-	match "-1B" BitsurfrCheckRevOld
-	match "-1C" BitsurfrCheckRevOld
-	match "-1D" BitsurfrCheckRevOld
-	match "-1E" BitsurfrCheckRevOld
-	match "-1F" BitsurfrCheckRevOld
-	match "-1G" BitsurfrCheckRevOld
-	match "-1H" BitsurfrCheckRevOld
-	match "-1I" BitsurfrCheckRevOld
-	match "OK\r\n" BitsurfrCheckRevOK
-	match "ERR"
-	wait 5
-	log "The BitSURFR did not properly answer ATI3."
-	failure
-BitsurfrCheckRevOK:
-	return
-BitsurfrCheckRevOld:
-	log "The BitSURFR Pro has an old software revision $matchedString. Please upgrade according to the manufacturer's instructions."
-	call GetOK
-	failure
-
-# This is how we detect an incoming call with a BitSURFR
-
-BitsurfrDetectRing:
-# First, we need to be properly configured
-	call BitsurfrSetup
-# Enable Caller-ID logging
-	set $modemCmd "@N0=1*1@N0=1*2@N0=1"
-	call ModemCmd
-	if $modemCmdResult != "OK" goto RingbackWait
-# A "RING" at any time is good enough
-	match ringset "RING\r\n" RingbackDone
-# Clear Caller-ID buffers
-	set $modemCmd "@L0*1@L0*2@L0"
-	call ModemCmd2
-# Read each buffer
-	call BitsurfrDetectReadCID
-	log "Remote Dial-Back mode enabled; waiting for incoming call."
-# Now wait indefinitely for one of those buffers to change
-BitsurfrDetectLoop:
-	wait 5
-	set $oldDataCID $dataCID
-	set $oldVoice1CID $voice1CID
-	set $oldVoice2CID $voice2CID
-	call BitsurfrDetectReadCID
-	if $oldDataCID != $dataCID goto BitsurfrDetectDone
-	if $oldVoice1CID != $voice1CID goto BitsurfrDetectDone
-	if $oldVoice2CID != $voice2CID goto BitsurfrDetectDone
-	goto BitsurfrDetectLoop
-
-# Examine the CID from each port
-BitsurfrDetectDone:
-	set $cid $dataCID
-	call BitsurfrDetectTryCID
-	set $cid $voice1CID
-	call BitsurfrDetectTryCID
-	set $cid $voice2CID
-	call BitsurfrDetectTryCID
-	goto RingbackDetectNoCID
-
-# Try to extract the calling party number
-BitsurfrDetectTryCID:
-# Strip the log number
-	if $cid match "[0-9] (.*)" set $cid $matchedString1
-# Check for various strings
-	if $cid match "BLOCKED" return
-	if $cid match "NO NUMBER" return
-	if $cid match "NO CID SERVICE" return
-	if $cid match "OUT OF AREA" return
-	goto RingbackDetectCID
-
-# Read Caller-ID buffers
-BitsurfrDetectReadCID:
-	set $modemCmd "@L1"
-	call ModemQueryStrip
-	set $dataCID $modemQuery
-	set $modemCmd "*1@L1"
-	call ModemQueryStrip
-	set $voice1CID $modemQuery
-	set $modemCmd "*2@L1"
-	call ModemQueryStrip
-	set $voice2CID $modemQuery
-	return
-
-#################################################################
-#
-#	3COM IMPACT IQ SETUP
-#
-#################################################################
-
-ImpactIQSetup:
-	set $noDialToneSubr ImpactIQNoDialtone
-	set $modemCmd "Z&F%C2E0"
-	call ModemCmd2
-
-# Set to 230K baud if we support it
-
-	set $modemCmd "$$B230400"
-	set $newBaudrate "230400"
-	call SetBaudrate
-
-# Check ISDN config and link status (XXX should we check revision too?)
-
-ImpactIQSetup1:
-	if $optimize == "yes" goto IQInitSetup2
-	call ImpactIQCheckConfig
-	call ImpactIQCheckLink
-
-# Now set the PAP/CHAP setting and voice/data originate mode setting
-
-IQInitSetup2:
-	set $authCmd "S84=1"
-	if $TA_AuthChap == "yes" set $authCmd "S84=0"
-	set $voiceCmd "S61=0"
-	if $TA_VoiceCall == "yes" set $voiceCmd "S61=1"
-	set $modemCmd "$authCmd$voiceCmd"
-	call ModemCmd2
-	if $TA_NoDoubleTelno == "yes" return
-	if $TA_Bonding == "yes" set $ModTelephone "${Telephone}&${Telephone}"
-	return
-
-##
-## What to do when NO DIALTONE
-##
-
-ImpactIQNoDialtone:
-	log "ISDN config problem (or modem restart). Check your ISDN switch type, directory numbers, and SPID settings."
-	return
-
-##
-## ImpactIQCheckLink
-##
-## Check the link status registers
-##
-
-ImpactIQCheckLink:
-	log "Checking the ISDN modem's link status..."
-	print "ATS59?\r\n"
-	match "000" IQSyncFail
-	match "001" IQSyncOK
-	match "ERR"
-	match "OK\r\n"
-	wait 3
-	call GetOK
-	log "The ISDN modem did not properly answer ATS59?"
-	failure
-IQSyncOK:
-	call GetOK
-	goto ImpactIQCheckInit
-IQSyncFail:
-	log "The ISDN modem is not receiving any ISDN signal. Please verify that it's connected to an ISDN line."
-	call GetOK
-	failure
-
-ImpactIQCheckInit:
-	set $impactInitReg "57"
-	call IQInitCheck
-	if $TA_Bonding == "yes" return
-	set $impactInitReg "58"
-	call IQInitCheck
-	return
-
-# A little subroutine
-
-IQInitCheck:
-	print "ATS${impactInitReg}?\r\n"
-	match "000" IQInitOK
-	match "001" IQInitOK
-	match "002" IQInitFail
-	match "ERR"
-	match "OK\r\n"
-	wait 3
-	call GetOK
-	log "The ISDN modem did not properly answer ATS${impactInitReg}?"
-	failure
-IQInitOK:
-	call GetOK
-	return
-IQInitFail:
-	log "ISDN initialization failed. Please check your ISDN switch type, directory numbers, and SPID settings."
-	call GetOK
-	failure
-
-##
-## ImpactIQCheckConfig
-##
-## Verify and adjust ISDN configuration as necessary
-##
-
-ImpactIQCheckConfig:
-	log "Checking the ISDN modem's ISDN configuration..."
-	set $valueChanged "no"
-
-# Check switch type XXX
-#
-# NOTE: The Impact IQ changes the value of this field as it auto-detects.
-# Not only that, but it cycles through each switch type as it is "trying
-# out" that type, so that reading this field is pretty much useless...
-# Our strategy is just to hope that auto-detect works!
-
-	if $TA_NewSwitch != "yes" goto ImpactIQCheckDirnos
-	log "Initiating switch type auto-detect..."
-	set $modemCmd "S50=0"
-	call ModemCmd2
-	set $TA_NewSwitch ""
-	set $valueChanged "yes"
-	set $iq_new_switch "yes"
-
-# Check directory numbers
-
-ImpactIQCheckDirnos:
-	set $checkCmd "S51"
-	set $checkValue $TA_Dirno1
-	set $checkValueNew $TA_Dirno1
-	set $checkMsg "Reprogramming line #1 directory number..."
-	call ModemCheckValue
-
-	set $checkCmd "S53"
-	set $checkValue $TA_Dirno2
-	set $checkValueNew $TA_Dirno2
-	set $checkMsg "Reprogramming line #2 directory number..."
-	call ModemCheckValue
-
-# Check SPIDs
-
-	set $checkCmd "S52"
-	set $checkValue $TA_SPID1
-	set $checkValueNew $TA_SPID1
-	set $checkMsg "Reprogramming line #1 SPID..."
-	call ModemCheckValue
-
-	set $checkCmd "S54"
-	set $checkValue $TA_SPID2
-	set $checkValueNew $TA_SPID2
-	set $checkMsg "Reprogramming line #2 SPID..."
-	call ModemCheckValue
-
-# Check 56K/64K setting
-
-	set $checkValue "064"
-	set $checkValueNew "64"
-	if $TA_56K == "yes" set $checkValue "056"
-	if $TA_56K == "yes" set $checkValueNew "56"
-	set $checkCmd "S60"
-	set $checkMsg "Reprogramming B channel data rate to ${checkValueNew}K..."
-	call ModemCheckValue
-	set $checkValueNew ""
-
-# Check Multi-link setting
-
-	set $checkValue "000"
-	set $checkValueNew "0"
-	if $TA_Bonding == "yes" set $checkValue "001"
-	if $TA_Bonding == "yes" set $checkValueNew "1"
-	set $checkCmd "S80"
-	set $checkMsg "Reprogramming mutli-link PPP setting..."
-	call ModemCheckValue
-
-# Restart if necessary, and wait extra long if the switch type changed
-
-	if $valueChanged == "no" return
-	log "Restarting ISDN modem with the new configuration..."
-	set $modemCmd "Z"
-	call ModemCmd2
-	failure
-
-##
-## Detect an incoming call with the 3Com
-##
-
-ImpactIQDetectRing:
-	call ImpactIQSetup
-	if $modemCmdResult != "OK" goto RingbackWait
-	match ringset "RING\r\n" RingbackDone
-# Clear Caller-ID buffers
-	set $modemCmd "\\N0"
-# We don't care if this command fails...
-	call ModemCmd
-# Read most recent incoming call
-	call ImpactIQDetectReadCID
-	log "Remote Dial-Back mode enabled; waiting for incoming call."
-# Now wait for a change
-ImpactIQDetectLoop:
-	wait 5
-	set $oldIncomingCall $incomingCall
-	call ImpactIQDetectReadCID
-	if $oldIncomingCall != $incomingCall goto ImpactIQDetectDone
-	goto ImpactIQDetectLoop
-
-# Examine the CID from each port
-ImpactIQDetectDone:
-	if $incomingCall !match "((.{14}).{10}) ((.{14}).{10}) ((.{14}).{10})" goto RingbackDetectNoCID
-	set $dataCID $matchedString2
-	set $voice1CID $matchedString4
-	set $voice2CID $matchedString6
-	set $cid $dataCID
-	call ImpactIQDetectTryCID
-	set $cid $voice1CID
-	call ImpactIQDetectTryCID
-	set $cid $voice2CID
-	call ImpactIQDetectTryCID
-	goto RingbackDetectNoCID
-
-# Look for a valid CID string
-ImpactIQDetectTryCID:
-	if $cid match " *" return
-	if $cid match " *N/A" return
-	goto RingbackDetectCID
-
-# Read first line of incoming call log (it's the 14th line of output)
-ImpactIQDetectReadCID:
-	set $modemCmd "\\N"
-	call ModemCmdSend
-	call ReadLine
-# Older version of the 3Com don't support this command
-	if $matchedString == "OK" return
-	if $matchedString match "ERR(O)?(R)?" return
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	call ReadLine
-	set $incomingCall $matchedString
-	call GetOK
-	return
-
-#################################################################
-#
-#	NEC ATERM SETUP
-#
-#################################################################
-
-AtermSetup:
-	if $AtermHardReset == "yes" goto AtermSetup2
-
-# Do hardware reset, which takes a while and doesn't give back "OK"
-
-	log "Initializing modem..."
-	print "ATZ98\r\n"
-	wait 6
-	set $AtermHardReset "yes"
-	failure
-
-AtermSetup2:
-
-# Set to 230K baud if we support it
-
-	set $modemCmd ""
-	set $newBaudrate "230400"
-	call SetBaudrate
-
-# Is this an IT55 or IT65?
-
-	set $atermIT65 ""
-	set $modemCmd "$$N14=0"
-	call ModemCmd
-	if $modemCmdResult == "OK" set $atermIT65 "yes"
-
-# Set normal stuff, PPP mode
-
-	set $modemCmd "&C1&D0&K3X4$$N1=1$$N9=0"
-	call ModemCmd2
-
-# Set the multi-link setting
-
-	set $bondCmd "$$N11=0"
-	if $TA_Bonding == "yes" set $bondCmd "$$N11=1"
-	set $modemCmd "$bondCmd"
-	call ModemCmd2
-
-# Additional settings for the IT65 go here...
-
-	if $atermIT65 != "yes" return
-	return
-
-#################################################################
-#
-#	MICROCOM DESKPORTE SETUP
-#
-#################################################################
-
-DeskPorteSetup:
-	set $noDialToneSubr GenericNoDialtone
-	set $temp "M1"
-	if $SpeakerOff == "yes" set $temp "M0"
-	set $modemCmd "Z&F&C1&D2X3E0S0=0${temp}"
-	call ModemCmd2
-	return
-
-#################################################################
-#
-#	KOREAN TERMINAL ADAPTER SETUP
-#
-#################################################################
-
-NTKSetup:
-	set $noDialToneSubr GenericNoDialtone
-	set $modemCmd "ZB40&J3"
-	call ModemCmd2
-	return
-
-#################################################################
-#
-#	ADTRAN EXPRESS XRT SETUP
-#
-#################################################################
-
-AdtranXRTSetup:
-	set $noDialToneSubr ImpactIQNoDialtone
-	set $dialErrorSubr AdtranXRTDialError
-	set $bonding "&F1"
-	if $TA_Bonding == "yes" set $bonding "&F2"
-	set $chap "S118=0"
-	if $TA_AuthChap == "yes" set $chap "S118=32"
-	set $origCmd "S53=3"
-	if $TA_56K == "yes" set $origCmd "S53=2"
-	if $TA_VoiceCall == "yes" set $origCmd "S53=0"
-	set $modemCmd "ZE0${bonding}&C1&D2${chap}${origCmd}"
-	call ModemCmd2
-
-# Check ISDN config and link status (XXX should we check revision too?)
-
-	if $optimize == "yes" return
-	call AdtranXRTCheckConfig
-	call AdtranXRTCheckLink
-	return
-
-##
-## What to do when ERROR when dialing
-##
-## This is what the Adtran returns if the line is not ready yet.
-## So we look into the status buffer to see if we recognize the
-## error condition.
-##
-
-AdtranXRTDialError:
-	call AdtranXRTDiagnose
-	failure
-
-##
-## Check the last status bufffer entry for what the problem is
-## XXX Figure out more stuff to look for and when it can happen
-##
-
-AdtranXRTDiagnose:
-	log "Checking the Adtran status buffer..."
-	print "AT!S\r\n"
-	match "\r\n\r\n" AdtranXRTDiagBlank
-	match "END OF STATUS BUFFER" AdtranXRTDiagBlank
-	match "L1 not up." AdtranXRTDiagL1
-	match "FACILITY_NOT_SUBSCRIBED" AdtranXRTDiagFNS
-	match "Unknown AT cmd" IQSyncOK
-	match "ERR"
-	match "OK\r\n"
-	wait 3
-	call GetOK
-	log "The ISDN modem did not properly answer ATS59?"
-	failure
-	goto ImpactIQCheckInit
-
-AdtranXRTDiagFNS:
-	log "ISDN initialization failed. Please check your ISDN switch type, directory numbers, and SPID settings."
-	failure
-
-AdtranXRTDiagL1:
-	log "The ISDN modem is not receiving any ISDN signal. Please verify that it's connected to an ISDN line."
-	failure
-
-AdtranXRTDiagBlank:
-	log "ISDN initialization failed or restarting link. Please verify proper line connection and ISDN settings."
-	failure
-
-##
-## AdtranXRTCheckLink
-##
-## Check the link status registers
-##
-
-AdtranXRTCheckLink:
-	log "Checking the ISDN modem's link status..."
-	print "AT!S1\r\n"
-	match "Link In Sync" AdtranXRTSyncReg
-	match "Getting" AdtranXRTSyncReg
-	match "Register" AdtranXRTSyncReg
-	match "Ready" AdtranXRTSyncOK
-	match "Down" AdtranXRTSyncFail
-	match "ERR"
-	match "OK\r\n"
-	wait 3
-	call GetOK
-	log "The ISDN modem did not properly answer AT!S1."
-	failure
-AdtranXRTSyncOK:
-	return
-AdtranXRTSyncFail:
-	print "ATDT1\r\n"
-	wait 1
-	goto AdtranXRTDiagnose
-AdtranXRTSyncReg:
-	log "The ISDN modem is initializing itself."
-	failure
-
-##
-## AdtranXRTCheckConfig
-##
-## Verify and adjust ISDN configuration as necessary
-##
-
-AdtranXRTCheckConfig:
-	log "Checking the ISDN modem's ISDN configuration..."
-	set $valueChanged "no"
-
-	set $checkCmd "S52"
-	set $checkValue "000"
-	set $checkValueNew "0"
-	if $TA_SwitchType == "DMS-100" set $checkValue "001"
-	if $TA_SwitchType == "DMS-100" set $checkValueNew "1"
-	if $TA_SwitchType == "NI-1" set $checkValue "002"
-	if $TA_SwitchType == "NI-1" set $checkValueNew "2"
-	set $checkMsg "Reprogramming switch type ($TA_SwitchType)..."
-	call ModemCheckValue
-
-# Check directory numbers
-
-AdtranXRTCheckDirnos:
-	set $checkCmd "SS62"
-	set $checkValue $TA_Dirno1
-	set $checkValueNew $TA_Dirno1
-	set $checkMsg "Reprogramming line #1 directory number..."
-	call ModemCheckValue
-
-	set $checkCmd "SS63"
-	set $checkValue $TA_Dirno2
-	set $checkValueNew $TA_Dirno2
-	set $checkMsg "Reprogramming line #2 directory number..."
-	call ModemCheckValue
-
-# Check SPIDs
-
-	set $checkCmd "SS60"
-	set $checkValue $TA_SPID1
-	set $checkValueNew $TA_SPID1
-	set $checkMsg "Reprogramming line #1 SPID..."
-	call ModemCheckValue
-
-	set $checkCmd "SS61"
-	set $checkValue $TA_SPID2
-	set $checkValueNew $TA_SPID2
-	set $checkMsg "Reprogramming line #2 SPID..."
-	call ModemCheckValue
-
-# Restart if necessary
-
-	if $valueChanged == "no" return
-	log "Restarting ISDN modem with the new configuration..."
-	set $modemCmd "&W"
-	call ModemCmd2
-	set $modemCmd "Z"
-	call ModemCmd2
-	failure
-
-#################################################################
-#
-#	BASIC MODEM STUFF
-#
-#################################################################
-
-##
-## ModemAnswer
-##
-## Wait for a RING and answer it. Variables:
-##
-##  $RingTimeout	How long for a RING before giving up (default 10 min)
-##  $ConnectTimeout	How long for connect after answering (default 45 secs)
-##
-## Returns:
-##
-##  $answerReturn	"OK" or "FAIL"
-##  $ConnectionSpeed	Connection speed reported by modem (possibly empty)
-##
-
-ModemAnswer:
-	if $RingTimeout == "" set $RingTimeout 600
-	if $ConnectTimeout == "" set $ConnectTimeout 45
-	match "RING\r" ModemAnswerGotRing
-	wait $RingTimeout
-	log "No RING detected after $RingTimeout seconds."
-	set $answerReturn "FAIL"
-	return
-ModemAnswerGotRing:
-	log "Incoming call detected..."
-	print "ATA\r\n"
-	regex "CONNECT *([0-9]*).*$" ModemAnswerConnect
-	wait $ConnectTimeout
-	log "Failed to connect incoming call."
-	set $answerReturn "FAIL"
-	return
-ModemAnswerConnect:
-	set $ConnectionSpeed $matchedString1
-	set $answerReturn "OK"
-	return
-
-##
-## ModemFind
-##
-## Just try to get where we are talking to the modem.
-## Returns with $ErrorMsg equal to the empty string if
-## we found the modem, or else some error message if not.
-##
-
-ModemFind:
-
-# Do a quick check first...
-
-	set $ErrorMsg ""
-	call ModemFind4
-	if $modemCmdResult == "OK" return
-	if $Serial230K != "yes" goto ModemFind1
-	set $newBaudrate 230400
-	if $Baudrate == "230400" set $newBaudrate 115200
-	set $Baudrate $newBaudrate
-	call ModemFind4
-	if $modemCmdResult == "OK" return
-
-# Now try possible baud rates more extensively
-
-ModemFind1:
-	set $Baudrate 115200
-	call ModemFind2
-	if $modemCmdResult == "OK" return
-	if $Serial230K != "yes" return
-	set $Baudrate 230400
-	wait 1
-	call ModemFind2
-	if $modemCmdResult == "OK" return
-	set $ErrorMsg "The modem is not responding."
-	return
-
-# This tries the +++ sequence in case the modem is in "on-line" mode
-
-ModemFind2:
-	call ModemFind3
-	if $modemCmdResult == "OK" return
-	call SendTriplePlus
-	call ModemFind3
-	return
-
-# This tries a few commands to see if the modem responds with "OK"
-
-ModemFind3:
-	set $modemCmd ""
-	set $modemCmdTimeout 1
-	call ModemCmd0
-	if $modemCmdResult == "OK" return
-	set $modemCmd "Z"
-	set $modemCmdTimeout 2
-	call ModemCmd0
-	if $modemCmdResult == "OK" return
-ModemFind4:
-	set $modemCmd ""
-	set $modemCmdTimeout 1
-	call ModemCmd0
-	return
-
-##
-## SetBaudrate
-##
-## Change baud rates (as allowed) and verify modem is still there.
-## If not, then fail the script.
-##
-##   $newBaudrate	New baud rate; if we don't support it, just return.
-##   $modemCmd		Command to send modem to jump to the new baud rate.
-##
-
-SetBaudrate:
-	if $Baudrate == $newBaudrate return
-	if $newBaudrate != 230400 goto SetBaudrate2
-	if $Serial230K != "yes" return
-SetBaudrate2:
-	log "Setting serial port speed to $newBaudrate..."
-	print "AT$modemCmd\r\n"
-	wait 1
-	set $Baudrate $newBaudrate
-	wait 1
-	set $modemCmd ""
-	goto ModemCmd2
-
-##
-## ModemCheckValue 
-##
-## Check the value in an S-register (or equivalent). If it is
-## not what we want, then change it and set $valueChanged to "yes",
-## and log $checkMsg (if not empty). The value $checkValueNew is
-## what we program the S-register to equal if it doesn't match.
-##
-## The $checkValue must match exactly on the first line of output.
-## If we get any weird error, then fail the script.
-##
-
-ModemCheckValue:
-	set $modemCmd "${checkCmd}?"
-	call ModemQuery
-	if $modemQuery == $checkValue return
-	set $valueChanged "yes"
-	set $checkValueMyNew $checkValueNew
-	if $checkValueNew == "" set $checkValueMyNew $checkValue
-	set $modemCmd "${checkCmd}=${checkValueMyNew}"
-	if $checkMsg != "" log $checkMsg
-	goto ModemCmd2
-
-##
-## ModemCmd
-##
-## Do the modem command in $modemCmd. Set $modemCmdResult to
-##
-##	OK	The modem returned "OK"
-##	ERROR	The modem returned "ERR" or "ERROR"
-##	TIMEOUT	The modem did not respond within three seconds
-##
-## If ERR or TIMEOUT, also set $ErrorMsg to an appropriate message
-##
-
-ModemCmd:
-	set $modemCmdTimeout 3
-ModemCmd0:
-	print "AT$modemCmd\r\n"
-	match "OK\r\n" ModemCmdOk
-	match "ERR" ModemCmdErr
-	wait $modemCmdTimeout
-	set $modemCmdResult "TIMEOUT"
-ModemCmdTimeout:
-	set $ErrorMsg "The modem is not responding to \"AT$modemCmd\" at ModemCmd: label."
-	return
-ModemCmdOk:
-	set $modemCmdResult "OK"
-	return
-ModemCmdErr:
-	set $modemCmdResult "ERROR"
-	set $ErrorMsg "The modem responded with \"ERROR\" to the command \"AT$modemCmd\" at ModemCmd: label."
-	return
-
-##
-## ModemCmd2
-##
-## Do the modem command in $modemCmd. If we don't get OK back,
-## fail the script and log an error message.
-##
-
-ModemCmd2:
-	call ModemCmd
-	if $modemCmdResult == "OK" return
-	log $ErrorMsg
-	failure
-
-##
-## ModemCmdSend
-##
-## Send a modem command and read the echo'ed CR-LF
-##
-
-ModemCmdSend:
-	print "AT$modemCmd\r\n"
-	match "\r\n" ModemCmdSend2
-	wait 3
-	goto ModemCmdTimeout
-ModemCmdSend2:
-	return
-
-##
-## ModemQuery
-##
-## Do the $modemCmd and expect exactly one line of response, then OK.
-## Return the response in $modemQuery. If anything goes wrong, die.
-##
-
-ModemQuery:
-	call ModemCmdSend
-	call ReadLine
-	set $modemQuery $matchedString
-	if $modemQuery == "ERR" goto ModemQueryError
-	if $modemQuery == "ERROR" goto ModemQueryError
-	goto GetOK
-ModemQueryError:
-	call ModemCmdErr
-	failure
-
-# Same thing, but strip leading and trailing blanks
-
-ModemQueryStrip:
-	call ModemQuery
-	if $modemQuery match " *(.*) *" nop
-	set $modemQuery $matchedString1
-	return
-
-##
-## ReadLine
-##
-## Read the next line of output. It should come within $modemCmdTimeout
-## seconds, or else we fail. Return it in $matchedString.
-##
-
-ReadLine:
-	regex "^.*$" ReadLineDone
-	wait $modemCmdTimeout
-	set $ErrorMsg "The modem is not responding."
-	log $ErrorMsg
-	failure
-ReadLineDone:
-	return
-
-##
-## Get an OK within 3 seconds or die
-##
-
-GetOK:
-	match "OK\r\n" GotOK
-	wait 3
-	log "The modem did not respond with \"OK\"."
-	failure
-GotOK:
-	return
-
-##
-## Send "+++" to get modem attention if on-line
-##
-
-SendTriplePlus:
-	print "\r\n"
-	wait 2
-	print "+++"
-	wait 2
-	return
-
-#################################################################
-#
-#	LOGIN AUTO-SCRIPTING
-#
-#################################################################
-
-##
-## AutoLogin
-##
-## Here we attempt to figure out what the remote server wants
-## from us. We do this by checking for bytes that correspond
-## to PPP packets (in which case we are done) as well as common
-## login type stuff like "name:", "ogin:", etc.
-##
-## This always returns. The hope is that when it returns, the
-## remote side has reached PPP mode.
-##
-## This has been crafted from empirical evidence. Lots of terminal
-## servers have various intelligent/stupid features which we
-## take advantage of/have to work around.
-##
-## Variables (set automatically by mpd):
-##
-##  $Login		Authorization login
-##  $Password		Authorization password
-##
-
-AutoLogin:
-	log "Initiating auto-login..."
-
-# Spend at most this long doing auto-login before giving up
-
-	timer autoLogin 5 AutoLoginTimeout
-
-# At any time if we see an LCP frame (not our own echo) then we're done
-
-	match autoLogin "\x7e\xff\x03\xc0\x21" AutoLoginFrame
-	match autoLogin "\x7e\xff\x7d\x23\xc0\x21\x7d\x21" AutoLoginFrame
-	match autoLogin "\x7e\xc0\x21" AutoLoginFrame
-
-# Now send a "fake" PPP frame (this is an empty config-reject with id# 172).
-# This should trigger any auto-detecting servers to jump into PPP mode,
-# which is good because it's faster (by avoiding human readable messages)
-# and more reliable (PPP framing).
-
-	print "\x7e\xff\x7d\x23\xc0\x21\x7d\x24\xac\x7d\x20\x7d\x24\x2e\x2b\x7e"
-
-# Wait one second for server to auto-detect PPP or send a login prompt.
-# After one second of neither, try sending a carriage return (some servers
-# require this). After that, we have to see something recognizable from
-# the peer, otherwise we'll just timeout.
-
-	match "ogin" AutoLoginPrompt
-	match "name" AutoLoginPrompt
-	wait 1
-	print "\r"
-	match "ogin" AutoLoginPrompt
-	match "name" AutoLoginPrompt
-	wait
-
-# At this point we've seen a login prompt; do the manual login
-
-AutoLoginPrompt:
-	log "Sending login..."
-	print "${Login}\r"
-	match "word"
-	wait
-	log "Sending password..."
-	print "${Password}\r"
-	match "\r"
-	wait
-	if $didLogin != "yes" match "ogin:" LoginAgain
-	match ">"
-	match "%"
-	match ":"
-	wait
-	log "Enabling PPP..."
-	print "ppp\r"
-	cancel all
-	return
-
-LoginAgain:
-	set $didLogin "yes"
-	goto AutoLoginPrompt
-
-# We saw a PPP frame
-
-AutoLoginFrame:
-	log "Detected PPP frame."
-	cancel all
-	return
-
-# We timed out before seeing a PPP frame. Cross your fingers and pray.
-
-AutoLoginTimeout:
-	log "Auto-login timeout."
-	cancel all
-	return
-
diff --git a/usr/local/sbin/ntpdate_sync_once.sh b/usr/local/sbin/ntpdate_sync_once.sh
deleted file mode 100755
index c183b79..0000000
--- a/usr/local/sbin/ntpdate_sync_once.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-NOTSYNCED="true"
-MAX_ATTEMPTS=3
-SERVER=`/bin/cat /cf/conf/config.xml | /usr/bin/grep timeservers | /usr/bin/cut -d">" -f2 | /usr/bin/cut -d"<" -f1`
-if [ "${SERVER}" = "" ]; then
-	exit
-fi
-
-/bin/pkill -f ntpdate_sync_once.sh
-
-ATTEMPT=1
-# Loop until we're synchronized, but for a set number of attempts so we don't get stuck here forever.
-while [ "$NOTSYNCED" = "true" ] && [ ${ATTEMPT} -le ${MAX_ATTEMPTS} ]; do
-	# Ensure that ntpd and ntpdate are not running so that the socket we want will be free.
-	while [ true ]; do
-		/usr/bin/killall ntpdate 2>/dev/null
-		/bin/pgrep ntpd
-		if [ $? -eq 0 ]; then
-			/usr/bin/killall ntpd 2>/dev/null
-		else
-			break
-		fi
-	done
-	sleep 1
-	/usr/local/sbin/ntpdate -s -t 5 ${SERVER}
-	if [ "$?" = "0" ]; then
-		NOTSYNCED="false"
-	else
-		sleep 5
-		ATTEMPT=`expr ${ATTEMPT} + 1`
-	fi
-done
-
-if [ "$NOTSYNCED" = "true" ]; then
-	echo "Giving up on time sync after ${MAX_ATTEMPTS} attempts." | /usr/bin/logger -t ntp;
-else
-	echo "Successfully synced time after ${ATTEMPT} attempts." | /usr/bin/logger -t ntp;
-fi
-
-if [ -f /var/etc/ntpd.conf ]; then
-	echo "Starting NTP Daemon." | /usr/bin/logger -t ntp;
-	/usr/local/sbin/ntpd -g -c /var/etc/ntpd.conf -p /var/run/ntpd.pid
-else
-	echo "NTP configuration file missing, not starting daemon." | /usr/bin/logger -t ntp;
-fi
diff --git a/usr/local/sbin/openvpn.attributes.sh b/usr/local/sbin/openvpn.attributes.sh
deleted file mode 100755
index add8e32..0000000
--- a/usr/local/sbin/openvpn.attributes.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-echo $script_type > /tmp/script
-if [ "$script_type" = "client-connect" ]; then
-	if [ -f /tmp/$common_name ]; then
-		/bin/cat /tmp/$common_name > $1
-		/bin/rm /tmp/$common_name
-	fi
-elif [ "$script_type" = "client-disconnect" ]; then
-	command="/sbin/pfctl -a 'openvpn/$common_name' -F rules"
-	eval $command
-	/sbin/pfctl -k $ifconfig_pool_remote_ip
-	/sbin/pfctl -K $ifconfig_pool_remote_ip
-fi
-
-exit 0
diff --git a/usr/local/sbin/ovpn-linkdown b/usr/local/sbin/ovpn-linkdown
deleted file mode 100755
index 708d507..0000000
--- a/usr/local/sbin/ovpn-linkdown
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-/sbin/pfctl -i $1 -Fs
-# delete the node just in case mpd cannot do that
-/bin/rm -f /var/etc/nameserver_$1
-/bin/rm -f /tmp/$1_router
-/bin/rm -f /tmp/$1up
-/usr/local/sbin/pfSctl -c 'filter reload'
diff --git a/usr/local/sbin/ovpn-linkup b/usr/local/sbin/ovpn-linkup
deleted file mode 100755
index 1164835..0000000
--- a/usr/local/sbin/ovpn-linkup
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# let the configuration system know that the ip has changed.
-#/usr/local/sbin/pfSctl -c "interface newip $interface"
-
-if [ "${dev_type}" = "tun" ]; then
-	if [ -n "${route_vpn_gateway}" ]; then
-		/bin/echo ${route_vpn_gateway} > /tmp/${1}_router
-	elif [ -n "${ifconfig_remote}" ]; then
-		/bin/echo ${ifconfig_remote} > /tmp/${1}_router
-	elif [ -n "${ifconfig_local}" ]; then
-		/bin/echo ${ifconfig_local} > /tmp/${1}_router
-	else
-		/bin/echo ${5} > /tmp/${1}_router
-	fi
-fi
-
-/usr/bin/touch /tmp/${1}up
-# reload filter
-/usr/local/sbin/pfSctl -c "interface newip ${1}"
-exit 0
diff --git a/usr/local/sbin/ovpn_auth_verify b/usr/local/sbin/ovpn_auth_verify
deleted file mode 100755
index b38fcb9..0000000
--- a/usr/local/sbin/ovpn_auth_verify
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "tls" ]; then
-	RESULT=$(/usr/local/sbin/fcgicli -f /etc/inc/openvpn.tls-verify.php -d "servercn=$2&depth=$3&certdepth=$4&certsubject=$5")
-else
-	# Single quoting $password breaks getting the value from the variable.
-	password=$(echo -n "${password}" | openssl enc -base64 | sed -e 's/=/%3D/g')
-	username=$(echo -n "${username}" | openssl enc -base64 | sed -e 's/=/%3D/g')
-	RESULT=$(/usr/local/sbin/fcgicli -f /etc/inc/openvpn.auth-user.php -d "username=$username&password=$password&cn=$common_name&strictcn=$3&authcfg=$2&modeid=$4")
-fi
-
-if [ "${RESULT}" = "OK" ]; then
-	exit 0
-fi
-
-exit 1
diff --git a/usr/local/sbin/pfSsh.php b/usr/local/sbin/pfSsh.php
deleted file mode 100755
index 8bfc909..0000000
--- a/usr/local/sbin/pfSsh.php
+++ /dev/null
@@ -1,344 +0,0 @@
-#!/usr/local/bin/php-cgi -f
-
-<?php
-
-require_once("globals.inc");
-echo "Starting the {$g['product_name']} developer shell";
-require_once("functions.inc");
-echo ".";
-require_once("config.inc");
-echo ".";
-require_once("util.inc");
-echo ".";
-
-$shell_cmds = array("alias", "alloc", "bg", "bind", "bindkey", "break",
-	 "breaksw", "builtins", "case", "cd", "chdir", "command", "complete", "continue", "default",
-	 "dirs", "do", "done", "echo", "echotc", "elif", "else", "end", "endif", "endsw", "esac", "eval",
-	 "exec", "exit", "export", "false", "fc", "fg", "filetest", "fi", "for", "foreach", "getopts",
-	 "glob", "goto", "hash", "hashstat", "history", "hup", "if", "jobid", "jobs", "kill", "limit",
-	 "local", "log", "login", "logout", "ls-F", "nice", "nohup", "notify", "onintr", "popd",
-	 "printenv", "pushd", "pwd", "read", "readonly", "rehash", "repeat", "return", "sched", "set",
-	 "setenv", "settc", "setty", "setvar", "shift", "source", "stop", "suspend", "switch",
-	 "telltc", "test", "then", "time", "trap", "true", "type", "ulimit", "umask", "unalias",
-	 "uncomplete", "unhash", "unlimit", "unset", "unsetenv", "until", "wait", "where", "which",
-	 "while");
-
-function pipe_cmd($command, $text_to_pipe) {
-	$descriptorspec = array(
-		0 => array("pipe", "r"),  // stdin
-		1 => array("pipe", "w"),  // stdout
-		2 => array("pipe", "w")); // stderr ?? instead of a file
-
-	$fd = proc_open("$command", $descriptorspec, $pipes);
-	if (is_resource($fd)) {
-		fwrite($pipes[0], "{$text_to_pipe}");
-		fclose($pipes[0]);
-		while ($s= fgets($pipes[1], 1024)) {
-			// read from the pipe
-			$buffer .= $s;
-		}
-		fclose($pipes[1]);
-		fclose($pipes[2]);
-	}
-	return $buffer;
-}
-
-if (!function_exists("readline")) {
-	function readline() {
-		$fp = fopen('php://stdin', 'r');
-		$textinput = chop(fgets($fp));
-		fclose($fp);
-		return $textinput;
-	}
-}
-
-function more($text, $count=24) {
-	$counter=0;
-	$lines = explode("\n", $text);
-	foreach ($lines as $line) {
-		if ($counter > $count) {
-			echo "Press RETURN to continue ...";
-			$fp = fopen('php://stdin', 'r');
-			$pressreturn = chop(fgets($fp));
-			if ($pressreturn == "q" || $pressreturn == "quit") {
-				return;
-			}
-			fclose($fp);
-			$counter = 0;
-		}
-		echo "{$line}\n";
-		$counter++;
-	}
-}
-
-function show_help() {
-
-$show_help_text = <<<EOF
-
-	Enter a series of commands and then execute the set with "exec".
-
-	For example:
-	echo "foo"; // php command
-	echo "foo2"; // php command
-	! echo "heh" # shell command
-	exec
-
-	Example commands:
-
-	startrecording <recordingfilename>
-	stoprecording <recordingfilename>
-	showrecordings
-
-	parse_config(true);  # reloads the \$config array
-
-	\$temp = print_r(\$config, true);
-	more(\$temp);
-
-	/* to output a configuration array */
-	print_r(\$config);
-
-	/* to output the interfaces configuration portion of config.xml */
-	print_r(\$config['interfaces']);
-
-	/* to output the dhcp server configuration */
-	print_r(\$config['dhcpd']);
-
-	/* to exit the {$g['product_name']} developer shell */
-	exit
-
-	/* to output supported wireless modes for an interface */
-	print_r(get_wireless_modes(\"ath0\"));
-
-	/* to enable SSH */
-	\$config['system']['enablesshd'] = true;
-
-	/* change OPTX to the OPT interface name such as BACKHAUL */
-	\$config['interfaces']['optx']['wireless']['standard'] = "11a";
-	\$config['interfaces']['optx']['wireless']['mode'] = "hostap";
-	\$config['interfaces']['optx']['wireless']['channel'] = "6";
-
-	/* to enable dhcp server for an optx interface */
-	\$config['dhcpd']['optx']['enable'] = true;
-	\$config['dhcpd']['optx']['range']['from'] = "192.168.31.100";
-	\$config['dhcpd']['optx']['range']['to'] = "192.168.31.150";
-
-	/* to disable the firewall filter */
-	\$config['system']['disablefilter'] = true;
-
-	/* to enable an interface and configure it as a DHCP client */
-	\$config['interfaces']['optx']['disabled'] = false;
-	\$config['interfaces']['optx']['ipaddr'] = "dhcp";
-
-	/* to enable an interface and set a static IPv4 address */
-	\$config['interfaces']['wan']['enable'] = true;
-	\$config['interfaces']['wan']['ipaddr'] = "192.168.100.1";
-	\$config['interfaces']['wan']['subnet'] = "24";
-
-	/* to save out the new configuration (config.xml) */
-	write_config();
-
-	/* to reboot the system after saving */
-	system_reboot_sync();
-
-EOF;
-
-	more($show_help_text);
-
-}
-
-$fp = fopen('php://stdin', 'r');
-
-echo ".\n\n";
-
-$pkg_interface='console';
-
-$shell_active = true;
-$tccommands = array();
-
-function completion($string, $index) {
-	global $tccommands;
-	return $tccommands;
-}
-
-readline_completion_function("completion");
-
-if ($argc < 2) {
-	echo "Welcome to the {$g['product_name']} developer shell\n";
-	echo "\nType \"help\" to show common usage scenarios.\n";
-	echo "\nAvailable playback commands:\n     ";
-	$files = scandir("/etc/phpshellsessions/");
-	$tccommands[] = "playback";
-	foreach ($files as $file) {
-		if ($file <> "." and $file <> "..") {
-			echo $file . " ";
-			if (function_exists("readline_add_history")) {
-				readline_add_history("playback $file");
-				$tccommands[] = "$file";
-			}
-		}
-	}
-	echo "\n\n";
-}
-
-$recording = false;
-$playback_file_split = array();
-$playbackbuffer = "";
-
-if ($argv[1]=="playback" or $argv[1]=="run") {
-	if (!file_exists("/etc/phpshellsessions/{$argv[2]}")) {
-		echo "Could not locate playback file.";
-		exit;
-	}
-	playback_file($argv[2]);
-	exit;
-}
-
-// Define more commands
-$tccommands[] = "exit";
-$tccommands[] = "quit";
-$tccommands[] = "?";
-$tccommands[] = "exec";
-$tccommands[] = "startrecording";
-$tccommands[] = "stoprecording";
-$tccommands[] = "showrecordings";
-$tccommands[] = "record";
-$tccommands[] = "reset";
-$tccommands[] = "master";
-$tccommands[] = "RELENG_1_2";
-
-while ($shell_active == true) {
-	$command = readline("{$g['product_name']} shell: ");
-	readline_add_history($command);
-	$command_split = explode(" ", $command);
-	$first_command = $command_split[0];
-	if ($first_command == "playback" || $first_command == "run") {
-		$playback_file = $command_split[1];
-		if (!$playback_file || !file_exists("/etc/phpshellsessions/{$playback_file}")) {
-			$command = "";
-			echo "Could not locate playback file.\n";
-		} else {
-			$command = "";
-			echo "\nPlayback of file {$command_split[1]} started.\n\n";
-			playback_file("{$playback_file}");
-			continue;
-		}
-	}
-	if ($first_command == "exit" or $first_command == "quit") {
-		die;
-	}
-	if ($first_command == "help" or $first_command == "?") {
-		show_help();
-		$playbackbuffer = "";
-		continue;
-	}
-	if ($first_command == "exec" or $first_command == "exec;") {
-		playback_text($playbackbuffer);
-		$playbackbuffer = "";
-		continue;
-	}
-	if ($first_command == "stoprecording" || $first_command == "stoprecord" || $first_command == "stop") {
-		if ($recording) {
-			fwrite($recording_fd, $playbackbuffer);
-			fclose($recording_fd);
-			$command = "";
-			conf_mount_ro();
-			echo "Recording stopped.\n";
-			$recording = false;
-		} else {
-			echo "No recording session in progress.\n";
-			$command = "";
-		}
-	}
-	if ($first_command == "showrecordings") {
-		show_recordings();
-		$command = "";
-	}
-	if ($first_command == "reset") {
-		$playbackbuffer = "";
-		echo "\nBuffer reset.\n\n";
-		continue;
-	}
-	if ($first_command == "record") {
-		if (!$command_split[1]) {
-			echo "usage: record playbackname\n";
-			$command = "";
-		} else {
-			/* time to record */
-			conf_mount_rw();
-			safe_mkdir("/etc/phpshellsessions");
-			$recording_fd = fopen("/etc/phpshellsessions/{$command_split[1]}","w");
-			if (!$recording_fd) {
-				echo "Could not start recording session.\n";
-				$command = "";
-			} else {
-				$recording = true;
-				echo "Recording of {$command_split[1]} started.\n";
-				$command = "";
-			}
-		}
-	}
-	$playbackbuffer .= $command . "\n";
-}
-
-function show_recordings() {
-	conf_mount_rw();
-	safe_mkdir("/etc/phpshellsessions");
-	if ($recording) {
-		conf_mount_ro();
-	}
-	echo "==> Sessions available for playback are:\n";
-	system("cd /etc/phpshellsessions && ls /etc/phpshellsessions");
-	echo "==> end of list.\n";
-}
-
-function returnlastchar($command) {
-	$commandlen = strlen($command);
-	$endofstring = substr($command, ($commandlen-1));
-	return $endofstring;
-}
-
-function returnfirstchar($command) {
-	$commandlen = strlen($command);
-	$endofstring = substr($command, 0, 1);
-	return $endofstring;
-}
-
-function str_replace_all($search,$replace,$subject) {
-	while (strpos($subject,$search)!==false) {
-		$subject = str_replace($search,$replace,$subject);
-	}
-	return $subject;
-}
-
-function playback_text($playback_file_contents) {
-	$playback_file_split = explode("\n", $playback_file_contents);
-	$playback_text  = "require_once('functions.inc');\n";
-	$playback_text .= "require_once('globals.inc');\n";
-	$playback_text .= "require_once('config.inc');\n";
-	$toquote = '"';
-	$toquotereplace = '\\"';
-	foreach ($playback_file_split as $pfs) {
-		$firstchar = returnfirstchar($pfs);
-		$currentline = $pfs;
-		if ($firstchar == "!") {
-			/* XXX: encode " in $pfs */
-			$pfsa = str_replace($toquote, $toquotereplace, $currentline);
-			$playback_text .= str_replace("!", "system(\"", $pfsa) . "\");\n";
-		} else if ($firstchar == "=") {
-			/* XXX: encode " in $pfs */
-			$pfsa = str_replace($toquote, $toquotereplace, $currentline);
-			$currentline   .= str_replace("!", "system(\"", $pfsa) . "\");\n";
-		} else {
-			$playback_text .= $pfs . "\n";
-		}
-	}
-	global $config;
-	eval($playback_text);
-}
-
-function playback_file($playback_file) {
-	$playback_file_contents = file_get_contents("/etc/phpshellsessions/{$playback_file}");
-	playback_text($playback_file_contents);
-}
-
-?>
diff --git a/usr/local/sbin/ppp-linkdown b/usr/local/sbin/ppp-linkdown
deleted file mode 100755
index 62d07ed..0000000
--- a/usr/local/sbin/ppp-linkdown
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-IF="${1}"
-LOCAL_IP="${3}"
-
-if [ -f /tmp/${IF}up ] && [ -f /conf/${IF}.log ]; then
-	seconds=$((`date -j +%s` - `/usr/bin/stat -f %m /tmp/${IF}up`))
-	/usr/local/sbin/ppp-log-uptime.sh $seconds ${IF} &
-fi
-
-/etc/rc.kill_states ${IF} ${LOCAL_IP}
-
-if [ -s "/tmp/${IF}_defaultgw" ]; then
-	GW=`head -n 1 /tmp/${IF}_defaultgw`
-	[ -n "${GW}" ] \
-		&& /sbin/route delete default ${GW}
-fi
-# delete the node just in case mpd cannot do that
-/usr/sbin/ngctl shutdown ${IF}:
-if [ -f "/var/etc/nameserver_${IF}" ]; then
-	# Remove old entries
-	for nameserver in `cat /var/etc/nameserver_${IF}`; do
-		/sbin/route delete ${nameserver} >/dev/null 2>&1
-	done
-	/bin/rm -f /var/etc/nameserver_${IF}
-fi
-# Do not remove gateway used during filter reload.
-/bin/rm -f /tmp/${IF}_router
-/bin/rm -f /tmp/${IF}up
-/bin/rm -f /tmp/${IF}_ip
-/usr/local/sbin/pfSctl -c 'service reload dns'
diff --git a/usr/local/sbin/ppp-linkup b/usr/local/sbin/ppp-linkup
deleted file mode 100755
index 2d1eb33..0000000
--- a/usr/local/sbin/ppp-linkup
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin
-
-if [ "${2}" == "inet" ]; then
-
-	OLD_ROUTER=`cat /tmp/${1}_router`
-	if [ -n "${OLD_ROUTER}" ]; then
-		echo "Removing states to old router ${OLD_ROUTER}" | logger -t ppp-linkup
-		pfctl -i ${1} -k 0.0.0.0/0 -k ${OLD_ROUTER}/32
-		pfctl -i ${1} -k ${OLD_ROUTER}/32 -k 0.0.0.0/0
-	fi
-
-	# let the configuration system know that the ipv4 has changed.
-	echo ${4} > /tmp/${1}_router
-	echo ${3} > /tmp/${1}_ip
-	touch /tmp/${1}up
-
-	if grep -q dnsallowoverride /conf/config.xml; then
-		# write nameservers to file
-		echo -n "" > /var/etc/nameserver_${1}
-		if echo "${6}" | grep -q dns1; then
-			DNS1=`echo "${6}" | awk '{print $2}'`
-			echo "${DNS1}" >> /var/etc/nameserver_${1}
-			route change "${DNS1}" ${4}
-		fi
-		if echo "${7}" | grep -q dns2; then
-			DNS2=`echo "${7}" | awk '{print $2}'`
-			echo "${DNS2}" >> /var/etc/nameserver_${1}
-			route change "${DNS2}" ${4}
-		fi
-		pfSctl -c 'service reload dns'
-		sleep 1
-	fi
-	pfSctl -c "interface newip ${1}"
-
-elif [ "${2}" == "inet6" ]; then
-	# let the configuration system know that the ipv6 has changed.
-	echo ${4} |cut -d% -f1 > /tmp/${1}_routerv6
-	echo ${3} |cut -d% -f1 > /tmp/${1}_ipv6
-	touch /tmp/${1}upv6
-
-	if grep -q dnsallowoverride /conf/config.xml; then
-		# write nameservers to file
-		echo -n "" > /var/etc/nameserver_v6${1}
-		if echo "${6}" | grep -q dns1; then
-			DNS1=`echo "${6}" | awk '{print $2}'`
-			echo "${DNS1}" >> /var/etc/nameserver_v6${1}
-			route change -inet6 "${DNS1}" ${4}
-		fi
-		if echo "${7}" | grep -q dns2; then
-			DNS2=`echo "${7}" | awk '{print $2}'`
-			echo "${DNS2}" >> /var/etc/nameserver_v6${1}
-			route change -inet6 "${DNS2}" ${4}
-		fi
-		pfSctl -c 'service reload dns'
-		sleep 1
-	fi
-	pfSctl -c "interface newipv6 ${1}"
-fi
-
-exit 0
diff --git a/usr/local/sbin/ppp-log-uptime.sh b/usr/local/sbin/ppp-log-uptime.sh
deleted file mode 100755
index 6fd8def..0000000
--- a/usr/local/sbin/ppp-log-uptime.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-#write the uptime in seconds to the persistent log in /conf/
-/etc/rc.conf_mount_rw
-/bin/echo `date -j +%Y.%m.%d-%H:%M:%S` $1 >> /conf/$2.log
-/etc/rc.conf_mount_ro
diff --git a/usr/local/sbin/ppp-uptime.sh b/usr/local/sbin/ppp-uptime.sh
deleted file mode 100755
index d7a8441..0000000
--- a/usr/local/sbin/ppp-uptime.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-#get ppp uptime from age of /tmp/{interface}up file
-[ -f /tmp/$1up ] && /bin/echo $((`date -j +%s` - `/usr/bin/stat -f %m /tmp/$1up`))
-\ No newline at end of file
diff --git a/usr/local/sbin/prefixes.php b/usr/local/sbin/prefixes.php
deleted file mode 100644
index 118bd9e..0000000
--- a/usr/local/sbin/prefixes.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-$leases_file = "/var/dhcpd/var/db/dhcpd6.leases";
-if (!file_exists($leases_file)) {
-	exit(1);
-}
-
-$fd = fopen($leases_file, 'r');
-
-$duid_arr = array();
-while (( $line = fgets($fd, 4096)) !== false) {
-	// echo "$line";
-	if (preg_match("/^(ia-[np][ad])[ ]+\"(.*?)\"/i", $line, $duidmatch)) {
-		$type = $duidmatch[1];
-		$duid = $duidmatch[2];
-		continue;
-	}
-
-	/* is it active? otherwise just discard */
-	if (preg_match("/binding state active/i", $line, $activematch)) {
-		$active = true;
-		continue;
-	}
-
-	if (preg_match("/iaaddr[ ]+([0-9a-f:]+)[ ]+/i", $line, $addressmatch)) {
-		$ia_na = $addressmatch[1];
-		continue;
-	}
-
-	if (preg_match("/iaprefix[ ]+([0-9a-f:\/]+)[ ]+/i", $line, $prefixmatch)) {
-		$ia_pd = $prefixmatch[1];
-		continue;
-	}
-
-	/* closing bracket */
-	if (preg_match("/^}/i", $line)) {
-		switch ($type) {
-			case "ia-na":
-				$duid_arr[$duid][$type] = $ia_na;
-				break;
-			case "ia-pd":
-				$duid_arr[$duid][$type] = $ia_pd;
-				break;
-		}
-		unset($type);
-		unset($duid);
-		unset($active);
-		unset($ia_na);
-		unset($ia_pd);
-		continue;
-	}
-}
-fclose($fd);
-
-$routes = array();
-foreach ($duid_arr as $entry) {
-	if (!empty($entry['ia-pd'])) {
-		$routes[$entry['ia-na']] = $entry['ia-pd'];
-	}
-}
-
-// echo "add routes\n";
-if (count($routes) > 0) {
-	foreach ($routes as $address => $prefix) {
-		echo "/sbin/route change -inet6 {$prefix} {$address}\n";
-	}
-}
-
-/* get clog from dhcpd */
-$dhcpdlogfile = "/var/log/dhcpd.log";
-$expires = array();
-if (file_exists($dhcpdlogfile)) {
-	$fd = popen("clog $dhcpdlogfile", 'r');
-	while (($line = fgets($fd)) !== false) {
-		//echo $line;
-		if (preg_match("/releases[ ]+prefix[ ]+([0-9a-f:]+\/[0-9]+)/i", $line, $expire)) {
-			if (in_array($expire[1], $routes)) {
-				continue;
-			}
-			$expires[$expire[1]] = $expire[1];
-		}
-	}
-	pclose($fd);
-}
-
-// echo "remove routes\n";
-if (count($expires) > 0) {
-	foreach ($expires as $prefix) {
-		echo "/sbin/route delete -inet6 {$prefix['prefix']}\n";
-	}
-}
-
-?>
diff --git a/usr/local/sbin/show_filter_reload_status.php b/usr/local/sbin/show_filter_reload_status.php
deleted file mode 100755
index e66c890..0000000
--- a/usr/local/sbin/show_filter_reload_status.php
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/local/bin/php-cgi -q
-<?php
-
-$last_text = "";
-
-while (!stristr($status, "Done")) {
-	$status = get_status();
-	if ($status <> "") {
-		echo $status . "\n";
-	}
-	sleep(1);
-}
-
-function get_status() {
-	global $last_text;
-	$status = file_get_contents("/var/run/filter_reload_status");
-	$status = str_replace("...", "", $status);
-	$status .= "...";
-	if ($status <> $last_text) {
-		$last_text = $status;
-		return $status;
-	}
-	return "";
-}
-
-?>
diff --git a/usr/local/sbin/ufslabels.sh b/usr/local/sbin/ufslabels.sh
deleted file mode 100755
index bded665..0000000
--- a/usr/local/sbin/ufslabels.sh
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh
-############################################
-#
-# Change fstab to use ufsid and geom labels to avoid relying on device numbers directly.
-#
-############################################
-
-# : cat /etc/fstab
-# # Device                Mountpoint      FStype  Options         Dump    Pass#
-# /dev/ad0s1a             /               ufs     rw              1       1
-# /dev/ad0s1b             none            swap    sw              0       0
-
-string_length() {
-	unset LEN
-	LEN=$(echo -n "${1}" | /usr/bin/wc -m)
-}
-
-get_ufsid() {
-	# $1 = device
-	# : /sbin/dumpfs /dev/ad0s1a | /usr/bin/head -n 2 | /usr/bin/tail -n 1 | /usr/bin/cut -f2 -d'[' | /usr/bin/cut -f1 -d ']' | /usr/bin/sed -e 's/[[:blank:]]//g'
-	# 51928c99a471c440
-
-	unset UFSID
-	local _dev="${1}"
-
-	if [ -z "${_dev}" ]; then
-		return
-	fi
-
-	ID_PARTS=$(/sbin/dumpfs /dev/${_dev} | \
-		/usr/bin/head -n 2 | \
-		/usr/bin/tail -n 1 | \
-		/usr/bin/cut -f2 -d'[' | \
-		/usr/bin/cut -f1 -d ']')
-	# " 51110eb0 f288b35d " (note it has more spaces than we need/want)
-	ID_PART1=$(echo ${ID_PARTS} | awk '{print $1}')
-	# "51110eb0"
-	ID_PART2=$(echo ${ID_PARTS} | awk '{print $2}')
-	# "f288b35d"
-
-	if [ -z "${ID_PART1}" -o -z  "${ID_PART2}" ]; then
-		echo "Invalid ufsid on ${1} (${ID_PARTS}), cannot continue"
-		exit -1
-	fi
-
-	# Safety check to avoid http://www.freebsd.org/cgi/query-pr.cgi?pr=156908
-	string_length "${ID_PART1}"
-	if [ ${LEN} -ne 8 ]; then
-		ID_PART1=$(printf "%08s" "${ID_PART1}")
-	fi
-	string_length "${ID_PART2}"
-	if [ ${LEN} -ne 8 ]; then
-		ID_PART2=$(printf "%08s" "${ID_PART2}")
-	fi
-	UFSID="${ID_PART1}${ID_PART2}"
-}
-
-find_fs_device() {
-	unset DEV
-	DEV=$(/usr/bin/grep -e "[[:blank:]]*${1}[[:blank:]]" ${FSTAB} | awk '{print $1}')
-	DEV=${DEV##/dev/}
-}
-
-FSTAB=${DESTDIR}/etc/fstab
-unset NEED_CHANGES
-cp ${FSTAB} ${FSTAB}.tmp
-
-ALL_FILESYSTEMS=$(/usr/bin/awk '/ufs/ && !(/dev\/mirror\// || /dev\/ufsid\// || /dev\/label\// || /dev\/geom\//) {print $2}' ${DESTDIR}/etc/fstab)
-
-for FS in ${ALL_FILESYSTEMS}
-do
-	find_fs_device "${FS}"
-	if [ "${DEV}" != "" ]; then
-		get_ufsid ${DEV}
-		string_length "${UFSID}"
-		if [ ${LEN} -ne 16 ]; then
-			echo "Invalid UFS ID for FS ${FS} ($UFSID), skipping"
-		else
-			/usr/bin/sed -i '' -e "s/${DEV}/ufsid\/${UFSID}/g" ${FSTAB}.tmp
-			NEED_CHANGES=1
-		fi
-	else
-		echo "Unable to find device for ${FS}"
-		exit -1
-	fi
-	echo "FS: ${FS} on device ${DEV} with ufsid ${UFSID}"
-done
-
-ALL_SWAPFS=$(/usr/bin/awk '/swap/ && !(/dev\/mirror\// || /dev\/ufsid\// || /dev\/label\// || /dev\/geom\//) {print $1}' ${DESTDIR}/etc/fstab)
-SWAPNUM=0
-for SFS in ${ALL_SWAPFS}
-do
-	DEV=${SFS##/dev/}
-	if [ "${DEV}" != "" ]; then
-		SWAPDEV=${DEV}
-		echo "FS: Swap slice ${SWAPNUM} on device ${SWAPDEV}"
-		if [ "${SWAPDEV}" != "" ]; then
-			/usr/bin/sed -i '' -e "s/${SWAPDEV}/label\/swap${SWAPNUM}/g" ${FSTAB}.tmp
-			NEED_CHANGES=1
-		fi
-		SWAPNUM=$((SWAPNUM+1))
-	fi
-done
-
-if [ -z "${NEED_CHANGES}" ]; then
-	echo Nothing to do, all filesystems and swap already use some form of device-independent labels
-	exit 0
-fi
-
-echo "===================="
-echo "Current fstab:"
-cat ${FSTAB}
-echo "===================="
-echo "New fstab:"
-cat ${FSTAB}.tmp
-
-if [ "${1}" = "commit" ]; then
-	COMMIT=y
-else
-	echo "Commit changes? (y/n):"
-	read COMMIT
-fi
-
-# Commit changes
-if [ "${COMMIT}" = "y" -o "${COMMIT}" = "Y" ]; then
-
-	echo "Applying label to swap partition"
-	SWAPNUM=0
-	for SFS in ${ALL_SWAPFS}
-	do
-		find_fs_device "${SFS}"
-		if [ "${DEV}" != "" ]; then
-			SWAPDEV=${DEV}
-			if [ -n "${SWAPDEV}" ]; then
-				echo "Disabling swap ${SWAPDEV} to apply label"
-				/sbin/swapoff /dev/${SWAPDEV}
-				/sbin/glabel label swap${SWAPNUM} /dev/${SWAPDEV}
-			fi
-			SWAPNUM=$((SWAPNUM+1))
-		fi
-	done
-
-	echo "Activating new fstab"
-	/bin/mv -f ${FSTAB} ${FSTAB}.old
-	/bin/mv -f ${FSTAB}.tmp ${FSTAB}
-
-	echo "Re-enabling swap"
-	/sbin/swapon -a 2>/dev/null >/dev/null
-fi
diff --git a/usr/local/sbin/vpn-linkdown b/usr/local/sbin/vpn-linkdown
deleted file mode 100755
index b6d033c..0000000
--- a/usr/local/sbin/vpn-linkdown
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# record logout
-/usr/bin/logger -p local3.info "logout,$1,$4,$5"
-/sbin/pfctl -i $1 -Fs
-/sbin/pfctl -K $4/32
diff --git a/usr/local/sbin/vpn-linkup b/usr/local/sbin/vpn-linkup
deleted file mode 100755
index bca7b6e..0000000
--- a/usr/local/sbin/vpn-linkup
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# record login
-/usr/bin/logger -p local3.info "login,$1,$4,$5"
-
-case `/bin/echo $1 | /usr/bin/cut -c1-4` in
-	pptp)
-		/sbin/ifconfig $1 group pptp
-		;;
-	poes)
-		/sbin/ifconfig $1 group pppoe
-		;;
-	l2tp)
-		/sbin/ifconfig $1 group l2tp
-		;;
-esac