[svn-commits] oej: branch oej/pinedanish-copybridgeflags-1.8 r378213 - in /team/oej/pinedan...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sat Dec 29 03:15:11 CST 2012
Author: oej
Date: Sat Dec 29 03:14:50 2012
New Revision: 378213
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378213
Log:
Resetting branch after merge disaster
Added:
team/oej/pinedanish-copybridgeflags-1.8/build_tools/find_missing_support_level
- copied unchanged from r371306, branches/1.8/build_tools/find_missing_support_level
team/oej/pinedanish-copybridgeflags-1.8/tests/test_config.c
- copied unchanged from r371306, branches/1.8/tests/test_config.c
Modified:
team/oej/pinedanish-copybridgeflags-1.8/ (props changed)
team/oej/pinedanish-copybridgeflags-1.8/addons/app_mysql.c
team/oej/pinedanish-copybridgeflags-1.8/addons/chan_mobile.c
team/oej/pinedanish-copybridgeflags-1.8/addons/format_mp3.c
team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGES.h
team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGESEnc.c
team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooCalls.c
team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooGkClient.c
team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323.c
team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323ep.c
team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooq931.c
team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323cDriver.c
team/oej/pinedanish-copybridgeflags-1.8/addons/res_config_mysql.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_confbridge.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_dictate.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_directory.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_disa.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_festival.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_getcpeid.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_macro.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_meetme.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_mixmonitor.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_osplookup.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_page.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_record.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_sms.c
team/oej/pinedanish-copybridgeflags-1.8/apps/app_while.c
team/oej/pinedanish-copybridgeflags-1.8/build_tools/make_version
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_agent.c
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_alsa.c
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_dahdi.c
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_gtalk.c
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_iax2.c
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_jingle.c
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_local.c
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_misdn.c
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_oss.c
team/oej/pinedanish-copybridgeflags-1.8/channels/chan_skinny.c
team/oej/pinedanish-copybridgeflags-1.8/channels/console_board.c
team/oej/pinedanish-copybridgeflags-1.8/channels/console_gui.c
team/oej/pinedanish-copybridgeflags-1.8/channels/console_video.c
team/oej/pinedanish-copybridgeflags-1.8/channels/iax2-parser.c
team/oej/pinedanish-copybridgeflags-1.8/channels/iax2-provision.c
team/oej/pinedanish-copybridgeflags-1.8/channels/misdn/ie.c
team/oej/pinedanish-copybridgeflags-1.8/channels/misdn/isdn_lib.c
team/oej/pinedanish-copybridgeflags-1.8/channels/misdn/isdn_msg_parser.c
team/oej/pinedanish-copybridgeflags-1.8/channels/misdn/portinfo.c
team/oej/pinedanish-copybridgeflags-1.8/channels/misdn_config.c
team/oej/pinedanish-copybridgeflags-1.8/channels/sig_analog.c
team/oej/pinedanish-copybridgeflags-1.8/channels/sig_analog.h
team/oej/pinedanish-copybridgeflags-1.8/channels/sig_pri.c
team/oej/pinedanish-copybridgeflags-1.8/channels/sip/config_parser.c
team/oej/pinedanish-copybridgeflags-1.8/channels/sip/dialplan_functions.c
team/oej/pinedanish-copybridgeflags-1.8/channels/sip/include/sip.h
team/oej/pinedanish-copybridgeflags-1.8/channels/sip/sdp_crypto.c
team/oej/pinedanish-copybridgeflags-1.8/channels/sip/srtp.c
team/oej/pinedanish-copybridgeflags-1.8/channels/vcodecs.c
team/oej/pinedanish-copybridgeflags-1.8/channels/vgrabbers.c
team/oej/pinedanish-copybridgeflags-1.8/configure.ac
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_aes.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_cdr.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_channel.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_curl.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_cut.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_devstate.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_dialgroup.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_global.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_lock.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_logic.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_math.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_odbc.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_realtime.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_shell.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_speex.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_strings.c
team/oej/pinedanish-copybridgeflags-1.8/funcs/func_volume.c
team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/adsi.h
team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/cel.h
team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/channel.h
team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/netsock2.h
team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/strings.h
team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/tcptls.h
team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/time.h
team/oej/pinedanish-copybridgeflags-1.8/include/asterisk/utils.h
team/oej/pinedanish-copybridgeflags-1.8/main/cdr.c
team/oej/pinedanish-copybridgeflags-1.8/main/channel.c
team/oej/pinedanish-copybridgeflags-1.8/main/loader.c
team/oej/pinedanish-copybridgeflags-1.8/main/tdd.c
team/oej/pinedanish-copybridgeflags-1.8/main/term.c
team/oej/pinedanish-copybridgeflags-1.8/main/utils.c
team/oej/pinedanish-copybridgeflags-1.8/main/xml.c
team/oej/pinedanish-copybridgeflags-1.8/pbx/dundi-parser.c
team/oej/pinedanish-copybridgeflags-1.8/pbx/pbx_ael.c
team/oej/pinedanish-copybridgeflags-1.8/pbx/pbx_config.c
team/oej/pinedanish-copybridgeflags-1.8/pbx/pbx_dundi.c
team/oej/pinedanish-copybridgeflags-1.8/pbx/pbx_lua.c
team/oej/pinedanish-copybridgeflags-1.8/pbx/pbx_realtime.c
team/oej/pinedanish-copybridgeflags-1.8/pbx/pbx_spool.c
team/oej/pinedanish-copybridgeflags-1.8/tests/test_linkedlists.c
Propchange: team/oej/pinedanish-copybridgeflags-1.8/
('svnmerge-integrated' removed)
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/app_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/app_mysql.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/app_mysql.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/app_mysql.c Sat Dec 29 03:14:50 2012
@@ -106,7 +106,7 @@
static void mysql_ds_destroy(void *data);
static void mysql_ds_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan);
-static struct ast_datastore_info mysql_ds_info = {
+static const struct ast_datastore_info mysql_ds_info = {
.type = "APP_ADDON_SQL_MYSQL",
.destroy = mysql_ds_destroy,
.chan_fixup = mysql_ds_fixup,
@@ -295,7 +295,7 @@
AST_NONSTANDARD_APP_ARGS(args, data, ' ');
if (args.argc == 3) {
- var = alloca(6 + strlen(args.variable) + 1);
+ var = ast_alloca(6 + strlen(args.variable) + 1);
sprintf(var, "MYSQL_%s", args.variable);
/* Make the parameter case-insensitive */
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/chan_mobile.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/chan_mobile.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/chan_mobile.c Sat Dec 29 03:14:50 2012
@@ -558,7 +558,7 @@
max_rsp = 255;
flags = IREQ_CACHE_FLUSH;
- ii = alloca(max_rsp * sizeof(inquiry_info));
+ ii = ast_alloca(max_rsp * sizeof(inquiry_info));
num_rsp = hci_inquiry(adapter->dev_id, len, max_rsp, NULL, &ii, flags);
if (num_rsp > 0) {
ast_cli(a->fd, FORMAT1, "Address", "Name", "Usable", "Type", "Port");
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/format_mp3.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/format_mp3.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/format_mp3.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/format_mp3.c Sat Dec 29 03:14:50 2012
@@ -9,7 +9,7 @@
* Thanks to mpglib from http://www.mpg123.org/
* and Chris Stenton [jacs at gnome.co.uk]
* for coding the ability to play stereo and non-8khz files
-
+
* See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact
* any of the maintainers of this project for assistance;
@@ -48,20 +48,20 @@
#define MP3_DCACHE 8192
struct mp3_private {
- char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */
- char empty; /* Empty character */
- int lasttimeout;
- int maxlen;
- struct timeval last;
+ /*! state for the mp3 decoder */
struct mpstr mp;
+ /*! buffer to hold mp3 data after read from disk */
char sbuf[MP3_SCACHE];
+ /*! buffer for slinear audio after being decoded out of sbuf */
char dbuf[MP3_DCACHE];
+ /*! how much data has been written to the output buffer in the ast_filestream */
int buflen;
+ /*! how much data has been written to sbuf */
int sbuflen;
+ /*! how much data is left to be read out of dbuf, starting at dbufoffset */
int dbuflen;
+ /*! current offset for reading data out of dbuf */
int dbufoffset;
- int sbufoffset;
- int lastseek;
int offset;
long seek;
};
@@ -107,17 +107,17 @@
static void mp3_close(struct ast_filestream *s)
{
struct mp3_private *p = s->_private;
-
+
ExitMP3(&p->mp);
return;
}
-static int mp3_squeue(struct ast_filestream *s)
+static int mp3_squeue(struct ast_filestream *s)
{
struct mp3_private *p = s->_private;
int res=0;
-
- p->lastseek = ftell(s->f);
+
+ res = ftell(s->f);
p->sbuflen = fread(p->sbuf, 1, MP3_SCACHE, s->f);
if(p->sbuflen < 0) {
ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", p->sbuflen, strerror(errno));
@@ -131,11 +131,11 @@
return 0;
}
-static int mp3_dqueue(struct ast_filestream *s)
+static int mp3_dqueue(struct ast_filestream *s)
{
struct mp3_private *p = s->_private;
int res=0;
-
+
if((res = decodeMP3(&p->mp,NULL,0,p->dbuf,MP3_DCACHE,&p->dbuflen)) == MP3_OK) {
p->sbuflen -= p->dbuflen;
p->dbufoffset = 0;
@@ -147,7 +147,7 @@
{
struct mp3_private *p = s->_private;
int res = 0, bytes = 0;
-
+
if(p->seek) {
ExitMP3(&p->mp);
InitMP3(&p->mp, OUTSCALE);
@@ -167,7 +167,7 @@
if(res == MP3_ERR)
return -1;
}
-
+
p->seek = 0;
return 0;
}
@@ -181,7 +181,7 @@
if(mp3_squeue(s))
return -1;
}
-
+
}
return 0;
@@ -194,36 +194,41 @@
int delay =0;
int save=0;
- /* Send a frame from the file to the appropriate channel */
-
- if(mp3_queue(s))
+ /* Pre-populate the buffer that holds audio to be returned (dbuf) */
+ if (mp3_queue(s)) {
return NULL;
-
- if(p->dbuflen) {
- for(p->buflen=0; p->buflen < MP3_BUFLEN && p->buflen < p->dbuflen; p->buflen++) {
- s->buf[p->buflen + AST_FRIENDLY_OFFSET] = p->dbuf[p->buflen+p->dbufoffset];
- p->sbufoffset++;
+ }
+
+ if (p->dbuflen) {
+ /* Read out what's waiting in dbuf */
+ for (p->buflen = 0; p->buflen < MP3_BUFLEN && p->buflen < p->dbuflen; p->buflen++) {
+ s->buf[p->buflen + AST_FRIENDLY_OFFSET] = p->dbuf[p->buflen + p->dbufoffset];
}
p->dbufoffset += p->buflen;
p->dbuflen -= p->buflen;
-
- if(p->buflen < MP3_BUFLEN) {
- if(mp3_queue(s))
- return NULL;
-
- for(save = p->buflen; p->buflen < MP3_BUFLEN; p->buflen++) {
- s->buf[p->buflen + AST_FRIENDLY_OFFSET] = p->dbuf[(p->buflen-save)+p->dbufoffset];
- p->sbufoffset++;
+ }
+
+ if (p->buflen < MP3_BUFLEN) {
+ /* dbuf didn't have enough, so reset dbuf, fill it back up and continue */
+ p->dbuflen = p->dbufoffset = 0;
+
+ if (mp3_queue(s)) {
+ return NULL;
+ }
+
+ /* Make sure dbuf has enough to complete this read attempt */
+ if (p->dbuflen >= (MP3_BUFLEN - p->buflen)) {
+ for (save = p->buflen; p->buflen < MP3_BUFLEN; p->buflen++) {
+ s->buf[p->buflen + AST_FRIENDLY_OFFSET] = p->dbuf[(p->buflen - save) + p->dbufoffset];
}
p->dbufoffset += (MP3_BUFLEN - save);
p->dbuflen -= (MP3_BUFLEN - save);
-
- }
-
- }
-
+ }
+
+ }
+
p->offset += p->buflen;
- delay = p->buflen/2;
+ delay = p->buflen / 2;
s->fr.frametype = AST_FRAME_VOICE;
s->fr.subclass.codec = AST_FORMAT_SLINEAR;
AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, p->buflen);
@@ -266,16 +271,16 @@
p->seek = offset;
return fseek(s->f, offset, SEEK_SET);
-
-}
-
-static int mp3_rewrite(struct ast_filestream *s, const char *comment)
+
+}
+
+static int mp3_rewrite(struct ast_filestream *s, const char *comment)
{
ast_log(LOG_ERROR,"I Can't write MP3 only read them.\n");
return -1;
}
-static int mp3_trunc(struct ast_filestream *s)
+static int mp3_trunc(struct ast_filestream *s)
{
ast_log(LOG_ERROR,"I Can't write MP3 only read them.\n");
@@ -285,7 +290,7 @@
static off_t mp3_tell(struct ast_filestream *s)
{
struct mp3_private *p = s->_private;
-
+
return p->offset/2;
}
@@ -321,6 +326,6 @@
static int unload_module(void)
{
return ast_format_unregister(name);
-}
+}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "MP3 format [Any rate but 8000hz mono is optimal]");
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGES.h
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGES.h?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGES.h (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGES.h Sat Dec 29 03:14:50 2012
@@ -169,7 +169,7 @@
typedef ASN1OBJID H225ProtocolIdentifier;
-EXTERN int asn1PE_H225ProtocolIdentifier (OOCTXT* pctxt, H225ProtocolIdentifier value);
+EXTERN int asn1PE_H225ProtocolIdentifier (OOCTXT* pctxt, H225ProtocolIdentifier* value);
EXTERN int asn1PD_H225ProtocolIdentifier (OOCTXT* pctxt, H225ProtocolIdentifier* pvalue);
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGESEnc.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGESEnc.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGESEnc.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/h323/H323-MESSAGESEnc.c Sat Dec 29 03:14:50 2012
@@ -223,11 +223,11 @@
/* */
/**************************************************************/
-EXTERN int asn1PE_H225ProtocolIdentifier (OOCTXT* pctxt, H225ProtocolIdentifier value)
-{
- int stat = ASN_OK;
-
- stat = encodeObjectIdentifier (pctxt, &value);
+EXTERN int asn1PE_H225ProtocolIdentifier (OOCTXT* pctxt, H225ProtocolIdentifier* value)
+{
+ int stat = ASN_OK;
+
+ stat = encodeObjectIdentifier (pctxt, value);
if (stat != ASN_OK) return stat;
return (stat);
@@ -6371,7 +6371,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode h245Address */
@@ -7112,7 +7112,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode destinationInfo */
@@ -7414,7 +7414,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode h245Address */
@@ -7811,7 +7811,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode destinationInfo */
@@ -8173,7 +8173,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
if (extbit) {
@@ -8672,7 +8672,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode reason */
@@ -9157,7 +9157,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode alternativeAddress */
@@ -9580,7 +9580,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode destinationInfo */
@@ -9726,7 +9726,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode callIdentifier */
@@ -9774,7 +9774,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode callIdentifier */
@@ -9822,7 +9822,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode callIdentifier */
@@ -9870,7 +9870,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode callIdentifier */
@@ -12236,7 +12236,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode nonStandardData */
@@ -12530,7 +12530,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode nonStandardData */
@@ -12892,7 +12892,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode nonStandardData */
@@ -13168,7 +13168,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode nonStandardData */
@@ -13913,7 +13913,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode nonStandardData */
@@ -14551,7 +14551,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode nonStandardData */
@@ -21566,7 +21566,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode nonStandardData */
@@ -21702,7 +21702,7 @@
/* encode protocolIdentifier */
- stat = asn1PE_H225ProtocolIdentifier (pctxt, pvalue->protocolIdentifier);
+ stat = asn1PE_H225ProtocolIdentifier (pctxt, &pvalue->protocolIdentifier);
if (stat != ASN_OK) return stat;
/* encode nonStandardData */
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooCalls.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooCalls.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooCalls.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooCalls.c Sat Dec 29 03:14:50 2012
@@ -265,14 +265,13 @@
int ooRemoveCallFromList (OOH323CallData *call)
{
- if(!call)
+ if(!call || !gH323ep.callList)
return OO_OK;
ast_mutex_lock(&callListLock);
OOTRACEINFO3("Removing call %lx: %s\n", call, call->callToken);
- if (!gH323ep.callList) return OO_OK;
if(call == gH323ep.callList)
{
if(!call->next)
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooGkClient.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooGkClient.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooGkClient.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooGkClient.c Sat Dec 29 03:14:50 2012
@@ -809,6 +809,9 @@
if(pGatekeeperConfirm->m.gatekeeperIdentifierPresent)
{
pGkClient->gkId.nchars = pGatekeeperConfirm->gatekeeperIdentifier.nchars;
+ if (pGkClient->gkId.data) {
+ memFreePtr(&pGkClient->ctxt, pGkClient->gkId.data);
+ }
pGkClient->gkId.data = (ASN116BITCHAR*)memAlloc(&pGkClient->ctxt,
sizeof(ASN116BITCHAR)*pGkClient->gkId.nchars);
if(!pGkClient->gkId.data)
@@ -1279,6 +1282,8 @@
unsigned int x=0;
DListNode *pNode = NULL;
OOTimer *pTimer = NULL;
+ ooGkClientTimerCb *cbData=NULL;
+
/* First delete the corresponding RRQ timer */
for(x=0; x<pGkClient->timerList.count; x++)
{
@@ -1368,8 +1373,40 @@
default:
OOTRACEINFO1("RRQ Rejected - Invalid Reason\n");
}
- pGkClient->state = GkClientGkErr;
+
+ /* send again GRQ/RRQ's */
+ ast_mutex_lock(&pGkClient->Lock);
+ pGkClient->state = GkClientUnregistered;
+ pGkClient->rrqRetries = 0;
+ pGkClient->grqRetries = 0;
+ pGkClient->discoveryComplete = FALSE;
+
+ cbData = (ooGkClientTimerCb*) memAlloc
+ (&pGkClient->ctxt, sizeof(ooGkClientTimerCb));
+ if(!cbData)
+ {
+ OOTRACEERR1("Error:Failed to allocate memory to GRQ timer callback\n");
+ pGkClient->state = GkClientFailed;
+ ast_mutex_unlock(&pGkClient->Lock);
+ return OO_FAILED;
+ }
+ cbData->timerType = OO_GRQ_TIMER;
+ cbData->pGkClient = pGkClient;
+ if(!ooTimerCreate(&pGkClient->ctxt, &pGkClient->timerList,
+ &ooGkClientGRQTimerExpired, pGkClient->grqTimeout,
+ cbData, FALSE))
+ {
+ OOTRACEERR1("Error:Unable to create GRQ timer.\n ");
+ memFreePtr(&pGkClient->ctxt, cbData);
+ pGkClient->state = GkClientFailed;
+ ast_mutex_unlock(&pGkClient->Lock);
+ return OO_FAILED;
+ }
+
+ ast_mutex_unlock(&pGkClient->Lock);
+
return OO_OK;
+
}
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323.c Sat Dec 29 03:14:50 2012
@@ -40,7 +40,7 @@
int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg);
int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg);
int ooHandleDisplayIE(OOH323CallData *call, Q931Message *q931Msg);
-int ooHandleH2250ID (OOH323CallData *call, H225ProtocolIdentifier protocolIdentifier);
+int ooHandleH2250ID (OOH323CallData *call, H225ProtocolIdentifier* protocolIdentifier);
int ooHandleDisplayIE(OOH323CallData *call, Q931Message *q931Msg) {
Q931InformationElement* pDisplayIE;
@@ -58,10 +58,10 @@
return OO_OK;
}
-int ooHandleH2250ID (OOH323CallData *call, H225ProtocolIdentifier protocolIdentifier) {
- if (!call->h225version && (protocolIdentifier.numids >= 6) &&
- (protocolIdentifier.subid[3] == 2250)) {
- call->h225version = protocolIdentifier.subid[5];
+int ooHandleH2250ID (OOH323CallData *call, H225ProtocolIdentifier* protocolIdentifier) {
+ if (!call->h225version && (protocolIdentifier->numids >= 6) &&
+ (protocolIdentifier->subid[3] == 2250)) {
+ call->h225version = protocolIdentifier->subid[5];
OOTRACEDBGC4("Extract H.225 remote version, it's %d, (%s, %s)\n", call->h225version,
call->callType, call->callToken);
@@ -386,7 +386,7 @@
"%s\n", call->callType, call->callToken);
return OO_FAILED;
}
- ooHandleH2250ID(call, setup->protocolIdentifier);
+ ooHandleH2250ID(call, &setup->protocolIdentifier);
memcpy(call->callIdentifier.guid.data, setup->callIdentifier.guid.data,
setup->callIdentifier.guid.numocts);
call->callIdentifier.guid.numocts = setup->callIdentifier.guid.numocts;
@@ -633,7 +633,7 @@
return OO_FAILED;
}
- ooHandleH2250ID(call, callProceeding->protocolIdentifier);
+ ooHandleH2250ID(call, &callProceeding->protocolIdentifier);
/* Handle fast-start */
if(OO_TESTFLAG (call->flags, OO_M_FASTSTART))
{
@@ -862,7 +862,7 @@
}
return OO_FAILED;
}
- ooHandleH2250ID(call, alerting->protocolIdentifier);
+ ooHandleH2250ID(call, &alerting->protocolIdentifier);
/*Handle fast-start */
if(OO_TESTFLAG (call->flags, OO_M_FASTSTART) &&
!OO_TESTFLAG(call->flags, OO_M_FASTSTARTANSWERED))
@@ -1099,7 +1099,7 @@
}
return OO_FAILED;
}
- ooHandleH2250ID(call, progress->protocolIdentifier);
+ ooHandleH2250ID(call, &progress->protocolIdentifier);
/*Handle fast-start */
if(OO_TESTFLAG (call->flags, OO_M_FASTSTART) &&
!OO_TESTFLAG(call->flags, OO_M_FASTSTARTANSWERED))
@@ -1343,7 +1343,7 @@
}
return OO_FAILED;
}
- ooHandleH2250ID(call, connect->protocolIdentifier);
+ ooHandleH2250ID(call, &connect->protocolIdentifier);
/*Handle fast-start */
if(OO_TESTFLAG (call->flags, OO_M_FASTSTART) &&
!OO_TESTFLAG (call->flags, OO_M_FASTSTARTANSWERED))
@@ -1841,7 +1841,7 @@
facility = pH323UUPdu->h323_message_body.u.facility;
if(facility)
{
- ooHandleH2250ID(call, facility->protocolIdentifier);
+ ooHandleH2250ID(call, &facility->protocolIdentifier);
/* Depending on the reason of facility message handle the message */
if(facility->reason.t == T_H225FacilityReason_transportedInformation)
{
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323ep.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323ep.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323ep.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooh323ep.c Sat Dec 29 03:14:50 2012
@@ -56,7 +56,7 @@
strcpy(gH323ep.traceFile, DEFAULT_TRACEFILE);
}
- gH323ep.fptraceFile = fopen(gH323ep.traceFile, "w");
+ gH323ep.fptraceFile = fopen(gH323ep.traceFile, "a");
if(gH323ep.fptraceFile == NULL)
{
printf("Error:Failed to open trace file %s for write.\n",
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooq931.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooq931.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323c/src/ooq931.c Sat Dec 29 03:14:50 2012
@@ -140,7 +140,7 @@
}
else {
ie = (Q931InformationElement*) memAlloc (pctxt,
- sizeof(*ie) - sizeof(ie->data));
+ sizeof(*ie));
if(!ie)
{
OOTRACEERR3("Error:Memory - ooQ931Decode - ie(%s, %s)\n",
@@ -2316,7 +2316,7 @@
else
OO_CLRFLAG(call->flags, OO_M_TUNNELING);
- if(opts->disableGk)
+ if(opts->disableGk || gH323ep.gkClient == NULL)
OO_SETFLAG(call->flags, OO_M_DISABLEGK);
else
OO_CLRFLAG(call->flags, OO_M_DISABLEGK);
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323cDriver.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323cDriver.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323cDriver.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/ooh323cDriver.c Sat Dec 29 03:14:50 2012
@@ -124,7 +124,7 @@
free(mycthread);
ast_module_unref(myself);
ast_update_use_count();
- return dummy;
+ return NULL;
}
int ooh323c_start_call_thread(ooCallData *call) {
Modified: team/oej/pinedanish-copybridgeflags-1.8/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/addons/res_config_mysql.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/addons/res_config_mysql.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/addons/res_config_mysql.c Sat Dec 29 03:14:50 2012
@@ -144,7 +144,7 @@
if (for_write) {
whichdb = ast_strdupa(ptr + 1);
} else {
- whichdb = alloca(ptr - database + 1);
+ whichdb = ast_alloca(ptr - database + 1);
strncpy(whichdb, database, ptr - database);
whichdb[ptr - database] = '\0';
}
@@ -467,7 +467,7 @@
}
initfield = ast_strdupa(newparam);
- if (initfield && (op = strchr(initfield, ' '))) {
+ if ((op = strchr(initfield, ' '))) {
*op = '\0';
}
Modified: team/oej/pinedanish-copybridgeflags-1.8/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/apps/app_confbridge.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/apps/app_confbridge.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/apps/app_confbridge.c Sat Dec 29 03:14:50 2012
@@ -280,11 +280,12 @@
/* Next play the audio file stating they are going to be placed into the conference */
if (!ast_test_flag(&conference_bridge_user->flags, OPTION_QUIET)) {
- ao2_unlock(conference_bridge);
- ast_autoservice_start(conference_bridge_user->chan);
- play_sound_file(conference_bridge, "conf-placeintoconf");
- ast_autoservice_stop(conference_bridge_user->chan);
- ao2_lock(conference_bridge);
+ if (play_prompt_to_channel(conference_bridge,
+ conference_bridge_user->chan,
+ "conf-placeintoconf")) {
+ /* user hungup while the sound was playing */
+ return -1;
+ }
}
/* Finally iterate through and unmute them all */
Modified: team/oej/pinedanish-copybridgeflags-1.8/apps/app_dictate.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/apps/app_dictate.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/apps/app_dictate.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/apps/app_dictate.c Sat Dec 29 03:14:50 2012
@@ -149,7 +149,7 @@
ast_mkdir(base, 0755);
len = strlen(base) + strlen(filein) + 2;
if (!path || len > maxlen) {
- path = alloca(len);
+ path = ast_alloca(len);
memset(path, 0, len);
maxlen = len;
} else {
Modified: team/oej/pinedanish-copybridgeflags-1.8/apps/app_directory.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/apps/app_directory.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/apps/app_directory.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/apps/app_directory.c Sat Dec 29 03:14:50 2012
@@ -475,7 +475,8 @@
const char *context = ast_variable_retrieve(rtdata, mailbox, "context");
fullname = ast_variable_retrieve(rtdata, mailbox, "fullname");
- if (ast_true((hidefromdir = ast_variable_retrieve(rtdata, mailbox, "hidefromdir")))) {
+ hidefromdir = ast_variable_retrieve(rtdata, mailbox, "hidefromdir");
+ if (ast_true(hidefromdir)) {
/* Skip hidden */
continue;
}
Modified: team/oej/pinedanish-copybridgeflags-1.8/apps/app_disa.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/apps/app_disa.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/apps/app_disa.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/apps/app_disa.c Sat Dec 29 03:14:50 2012
@@ -181,8 +181,13 @@
args.context = "disa";
if (ast_strlen_zero(args.mailbox))
args.mailbox = "";
- if (!ast_strlen_zero(args.options))
+ if (!ast_strlen_zero(args.options)) {
ast_app_parse_options(app_opts, &flags, NULL, args.options);
+ } else {
+ /* Coverity - This uninit_use should be ignored since this macro initializes the flags */
+ ast_clear_flag(&flags, AST_FLAGS_ALL);
+ }
+
ast_debug(1, "Mailbox: %s\n",args.mailbox);
Modified: team/oej/pinedanish-copybridgeflags-1.8/apps/app_festival.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/apps/app_festival.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/apps/app_festival.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/apps/app_festival.c Sat Dec 29 03:14:50 2012
@@ -343,12 +343,12 @@
const char *endcmd = "\" 'file)(quit)\n";
strln = strlen(startcmd) + strlen(args.text) + strlen(endcmd) + 1;
- newfestivalcommand = alloca(strln);
+ newfestivalcommand = ast_alloca(strln);
snprintf(newfestivalcommand, strln, "%s%s%s", startcmd, args.text, endcmd);
festivalcommand = newfestivalcommand;
} else { /* This else parses the festivalcommand that we're sent from the config file for \n's, etc */
int x, j;
- newfestivalcommand = alloca(strlen(festivalcommand) + strlen(args.text) + 1);
+ newfestivalcommand = ast_alloca(strlen(festivalcommand) + strlen(args.text) + 1);
for (x = 0, j = 0; x < strlen(festivalcommand); x++) {
if (festivalcommand[x] == '\\' && festivalcommand[x + 1] == 'n') {
Modified: team/oej/pinedanish-copybridgeflags-1.8/apps/app_getcpeid.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/apps/app_getcpeid.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/apps/app_getcpeid.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/apps/app_getcpeid.c Sat Dec 29 03:14:50 2012
@@ -76,7 +76,7 @@
unsigned int x;
for (x = 0; x < 4; x++)
- data[x] = alloca(80);
+ data[x] = ast_alloca(80);
strcpy(data[0], "** CPE Info **");
strcpy(data[1], "Identifying CPE...");
Modified: team/oej/pinedanish-copybridgeflags-1.8/apps/app_macro.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/apps/app_macro.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/apps/app_macro.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/apps/app_macro.c Sat Dec 29 03:14:50 2012
@@ -164,7 +164,7 @@
static void macro_fixup(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan);
-static struct ast_datastore_info macro_ds_info = {
+static const struct ast_datastore_info macro_ds_info = {
.type = "MACRO",
.chan_fixup = macro_fixup,
};
@@ -596,8 +596,7 @@
char *expr = NULL, *label_a = NULL, *label_b = NULL;
int res = 0;
- if (!(expr = ast_strdupa(data)))
- return -1;
+ expr = ast_strdupa(data);
if ((label_a = strchr(expr, '?'))) {
*label_a = '\0';
Modified: team/oej/pinedanish-copybridgeflags-1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/apps/app_meetme.c?view=diff&rev=378213&r1=378212&r2=378213
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/apps/app_meetme.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/apps/app_meetme.c Sat Dec 29 03:14:50 2012
@@ -177,7 +177,7 @@
<argument name="secs" required="true" />
</option>
<option name="x">
- <para>Close the conference when last marked user exits</para>
+ <para>Leave the conference when the last marked user leaves.</para>
</option>
<option name="X">
<para>Allow user to exit the conference by entering a valid single digit
[... 5238 lines stripped ...]
More information about the svn-commits
mailing list