More code that somehow got left out of sig_analog

* 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: http://svn.digium.com/svn/asterisk/trunk@212287 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 5 insertions, 2 deletions

diff --git a/channels/sig_analog.h b/channels/sig_analog.h
index f33f417b7..381655021 100644
--- a/channels/sig_analog.h
+++ b/channels/sig_analog.h
@@ -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;