rename "parking" to "features" in preparation for some more (possibly post 1.0) featu...

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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index d44de703441bf6c2f27181e1d09994e494ce4fb1..43ff0c30dbc44aa9f7c09a438bdde4e4e3c5db97 100755 (executable)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -21,7 +21,7 @@
 #include <asterisk/translate.h>
 #include <asterisk/say.h>
 #include <asterisk/config.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/callerid.h>
 #include <asterisk/utils.h>

diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index 2faa92dc13e51ff4ab8d1dedd59dd933272b2e4d..c3f949ec32342da40b5884dd4c3d291438b3954d 100755 (executable)
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -21,7 +21,7 @@
 #include <asterisk/channel_pvt.h>
 #include <asterisk/pbx.h>
 #include <asterisk/module.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/options.h>
 #include <asterisk/logger.h>
 #include <asterisk/say.h>

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 45690fd5691b3411732499fb4cbf9d580b44629e..6fe9f6d4a7819760b7469e29a512e5fc2cc22935 100755 (executable)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -38,7 +38,7 @@
 #include <asterisk/module.h>
 #include <asterisk/translate.h>
 #include <asterisk/say.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/cli.h>
 #include <asterisk/manager.h>

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index bf71e9aab963bacd65b314d18a12e43ae34f6978..6371e0727fbeb0977c46319d9c30399b6e9d731f 100755 (executable)
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -32,7 +32,7 @@
 #include <asterisk/app.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/manager.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/utils.h>
 #include <sys/socket.h>
 #include <errno.h>

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 53e28c86686754bfca9cd97af238f89264f9f737..58945b71128ba39887fe4745641230586cdb9e4e 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -33,7 +33,7 @@
 #include <asterisk/app.h>
 #include <asterisk/astdb.h>
 #include <asterisk/musiconhold.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/utils.h>
 #include <sys/mman.h>
 #include <arpa/inet.h>

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 61391a7fb1345006cac18db932387d4def4cd82c..67e9081e464c247714497a2fda4dd8f51f322db3 100755 (executable)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -68,7 +68,7 @@
 #include <asterisk/say.h>
 #include <asterisk/cdr.h>
 #include <asterisk/astdb.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/app.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/utils.h>

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 47d229eb6d43273574526314afdcc5efc74a096c..9a3105da5ac38cb1b0610a80714acf2c985f3035 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -34,7 +34,7 @@
 #include <asterisk/app.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/dsp.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/acl.h>
 #include <asterisk/srv.h>
 #include <asterisk/astdb.h>

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index c624324b88efa9d1093a0d4ac85d1752f0da5c0b..df3398dd003c3c8b1d610852be90982ea7649ca9 100755 (executable)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -34,7 +34,7 @@
 #include <asterisk/say.h>
 #include <asterisk/cdr.h>
 #include <asterisk/astdb.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/app.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/utils.h>

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 48e6cf2f0ce5bebd1ccb515e945df80ec908de26..d5d17f40063758bd244f51d02c87ccc1c1100303 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -28,7 +28,7 @@
 #include <asterisk/adsi.h>
 #include <asterisk/cli.h>
 #include <asterisk/cdr.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/say.h>
 #include <asterisk/tdd.h>

diff --git a/configs/parking.conf.sample b/configs/features.conf.sample
similarity index 100%
rename from configs/parking.conf.sample
rename to configs/features.conf.sample

diff --git a/include/asterisk/parking.h b/include/asterisk/features.h
similarity index 100%
rename from include/asterisk/parking.h
rename to include/asterisk/features.h

diff --git a/res/Makefile b/res/Makefile
index afd3af93719b58a9d83c08883fa2c298490cc720..39d079e0f9afbc15aaf153f9630cf02a6c8e23d2 100755 (executable)
--- a/res/Makefile
+++ b/res/Makefile
@@ -11,7 +11,7 @@
 # the GNU General Public License
 #
 
-MODS=res_adsi.so res_parking.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \
+MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \
      res_agi.so
 MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
 MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi)
@@ -31,7 +31,9 @@ OSPLIB=/usr/lib/libosp.a
 all: depend $(MODS)
 
 install: all
+       rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
        rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
+       rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
        for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 
 res_crypto.so: res_crypto.o

diff --git a/res/res_parking.c b/res/res_features.c
similarity index 99%
rename from res/res_parking.c
rename to res/res_features.c
index b7d1b22f987d5abf888c1df41e6f4f2bfd52ee31..b55f1be5e0c568ed61f85babaec71e31d10eba9a 100755 (executable)
--- a/res/res_parking.c
+++ b/res/res_features.c
@@ -21,7 +21,7 @@
 #include <asterisk/translate.h>
 #include <asterisk/say.h>
 #include <asterisk/channel_pvt.h>
-#include <asterisk/parking.h>
+#include <asterisk/features.h>
 #include <asterisk/musiconhold.h>
 #include <asterisk/config.h>
 #include <asterisk/cli.h>
@@ -697,7 +697,12 @@ int load_module(void)
 
        ast_cli_register(&showparked);
 
-       cfg = ast_load("parking.conf");
+       cfg = ast_load("features.conf");
+       if (!cfg) {
+               cfg = ast_load("parking.conf");
+               if (cfg)
+                       ast_log(LOG_NOTICE, "parking.conf is deprecated in favor of 'features.conf'.  Please rename it.\n");
+       }
        if (cfg) {
                var = ast_variable_browse(cfg, "general");
                while(var) {