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

issue #5800

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-11-21 01:11:40 +00:00
parent 913232e82e
commit 3cb060d80f
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,5 +1,7 @@
2005-11-20 Russell Bryant <russell@digium.com> 2005-11-20 Russell Bryant <russell@digium.com>
* channels/chan_oss.c configs/oss.conf.sample: Add the ability to set callerid in oss.conf.
* channels/chan_sip.c channels/chan_iax2.c: Change warning messages about the number of scheduled events happening all at once to debug messages. (issue #5794) * channels/chan_sip.c channels/chan_iax2.c: Change warning messages about the number of scheduled events happening all at once to debug messages. (issue #5794)
2005-11-20 Josh Roberson <josh@asteriasgi.com> 2005-11-20 Josh Roberson <josh@asteriasgi.com>

16
channels/chan_oss.c
View File

@@ -55,6 +55,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h" #include "asterisk/lock.h"
#include "asterisk/frame.h" #include "asterisk/frame.h"
#include "asterisk/logger.h" #include "asterisk/logger.h"
#include "asterisk/callerid.h" /* for ast_callerid_split() */
#include "asterisk/channel.h" #include "asterisk/channel.h"
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/options.h" #include "asterisk/options.h"
@@ -284,6 +285,8 @@ struct chan_oss_pvt {
char ext[AST_MAX_EXTENSION]; char ext[AST_MAX_EXTENSION];
char ctx[AST_MAX_CONTEXT]; char ctx[AST_MAX_CONTEXT];
char language[MAX_LANGUAGE]; char language[MAX_LANGUAGE];
char cid_name[256]; /*XXX */
char cid_num[256]; /*XXX */
/* buffers used in oss_write */ /* buffers used in oss_write */
char oss_write_buf[FRAME_SIZE*2]; char oss_write_buf[FRAME_SIZE*2];
@@ -892,6 +895,10 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o,
ast_copy_string(c->exten, ext, sizeof(c->exten)); ast_copy_string(c->exten, ext, sizeof(c->exten));
if (!ast_strlen_zero(o->language)) if (!ast_strlen_zero(o->language))
ast_copy_string(c->language, o->language, sizeof(c->language)); ast_copy_string(c->language, o->language, sizeof(c->language));
if (!ast_strlen_zero(o->cid_num))
c->cid.cid_num = strdup(o->cid_num);
if (!ast_strlen_zero(o->cid_name))
c->cid.cid_name = strdup(o->cid_name);
o->owner = c; o->owner = c;
ast_setstate(c, state); ast_setstate(c, state);
@@ -1274,6 +1281,14 @@ static void store_mixer(struct chan_oss_pvt *o, char *s)
ast_log(LOG_WARNING, "setting mixer %s\n", s); ast_log(LOG_WARNING, "setting mixer %s\n", s);
} }
/*
* store the callerid components
*/
static void store_callerid(struct chan_oss_pvt *o, char *s)
{
ast_callerid_split(s, o->cid_name, sizeof(o->cid_name), o->cid_num, sizeof(o->cid_num));
}
/* /*
* grab fields from the config file, init the descriptor and open the device. * grab fields from the config file, init the descriptor and open the device.
*/ */
@@ -1315,6 +1330,7 @@ static struct chan_oss_pvt * store_config(struct ast_config *cfg, char *ctg)
M_STR("language", o->language) M_STR("language", o->language)
M_STR("extension", o->ext) M_STR("extension", o->ext)
M_F("mixer", store_mixer(o, v->value)) M_F("mixer", store_mixer(o, v->value))
M_F("callerid", store_callerid(o, v->value))
M_END(;); M_END(;);
} }
if (ast_strlen_zero(o->device)) if (ast_strlen_zero(o->device))

4
configs/oss.conf.sample
View File

@@ -25,6 +25,10 @@ extension=s
; ;
;language=en ;language=en
; ;
; CallerID for outbound calls
;
;callerid=John Doe <1234>
;
; Silence supression can be enabled when sound is over a certain threshold. ; Silence supression can be enabled when sound is over a certain threshold.
; The value for the threshold should probably be between 500 and 2000 or so, ; The value for the threshold should probably be between 500 and 2000 or so,
; but your mileage may vary. Use the echo test to evaluate the best setting. ; but your mileage may vary. Use the echo test to evaluate the best setting.