kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-18 10:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Creating tag for the release of asterisk-1.4.0-beta1

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.4.0-beta1@43394 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-09-20 23:03:28 +00:00
parent ba231a2537 9cf9c1373b
commit 6b6ff99f55
6 changed files with 105 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.lastclean
View File

@@ -1 +0,0 @@
24

1
.version
View File

@@ -1 +0,0 @@
1.4.0-beta1

3
ChangeLog
View File

@@ -1,3 +0,0 @@
2006-09-20 Kevin P. Fleming <kpfleming@digium.com>
* Asterisk 1.4.0-beta1 released.

26
channels/chan_agent.c
View File

@@ -1006,9 +1006,13 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
static int read_agent_config(void)
{
struct ast_config *cfg;
struct ast_config *ucfg;
struct ast_variable *v;
struct agent_pvt *p;
const char *general_val;
const char *catname;
const char *hasagent;
int genhasagent;
group = 0;
autologoff = 0;
@@ -1104,6 +1108,28 @@ static int read_agent_config(void)
}
v = v->next;
}
if ((ucfg = ast_config_load("users.conf"))) {
genhasagent = ast_true(ast_variable_retrieve(ucfg, "general", "hasagent"));
catname = ast_category_browse(ucfg, NULL);
while(catname) {
if (strcasecmp(catname, "general")) {
hasagent = ast_variable_retrieve(ucfg, catname, "hasagent");
if (ast_true(hasagent) || (!hasagent && genhasagent)) {
char tmp[256];
const char *fullname = ast_variable_retrieve(ucfg, catname, "fullname");
const char *secret = ast_variable_retrieve(ucfg, catname, "secret");
if (!fullname)
fullname = "";
if (!secret)
secret = "";
snprintf(tmp, sizeof(tmp), "%s,%s,%s", catname, secret,fullname);
add_agent(tmp, 0);
}
}
catname = ast_category_browse(ucfg, catname);
}
ast_config_destroy(ucfg);
}
AST_LIST_TRAVERSE_SAFE_BEGIN(&agents, p, list) {
if (p->dead) {
AST_LIST_REMOVE_CURRENT(&agents, list);

4
main/astmm.c
View File

@@ -378,8 +378,8 @@ static int handle_show_memory_summary(int fd, int argc, char *argv[])
/* Dump the whole list */
for (cur = list; cur; cur = cur->next) {
len += list->len;
count += list->count;
len += cur->len;
count += cur->count;
if (fn) {
ast_cli(fd, "%10d bytes in %5d allocations in function '%s' of '%s'\n",
cur->len, cur->count, cur->fn, fn);

123
sounds/Makefile
View File

@@ -15,64 +15,97 @@
-include $(ASTTOPDIR)/menuselect.makeopts
PWD:=$(shell pwd)
SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
CORE_SOUNDS_VERSION:=1.4.2
EXTRA_SOUNDS_VERSION:=1.4.1
SOUNDS_URL:=http://ftp.digium.com/pub/telephony/sounds/releases
MENUSELECT_CORE_SOUNDS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
MENUSELECT_CORE_SOUNDS:=$(subst -FR-,-fr-,$(MENUSELECT_CORE_SOUNDS))
MENUSELECT_CORE_SOUNDS:=$(subst -ES-,-es-,$(MENUSELECT_CORE_SOUNDS))
MENUSELECT_CORE_SOUNDS:=$(subst -WAV,-wav,$(MENUSELECT_CORE_SOUNDS))
MENUSELECT_CORE_SOUNDS:=$(subst -ULAW,-ulaw,$(MENUSELECT_CORE_SOUNDS))
MENUSELECT_CORE_SOUNDS:=$(subst -ALAW,-alaw,$(MENUSELECT_CORE_SOUNDS))
MENUSELECT_CORE_SOUNDS:=$(subst -GSM,-gsm,$(MENUSELECT_CORE_SOUNDS))
MENUSELECT_CORE_SOUNDS:=$(subst -G729,-g729,$(MENUSELECT_CORE_SOUNDS))
CORE_SOUNDS:=$(MENUSELECT_CORE_SOUNDS:CORE-SOUNDS-%=asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION).tar.gz)
CORE_SOUND_TAGS:=$(MENUSELECT_CORE_SOUNDS:CORE-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION))
MENUSELECT_EXTRA_SOUNDS:=$(subst -EN-,-en-,$(MENUSELECT_EXTRA_SOUNDS))
MENUSELECT_EXTRA_SOUNDS:=$(subst -FR-,-fr-,$(MENUSELECT_EXTRA_SOUNDS))
MENUSELECT_EXTRA_SOUNDS:=$(subst -ES-,-es-,$(MENUSELECT_EXTRA_SOUNDS))
MENUSELECT_EXTRA_SOUNDS:=$(subst -WAV,-wav,$(MENUSELECT_EXTRA_SOUNDS))
MENUSELECT_EXTRA_SOUNDS:=$(subst -ULAW,-ulaw,$(MENUSELECT_EXTRA_SOUNDS))
MENUSELECT_EXTRA_SOUNDS:=$(subst -ALAW,-alaw,$(MENUSELECT_EXTRA_SOUNDS))
MENUSELECT_EXTRA_SOUNDS:=$(subst -GSM,-gsm,$(MENUSELECT_EXTRA_SOUNDS))
MENUSELECT_EXTRA_SOUNDS:=$(subst -G729,-g729,$(MENUSELECT_EXTRA_SOUNDS))
EXTRA_SOUNDS:=$(MENUSELECT_EXTRA_SOUNDS:EXTRA-SOUNDS-%=asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION).tar.gz)
EXTRA_SOUND_TAGS:=$(MENUSELECT_EXTRA_SOUNDS:EXTRA-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION))
MENUSELECT_MOH:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH))
MENUSELECT_MOH:=$(subst -WAV,-wav,$(MENUSELECT_MOH))
MENUSELECT_MOH:=$(subst -ULAW,-ulaw,$(MENUSELECT_MOH))
MENUSELECT_MOH:=$(subst -ALAW,-alaw,$(MENUSELECT_MOH))
MENUSELECT_MOH:=$(subst -GSM,-gsm,$(MENUSELECT_MOH))
MENUSELECT_MOH:=$(subst -G729,-g729,$(MENUSELECT_MOH))
MOH:=$(MENUSELECT_MOH:MOH-%=asterisk-moh-%.tar.gz)
MOH_TAGS:=$(MENUSELECT_MOH:MOH-%=$(MOH_DIR)/.asterisk-moh-%)
MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
MCS:=$(subst -FR-,-fr-,$(MCS))
MCS:=$(subst -ES-,-es-,$(MCS))
MCS:=$(subst -WAV,-wav,$(MCS))
MCS:=$(subst -ULAW,-ulaw,$(MCS))
MCS:=$(subst -ALAW,-alaw,$(MCS))
MCS:=$(subst -GSM,-gsm,$(MCS))
MCS:=$(subst -G729,-g729,$(MCS))
CORE_SOUNDS:=$(MCS:CORE-SOUNDS-%=asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION).tar.gz)
CORE_SOUND_TAGS:=$(MCS:CORE-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-core-sounds-%-$(CORE_SOUNDS_VERSION))
MES:=$(subst -EN-,-en-,$(MENUSELECT_EXTRA_SOUNDS))
MES:=$(subst -FR-,-fr-,$(MES))
MES:=$(subst -ES-,-es-,$(MES))
MES:=$(subst -WAV,-wav,$(MES))
MES:=$(subst -ULAW,-ulaw,$(MES))
MES:=$(subst -ALAW,-alaw,$(MES))
MES:=$(subst -GSM,-gsm,$(MES))
MES:=$(subst -G729,-g729,$(MES))
EXTRA_SOUNDS:=$(MES:EXTRA-SOUNDS-%=asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION).tar.gz)
EXTRA_SOUND_TAGS:=$(MES:EXTRA-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION))
MM:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH))
MM:=$(subst -WAV,-wav,$(MM))
MM:=$(subst -ULAW,-ulaw,$(MM))
MM:=$(subst -ALAW,-alaw,$(MM))
MM:=$(subst -GSM,-gsm,$(MM))
MM:=$(subst -G729,-g729,$(MM))
MOH:=$(MM:MOH-%=asterisk-moh-%.tar.gz)
MOH_TAGS:=$(MM:MOH-%=$(MOH_DIR)/.asterisk-moh-%)
WGET_ARGS:=--continue
all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
$(SOUNDS_DIR)/.asterisk-core-sounds-en-%: asterisk-core-sounds-en-%.tar.gz $(SOUNDS_DIR)
cat $< | gzip -d | tar xCf $(SOUNDS_DIR) -
$(SOUNDS_DIR)/.asterisk-core-sounds-en-%:
@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
if test ! -f $${PACKAGE}; then exit 1; fi; \
rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR) - && \
touch $@
$(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: asterisk-core-sounds-fr-%.tar.gz $(SOUNDS_DIR)/fr
cat $< | gzip -d | tar xCf $(SOUNDS_DIR)/fr -
$(SOUNDS_DIR)/.asterisk-core-sounds-es-%:
@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
if test ! -f $${PACKAGE}; then exit 1; fi; \
rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR)/es - && \
touch $@
$(SOUNDS_DIR)/.asterisk-core-sounds-es-%: asterisk-core-sounds-es-%.tar.gz $(SOUNDS_DIR)/es
cat $< | gzip -d | tar xCf $(SOUNDS_DIR)/es -
$(SOUNDS_DIR)/.asterisk-core-sounds-fr-%:
@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
if test ! -f $${PACKAGE}; then exit 1; fi; \
rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR)/fr - && \
touch $@
$(SOUNDS_DIR)/.asterisk-extra-sounds-en-%: asterisk-extra-sounds-en-%.tar.gz $(SOUNDS_DIR)
cat $< | gzip -d | tar xCf $(SOUNDS_DIR) -
$(SOUNDS_DIR)/.asterisk-extra-sounds-en-%:
@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
if test ! -f $${PACKAGE}; then exit 1; fi; \
rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR) - && \
touch $@
$(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%: asterisk-extra-sounds-fr-%.tar.gz $(SOUNDS_DIR)/fr
cat $< | gzip -d | tar xCf $(SOUNDS_DIR)/fr -
$(SOUNDS_DIR)/.asterisk-extra-sounds-es-%:
@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
if test ! -f $${PACKAGE}; then exit 1; fi; \
rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR)/es - && \
touch $@
$(SOUNDS_DIR)/.asterisk-extra-sounds-es-%: asterisk-extra-sounds-es-%.tar.gz $(SOUNDS_DIR)/es
cat $< | gzip -d | tar xCf $(SOUNDS_DIR)/es -
$(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%:
@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
if test ! -f $${PACKAGE}; then exit 1; fi; \
rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
cat $${PACKAGE} | gzip -d | tar xCf $(SOUNDS_DIR)/fr - && \
touch $@
$(MOH_DIR)/.asterisk-moh-%: asterisk-moh-%.tar.gz $(MOH_DIR)
cat $< | gzip -d | tar xCf $(MOH_DIR) -
$(MOH_DIR)/.asterisk-moh-%:
@PACKAGE=$(subst $(MOH_DIR)/.asterisk,asterisk,$@).tar.gz; \
if test ! -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
if test ! -f $${PACKAGE}; then exit 1; fi; \
cat $${PACKAGE} | gzip -d | tar xCf $(MOH_DIR) - && \
touch $@
asterisk-core-%.tar.gz:
@wget $(WGET_ARGS) $(SOUNDS_URL)/$@
@@ -86,12 +119,10 @@ asterisk-moh-%.tar.gz:
dist-clean:
rm -f *.tar.gz
.PHONY: $(SOUNDS_DIR) $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/es $(MOH_DIR)
$(SOUNDS_DIR) $(MOH_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr:
mkdir -p $@
install: $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
install: $(SOUNDS_DIR) $(SOUNDS_DIR)/es $(SOUNDS_DIR)/fr $(MOH_DIR) $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
uninstall:
rm -rf $(SOUNDS_DIR)