kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

accept any name starting with X11 for X11 grabbers - this lets

Browse Source 
you have multiple active instances of this grabber;

require v4l device names to start with '/dev/' - prevents some useless
attempt to open a file as a device.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126309 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2008-06-29 12:53:45 +00:00
parent e6f17e50c4
commit 03e7978a1a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/vgrabbers.c
View File

@@ -79,7 +79,8 @@ static void *grab_x11_open(const char *name, struct fbuf_t *geom, int fps)
struct grab_x11_desc *v; struct grab_x11_desc *v;
struct fbuf_t *b; struct fbuf_t *b;
if (strcasecmp(name, "X11")) /* all names starting with X11 identify this grabber */
if (strncasecmp(name, "X11", 3))
return NULL; /* not us */ return NULL; /* not us */
v = ast_calloc(1, sizeof(*v)); v = ast_calloc(1, sizeof(*v));
if (v == NULL) if (v == NULL)
@@ -205,6 +206,9 @@ static void *grab_v4l1_open(const char *dev, struct fbuf_t *geom, int fps)
struct grab_v4l1_desc *v; struct grab_v4l1_desc *v;
struct fbuf_t *b; struct fbuf_t *b;
/* name should be something under /dev/ */
if (strncmp(dev, "/dev/", 5))
return NULL;
fd = open(dev, O_RDONLY | O_NONBLOCK); fd = open(dev, O_RDONLY | O_NONBLOCK);
if (fd < 0) { if (fd < 0) {
ast_log(LOG_WARNING, "error opening camera %s\n", dev); ast_log(LOG_WARNING, "error opening camera %s\n", dev);