/*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
*
- * Channel Management
- *
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2006, Digium, Inc.
*
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
+ *
+ * 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;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
*
* This program is free software, distributed under the terms of
- * the GNU General Public License
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
*/
+/*! \file
+ *
+ * \brief Image Management
+ *
+ * \author Mark Spencer <markster@digium.com>
+ */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
#include <stdio.h>
#include <stdlib.h>
-#include <pthread.h>
#include <string.h>
#include <sys/time.h>
#include <sys/stat.h>
#include <signal.h>
#include <errno.h>
#include <unistd.h>
-#include <asterisk/sched.h>
-#include <asterisk/options.h>
-#include <asterisk/channel.h>
-#include <asterisk/channel_pvt.h>
-#include <asterisk/logger.h>
-#include <asterisk/file.h>
-#include <asterisk/image.h>
-#include <asterisk/translate.h>
-#include <asterisk/cli.h>
-#include "asterisk.h"
-#include "astconf.h"
-static struct ast_imager *list;
-static pthread_mutex_t listlock = AST_MUTEX_INITIALIZER;
+#include "asterisk/sched.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/logger.h"
+#include "asterisk/file.h"
+#include "asterisk/image.h"
+#include "asterisk/translate.h"
+#include "asterisk/cli.h"
+#include "asterisk/lock.h"
+
+static AST_LIST_HEAD_STATIC(imagers, ast_imager);
int ast_image_register(struct ast_imager *img)
{
if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Registered format '%s' (%s)\n", img->name, img->desc);
- ast_pthread_mutex_lock(&listlock);
- img->next = list;
- list = img;
- ast_pthread_mutex_unlock(&listlock);
+ AST_LIST_LOCK(&imagers);
+ AST_LIST_INSERT_HEAD(&imagers, img, list);
+ AST_LIST_UNLOCK(&imagers);
return 0;
}
void ast_image_unregister(struct ast_imager *img)
{
- struct ast_imager *i, *prev = NULL;
- ast_pthread_mutex_lock(&listlock);
- i = list;
- while(i) {
+ struct ast_imager *i;
+
+ AST_LIST_LOCK(&imagers);
+ AST_LIST_TRAVERSE_SAFE_BEGIN(&imagers, i, list) {
if (i == img) {
- if (prev)
- prev->next = i->next;
- else
- list = i->next;
+ AST_LIST_REMOVE_CURRENT(&imagers, list);
break;
}
- prev = i;
- i = i->next;
}
- ast_pthread_mutex_unlock(&listlock);
+ AST_LIST_TRAVERSE_SAFE_END
+ AST_LIST_UNLOCK(&imagers);
if (i && (option_verbose > 1))
- ast_verbose(VERBOSE_PREFIX_2 "Registered format '%s' (%s)\n", img->name, img->desc);
+ ast_verbose(VERBOSE_PREFIX_2 "Unregistered format '%s' (%s)\n", img->name, img->desc);
}
int ast_supports_images(struct ast_channel *chan)
{
- if (!chan || !chan->pvt)
+ if (!chan || !chan->tech)
return 0;
- if (!chan->pvt->send_image)
+ if (!chan->tech->send_image)
return 0;
return 1;
}
return 0;
}
-static void make_filename(char *buf, int len, char *filename, char *preflang, char *ext)
+static void make_filename(char *buf, int len, char *filename, const char *preflang, char *ext)
{
if (filename[0] == '/') {
- if (preflang && strlen(preflang))
+ if (!ast_strlen_zero(preflang))
snprintf(buf, len, "%s-%s.%s", filename, preflang, ext);
else
snprintf(buf, len, "%s.%s", filename, ext);
} else {
- if (preflang && strlen(preflang))
- snprintf(buf, len, "%s/%s/%s-%s.%s", ast_config_AST_VAR_DIR, "images", filename, preflang, ext);
+ if (!ast_strlen_zero(preflang))
+ snprintf(buf, len, "%s/%s/%s-%s.%s", ast_config_AST_DATA_DIR, "images", filename, preflang, ext);
else
- snprintf(buf, len, "%s/%s/%s.%s", ast_config_AST_VAR_DIR, "images", filename, ext);
+ snprintf(buf, len, "%s/%s/%s.%s", ast_config_AST_DATA_DIR, "images", filename, ext);
}
}
-struct ast_frame *ast_read_image(char *filename, char *preflang, int format)
+struct ast_frame *ast_read_image(char *filename, const char *preflang, int format)
{
struct ast_imager *i;
char buf[256];
int fd;
int len=0;
struct ast_frame *f = NULL;
-#if 0 /* We need to have some sort of read-only lock */
- ast_pthread_mutex_lock(&listlock);
-#endif
- i = list;
- while(!found && i) {
+
+ AST_LIST_LOCK(&imagers);
+ AST_LIST_TRAVERSE(&imagers, i, list) {
if (i->format & format) {
char *stringp=NULL;
strncpy(tmp, i->exts, sizeof(tmp)-1);
e = strsep(&stringp, "|");
}
}
- i = i->next;
+ if (found)
+ break;
}
+
if (found) {
fd = open(buf, O_RDONLY);
if (fd > -1) {
lseek(fd, 0, SEEK_SET);
f = found->read_image(fd,len);
} else
- ast_log(LOG_WARNING, "%s does not appear to be a %s file\n", buf, i->name);
+ ast_log(LOG_WARNING, "%s does not appear to be a %s file\n", buf, found->name);
close(fd);
} else
ast_log(LOG_WARNING, "Unable to open '%s': %s\n", buf, strerror(errno));
} else
ast_log(LOG_WARNING, "Image file '%s' not found\n", filename);
-#if 0
- ast_pthread_mutex_unlock(&listlock);
-#endif
+
+ AST_LIST_UNLOCK(&imagers);
+
return f;
}
{
struct ast_frame *f;
int res = -1;
- if (chan->pvt->send_image) {
+ if (chan->tech->send_image) {
f = ast_read_image(filename, chan->language, -1);
if (f) {
- res = chan->pvt->send_image(chan, f);
+ res = chan->tech->send_image(chan, f);
ast_frfree(f);
}
}
static int show_image_formats(int fd, int argc, char *argv[])
{
#define FORMAT "%10s %10s %50s %10s\n"
-#define FORMAT2 "%10s %10s %50s %10d\n"
+#define FORMAT2 "%10s %10s %50s %10s\n"
struct ast_imager *i;
if (argc != 3)
return RESULT_SHOWUSAGE;
ast_cli(fd, FORMAT, "Name", "Extensions", "Description", "Format");
- i = list;
- while(i) {
- ast_cli(fd, FORMAT2, i->name, i->exts, i->desc, i->format);
- i = i->next;
- };
+ AST_LIST_TRAVERSE(&imagers, i, list)
+ ast_cli(fd, FORMAT2, i->name, i->exts, i->desc, ast_getformatname(i->format));
return RESULT_SUCCESS;
}
int ast_image_init(void)
{
- ast_cli_register(&show_images);
- return 0;
+ return ast_cli_register(&show_images);
}
projects / asterisk/asterisk.git / blobdiff