diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-14 20:09:53 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-14 20:09:53 +0000 |
| commit | b753520b72da19489f2bf234f87979fd4b937ab1 (patch) | |
| tree | 64c3a1416d369435e02fa9e7d6790744532b3da5 /channels/chan_oss.c | |
| parent | 76f2b731e450325b82faec17a6f0801c5e271a09 (diff) | |
Merged revisions 108797 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r108797 | russell | 2008-03-14 15:09:37 -0500 (Fri, 14 Mar 2008) | 13 lines
Merged revisions 108796 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r108796 | russell | 2008-03-14 15:09:22 -0500 (Fri, 14 Mar 2008) | 5 lines
Fix a channel name issue. chan_oss registers the "Console" channel type,
but it created channels with an "OSS" prefix.
(closes issue #12194, reported by davidw, patched by me)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@108798 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_oss.c')
| -rw-r--r-- | channels/chan_oss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 626951208..9d1c4569c 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -789,7 +789,7 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx, { struct ast_channel *c; - c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, 0, "OSS/%s", o->device + 5); + c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, 0, "Console/%s", o->device + 5); if (c == NULL) return NULL; c->tech = &oss_tech; |