[svn-commits] murf: branch murf/bug_7606 r39424 - in
/team/murf/bug_7606: ./ apps/ channels...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Tue Aug 8 16:35:45 MST 2006
Author: murf
Date: Tue Aug 8 18:35:44 2006
New Revision: 39424
URL: http://svn.digium.com/view/asterisk?rev=39424&view=rev
Log:
Merged revisions 39349,39351,39353,39378,39380,39404 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r39349 | file | 2006-08-08 11:02:45 -0600 (Tue, 08 Aug 2006) | 2 lines
Add support for Sigma Designs cards. These basically allow you to offload dialtone generation to the board. If you're using a quicknet board where this might work, give it a try as well. (issue #6092 reported by ywalther - minor mods by moi)
................
r39351 | mogorman | 2006-08-08 11:07:41 -0600 (Tue, 08 Aug 2006) | 3 lines
some code clean up and catch for a act_hook being called
without a packet.
................
r39353 | russell | 2006-08-08 11:29:09 -0600 (Tue, 08 Aug 2006) | 9 lines
Blocked revisions 39350 via svnmerge
........
r39350 | russell | 2006-08-08 13:04:10 -0400 (Tue, 08 Aug 2006) | 2 lines
Increase the buffer size for the callid (issue #7675, reported by pssatcs)
........
................
r39378 | nadi | 2006-08-08 12:13:40 -0600 (Tue, 08 Aug 2006) | 7 lines
* first bits of decoding facility information elements
* fail on misdn_cfg_init() if elements in the config enum don't match with the config structs in misdn_config.c
* implemented first bits for encoding ISDN facility information elements via ASN.1 descriptions
* using unnamed semaphore for syncing in misdn_thread
* advanced fax detection: configurable detect timeout and context to jump into
................
r39380 | kpfleming | 2006-08-08 12:39:41 -0600 (Tue, 08 Aug 2006) | 10 lines
Merged revisions 39379 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r39379 | kpfleming | 2006-08-08 13:39:16 -0500 (Tue, 08 Aug 2006) | 2 lines
add explicit listing of anthm's contributions (issue #7683)
........
................
r39404 | mogorman | 2006-08-08 14:35:59 -0600 (Tue, 08 Aug 2006) | 3 lines
support for imap in app_voicemail as well as some
credits fixed.
................
Added:
team/murf/bug_7606/channels/misdn/asn1.c (props changed)
- copied unchanged from r39404, trunk/channels/misdn/asn1.c
team/murf/bug_7606/channels/misdn/asn1.h (props changed)
- copied unchanged from r39404, trunk/channels/misdn/asn1.h
team/murf/bug_7606/doc/imapstorage.txt (props changed)
- copied unchanged from r39404, trunk/doc/imapstorage.txt
Modified:
team/murf/bug_7606/ (props changed)
team/murf/bug_7606/CREDITS
team/murf/bug_7606/apps/app_voicemail.c
team/murf/bug_7606/channels/chan_jingle.c
team/murf/bug_7606/channels/chan_misdn.c
team/murf/bug_7606/channels/chan_phone.c
team/murf/bug_7606/channels/misdn/Makefile
team/murf/bug_7606/channels/misdn/chan_misdn_config.h
team/murf/bug_7606/channels/misdn/fac.c
team/murf/bug_7606/channels/misdn/fac.h
team/murf/bug_7606/channels/misdn/isdn_lib.c
team/murf/bug_7606/channels/misdn/isdn_lib.h
team/murf/bug_7606/channels/misdn/isdn_msg_parser.c
team/murf/bug_7606/channels/misdn_config.c
team/murf/bug_7606/configs/phone.conf.sample
team/murf/bug_7606/pbx/ael/ael-test/runtests
team/murf/bug_7606/res/res_jabber.c
Propchange: team/murf/bug_7606/
------------------------------------------------------------------------------
automerge = on
Propchange: team/murf/bug_7606/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/murf/bug_7606/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/murf/bug_7606/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 8 18:35:44 2006
@@ -1,1 +1,1 @@
-/trunk:1-39341
+/trunk:1-39421
Modified: team/murf/bug_7606/CREDITS
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7606/CREDITS?rev=39424&r1=39423&r2=39424&view=diff
==============================================================================
--- team/murf/bug_7606/CREDITS (original)
+++ team/murf/bug_7606/CREDITS Tue Aug 8 18:35:44 2006
@@ -41,6 +41,39 @@
russelb at clemson.edu
Anthony Minessale II - Countless big and small fixes, and relentless forward push
+also:
+app_chanspy
+app_forkcdr
+app_controlplayback
+app_while
+app_dumpchan
+app_dictate
+app_realtime
+app_macroif
+app_execif
+app_execiftime
+res_odbc
+res_config_odbc
+format_slin
+app_retrydial
+cdr_custom
+res_muxmon (now MixMonitor)
+res_sqlite
+format_mp3
+Several Features in app_dial including L(), G() and enhancements to M() and D()
+The concept design and initial implementation of dialplan functions with several examples.
+Several CDR enhancements including CDR variables.
+Attended Transfer
+One Touch Record
+Native Music On Hold
+Pluggable config backend (res_config)
+Realtime Caching options and SIP/IAX clusterability
+IAX codec preferences
+Modifications to the manager API to disable events.
+command line '-t' flag to allow recording/voicemail on nfs shares.
+#exec parser in config files.
+setvar from iax and sip peers.
+mulit-line comments in config files.
anthmct at yahoo.com http://www.asterlink.com
James Golovich - Innumerable contributions
@@ -131,6 +164,16 @@
John Martin, Aupix - Improved video support in the SIP channel
Steve Underwood - Provided T.38 pass through support.
+
+George Konstantoulakis - Support for Greek in voicemail added by InAccess Networks (work funded by HOL, www.hol.gr) gkon at inaccessnetworks.com
+
+Daniel Nylander - Support for Swedish and Norwegian languages in voicemail. http://www.danielnylander.se/
+
+Stojan Sljivic - An option for maximum number of messsages per mailbox in voicemail. Also an issue with voicemail synchronization has been fixed. GDS Partners www.gdspartners.com . stojan.sljivic at gdspartners.com
+
+Bartosz Supczinski - Support for Polish added by DIR (www.dir.pl) Bartosz.Supczinski at dir.pl
+
+James Rothenberger - Support for IMAP storage integration added by OneBizTone LLC Work funded by University of Pennsylvania jar at onebiztone.com
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Modified: team/murf/bug_7606/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug_7606/apps/app_voicemail.c?rev=39424&r1=39423&r2=39424&view=diff
==============================================================================
--- team/murf/bug_7606/apps/app_voicemail.c (original)
+++ team/murf/bug_7606/apps/app_voicemail.c Tue Aug 8 18:35:44 2006
@@ -28,20 +28,6 @@
* \note This module requires res_adsi to load.
*/
-/*
- * 12-16-2004 : Support for Greek added by InAccess Networks (work funded by HOL, www.hol.gr)
- * George Konstantoulakis <gkon at inaccessnetworks.com>
- *
- * 05-10-2005 : Support for Swedish and Norwegian added by Daniel Nylander, http://www.danielnylander.se/
- *
- * 05-11-2005 : An option for maximum number of messsages per mailbox added by GDS Partners (www.gdspartners.com)
- * 07-11-2005 : An issue with voicemail synchronization has been fixed by GDS Partners (www.gdspartners.com)
- * Stojan Sljivic <stojan.sljivic at gdspartners.com>
- *
- * 12-04-2006 : Support for Polish added by DIR (www.dir.pl)
- * Bartosz Supczinski <Bartosz.Supczinski at dir.pl>
- */
-
/*** MAKEOPTS
<category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o">
<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
@@ -76,7 +62,14 @@
#include <sys/mman.h>
#include <time.h>
#include <dirent.h>
-
+#ifdef IMAP_STORAGE
+#include <ctype.h>
+#include <signal.h>
+#include <pwd.h>
+#include "c-client.h"
+#include "imap4r1.h"
+#include "linkage.h"
+#endif
#include "asterisk/lock.h"
#include "asterisk/file.h"
#include "asterisk/logger.h"
@@ -95,10 +88,56 @@
#include "asterisk/utils.h"
#include "asterisk/stringfields.h"
#include "asterisk/smdi.h"
-#define SMDI_MWI_WAIT_TIMEOUT 1000 /* 1 second */
#ifdef ODBC_STORAGE
#include "asterisk/res_odbc.h"
#endif
+
+#ifdef IMAP_STORAGE
+char *curhst = NIL; /* currently connected host */
+char *curusr = NIL; /* current login user */
+
+char temp[1024];
+
+static char imapserver[48];
+static char imapport[8];
+static char imapflags[128];
+static char authuser[32];
+static char authpassword[42];
+static int expungeonhangup = 1;
+static char delimiter = '\0';
+
+struct vm_state;
+
+int init_mailstream (struct vm_state *vms);
+void write_file (char *filename, char *buffer, unsigned long len);
+void status (MAILSTREAM *stream);
+void display_body (BODY *body, char *pfx, long i);
+static char *get_header_by_tag(char *header, char *tag);
+static void vm_imap_delete(int msgnum, struct vm_state *vms);
+static char *get_user_by_mailbox(char *mailbox);
+static struct vm_state *get_vm_state_by_imapuser(char *user, int interactive);
+static struct vm_state *get_vm_state_by_mailbox(const char *mailbox, int interactive);
+static void vmstate_insert(struct vm_state *vms);
+static void vmstate_delete(struct vm_state *vms);
+static void set_update(MAILSTREAM * stream);
+static void init_vm_state(struct vm_state *vms);
+static void check_msgArray(struct vm_state *vms);
+static void copy_msgArray(struct vm_state *dst, struct vm_state *src);
+static int save_body(BODY *body, struct vm_state *vms, char *section, char *format);
+static int make_gsm_file(char *dest, char *imapuser, char *dir, int num);
+static void get_mailbox_delimiter(MAILSTREAM *stream);
+void mm_parsequota (MAILSTREAM *stream, unsigned char *msg, QUOTALIST *pquota);
+/* should define TMP in config file... */
+#define TMP "/tmp"
+struct vmstate {
+ struct vm_state *vms;
+ struct vmstate *next;
+};
+AST_MUTEX_DEFINE_STATIC(vmstate_lock);
+static struct vmstate *vmstates = NULL;
+#endif
+
+#define SMDI_MWI_WAIT_TIMEOUT 1000 /* 1 second */
#define COMMAND_TIMEOUT 5000
/* Don't modify these here; set your umask at runtime instead */
@@ -142,6 +181,7 @@
#define VM_SEARCH (1 << 14)
#define VM_TEMPGREETWARN (1 << 15) /*!< Remind user tempgreeting is set */
#define ERROR_LOCK_PATH -100
+
enum {
OPT_SILENT = (1 << 0),
@@ -272,6 +312,9 @@
unsigned int flags; /*!< VM_ flags */
int saydurationm;
int maxmsg; /*!< Maximum number of msgs per folder for this mailbox */
+#ifdef IMAP_STORAGE
+ char imapuser[80]; /* IMAP server login */
+#endif
double volgain; /*!< Volume gain for voicemails sent via email */
AST_LIST_ENTRY(ast_vm_user) list;
};
@@ -298,6 +341,17 @@
int oldmessages;
int starting;
int repeats;
+#ifdef IMAP_STORAGE
+ int updated; /* decremented on each mail check until 1 -allows delay */
+ long msgArray[256];
+ MAILSTREAM *mailstream;
+ int vmArrayIndex;
+ char imapuser[80]; /* IMAP server login */
+ int interactive;
+ unsigned int quota_limit;
+ unsigned int quota_usage;
+ struct vm_state *persist_vms;
+#endif
};
static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int msg, int option, signed char record_gain);
static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, char *outgoing_context);
@@ -306,7 +360,10 @@
signed char record_gain);
static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, char *fmtc, signed char record_gain);
static int vm_play_folder_name(struct ast_channel *chan, char *mbox);
-
+static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, int msgnum, long duration, char *fmt, char *cidnum, char *cidname);
+#ifndef ODBC_STORAGE
+static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit);
+#endif
static void apply_options(struct ast_vm_user *vmu, const char *options);
#ifdef ODBC_STORAGE
@@ -320,6 +377,16 @@
#define COPY(a,b,c,d,e,f,g,h) (copy_file(a,b,c,d,e,f))
#define DELETE(a,b,c) (delete_file(a,b))
#else
+#ifdef IMAP_STORAGE
+#define RETRIEVE(a,b)
+#define DISPOSE(a,b)
+#define STORE(a,b,c,d)
+#define EXISTS(a,b,c,d) (ast_fileexists(c,NULL,d) > 0)
+#define RENAME(a,b,c,d,e,f,g,h) (rename_file(g,h));
+#define COPY(a,b,c,d,e,f,g,h) (copy_file(g,h));
+#define IMAP_DELETE(a,b,c,d) (vm_imap_delete(b,d))
+#define DELETE(a,b,c) (vm_delete(c))
+#else
#define RETRIEVE(a,b)
#define DISPOSE(a,b)
#define STORE(a,b,c,d)
@@ -328,12 +395,20 @@
#define COPY(a,b,c,d,e,f,g,h) (copy_file(g,h));
#define DELETE(a,b,c) (vm_delete(c))
#endif
+#endif
static char VM_SPOOL_DIR[PATH_MAX];
static char ext_pass_cmd[128];
-
+#ifdef ODBC_STORAGE
+static char *tdesc = "Comedian Mail (Voicemail System) with ODBC Storage";
+#else
+#ifdef IMAP_STORAGE
+static char *tdesc = "Comedian Mail (Voicemail System) with IMAP Storage";
+#else
static char *tdesc = "Comedian Mail (Voicemail System)";
+#endif
+#endif
static char *addesc = "Comedian Mail";
@@ -360,7 +435,7 @@
" message. The units are whole-number decibels (dB).\n"
" s - Skip the playback of instructions for leaving a message to the\n"
" calling party.\n"
-" u - Play the 'unavailable greeting.\n"
+" u - Play the 'unavailble greeting.\n"
" j - Jump to priority n+101 if the mailbox is not found or some other\n"
" error occurs.\n";
@@ -491,6 +566,10 @@
ast_copy_string(vmu->language, value, sizeof(vmu->language));
} else if (!strcasecmp(var, "tz")) {
ast_copy_string(vmu->zonetag, value, sizeof(vmu->zonetag));
+#ifdef IMAP_STORAGE
+ } else if (!strcasecmp(var, "imapuser")) {
+ strncpy(vmu->imapuser, value, sizeof(vmu->imapuser) - 1);
+#endif
} else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) {
ast_set2_flag(vmu, ast_true(value), VM_DELETE);
} else if (!strcasecmp(var, "saycid")){
@@ -799,10 +878,8 @@
{
char buf[255];
snprintf(buf,255,"%s %s %s %s",ext_pass_cmd,vmu->context,vmu->mailbox,newpassword);
- if (!ast_safe_system(buf)) {
- reset_user_pw(vmu->context, vmu->mailbox, newpassword);
+ if (!ast_safe_system(buf))
ast_copy_string(vmu->password, newpassword, sizeof(vmu->password));
- }
}
static int make_dir(char *dest, int len, const char *context, const char *ext, const char *folder)
@@ -810,6 +887,40 @@
return snprintf(dest, len, "%s%s/%s/%s", VM_SPOOL_DIR, context, ext, folder);
}
+#ifdef IMAP_STORAGE
+static int make_gsm_file(char *dest, char *imapuser, char *dir, int num)
+{
+ char gsmdir[256];
+
+ sprintf(gsmdir,"%s/%s",dir,imapuser);
+ if (mkdir(gsmdir, 01777) && (errno != EEXIST)) {
+ ast_log(LOG_WARNING, "mkdir '%s' failed: %s\n", gsmdir, strerror(errno));
+ return sprintf(dest, "%s/msg%04d", dir, num);
+ }
+ /* return sprintf(dest, "%s/s/msg%04d", dir, imapuser, num); */
+ return sprintf(dest, "%s/%s/msg%04d", dir, imapuser, num);
+}
+
+static void vm_imap_delete(int msgnum, struct vm_state *vms)
+{
+ unsigned long messageNum = 0;
+ char arg[10];
+
+ /* find real message number based on msgnum */
+ /* this may be an index into vms->msgArray based on the msgnum. */
+
+ messageNum = vms->msgArray[msgnum];
+ if (messageNum == 0) {
+ ast_log(LOG_WARNING, "msgnum %d, mailbox message %lu is zero.\n",msgnum,messageNum);
+ return;
+ }
+ ast_log(LOG_DEBUG, "deleting msgnum %d, which is mailbox message %lu\n",msgnum,messageNum);
+ /* delete message */
+ sprintf (arg,"%lu",messageNum);
+ mail_setflag (vms->mailstream,arg,"\\DELETED");
+}
+
+#endif
static int make_file(char *dest, int len, char *dir, int num)
{
return snprintf(dest, len, "%s/msg%04d", dir, num);
@@ -1446,7 +1557,6 @@
}
#else
-
static int count_messages(struct ast_vm_user *vmu, char *dir)
{
/* Find all .txt files - even if they are not in sequence from 0000 */
@@ -1755,7 +1865,7 @@
return p;
}
-static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *context, char *mailbox, char *cidnum, char *cidname, char *attach, char *format, int duration, int attach_user_voicemail, const char *category)
+static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *context, char *mailbox, char *cidnum, char *cidname, char *attach, char *format, int duration, int attach_user_voicemail, struct ast_channel *chan, const char *category)
{
FILE *p=NULL;
char date[256];
@@ -1838,6 +1948,23 @@
else
fprintf(p, "Subject: [PBX]: New message %d in mailbox %s\n", msgnum + 1, mailbox);
fprintf(p, "Message-ID: <Asterisk-%d-%d-%s-%d@%s>\n", msgnum, (unsigned int)ast_random(), mailbox, getpid(), host);
+#ifdef IMAP_STORAGE
+ /* additional information needed for IMAP searching */
+ fprintf(p, "X-Asterisk-VM-Message-Num: %d\n", msgnum + 1);
+ /* fprintf(p, "X-Asterisk-VM-Orig-Mailbox: %s\n", ext); */
+ fprintf(p, "X-Asterisk-VM-Server-Name: %s\n", fromstring);
+ fprintf(p, "X-Asterisk-VM-Context: %s\n", context);
+ fprintf(p, "X-Asterisk-VM-Extension: %s\n", chan->exten);
+ fprintf(p, "X-Asterisk-VM-Priority: %d\n", chan->priority);
+ fprintf(p, "X-Asterisk-VM-Caller-channel: %s\n", chan->name);
+ fprintf(p, "X-Asterisk-VM-Caller-ID-Num: %s\n", cidnum);
+ fprintf(p, "X-Asterisk-VM-Caller-ID-Name: %s\n", cidname);
+ fprintf(p, "X-Asterisk-VM-Duration: %d\n", duration);
+ if (category != NULL)
+ fprintf(p, "X-Asterisk-VM-Category: %s\n", category);
+ fprintf(p, "X-Asterisk-VM-Orig-date: %s\n", date);
+ fprintf(p, "X-Asterisk-VM-Orig-time: %ld\n", (long)time(NULL));
+#endif
if (!ast_strlen_zero(cidnum))
fprintf(p, "X-Asterisk-CallerID: %s\n", cidnum);
if (!ast_strlen_zero(cidname))
@@ -1898,6 +2025,20 @@
snprintf(fname, sizeof(fname), "%s.%s", attach, format);
base_encode(fname, p);
+#ifdef IMAP_STORAGE
+ /* only attach if necessary */
+ ast_log(LOG_DEBUG, "Before second attachment with format set to:%s\n",format);
+ if (strcmp(format, "gsm")) {
+ fprintf(p, "--%s\n", bound);
+ fprintf(p, "Content-Type: audio/x-gsm; name=\"msg%04d.%s\"\n", msgnum, format);
+ fprintf(p, "Content-Transfer-Encoding: base64\n");
+ fprintf(p, "Content-Description: Voicemail sound attachment.\n");
+ fprintf(p, "Content-Disposition: attachment; filename=\"msg%04d.gsm\"\n\n", msgnum);
+
+ snprintf(fname, sizeof(fname), "%s.gsm", attach);
+ base_encode(fname, p);
+ }
+#endif
fprintf(p, "\n\n--%s--\n.\n", bound);
if (tmpfd > -1)
close(tmpfd);
@@ -1994,6 +2135,7 @@
return 0;
}
+#ifndef IMAP_STORAGE
static int get_date(char *s, int len)
{
struct tm tm;
@@ -2002,6 +2144,7 @@
localtime_r(&t,&tm);
return strftime(s, len, "%a %b %e %r %Z %Y", &tm);
}
+#endif
static int invent_message(struct ast_channel *chan, char *context, char *ext, int busy, char *ecodes)
{
@@ -2246,7 +2389,205 @@
}
#else
-
+#ifdef IMAP_STORAGE
+static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs)
+{
+ SEARCHPGM *pgm;
+ SEARCHHEADER *hdr;
+
+ struct ast_vm_user *vmu;
+ struct vm_state *vms_p;
+ char tmp[256]="";
+ char *mb, *cur;
+ char *mailboxnc;
+ char *context;
+ int ret = 0;
+ if (newmsgs)
+ *newmsgs = 0;
+ if (oldmsgs)
+ *oldmsgs = 0;
+
+ ast_log (LOG_DEBUG,"Mailbox is set to %s\n",mailbox);
+ /* If no mailbox, return immediately */
+ if (ast_strlen_zero(mailbox))
+ return 0;
+ if (strchr(mailbox, ',')) {
+ int tmpnew, tmpold;
+ strncpy(tmp, mailbox, sizeof(tmp) - 1);
+ mb = tmp;
+ ret = 0;
+ while((cur = strsep(&mb, ", "))) {
+ if (!ast_strlen_zero(cur)) {
+ if (messagecount(cur, newmsgs ? &tmpnew : NULL, oldmsgs ? &tmpold : NULL))
+ return -1;
+ else {
+ if (newmsgs)
+ *newmsgs += tmpnew;
+ if (oldmsgs)
+ *oldmsgs += tmpold;
+ }
+ }
+ }
+ return 0;
+ }
+
+ strncpy(tmp, mailbox, sizeof(tmp) - 1);
+ context = strchr(tmp, '@');
+ if (context) {
+ *context = '\0';
+ mailboxnc = tmp;
+ context++;
+ } else {
+ context = "default";
+ mailboxnc = (char *)mailbox;
+ }
+
+ /* We have to get the user before we can open the stream! */
+ /*ast_log (LOG_DEBUG,"Before find_user, context is %s and mailbox is %s\n",context,mailbox); */
+ vmu = find_user(NULL, context, mailboxnc);
+ if (vmu == NULL) {
+ ast_log (LOG_ERROR,"Couldn't find mailbox %s in context %s\n",mailboxnc,context);
+ return -1;
+ } else {
+ /* No IMAP account available */
+ if (vmu->imapuser[0] == '\0') {
+ ast_log (LOG_WARNING,"IMAP user not set for mailbox %s\n",vmu->mailbox);
+ return -1;
+ }
+ }
+
+ /* check if someone is accessing this box right now... */
+ vms_p = get_vm_state_by_imapuser(vmu->imapuser,1);
+ if (vms_p == NULL) {
+ vms_p = get_vm_state_by_mailbox(mailboxnc,1);
+ }
+ if (vms_p != NULL) {
+ ast_log (LOG_DEBUG,"Returning before search - user is logged in\n");
+ *newmsgs = vms_p->newmessages;
+ *oldmsgs = vms_p->oldmessages;
+ return 0;
+ }
+
+ /* add one if not there... */
+ vms_p = get_vm_state_by_imapuser(vmu->imapuser,0);
+ if (vms_p == NULL) {
+ vms_p = get_vm_state_by_mailbox(mailboxnc,0);
+ }
+
+ if (vms_p == NULL) {
+ ast_log (LOG_DEBUG,"Adding new vmstate for %s\n",vmu->imapuser);
+ vms_p = (struct vm_state *)malloc(sizeof(struct vm_state));
+ strcpy(vms_p->imapuser,vmu->imapuser);
+ strcpy(vms_p->username,mailboxnc); /* save for access from interactive entry point */
+ vms_p->mailstream = NIL; /* save for access from interactive entry point */
+ ast_log (LOG_DEBUG,"Copied %s to %s\n",vmu->imapuser,vms_p->imapuser);
+ vms_p->updated = 1;
+ vms_p->interactive = 0;
+ /* set mailbox to INBOX! */
+ strncpy(vms_p->curbox, mbox(0), sizeof(vms_p->curbox) - 1);
+ init_vm_state(vms_p);
+ vmstate_insert(vms_p);
+ }
+ if (vms_p->mailstream == NULL)
+ ret = init_mailstream(vms_p);
+ if (vms_p->mailstream == NULL) {
+ ast_log (LOG_ERROR,"Houston we have a problem - IMAP mailstream is NULL\n");
+ return -1;
+ }
+ if (newmsgs && ret==0 && vms_p->updated==1 ) {
+ pgm = mail_newsearchpgm ();
+ hdr = mail_newsearchheader ("X-Asterisk-VM-Extension", (char *)mailboxnc);
+ pgm->header = hdr;
+ pgm->unseen = 1;
+ pgm->seen = 0;
+ pgm->undeleted = 1;
+ pgm->deleted = 0;
+
+ vms_p->vmArrayIndex = 0;
+
+ ast_log (LOG_DEBUG,"Before search of mailbox %s for NEW messages\n",vms_p->mailstream->mailbox);
+ mail_search_full (vms_p->mailstream, NULL, pgm, NIL);
+ ast_log (LOG_DEBUG,"After search\n");
+ *newmsgs = vms_p->vmArrayIndex;
+ vms_p->newmessages = vms_p->vmArrayIndex;
+ ast_log (LOG_DEBUG,"There are %d NEW messages\n",vms_p->newmessages);
+ }
+ if (oldmsgs && ret==0 && vms_p->updated==1 ) {
+ pgm = mail_newsearchpgm ();
+ hdr = mail_newsearchheader ("X-Asterisk-VM-Extension", (char *)mailboxnc);
+ pgm->header = hdr;
+ pgm->unseen = 0;
+ pgm->seen = 1;
+ pgm->deleted = 0;
+ pgm->undeleted = 1;
+
+ vms_p->vmArrayIndex = 0;
+
+ ast_log (LOG_DEBUG,"Before search of mailbox %s for OLD messages\n",vms_p->mailstream->mailbox);
+ mail_search_full (vms_p->mailstream, NULL, pgm, NIL);
+ *oldmsgs = vms_p->vmArrayIndex;
+ vms_p->oldmessages = vms_p->vmArrayIndex;
+ ast_log (LOG_DEBUG,"There are %d OLD messages\n",vms_p->oldmessages);
+ }
+ if (vms_p->updated == 1) { /* changes, so we did the searches above */
+ vms_p->updated = 0;
+ } else if (vms_p->updated > 1) { /* decrement delay count */
+ vms_p->updated--;
+ } else { /* no changes, so don't search */
+ ast_log (LOG_DEBUG,"Calling mail_ping on mailbox %s\n",vms_p->mailstream->mailbox);
+ mail_ping(vms_p->mailstream);
+ /* Keep the old data */
+ *newmsgs = vms_p->newmessages;
+ *oldmsgs = vms_p->oldmessages;
+ }
+ return 0;
+ }
+#else
+
+static int messagecount(const char *context, const char *mailbox, const char *folder)
+{
+ return __has_voicemail(context, mailbox, folder, 0);
+}
+
+#endif
+#endif
+
+/* copy message only used by file storage */
+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 fromdir[256], todir[256], frompath[256], topath[256];
+ const char *frombox = mbox(imbox);
+ int recipmsgnum;
+
+ ast_log(LOG_NOTICE, "Copying message from %s@%s to %s@%s\n", vmu->mailbox, vmu->context, recip->mailbox, recip->context);
+
+ create_dirpath(todir, sizeof(todir), recip->context, recip->mailbox, "INBOX");
+
+ make_dir(fromdir, sizeof(fromdir), vmu->context, vmu->mailbox, frombox);
+ make_file(frompath, sizeof(frompath), fromdir, msgnum);
+
+ if (vm_lock_path(todir))
+ return ERROR_LOCK_PATH;
+
+ recipmsgnum = 0;
+ do {
+ make_file(topath, sizeof(topath), todir, recipmsgnum);
+ if (!EXISTS(todir, recipmsgnum, topath, chan->language))
+ break;
+ recipmsgnum++;
+ } while (recipmsgnum < recip->maxmsg);
+ if (recipmsgnum < recip->maxmsg) {
+ COPY(fromdir, msgnum, todir, recipmsgnum, recip->mailbox, recip->context, frompath, topath);
+ } else {
+ ast_log(LOG_ERROR, "Recipient mailbox %s@%s is full\n", recip->mailbox, recip->context);
+ }
+ ast_unlock_path(todir);
+ notify_new_message(chan, recip, recipmsgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
+
+ return 0;
+}
+
+#ifndef ODBC_STORAGE
static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit)
{
DIR *dir;
@@ -2277,6 +2618,7 @@
return ret;
}
+
static int has_voicemail(const char *mailbox, const char *folder)
{
char tmp[256], *tmp2 = tmp, *mbox, *context;
@@ -2292,10 +2634,6 @@
return 0;
}
-static int messagecount(const char *context, const char *mailbox, const char *folder)
-{
- return __has_voicemail(context, mailbox, folder, 0);
-}
static int inboxcount(const char *mailbox, int *newmsgs, int *oldmsgs)
{
@@ -2345,42 +2683,6 @@
#endif
-static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, int msgnum, long duration, char *fmt, char *cidnum, char *cidname);
-
-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 fromdir[256], todir[256], frompath[256], topath[256];
- const char *frombox = mbox(imbox);
- int recipmsgnum;
-
- ast_log(LOG_NOTICE, "Copying message from %s@%s to %s@%s\n", vmu->mailbox, vmu->context, recip->mailbox, recip->context);
-
- create_dirpath(todir, sizeof(todir), recip->context, recip->mailbox, "INBOX");
-
- make_dir(fromdir, sizeof(fromdir), vmu->context, vmu->mailbox, frombox);
- make_file(frompath, sizeof(frompath), fromdir, msgnum);
-
- if (vm_lock_path(todir))
- return ERROR_LOCK_PATH;
-
- recipmsgnum = 0;
- do {
- make_file(topath, sizeof(topath), todir, recipmsgnum);
- if (!EXISTS(todir, recipmsgnum, topath, chan->language))
- break;
- recipmsgnum++;
- } while (recipmsgnum < recip->maxmsg);
- if (recipmsgnum < recip->maxmsg) {
- COPY(fromdir, msgnum, todir, recipmsgnum, recip->mailbox, recip->context, frompath, topath);
- } else {
- ast_log(LOG_ERROR, "Recipient mailbox %s@%s is full\n", recip->mailbox, recip->context);
- }
- ast_unlock_path(todir);
- notify_new_message(chan, recip, recipmsgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
-
- return 0;
-}
-
static void run_externnotify(char *context, char *extension)
{
char arguments[255];
@@ -2428,16 +2730,22 @@
static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_options *options)
{
- char txtfile[256], tmptxtfile[256];
+#ifdef IMAP_STORAGE
+ int newmsgs, oldmsgs;
+ struct vm_state *vms;
+#else
+ char tmptxtfile[256], txtfile[256];
char callerid[256];
FILE *txt;
- int res = 0, txtdes;
+ char date[256];
+ int txtdes;
+#endif
+ int res = 0;
int msgnum;
int duration = 0;
int ausemacro = 0;
int ousemacro = 0;
int ouseexten = 0;
- char date[256];
char dir[256], tmpdir[260];
char fn[256];
char prefile[256]="";
@@ -2466,6 +2774,7 @@
category = pbx_builtin_getvar_helper(chan, "VM_CATEGORY");
+ ast_log(LOG_DEBUG, "Before find_user\n");
if (!(vmu = find_user(&svm, context, ext))) {
ast_log(LOG_WARNING, "No entry in voicemail config file for '%s'\n", ext);
if (ast_test_flag(options, OPT_PRIORITY_JUMP) || ast_opt_priority_jumping)
@@ -2504,8 +2813,8 @@
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;
+ strncat(ecodes, "0", sizeof(ecodes) - strlen(ecodes) - 1);
+ ousemacro = 1;
}
}
@@ -2595,6 +2904,55 @@
if (!ast_strlen_zero(fmt)) {
msgnum = 0;
+#ifdef IMAP_STORAGE
+ /* Is ext a mailbox? */
+ /* must open stream for this user to get info! */
+ vms = get_vm_state_by_mailbox(ext,0);
+ if (vms != NULL) {
+ ast_log(LOG_DEBUG, "Using vm_state, interactive set to %d.\n",vms->interactive);
+ newmsgs = vms->newmessages++;
+ oldmsgs = vms->oldmessages;
+ } else {
+ ast_log(LOG_DEBUG, "About to call messagecount.\n");
+ res = messagecount(ext, &newmsgs, &oldmsgs);
+ if(res < 0) {
+ ast_log(LOG_NOTICE,"Can not leave voicemail, unable to count messages\n");
+ return -1;
+ }
+ }
+ /* here is a big difference! We add one to it later */
+ msgnum = newmsgs + oldmsgs;
+ ast_log(LOG_NOTICE, "Messagecount set to %d\n",msgnum);
+ sprintf(fn, "%s/msg%s%04d", TMP, vmu->mailbox, msgnum);
+ /* set variable for compatability */
+ pbx_builtin_setvar_helper(chan, "VM_MESSAGEFILE", "IMAP_STORAGE");
+
+ /* Check if mailbox is full */
+ if (vms->quota_usage >= vms->quota_limit) {
+ ast_log(LOG_DEBUG, "*** QUOTA EXCEEDED!!\n");
+ ast_play_and_wait(chan, "vm-mailboxfull");
+ return -1;
+ }
+
+ /* play beep */
+ res = ast_streamfile(chan, "beep", chan->language);
+ if (!res)
+ res = ast_waitstream(chan, "");
+ /* play_record_review does recording and verify */
+ ast_log(LOG_DEBUG, "About to record message in file %s\n",fn);
+ res = play_record_review(chan, NULL, fn, vmmaxmessage, fmt, 1, vmu, &duration, dir, options->record_gain);
+ if (res == '0') {
+ goto transfer;
+ }
+ if (res > 0) res = 0;
+
+ if (duration < vmminmessage) {
+ if (option_verbose > 2)
+ ast_verbose( VERBOSE_PREFIX_3 "Recording was %d seconds long but needs to be at least %d - abandoning\n", duration, vmminmessage);
+ goto leave_vm_out;
+ }
+ notify_new_message(chan, vmu, msgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
+#else
if (count_messages(vmu, dir) >= vmu->maxmsg) {
res = ast_streamfile(chan, "vm-mailboxfull", chan->language);
if (!res)
@@ -2620,7 +2978,7 @@
/* Unless we're *really* silent, try to send the beep */
res = ast_stream_and_wait(chan, "beep", chan->language, "");
}
-
+
/* Store information */
txt = fdopen(txtdes, "w+");
if (txt) {
@@ -2652,12 +3010,11 @@
} else
ast_log(LOG_WARNING, "Error opening text file for output\n");
res = play_record_review(chan, NULL, tmptxtfile, vmmaxmessage, fmt, 1, vmu, &duration, NULL, options->record_gain);
-
+
if (txt) {
if (duration < vmminmessage) {
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Recording was %d seconds long but needs to be at least %d - abandoning\n", duration, vmminmessage);
- fclose(txt);
ast_filedelete(tmptxtfile, NULL);
unlink(tmptxtfile);
} else {
@@ -2689,12 +3046,11 @@
rename(tmptxtfile, txtfile);
ast_unlock_path(dir);
-
/* Are there to be more recipients of this message? */
while (tmpptr) {
struct ast_vm_user recipu, *recip;
char *exten, *context;
-
+
exten = strsep(&tmpptr, "&");
context = strchr(exten, '@');
if (context) {
@@ -2706,7 +3062,7 @@
free_user(recip);
}
}
- if (ast_fileexists(fn, NULL, NULL) > 0) {
+ if (ast_fileexists(fn, NULL, NULL)) {
STORE(dir, vmu->mailbox, vmu->context, msgnum);
notify_new_message(chan, vmu, msgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
DISPOSE(dir, msgnum);
@@ -2714,7 +3070,7 @@
}
}
}
-
+#endif
if (res == '0') {
goto transfer;
} else if (res > 0)
@@ -2733,6 +3089,7 @@
return res;
}
+#ifndef IMAP_STORAGE
static int resequence_mailbox(struct ast_vm_user *vmu, char *dir)
{
/* we know max messages, so stop process when number is hit */
@@ -2760,7 +3117,7 @@
return 0;
}
-
+#endif
static int say_and_wait(struct ast_channel *chan, int num, const char *language)
{
@@ -2769,8 +3126,27 @@
return d;
}
-static int save_to_folder(struct ast_vm_user *vmu, char *dir, int msg, char *context, char *username, int box)
-{
+static int save_to_folder(struct ast_vm_user *vmu, struct vm_state *vms, int msg, int box)
+{
+#ifdef IMAP_STORAGE
+ /* we must use mbox(x) folder names, and copy the message there */
+ /* simple. huh? */
+ char *dbox = mbox(box);
+ long res;
+ char sequence[10];
+
+ /* if save to Old folder, just leave in INBOX */
+ if (box == 1) return 10;
+ /* get the real IMAP message number for this message */
+ sprintf(sequence,"%ld",vms->msgArray[msg]);
+ ast_log(LOG_DEBUG, "Copying sequence %s to mailbox %s\n",sequence,dbox);
+ res = mail_copy(vms->mailstream,sequence,dbox);
+ if (res == 1) return 0;
+ return 1;
+#else
+ char *dir = vms->curdir;
+ char *username = vms->username;
+ char *context = vmu->context;
char sfn[256];
char dfn[256];
char ddir[256];
@@ -2795,7 +3171,7 @@
COPY(dir, msg, ddir, x, username, context, sfn, dfn);
}
ast_unlock_path(ddir);
-
+#endif
return 0;
}
@@ -3385,8 +3761,15 @@
int newmsgs = 0, oldmsgs = 0;
const char *category = pbx_builtin_getvar_helper(chan, "VM_CATEGORY");
+ ast_log(LOG_DEBUG, "In notify_new_message...\n");
+
+#ifdef IMAP_STORAGE
+ stpcpy(todir,TMP);
+ sprintf(fn, "%s/msg%s%04d", todir, vmu->mailbox, msgnum);
+#else
make_dir(todir, sizeof(todir), vmu->context, vmu->mailbox, "INBOX");
make_file(fn, sizeof(fn), todir, msgnum);
+#endif
snprintf(ext_context, sizeof(ext_context), "%s@%s", vmu->mailbox, vmu->context);
if (!ast_strlen_zero(vmu->attachfmt)) {
@@ -3408,7 +3791,8 @@
attach_user_voicemail = ast_test_flag(vmu, VM_ATTACH);
if (!ast_strlen_zero(vmu->serveremail))
myserveremail = vmu->serveremail;
- sendmail(myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, fn, fmt, duration, attach_user_voicemail, category);
+ /*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 (!ast_strlen_zero(vmu->pager)) {
@@ -3431,25 +3815,37 @@
return 0;
}
-static int forward_message(struct ast_channel *chan, char *context, char *dir, int curmsg, struct ast_vm_user *sender, char *fmt, int flag, signed char record_gain)
-{
+static int forward_message(struct ast_channel *chan, char *context, struct vm_state *vms, struct ast_vm_user *sender, char *fmt, int flag, signed char record_gain)
+{
+#ifdef IMAP_STORAGE
+ BODY *body;
+ char *header_content;
+ char *temp;
+#else
+ struct ast_config *mif;
+ char sys[256];
+ char miffile[256];
+ char callerid[512];
+ char tmp[256];
+ char ext_context[256]="";
+#endif
char username[70]="";
- char sys[256];
char todir[256];
int todircount=0;
int duration;
- struct ast_config *mif;
- char miffile[256];
char fn[256];
- char callerid[512];
- char ext_context[256]="";
int res = 0, cmd = 0;
struct ast_vm_user *receiver = NULL, *vmtmp;
AST_LIST_HEAD_NOLOCK_STATIC(extensions, ast_vm_user);
- char tmp[256];
char *stringp, *s;
int saved_messages = 0, found = 0;
int valid_extensions = 0;
+ char *dir;
+ int curmsg;
+
+ if (vms == NULL) return -1;
+ dir = vms->curdir;
+ curmsg = vms->curmsg;
while (!res && !valid_extensions) {
int use_directory = 0;
@@ -3574,6 +3970,65 @@
cmd = vm_forwardoptions(chan, sender, dir, curmsg, vmfmts, context, record_gain);
if (!cmd) {
AST_LIST_TRAVERSE_SAFE_BEGIN(&extensions, vmtmp, list) {
+#ifdef IMAP_STORAGE
+ /* NEED TO CHANGE username to mailbox!! - JAR */
+ /* Need to get message content */
+ ast_log (LOG_DEBUG,"Before mail_fetchheaders, curmsg is: %d, imap messages is %lu\n",vms->curmsg, vms->msgArray[vms->curmsg]);
+ if (vms->msgArray[vms->curmsg] == 0) {
+ 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 (header_content == "" || header_content == NULL) {
+ 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 */
+ temp = get_header_by_tag(header_content, "X-Asterisk-VM-Duration:");
+ if (temp != NULL)
+ duration = atoi(temp);
+ else
+ duration = 0;
+
+ /* Attach only the first format */
+ fmt = ast_strdupa(fmt);
+ if (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_log (LOG_DEBUG,"**** format set to %s, vmfmts set to %s\n",fmt,vmfmts);
+ /* ast_copy_string(fmt, vmfmts, sizeof(fmt));*/
+ /* if (!ast_strlen_zero(fmt)) { */
+
+ make_gsm_file(vms->fn, vms->imapuser, TMP, vms->curmsg);
+
+ ast_log (LOG_DEBUG,"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);
+ save_body(body,vms,"3","gsm");
+ /* should not assume "fmt" here! */
+ save_body(body,vms,"2",fmt);
+
+ char *myserveremail = serveremail;
+ if (!ast_strlen_zero(vmtmp->serveremail))
+ myserveremail = vmtmp->serveremail;
+ int attach_user_voicemail = ast_test_flag((&globalflags), VM_ATTACH);
+ attach_user_voicemail = ast_test_flag(vmtmp, VM_ATTACH);
+ stpcpy(todir,TMP);
+ sprintf(fn, "%s/%s/msg%04d", todir, vms->imapuser, vms->curmsg);
+ /* NULL category for IMAP storage */
+ sendmail(myserveremail, vmtmp, todircount, vmtmp->context, vmtmp->mailbox, chan->cid.cid_num, chan->cid.cid_name, fn, fmt, duration, attach_user_voicemail, chan, NULL);
+#else
+
/* if (ast_play_and_wait(chan, "vm-savedto"))
break;
*/
@@ -3628,7 +4083,8 @@
attach_user_voicemail = ast_test_flag(vmtmp, VM_ATTACH);
if (!ast_strlen_zero(vmtmp->serveremail))
myserveremail = vmtmp->serveremail;
- sendmail(myserveremail, vmtmp, todircount, vmtmp->context, vmtmp->mailbox, chan->cid.cid_num, chan->cid.cid_name, fn, tmp, duration, attach_user_voicemail, category);
+ /*XXX POSSIBLE ISSUE FOR IMAP STORAGE but no idea how its an else statement XXX*/
+ sendmail(myserveremail, vmtmp, todircount, vmtmp->context, vmtmp->mailbox, chan->cid.cid_num, chan->cid.cid_name, fn, tmp, duration, attach_user_voicemail, chan, category);
}
if (!ast_strlen_zero(vmtmp->pager)) {
@@ -3643,7 +4099,7 @@
/* Leave voicemail for someone */
manager_event(EVENT_FLAG_CALL, "MessageWaiting", "Mailbox: %s\r\nWaiting: %d\r\n", ext_context, has_voicemail(ext_context, NULL));
run_externnotify(vmtmp->context, vmtmp->mailbox);
-
+#endif
saved_messages++;
AST_LIST_REMOVE_CURRENT(&extensions, list);
free_user(vmtmp);
@@ -3876,6 +4332,116 @@
return res;
}
+#ifdef IMAP_STORAGE
[... 2897 lines stripped ...]
More information about the svn-commits
mailing list