dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

rename "parking" to "features" in preparation for some more (possibly post 1.0) feature additions 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3463 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-07-17 20:58:01 +00:00
parent f1c4cb1210
commit fc1d3d8122
13 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_dial.c
View File

@ -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>

2
apps/app_parkandannounce.c
View File

@ -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>

2
apps/app_queue.c
View File

@ -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>

2
channels/chan_agent.c
View File

@ -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>

2
channels/chan_iax2.c
View File

@ -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>

2
channels/chan_mgcp.c
View File

@ -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>

2
channels/chan_sip.c
View File

@ -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>

2
channels/chan_skinny.c
View File

@ -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>

2
channels/chan_zap.c
View File

@ -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>

0
configs/parking.conf.sample → configs/features.conf.sample
View File

0
include/asterisk/parking.h → include/asterisk/features.h
View File

4
res/Makefile
View File

@ -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

9
res/res_parking.c → res/res_features.c
View File

@ -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) {