[svn-commits] russell: branch russell/chan_refcount r104567 - in /team/russell/chan_refcoun...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Feb 27 10:34:28 CST 2008
Author: russell
Date: Wed Feb 27 10:34:27 2008
New Revision: 104567
URL: http://svn.digium.com/view/asterisk?view=rev&rev=104567
Log:
resolve, reset
Added:
team/russell/chan_refcount/build_tools/make_version_h
- copied unchanged from r104539, trunk/build_tools/make_version_h
team/russell/chan_refcount/doc/janitor-projects.txt
- copied unchanged from r104539, trunk/doc/janitor-projects.txt
team/russell/chan_refcount/include/asterisk/ast_version.h
- copied unchanged from r104539, trunk/include/asterisk/ast_version.h
Removed:
team/russell/chan_refcount/include/asterisk/version.h
Modified:
team/russell/chan_refcount/ (props changed)
team/russell/chan_refcount/CHANGES
team/russell/chan_refcount/Makefile
team/russell/chan_refcount/UPGRADE.txt
team/russell/chan_refcount/apps/app_voicemail.c
team/russell/chan_refcount/build_tools/make_version_c
team/russell/chan_refcount/channels/chan_sip.c
team/russell/chan_refcount/channels/chan_vpb.cc
team/russell/chan_refcount/channels/chan_zap.c
team/russell/chan_refcount/configs/smdi.conf.sample
team/russell/chan_refcount/configs/vpb.conf.sample
team/russell/chan_refcount/doc/CODING-GUIDELINES
team/russell/chan_refcount/funcs/func_odbc.c
team/russell/chan_refcount/funcs/func_version.c
team/russell/chan_refcount/include/asterisk/ (props changed)
team/russell/chan_refcount/include/asterisk/cdr.h
team/russell/chan_refcount/include/asterisk/module.h
team/russell/chan_refcount/include/asterisk/smdi.h
team/russell/chan_refcount/main/asterisk.c
team/russell/chan_refcount/main/cdr.c
team/russell/chan_refcount/main/features.c
team/russell/chan_refcount/main/http.c
team/russell/chan_refcount/main/manager.c
team/russell/chan_refcount/main/pbx.c
team/russell/chan_refcount/main/rtp.c
team/russell/chan_refcount/res/res_agi.c
team/russell/chan_refcount/res/res_phoneprov.c
team/russell/chan_refcount/res/res_smdi.c
team/russell/chan_refcount/res/snmp/agent.c
team/russell/chan_refcount/utils/astcanary.c
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
automerge = *
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb 27 10:34:27 2008
@@ -1,1 +1,1 @@
-/trunk:1-104106,104108
+/trunk:1-104106,104108-104556
Modified: team/russell/chan_refcount/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/CHANGES?view=diff&rev=104567&r1=104566&r2=104567
==============================================================================
--- team/russell/chan_refcount/CHANGES (original)
+++ team/russell/chan_refcount/CHANGES Wed Feb 27 10:34:27 2008
@@ -281,6 +281,12 @@
lockfile will not work, such as on SMB/CIFS mounts.
* Added the ability to backup deleted messages, to ease recovery in the case
that a user accidentally deletes a message, and discovers that they need it.
+ * Reworked the SMDI interface in Asterisk. The new way to access SMDI information
+ is through the new functions, SMDI_MSG_RETRIEVE() and SMDI_MSG(). The file
+ smdi.conf can now be configured with options to map SMDI station IDs to Asterisk
+ voicemail boxes. The SMDI interface can also poll for MWI changes when some
+ outside entity is modifying the state of the mailbox (such as IMAP storage or
+ a web interface of some kind).
Queue changes
-------------
@@ -472,6 +478,8 @@
(but a record will still be inserted, based on what columns remain). Note
that the other two features from cdr_adaptive_odbc (alias and filter) are
not currently supported.
+ * The ResetCDR application now has an 'e' option that re-enables a CDR if it
+ has been disabled using the NoCDR application.
Miscellaneous New Modules
-------------------------
Modified: team/russell/chan_refcount/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/Makefile?view=diff&rev=104567&r1=104566&r2=104567
==============================================================================
--- team/russell/chan_refcount/Makefile (original)
+++ team/russell/chan_refcount/Makefile Wed Feb 27 10:34:27 2008
@@ -373,7 +373,7 @@
@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
-$(SUBDIRS): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
+$(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
# Non-windows:
@@ -409,6 +409,11 @@
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
+include/asterisk/version.h:
+ @build_tools/make_version_h > $@.tmp
+ @cmp -s $@.tmp $@ || mv $@.tmp $@
+ @rm -f $@.tmp
+
include/asterisk/buildopts.h: menuselect.makeopts
@build_tools/make_buildopts_h > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@@ -429,6 +434,7 @@
rm -f defaults.h
rm -f include/asterisk/build.h
rm -f main/version.c
+ rm -f include/asterisk/version.h
@$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean
@@ -558,7 +564,14 @@
echo " WARNING WARNING WARNING" ;\
fi
-install: datafiles bininstall $(SUBDIRS_INSTALL)
+badshell:
+ifneq ($(findstring ~,$(DESTDIR)),)
+ @echo "Your shell doesn't do ~ expansion when expected (specifically, when doing \"make install DESTDIR=~/path\")."
+ @echo "Try replacing ~ with \$$HOME, as in \"make install DESTDIR=\$$HOME/path\"."
+ @exit 1
+endif
+
+install: badshell datafiles bininstall $(SUBDIRS_INSTALL)
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
@@ -709,7 +722,7 @@
rpm: __rpm
-__rpm: main/version.c include/asterisk/buildopts.h spec
+__rpm: main/version.c include/asterisk/version.h include/asterisk/buildopts.h spec
rm -rf /tmp/asterisk ; \
mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
$(MAKE) DESTDIR=/tmp/asterisk install ; \
@@ -834,4 +847,4 @@
asterisk.pdf:
$(MAKE) -C doc/tex asterisk.pdf
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) main/version.c
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell main/version.c include/asterisk/version.h
Modified: team/russell/chan_refcount/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/UPGRADE.txt?view=diff&rev=104567&r1=104566&r2=104567
==============================================================================
--- team/russell/chan_refcount/UPGRADE.txt (original)
+++ team/russell/chan_refcount/UPGRADE.txt Wed Feb 27 10:34:27 2008
@@ -157,6 +157,9 @@
to modify modules.conf to add another "noload" line to ensure that only one of
these three modules gets loaded.
+* Zap: The "msdstrip" option has been deprecated, as it provides no value over
+ the method of stripping digits in the dialplan using variable substring syntax.
+
Configuration:
* pbx_dundi.c: tos parameter changed to use new values. Old values like lowdelay,
Modified: team/russell/chan_refcount/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/apps/app_voicemail.c?view=diff&rev=104567&r1=104566&r2=104567
==============================================================================
--- team/russell/chan_refcount/apps/app_voicemail.c (original)
+++ team/russell/chan_refcount/apps/app_voicemail.c Wed Feb 27 10:34:27 2008
@@ -61,7 +61,7 @@
</category>
***/
-/*It is important to include the IMAP_STORAGE related headers
+/* It is important to include the IMAP_STORAGE related headers
* before asterisk.h since asterisk.h includes logger.h. logger.h
* and c-client.h have conflicting definitions for LOG_WARNING and
* LOG_DEBUG, so it's important that we use Asterisk's definitions
@@ -342,7 +342,7 @@
\arg \b vm-ri A class-word for day (ri4)
\arg \b vm-you You (ni3)
\arg \b vm-haveno Have no (mei2 you3)
-\arg \b vm-have Have (you3)
+\arg \b vm-have Have (you3)
\arg \b vm-listen To listen (yao4 ting1)
@@ -387,7 +387,7 @@
char imapuser[80]; /*!< IMAP server login */
char imappassword[80]; /*!< IMAP server password if authpassword not defined */
#endif
- double volgain; /*!< Volume gain for voicemails sent via email */
+ double volgain; /*!< Volume gain for voicemails sent via email */
AST_LIST_ENTRY(ast_vm_user) list;
};
@@ -1168,8 +1168,8 @@
snprintf(full_fn, sizeof(full_fn), "%s.txt", fn);
if (!(f = fopen(full_fn, "w+"))) {
- ast_log(LOG_WARNING, "Failed to open/create '%s'\n", full_fn);
- goto yuck;
+ ast_log(LOG_WARNING, "Failed to open/create '%s'\n", full_fn);
+ goto yuck;
}
snprintf(full_fn, sizeof(full_fn), "%s.%s", fn, fmt);
@@ -1185,8 +1185,7 @@
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
goto yuck;
- }
- else if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
+ } else if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Fetch error!\n[%s]\n\n", sql);
SQLFreeHandle (SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
@@ -1658,8 +1657,8 @@
return x - 1;
}
-#endif /*#ifndef IMAP_STORAGE*/
-#endif /*#else of #ifdef ODBC_STORAGE*/
+#endif /* #ifndef IMAP_STORAGE */
+#endif /* #else of #ifdef ODBC_STORAGE */
static int copy(char *infile, char *outfile)
{
@@ -2336,7 +2335,7 @@
#ifdef IMAP_STORAGE
static int folder_int(const char *folder)
{
- /*assume a NULL folder means INBOX*/
+ /* assume a NULL folder means INBOX */
if (!folder)
return 0;
#ifdef IMAP_STORAGE
@@ -2365,7 +2364,7 @@
return 9;
else if (!strcasecmp(folder, "Deleted"))
return 10;
- else /*assume they meant INBOX if folder is not found otherwise*/
+ else /* assume they meant INBOX if folder is not found otherwise */
return 0;
}
#endif
@@ -2549,9 +2548,10 @@
ast_copy_string (fn, dir, sizeof(fn));
if (ast_strlen_zero(vmu->email)) {
- /*we need the vmu->email to be set when we call make_email_file, but if we keep it set,
- * a duplicate e-mail will be created. So at the end of this function, we will revert back to an empty
- * string if tempcopy is 1
+ /* We need the vmu->email to be set when we call make_email_file, but
+ * if we keep it set, a duplicate e-mail will be created. So at the end
+ * of this function, we will revert back to an empty string if tempcopy
+ * is 1.
*/
ast_copy_string(vmu->email, vmu->imapuser, sizeof(vmu->email));
tempcopy = 1;
@@ -2562,7 +2562,7 @@
ast_debug(3, "Storing file '%s', format '%s'\n", fn, fmt);
/* Make a temporary file instead of piping directly to sendmail, in case the mail
- command hangs */
+ command hangs. */
if (!(p = vm_mkftemp(tmp))) {
ast_log(LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
if (tempcopy)
@@ -2609,7 +2609,7 @@
{
SEARCHPGM *pgm;
SEARCHHEADER *hdr;
-
+
struct ast_vm_user *vmu, vmus;
struct vm_state *vms_p;
int ret = 0;
@@ -2637,7 +2637,7 @@
ast_log(LOG_WARNING, "IMAP user not set for mailbox %s\n", vmu->mailbox);
free_user(vmu);
return -1;
- }
+ }
/* check if someone is accessing this box right now... */
vms_p = get_vm_state_by_imapuser(vmu->imapuser, 1);
@@ -2646,11 +2646,11 @@
}
if (vms_p) {
ast_debug(3, "Returning before search - user is logged in\n");
- if (fold == 0) {/*INBOX*/
+ if (fold == 0) { /* INBOX */
return vms_p->newmessages;
}
- if (fold == 1) {/*Old messages*/
- return vms_p->oldmessages;
+ if (fold == 1) { /* Old messages */
+ return vms_p->oldmessages;
}
}
@@ -2704,7 +2704,7 @@
vms_p->newmessages = vms_p->vmArrayIndex;
if (fold == 1)
vms_p->oldmessages = vms_p->vmArrayIndex;
- /*Freeing the searchpgm also frees the searchhdr*/
+ /* Freeing the searchpgm also frees the searchhdr */
mail_free_searchpgm(&pgm);
vms_p->updated = 0;
return vms_p->vmArrayIndex;
@@ -2716,7 +2716,7 @@
static int inboxcount(const char *mailbox_context, int *newmsgs, int *oldmsgs)
{
char tmp[PATH_MAX] = "";
- char *mailboxnc;
+ char *mailboxnc;
char *context;
char *mb;
char *cur;
@@ -2793,7 +2793,7 @@
static int copy_message(struct ast_channel *chan, struct ast_vm_user *vmu, int imbox, int msgnum, long duration, struct ast_vm_user *recip, char *fmt, char *dir)
{
struct vm_state *sendvms = NULL, *destvms = NULL;
- char messagestring[10]; /*I guess this could be a problem if someone has more than 999999999 messages...*/
+ char messagestring[10]; /* I guess this could be a problem if someone has more than 999,999,999 messages... */
if (!(sendvms = get_vm_state_by_imapuser(vmu->imapuser, 0))) {
ast_log(LOG_ERROR, "Couldn't get vm_state for originator's mailbox!!\n");
return -1;
@@ -2976,8 +2976,8 @@
else
ast_smdi_mwi_unset(smdi_iface, extension);
- if ((mwi_msg = ast_smdi_mwi_message_wait(smdi_iface, SMDI_MWI_WAIT_TIMEOUT))) {
- ast_log(LOG_ERROR, "Error executing SMDI MWI change for %s on %s\n", extension, smdi_iface->name);
+ if ((mwi_msg = ast_smdi_mwi_message_wait_station(smdi_iface, SMDI_MWI_WAIT_TIMEOUT, extension))) {
+ ast_log(LOG_ERROR, "Error executing SMDI MWI change for %s\n", extension);
if (!strncmp(mwi_msg->cause, "INV", 3))
ast_log(LOG_ERROR, "Invalid MWI extension: %s\n", mwi_msg->fwd_st);
else if (!strncmp(mwi_msg->cause, "BLK", 3))
@@ -2985,7 +2985,7 @@
ast_log(LOG_WARNING, "The switch reported '%s'\n", mwi_msg->cause);
ASTOBJ_UNREF(mwi_msg, ast_smdi_mwi_message_destroy);
} else {
- ast_debug(1, "Successfully executed SMDI MWI change for %s on %s\n", extension, smdi_iface->name);
+ ast_debug(1, "Successfully executed SMDI MWI change for %s\n", extension);
}
}
@@ -3093,10 +3093,9 @@
} else if (ast_exists_extension(chan, chan->context, "o", 1, chan->cid.cid_num)) {
strncat(ecodes, "0", sizeof(ecodes) - strlen(ecodes) - 1);
ouseexten = 1;
- }
- else if (!ast_strlen_zero(chan->macrocontext) && ast_exists_extension(chan, chan->macrocontext, "o", 1, chan->cid.cid_num)) {
- strncat(ecodes, "0", sizeof(ecodes) - strlen(ecodes) - 1);
- ousemacro = 1;
+ } else if (!ast_strlen_zero(chan->macrocontext) && ast_exists_extension(chan, chan->macrocontext, "o", 1, chan->cid.cid_num)) {
+ strncat(ecodes, "0", sizeof(ecodes) - strlen(ecodes) - 1);
+ ousemacro = 1;
}
}
@@ -3211,8 +3210,10 @@
return -1;
}
if (!(vms = get_vm_state_by_mailbox(ext, 0))) {
- /*It is possible under certain circumstances that inboxcount did not create a vm_state when it was needed. This is a catchall which will
- * rarely be used*/
+ /* It is possible under certain circumstances that inboxcount did not
+ * create a vm_state when it was needed. This is a catchall which will
+ * rarely be used.
+ */
if (!(vms = ast_calloc(1, sizeof(*vms)))) {
ast_log(LOG_ERROR, "Couldn't allocate necessary space\n");
return -1;
@@ -4024,9 +4025,9 @@
ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DISPLAY);
}
-/*--- get_folder: Folder menu ---*/
-/* Plays "press 1 for INBOX messages" etc
- Should possibly be internationalized
+/*!\brief get_folder: Folder menu
+ * Plays "press 1 for INBOX messages" etc.
+ * Should possibly be internationalized
*/
static int get_folder(struct ast_channel *chan, int start)
{
@@ -4069,7 +4070,7 @@
}
static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, char *curdir, int curmsg, char *vmfmts,
- char *context, signed char record_gain, long *duration, struct vm_state *vms)
+ char *context, signed char record_gain, long *duration, struct vm_state *vms)
{
int cmd = 0;
int retries = 0, prepend_duration = 0, already_recorded = 0;
@@ -4099,7 +4100,6 @@
switch (cmd) {
case '1':
/* prepend a message to the current message, update the metadata and return */
- {
prepend_duration = 0;
/* if we can't read the message metadata, stop now */
@@ -4137,7 +4137,6 @@
}
break;
- }
case '2':
cmd = 't';
break;
@@ -4210,7 +4209,7 @@
if (!ast_strlen_zero(vmu->attachfmt)) {
if (strstr(fmt, vmu->attachfmt))
fmt = vmu->attachfmt;
- else
+ else
ast_log(LOG_WARNING, "Attachment format '%s' is not one of the recorded formats '%s'. Falling back to default format for '%s@%s'.\n", vmu->attachfmt, fmt, vmu->mailbox, vmu->context);
}
@@ -4230,7 +4229,7 @@
if (attach_user_voicemail)
RETRIEVE(todir, msgnum, vmu->mailbox, vmu->context);
- /*XXX possible imap issue, should category be NULL XXX*/
+ /* XXX possible imap issue, should category be NULL XXX */
sendmail(myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, fn, fmt, duration, attach_user_voicemail, chan, category);
if (attach_user_voicemail)
@@ -4318,8 +4317,7 @@
cmd = ast_waitfordigit(chan, 3000);
if (!cmd)
retries++;
- if (retries > 3)
- {
+ if (retries > 3) {
cmd = 't';
done = 1;
}
@@ -4360,7 +4358,7 @@
} else {
ast_log(LOG_WARNING, "Could not find the Directory application, disabling directory_forward\n");
- ast_clear_flag((&globalflags), VM_DIRECFORWARD);
+ ast_clear_flag((&globalflags), VM_DIRECFORWARD);
}
} else {
/* Ask for an extension */
@@ -4390,7 +4388,7 @@
/* play name if available, else play extension number */
snprintf(fn, sizeof(fn), "%s%s/%s/greet", VM_SPOOL_DIR, receiver->context, s);
- RETRIEVE(fn, -1, s, receiver->context);
+ RETRIEVE(fn, -1, s, receiver->context);
if (ast_fileexists(fn, NULL, NULL) > 0) {
res = ast_stream_and_wait(chan, fn, ecodes);
if (res) {
@@ -4438,7 +4436,7 @@
create_dirpath(vmstmp.curdir, sizeof(vmstmp.curdir), sender->context, vmstmp.username, "tmp");
make_file(msgfile, sizeof(msgfile), vmstmp.curdir, curmsg);
- RETRIEVE(dir, curmsg, sender->mailbox, context);
+ RETRIEVE(dir, curmsg, sender->mailbox, context);
/* Alter a surrogate file, only */
copy_plain_file(origmsgfile, msgfile);
@@ -4451,48 +4449,46 @@
int attach_user_voicemail;
char buf[1024] = "";
- /* Need to get message content */
- ast_debug(3, "Before mail_fetchheaders, curmsg is: %d, imap messages is %lu\n", vms->curmsg, vms->msgArray[vms->curmsg]);
- if (!vms->msgArray[vms->curmsg]) {
- ast_log(LOG_WARNING, "Trying to access unknown message\n");
- return -1;
- }
-
- /* This will only work for new messages... */
+ /* Need to get message content */
+ ast_debug(3, "Before mail_fetchheaders, curmsg is: %d, imap messages is %lu\n", vms->curmsg, vms->msgArray[vms->curmsg]);
+ if (!vms->msgArray[vms->curmsg]) {
+ ast_log(LOG_WARNING, "Trying to access unknown message\n");
+ return -1;
+ }
+
+ /* This will only work for new messages... */
header_content = mail_fetchheader (vms->mailstream, vms->msgArray[vms->curmsg]);
- /* empty string means no valid header */
- if (ast_strlen_zero(header_content)) {
- ast_log(LOG_ERROR, "Could not fetch header for message number %ld\n", vms->msgArray[vms->curmsg]);
- return -1;
- }
- /* Get header info needed by sendmail */
+ /* empty string means no valid header */
+ if (ast_strlen_zero(header_content)) {
+ ast_log(LOG_ERROR, "Could not fetch header for message number %ld\n", vms->msgArray[vms->curmsg]);
+ return -1;
+ }
+ /* Get header info needed by sendmail */
if ((temp = get_header_by_tag(header_content, "X-Asterisk-VM-Duration:", buf, sizeof(buf))))
- duration = atoi(temp);
- else
- duration = 0;
+ duration = atoi(temp);
+ else
+ duration = 0;
- /* Attach only the first format */
+ /* Attach only the first format */
if ((fmt = ast_strdupa(fmt))) {
- stringp = fmt;
- strsep(&stringp, "|");
- } else {
- ast_log(LOG_ERROR, "audio format not set. Default to WAV\n");
- fmt = "WAV";
- }
- if (!strcasecmp(fmt, "wav49"))
- fmt = "WAV";
- ast_debug(3, "**** format set to %s, vmfmts set to %s\n", fmt, vmfmts);
- /* ast_copy_string(fmt, vmfmts, sizeof(fmt));*/
- /* if (!ast_strlen_zero(fmt)) { */
+ stringp = fmt;
+ strsep(&stringp, "|");
+ } else {
+ ast_log(LOG_ERROR, "audio format not set. Default to WAV\n");
+ fmt = "WAV";
+ }
+ if (!strcasecmp(fmt, "wav49"))
+ fmt = "WAV";
+ ast_debug(3, "**** format set to %s, vmfmts set to %s\n", fmt, vmfmts);
snprintf(todir, sizeof(todir), "%s%s/%s/tmp", VM_SPOOL_DIR, vmtmp->context, vmtmp->mailbox);
make_gsm_file(vms->fn, sizeof(vms->fn), vms->imapuser, todir, vms->curmsg);
- ast_debug(3, "Before mail_fetchstructure, message number is %ld, filename is:%s\n", vms->msgArray[vms->curmsg], vms->fn);
- /*mail_fetchstructure (mailstream, vmArray[0], &body); */
- mail_fetchstructure (vms->mailstream, vms->msgArray[vms->curmsg], &body);
+
+ ast_debug(3, "Before mail_fetchstructure, message number is %ld, filename is:%s\n", vms->msgArray[vms->curmsg], vms->fn);
+ mail_fetchstructure(vms->mailstream, vms->msgArray[vms->curmsg], &body);
save_body(body, vms, "3", "gsm");
- /* should not assume "fmt" here! */
+ /* should not assume "fmt" here! */
save_body(body, vms, "2", fmt);
-
+
/* get destination mailbox */
dstvms = get_vm_state_by_mailbox(vmtmp->mailbox, 0);
if (dstvms) {
@@ -4653,8 +4649,13 @@
char prefile[PATH_MAX] = "";
- /* If voicemail cid is not enabled, or we didn't get cid or context from the attribute file, leave now. */
- /* BB: Still need to change this so that if this function is called by the message envelope (and someone is explicitly requesting to hear the CID), it does not check to see if CID is enabled in the config file */
+ /* If voicemail cid is not enabled, or we didn't get cid or context from
+ * the attribute file, leave now.
+ *
+ * TODO Still need to change this so that if this function is called by the
+ * message envelope (and someone is explicitly requesting to hear the CID),
+ * it does not check to see if CID is enabled in the config file.
+ */
if ((cid == NULL)||(context == NULL))
return res;
@@ -4681,18 +4682,16 @@
res = ast_stream_and_wait(chan, prefile, "");
} else {
ast_verb(3, "Playing envelope info: message from '%s'\n", callerid);
- /* BB: Say "from extension" as one saying to sound smoother */
+ /* Say "from extension" as one saying to sound smoother */
if (!callback)
res = wait_file2(chan, vms, "vm-from-extension");
res = ast_say_digit_str(chan, callerid, "", chan->language);
}
}
}
- }
-
- else if (!res) {
+ } else if (!res) {
ast_debug(1, "VM-CID: Numeric caller id: (%s)\n", callerid);
- /* BB: Since this is all nicely figured out, why not say "from phone number" in this case" */
+ /* Since this is all nicely figured out, why not say "from phone number" in this case? */
if (!callback)
res = wait_file2(chan, vms, "vm-from-phonenumber");
res = ast_say_digit_str(chan, callerid, AST_DIGIT_ANY, chan->language);
@@ -4855,8 +4854,6 @@
else
category[0] = '\0';
- /*if (!strncasecmp("macro", context, 5)) Macro names in contexts are useless for our needs */
- /* context = ast_variable_retrieve(msg_cfg, "message", "macrocontext"); */
if (res == '1')
res = 0;
@@ -4872,11 +4869,6 @@
if ((!res) && (ast_test_flag(vmu, VM_SAYDURATION)) && duration[0] != '\0')
res = play_message_duration(chan, vms, duration, vmu->saydurationm);
- /* Allow pressing '1' to skip envelope / callerid */
- /* if (res == '1')
- res = 0;
- */
- /*ast_config_destroy(msg_cfg);*/
res = 0;
if (!res) {
@@ -5150,7 +5142,6 @@
struct vm_state *vms_p;
char *file, *filename;
char *attachment;
- /*char *mb, *cur;*/
int ret = 0, i;
BODY *body;
@@ -5295,8 +5286,7 @@
if (last_msg < 0)
return last_msg;
- else if (vms->lastmsg != last_msg)
- {
+ else if (vms->lastmsg != last_msg) {
ast_log(LOG_NOTICE, "Resequencing Mailbox: %s\n", vms->curdir);
res = resequence_mailbox(vmu, vms->curdir);
if (res)
@@ -5322,7 +5312,7 @@
/* Get the deleted messages fixed */
if (vm_lock_path(vms->curdir))
return ERROR_LOCK_PATH;
-
+
for (x = 0; x < vmu->maxmsg; x++) {
if (!vms->deleted[x] && (strcasecmp(vms->curbox, "INBOX") || !vms->heard[x] || (vms->heard[x] && !ast_test_flag(vmu, VM_MOVEHEARD)))) {
/* Save this message. It's not in INBOX or hasn't been heard */
@@ -5858,8 +5848,7 @@
if (!vms->oldmessages && !vms->newmessages) {
res = ast_play_and_wait(chan, "vm-nomessages");
return res;
- }
- else {
+ } else {
res = ast_play_and_wait(chan, "vm-youhave");
}
if (vms->newmessages) {
@@ -5870,8 +5859,7 @@
res = ast_play_and_wait(chan, "vm-message");
if (!res)
res = ast_play_and_wait(chan, "vm-INBOXs");
- }
- else {
+ } else {
if (!res)
res = ast_play_and_wait(chan, "vm-messages");
if (!res)
@@ -5888,10 +5876,9 @@
res = ast_play_and_wait(chan, "vm-message");
if (!res)
res = ast_play_and_wait(chan, "vm-Olds");
- }
- else {
+ } else {
if (!res)
- res = ast_play_and_wait(chan, "vm-messages");
+ res = ast_play_and_wait(chan, "vm-messages");
if (!res)
res = ast_play_and_wait(chan, "vm-Old");
}
@@ -6196,37 +6183,36 @@
/* Introduce messages they have */
res = ast_play_and_wait(chan, "vm-you");
- if (!res && vms->newmessages) {
- res = ast_play_and_wait(chan, "vm-have");
- if (!res)
- res = say_and_wait(chan, vms->newmessages, chan->language);
- if (!res)
- res = ast_play_and_wait(chan, "vm-tong");
- if (!res)
- res = ast_play_and_wait(chan, "vm-INBOX");
- if (vms->oldmessages && !res)
- res = ast_play_and_wait(chan, "vm-and");
- else if (!res)
- res = ast_play_and_wait(chan, "vm-messages");
-
- }
- if (!res && vms->oldmessages) {
- res = ast_play_and_wait(chan, "vm-have");
- if (!res)
- res = say_and_wait(chan, vms->oldmessages, chan->language);
- if (!res)
- res = ast_play_and_wait(chan, "vm-tong");
- if (!res)
- res = ast_play_and_wait(chan, "vm-Old");
- if (!res)
- res = ast_play_and_wait(chan, "vm-messages");
- }
- if (!res && !vms->oldmessages && !vms->newmessages) {
- res = ast_play_and_wait(chan, "vm-haveno");
- if (!res)
- res = ast_play_and_wait(chan, "vm-messages");
- }
- return res;
+ if (!res && vms->newmessages) {
+ res = ast_play_and_wait(chan, "vm-have");
+ if (!res)
+ res = say_and_wait(chan, vms->newmessages, chan->language);
+ if (!res)
+ res = ast_play_and_wait(chan, "vm-tong");
+ if (!res)
+ res = ast_play_and_wait(chan, "vm-INBOX");
+ if (vms->oldmessages && !res)
+ res = ast_play_and_wait(chan, "vm-and");
+ else if (!res)
+ res = ast_play_and_wait(chan, "vm-messages");
+ }
+ if (!res && vms->oldmessages) {
+ res = ast_play_and_wait(chan, "vm-have");
+ if (!res)
+ res = say_and_wait(chan, vms->oldmessages, chan->language);
+ if (!res)
+ res = ast_play_and_wait(chan, "vm-tong");
+ if (!res)
+ res = ast_play_and_wait(chan, "vm-Old");
+ if (!res)
+ res = ast_play_and_wait(chan, "vm-messages");
+ }
+ if (!res && !vms->oldmessages && !vms->newmessages) {
+ res = ast_play_and_wait(chan, "vm-haveno");
+ if (!res)
+ res = ast_play_and_wait(chan, "vm-messages");
+ }
+ return res;
}
/* UKRAINIAN syntax */
@@ -6537,8 +6523,7 @@
unsigned char buf[256];
int bytes = 0;
- if (ast_adsi_available(chan))
- {
+ if (ast_adsi_available(chan)) {
bytes += adsi_logo(buf + bytes);
bytes += ast_adsi_display(buf + bytes, ADSI_COMM_PAGE, 3, ADSI_JUST_CENT, 0, "Options Menu", "");
bytes += ast_adsi_display(buf + bytes, ADSI_COMM_PAGE, 4, ADSI_JUST_CENT, 0, "Not Done", "");
@@ -7232,8 +7217,7 @@
res = cmd;
goto out;
}
- }
- else
+ } else
cmd = ast_play_and_wait(chan, "vm-sorry");
cmd = 't';
break;
@@ -7255,8 +7239,7 @@
silentexit = 1;
goto out;
}
- }
- else
+ } else
cmd = ast_play_and_wait(chan, "vm-sorry");
cmd = 't';
break;
@@ -7336,8 +7319,7 @@
else if (play_folder == 1)
vms.oldmessages--;
cmd = ast_play_and_wait(chan, "vm-deleted");
- }
- else {
+ } else {
if (play_folder == 0)
vms.newmessages++;
else if (play_folder == 1)
@@ -7738,25 +7720,29 @@
return CLI_FAILURE;
}
- ast_cli(fd, "\n"
- "=============================================================\n"
- "=== Configured Voicemail Users ==============================\n"
- "=============================================================\n"
- "===\n");
+ ast_cli(fd,
+ "\n"
+ "=============================================================\n"
+ "=== Configured Voicemail Users ==============================\n"
+ "=============================================================\n"
+ "===\n");
while ((cat = ast_category_browse(cfg, cat))) {
struct ast_variable *var = NULL;
- ast_cli(fd, "=== Mailbox ...\n"
- "===\n");
+ ast_cli(fd,
+ "=== Mailbox ...\n"
+ "===\n");
for (var = ast_variable_browse(cfg, cat); var; var = var->next)
ast_cli(fd, "=== ==> %s: %s\n", var->name, var->value);
- ast_cli(fd, "===\n"
- "=== ---------------------------------------------------------\n"
- "===\n");
- }
-
- ast_cli(fd, "=============================================================\n"
- "\n");
+ ast_cli(fd,
+ "===\n"
+ "=== ---------------------------------------------------------\n"
+ "===\n");
+ }
+
+ ast_cli(fd,
+ "=============================================================\n"
+ "\n");
return CLI_SUCCESS;
}
@@ -8109,67 +8095,67 @@
make_dir(dirname, sizeof(dirname), vmu->context, vmu->mailbox, "INBOX");
astman_append(s,
- "%s"
- "Event: VoicemailUserEntry\r\n"
- "VMContext: %s\r\n"
- "VoiceMailbox: %s\r\n"
- "Fullname: %s\r\n"
- "Email: %s\r\n"
- "Pager: %s\r\n"
- "ServerEmail: %s\r\n"
- "MailCommand: %s\r\n"
- "Language: %s\r\n"
- "TimeZone: %s\r\n"
- "Callback: %s\r\n"
- "Dialout: %s\r\n"
- "UniqueID: %s\r\n"
- "ExitContext: %s\r\n"
- "SayDurationMinimum: %d\r\n"
- "SayEnvelope: %s\r\n"
- "SayCID: %s\r\n"
- "AttachMessage: %s\r\n"
- "AttachmentFormat: %s\r\n"
- "DeleteMessage: %s\r\n"
- "VolumeGain: %.2f\r\n"
- "CanReview: %s\r\n"
- "CallOperator: %s\r\n"
- "MaxMessageCount: %d\r\n"
- "MaxMessageLength: %d\r\n"
- "NewMessageCount: %d\r\n"
+ "%s"
+ "Event: VoicemailUserEntry\r\n"
+ "VMContext: %s\r\n"
+ "VoiceMailbox: %s\r\n"
+ "Fullname: %s\r\n"
+ "Email: %s\r\n"
+ "Pager: %s\r\n"
+ "ServerEmail: %s\r\n"
+ "MailCommand: %s\r\n"
+ "Language: %s\r\n"
+ "TimeZone: %s\r\n"
+ "Callback: %s\r\n"
+ "Dialout: %s\r\n"
+ "UniqueID: %s\r\n"
+ "ExitContext: %s\r\n"
+ "SayDurationMinimum: %d\r\n"
+ "SayEnvelope: %s\r\n"
+ "SayCID: %s\r\n"
+ "AttachMessage: %s\r\n"
+ "AttachmentFormat: %s\r\n"
+ "DeleteMessage: %s\r\n"
+ "VolumeGain: %.2f\r\n"
+ "CanReview: %s\r\n"
+ "CallOperator: %s\r\n"
+ "MaxMessageCount: %d\r\n"
+ "MaxMessageLength: %d\r\n"
+ "NewMessageCount: %d\r\n"
#ifdef IMAP_STORAGE
- "OldMessageCount: %d\r\n"
- "IMAPUser: %s\r\n"
+ "OldMessageCount: %d\r\n"
+ "IMAPUser: %s\r\n"
#endif
- "\r\n",
- actionid,
- vmu->context,
- vmu->mailbox,
- vmu->fullname,
- vmu->email,
- vmu->pager,
- vmu->serveremail,
- vmu->mailcmd,
- vmu->language,
- vmu->zonetag,
- vmu->callback,
- vmu->dialout,
- vmu->uniqueid,
- vmu->exit,
- vmu->saydurationm,
- ast_test_flag(vmu, VM_ENVELOPE) ? "Yes" : "No",
- ast_test_flag(vmu, VM_SAYCID) ? "Yes" : "No",
- ast_test_flag(vmu, VM_ATTACH) ? "Yes" : "No",
- vmu->attachfmt,
- ast_test_flag(vmu, VM_DELETE) ? "Yes" : "No",
- vmu->volgain,
- ast_test_flag(vmu, VM_REVIEW) ? "Yes" : "No",
- ast_test_flag(vmu, VM_OPERATOR) ? "Yes" : "No",
- vmu->maxmsg,
- vmu->maxsecs,
+ "\r\n",
+ actionid,
+ vmu->context,
+ vmu->mailbox,
+ vmu->fullname,
+ vmu->email,
+ vmu->pager,
+ vmu->serveremail,
+ vmu->mailcmd,
+ vmu->language,
+ vmu->zonetag,
+ vmu->callback,
+ vmu->dialout,
+ vmu->uniqueid,
+ vmu->exit,
+ vmu->saydurationm,
+ ast_test_flag(vmu, VM_ENVELOPE) ? "Yes" : "No",
+ ast_test_flag(vmu, VM_SAYCID) ? "Yes" : "No",
+ ast_test_flag(vmu, VM_ATTACH) ? "Yes" : "No",
+ vmu->attachfmt,
+ ast_test_flag(vmu, VM_DELETE) ? "Yes" : "No",
+ vmu->volgain,
+ ast_test_flag(vmu, VM_REVIEW) ? "Yes" : "No",
+ ast_test_flag(vmu, VM_OPERATOR) ? "Yes" : "No",
+ vmu->maxmsg,
+ vmu->maxsecs,
#ifdef IMAP_STORAGE
- new, old, vmu->imapuser
+ new, old, vmu->imapuser
#else
- count_messages(vmu, dirname)
+ count_messages(vmu, dirname)
#endif
);
}
@@ -8411,8 +8397,6 @@
}
if (!smdi_iface) {
ast_log(LOG_ERROR, "No valid SMDI interface specfied, disabling SMDI voicemail notification\n");
- } else {
- ast_debug(1, "Using SMDI port %s\n", smdi_iface->name);
}
}
@@ -8531,7 +8515,7 @@
}
ast_set2_flag((&globalflags), ast_true(val), VM_REVIEW);
- /*Temporary greeting reminder */
+ /* Temporary greeting reminder */
if (!(val = ast_variable_retrieve(cfg, "general", "tempgreetwarn"))) {
ast_debug(1, "VM Temporary Greeting Reminder Option disabled globally\n");
val = "no";
@@ -8977,9 +8961,7 @@
if ((temp = get_header_by_tag(header_content, "X-Asterisk-VM-Caller-ID-Num:", buf, sizeof(buf))))
snprintf(cid, sizeof(cid), "\"%s\" <%s>", cidN, temp);
- else
-
- if ((temp = get_header_by_tag(header_content, "X-Asterisk-VM-Context:", buf, sizeof(buf))))
+ else if ((temp = get_header_by_tag(header_content, "X-Asterisk-VM-Context:", buf, sizeof(buf))))
ast_copy_string(contextS, temp, sizeof(contextS));
else
contextS[0] = '\0';
@@ -9262,16 +9244,14 @@
break;
} else if (cmd == '*') {
break;
- }
-#if 0
- else if (vmu->review && (*duration < 5)) {
+#if 0
+ } else if (vmu->review && (*duration < 5)) {
/* Message is too short */
ast_verb(3, "Message too short\n");
cmd = ast_play_and_wait(chan, "vm-tooshort");
cmd = ast_filedelete(tempfile, NULL);
break;
- }
- else if (vmu->review && (cmd == 2 && *duration < (maxsilence + 3))) {
+ } else if (vmu->review && (cmd == 2 && *duration < (maxsilence + 3))) {
/* Message is all silence */
ast_verb(3, "Nothing recorded\n");
cmd = ast_filedelete(tempfile, NULL);
@@ -9279,9 +9259,8 @@
if (!cmd)
cmd = ast_play_and_wait(chan, "vm-speakup");
break;
- }
#endif
- else {
+ } else {
/* If all is well, a message exists */
message_exists = 1;
cmd = 0;
@@ -9338,8 +9317,7 @@
return cmd;
if (message_exists) {
cmd = ast_play_and_wait(chan, "vm-review");
- }
- else {
+ } else {
cmd = ast_play_and_wait(chan, "vm-torerecord");
if (!cmd)
cmd = ast_waitfordigit(chan, 600);
@@ -9811,7 +9789,7 @@
}
ast_debug(3, "User %s mailbox set for update.\n", user);
-
+
vms->updated = 1; /* Set updated flag since mailbox changed */
}
@@ -9852,12 +9830,12 @@
if (!body || body == NIL)
return -1;
- body_content = mail_fetchbody (vms->mailstream, vms->msgArray[vms->curmsg], section, &len);
+ body_content = mail_fetchbody(vms->mailstream, vms->msgArray[vms->curmsg], section, &len);
if (body_content != NIL) {
snprintf(filename, sizeof(filename), "%s.%s", vms->fn, format);
/* ast_debug(1, body_content); */
- body_decoded = rfc822_base64 ((unsigned char *)body_content, len, &newlen);
- write_file (filename, (char *) body_decoded, newlen);
+ body_decoded = rfc822_base64((unsigned char *)body_content, len, &newlen);
+ write_file(filename, (char *) body_decoded, newlen);
}
return 0;
}
@@ -9885,7 +9863,7 @@
/* This is a workaround so that menuselect displays a proper description
* AST_MODULE_INFO(, , "Comedian Mail (Voicemail System)"
*/
-
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
.load = load_module,
.unload = unload_module,
Modified: team/russell/chan_refcount/build_tools/make_version_c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/build_tools/make_version_c?view=diff&rev=104567&r1=104566&r2=104567
==============================================================================
--- team/russell/chan_refcount/build_tools/make_version_c (original)
+++ team/russell/chan_refcount/build_tools/make_version_c Wed Feb 27 10:34:27 2008
@@ -14,7 +14,7 @@
#include "asterisk.h"
-#include "asterisk/version.h"
+#include "asterisk/ast_version.h"
static const char asterisk_version[] = "${ASTERISKVERSION}${EXTRA}";
Modified: team/russell/chan_refcount/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_sip.c?view=diff&rev=104567&r1=104566&r2=104567
==============================================================================
--- team/russell/chan_refcount/channels/chan_sip.c (original)
+++ team/russell/chan_refcount/channels/chan_sip.c Wed Feb 27 10:34:27 2008
@@ -173,7 +173,7 @@
#include "asterisk/abstract_jb.h"
#include "asterisk/threadstorage.h"
#include "asterisk/translate.h"
-#include "asterisk/version.h"
+#include "asterisk/ast_version.h"
#include "asterisk/event.h"
#include "asterisk/tcptls.h"
@@ -11488,7 +11488,7 @@
const char *content_type = get_header(req, "Content-Type");
if (strcmp(content_type, "text/plain")) { /* No text/plain attachment */
- transmit_response(p, "415 Unsupported Media Type", req); /* Good enough, or? */
+ transmit_response(p, "415 Unsupported Media Type", req);
if (!p->owner)
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
return;
@@ -11515,7 +11515,7 @@
transmit_response(p, "202 Accepted", req); /* We respond 202 accepted, since we relay the message */
} else { /* Message outside of a call, we do not support that */
ast_log(LOG_WARNING, "Received message to %s from %s, dropped it...\n Content-Type:%s\n Message: %s\n", get_header(req, "To"), get_header(req, "From"), content_type, buf);
- transmit_response(p, "405 Method Not Allowed", req); /* Good enough, or? */
+ transmit_response(p, "405 Method Not Allowed", req);
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
}
return;
@@ -11880,7 +11880,7 @@
return _sip_show_peers(a->fd, NULL, NULL, NULL, a->argc, (const char **) a->argv);
}
[... 6008 lines stripped ...]
More information about the svn-commits
mailing list