work on chan_lcr

[lcr.git] / mISDN.cpp

diff --git a/mISDN.cpp b/mISDN.cpp
index bfac919..c9eb114 100644 (file)
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -286,7 +286,7 @@ PmISDN::PmISDN(int type, mISDNport *mISDNport, char *portname, struct port_setti
  */
 PmISDN::~PmISDN()
 {
-       struct message *message;
+       struct lcr_msg *message;
 
        /* remove bchannel relation */
        drop_bchannel();
@@ -317,7 +317,7 @@ void chan_trace_header(struct mISDNport *mISDNport, class PmISDN *port, char *ms
        /* init trace with given values */
        start_trace(mISDNport?mISDNport->portnum:0,
                    (mISDNport)?((mISDNport->ifport)?mISDNport->ifport->interface:NULL):NULL,
-                   port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype):NULL,
+                   port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype, options.national, options.international):NULL,
                    port?port->p_dialinginfo.id:NULL,
                    direction,
                    CATEGORY_CH,
@@ -428,7 +428,7 @@ void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsign
        /* init trace with given values */
        start_trace(mISDNport?mISDNport->portnum:0,
                    mISDNport?mISDNport->ifport->interface:NULL,
-                   port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype):NULL,
+                   port?numberrize_callerinfo(port->p_callerinfo.id, port->p_callerinfo.ntype, options.national, options.international):NULL,
                    port?port->p_dialinginfo.id:NULL,
                    direction,
                    CATEGORY_CH,
@@ -1511,7 +1511,7 @@ on empty load, remote-audio causes the load with the remote audio to be increase
  */
 int PmISDN::handler(void)
 {
-       struct message *message;
+       struct lcr_msg *message;
        int elapsed = 0;
        int ret;
 
@@ -1647,7 +1647,7 @@ void PmISDN::bchannel_receive(iframe_t *frm)
 #endif
        unsigned char *data_temp;
        unsigned long length_temp;
-       struct message *message;
+       struct lcr_msg *message;
        unsigned char *p;
        int l;
 
@@ -1962,7 +1962,7 @@ void PmISDN::set_tone(char *dir, char *tone)
 
 
 /* MESSAGE_mISDNSIGNAL */
-//extern struct message *dddebug;
+//extern struct lcr_msg *dddebug;
 void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union parameter *param)
 {
        switch(param->mISDNsignal.message)
@@ -2052,7 +2052,7 @@ void PmISDN::message_mISDNsignal(unsigned long epoint_id, int message_id, union
 /* MESSAGE_CRYPT */
 void PmISDN::message_crypt(unsigned long epoint_id, int message_id, union parameter *param)
 {
-       struct message *message;
+       struct lcr_msg *message;
 
        switch(param->crypt.type)
        {
@@ -3789,7 +3789,7 @@ void PmISDN::txfromup(unsigned char *data, int length)
                frm->addr = p_m_mISDNport->b_addr[p_m_b_index] | FLG_MSG_DOWN;
                frm->dinfo = 0;
                frm->len = ISDN_LOAD;
-               memset(buf+MISDN_HEADER_LEN, (options.law=='a')?0x2a:0xff, ISDN_LOAD);
+               memset(buf+mISDN_HEADER_LEN, (options.law=='a')?0x2a:0xff, ISDN_LOAD);
                mISDN_write(mISDNdevice, frm, mISDN_HEADER_LEN+ISDN_LOAD, TIMEOUT_1SEC);
 #endif
                p_m_load += ISDN_LOAD;