** **
\*****************************************************************************/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
#include "main.h"
-#include <unistd.h>
-#include <poll.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#include "myisdn.h"
+#ifndef SOCKET_MISDN
+// old mISDN
extern "C" {
#include <mISDNuser/net_l2.h>
}
+#else
+// socket mISDN
+#include <sys/socket.h>
+extern "C" {
+}
+#include <q931.h>
+extern unsigned long mt_assign_pid;
+#endif
-#include "q931.h"
#include "ie.cpp"
-
/*
* constructor
*/
if (p_m_d_notify_pending)
message_free(p_m_d_notify_pending);
+#ifndef SOCKET_MISDN
/* check how many processes are left */
if (p_m_d_ntmode == 1)
{
if (p_m_mISDNport->nst.layer3->proc)
PDEBUG(DEBUG_ISDN, "destroyed mISDNPort(%s). WARNING: There is still a layer 3 process left. Ignore this, if currently are other calls. This message is not an error!\n", p_name);
}
+#endif
}
* return: <0: error, call is released, -cause is given
* 0: ok, nothing to do
*/
+#ifdef SOCKET_MISDN
+int Pdss1::received_first_reply_to_setup(unsigned long cmd, int channel, int exclusive)
+#else
int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int exclusive)
+#endif
{
int ret;
#ifdef SOCKET_MISDN
/*** we sent 'no channel available' ***/
/* if not the first reply, but a connect, we are forced */
+#ifdef SOCKET_MISDN
+ if (cmd==MT_CONNECT && p_state!=PORT_STATE_OUT_SETUP)
+#else
if (prim==(CC_CONNECT | INDICATION) && p_state!=PORT_STATE_OUT_SETUP)
+#endif
{
chan_trace_header(p_m_mISDNport, this, "CHANNEL SELECTION (connect)", DIRECTION_NONE);
add_trace("channel", "request", "no-channel");
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
* handles all indications
*/
/* CC_SETUP INDICATION */
-void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
-{
#ifdef SOCKET_MISDN
- l3_msg *l3m;
+void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
#else
+void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
+{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
msg_t *dmsg;
SETUP_t *setup = (SETUP_t *)((unsigned long)data + headerlen);
unsigned char useruser[128];
int useruser_len = 0, useruser_protocol;
class Endpoint *epoint;
- struct message *message;
+ struct lcr_msg *message;
+#ifdef SOCKET_MISDN
+ /* process given callref */
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_IND, DIRECTION_IN);
+ add_trace("callref", "new", "0x%x", pid);
+ if (p_m_d_l3id != pid)
+ {
+ /* release in case the ID is already in use */
+ add_trace("error", NULL, "callref already in use");
+ end_trace();
+ l3m = create_l3msg();
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
+ enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
+ add_trace("reason", NULL, "callref already in use");
+ end_trace();
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, pid, l3m);
+ new_state(PORT_STATE_RELEASE);
+ p_m_delete = 1;
+ return;
+ }
+ p_m_d_l3id = pid;
+ p_m_d_ces = pid >> 16;
+ end_trace();
+#else
/* callref from nt-lib */
if (p_m_d_ntmode)
{
/* nt-library now gives us the id via CC_SETUP */
if (dinfo&(~0xff) == 0xff00)
FATAL("l3-stack gives us a process id 0xff00-0xffff\n");
- l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | INDICATION, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_IND, 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_l3id = dinfo;
p_m_d_ces = setup->ces;
}
+#endif
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_calling_pn(l3m, &calling_type, &calling_plan, &calling_present, &calling_screen, (unsigned char *)p_callerinfo.id, sizeof(p_callerinfo.id));
+ dec_ie_called_pn(l3m, &called_type, &called_plan, (unsigned char *)p_dialinginfo.id, sizeof(p_dialinginfo.id));
+ dec_ie_keypad(l3m, (unsigned char *)keypad, sizeof(keypad));
+ /* te-mode: CNIP (calling name identification presentation) */
+ if (!p_m_d_ntmode)
+ dec_facility_centrex(l3m, (unsigned char *)p_callerinfo.name, sizeof(p_callerinfo.name));
+ dec_ie_useruser(l3m, &useruser_protocol, useruser, &useruser_len);
+ dec_ie_complete(l3m, &p_dialinginfo.sending_complete);
+ dec_ie_redir_nr(l3m, &redir_type, &redir_plan, &redir_present, &redir_screen, &redir_reason, (unsigned char *)p_redirinfo.id, sizeof(p_redirinfo.id));
+ dec_ie_channel_id(l3m, &exclusive, &channel);
+ dec_ie_hlc(l3m, &hlc_coding, &hlc_interpretation, &hlc_presentation, &hlc_hlc, &hlc_exthlc);
+ dec_ie_bearer(l3m, &bearer_coding, &bearer_capability, &bearer_mode, &bearer_rate, &bearer_multi, &bearer_user);
+#else
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.id, sizeof(p_dialinginfo.id));
dec_ie_keypad(setup->KEYPAD, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)keypad, sizeof(keypad));
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, &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);
+#endif
end_trace();
/* if blocked, release call with MT_RELEASE_COMPLETE */
if (p_m_mISDNport->ifport->block)
{
- RELEASE_COMPLETE_t *release_complete;
-
#ifdef SOCKET_MISDN
l3m = create_l3msg();
#else
+ RELEASE_COMPLETE_t *release_complete;
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 27); /* temporary unavailable */
#else
add_trace("reason", NULL, "port blocked");
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
}
/* CC_INFORMATION INDICATION */
+#ifdef SOCKET_MISDN
+void Pdss1::information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
INFORMATION_t *information = (INFORMATION_t *)((unsigned long)data + headerlen);
+#endif
int type, plan;
unsigned char keypad[32] = "";
- struct message *message;
+ struct lcr_msg *message;
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_called_pn(l3m, &type, &plan, (unsigned char *)p_dialinginfo.id, sizeof(p_dialinginfo.id));
+ dec_ie_keypad(l3m, (unsigned char *)keypad, sizeof(keypad));
+ dec_ie_complete(l3m, &p_dialinginfo.sending_complete);
+#else
dec_ie_called_pn(information->CALLED_PN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, (unsigned char *)p_dialinginfo.id, sizeof(p_dialinginfo.id));
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);
+#endif
end_trace();
SCAT(p_dialinginfo.id, (char *)keypad);
}
/* CC_SETUP_ACCNOWLEDGE INDICATION */
+#ifdef SOCKET_MISDN
+void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void *data)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
SETUP_ACKNOWLEDGE_t *setup_acknowledge = (SETUP_ACKNOWLEDGE_t *)((unsigned long)data + headerlen);
+#endif
int exclusive, channel;
int coding, location, progress;
int ret;
- struct message *message;
+ struct lcr_msg *message;
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_channel_id(l3m, &exclusive, &channel);
+ dec_ie_progress(l3m, &coding, &location, &progress);
+#else
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);
+#endif
end_trace();
/* process channel */
+#ifdef SOCKET_MISDN
+ ret = received_first_reply_to_setup(cmd, channel, exclusive);
+#else
ret = received_first_reply_to_setup(prim, channel, exclusive);
+#endif
if (ret < 0)
{
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
}
/* CC_PROCEEDING INDICATION */
+#ifdef SOCKET_MISDN
+void Pdss1::proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
CALL_PROCEEDING_t *proceeding = (CALL_PROCEEDING_t *)((unsigned long)data + headerlen);
+#endif
int exclusive, channel;
int coding, location, progress;
int ret;
- struct message *message;
+ struct lcr_msg *message;
int notify = -1, type, plan, present;
char redir[32];
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_channel_id(l3m, &exclusive, &channel);
+ dec_ie_progress(l3m, &coding, &location, &progress);
+ dec_ie_notify(l3m, ¬ify);
+ dec_ie_redir_dn(l3m, &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
+#else
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);
dec_ie_redir_dn(proceeding->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
+#endif
end_trace();
+#ifdef SOCKET_MISDN
+ ret = received_first_reply_to_setup(cmd, channel, exclusive);
+#else
ret = received_first_reply_to_setup(prim, channel, exclusive);
+#endif
if (ret < 0)
{
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
}
/* CC_ALERTING INDICATION */
+#ifdef SOCKET_MISDN
+void Pdss1::alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
ALERTING_t *alerting = (ALERTING_t *)((unsigned long)data + headerlen);
+#endif
int exclusive, channel;
int coding, location, progress;
int ret;
- struct message *message;
+ struct lcr_msg *message;
int notify = -1, type, plan, present;
char redir[32];
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_ALERTING_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_channel_id(l3m, &exclusive, &channel);
+ dec_ie_progress(l3m, &coding, &location, &progress);
+ dec_ie_notify(l3m, ¬ify);
+ dec_ie_redir_dn(l3m, &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
+#else
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);
dec_ie_redir_dn(alerting->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
+#endif
end_trace();
/* process channel */
+#ifdef SOCKET_MISDN
+ ret = received_first_reply_to_setup(cmd, channel, exclusive);
+#else
ret = received_first_reply_to_setup(prim, channel, exclusive);
+#endif
if (ret < 0)
{
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
}
/* CC_CONNECT INDICATION */
-void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
-{
#ifdef SOCKET_MISDN
- l3_msg *l3m;
+void Pdss1::connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
#else
+void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
+{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
msg_t *dmsg;
CONNECT_t *connect = (CONNECT_t *)((unsigned long)data + headerlen);
int exclusive, channel;
int type, plan, present, screen;
int ret;
- struct message *message;
+ struct lcr_msg *message;
int bchannel_before;
if (p_m_d_ntmode)
+#ifdef SOCKET_MISDN
+ p_m_d_ces = pid >> 16;
+#else
p_m_d_ces = connect->ces;
+#endif
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_channel_id(l3m, &exclusive, &channel);
+ dec_ie_connected_pn(l3m, &type, &plan, &present, &screen, (unsigned char *)p_connectinfo.id, sizeof(p_connectinfo.id));
+ /* te-mode: CONP (connected name identification presentation) */
+ if (!p_m_d_ntmode)
+ dec_facility_centrex(l3m, (unsigned char *)p_connectinfo.name, sizeof(p_connectinfo.name));
+#else
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));
/* te-mode: CONP (connected name identification presentation) */
if (!p_m_d_ntmode)
dec_facility_centrex(connect->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), (unsigned char *)p_connectinfo.name, sizeof(p_connectinfo.name));
+#endif
end_trace();
/* select channel */
bchannel_before = p_m_b_channel;
+#ifdef SOCKET_MISDN
+ ret = received_first_reply_to_setup(cmd, channel, exclusive);
+#else
ret = received_first_reply_to_setup(prim, channel, exclusive);
+#endif
if (ret < 0)
{
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
dmsg = create_l3msg(CC_CONNECT | RESPONSE, MT_CONNECT, dinfo, sizeof(CONNECT_ACKNOWLEDGE_t), p_m_d_ntmode);
connect_acknowledge = (CONNECT_ACKNOWLEDGE_t *)(dmsg->data + headerlen);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_CONNECT | RESPONSE, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_RES, DIRECTION_OUT);
/* if we had no bchannel before, we send it now */
if (!bchannel_before && p_m_b_channel)
#ifdef SOCKET_MISDN
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_CONNECT, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CONNECT, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
}
/* CC_DISCONNECT INDICATION */
+#ifdef SOCKET_MISDN
+void Pdss1::disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
DISCONNECT_t *disconnect = (DISCONNECT_t *)((unsigned long)data + headerlen);
+#endif
int location, cause;
int coding, proglocation, progress;
- struct message *message;
+ struct lcr_msg *message;
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_progress(l3m, &coding, &proglocation, &progress);
+ dec_ie_cause(l3m, &location, &cause);
+#else
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);
+#endif
end_trace();
if (location == LOCATION_PRIVATE_LOCAL)
location = LOCATION_PRIVATE_REMOTE;
dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, dinfo, sizeof(RELEASE_t), p_m_d_ntmode);
release = (RELEASE_t *)(dmsg->data + headerlen);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16); /* normal */
#else
add_trace("reason", NULL, "no remote patterns");
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
}
/* CC_DISCONNECT INDICATION */
+#ifdef SOCKET_MISDN
+void Pdss1::disconnect_ind_i(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
DISCONNECT_t *disconnect = (DISCONNECT_t *)((unsigned long)data + headerlen);
+#endif
int location, cause;
/* cause */
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_IND, DIRECTION_IN);
if (p_m_d_collect_cause > 0)
{
add_trace("old-cause", "location", "%d", p_m_d_collect_location);
add_trace("old-cause", "value", "%d", p_m_d_collect_cause);
}
+#ifdef SOCKET_MISDN
+ dec_ie_cause(l3m, &location, &cause);
+#else
dec_ie_cause(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
+#endif
if (location == LOCATION_PRIVATE_LOCAL)
location = LOCATION_PRIVATE_REMOTE;
}
/* CC_RELEASE INDICATION */
-void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
-{
#ifdef SOCKET_MISDN
- l3_msg *l3m;
+void Pdss1::release_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
#else
+void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
+{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
msg_t *dmsg;
RELEASE_t *release = (RELEASE_t *)((unsigned long)data + headerlen);
#endif
int location, cause;
- struct message *message;
+ struct lcr_msg *message;
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_cause(l3m, &location, &cause);
+#else
dec_ie_cause(release->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
+#endif
end_trace();
if (location == LOCATION_PRIVATE_LOCAL)
location = LOCATION_PRIVATE_REMOTE;
}
/* only in NT mode we must send release_complete, if we got a release confirm */
+#ifdef SOCKET_MISDN
+ if (cmd == MT_RELEASE)
+#else
if (prim == (CC_RELEASE | CONFIRM))
+#endif
{
/* sending release complete */
- RELEASE_COMPLETE_t *release_complete;
-
#ifdef SOCKET_MISDN
l3m = create_l3msg();
#else
+ RELEASE_COMPLETE_t *release_complete;
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 16);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
}
/* CC_RELEASE_COMPLETE INDICATION (a reject) */
+#ifdef SOCKET_MISDN
+void Pdss1::release_complete_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void *data)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
RELEASE_COMPLETE_t *release_complete = (RELEASE_COMPLETE_t *)((unsigned long)data + headerlen);
+#endif
int location, cause;
- struct message *message;
+ struct lcr_msg *message;
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_cause(l3m, &location, &cause);
+#else
dec_ie_cause(release_complete->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
+#endif
end_trace();
if (location == LOCATION_PRIVATE_LOCAL)
location = LOCATION_PRIVATE_REMOTE;
}
/* T312 timeout */
-void Pdss1::t312_timeout(unsigned long prim, unsigned long dinfo, void *data)
+#ifdef SOCKET_MISDN
+void Pdss1::t312_timeout_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
+void Pdss1::t312_timeout_ind(unsigned long prim, unsigned long dinfo, void *data)
{
- struct message *message;
+#endif
+ struct lcr_msg *message;
// trace is done at message_isdn()
}
/* CC_NOTIFY INDICATION */
+#ifdef SOCKET_MISDN
+void Pdss1::notify_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
NOTIFY_t *notifying = (NOTIFY_t *)((unsigned long)data + headerlen);
- struct message *message;
+#endif
+ struct lcr_msg *message;
int notify, type, plan, present;
unsigned char notifyid[sizeof(message->param.notifyinfo.id)];
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_notify(l3m, ¬ify);
+ dec_ie_redir_dn(l3m, &type, &plan, &present, notifyid, sizeof(notifyid));
+#else
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, notifyid, sizeof(notifyid));
+#endif
end_trace();
if (!ACTIVE_EPOINT(p_epointlist))
/* CC_HOLD INDICATION */
-void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
-{
- struct message *message;
+ struct lcr_msg *message;
#ifdef SOCKET_MISDN
- l3_msg *l3m;
+void Pdss1::hold_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
#else
+void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
+{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
msg_t *dmsg;
// HOLD_t *hold = (HOLD_t *)((unsigned long)data + headerlen);
#endif
// class Endpoint *epoint;
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_IND, 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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_HOLD_REJECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_REJECT_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, p_m_hold?101:31); /* normal unspecified / incompatible state */
#else
add_trace("reason", NULL, "no endpoint");
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_HOLD_REJECT, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_HOLD_REJECT, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_HOLD_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_HOLD_ACKNOWLEDGE_REQ, DIRECTION_OUT);
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_HOLD_ACKNOWLEDGE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_HOLD_ACKNOWLEDGE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
/* CC_RETRIEVE INDICATION */
-void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
-{
#ifdef SOCKET_MISDN
- l3_msg *l3m;
+void Pdss1::retrieve_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
#else
+void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
+{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
msg_t *dmsg;
RETRIEVE_t *retrieve = (RETRIEVE_t *)((unsigned long)data + headerlen);
RETRIEVE_REJECT_t *retrieve_reject;
RETRIEVE_ACKNOWLEDGE_t *retrieve_acknowledge;
#endif
- struct message *message;
+ struct lcr_msg *message;
int channel, exclusive, cause;
int ret;
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RETRIEVE_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_channel_id(l3m, &exclusive, &channel);
+#else
dec_ie_channel_id(retrieve->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &exclusive, &channel);
+#endif
end_trace();
if (!p_m_hold)
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RETRIEVE_REJECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RETRIEVE_REJECT_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, cause);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RETRIEVE_REJECT, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RETRIEVE_REJECT, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RETRIEVE_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RETRIEVE_ACKNOWLEDGE_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_channel_id(l3m, 1, p_m_b_channel);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RETRIEVE_ACKNOWLEDGE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RETRIEVE_ACKNOWLEDGE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
}
/* CC_SUSPEND INDICATION */
-void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
-{
#ifdef SOCKET_MISDN
- l3_msg *l3m;
+void Pdss1::suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
#else
+void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
+{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
msg_t *dmsg;
SUSPEND_t *suspend = (SUSPEND_t *)((unsigned long)data + headerlen);
SUSPEND_ACKNOWLEDGE_t *suspend_acknowledge;
SUSPEND_REJECT_t *suspend_reject;
#endif
- struct message *message;
+ struct lcr_msg *message;
class Endpoint *epoint;
unsigned char callid[8];
int len;
int ret = -31; /* normal, unspecified */
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_call_id(l3m, callid, &len);
+#else
dec_ie_call_id(suspend->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len);
+#endif
end_trace();
if (!ACTIVE_EPOINT(p_epointlist))
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_SUSPEND_REJECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_REJECT_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SUSPEND_REJECT, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SUSPEND_REJECT, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_SUSPEND_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_SUSPEND_ACKNOWLEDGE_REQ, DIRECTION_OUT);
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SUSPEND_ACKNOWLEDGE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SUSPEND_ACKNOWLEDGE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
}
/* CC_RESUME INDICATION */
-void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
-{
#ifdef SOCKET_MISDN
- l3_msg *l3m;
+void Pdss1::resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
#else
+void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
+{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
msg_t *dmsg;
RESUME_t *resume = (RESUME_t *)((unsigned long)data + headerlen);
int len;
int channel, exclusive;
class Endpoint *epoint;
- struct message *message;
+ struct lcr_msg *message;
int ret;
+#ifdef SOCKET_MISDN
+ /* process given callref */
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_IND, DIRECTION_IN);
+ add_trace("callref", "new", "0x%x", pid);
+ if (p_m_d_l3id != pid)
+ {
+ /* release is case the ID is already in use */
+ add_trace("error", NULL, "callref already in use");
+ end_trace();
+ l3m = create_l3msg();
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_REJECT_REQ, DIRECTION_OUT);
+ enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, 47);
+ add_trace("reason", NULL, "callref already in use");
+ end_trace();
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_REJECT, pid, l3m);
+ new_state(PORT_STATE_RELEASE);
+ p_m_delete = 1;
+ return;
+ }
+ p_m_d_l3id = pid;
+ p_m_d_ces = pid >> 16;
+ end_trace();
+#else
/* callref from nt-lib */
if (p_m_d_ntmode)
{
/* nt-library now gives us the id via CC_RESUME */
if (dinfo&(~0xff) == 0xff00)
FATAL("l3-stack gives us a process id 0xff00-0xffff\n");
- l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | INDICATION, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_IND, 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_l3id = dinfo;
p_m_d_ces = resume->ces;
}
+#endif
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_call_id(l3m, callid, &len);
+#else
dec_ie_call_id(resume->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), callid, &len);
+#endif
end_trace();
/* if blocked, release call */
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RESUME_REJECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_REJECT_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally)?LOCATION_PRIVATE_LOCAL:LOCATION_PRIVATE_REMOTE, -ret);
#else
add_trace("reason", NULL, "port blocked");
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RESUME_REJECT, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_REJECT, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RESUME_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RESUME_ACKNOWLEDGE_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_channel_id(l3m, 1, p_m_b_channel);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RESUME_ACKNOWDGE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_ACKNOWLEDGE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
/* CC_FACILITY INDICATION */
+#ifdef SOCKET_MISDN
+void Pdss1::facility_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+#else
void Pdss1::facility_ind(unsigned long prim, unsigned long dinfo, void *data)
{
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
FACILITY_t *facility = (FACILITY_t *)((unsigned long)data + headerlen);
+#endif
unsigned char facil[256];
int facil_len;
- struct message *message;
+ struct lcr_msg *message;
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_FACILITY_IND, DIRECTION_IN);
+#ifdef SOCKET_MISDN
+ dec_ie_facility(l3m, facil, &facil_len);
+#else
dec_ie_facility(facility->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), facil, &facil_len);
+#endif
end_trace();
/* facility */
* handler for isdn connections
* incoming information are parsed and sent via message to the endpoint
*/
+#ifdef SOCKET_MISDN
+void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+ int timer_hex=0;
+
+ switch (cmd)
+ {
+ case MT_TIMEOUT:
+ if (!l3m->cause)
+ {
+ PERROR("Pdss1(%s) timeout without cause.\n", p_name);
+ break;
+ }
+ if (l3m->cause[1] != 5)
+ {
+ PERROR("Pdss1(%s) expecting timeout with timer diagnostic.\n", p_name);
+ break;
+ }
+ if (l3m->cause[4]=='3' && l3m->cause[5]=='1' && l3m->cause[6]=='2')
+ {
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_TIMEOUT_IND, DIRECTION_IN);
+ add_trace("timer", NULL, "%x", timer_hex);
+ end_trace();
+ t312_timeout_ind(cmd, pid, l3m);
+ }
+ break;
+
+ case MT_SETUP:
+ if (p_state != PORT_STATE_IDLE)
+ break;
+ setup_ind(cmd, pid, l3m);
+ break;
+
+ case MT_INFORMATION:
+ information_ind(cmd, pid, l3m);
+ break;
+
+ case MT_SETUP_ACKNOWLEDGE:
+ if (p_state != PORT_STATE_OUT_SETUP)
+ {
+ PERROR("Pdss1(%s) received setup_acknowledge, but we are not in outgoing setup state, IGNORING.\n", p_name);
+ break;
+ }
+ setup_acknowledge_ind(cmd, pid, l3m);
+ break;
+
+ case MT_CALL_PROCEEDING:
+ if (p_state != PORT_STATE_OUT_SETUP
+ && p_state != PORT_STATE_OUT_OVERLAP)
+ {
+ PERROR("Pdss1(%s) received proceeding, but we are not in outgoing setup OR overlap state, IGNORING.\n", p_name);
+ break;
+ }
+ proceeding_ind(cmd, pid, l3m);
+ break;
+
+ case MT_ALERTING:
+ if (p_state != PORT_STATE_OUT_SETUP
+ && p_state != PORT_STATE_OUT_OVERLAP
+ && p_state != PORT_STATE_OUT_PROCEEDING)
+ {
+ PERROR("Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding state, IGNORING.\n", p_name);
+ break;
+ }
+ alerting_ind(cmd, pid, l3m);
+ break;
+
+ case MT_CONNECT:
+ if (p_state != PORT_STATE_OUT_SETUP
+ && p_state != PORT_STATE_OUT_OVERLAP
+ && p_state != PORT_STATE_OUT_PROCEEDING
+ && p_state != PORT_STATE_OUT_ALERTING)
+ {
+ PERROR("Pdss1(%s) received alerting, but we are not in outgoing setup OR overlap OR proceeding OR ALERTING state, IGNORING.\n", p_name);
+ break;
+ }
+ connect_ind(cmd, pid, l3m);
+ if (p_m_d_notify_pending)
+ {
+ /* send pending notify message during connect */
+ message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
+ message_free(p_m_d_notify_pending);
+ p_m_d_notify_pending = NULL;
+ }
+ break;
+
+ case MT_CONNECT_ACKNOWLEDGE:
+ if (p_state == PORT_STATE_CONNECT_WAITING)
+ new_state(PORT_STATE_CONNECT);
+ if (p_m_d_notify_pending)
+ {
+ /* send pending notify message during connect-ack */
+ message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
+ message_free(p_m_d_notify_pending);
+ p_m_d_notify_pending = NULL;
+ }
+ break;
+
+ case MT_DISCONNECT:
+ disconnect_ind(cmd, pid, l3m);
+ break;
+
+ case MT_RELEASE:
+ release_ind(cmd, pid, l3m);
+ break;
+
+ case MT_RELEASE_COMPLETE:
+ release_complete_ind(cmd, pid, l3m);
+ break;
+
+ case MT_NOTIFY:
+ notify_ind(cmd, pid, l3m);
+ break;
+
+ case MT_HOLD:
+ hold_ind(cmd, pid, l3m);
+ break;
+
+ case MT_RETRIEVE:
+ retrieve_ind(cmd, pid, l3m);
+ break;
+
+ case MT_SUSPEND:
+ suspend_ind(cmd, pid, l3m);
+ break;
+
+ case MT_RESUME:
+ resume_ind(cmd, pid, l3m);
+ break;
+
+ case MT_FACILITY:
+ facility_ind(cmd, pid, l3m);
+ break;
+
+ case MT_FREE:
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_L3ID_IND, DIRECTION_IN);
+ add_trace("callref", NULL, "0x%x", p_m_d_l3id);
+ end_trace();
+ p_m_d_l3id = 0;
+ p_m_d_ces = -1;
+ p_m_delete = 1;
+//#warning remove me
+//PDEBUG(DEBUG_LOG, "JOLLY release cr %d\n", p_serial);
+ /* sending release to endpoint in case we still have an endpoint
+ * this is because we don't get any response if a release_complete is received (or a release in release state)
+ */
+ while(p_epointlist)
+ {
+ struct lcr_msg *message;
+ message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
+ message->param.disconnectinfo.cause = (p_m_d_collect_cause!=CAUSE_NOUSER)?p_m_d_collect_cause:CAUSE_UNSPECIFIED;
+ message->param.disconnectinfo.location = (p_m_d_collect_cause!=CAUSE_NOUSER)?p_m_d_collect_location:LOCATION_PRIVATE_LOCAL;
+ message_put(message);
+ /* remove epoint */
+ free_epointlist(p_epointlist);
+
+ new_state(PORT_STATE_RELEASE);
+ }
+ break;
+
+ default:
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_UNKNOWN, DIRECTION_IN);
+ add_trace("unhandled", "cmd", "0x%x", cmd);
+ end_trace();
+ }
+}
+#else
void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
{
int new_l3id;
}
if (timer_hex==0x312 && p_m_d_ntmode)
{
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_TIMEOUT_IND, DIRECTION_IN);
add_trace("timer", NULL, "%x", timer_hex);
end_trace();
- t312_timeout(prim, dinfo, data);
+ t312_timeout_ind(prim, dinfo, data);
}
break;
case CC_SETUP | CONFIRM:
if (p_m_d_ntmode)
{
- l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | INDICATION, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_IND, 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)
break;
case CC_RELEASE_CR | INDICATION:
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_CR | INDICATION, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_CR_IND, DIRECTION_IN);
add_trace("callref", NULL, "0x%x", p_m_d_l3id);
end_trace();
if (p_m_d_ntmode)
p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0;
}
p_m_d_l3id = 0;
+ p_m_d_ces = -1;
p_m_delete = 1;
//#warning remove me
//PDEBUG(DEBUG_LOG, "JOLLY release cr %d\n", p_serial);
*/
while(p_epointlist)
{
- struct message *message;
+ struct lcr_msg *message;
message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
message->param.disconnectinfo.cause = (p_m_d_collect_cause!=CAUSE_NOUSER)?p_m_d_collect_cause:CAUSE_UNSPECIFIED;
message->param.disconnectinfo.location = (p_m_d_collect_cause!=CAUSE_NOUSER)?p_m_d_collect_location:LOCATION_PRIVATE_LOCAL;
break;
case CC_NEW_CR | INDICATION:
- l1l2l3_trace_header(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_IND, 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(p_m_mISDNport, this, prim, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_UNKNOWN, DIRECTION_IN);
add_trace("unhandled", "prim", "0x%x", prim);
end_trace();
}
}
+#endif
void Pdss1::new_state(int state)
{
{
int ret;
-//if (p_m_delete && p_m_d_l3id==0)
-// printf("ping! %d", p_serial);
if ((ret = PmISDN::handler()))
return(ret);
/* handle destruction */
if (p_m_delete && p_m_d_l3id==0)
{
-//#warning remove
-//PDEBUG(DEBUG_LOG, "JOLLY destroy object %d\n", p_serial);
-
delete this;
return(-1);
}
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_called_pn(l3m, 0, 1, (unsigned char *)param->information.id);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
{
#ifdef SOCKET_MISDN
l3_msg *l3m;
+ int ret;
#else
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
msg_t *dmsg;
INFORMATION_t *information;
SETUP_t *setup;
+ int i;
#endif
int plan, type, screen, present, reason;
int capability, mode, rate, coding, user, presentation, interpretation, hlc, exthlc;
int channel, exclusive;
- int i;
struct epoint_list *epointlist;
/* release if port is blocked */
if (p_m_mISDNport->ifport->block)
{
- struct message *message;
+ struct lcr_msg *message;
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
message->param.disconnectinfo.cause = 27; // temp. unavail.
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
if (p_m_d_ntmode)
#ifdef SOCKET_MISDN
enc_ie_display(l3m, (unsigned char *)p_callerinfo.display);
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
if (!p_m_b_channel && !p_m_b_reserve && p_type==PORT_TYPE_DSS1_NT_OUT)
channel = CHANNEL_NO;
+#ifdef SOCKET_MISDN
+ /* creating l3id */
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_REQ, DIRECTION_OUT);
+ /* see MT_ASSIGN notes at do_layer3() */
+ mt_assign_pid = 0;
+ ret = p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_ASSIGN, 0, NULL);
+ if (mt_assign_pid == 0 || ret < 0)
+ {
+ struct lcr_msg *message;
+
+ add_trace("callref", NULL, "no free id");
+ end_trace();
+ message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
+ message->param.disconnectinfo.cause = 47;
+ message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+ message_put(message);
+ new_state(PORT_STATE_RELEASE);
+ p_m_delete = 1;
+ return;
+ }
+ p_m_d_l3id = mt_assign_pid;
+ mt_assign_pid = ~0;
+#else
/* creating l3id */
- l1l2l3_trace_header(p_m_mISDNport, this, CC_NEW_CR | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_CR_REQ, DIRECTION_OUT);
if (p_m_d_ntmode)
{
i = 0;
}
if (i == 0x100)
{
- struct message *message;
+ struct lcr_msg *message;
add_trace("callref", NULL, "no free id");
end_trace();
// goto nomem;
}
add_trace("callref", "new", "0x%x", p_m_d_l3id);
+#endif
end_trace();
/* preparing setup message */
dmsg = create_l3msg(CC_SETUP | REQUEST, MT_SETUP, p_m_d_l3id, sizeof(SETUP_t), p_m_d_ntmode);
setup = (SETUP_t *)(dmsg->data + headerlen);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_SETUP | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_REQ, DIRECTION_OUT);
/* channel information */
if (channel >= 0) /* it should */
{
/* send setup message now */
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SETUP, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SETUP, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_FACILITY | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_FACILITY_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_facility(l3m, (unsigned char *)param->facilityinfo.data, param->facilityinfo.len);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_FACILITY, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_FACILITY, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_NOTIFY | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_notify(l3m, notify);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_NOTIFICATION, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_NOTIFY, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
#ifdef SOCKET_MISDN
enc_ie_display(l3m, (unsigned char *)param->notifyinfo.display);
#else
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_SETUP_ACKNOWLEDGE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_REQ, DIRECTION_OUT);
/* channel information */
if (p_state == PORT_STATE_IN_SETUP)
#ifdef SOCKET_MISDN
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_SETUP_ACKNOWLEDGE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SETUP_ACKNOWLEDGE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
/* channel information */
if (p_state == PORT_STATE_IN_SETUP)
#ifdef SOCKET_MISDN
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
/* NT-MODE in setup state we must send PROCEEDING first */
if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP)
{
- CALL_PROCEEDING_t *proceeding;
-
/* sending proceeding */
#ifdef SOCKET_MISDN
l3m = create_l3msg();
#else
+ CALL_PROCEEDING_t *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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
/* channel information */
#ifdef SOCKET_MISDN
enc_ie_channel_id(l3m, 1, p_m_b_channel);
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_ALERTING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_ALERTING_REQ, DIRECTION_OUT);
/* channel information */
if (p_state == PORT_STATE_IN_SETUP)
#ifdef SOCKET_MISDN
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_ALERTING, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_ALERTING, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
/* NT-MODE in setup state we must send PROCEEDING first */
if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP)
{
- CALL_PROCEEDING_t *proceeding;
-
/* sending proceeding */
#ifdef SOCKET_MISDN
l3m = create_l3msg();
#else
+ CALL_PROCEEDING_t *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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
/* channel information */
#ifdef SOCKET_MISDN
enc_ie_channel_id(l3m, 1, p_m_b_channel);
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_INFORMATION | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
if (p_m_d_ntmode)
#ifdef SOCKET_MISDN
enc_ie_display(l3m, (unsigned char *)p_connectinfo.display);
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_INFORMATION, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_CONNECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_REQ, DIRECTION_OUT);
/* connect information */
plan = 1;
switch (p_connectinfo.ntype)
end_trace();
/* finally send message */
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_CONNECT, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CONNECT, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
DISCONNECT_t *disconnect;
RELEASE_COMPLETE_t *release_complete;
#endif
- struct message *message;
+ struct lcr_msg *message;
char *p = NULL;
/* we reject during incoming setup when we have no tones. also if we are in outgoing setup state */
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_COMPLETE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_COMPLETE_REQ, DIRECTION_OUT);
/* send cause */
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
/* workarround: NT-MODE in setup state we must send PROCEEDING first to make it work */
if (p_state==PORT_STATE_IN_SETUP)
{
- CALL_PROCEEDING_t *proceeding;
-
/* sending proceeding */
#ifdef SOCKET_MISDN
l3m = create_l3msg();
#else
+ CALL_PROCEEDING_t *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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
/* channel information */
#ifdef SOCKET_MISDN
enc_ie_channel_id(l3m, 1, p_m_b_channel);
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_DISCONNECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_REQ, DIRECTION_OUT);
/* progress information */
if (p_capainfo.bearer_capa==INFO_BC_SPEECH
|| p_capainfo.bearer_capa==INFO_BC_AUDIO
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_DISCONNECT, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_DISCONNECT, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT);
/* send cause */
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT);
/* send cause */
#ifdef SOCKET_MISDN
enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_RELEASE_COMPLETE, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
new_state(PORT_STATE_RELEASE);
/* remove epoint */
free_epointid(epoint_id);
-#if 0
- /* remove process */
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_CR | REQUEST, DIRECTION_OUT);
- add_trace("callref", NULL, "0x%x", p_m_d_l3id);
- end_trace();
- if (p_m_d_ntmode)
- {
- if ((p_m_d_l3id&0xff00) == 0xff00)
- p_m_mISDNport->procids[p_m_d_l3id&0xff] = 0;
- }
- p_m_d_l3id = 0;
- p_m_delete = 1;
-#endif
// wait for callref to be released
return;
}
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_PROCEEDING | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_PROCEEDING_REQ, DIRECTION_OUT);
/* channel information */
#ifdef SOCKET_MISDN
enc_ie_channel_id(l3m, 1, p_m_b_channel);
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_PROCEEDING, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_CALL_PROCEEDING, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
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);
#endif
- l1l2l3_trace_header(p_m_mISDNport, this, CC_DISCONNECT | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_DISCONNECT_REQ, DIRECTION_OUT);
/* progress information */
if (p_capainfo.bearer_capa==INFO_BC_SPEECH
|| p_capainfo.bearer_capa==INFO_BC_AUDIO
#endif
end_trace();
#ifdef SOCKET_MISDN
- p_m_mISDNport->layer3->to_layer3(p_m_mISDNport->layer3, MT_DISCONNECT, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_DISCONNECT, p_m_d_l3id, l3m);
#else
msg_queue_tail(&p_m_mISDNport->downqueue, dmsg);
#endif
*/
int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union parameter *param)
{
- struct message *message;
+ struct lcr_msg *message;
if (PmISDN::message_epoint(epoint_id, message_id, param))
return(1);
}
if (p_epointlist && p_state==PORT_STATE_IDLE)
FATAL("Pdss1(%s): epoint pointer is set in idle state, how bad!!\n", p_name);
+#ifdef SOCKET_MISDN
+ message_setup(epoint_id, message_id, param);
+#else
/* note: pri is a special case, because links must be up for pri */
if (p_m_mISDNport->l1link || p_m_mISDNport->pri || !p_m_mISDNport->ntmode || p_state!=PORT_STATE_IDLE)
{
act.dinfo = 0;
act.len = 0;
mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
- l1l2l3_trace_header(p_m_mISDNport, this, act.prim, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L1_ACTIVATE_REQ, DIRECTION_OUT);
end_trace();
// /* set timeout */
// p_m_mISDNport->l1timeout = now+3;
}
+#endif
break;
case MESSAGE_NOTIFY: /* display and notifications */
/*
* data from isdn-stack (layer-3) to pbx (port class)
*/
+#ifdef SOCKET_MISDN
+int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+ class Port *port;
+ class Pdss1 *pdss1;
+ char name[32];
+
+ PDEBUG(DEBUG_ISDN, "cmd(0x%x) pid(0x%x)\n", cmd, pid);
+
+ if (pid == 0)
+ {
+ PERROR("PID is 0. change it.... quick...\n");
+ return(-EINVAL);
+ }
+
+ /* find Port object of type ISDN */
+ port = port_first;
+ while(port)
+ {
+ /* are we ISDN ? */
+ if (port->p_type == PORT_TYPE_DSS1_NT_IN || port->p_type == PORT_TYPE_DSS1_NT_OUT)
+ {
+ pdss1 = (class Pdss1 *)port;
+ /* check out correct stack and id */
+ if (pdss1->p_m_mISDNport == mISDNport
+ && (pdss1->p_m_d_l3id & MISDN_PID_CRVAL_MASK) == (pid & MISDN_PID_CRVAL_MASK))
+ {
+ /* found port, the message belongs to */
+ break;
+ }
+ }
+ port = port->next;
+ }
+
+ /* aktueller prozess */
+ if (port)
+ {
+ /* if process id is master process, but a child disconnects */
+ if (mISDNport->ntmode
+ && (pid & MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER
+ && (pdss1->p_m_d_l3id & MISDN_PID_CRVAL_MASK) == MISDN_PID_MASTER)
+ {
+ if (cmd == MT_DISCONNECT)
+ {
+ /* send special indication for child disconnect */
+ pdss1->disconnect_ind_i(cmd, pid, l3m);
+ return(0);
+ }
+ // ignoring other messages from child processes
+ return(0);
+ }
+ /* if process id and layer 3 id matches */
+ if (pid == pdss1->p_m_d_l3id)
+ pdss1->message_isdn(cmd, pid, l3m);
+ return(0);
+ }
+
+ /* d-message */
+ switch(cmd)
+ {
+ case MT_SETUP:
+ /* 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, 0, 0)))
+
+ FATAL("Cannot create Port instance.\n");
+ pdss1->message_isdn(cmd, pid, l3m);
+ break;
+
+ case MT_RESUME:
+ /* 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, 0, 0)))
+ FATAL("Cannot create Port instance.\n");
+ pdss1->message_isdn(cmd, pid, l3m);
+ break;
+
+ case MT_FREE:
+ PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", pid);
+ break;
+
+ case MT_RELEASE_COMPLETE:
+ PERROR("must be ignored by stack, not sent to app\n");
+ break;
+
+ case MT_FACILITY:
+ // facility als broadcast
+ break;
+
+ default:
+ PERROR("unhandled message: cmd(0x%x) pid(0x%x)\n", cmd, pid);
+ port = port_first;
+ while(port)
+ {
+ if (port->p_type == PORT_TYPE_DSS1_NT_IN || port->p_type == PORT_TYPE_DSS1_NT_OUT)
+ {
+ pdss1 = (class Pdss1 *)port;
+ /* check out correct stack */
+ if (pdss1->p_m_mISDNport == mISDNport)
+ /* check out correct id */
+ PERROR("unhandled message: pid=%x is not associated with port-dinfo=%x\n", pid, pdss1->p_m_d_l3id);
+ }
+ port = port->next;
+ }
+ return(-EINVAL);
+ }
+ return(0);
+}
+#else
/* NOTE: nt mode use mISDNuser_head_t as header */
int stack2manager_nt(void *dat, void *arg)
{
break;
case DL_ESTABLISH | INDICATION:
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_IND, DIRECTION_IN);
+ goto ss_estab;
case DL_ESTABLISH | CONFIRM:
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_CON, DIRECTION_IN);
ss_estab:
- l1l2l3_trace_header(mISDNport, NULL, hh->prim, DIRECTION_IN);
add_trace("tei", NULL, "%d", hh->dinfo);
end_trace();
if (mISDNport->ptp && hh->dinfo == 0)
break;
case DL_RELEASE | INDICATION:
+ l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN);
+ goto ss_rel;
case DL_RELEASE | CONFIRM:
+ l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_CON, DIRECTION_IN);
ss_rel:
- l1l2l3_trace_header(mISDNport, NULL, hh->prim, DIRECTION_IN);
add_trace("tei", NULL, "%d", hh->dinfo);
end_trace();
if (mISDNport->ptp && hh->dinfo == 0)
time(&mISDNport->l2establish);
PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
}
-//#warning debugging usleep crash
-// printf("JOLLY release port %d\n", mISDNport->portnum);
- usleep(1);
break;
case CC_SETUP | INDICATION:
return(-EINVAL);
}
+#endif // stacktomanager
+
+#ifndef SOCKET_MISDN
/*
* sending message that were queued during L1 activation
* or releasing port if link is down
{
class Port *port;
class Pdss1 *pdss1;
- struct message *message;
+ struct lcr_msg *message;
if (!mISDNport->ntmode)
return;
}
}
-
+#endif