chan_local: Update chan_local references for Local channels.

chan_local no longer exists since Local channels are built into the
core (core_local), but there are still comments which reference it,
including in the configs. Update these to avoid confusion.

Resolves: #1849

diff --git a/configs/samples/features.conf.sample b/configs/samples/features.conf.sample
index ba2f481e7f627a1cc5b601f90b925915f18a48fd..7e69ec24d3eb6950db5da0787c67972faa953a59 100644 (file)
--- a/configs/samples/features.conf.sample
+++ b/configs/samples/features.conf.sample
@@ -40,7 +40,7 @@
 
 ; Note that the DTMF features listed below only work when two channels have answered and are bridged together.
 ; They can not be used while the remote party is ringing or in progress. If you require this feature you can use
-; chan_local in combination with Answer to accomplish it.
+; a Local channel in combination with Answer to accomplish it.
 
 [featuremap]
 ;blindxfer => #1                ; Blind transfer  (default is #) -- Make sure to set the T and/or t option in the Dial() or Queue() app call!

diff --git a/configs/samples/queues.conf.sample b/configs/samples/queues.conf.sample
index 16882e63c5d7530d83118f941d3a2ad539a7651c..0c95ea80b650f593c763a9ff2a0c487850737128 100644 (file)
--- a/configs/samples/queues.conf.sample
+++ b/configs/samples/queues.conf.sample
@@ -561,7 +561,7 @@ monitor-type = MixMonitor
 ; before app_queue.so itself or they may be marked invalid until reload. This
 ; can be accomplished by explicitly listing them in modules.conf before
 ; app_queue.so.  Additionally, if you use Local channels as queue members, you
-; must also preload pbx_config.so and chan_local.so (or pbx_ael.so, pbx_lua.so,
+; must also preload pbx_config.so (or pbx_ael.so, pbx_lua.so,
 ; or pbx_realtime.so, depending on how your dialplan is configured).
 ;
 ; syntax: member => interface,[,penalty][,membername][,state_interface][,ringinuse][,wrapuptime][,paused]

diff --git a/menuselect/example_menuselect-tree b/menuselect/example_menuselect-tree
index 9bc389ae363ab5ba07a43a93d29414b38da8dbe4..25d04747166175ed60f167f802d7449fe5c55f3a 100644 (file)
--- a/menuselect/example_menuselect-tree
+++ b/menuselect/example_menuselect-tree
@@ -191,10 +191,8 @@
                <member name="chan_jingle" displayname="Jingle Channel Driver" remove_on_change="channels/chan_jingle.o channels/chan_jingle.so">
        <depend>iksemel</depend>
                </member>
-               <member name="chan_local" displayname="Local Proxy Channel" remove_on_change="channels/chan_local.o channels/chan_local.so">
-               </member>
-               <member name="chan_zap" displayname="Zapata Telephony" remove_on_change="channels/chan_zap.o channels/chan_zap.so">
-       <depend>zaptel</depend>
+               <member name="chan_dahdi" displayname="DAHDI Telephony" remove_on_change="channels/chan_dahdi.o channels/chan_dahdi.so">
+       <depend>dahdi</depend>
                </member>
        </category>
        <category name="MENUSELECT_CODECS" displayname="Codec Translators">

diff --git a/menuselect/test/menuselect-tree b/menuselect/test/menuselect-tree
index 690bf66fcee48e8e5282cb786f14734567853340..ff28e20fdd0fc41cb0d15bce1eb3ab9cc7440250 100644 (file)
--- a/menuselect/test/menuselect-tree
+++ b/menuselect/test/menuselect-tree
@@ -34,7 +34,6 @@
 <member name="app_db" displayname="Database Access Functions" remove_on_change="apps/app_db.o apps/app_db.so">
 </member>
 <member name="app_dial" displayname="Dialing Application" remove_on_change="apps/app_dial.o apps/app_dial.so">
-       <depend>chan_local</depend>
 </member>
 <member name="app_dictate" displayname="Virtual Dictation Machine" remove_on_change="apps/app_dictate.o apps/app_dictate.so">
 </member>
@@ -59,7 +58,6 @@
        <depend name="dahdi">DAHDI</depend>
 </member>
 <member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so">
-       <depend>chan_local</depend>
 </member>
 <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so">
 </member>
@@ -188,7 +186,6 @@
 </category>
 <category name="MENUSELECT_CHANNELS" displayname="Channel Drivers" remove_on_change="channels/modules.link">
 <member name="chan_agent" displayname="Agent Proxy Channel" remove_on_change="channels/chan_agent.o channels/chan_agent.so">
-        <depend>chan_local</depend>
 </member>
 <member name="chan_console" displayname="Console Channel Driver" remove_on_change="channels/chan_console.o channels/chan_console.so">
        <depend>portaudio</depend>
@@ -220,8 +217,6 @@
        <depend>res_jabber</depend>
        <use>openssl</use>
 </member>
-<member name="chan_local" displayname="Local Proxy Channel (Note: used internally by other modules)" remove_on_change="channels/chan_local.o channels/chan_local.so">
-</member>
 <member name="chan_unistim" displayname="UNISTIM Protocol (USTM)" remove_on_change="channels/chan_unistim.o channels/chan_unistim.so">
 </member>
 <member name="chan_usbradio" displayname="usb Console Channel Driver" remove_on_change="channels/chan_usbradio.o channels/chan_usbradio.so">

diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c
index cdde3366513700f3cf566f8d94c70d72e1faae9a..8702c5072d47c23f23acd462548c05172434d2eb 100644 (file)
--- a/res/parking/parking_bridge_features.c
+++ b/res/parking/parking_bridge_features.c
@@ -254,7 +254,7 @@ static struct ast_channel *park_local_transfer(struct ast_channel *parker, const
        /* Fill the variable with the extension and context we want to call */
        snprintf(destination, sizeof(destination), "%s@%s", exten, context);
 
-       /* Now we request that chan_local prepare to call the destination */
+       /* Now we request a Local channel to prepare to call the destination */
        parkee = ast_request("Local", ast_channel_nativeformats(parker), NULL, parker, destination,
                &cause);
        if (!parkee) {