fixup

[lcr.git] / chan_lcr.h

diff --git a/chan_lcr.h b/chan_lcr.h
index 3a64593..ab7101d 100644 (file)
--- a/chan_lcr.h
+++ b/chan_lcr.h
@@ -9,8 +9,6 @@
 **                                                                           **
 \*****************************************************************************/
 
-/* structure for all calls */
-struct bchannel;
 struct chan_call {
        struct chan_call        *next;  /* link to next call instance */
        int                     state;  /* current call state CHAN_LCR_STATE */
@@ -19,8 +17,6 @@ struct chan_call {
        void                    *ast;   /* current asterisk channel */
        int                     pbx_started;
                                        /* indicates if pbx que is available */
-       struct bchannel         *bchannel;
-                                       /* reference to bchannel, if set */
        int                     audiopath;
                                        /* audio is available */
        int                     cause, location;
@@ -29,6 +25,8 @@ struct chan_call {
                                        /* queue dialing prior setup ack */
        char                    oad[64];/* caller id in number format */
 
+       struct caller_info      callerinfo;
+       struct redir_info       redirinfo;
        struct connect_info     connectinfo;
                                        /* store connectinfo form lcr */
        int                     bridge_id;
@@ -45,9 +43,11 @@ struct chan_call {
                                        /* LCR interface name for setup */
        char                    dialstring[64];
                                        /* cached dial string for setup */
+#ifndef AST_PARTY_CALLER
         char                    cid_num[64]; /* cached cid for setup */
        char                    cid_name[64]; /* cached cid for setup */
        char                    cid_rdnis[64]; /* cached cid for setup */
+#endif
        char                    display[128];
                                        /* display for setup */
        int                     dsp_dtmf;
@@ -71,7 +71,7 @@ struct chan_call {
        int                     bf_len; /* blowfish crypt key */
        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, hdlc, faxdetect;
+       int                     tx_queue, hdlc, faxdetect, ast_dsp;
                                        /* flags for bchannel mode */
        char                    queue_string[64];
                                        /* queue for asterisk */