diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-10 05:41:34 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-10 05:41:34 +0000 |
| commit | 0b504720373aee466c5a08931fbf8210deaea9c0 (patch) | |
| tree | 9a564f15ac25870f7fe98c097760dd5729177206 /channels/chan_oss.c | |
| parent | 9cb664196b665847c05a4e915e6fdfb9a9ca8aac (diff) | |
Merged revisions 60989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r60989 | murf | 2007-04-09 12:32:07 -0600 (Mon, 09 Apr 2007) | 1 line
This is a big improvement over the current CDR fixes. It may still need refinement, but this won't have as many folks bothered.
This also adds the mods from 1.4/r.61136;
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@61152 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_oss.c')
| -rw-r--r-- | channels/chan_oss.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index d6757a636..d7344961d 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -1021,7 +1021,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, "OSS/%s", o->device + 5); + c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", o->ext, o->ctx, 0, "OSS/%s", o->device + 5); if (c == NULL) return NULL; c->tech = &oss_tech; @@ -1033,10 +1033,6 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx, c->writeformat = AST_FORMAT_SLINEAR; c->tech_pvt = o; - if (!ast_strlen_zero(ctx)) - ast_copy_string(c->context, ctx, sizeof(c->context)); - if (!ast_strlen_zero(ext)) - ast_copy_string(c->exten, ext, sizeof(c->exten)); if (!ast_strlen_zero(o->language)) ast_string_field_set(c, language, o->language); /* Don't use ast_set_callerid() here because it will |