[svn-commits] russell: branch group/bindings r242811 - in /team/group/bindings: ./ addons/ ...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jan 25 10:13:09 CST 2010
Author: russell
Date: Mon Jan 25 10:13:04 2010
New Revision: 242811
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242811
Log:
Resolve conflict in super old branch
Modified:
team/group/bindings/ (props changed)
team/group/bindings/addons/chan_ooh323.c
team/group/bindings/addons/ooh323c/src/ooCmdChannel.c
team/group/bindings/addons/ooh323c/src/ooStackCmds.c
team/group/bindings/addons/ooh323c/src/ooStackCmds.h
team/group/bindings/addons/ooh323c/src/oochannels.c
team/group/bindings/addons/ooh323c/src/ooh323.c
team/group/bindings/configure
team/group/bindings/configure.ac
team/group/bindings/include/asterisk/autoconfig.h.in
team/group/bindings/main/Makefile
team/group/bindings/makeopts.in
team/group/bindings/pbx/Makefile
team/group/bindings/res/Makefile
team/group/bindings/res/res_phoneprov.c
Propchange: team/group/bindings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/bindings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 25 10:13:04 2010
@@ -1,1 +1,1 @@
-/trunk:1-242440
+/trunk:1-242810
Modified: team/group/bindings/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/addons/chan_ooh323.c?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/addons/chan_ooh323.c (original)
+++ team/group/bindings/addons/chan_ooh323.c Mon Jan 25 10:13:04 2010
@@ -902,6 +902,10 @@
if(p->callerid_name)
free(p->callerid_name);
p->callerid_name = strdup(ast->connected.id.name);
+ } else if (ast->connected.id.number) {
+ if(p->callerid_name)
+ free(p->callerid_name);
+ p->callerid_name = strdup(ast->connected.id.number);
} else {
ast->connected.id.name = strdup(gCallerID);
if(p->callerid_name)
@@ -1204,6 +1208,13 @@
break;
case AST_CONTROL_SRCUPDATE:
ast_rtp_instance_new_source(p->rtp);
+ break;
+
+ case AST_CONTROL_CONNECTED_LINE:
+ if (gH323Debug)
+ ast_log(LOG_DEBUG, "Sending connected line info for %s (%s)\n",
+ callToken, ast->connected.id.name);
+ ooSetANI(callToken, ast->connected.id.name);
break;
case AST_CONTROL_T38_PARAMETERS:
Modified: team/group/bindings/addons/ooh323c/src/ooCmdChannel.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/addons/ooh323c/src/ooCmdChannel.c?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/addons/ooh323c/src/ooCmdChannel.c (original)
+++ team/group/bindings/addons/ooh323c/src/ooCmdChannel.c Mon Jan 25 10:13:04 2010
@@ -402,6 +402,15 @@
ooSendRequestMode(call, *(int *)cmd.param2);
break;
+ case OO_CMD_SETANI:
+ OOTRACEINFO3("Processing SetANI command %s, ani is %s\n",
+ (char *)cmd.param1, (char *)cmd.param2);
+ if(cmd.param2) {
+ strncpy(call->ourCallerId, cmd.param2, sizeof(call->ourCallerId)-1);
+ call->ourCallerId[sizeof(call->ourCallerId)-1] = '\0';
+ }
+ break;
+
default: OOTRACEERR1("ERROR:Unknown command\n");
}
}
Modified: team/group/bindings/addons/ooh323c/src/ooStackCmds.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/addons/ooh323c/src/ooStackCmds.c?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/addons/ooh323c/src/ooStackCmds.c (original)
+++ team/group/bindings/addons/ooh323c/src/ooStackCmds.c Mon Jan 25 10:13:04 2010
@@ -494,6 +494,54 @@
return OO_STKCMD_SUCCESS;
}
+OOStkCmdStat ooSetANI(const char *callToken, const char* ani)
+{
+ OOStackCommand cmd;
+ OOH323CallData *call;
+
+ if(!callToken)
+ {
+ return OO_STKCMD_INVALIDPARAM;
+ }
+
+ if(!(call = ooFindCallByToken(callToken))) {
+ return OO_STKCMD_INVALIDPARAM;
+ }
+
+ if(call->CmdChan == 0)
+ {
+ if(ooCreateCallCmdConnection(call) != OO_OK)
+ return OO_STKCMD_CONNECTIONERR;
+ }
+
+ memset(&cmd, 0, sizeof(OOStackCommand));
+ cmd.type = OO_CMD_SETANI;
+
+ cmd.param1 = (void*) malloc(strlen(callToken)+1);
+ cmd.param2 = (void*) malloc(strlen(ani)+1);
+ if(!cmd.param1 || !cmd.param2)
+ {
+ if(cmd.param1) free(cmd.param1); /* Release memory */
+ if(cmd.param2) free(cmd.param2);
+ return OO_STKCMD_MEMERR;
+ }
+ strcpy((char*)cmd.param1, callToken);
+ cmd.plen1 = strlen(callToken);
+ strcpy((char*)cmd.param2, ani);
+ cmd.plen2 = strlen(ani);
+
+ if(ooWriteCallStackCommand(call,&cmd) != OO_OK)
+ {
+ free(cmd.param1);
+ free(cmd.param2);
+ return OO_STKCMD_WRITEERR;
+ }
+ free(cmd.param1);
+ free(cmd.param2);
+
+ return OO_STKCMD_SUCCESS;
+}
+
OOStkCmdStat ooRequestChangeMode(const char *callToken, int isT38Mode)
{
OOStackCommand cmd;
Modified: team/group/bindings/addons/ooh323c/src/ooStackCmds.h
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/addons/ooh323c/src/ooStackCmds.h?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/addons/ooh323c/src/ooStackCmds.h (original)
+++ team/group/bindings/addons/ooh323c/src/ooStackCmds.h Mon Jan 25 10:13:04 2010
@@ -67,7 +67,8 @@
OO_CMD_MANUALRINGBACK, /*!< Send Alerting - ringback */
OO_CMD_MANUALPROGRESS, /*!< Send progress */
OO_CMD_STOPMONITOR, /*!< Stop the event monitor */
- OO_CMD_REQMODE /*!< Request new mode */
+ OO_CMD_REQMODE, /*!< Request new mode */
+ OO_CMD_SETANI /*! <Set conncted info */
} OOStackCmdID;
@@ -176,6 +177,8 @@
int ooGenerateOutgoingCallToken (char *callToken, size_t size);
+EXTERN OOStkCmdStat ooSetANI(const char *callToken, const char* ani);
+
#ifdef __cplusplus
}
#endif
Modified: team/group/bindings/addons/ooh323c/src/oochannels.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/addons/ooh323c/src/oochannels.c?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/addons/ooh323c/src/oochannels.c (original)
+++ team/group/bindings/addons/ooh323c/src/oochannels.c Mon Jan 25 10:13:04 2010
@@ -1124,7 +1124,7 @@
finishPrint();
removeEventHandler(pctxt);
if(ret == OO_OK) {
- ooHandleH2250Message(call, pmsg);
+ ret = ooHandleH2250Message(call, pmsg);
}
return ret;
}
Modified: team/group/bindings/addons/ooh323c/src/ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/addons/ooh323c/src/ooh323.c?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/addons/ooh323c/src/ooh323.c (original)
+++ team/group/bindings/addons/ooh323c/src/ooh323.c Mon Jan 25 10:13:04 2010
@@ -1533,6 +1533,17 @@
OOTimer *pTimer=NULL;
int type = q931Msg->messageType;
struct timespec ts;
+
+/* checking of message validity for first/next messages of calls */
+
+ if (!strcmp(call->callType, "incoming")) {
+ if ((call->callState != OO_CALL_CREATED && type == Q931SetupMsg) ||
+ (call->callState == OO_CALL_CREATED && type != Q931SetupMsg)) {
+ ooFreeQ931Message(call->msgctxt, q931Msg);
+ return OO_FAILED;
+ }
+ }
+
switch(type)
{
case Q931SetupMsg: /* SETUP message is received */
Modified: team/group/bindings/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/configure.ac?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/configure.ac (original)
+++ team/group/bindings/configure.ac Mon Jan 25 10:13:04 2010
@@ -188,6 +188,8 @@
AC_PATH_PROG([DIRNAME], [dirname], :)
AC_PATH_PROG([DOT], [dot], :)
AC_PATH_PROG([FIND], [find], :)
+AC_PATH_PROG([BISON], [bison], :)
+AC_PATH_PROG([FLEX], [flex], :)
AC_PATH_PROG([GREP], [grep], :)
AC_PATH_PROG([ID], [id], :)
AC_PATH_PROG([KPATHSEA], [kpsewhich], :)
Modified: team/group/bindings/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/include/asterisk/autoconfig.h.in?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/include/asterisk/autoconfig.h.in (original)
+++ team/group/bindings/include/asterisk/autoconfig.h.in Mon Jan 25 10:13:04 2010
@@ -953,7 +953,7 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_blksize'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1284,11 +1284,11 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -1308,11 +1308,6 @@
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
- second argument and the buffer pointer as the third, as on System V before
- release 3. */
-#undef SETVBUF_REVERSED
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
@@ -1334,20 +1329,30 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* Define to 1 if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
+/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE
@@ -1364,20 +1369,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Modified: team/group/bindings/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/main/Makefile?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/main/Makefile (original)
+++ team/group/bindings/main/Makefile Mon Jan 25 10:13:04 2010
@@ -11,7 +11,7 @@
# the GNU General Public License
#
--include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps $(ASTTOPDIR)/makeopts.embed_rules
+-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps $(ASTTOPDIR)/makeopts.embed_rules $(ASTTOPDIR)/makeopts
all: asterisk
@@ -101,16 +101,26 @@
db1-ast/libdb1.a: CHECK_SUBDIR
_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
+ifneq ($(BISON),:)
+ast_expr2.c ast_expr2.h: ast_expr2.y
+else
ast_expr2.c ast_expr2.h:
- bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
+endif
+ $(ECHO_PREFIX) echo " [BISON] $< -> $@"
+ $(CMD_PREFIX) $(BISON) -o $@ -d --name-prefix=ast_yy ast_expr2.y
+ifneq ($(FLEX),:)
+ast_expr2f.c: ast_expr2.fl
+else
ast_expr2f.c:
- flex -o $@ ast_expr2.fl
- sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix
- echo "#include \"asterisk.h\"" > $@
- echo >> $@
- cat $@.fix >> $@
- rm $@.fix
+endif
+ $(ECHO_PREFIX) echo " [FLEX] $< -> $@"
+ $(CMD_PREFIX) $(FLEX) -o $@ ast_expr2.fl
+ $(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix
+ $(CMD_PREFIX) echo "#include \"asterisk.h\"" > $@
+ $(CMD_PREFIX) echo >> $@
+ $(CMD_PREFIX) cat $@.fix >> $@
+ $(CMD_PREFIX) rm $@.fix
ast_expr2f.o: _ASTCFLAGS+=-Wno-unused
Modified: team/group/bindings/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/makeopts.in?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/makeopts.in (original)
+++ team/group/bindings/makeopts.in Mon Jan 25 10:13:04 2010
@@ -8,6 +8,8 @@
INSTALL=@INSTALL@
AWK=@AWK@
+BISON=@BISON@
+FLEX=@FLEX@
GREP=@GREP@
AR=@AR@
RANLIB=@RANLIB@
Modified: team/group/bindings/pbx/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/pbx/Makefile?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/pbx/Makefile (original)
+++ team/group/bindings/pbx/Makefile Mon Jan 25 10:13:04 2010
@@ -9,7 +9,7 @@
# the GNU General Public License
#
--include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
+-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps $(ASTTOPDIR)/makeopts
MODULE_PREFIX=pbx
MENUSELECT_CATEGORY=PBX
Modified: team/group/bindings/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/res/Makefile?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/res/Makefile (original)
+++ team/group/bindings/res/Makefile Mon Jan 25 10:13:04 2010
@@ -45,14 +45,22 @@
$(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o
+ifneq ($(FLEX),:)
ael/ael_lex.c: ael/ael.flex
+else
+ael/ael_lex.c:
+endif
$(ECHO_PREFIX) echo " [FLEX] $< -> $@"
- (cd ael; flex ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c)
- (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c)
+ $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c)
+ $(CMD_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c)
+ifneq ($(BISON),:)
ael/ael.tab.c ael/ael.tab.h: ael/ael.y
+else
+ael/ael.tab.c ael/ael.tab.h:
+endif
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
- (cd ael; bison -v -d ael.y)
+ $(CMD_PREFIX) (cd ael; $(BISON) -v -d ael.y)
ael/pval.o: ael/pval.c
Modified: team/group/bindings/res/res_phoneprov.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bindings/res/res_phoneprov.c?view=diff&rev=242811&r1=242810&r2=242811
==============================================================================
--- team/group/bindings/res/res_phoneprov.c (original)
+++ team/group/bindings/res/res_phoneprov.c Mon Jan 25 10:13:04 2010
@@ -514,6 +514,7 @@
ast_free(file);
}
+ http_header = ast_str_create(80);
ast_str_set(&http_header, 0, "Content-type: %s\r\n",
route->file->mime_type);
@@ -522,6 +523,7 @@
if (tmp) {
ast_free(tmp);
}
+ ast_free(http_header);
goto out500;
}
ast_str_append(&result, 0, "%s", ast_str_buffer(tmp));
More information about the svn-commits
mailing list