kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

More code that somehow got left out of sig_analog

Browse Source 
* confirmanswer option now respected
* check and set waiting for dialtone timer
* unneeded needcallerid flag removed from analog_subchannel
* ss_astchan does not need to be a void pointer
* swap_channels callback updated to trunk
* analog_hangup now resets channel to default law


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@212287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-08-14 22:39:11 +00:00
parent 18a5f4c490
commit 132204459c
3 changed files with 119 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channels/sig_analog.h
View File

@@ -194,6 +194,10 @@ struct analog_callback {
void (* const set_cadence)(void *pvt, int *cidrings, struct ast_channel *chan);
void (* const set_dialing)(void *pvt, int flag);
void (* const set_ringtimeout)(void *pvt, int ringt);
void (* const set_waitingfordt)(void *pvt, struct ast_channel *ast);
int (* const check_waitingfordt)(void *pvt);
void (* const set_confirmanswer)(void *pvt, int flag);
int (* const check_confirmanswer)(void *pvt);
};
@@ -203,7 +207,6 @@ struct analog_callback {
struct analog_subchannel {
struct ast_channel *owner;
struct ast_frame f; /*!< One frame for each channel. How did this ever work before? */
unsigned int needcallerid:1;
unsigned int inthreeway:1;
/* Have we allocated a subchannel yet or not */
unsigned int allocd:1;
@@ -292,7 +295,7 @@ struct analog_pvt {
char call_forward[AST_MAX_EXTENSION];
/* Ast channel to pass to __ss_analog_thread */
void *ss_astchan;
struct ast_channel *ss_astchan;
/* All variables after this are definitely going to be audited */
unsigned int inalarm:1;