[asterisk-commits] branch murf/bug_6264-trunk r9192 - in
/team/murf/bug_6264-trunk: ./ agi/ apps...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Feb 7 08:26:20 MST 2006
Author: murf
Date: Tue Feb 7 09:25:33 2006
New Revision: 9192
URL: http://svn.digium.com/view/asterisk?rev=9192&view=rev
Log:
Merged revisions 8232,8242,8276,8281,8320,8347,8394,8412,8414,8418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8232 | russell | 2006-01-18 21:17:45 -0700 (Wed, 18 Jan 2006) | 3 lines
fix a seg fault due to assuming that space gets allocatted on the stack in the
same order that we declare the variables (issue #6290)
........
r8242 | russell | 2006-01-18 21:56:48 -0700 (Wed, 18 Jan 2006) | 3 lines
fix Message-Account header to use the ip address if the fromdomain
isn't set (issue #6278)
........
r8276 | tilghman | 2006-01-19 12:14:37 -0700 (Thu, 19 Jan 2006) | 2 lines
Bug 6072 - Memory leaks in the expression parser
........
r8281 | oej | 2006-01-19 12:40:28 -0700 (Thu, 19 Jan 2006) | 2 lines
Enable "musicclass" setting for sip peers as per the config sample.
........
r8320 | mogorman | 2006-01-19 18:00:46 -0700 (Thu, 19 Jan 2006) | 3 lines
solved problem with delayreject and iax trunking
bug 4291
........
r8347 | russell | 2006-01-20 11:34:42 -0700 (Fri, 20 Jan 2006) | 2 lines
fix invalid value of prev_q (issue #6302)
........
r8394 | tilghman | 2006-01-21 11:29:39 -0700 (Sat, 21 Jan 2006) | 2 lines
Bug 5936 - AddQueueMember fails on realtime queue, if queue not yet loaded
........
r8412 | russell | 2006-01-21 16:17:06 -0700 (Sat, 21 Jan 2006) | 2 lines
prevent the possibility of writing outside of the available workspace (issue #6271)
........
r8414 | russell | 2006-01-21 16:43:14 -0700 (Sat, 21 Jan 2006) | 2 lines
temporarily revert substring fix pending the result of the discussion in issue #6271
........
r8418 | russell | 2006-01-21 19:05:41 -0700 (Sat, 21 Jan 2006) | 3 lines
add a modified fix to prevent writing outside of the provided workspace when
calculating a substring (issue #6271)
........
Added:
team/murf/bug_6264-trunk/configs/muted.conf.sample (props changed)
- copied unchanged from r9186, trunk/configs/muted.conf.sample
team/murf/bug_6264-trunk/doc/00README.1st
- copied unchanged from r9186, trunk/doc/00README.1st
team/murf/bug_6264-trunk/doc/ael.txt (props changed)
- copied unchanged from r9186, trunk/doc/ael.txt
team/murf/bug_6264-trunk/doc/app-sms.txt (props changed)
- copied unchanged from r9186, trunk/doc/app-sms.txt
team/murf/bug_6264-trunk/doc/asterisk-conf.txt (props changed)
- copied unchanged from r9186, trunk/doc/asterisk-conf.txt
team/murf/bug_6264-trunk/doc/backtrace.txt (props changed)
- copied unchanged from r9186, trunk/doc/backtrace.txt
team/murf/bug_6264-trunk/doc/billing.txt (props changed)
- copied unchanged from r9186, trunk/doc/billing.txt
team/murf/bug_6264-trunk/doc/callingpres.txt
- copied unchanged from r9186, trunk/doc/callingpres.txt
team/murf/bug_6264-trunk/doc/cdrdriver.txt (props changed)
- copied unchanged from r9186, trunk/doc/cdrdriver.txt
team/murf/bug_6264-trunk/doc/chaniax.txt (props changed)
- copied unchanged from r9186, trunk/doc/chaniax.txt
team/murf/bug_6264-trunk/doc/channels.txt (props changed)
- copied unchanged from r9186, trunk/doc/channels.txt
team/murf/bug_6264-trunk/doc/channelvariables.txt (props changed)
- copied unchanged from r9186, trunk/doc/channelvariables.txt
team/murf/bug_6264-trunk/doc/cliprompt.txt (props changed)
- copied unchanged from r9186, trunk/doc/cliprompt.txt
team/murf/bug_6264-trunk/doc/configuration.txt (props changed)
- copied unchanged from r9186, trunk/doc/configuration.txt
team/murf/bug_6264-trunk/doc/cygwin.txt (props changed)
- copied unchanged from r9186, trunk/doc/cygwin.txt
team/murf/bug_6264-trunk/doc/dundi.txt (props changed)
- copied unchanged from r9186, trunk/doc/dundi.txt
team/murf/bug_6264-trunk/doc/enum.txt (props changed)
- copied unchanged from r9186, trunk/doc/enum.txt
team/murf/bug_6264-trunk/doc/extconfig.txt (props changed)
- copied unchanged from r9186, trunk/doc/extconfig.txt
team/murf/bug_6264-trunk/doc/externalivr.txt (props changed)
- copied unchanged from r9186, trunk/doc/externalivr.txt
team/murf/bug_6264-trunk/doc/freetds.txt (props changed)
- copied unchanged from r9186, trunk/doc/freetds.txt
team/murf/bug_6264-trunk/doc/h323.txt (props changed)
- copied unchanged from r9186, trunk/doc/h323.txt
team/murf/bug_6264-trunk/doc/hardware.txt (props changed)
- copied unchanged from r9186, trunk/doc/hardware.txt
team/murf/bug_6264-trunk/doc/ices.txt (props changed)
- copied unchanged from r9186, trunk/doc/ices.txt
team/murf/bug_6264-trunk/doc/jitterbuffer.txt (props changed)
- copied unchanged from r9186, trunk/doc/jitterbuffer.txt
team/murf/bug_6264-trunk/doc/linkedlists.txt (props changed)
- copied unchanged from r9186, trunk/doc/linkedlists.txt
team/murf/bug_6264-trunk/doc/math.txt (props changed)
- copied unchanged from r9186, trunk/doc/math.txt
team/murf/bug_6264-trunk/doc/misdn.txt (props changed)
- copied unchanged from r9186, trunk/doc/misdn.txt
team/murf/bug_6264-trunk/doc/mp3.txt (props changed)
- copied unchanged from r9186, trunk/doc/mp3.txt
team/murf/bug_6264-trunk/doc/musiconhold-fpm.txt (props changed)
- copied unchanged from r9186, trunk/doc/musiconhold-fpm.txt
team/murf/bug_6264-trunk/doc/mysql.txt (props changed)
- copied unchanged from r9186, trunk/doc/mysql.txt
team/murf/bug_6264-trunk/doc/odbcstorage.txt (props changed)
- copied unchanged from r9186, trunk/doc/odbcstorage.txt
team/murf/bug_6264-trunk/doc/privacy.txt (props changed)
- copied unchanged from r9186, trunk/doc/privacy.txt
team/murf/bug_6264-trunk/doc/realtime.txt (props changed)
- copied unchanged from r9186, trunk/doc/realtime.txt
team/murf/bug_6264-trunk/doc/security.txt (props changed)
- copied unchanged from r9186, trunk/doc/security.txt
team/murf/bug_6264-trunk/doc/sms.txt (props changed)
- copied unchanged from r9186, trunk/doc/sms.txt
team/murf/bug_6264-trunk/funcs/func_sha1.c
- copied unchanged from r9186, trunk/funcs/func_sha1.c
team/murf/bug_6264-trunk/include/asterisk/sha1.h
- copied unchanged from r9186, trunk/include/asterisk/sha1.h
team/murf/bug_6264-trunk/sha1.c
- copied unchanged from r9186, trunk/sha1.c
Removed:
team/murf/bug_6264-trunk/apps/app_intercom.c
team/murf/bug_6264-trunk/apps/app_sql_postgres.c
Modified:
team/murf/bug_6264-trunk/ (props changed)
team/murf/bug_6264-trunk/.cleancount
team/murf/bug_6264-trunk/Makefile
team/murf/bug_6264-trunk/agi/Makefile
team/murf/bug_6264-trunk/apps/Makefile
team/murf/bug_6264-trunk/apps/app_macro.c
team/murf/bug_6264-trunk/cdr/Makefile
team/murf/bug_6264-trunk/channel.c
team/murf/bug_6264-trunk/channels/Makefile
team/murf/bug_6264-trunk/channels/chan_local.c
team/murf/bug_6264-trunk/channels/chan_misdn.c
team/murf/bug_6264-trunk/channels/chan_misdn_config.c
team/murf/bug_6264-trunk/channels/chan_sip.c
team/murf/bug_6264-trunk/channels/chan_vpb.c
team/murf/bug_6264-trunk/channels/chan_zap.c
team/murf/bug_6264-trunk/channels/misdn/Makefile
team/murf/bug_6264-trunk/channels/misdn/chan_misdn_config.h
team/murf/bug_6264-trunk/channels/misdn/isdn_lib.c
team/murf/bug_6264-trunk/channels/misdn/isdn_lib.h
team/murf/bug_6264-trunk/channels/misdn/isdn_msg_parser.c
team/murf/bug_6264-trunk/cli.c
team/murf/bug_6264-trunk/codecs/Makefile
team/murf/bug_6264-trunk/configs/misdn.conf.sample
team/murf/bug_6264-trunk/formats/Makefile
team/murf/bug_6264-trunk/frame.c
team/murf/bug_6264-trunk/funcs/Makefile
team/murf/bug_6264-trunk/funcs/func_language.c
team/murf/bug_6264-trunk/funcs/func_moh.c
team/murf/bug_6264-trunk/include/asterisk/cdr.h
team/murf/bug_6264-trunk/include/asterisk/channel.h
team/murf/bug_6264-trunk/include/asterisk/frame.h
team/murf/bug_6264-trunk/include/asterisk/image.h
team/murf/bug_6264-trunk/include/asterisk/musiconhold.h
team/murf/bug_6264-trunk/include/asterisk/stringfields.h
team/murf/bug_6264-trunk/include/asterisk/utils.h
team/murf/bug_6264-trunk/pbx.c
team/murf/bug_6264-trunk/res/Makefile
team/murf/bug_6264-trunk/res/res_agi.c
team/murf/bug_6264-trunk/res/res_clioriginate.c
team/murf/bug_6264-trunk/res/res_features.c
team/murf/bug_6264-trunk/res/res_musiconhold.c
team/murf/bug_6264-trunk/res/res_odbc.c
team/murf/bug_6264-trunk/rtp.c
team/murf/bug_6264-trunk/stdtime/Makefile
team/murf/bug_6264-trunk/udptl.c
team/murf/bug_6264-trunk/utils.c
team/murf/bug_6264-trunk/utils/Makefile
Propchange: team/murf/bug_6264-trunk/
------------------------------------------------------------------------------
automerge = 1
Propchange: team/murf/bug_6264-trunk/
------------------------------------------------------------------------------
--- branch-1.2-blocked (added)
+++ branch-1.2-blocked Tue Feb 7 09:25:33 2006
@@ -1,0 +1,1 @@
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047,8112,8124,8134,8394,8412,8414,8418,8429,8433,8445,8562,8573,8600,8619,8666,8808,9073
Propchange: team/murf/bug_6264-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/murf/bug_6264-trunk/
('svnmerge-blocked' removed)
Propchange: team/murf/bug_6264-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 7 09:25:33 2006
@@ -1,1 +1,1 @@
-/trunk:1-9038
+/trunk:1-9191
Modified: team/murf/bug_6264-trunk/.cleancount
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/.cleancount?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/.cleancount (original)
+++ team/murf/bug_6264-trunk/.cleancount Tue Feb 7 09:25:33 2006
@@ -1,1 +1,1 @@
-9
+10
Modified: team/murf/bug_6264-trunk/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/Makefile?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/Makefile (original)
+++ team/murf/bug_6264-trunk/Makefile Tue Feb 7 09:25:33 2006
@@ -3,7 +3,7 @@
#
# Top level Makefile
#
-# Copyright (C) 1999-2005, Mark Spencer
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -327,8 +327,6 @@
ifneq ($(wildcard .svn),)
ASTERISKVERSIONNUM=999999
ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
- else
- ASTERISKVERSIONNUM=000000
endif
endif
@@ -351,7 +349,7 @@
astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
- cryptostub.o
+ cryptostub.o sha1.o
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
OBJS+= poll.o
@@ -912,3 +910,37 @@
if cmp -s .cleancount .lastclean ; then echo ; else \
$(MAKE) clean; cp -f .cleancount .lastclean;\
fi
+
+_uninstall:
+ rm -f $(DESTDIR)$(MODULES_DIR)/*
+ rm -f $(DESTDIR)$(ASTSBINDIR)/*asterisk*
+ rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
+ rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
+ rm -rf $(DESTDIR)$(ASTHEADERDIR)
+ rm -rf $(DESTDIR)$(ASTVARLIBDIR)/sounds
+ rm -rf $(DESTDIR)$(ASTVARLIBDIR)/firmware
+ rm -rf $(DESTDIR)$(ASTMANDIR)/man8
+ for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
+
+uninstall: _uninstall
+ @echo " +--------- Asterisk Uninstall Complete -----+"
+ @echo " + Asterisk binaries, sounds, man pages, +"
+ @echo " + headers, modules, and firmware builds, +"
+ @echo " + have all been uninstalled. +"
+ @echo " + +"
+ @echo " + To remove ALL traces of Asterisk, +"
+ @echo " + including configuration, spool +"
+ @echo " + directories, and logs, run the following +"
+ @echo " + command: +"
+ @echo " + +"
+ @echo " + $(MAKE) uninstall-all +"
+ @echo " +-------------------------------------------+"
+
+
+uninstall-all: _uninstall
+ rm -rf $(DESTDIR)$(ASTLIBDIR)
+ rm -rf $(DESTDIR)$(ASTVARLIBDIR)
+ rm -rf $(DESTDIR)$(ASTSPOOLDIR)
+ rm -rf $(DESTDIR)$(ASTETCDIR)
+ rm -rf $(DESTDIR)$(ASTLOGDIR)
+
Modified: team/murf/bug_6264-trunk/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/agi/Makefile?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/agi/Makefile (original)
+++ team/murf/bug_6264-trunk/agi/Makefile Tue Feb 7 09:25:33 2006
@@ -30,6 +30,9 @@
mkdir -p $(DESTDIR)$(AGI_DIR)
for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
+uninstall:
+ for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
+
eagi-test: eagi-test.o
$(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS)
Modified: team/murf/bug_6264-trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/apps/Makefile?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/apps/Makefile (original)
+++ team/murf/bug_6264-trunk/apps/Makefile Tue Feb 7 09:25:33 2006
@@ -26,12 +26,6 @@
app_userevent.so app_url.so app_verbose.so app_voicemail.so \
app_waitforring.so app_waitforsilence.so app_while.so app_zapateller.so \
app_morsecode.so
-
-#
-# Obsolete things...
-#
-#APPS+=app_sql_postgres.so
-#APPS+=app_sql_odbc.so
#
# Experimental things
Modified: team/murf/bug_6264-trunk/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/apps/app_macro.c?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/apps/app_macro.c (original)
+++ team/murf/bug_6264-trunk/apps/app_macro.c Tue Feb 7 09:25:33 2006
@@ -107,7 +107,7 @@
char oldcontext[AST_MAX_CONTEXT] = "";
int offset, depth = 0;
int setmacrocontext=0;
- int autoloopflag;
+ int autoloopflag, dead = 0;
char *save_macro_exten;
char *save_macro_context;
@@ -208,8 +208,8 @@
break;
}
switch(res) {
- case MACRO_EXIT_RESULT:
- res = 0;
+ case MACRO_EXIT_RESULT:
+ res = 0;
goto out;
case AST_PBX_KEEPALIVE:
if (option_debug)
@@ -223,6 +223,7 @@
ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
else if (option_verbose > 1)
ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
+ dead = 1;
goto out;
}
}
@@ -242,37 +243,44 @@
out:
/* Reset the depth back to what it was when the routine was entered (like if we called Macro recursively) */
snprintf(depthc, sizeof(depthc), "%d", depth);
- pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc);
-
- ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
- for (x=1; x<argc; x++) {
+ if (!dead) {
+ pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc);
+
+ ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
+ }
+
+ for (x = 1; x < argc; x++) {
/* Restore old arguments and delete ours */
snprintf(varname, sizeof(varname), "ARG%d", x);
if (oldargs[x]) {
- pbx_builtin_setvar_helper(chan, varname, oldargs[x]);
+ if (!dead)
+ pbx_builtin_setvar_helper(chan, varname, oldargs[x]);
free(oldargs[x]);
- } else {
+ } else if (!dead) {
pbx_builtin_setvar_helper(chan, varname, NULL);
}
}
/* Restore macro variables */
- pbx_builtin_setvar_helper(chan, "MACRO_EXTEN", save_macro_exten);
+ if (!dead) {
+ pbx_builtin_setvar_helper(chan, "MACRO_EXTEN", save_macro_exten);
+ pbx_builtin_setvar_helper(chan, "MACRO_CONTEXT", save_macro_context);
+ pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", save_macro_priority);
+ }
if (save_macro_exten)
free(save_macro_exten);
- pbx_builtin_setvar_helper(chan, "MACRO_CONTEXT", save_macro_context);
if (save_macro_context)
free(save_macro_context);
- pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", save_macro_priority);
if (save_macro_priority)
free(save_macro_priority);
- if (setmacrocontext) {
+
+ if (!dead && setmacrocontext) {
chan->macrocontext[0] = '\0';
chan->macroexten[0] = '\0';
chan->macropriority = 0;
}
- if (!strcasecmp(chan->context, fullmacro)) {
+ if (!dead && !strcasecmp(chan->context, fullmacro)) {
/* If we're leaving the macro normally, restore original information */
chan->priority = oldpriority;
ast_copy_string(chan->context, oldcontext, sizeof(chan->context));
@@ -292,7 +300,8 @@
}
}
- pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", save_macro_offset);
+ if (!dead)
+ pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", save_macro_offset);
if (save_macro_offset)
free(save_macro_offset);
LOCAL_USER_REMOVE(u);
Modified: team/murf/bug_6264-trunk/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/cdr/Makefile?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/cdr/Makefile (original)
+++ team/murf/bug_6264-trunk/cdr/Makefile Tue Feb 7 09:25:33 2006
@@ -112,6 +112,8 @@
install: all
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+uninstall:
+
clean:
rm -f *.so *.o .depend
Modified: team/murf/bug_6264-trunk/channel.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/channel.c?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/channel.c (original)
+++ team/murf/bug_6264-trunk/channel.c Tue Feb 7 09:25:33 2006
@@ -72,6 +72,7 @@
#include "asterisk/app.h"
#include "asterisk/transcap.h"
#include "asterisk/devicestate.h"
+#include "asterisk/sha1.h"
struct channel_spy_trans {
int last_format;
Modified: team/murf/bug_6264-trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/channels/Makefile?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/channels/Makefile (original)
+++ team/murf/bug_6264-trunk/channels/Makefile Tue Feb 7 09:25:33 2006
@@ -69,7 +69,7 @@
CHANNEL_LIBS+=chan_h323.so
endif
-ifneq ($(wildcard misdn/chan_misdn_lib.a),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
CHANNEL_LIBS+=chan_misdn.so
CFLAGS+=-Imisdn
endif
@@ -224,11 +224,18 @@
$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
endif
+misdn/chan_misdn_lib.a:
+ make -C misdn
+
chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a
$(CC) -shared -Xlinker -x -L/usr/lib -o $@ $^ -lisdnnet -lmISDN
chan_misdn.o: chan_misdn.c
- $(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.2.1\" -c $< -o $@
+ $(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.3.0\" -c $< -o $@
+
+chan_misdn_config.o: chan_misdn_config.c misdn/chan_misdn_config.h
+ $(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.3.0\" -c $< -o $@
+
install: all
for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
Modified: team/murf/bug_6264-trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/channels/chan_local.c?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/channels/chan_local.c (original)
+++ team/murf/bug_6264-trunk/channels/chan_local.c Tue Feb 7 09:25:33 2006
@@ -394,7 +394,7 @@
isoutbound = IS_OUTBOUND(ast, p);
if (isoutbound) {
status = pbx_builtin_getvar_helper(p->chan, "DIALSTATUS");
- if(status)
+ if ((status) && (p->owner))
pbx_builtin_setvar_helper(p->owner, "CHANLOCALSTATUS", status);
p->chan = NULL;
p->launchedpbx = 0;
Modified: team/murf/bug_6264-trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_6264-trunk/channels/chan_misdn.c?rev=9192&r1=9191&r2=9192&view=diff
==============================================================================
--- team/murf/bug_6264-trunk/channels/chan_misdn.c (original)
+++ team/murf/bug_6264-trunk/channels/chan_misdn.c Tue Feb 7 09:25:33 2006
@@ -60,8 +60,8 @@
#include <asterisk/features.h>
#include <asterisk/stringfields.h>
-#include "chan_misdn_config.h"
-#include "isdn_lib.h"
+#include <chan_misdn_config.h>
+#include <isdn_lib.h>
ast_mutex_t release_lock_mutex;
@@ -102,6 +102,17 @@
/* BEGIN: chan_misdn.h */
+
+
+enum tone_e {
+ TONE_NONE=0,
+ TONE_DIAL,
+ TONE_ALERTING,
+ TONE_BUSY,
+ TONE_CUSTOM,
+ TONE_FILE
+};
+
enum misdn_chan_state {
MISDN_NOTHING, /*!< at beginning */
@@ -161,6 +172,8 @@
int addr;
char context[BUFFERSIZE];
+
+ const struct tone_zone_sound *ts;
struct chan_list *peer;
struct chan_list *next;
@@ -266,6 +279,7 @@
+static int tone_indicate( struct chan_list *cl, enum tone_e tone);
static int start_bc_tones(struct chan_list *cl);
static int stop_bc_tones(struct chan_list *cl);
@@ -300,25 +314,6 @@
return NULL;
}
-static char* tone2str(struct misdn_bchannel *bc)
-{
- static struct {
- char name[16];
- enum tone_e tone;
- } *tone, tone_buf[] = {
- {"NOTONE",TONE_NONE},
- {"DIAL",TONE_DIAL},
- {"BUSY",TONE_BUSY},
- {"ALERT",TONE_ALERTING},
- {"",TONE_NONE}
- };
-
-
- for (tone=&tone_buf[0]; tone->name[0]; tone++) {
- if (tone->tone == bc->tone) return tone->name;
- }
- return NULL;
-}
static char *bearer2str(int cap) {
static char *bearers[]={
@@ -529,12 +524,12 @@
if (argc == 3 || onlyport == 0) {
ast_cli(fd,"Misdn General-Config: \n");
- ast_cli(fd," -> VERSION: " CHAN_MISDN_VERSION "\n");
-
+ ast_cli(fd," -> Version: chan_misdn-" CHAN_MISDN_VERSION "\n");
for (elem = MISDN_GEN_FIRST + 1, linebreak = 1; elem < MISDN_GEN_LAST; elem++, linebreak++) {
misdn_cfg_get_config_string( 0, elem, buffer, BUFFERSIZE);
ast_cli(fd, "%-36s%s", buffer, !(linebreak % 2) ? "\n" : "");
}
+ ast_cli(fd, "\n");
}
if (onlyport < 0) {
@@ -610,6 +605,8 @@
free_robin_list();
misdn_cfg_reload();
+
+ misdn_cfg_update_ptp();
misdn_cfg_get( 0, MISDN_GEN_TRACEFILE, global_tracefile, BUFFERSIZE);
@@ -643,7 +640,6 @@
" --> ch_addr: %x\n"
" --> bc_addr: %x\n"
" --> bc_l3id: %x\n"
- " --> tone: %s\n"
" --> display: %s\n"
" --> activated: %d\n"
" --> capability: %s\n"
@@ -655,7 +651,6 @@
help->addr,
bc->addr,
bc?bc->l3_id:-1,
- tone2str(bc),
bc->display,
bc->active,
@@ -1059,14 +1054,13 @@
/*** CLI END ***/
-
-static int read_config(struct chan_list *ch, int orig) {
-
+static int update_config (struct chan_list *ch, int orig)
+{
if (!ch) {
ast_log(LOG_WARNING, "Cannot configure without chanlist\n");
return -1;
}
-
+
struct ast_channel *ast=ch->ast;
struct misdn_bchannel *bc=ch->bc;
if (! ast || ! bc ) {
@@ -1076,6 +1070,90 @@
int port=bc->port;
+ chan_misdn_log(1,port,"update_config: Getting Config\n");
+
+
+ int pres, screen;
+
+ misdn_cfg_get( port, MISDN_CFG_PRES, &pres, sizeof(int));
+ misdn_cfg_get( port, MISDN_CFG_SCREEN, &screen, sizeof(int));
+ chan_misdn_log(2,port," --> pres: %d screen: %d\n",pres, screen);
+
+ if ( (pres + screen) < 0 ) {
+
+ chan_misdn_log(2,port," --> pres: %x\n", ast->cid.cid_pres);
+
+ switch (ast->cid.cid_pres & 0x60){
+
+ case AST_PRES_RESTRICTED:
+ bc->pres=1;
+ chan_misdn_log(2, port, " --> PRES: Restricted (0x1)\n");
+ break;
+
+
+ case AST_PRES_UNAVAILABLE:
+ bc->pres=2;
+ chan_misdn_log(2, port, " --> PRES: Unavailable (0x2)\n");
+ break;
+
+ default:
+ bc->pres=0;
+ chan_misdn_log(2, port, " --> PRES: Allowed (0x0)\n");
+ }
+
+ switch (ast->cid.cid_pres & 0x3){
+
+ case AST_PRES_USER_NUMBER_UNSCREENED:
+ bc->screen=0;
+ chan_misdn_log(2, port, " --> SCREEN: Unscreened (0x0)\n");
+ break;
+
+ case AST_PRES_USER_NUMBER_PASSED_SCREEN:
+ bc->screen=1;
+ chan_misdn_log(2, port, " --> SCREEN: Passed Screen (0x1)\n");
+ break;
+ case AST_PRES_USER_NUMBER_FAILED_SCREEN:
+ bc->screen=2;
+ chan_misdn_log(2, port, " --> SCREEN: Failed Screen (0x2)\n");
+ break;
+
+ case AST_PRES_NETWORK_NUMBER:
+ bc->screen=3;
+ chan_misdn_log(2, port, " --> SCREEN: Network Nr. (0x3)\n");
+ break;
+
+ default:
+ bc->screen=0;
+ chan_misdn_log(2, port, " --> SCREEN: Unscreened (0x0)\n");
+ }
+
+
+ } else {
+ bc->screen=screen;
+ bc->pres=pres;
+ }
+
+ return 0;
+
+}
+
+
+static int read_config(struct chan_list *ch, int orig) {
+
+ if (!ch) {
+ ast_log(LOG_WARNING, "Cannot configure without chanlist\n");
+ return -1;
+ }
+
+ struct ast_channel *ast=ch->ast;
+ struct misdn_bchannel *bc=ch->bc;
+ if (! ast || ! bc ) {
+ ast_log(LOG_WARNING, "Cannot configure without ast || bc\n");
+ return -1;
+ }
+
+ int port=bc->port;
+
chan_misdn_log(1,port,"read_config: Getting Config\n");
char lang[BUFFERSIZE];
@@ -1094,6 +1172,8 @@
misdn_cfg_get( port, MISDN_CFG_RXGAIN, &bc->rxgain, sizeof(int));
misdn_cfg_get( port, MISDN_CFG_SENDDTMF, &bc->send_dtmf, sizeof(int));
+
+ misdn_cfg_get( port, MISDN_CFG_NEED_MORE_INFOS, &bc->need_more_infos, sizeof(int));
/*Initialize new Jitterbuffer*/
@@ -1128,6 +1208,7 @@
}
misdn_cfg_get( bc->port, MISDN_CFG_CONTEXT, ch->context, sizeof(ch->context));
+
strncpy(ast->context,ch->context,sizeof(ast->context)-1);
{
@@ -1233,67 +1314,7 @@
}
- /* Will be overridden by asterisk in head! */
- {
- int pres;
-
- misdn_cfg_get( port, MISDN_CFG_PRES, &pres, sizeof(int));
- bc->pres=pres?0:1;
-
- }
-
- int def_callingpres;
- misdn_cfg_get( port, MISDN_CFG_USE_CALLINGPRES, &def_callingpres, sizeof(int));
- if ( def_callingpres) {
-
- switch (ast->cid.cid_pres & 0x60){
- case AST_PRES_RESTRICTED:
- bc->pres=1;
- chan_misdn_log(2, port, " --> PRES: Restricted (0x1)\n");
- break;
-
-
- case AST_PRES_UNAVAILABLE:
- bc->pres=2;
- chan_misdn_log(2, port, " --> PRES: Unavailable (0x2)\n");
- break;
-
- default:
- bc->pres=0;
- chan_misdn_log(2, port, " --> PRES: Allowed (0x0)\n");
- }
-
- switch (ast->cid.cid_pres & 0x3){
-
- case AST_PRES_USER_NUMBER_UNSCREENED:
- bc->screen=0;
- chan_misdn_log(2, port, " --> SCREEN: Unscreened (0x0)\n");
- break;
-
- case AST_PRES_USER_NUMBER_PASSED_SCREEN:
- bc->screen=1;
- chan_misdn_log(2, port, " --> SCREEN: Passed Screen (0x1)\n");
- break;
- case AST_PRES_USER_NUMBER_FAILED_SCREEN:
- bc->screen=2;
- chan_misdn_log(2, port, " --> SCREEN: Failed Screen (0x2)\n");
- break;
-
- case AST_PRES_NETWORK_NUMBER:
- bc->screen=3;
- chan_misdn_log(2, port, " --> SCREEN: Network Nr. (0x3)\n");
- break;
-
- default:
- bc->screen=0;
- chan_misdn_log(2, port, " --> SCREEN: Unscreened (0x0)\n");
- }
-
-
- }
-
-
} else { /** ORIGINATOR MISDN **/
@@ -1366,8 +1387,18 @@
strcpy(bc->dad,tmp);
}
-
-
+ if ( strcmp(bc->dad,ast->exten)) {
+ ast_copy_string(ast->exten, bc->dad, sizeof(ast->exten));
+ }
+ if ( ast->cid.cid_num && strcmp(ast->cid.cid_num, bc->oad)) {
+ free(ast->cid.cid_num);
+ ast->cid.cid_num=NULL;
+
+ }
+ if ( !ast->cid.cid_num) {
+ ast->cid.cid_num=strdup(bc->oad);
+ }
+
pbx_builtin_setvar_helper(ch->ast,"REDIRECTING_NUMBER",bc->rad);
}
@@ -1387,6 +1418,13 @@
struct misdn_bchannel *newbc;
char *opts=NULL, *ext,*tokb;
char dest_cp[256];
+ struct ast_channel *bridged;
+
+ if ( (bridged=ast_bridged_channel(ast)) ) {
+ chan_misdn_log(0,0,"Our Bridged Partner is %s\n",bridged->tech->type);
+ } else {
+ chan_misdn_log(0,0,"No Bridged Partner\n");
+ }
{
strncpy(dest_cp,dest,sizeof(dest_cp)-1);
@@ -1475,7 +1513,10 @@
chan_misdn_log(2, port, " --> * Call with flag Digital\n");
}
-
+
+ /* update screening and presentation */
+ update_config(ch,ORG_AST);
+
/* Finally The Options Override Everything */
if (opts)
misdn_set_opt_exec(ast,opts);
@@ -1483,9 +1524,7 @@
chan_misdn_log(1,0,"NO OPTS GIVEN\n");
-
ch->state=MISDN_CALLING;
-
r=misdn_lib_send_event( newbc, EVENT_SETUP );
@@ -1504,7 +1543,6 @@
chan_misdn_log(1, port, " --> * SEND: State Dialing pid:%d\n",newbc?newbc->pid:1);
ast_setstate(ast, AST_STATE_DIALING);
-
ast->hangupcause=16;
return 0;
}
@@ -1515,9 +1553,7 @@
struct chan_list *p;
- if (!ast || ! MISDN_ASTERISK_PVT(ast)) return -1;
- p = MISDN_ASTERISK_TECH_PVT(ast) ;
-
+ if (!ast || ! (p=MISDN_ASTERISK_TECH_PVT(ast)) ) return -1;
chan_misdn_log(1, p? (p->bc? p->bc->port : 0) : 0, "* ANSWER:\n");
@@ -1549,10 +1585,12 @@
}
{
- const char *async=pbx_builtin_getvar_helper(ast, "MISDN_DIGITAL_TRANS");
- if (async) {
+ const char *nodsp=pbx_builtin_getvar_helper(ast, "MISDN_DIGITAL_TRANS");
+ if (nodsp) {
chan_misdn_log(1, p->bc->port, " --> Connection is transparent digital\n");
- p->bc->async=1;
+ p->bc->nodsp=1;
+ p->bc->hdlc=0;
+ p->bc->nojitter=1;
}
}
@@ -1567,9 +1605,7 @@
{
struct chan_list *p;
- if (!ast || ! MISDN_ASTERISK_PVT(ast)) return -1;
- p = MISDN_ASTERISK_TECH_PVT(ast) ;
-
+ if (!ast || ! (p=MISDN_ASTERISK_TECH_PVT(ast))) return -1;
struct misdn_bchannel *bc=p->bc;
chan_misdn_log(1, bc?bc->port:0, "* IND : Digit %c\n",digit);
@@ -1627,8 +1663,7 @@
{
struct chan_list *p;
- if (!ast || ! MISDN_ASTERISK_PVT(ast)) return -1;
- p = MISDN_ASTERISK_TECH_PVT(ast) ;
+ if (!ast || ! (p=MISDN_ASTERISK_TECH_PVT(ast) )) return -1;
chan_misdn_log(1, p->bc?p->bc->port:0, "* IND: Got Fixup State:%s Holded:%d L3id:%x\n", misdn_get_ch_state(p), p->holded, p->l3id);
@@ -1645,11 +1680,10 @@
struct chan_list *p;
- if (!ast || ! MISDN_ASTERISK_PVT(ast)) {
+ if (!ast || ! (p=MISDN_ASTERISK_TECH_PVT(ast))) {
ast_log(LOG_WARNING, "Returnded -1 in misdn_indication\n");
return -1;
}
- p = MISDN_ASTERISK_TECH_PVT(ast) ;
if (!p->bc ) {
chan_misdn_log(1, 0, "* IND : Indication from %s\n",ast->exten);
@@ -1657,7 +1691,7 @@
return -1;
}
- chan_misdn_log(1, p->bc->port, "* IND : Indication from %s\n",ast->exten);
+ chan_misdn_log(1, p->bc->port, "* IND : Indication [%d] from %s\n",cond, ast->exten);
switch (cond) {
case AST_CONTROL_BUSY:
@@ -1668,7 +1702,7 @@
p->bc->out_cause=17;
if (p->state != MISDN_CONNECTED) {
misdn_lib_send_event( p->bc, EVENT_DISCONNECT);
- manager_send_tone(p->bc, TONE_BUSY);
+ tone_indicate(p, TONE_BUSY);
} else {
chan_misdn_log(-1, p->bc->port, " --> !! Got Busy in Connected State !?! ast:%s\n", ast->name);
@@ -1678,23 +1712,26 @@
chan_misdn_log(1, p->bc->port, " --> * IND :\tring pid:%d\n",p->bc?p->bc->pid:-1);
break;
case AST_CONTROL_RINGING:
- if ( p->state == MISDN_ALERTING) {
- chan_misdn_log(1, p->bc->port, " --> * IND :\tringing pid:%d but I ws Ringing before, so ignoreing it\n",p->bc?p->bc->pid:-1);
- break;
- }
- p->state=MISDN_ALERTING;
-
- chan_misdn_log(1, p->bc->port, " --> * IND :\tringing pid:%d\n",p->bc?p->bc->pid:-1);
-
- misdn_lib_send_event( p->bc, EVENT_ALERTING);
-
- manager_send_tone(p->bc, TONE_ALERTING);
- chan_misdn_log(1, p->bc->port, " --> * SEND: State Ring pid:%d\n",p->bc?p->bc->pid:-1);
- ast_setstate(ast,AST_STATE_RINGING);
- break;
-
+ switch (p->state) {
+ case MISDN_ALERTING:
+ chan_misdn_log(1, p->bc->port, " --> * IND :\tringing pid:%d but I was Ringing before, so ignoreing it\n",p->bc?p->bc->pid:-1);
+ break;
+ case MISDN_CONNECTED:
+ chan_misdn_log(1, p->bc->port, " --> * IND :\tringing pid:%d but Connected, so just send TONE_ALERTING without state changes \n",p->bc?p->bc->pid:-1);
+ tone_indicate(p, TONE_ALERTING);
+ break;
+ default:
+ p->state=MISDN_ALERTING;
+ chan_misdn_log(1, p->bc->port, " --> * IND :\tringing pid:%d\n",p->bc?p->bc->pid:-1);
+ misdn_lib_send_event( p->bc, EVENT_ALERTING);
+ tone_indicate(p, TONE_ALERTING);
+ chan_misdn_log(1, p->bc->port, " --> * SEND: State Ring pid:%d\n",p->bc?p->bc->pid:-1);
+ ast_setstate(ast,AST_STATE_RINGING);
+ }
+ break;
case AST_CONTROL_ANSWER:
chan_misdn_log(1, p->bc->port, " --> * IND :\tanswer pid:%d\n",p->bc?p->bc->pid:-1);
+ start_bc_tones(p);
break;
case AST_CONTROL_TAKEOFFHOOK:
chan_misdn_log(1, p->bc->port, " --> *\ttakeoffhook pid:%d\n",p->bc?p->bc->pid:-1);
@@ -1707,9 +1744,13 @@
break;
case AST_CONTROL_PROGRESS:
chan_misdn_log(1, p->bc->port, " --> * IND :\tprogress pid:%d\n",p->bc?p->bc->pid:-1);
+ misdn_lib_send_event( p->bc, EVENT_PROGRESS);
+ break;
+ case AST_CONTROL_PROCEEDING:
+ chan_misdn_log(1, p->bc->port, " --> * IND :\tproceeding pid:%d\n",p->bc?p->bc->pid:-1);
+ misdn_lib_send_event( p->bc, EVENT_PROCEEDING);
break;
case AST_CONTROL_CONGESTION:
-
chan_misdn_log(1, p->bc->port, " --> * IND :\tcongestion pid:%d\n",p->bc?p->bc->pid:-1);
p->bc->out_cause=42;
@@ -1721,11 +1762,12 @@
}
if (p->bc->nt) {
- manager_send_tone(p->bc, TONE_BUSY);
+ tone_indicate(p, TONE_BUSY);
}
break;
case -1 :
- chan_misdn_log(1, p->bc->port, " --> * IND :\t-1! pid:%d\n",p->bc?p->bc->pid:-1);
+ chan_misdn_log(1, p->bc->port, " --> * IND :\t-1! (stop indication) pid:%d\n",p->bc?p->bc->pid:-1);
+ tone_indicate(p, TONE_NONE);
break;
case AST_CONTROL_HOLD:
@@ -1815,7 +1857,7 @@
case MISDN_HOLDED:
case MISDN_DIALING:
start_bc_tones(p);
- manager_send_tone(bc, TONE_BUSY);
+ tone_indicate(p, TONE_BUSY);
p->state=MISDN_CLEANING;
misdn_lib_send_event( bc, EVENT_RELEASE_COMPLETE);
@@ -1826,7 +1868,7 @@
chan_misdn_log(2, bc->port, " --> * State Alerting\n");
if (p->orginator != ORG_AST)
- manager_send_tone(bc, TONE_BUSY);
+ tone_indicate(p, TONE_BUSY);
p->state=MISDN_CLEANING;
misdn_lib_send_event( bc, EVENT_DISCONNECT);
@@ -1835,7 +1877,7 @@
/* Alerting or Disconect */
chan_misdn_log(2, bc->port, " --> * State Connected\n");
start_bc_tones(p);
- manager_send_tone(bc, TONE_BUSY);
+ tone_indicate(p, TONE_BUSY);
misdn_lib_send_event( bc, EVENT_DISCONNECT);
p->state=MISDN_CLEANING; /* MISDN_HUNGUP_FROM_AST; */
@@ -1918,8 +1960,8 @@
return -1;
}
- if (ch->bc->tone != TONE_NONE)
- manager_send_tone(ch->bc,TONE_NONE);
+ /*if (ch->bc->tone != TONE_NONE)
+ tone_indicate(ch,TONE_NONE); */
if (ch->holded ) {
@@ -1931,10 +1973,17 @@
chan_misdn_log(5, ch->bc->port, "misdn_write: Returning because notxone\n");
return 0;
}
+
+
+ if ( !frame->subclass) {
+ chan_misdn_log(0, ch->bc->port, "misdn_write: * prods us\n");
+ return 0;
+ }
if ( !(frame->subclass & prefformat)) {
-
+
chan_misdn_log(-1, ch->bc->port, "Got Unsupported Frame with Format:%d\n", frame->subclass);
+ return -1;
}
@@ -1949,6 +1998,13 @@
}
#endif
+
+ if (!ch->bc->active) {
+ chan_misdn_log(5, ch->bc->port, "BC not active droping: %d frames\n",frame->samples);
+ return 0;
+ }
+
+ chan_misdn_log(9, ch->bc->port, "Sending :%d bytes 2 MISDN\n",frame->samples);
/*if speech flip bits*/
if ( misdn_cap_is_speech(ch->bc->capability) )
flip_buf_bits(frame->data,frame->samples);
@@ -2063,10 +2119,56 @@
/** AST INDICATIONS END **/
+static int tone_indicate( struct chan_list *cl, enum tone_e tone)
+{
+ const struct tone_zone_sound *ts= NULL;
+ struct ast_channel *ast=cl->ast;
+
+ chan_misdn_log(0,cl->bc->port,"Tone Indicate:\n");
+
+ if (!cl->ast) {
+ return 0;
+ }
+
+ switch (tone) {
+ case TONE_DIAL:
+ chan_misdn_log(0,cl->bc->port," --> Dial\n");
+ ts=ast_get_indication_tone(ast->zone,"dial");
+ misdn_lib_tone_generator_start(cl->bc);
+ break;
+ case TONE_ALERTING:
+ chan_misdn_log(0,cl->bc->port," --> Ring\n");
+ ts=ast_get_indication_tone(ast->zone,"ring");
+ misdn_lib_tone_generator_stop(cl->bc);
+ break;
+ case TONE_BUSY:
+ chan_misdn_log(0,cl->bc->port," --> Busy\n");
+ ts=ast_get_indication_tone(ast->zone,"busy");
+ misdn_lib_tone_generator_stop(cl->bc);
+ break;
+ case TONE_FILE:
+ break;
+
+ case TONE_NONE:
+ chan_misdn_log(0,cl->bc->port," --> None\n");
+ misdn_lib_tone_generator_stop(cl->bc);
+ ast_playtones_stop(ast);
+ break;
+ default:
+ chan_misdn_log(0,cl->bc->port,"Don't know how to handle tone: %d\n",tone);
+ }
+
+ cl->ts=ts;
+
+ if (ts) ast_playtones_start(ast,0, ts->data, 0);
+
+ return 0;
+}
+
static int start_bc_tones(struct chan_list* cl)
{
manager_bchannel_activate(cl->bc);
- manager_send_tone(cl->bc ,TONE_NONE);
+ misdn_lib_tone_generator_stop(cl->bc);
cl->notxtone=0;
cl->norxtone=0;
return 0;
@@ -2188,17 +2290,16 @@
misdn_cfg_get(port, MISDN_CFG_GROUPNAME, cfg_group, BUFFERSIZE);
if (!strcasecmp(cfg_group, group)) {
- int l1, port_up;
+ int port_up;
- misdn_cfg_get( 0, MISDN_GEN_L1_INFO_OK, &l1, sizeof(l1));
port_up = misdn_lib_port_up(port);
- if ((l1 && port_up) || !l1) {
+ if ( port_up ) {
newbc = misdn_lib_get_free_bc(port, robin_channel);
if (newbc) {
chan_misdn_log(4, port, " Success! Found port:%d channel:%d\n", newbc->port, newbc->channel);
if (port_up)
- chan_misdn_log(4, port, "def_l1:%d, portup:%d\n", l1, port_up);
+ chan_misdn_log(4, port, "ortup:%d\n", port_up);
rr->port = newbc->port;
rr->channel = newbc->channel;
break;
@@ -2219,14 +2320,13 @@
misdn_cfg_get( port, MISDN_CFG_GROUPNAME, cfg_group, BUFFERSIZE);
if (!strcasecmp(cfg_group, group)) {
- int l1, port_up;
+ int port_up;
- misdn_cfg_get( 0, MISDN_GEN_L1_INFO_OK, &l1, sizeof(l1));
port_up = misdn_lib_port_up(port);
- chan_misdn_log(4, port, "def_l1:%d, portup:%d\n", l1, port_up);
+ chan_misdn_log(4, port, "portup:%d\n", port_up);
- if ((l1 && port_up) || !l1) {
+ if ( port_up ) {
newbc = misdn_lib_get_free_bc(port, 0);
if (newbc)
break;
@@ -2263,6 +2363,21 @@
return tmp;
}
+
+int misdn_send_text (struct ast_channel *chan, const char *text)
+{
+ struct chan_list *tmp=chan->tech_pvt;
+
+ if (tmp && tmp->bc) {
+ ast_copy_string(tmp->bc->display,text,sizeof(tmp->bc->display));
+ misdn_lib_send_event(tmp->bc, EVENT_INFORMATION);
+ } else {
+ ast_log(LOG_WARNING, "No chan_list but send_text request?\n");
+ return -1;
+ }
+
+ return 0;
+}
static struct ast_channel_tech misdn_tech = {
.type="mISDN",
@@ -2278,6 +2393,7 @@
.write=misdn_write,
.indicate=misdn_indication,
.fixup=misdn_fixup,
+ .send_text=misdn_send_text,
.properties=0
};
@@ -2294,6 +2410,7 @@
.write=misdn_write,
.indicate=misdn_indication,
.fixup=misdn_fixup,
+ .send_text=misdn_send_text,
.properties=0
};
@@ -2379,15 +2496,16 @@
static int misdn_tx2ast_frm(struct chan_list * tmp, char * buf, int len )
{
struct ast_frame frame;
-
+
[... 5010 lines stripped ...]
More information about the asterisk-commits
mailing list