/*
* constructor
*/
-Pdss1::Pdss1(int type, mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive) : PmISDN(type, mISDNport, portname, settings, channel, exclusive)
+Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive) : PmISDN(type, mISDNport, portname, settings, channel, exclusive)
{
p_callerinfo.itype = (mISDNport->ifport->interface->extension)?INFO_ITYPE_ISDN:INFO_ITYPE_ISDN_EXTENSION;
p_m_d_ntmode = mISDNport->ntmode;
exit(-1);
}
-/* isdn messaging */
-static struct isdn_message {
- char *name;
- unsigned long value;
-} isdn_message[] = {
- {"TIMEOUT", CC_TIMEOUT},
- {"SETUP", CC_SETUP},
- {"SETUP_ACK", CC_SETUP_ACKNOWLEDGE},
- {"PROCEEDING", CC_PROCEEDING},
- {"ALERTING", CC_ALERTING},
- {"CONNECT", CC_CONNECT},
- {"CONNECT RES", CC_CONNECT},
- {"CONNECT_ACK", CC_CONNECT_ACKNOWLEDGE},
- {"DISCONNECT", CC_DISCONNECT},
- {"RELEASE", CC_RELEASE},
- {"RELEASE_COMP", CC_RELEASE_COMPLETE},
- {"INFORMATION", CC_INFORMATION},
- {"PROGRESS", CC_PROGRESS},
- {"NOTIFY", CC_NOTIFY},
- {"SUSPEND", CC_SUSPEND},
- {"SUSPEND_ACK", CC_SUSPEND_ACKNOWLEDGE},
- {"SUSPEND_REJ", CC_SUSPEND_REJECT},
- {"RESUME", CC_RESUME},
- {"RESUME_ACK", CC_RESUME_ACKNOWLEDGE},
- {"RESUME_REJ", CC_RESUME_REJECT},
- {"HOLD", CC_HOLD},
- {"HOLD_ACK", CC_HOLD_ACKNOWLEDGE},
- {"HOLD_REJ", CC_HOLD_REJECT},
- {"RETRIEVE", CC_RETRIEVE},
- {"RETRIEVE_ACK", CC_RETRIEVE_ACKNOWLEDGE},
- {"RETRIEVE_REJ", CC_RETRIEVE_REJECT},
- {"FACILITY", CC_FACILITY},
- {"STATUS", CC_STATUS},
- {"RESTART", CC_RESTART},
- {"RELEASE_CR", CC_RELEASE_CR},
- {"NEW_CR", CC_NEW_CR},
- {"DL_ESTABLSIH", DL_ESTABLSIH},
- {"DL_RELEASE", DL_RELEASE},
- {"PH_ACTICATIE", PH_ACTICATIE},
- {"PH_DEACTICATIE", PH_DEACTICATIE},
-
- {NULL, 0},
-};
-
-static char *isdn_prim[4] = {
- " REQUEST",
- " CONFIRM",
- " INDICATION",
- " RESPONSE",
-};
-
-
-/*
- * isdn trace header
- */
-void Pdss1::l1l2l3_trace_header(unsigned long prim, int direction_out)
-{
- int i;
- char msgtext[64] = "<<UNKNOWN MESSAGE>>";
-
- /* select message and primitive text */
- i = 0;
- while(isdn_message[i].name)
- {
- if (isdn_message[i].value == (prim&0xffffff00))
- {
- SCPY(msgtext, isdn_message[i].name);
- break;
- }
- i++;
- }
- SCAT(msgtext, isdn_prim[prim&0x00000003]);
-
- /* add direction */
- if (direction && (prim&0xffffff00)!=CC_NEW_CR && (prim&0xffffff00)!=CC_RELEASE_CR)
- {
- if (p_m_ntmode)
- {
- if (direction == DIRECTION_OUT)
- SCAT(msgtext, " N->U");
- else
- SCAT(msgtext, " N<-U");
- } else
- {
- if (direction == DIRECTION_OUT)
- SCAT(msgtext, " U->N");
- else
- SCAT(msgtext, " U<-N");
- }
- }
-
- /* init trace with given values */
- start_trace(p_m_mISDNport->portnum,
- p_m_mISDNport->ifport->interface,
- nationalize(p_callerinfo.id, p_callerinfo.ntype),
- p_dialinginfo.number,
- direction,
- CATEGORY_L3,
- p_serial,
- msgtext);
-}
-
-
-void Pdss1::chan_trace_header(char *msgtext)
-{
- int i;
-
-
- /* init trace with given values */
- start_trace(p_m_mISDNport->portnum,
- p_m_mISDNport->ifport->interface,
- nationalize(p_callerinfo.id, p_callerinfo.ntype),
- p_dialinginfo.number,
- 0,
- CATEGORY_L3,
- p_serial,
- msgtext);
-}
-
-
/*
* if we received a first reply to the setup message,
* we will check if we have now channel information
if (p_state != PORT_STATE_OUT_SETUP)
return(0);
- chan_trace_header("CHANNEL SELECTION (first reply to setup)");
+ chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE);
add_trace("channel", "request", "%d (forced)", p_m_b_channel);
add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel);
end_trace();
/* activate our exclusive channel */
- bchannel_activate(p_m_mISDNport, p_m_b_index);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
} else
if (p_m_b_channel)
{
if (p_state != PORT_STATE_OUT_SETUP)
return(0);
- chan_trace_header("CHANNEL SELECTION (first reply to setup)");
+ chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE);
add_trace("channel", "request", "%d (suggest)", p_m_b_channel);
add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel);
add_trace("connect", "channel", "%d", p_m_b_channel);
end_trace();
p_m_b_exclusive = 1; // we are done
- bchannel_activate(p_m_mISDNport, p_m_b_index);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
return(0);
}
end_trace();
/* activate channel given by remote */
- bchannel_activate(p_m_mISDNport, p_m_b_index);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
} else
if (p_m_b_reserve)
{
if (p_state != PORT_STATE_OUT_SETUP)
return(0);
- chan_trace_header("CHANNEL SELECTION (first reply to setup)");
+ chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE);
add_trace("channel", "request", "any");
add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel);
/* if no channel was replied */
end_trace();
/* activate channel given by remote */
- bchannel_activate(p_m_mISDNport, p_m_b_index);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
} else
{
/*** we sent 'no channel available' ***/
/* if not the first reply, but a connect, we are forced */
if (prim==(CC_CONNECT | INDICATION) && p_state!=PORT_STATE_OUT_SETUP)
{
- chan_trace_header("CHANNEL SELECTION (connect)");
+ chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (connect)", DIRECTION_NONE);
add_trace("channel", "request", "no-channel");
add_trace("channel", "reply", (channel>=0)?"%d%s":"(none)", channel, exclusive?" (forced)":"");
if (channel > 0)
p_m_b_exclusive = 1; // we are done
/* activate channel given by remote */
- bchannel_activate(p_m_mISDNport, p_m_b_index);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
return(0);
}
if (p_state != PORT_STATE_OUT_SETUP)
return(0);
- chan_trace_header("CHANNEL SELECTION (first reply to setup)");
+ chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (first reply to setup)", DIRECTION_NONE);
add_trace("channel", "request", "no-channel");
add_trace("channel", "reply", (channel>=0)?"%d":"(none)", channel);
/* if first reply has no channel, we are done */
p_m_b_exclusive = 1; // we are done
/* activate channel given by remote */
- bchannel_activate(p_m_mISDNport, p_m_b_index);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
}
return(0);
channelerror:
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
- l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
-
release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
/*
+ * hunt bchannel for incomming setup or retrieve or resume
+ */
+int Pdss1::hunt_bchannel(int channel, int exclusive)
+{
+ struct select_channel *selchannel;
+ struct interface_port *ifport = p_m_mISDNport->ifport;
+ int i;
+
+ chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (setup)", DIRECTION_NONE);
+ if (exclusive<0)
+ exclusive = 0;
+ if (channel == CHANNEL_NO)
+ add_trace("channel", "request", "no-channel");
+ else
+ add_trace("channel", "request", (channel>0)?"%d%s":"any", channel, exclusive?" (forced)":"");
+ if (channel==CHANNEL_NO && p_type==PORT_TYPE_DSS1_TE_IN)
+ {
+ add_trace("conclusion", NULL, "incoming call-waiting not supported for TE-mode");
+ end_trace();
+ return(-6); // channel unacceptable
+ }
+ if (channel <= 0) /* not given, no channel, whatever.. */
+ channel = CHANNEL_ANY; /* any channel */
+ if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) // of out chan..
+ {
+ add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved);
+ add_trace("conclusion", NULL, "all channels are reserved");
+ end_trace();
+ return(-34); // no channel
+ }
+ if (channel == CHANNEL_ANY)
+ goto get_from_list;
+ if (channel > 0)
+ {
+ /* check for given channel in selection list */
+ selchannel = ifport->in_channel;
+ while(selchannel)
+ {
+ if (selchannel->channel == channel || selchannel->channel == CHANNEL_FREE)
+ break;
+ selchannel = selchannel->next;
+ }
+ if (!selchannel)
+ channel = 0;
+
+ /* exclusive channel requests must be in the list */
+ if (exclusive)
+ {
+ if (!channel)
+ {
+ add_trace("conclusion", NULL, "exclusively requested channel not in list");
+ end_trace();
+ return(-6); // channel unacceptable
+ }
+ i = selchannel->channel-1-(selchannel->channel>=17);
+ if (p_m_mISDNport->b_port[i] == NULL)
+ goto use_channel;
+ add_trace("conclusion", NULL, "exclusively requested channel is busy");
+ end_trace();
+ return(-6); // channel unacceptable
+ }
+
+ /* requested channels in list will be used */
+ if (channel)
+ {
+ i = selchannel->channel-1-(selchannel->channel>=17);
+ if (p_m_mISDNport->b_port[i] == NULL)
+ goto use_channel;
+ }
+
+ /* if channel is not available or not in list, it must be searched */
+ get_from_list:
+ /* check for first free channel in list */
+ channel = 0;
+ selchannel = ifport->in_channel;
+ while(selchannel)
+ {
+ switch(selchannel->channel)
+ {
+ case CHANNEL_FREE: /* free channel */
+ add_trace("hunting", "channel", "free");
+ if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num)
+ break; /* all channel in use or reserverd */
+ /* find channel */
+ i = 0;
+ while(i < p_m_mISDNport->b_num)
+ {
+ if (p_m_mISDNport->b_port[i] == NULL)
+ {
+ channel = i+1+(i>=15);
+ break;
+ }
+ i++;
+ }
+ break;
+
+ default:
+ add_trace("hunting", "channel", "%d", selchannel->channel);
+ if (selchannel->channel<1 || selchannel->channel==16)
+ break; /* invalid channels */
+ i = selchannel->channel-1-(selchannel->channel>=17);
+ if (i >= p_m_mISDNport->b_num)
+ break; /* channel not in port */
+ if (p_m_mISDNport->b_port[i] == NULL)
+ {
+ channel = selchannel->channel;
+ break;
+ }
+ break;
+ }
+ if (channel)
+ break; /* found channel */
+ selchannel = selchannel->next;
+ }
+ if (!channel)
+ {
+ add_trace("conclusion", NULL, "no channel available");
+ end_trace();
+ return(-6); // channel unacceptable
+ }
+ }
+use_channel:
+ add_trace("conclusion", NULL, "channel available");
+ add_trace("connect", "channel", "%d", p_m_b_channel);
+ end_trace();
+ return(channel);
+}
+
+/*
* handles all indications
*/
/* CC_SETUP INDICATION */
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
SETUP_t *setup = (SETUP_t *)((unsigned long)data + headerlen);
- int type, plan, present, screen, reason;
- int coding, capability, mode, rate, multi, user, presentation, interpretation, hlc, exthlc;
+ int calling_type, calling_plan, calling_present, calling_screen;
+ int called_type, called_plan;
+ int redir_type, redir_plan, redir_present, redir_screen, redir_reason;
+ int hlc_coding, hlc_presentation, hlc_interpretation, hlc_hlc, hlc_exthlc;
+ int bearer_coding, bearer_capability, bearer_mode, bearer_rate, bearer_multi, bearer_user;
int exclusive, channel;
int ret;
msg_t *dmsg;
PERROR("fatal software error: l3-stack gives us a process id 0xff00-0xffff\n");
exit(-1);
}
- l1l2l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | INDICATION, DIRECTION_IN);
if (p_m_d_l3id)
add_trace("callref", "old", "0x%x", p_m_d_l3id);
add_trace("callref", "new", "0x%x", dinfo);
p_m_d_ces = setup->ces;
}
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_calling_pn(setup->CALLING_PN, (Q931_info_t *)((unsigned long)data+headerlen), &calling_type, &calling_plan, &calling_present, &calling_screen, (unsigned char *)p_callerinfo.id, sizeof(p_callerinfo.id));
dec_ie_called_pn(setup->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &called_type, &called_plan, (unsigned char *)p_dialinginfo.number, sizeof(p_dialinginfo.number));
dec_ie_keypad(setup->KEYPAD, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)keypad, sizeof(keypad));
dec_ie_complete(setup->COMPLETE, (Q931_info_t *)((unsigned long)data+headerlen), &p_dialinginfo.sending_complete);
dec_ie_redir_nr(setup->REDIR_NR, (Q931_info_t *)((unsigned long)data+headerlen), &redir_type, &redir_plan, &redir_present, &redir_screen, &redir_reason, (unsigned char *)p_redirinfo.id, sizeof(p_redirinfo.id));
dec_ie_channel_id(setup->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
- dec_ie_hlc(setup->HLC, (Q931_info_t *)((unsigned long)data+headerlen), &hlc_coding, &interpretation, &presentation, &hlc, &exthlc);
- dec_ie_bearer(setup->BEARER, (Q931_info_t *)((unsigned long)data+headerlen), &bearer_coding, &capability, &mode, &rate, &multi, &user);
+ dec_ie_hlc(setup->HLC, (Q931_info_t *)((unsigned long)data+headerlen), &hlc_coding, &hlc_interpretation, &hlc_presentation, &hlc_hlc, &hlc_exthlc);
+ dec_ie_bearer(setup->BEARER, (Q931_info_t *)((unsigned long)data+headerlen), &bearer_coding, &bearer_capability, &bearer_mode, &bearer_rate, &bearer_multi, &bearer_user);
end_trace();
/* if blocked, release call */
{
RELEASE_COMPLETE_t *release_complete;
- printlog("--- port#%d is blocked.\n", mISDNport->ifport->portnum);
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
- l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */
add_trace("reason", NULL, "port blocked");
end_trace();
}
/* caller info */
- switch (present)
+ switch (calling_present)
{
case 1:
p_callerinfo.present = INFO_PRESENT_RESTRICTED;
p_callerinfo.present = INFO_PRESENT_ALLOWED;
break;
}
- switch (screen)
+ switch (calling_screen)
{
case 0:
p_callerinfo.screen = INFO_SCREEN_USER;
p_callerinfo.screen = INFO_SCREEN_NETWORK;
break;
}
- switch (type)
+ switch (calling_type)
{
case -1:
p_callerinfo.ntype = INFO_NTYPE_UNKNOWN;
/* dialing information */
SCAT(p_dialinginfo.number, (char *)keypad);
- switch (type)
+ switch (called_type)
{
case 0x1:
p_dialinginfo.ntype = INFO_NTYPE_INTERNATIONAL;
p_dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
break;
}
- switch (present)
+
+ /* redir info */
+ switch (redir_present)
{
case 1:
p_redirinfo.present = INFO_PRESENT_RESTRICTED;
p_redirinfo.present = INFO_PRESENT_ALLOWED;
break;
}
- switch (screen)
+ switch (redir_screen)
{
case 0:
p_redirinfo.screen = INFO_SCREEN_USER;
p_redirinfo.screen = INFO_SCREEN_NETWORK;
break;
}
- switch (reason)
+ switch (redir_reason)
{
case 1:
p_redirinfo.reason = INFO_REDIR_BUSY;
p_redirinfo.reason = INFO_REDIR_UNKNOWN;
break;
}
- switch (type)
+ switch (redir_type)
{
case -1:
p_redirinfo.ntype = INFO_NTYPE_UNKNOWN;
p_redirinfo.isdn_port = p_m_portnum;
/* bearer capability */
- switch (capability)
+ switch (bearer_capability)
{
case -1:
p_capainfo.bearer_capa = INFO_BC_AUDIO;
- user = (options.law=='a')?3:2;
+ bearer_user = (options.law=='a')?3:2;
break;
default:
- p_capainfo.bearer_capa = capability;
+ p_capainfo.bearer_capa = bearer_capability;
break;
}
- switch (mode)
+ switch (bearer_mode)
{
case 2:
p_capainfo.bearer_mode = INFO_BMODE_PACKET;
p_capainfo.bearer_mode = INFO_BMODE_CIRCUIT;
break;
}
- switch (user)
+ switch (bearer_user)
{
case -1:
p_capainfo.bearer_info1 = INFO_INFO1_NONE;
break;
default:
- p_capainfo.bearer_info1 = user + 0x80;
+ p_capainfo.bearer_info1 = bearer_user + 0x80;
break;
}
/* hlc */
- switch (hlc)
+ switch (hlc_hlc)
{
case -1:
p_capainfo.hlc = INFO_HLC_NONE;
break;
default:
- p_capainfo.hlc = hlc + 0x80;
+ p_capainfo.hlc = hlc_hlc + 0x80;
break;
}
- switch (exthlc)
+ switch (hlc_exthlc)
{
case -1:
p_capainfo.exthlc = INFO_HLC_NONE;
break;
default:
- p_capainfo.exthlc = exthlc + 0x80;
+ p_capainfo.exthlc = hlc_exthlc + 0x80;
break;
}
- /* process channel */
- chan_trace_header("CHANNEL SELECTION (setup)");
- if (exclusive<0)
- exclusive = 0;
- if (channel == CHANNEL_NO)
- add_trace("channel", "request", "no-channel");
- else
- add_trace("channel", "request", (channel>0)?"%d%s":"any", channel, exclusive?" (forced)":"");
- if (channel==CHANNEL_NO && p_type==PORT_TYPE_DSS1_TE_IN)
- {
- add_trace("conclusion", NULL, "incoming call-waiting not supported for TE-mode");
- end_trace();
- ret = -6; // channel unacceptable
- goto no_channel;
- }
- if (channel <= 0) /* not given, no channel, whatever.. */
- channel = CHANNEL_ANY; /* any channel */
- if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) // of out chan..
- {
- add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved);
- add_trace("conclusion", NULL, "all channels are reserved");
- end_trace();
- ret = -34; // no channel
+ /* hunt channel */
+ ret = channel = hunt_bchannel(channel, exclusive);
+ if (ret < 0)
goto no_channel;
- }
- if (channel == CHANNEL_ANY)
- goto get_from_list;
- if (channel > 0)
- {
- /* check for given channel in selection list */
- selchannel = ifport->channel_in;
- while(selchannel)
- {
- if (selchannel->channel == channel || selchannel->channel == CHANNEL_FREE)
- break;
- selchannel = selchannel->next;
- }
- if (!selchannel)
- channel = 0;
-
- /* exclusive channel requests must be in the list */
- if (exclusive)
- {
- if (!channel)
- {
- add_trace("conclusion", NULL, "exclusively requested channel not in list");
- end_trace();
- ret = 6; // unacceptable
- goto no_channel;
- }
- i = selchannel->channel-1-(selchannel->channel>=17);
- if (mISDNport->b_port[i] == NULL)
- goto use_channel;
- add_trace("conclusion", NULL, "exclusively requested channel is busy");
- end_trace();
- ret = 6; // unacceptable
- goto no_channel;
- }
-
- /* requested channels in list will be used */
- if (channel)
- {
- i = selchannel->channel-1-(selchannel->channel>=17);
- if (mISDNport->b_port[i] == NULL)
- goto use_channel;
- }
-
- /* if channel is not available or not in list, it must be searched */
- get_from_list:
- /* check for first free channel in list */
- channel = 0;
- selchannel = ifport->channel_in;
- while(selchannel)
- {
- switch(selchannel->channel)
- {
- case CHANNEL_FREE: /* free channel */
- add_trace("hunting", "channel", "free");
- if (mISDNport->b_inuse >= mISDNport->b_num)
- break; /* all channel in use or reserverd */
- /* find channel */
- i = 0;
- while(i < mISDNport->b_num)
- {
- if (mISDNport->b_port[i] == NULL)
- {
- channel = i+1+(i>=15);
- break;
- }
- i++;
- }
- break;
-
- default:
- add_trace("hunting", "channel", "%d", selchannel->channel);
- if (selchannel->channel<1 || selchannel->channel==16)
- break; /* invalid channels */
- i = selchannel->channel-1-(selchannel->channel>=17);
- if (i >= mISDNport->b_num)
- break; /* channel not in port */
- if (mISDNport->b_port[i] == NULL)
- {
- channel = selchannel->channel;
- break;
- }
- break;
- }
- if (channel)
- break; /* found channel */
- selchannel = selchannel->next;
- }
- if (!channel)
- {
- add_trace("conclusion", NULL, "no channel available");
- end_trace();
- ret = 6; // unacceptable
- goto no_channel;
- }
- }
/* open channel */
- use_channel:
ret = seize_bchannel(channel, 1);
if (ret < 0)
{
- add_trace("conclusion", NULL, "channel not available");
- end_trace();
no_channel:
RELEASE_COMPLETE_t *release_complete;
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
- l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
p_m_delete = 1;
return;
}
- add_trace("conclusion", NULL, "channel available");
- add_trace("connect", "channel", "%d", p_m_b_channel);
- end_trace();
- bchannel_activate(p_m_mISDNport, p_m_b_index);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
/* create endpoint */
if (p_epointlist)
RELEASE_COMPLETE_t *release_complete;
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
- l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 41); /* temporary failure */
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
unsigned char keypad[32] = "";
struct message *message;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_called_pn(information->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, (unsigned char *)p_dialinginfo.number, sizeof(p_dialinginfo.number));
dec_ie_keypad(information->KEYPAD, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)keypad, sizeof(keypad));
dec_ie_complete(information->COMPLETE, (Q931_info_t *)((unsigned long)data+headerlen), &p_dialinginfo.sending_complete);
int ret;
struct message *message;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_channel_id(setup_acknowledge->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
dec_ie_progress(setup_acknowledge->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &location, &progress);
end_trace();
int notify = -1, type, plan, present;
char redir[32];
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_channel_id(proceeding->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
dec_ie_progress(proceeding->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &location, &progress);
dec_ie_notify(NULL/*proceeding->NOTIFY*/, (Q931_info_t *)((unsigned long)data+headerlen), ¬ify);
int notify = -1, type, plan, present;
char redir[32];
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_channel_id(alerting->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
dec_ie_progress(alerting->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &location, &progress);
dec_ie_notify(NULL/*alerting->NOTIFY*/, (Q931_info_t *)((unsigned long)data+headerlen), ¬ify);
if (p_m_d_ntmode)
p_m_d_ces = connect->ces;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_channel_id(connect->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
dec_ie_connected_pn(connect->CONNECT_PN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, &screen, (unsigned char *)p_connectinfo.id, sizeof(p_connectinfo.id));
#ifdef CENTREX
break;
}
p_connectinfo.isdn_port = p_m_portnum;
- SCPY(p_connectingo.interface, p_m_mISDNport->ifport->interface->name);
+ SCPY(p_connectinfo.interfaces, p_m_mISDNport->ifport->interface->name);
/* send connect acknowledge */
dmsg = create_l3msg(CC_CONNECT | RESPONSE, MT_CONNECT, dinfo, sizeof(CONNECT_ACKNOWLEDGE_t), p_m_d_ntmode);
- l1l2l3_trace_header(CC_CONNECT | RESPONSE, DIRECTION_OUT);
connect_acknowledge = (CONNECT_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_CONNECT | RESPONSE, DIRECTION_OUT);
/* if we had no bchannel before, we send it now */
if (!bchannel_before && p_m_b_channel)
enc_ie_channel_id(&connect_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
int coding, proglocation, progress;
struct message *message;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_progress(disconnect->PROGRESS, (Q931_info_t *)((unsigned long)data+headerlen), &coding, &proglocation, &progress);
dec_ie_cause(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
end_trace();
dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, dinfo, sizeof(RELEASE_t), p_m_d_ntmode);
release = (RELEASE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_RELEASE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
enc_ie_cause(&release->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */
add_trace("reason", NULL, "no remote patterns");
end_trace();
int location, cause;
/* cause */
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
if (p_m_d_collect_cause > 0)
{
add_trace("old-cause", "location", "%d", p_m_d_collect_location);
int location, cause;
struct message *message;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_cause(release->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
end_trace();
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, dinfo, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
int location, cause;
struct message *message;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_cause(release_complete->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
end_trace();
struct message *message;
int notify, type, plan, present;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_notify(notifying->NOTIFY, (Q931_info_t *)((unsigned long)data+headerlen), ¬ify);
dec_ie_redir_dn(notifying->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)message->param.notifyinfo.id, sizeof(message->param.notifyinfo.id));
end_trace();
msg_t *dmsg;
// class Endpoint *epoint;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
end_trace();
if (!ACTIVE_EPOINT(p_epointlist) || p_m_hold)
{
dmsg = create_l3msg(CC_HOLD_REJECT | REQUEST, MT_HOLD_REJECT, dinfo, sizeof(HOLD_REJECT_t), p_m_d_ntmode);
hold_reject = (HOLD_REJECT_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_HOLD_REJECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_HOLD_REJECT | REQUEST, DIRECTION_OUT);
enc_ie_cause(&hold_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, p_m_hold?101:31); /* normal unspecified / incompatible state */
add_trace("reason", NULL, "no endpoint");
end_trace();
message_put(message);
/* deactivate bchannel */
- chan_trace_header("CHANNEL RELEASE (hold)");
+ chan_trace_header(p_m_mISDNport, this, "CHANNEL RELEASE (hold)", DIRECTION_NONE);
add_trace("disconnect", "channel", "%d", p_m_b_channel);
end_trace();
- free_bchannel();
-prüfen, ob bei allen alloc_bchannel/free_bchannel ein trace erfolgt
+ drop_bchannel();
/* set hold state */
p_m_hold = 1;
/* acknowledge hold */
dmsg = create_l3msg(CC_HOLD_ACKNOWLEDGE | REQUEST, MT_HOLD_ACKNOWLEDGE, dinfo, sizeof(HOLD_ACKNOWLEDGE_t), p_m_d_ntmode);
hold_acknowledge = (HOLD_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_HOLD_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_HOLD_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
}
msg_t *dmsg;
int ret;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_channel_id(retrieve->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
end_trace();
dmsg = create_l3msg(CC_RETRIEVE_REJECT | REQUEST, MT_RETRIEVE_REJECT, dinfo, sizeof(RETRIEVE_REJECT_t), p_m_d_ntmode);
retrieve_reject = (RETRIEVE_REJECT_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_RETRIEVE_REJECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RETRIEVE_REJECT | REQUEST, DIRECTION_OUT);
enc_ie_cause(&retrieve_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
message->param.notifyinfo.local = 1; /* call is retrieved by supplementary service */
message_put(message);
+ /* hunt channel */
+ ret = channel = hunt_bchannel(channel, exclusive);
+ if (ret < 0)
+ goto no_channel;
-
-mach den channel-kram, wie beim setup
-
-
-
-
-
-
-
-
-
- /* channel_id */
- chan_trace_header("CHANNEL RELEASE (retrieve)");
- if (exclusive<0)
- exclusive = 0;
-alle channels richtig convertieren
- if (channel < 0)
- channel = -1; /* any channel */
- if (channel == ANY_CHANNEL)
- channel = -1; /* any channel */
- if (channel == CHANNEL_NO)
- add_trace("channel", "request", "no-channel");
- else
- add_trace("channel", "request", (channel>0)?"%d%s":"any", channel, exclusive?" (forced)":"");
- /* debug */
- if (channel==CHANNEL_NO && (p_type==PORT_TYPE_DSS1_TE_IN||p_type==PORT_TYPE_DSS1_TE_OUT))
- {
- add_trace("conclusion", NULL, "incoming call-waiting not supported for TE-mode");
- end_trace();
- cause = 6;
- goto reject;
- }
/* open channel */
- ret = alloc_bchannel(channel, exclusive);
+ ret = seize_bchannel(channel, 1);
if (ret < 0)
{
- PDEBUG(DEBUG_BCHANNEL, "- channel is not available (cause=%d), so we send a retrieve_reject.\n", -ret);
+ no_channel:
cause = -ret;
goto reject;
}
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/* set hold state */
p_m_hold = 0;
p_m_timeout = 0;
/* acknowledge retrieve */
dmsg = create_l3msg(CC_RETRIEVE_ACKNOWLEDGE | REQUEST, MT_RETRIEVE_ACKNOWLEDGE, dinfo, sizeof(RETRIEVE_ACKNOWLEDGE_t), p_m_d_ntmode);
retrieve_acknowledge = (RETRIEVE_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_RETRIEVE_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RETRIEVE_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
enc_ie_channel_id(&retrieve_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
msg_t *dmsg;
int ret = -31; /* normal, unspecified */
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_call_id(suspend->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len);
end_trace();
reject:
dmsg = create_l3msg(CC_SUSPEND_REJECT | REQUEST, MT_SUSPEND_REJECT, dinfo, sizeof(SUSPEND_REJECT_t), p_m_d_ntmode);
suspend_reject = (SUSPEND_REJECT_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT);
enc_ie_cause(&suspend_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
message_put(message);
/* deactivate bchannel */
- chan_trace_header("CHANNEL RELEASE (suspend)");
+ chan_trace_header(p_m_mISDNport, this, "CHANNEL RELEASE (suspend)", DIRECTION_NONE);
add_trace("disconnect", "channel", "%d", p_m_b_channel);
end_trace();
- free_bchannel();
+ drop_bchannel();
/* sending suspend to endpoint */
while (p_epointlist)
/* sending SUSPEND_ACKNOWLEDGE */
dmsg = create_l3msg(CC_SUSPEND_ACKNOWLEDGE | REQUEST, MT_SUSPEND_ACKNOWLEDGE, dinfo, sizeof(SUSPEND_ACKNOWLEDGE_t), p_m_d_ntmode);
suspend_acknowledge = (SUSPEND_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_SUSPEND_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_SUSPEND_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
PERROR("fatal software error: l3-stack gives us a process id 0xff00-0xffff\n");
exit(-1);
}
- l1l2l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | INDICATION, DIRECTION_IN);
if (p_m_d_l3id)
add_trace("callref", "old", "0x%x", p_m_d_l3id);
add_trace("callref", "new", "0x%x", dinfo);
if (p_m_d_l3id&(~0xff) == 0xff00)
p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0;
p_m_d_l3id = dinfo;
- p_m_d_ces = setup->ces;
+ p_m_d_ces = resume->ces;
}
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_call_id(resume->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len);
end_trace();
/* if blocked, release call */
if (p_m_mISDNport->ifport->block)
{
- RELEASE_COMPLETE_t *release_complete;
-
- printlog("--- port#%d is blocked.\n", mISDNport->ifport->portnum);
ret = -27;
goto reject;
}
/* call id */
if (len<0) len = 0;
- /* channel_id */
+ /* channel_id (no channel is possible in message) */
exclusive = 0;
channel = -1; /* any channel */
/* hunt channel */
- ret = hunt_bchannel(channel, exclusive);
+ ret = channel = hunt_bchannel(channel, exclusive);
+ if (ret < 0)
+ goto no_channel;
+
+ /* open channel */
+ ret = seize_bchannel(channel, 1);
if (ret < 0)
{
+ no_channel:
reject:
dmsg = create_l3msg(CC_RESUME_REJECT | REQUEST, MT_RESUME_REJECT, dinfo, sizeof(RESUME_REJECT_t), p_m_d_ntmode);
resume_reject = (RESUME_REJECT_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_RESUME_REJECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RESUME_REJECT | REQUEST, DIRECTION_OUT);
enc_ie_cause(&resume_reject->CAUSE, dmsg, (p_m_d_ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
if (ret == -27)
add_trace("reason", NULL, "port blocked");
p_m_delete = 1;
return;
}
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
/* create endpoint */
if (p_epointlist)
/* sending RESUME_ACKNOWLEDGE */
dmsg = create_l3msg(CC_RESUME_ACKNOWLEDGE | REQUEST, MT_RESUME_ACKNOWLEDGE, dinfo, sizeof(RESUME_ACKNOWLEDGE_t), p_m_d_ntmode);
resume_acknowledge = (RESUME_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_RESUME_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RESUME_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
enc_ie_channel_id(&resume_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
int facil_len;
struct message *message;
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
dec_ie_facility(facility->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), facil, &facil_len);
end_trace();
*/
void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
{
- int i;
int new_l3id;
int timer_hex=0;
switch (prim)
{
case CC_TIMEOUT | INDICATION:
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
if (p_m_d_ntmode)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
case CC_SETUP | CONFIRM:
if (p_m_d_ntmode)
{
- l1l2l3_trace_header(CC_NEW_CR | INDICATION, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | INDICATION, DIRECTION_IN);
add_trace("callref", "old", "0x%x", p_m_d_l3id);
/* nt-library now gives us a new id via CC_SETUP_CONFIRM */
if ((p_m_d_l3id&0xff00) != 0xff00)
add_trace("callref", "new", "0x%x", p_m_d_l3id);
end_trace();
}
- end_trace;
break;
case CC_INFORMATION | INDICATION:
break;
case CC_RELEASE_CR | INDICATION:
- l1l2l3_trace_header(CC_RELEASE_CR | INDICATION, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_CR | INDICATION, DIRECTION_IN);
add_trace("callref", NULL, "0x%x", p_m_d_l3id);
end_trace();
if (p_m_d_ntmode)
break;
case CC_NEW_CR | INDICATION:
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
if (p_m_d_l3id)
add_trace("callref", "old", "0x%x", p_m_d_l3id);
if (p_m_d_ntmode)
break;
default:
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
add_trace("unhandled", "prim", "0x%x", prim);
end_trace();
}
if (param->information.number[0]) /* only if we have something to dial */
{
dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode);
- l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT);
information = (INFORMATION_t *)(dmsg->data + headerlen);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
enc_ie_called_pn(&information->CALLED_PN, dmsg, 0, 1, (unsigned char *)param->information.number);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
/* release if port is blocked */
if (p_m_mISDNport->ifport->block)
{
+ struct message *message;
+
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
message->param.disconnectinfo.cause = 27; // temp. unavail.
message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
/* sending information */
dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode);
information = (INFORMATION_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
if (p_m_d_ntmode)
enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_callerinfo.display);
end_trace();
channel = CHANNEL_NO;
/* creating l3id */
- l1l2l3_trace_header(CC_NEW_CR | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | REQUEST, DIRECTION_OUT);
if (p_m_d_ntmode)
{
i = 0;
/* preparing setup message */
dmsg = create_l3msg(CC_SETUP | REQUEST, MT_SETUP, p_m_d_l3id, sizeof(SETUP_t), p_m_d_ntmode);
- l1l2l3_trace_header(CC_SETUP | REQUEST, DIRECTION_OUT);
setup = (SETUP_t *)(dmsg->data + headerlen);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_SETUP | REQUEST, DIRECTION_OUT);
/* channel information */
if (channel >= 0) /* it should */
{
/* sending facility */
dmsg = create_l3msg(CC_FACILITY | REQUEST, MT_FACILITY, p_m_d_l3id, sizeof(FACILITY_t), p_m_d_ntmode);
facility = (FACILITY_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_FACILITY | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_FACILITY | REQUEST, DIRECTION_OUT);
enc_ie_facility(&facility->FACILITY, dmsg, (unsigned char *)param->facilityinfo.data, param->facilityinfo.len);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
/* sending notification */
dmsg = create_l3msg(CC_NOTIFY | REQUEST, MT_NOTIFY, p_m_d_l3id, sizeof(NOTIFY_t), p_m_d_ntmode);
notification = (NOTIFY_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_NOTIFY | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_NOTIFY | REQUEST, DIRECTION_OUT);
enc_ie_notify(¬ification->NOTIFY, dmsg, notify);
/* sending redirection number only in ntmode */
if (type >= 0 && p_m_d_ntmode)
/* sending information */
dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode);
information = (INFORMATION_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)param->notifyinfo.display);
end_trace();
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
/* sending setup_acknowledge */
dmsg = create_l3msg(CC_SETUP_ACKNOWLEDGE | REQUEST, MT_SETUP_ACKNOWLEDGE, p_m_d_l3id, sizeof(SETUP_ACKNOWLEDGE_t), p_m_d_ntmode);
setup_acknowledge = (SETUP_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_SETUP_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_SETUP_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
/* channel information */
if (p_state == PORT_STATE_IN_SETUP)
enc_ie_channel_id(&setup_acknowledge->CHANNEL_ID, dmsg, 1, p_m_b_channel);
/* sending proceeding */
dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
/* channel information */
if (p_state == PORT_STATE_IN_SETUP)
enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
/* sending proceeding */
dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
/* channel information */
enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
/* progress information */
/* sending alerting */
dmsg = create_l3msg(CC_ALERTING | REQUEST, MT_ALERTING, p_m_d_l3id, sizeof(ALERTING_t), p_m_d_ntmode);
alerting = (ALERTING_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_ALERTING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_ALERTING | REQUEST, DIRECTION_OUT);
/* channel information */
if (p_state == PORT_STATE_IN_SETUP)
enc_ie_channel_id(&alerting->CHANNEL_ID, dmsg, 1, p_m_b_channel);
/* sending proceeding */
dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
/* channel information */
enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
// /* progress information */
/* sending information */
dmsg = create_l3msg(CC_INFORMATION | REQUEST, MT_INFORMATION, p_m_d_l3id, sizeof(INFORMATION_t), p_m_d_ntmode);
information = (INFORMATION_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_INFORMATION | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
if (p_m_d_ntmode)
enc_ie_display(&information->DISPLAY, dmsg, (unsigned char *)p_connectinfo.display);
end_trace();
/* preparing connect message */
dmsg = create_l3msg(CC_CONNECT | REQUEST, MT_CONNECT, p_m_d_l3id, sizeof(CONNECT_t), p_m_d_ntmode);
connect = (CONNECT_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_CONNECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_CONNECT | REQUEST, DIRECTION_OUT);
/* connect information */
plan = 1;
switch (p_connectinfo.ntype)
/* sending release */
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
/* send cause */
enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
end_trace();
/* sending proceeding */
dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
/* channel information */
enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
/* progress information */
/* sending disconnect */
dmsg = create_l3msg(CC_DISCONNECT | REQUEST, MT_DISCONNECT, p_m_d_l3id, sizeof(DISCONNECT_t), p_m_d_ntmode);
disconnect = (DISCONNECT_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_DISCONNECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_DISCONNECT | REQUEST, DIRECTION_OUT);
/* progress information */
if (p_capainfo.bearer_capa==INFO_BC_SPEECH
|| p_capainfo.bearer_capa==INFO_BC_AUDIO
/* sending release */
dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, p_m_d_l3id, sizeof(RELEASE_t), p_m_d_ntmode);
release = (RELEASE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_RELEASE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
/* send cause */
enc_ie_cause(&release->CAUSE, dmsg, (p_m_d_ntmode && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
end_trace();
/* remove epoint */
remove_endpoint:
free_epointid(epoint_id);
- l1l2l3_trace_header(CC_RELEASE_CR | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_CR | REQUEST, DIRECTION_OUT);
add_trace("callref", "new", "0x%x", p_m_d_l3id);
end_trace();
if (p_m_d_ntmode)
/* sending release */
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, p_m_d_l3id, sizeof(RELEASE_COMPLETE_t), p_m_d_ntmode);
release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_RELEASE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
/* send cause */
enc_ie_cause(&release_complete->CAUSE, dmsg, (p_m_d_ntmode && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
end_trace();
/* sending proceeding */
dmsg = create_l3msg(CC_PROCEEDING | REQUEST, MT_CALL_PROCEEDING, p_m_d_l3id, sizeof(CALL_PROCEEDING_t), p_m_d_ntmode);
proceeding = (CALL_PROCEEDING_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
/* channel information */
enc_ie_channel_id(&proceeding->CHANNEL_ID, dmsg, 1, p_m_b_channel);
/* progress information */
/* sending disconnect */
dmsg = create_l3msg(CC_DISCONNECT | REQUEST, MT_DISCONNECT, p_m_d_l3id, sizeof(DISCONNECT_t), p_m_d_ntmode);
disconnect = (DISCONNECT_t *)(dmsg->data + headerlen);
- l1l2l3_trace_header(CC_DISCONNECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, CC_DISCONNECT | REQUEST, DIRECTION_OUT);
/* progress information */
if (p_capainfo.bearer_capa==INFO_BC_SPEECH
|| p_capainfo.bearer_capa==INFO_BC_AUDIO
act.dinfo = 0;
act.len = 0;
mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
- l1l2l3_trace_header(act.prim, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, act.prim, DIRECTION_OUT);
end_trace();
// /* set timeout */
// p_m_mISDNport->l1timeout = now+3;
case DL_ESTABLISH | INDICATION:
case DL_ESTABLISH | CONFIRM:
ss_estab:
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, hh->prim, DIRECTION_IN);
add_trace("tei", NULL, "%d", hh->dinfo);
end_trace();
if (mISDNport->ptp && hh->dinfo == 0)
case DL_RELEASE | INDICATION:
case DL_RELEASE | CONFIRM:
ss_rel:
- l1l2l3_trace_header(prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, hh->prim, DIRECTION_IN);
add_trace("tei", NULL, "%d", hh->dinfo);
end_trace();
if (mISDNport->ptp && hh->dinfo == 0)
PERROR("FATAL ERROR: cannot create port object.\n");
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, hh->dinfo, sizeof(RELEASE_COMPLETE_t), mISDNport->ntmode);
release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + mISDN_HEADER_LEN);
+ l1l2l3_trace_header(mISDNport, NULL, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
enc_ie_cause_standalone(mISDNport->ntmode?&release_complete->CAUSE:NULL, dmsg, (mISDNport->ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
+ end_trace();
msg_queue_tail(&mISDNport->downqueue, dmsg);
break;
}
case CC_RESUME | INDICATION:
/* creating port object */
SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum);
- if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL)))
+ if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, 0, 0)))
{
SUSPEND_REJECT_t *suspend_reject;
msg_t *dmsg;
PERROR("FATAL ERROR: cannot create port object.\n");
dmsg = create_l3msg(CC_SUSPEND_REJECT | REQUEST, MT_SUSPEND_REJECT, hh->dinfo, sizeof(SUSPEND_REJECT_t), mISDNport->ntmode);
suspend_reject = (SUSPEND_REJECT_t *)(dmsg->data + mISDN_HEADER_LEN);
+ l1l2l3_trace_header(mISDNport, NULL, CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT);
enc_ie_cause_standalone(mISDNport->ntmode?&suspend_reject->CAUSE:NULL, dmsg, (mISDNport->ntmode)?1:0, 47);
+ end_trace();
msg_queue_tail(&mISDNport->downqueue, dmsg);
break;
}
/* creating port object */
SPRINT(name, "%s-%d-in", mISDNport->ifport->interface->name, mISDNport->portnum);
- if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_TE_IN, mISDNport, name, NULL)))
+ if (!(pdss1 = new Pdss1(PORT_TYPE_DSS1_NT_IN, mISDNport, name, NULL, 0, 0)))
{
RELEASE_COMPLETE_t *release_complete;
msg_t *dmsg;
PERROR("FATAL ERROR: cannot create port object.\n");
dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST, MT_RELEASE_COMPLETE, frm->dinfo, sizeof(RELEASE_COMPLETE_t), mISDNport->ntmode);
release_complete = (RELEASE_COMPLETE_t *)(dmsg->data + mISDN_HEADER_LEN);
+ l1l2l3_trace_header(mISDNport, NULL, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
enc_ie_cause_standalone(mISDNport->ntmode?&release_complete->CAUSE:NULL, dmsg, (mISDNport->ntmode)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
+ end_trace();
msg_queue_tail(&mISDNport->downqueue, dmsg);
free_msg(msg);
return(0);
projects / lcr.git / blobdiff