X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=chan_lcr.h;h=e7ea0f5db02c788dd0bbb712922464441a2abf74;hp=0ca58d5a7e2dd9655195f652252a439ce7cf9fe8;hb=42959fafffad3a47ee2b4bb472a16730deb6586a;hpb=82e0281d1d50ebb4d2ff9e383d2db61df38f72c2

diff --git a/chan_lcr.h b/chan_lcr.h
index 0ca58d5..e7ea0f5 100644
--- a/chan_lcr.h
+++ b/chan_lcr.h
@@ -14,7 +14,8 @@ struct bchannel;
 struct chan_call {
 	struct chan_call	*next;	/* link to next call instance */
 	int			state;	/* current call state CHAN_LCR_STATE */
-	unsigned long		ref;	/* callref for this channel */
+	unsigned int		ref;	/* callref for this channel */
+	int			ref_was_assigned;
 	void			*ast;	/* current asterisk channel */
 	int			pbx_started;
 					/* indicates if pbx que is available */
@@ -24,9 +25,10 @@ struct chan_call {
 					/* audio is available */
 	int			cause, location;
 					/* store cause from lcr */
-	unsigned char		dialque[64];
+	char			dialque[64];
 					/* queue dialing prior setup ack */
 	char			oad[64];/* caller id in number format */
+
 	struct connect_info	connectinfo;
 					/* store connectinfo form lcr */
 	int			bridge_id;
@@ -43,20 +45,38 @@ struct chan_call {
 					/* LCR interface name for setup */
 	char			dialstring[64];
 					/* cached dial string for setup */
+        char                    cid_num[64]; /* cached cid for setup */
+	char                    cid_name[64]; /* cached cid for setup */
+	char                    cid_rdnis[64]; /* cached cid for setup */
 	char			display[128];
 					/* display for setup */
-	int			dtmf;
-					/* shall dtmf be enabled */
-	int			no_dtmf;
-					/* dtmf disabled by option */
+	int			dsp_dtmf;
+					/* decode dtmf by dsp */
+	int                     inband_dtmf; /* generate dtmf tones, if
+					      requested by asterisk */
+        int                     rebuffer; /* send only 160 bytes frames
+					     to asterisk */
+
+	int			framepos; /* send only 160 bytes frames to asterisk */
+	
+        int                     on_hold; /* track hold management, since
+					    sip phones sometimes screw it up */
 	char			pipeline[256];
 					/* echo cancel pipeline by option */
 	int			tx_gain, rx_gain;
 					/* gain by option */
+	int			keypad;
+					/* use keypad to dial number */
 	unsigned char		bf_key[56];
 	int			bf_len;	/* blowfish crypt key */
-	int			transparent, hdlc;
+	struct ast_dsp		*dsp; /* ast dsp processor for fax/tone detection */
+	struct ast_trans_pvt 	*trans; /* Codec translation path as fax/tone detection requires slin */
+	int			nodsp, nodsp_queue, hdlc, faxdetect;
 					/* flags for bchannel mode */
+	char			queue_string[64];
+					/* queue for asterisk */
+	int			has_pattern;
+					/* pattern are available, PROGRESS has been indicated */
 		
 };
 
@@ -112,6 +132,8 @@ enum {
 };
 
 
+#define SOCKET_RETRY_TIMER	5
+
 #define CERROR(call, ast, arg...) chan_lcr_log(__LOG_ERROR, __FILE__, __LINE__,  __FUNCTION__, call, ast, ##arg)
 #define CDEBUG(call, ast, arg...) chan_lcr_log(__LOG_NOTICE, __FILE__, __LINE__,  __FUNCTION__, call, ast, ##arg)
 void chan_lcr_log(int type, const char *file, int line, const char *function,  struct chan_call *call, struct ast_channel *ast, const char *fmt, ...);