summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bchannel.c2
-rw-r--r--dss1.cpp429
-rw-r--r--dss1.h22
-rw-r--r--mISDN.cpp184
-rw-r--r--mISDN.h4
-rw-r--r--main.c10
-rw-r--r--main.h2
-rw-r--r--q931.h2
-rw-r--r--trace.h98
9 files changed, 564 insertions, 189 deletions
diff --git a/bchannel.c b/bchannel.c
index a66a62a..fd4c8cc 100644
--- a/bchannel.c
+++ b/bchannel.c
@@ -49,7 +49,7 @@ enum {
BSTATE_ACTIVE,
};
-#ifdef MISDN_SOCKET
+#ifdef SOCKET_MISDN
int bchannel_socket = -1;
int bchannel_initialize(void)
diff --git a/dss1.cpp b/dss1.cpp
index 9e7a230..419223f 100644
--- a/dss1.cpp
+++ b/dss1.cpp
@@ -343,7 +343,7 @@ int Pdss1::received_first_reply_to_setup(unsigned long prim, int channel, int ex
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
@@ -494,11 +494,12 @@ use_channel:
* 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);
@@ -516,13 +517,14 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
class Endpoint *epoint;
struct message *message;
+#ifndef SOCKET_MISDN
/* 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);
@@ -532,8 +534,23 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
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));
@@ -546,6 +563,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
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 */
@@ -559,7 +577,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -776,7 +794,7 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -821,18 +839,29 @@ void Pdss1::setup_ind(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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;
- 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(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);
+#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);
@@ -859,18 +888,28 @@ void Pdss1::information_ind(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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;
- 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(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);
+#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 */
@@ -893,10 +932,15 @@ void Pdss1::setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void
}
/* 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;
@@ -904,11 +948,18 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data)
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(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), &notify);
dec_ie_redir_dn(proceeding->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &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), &notify);
+ 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();
ret = received_first_reply_to_setup(prim, channel, exclusive);
@@ -976,10 +1027,15 @@ void Pdss1::proceeding_ind(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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;
@@ -987,11 +1043,18 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data)
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(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), &notify);
+ dec_ie_redir_dn(alerting->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &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), &notify);
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 */
@@ -1059,11 +1122,12 @@ void Pdss1::alerting_ind(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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);
@@ -1078,9 +1142,14 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
if (p_m_d_ntmode)
p_m_d_ces = connect->ces;
- 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(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));
+#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));
+#endif
/* 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));
@@ -1154,7 +1223,7 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -1178,17 +1247,27 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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;
- 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(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);
+#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;
@@ -1212,7 +1291,7 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -1262,20 +1341,29 @@ void Pdss1::disconnect_ind(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &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;
@@ -1288,11 +1376,12 @@ void Pdss1::disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data
}
/* 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);
@@ -1300,8 +1389,12 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
int location, cause;
struct message *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(release->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &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;
@@ -1332,7 +1425,7 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -1351,15 +1444,24 @@ void Pdss1::release_ind(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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;
- 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(release_complete->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &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;
@@ -1383,8 +1485,13 @@ void Pdss1::release_complete_ind(unsigned long prim, unsigned long dinfo, void *
}
/* 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)
+{
+#endif
struct message *message;
// trace is done at message_isdn()
@@ -1412,17 +1519,27 @@ void Pdss1::t312_timeout(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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);
+#endif
struct message *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(notifying->NOTIFY, (Q931_info_t *)((unsigned long)data+headerlen), &notify);
dec_ie_redir_dn(notifying->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, notifyid, sizeof(notifyid));
+#else
+ dec_ie_notify(notifying->NOTIFY, (Q931_info_t *)((unsigned long)data+headerlen), &notify);
+ 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))
@@ -1472,12 +1589,13 @@ void Pdss1::notify_ind(unsigned long prim, unsigned long dinfo, void *data)
/* CC_HOLD INDICATION */
-void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
-{
struct message *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);
@@ -1486,7 +1604,7 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
#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)
@@ -1497,7 +1615,7 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -1544,7 +1662,7 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
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);
@@ -1555,11 +1673,12 @@ void Pdss1::hold_ind(unsigned long prim, unsigned long dinfo, void *data)
/* 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);
@@ -1570,8 +1689,12 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
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(retrieve->CHANNEL_ID, (Q931_info_t *)((unsigned long)data+headerlen), &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)
@@ -1585,7 +1708,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -1633,7 +1756,7 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -1648,11 +1771,12 @@ void Pdss1::retrieve_ind(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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);
@@ -1665,8 +1789,12 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
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(suspend->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), 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))
@@ -1678,7 +1806,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -1743,7 +1871,7 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
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);
@@ -1756,11 +1884,12 @@ void Pdss1::suspend_ind(unsigned long prim, unsigned long dinfo, void *data)
}
/* 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);
@@ -1780,7 +1909,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
/* 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);
@@ -1791,8 +1920,12 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
p_m_d_ces = resume->ces;
}
- 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(resume->CALL_ID, (Q931_info_t *)((unsigned long)data+headerlen), 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 */
@@ -1826,7 +1959,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -1884,7 +2017,7 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
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
@@ -1902,16 +2035,25 @@ void Pdss1::resume_ind(unsigned long prim, unsigned long dinfo, void *data)
/* 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;
- 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(facility->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), facil, &facil_len);
+#else
+ dec_ie_facility(facility->FACILITY, (Q931_info_t *)((unsigned long)data+headerlen), facil, &facil_len);
+#endif
end_trace();
/* facility */
@@ -1939,15 +2081,20 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
case CC_TIMEOUT | INDICATION:
if (p_m_d_ntmode)
{
+#ifdef SOCKET_MISDN
+ #warning TESTEN!!!
+ timer_hex = *((int *)(((char *)data)/*+headerlen*/));
+#else
int headerlen = (p_m_d_ntmode)?mISDNUSER_HEAD_SIZE:mISDN_HEADER_LEN;
timer_hex = *((int *)(((char *)data)+headerlen));
+#endif
}
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;
@@ -1960,7 +2107,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
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)
@@ -2078,7 +2225,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
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)
@@ -2108,7 +2255,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
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)
@@ -2126,7 +2273,7 @@ void Pdss1::message_isdn(unsigned long prim, unsigned long dinfo, void *data)
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();
}
@@ -2229,7 +2376,7 @@ void Pdss1::message_information(unsigned long epoint_id, int message_id, union p
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
@@ -2303,7 +2450,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
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);
@@ -2344,7 +2491,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
channel = CHANNEL_NO;
/* 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;
@@ -2397,7 +2544,7 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet
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 */
{
@@ -2630,7 +2777,7 @@ void Pdss1::message_facility(unsigned long epoint_id, int message_id, union para
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
@@ -2728,7 +2875,7 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame
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
@@ -2763,7 +2910,7 @@ void Pdss1::message_notify(unsigned long epoint_id, int message_id, union parame
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
@@ -2796,7 +2943,7 @@ void Pdss1::message_overlap(unsigned long epoint_id, int message_id, union param
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
@@ -2842,7 +2989,7 @@ void Pdss1::message_proceeding(unsigned long epoint_id, int message_id, union pa
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
@@ -2893,7 +3040,7 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para
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);
@@ -2925,7 +3072,7 @@ void Pdss1::message_alerting(unsigned long epoint_id, int message_id, union para
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
@@ -2979,7 +3126,7 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
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);
@@ -3020,7 +3167,7 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
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);
@@ -3049,7 +3196,7 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param
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)
@@ -3170,7 +3317,7 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP)
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);
@@ -3200,7 +3347,7 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP)
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);
@@ -3232,7 +3379,7 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP)
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
@@ -3296,7 +3443,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param
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);
@@ -3334,7 +3481,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param
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);
@@ -3352,7 +3499,7 @@ void Pdss1::message_release(unsigned long epoint_id, int message_id, union param
free_epointid(epoint_id);
#if 0
/* remove process */
- l1l2l3_trace_header(p_m_mISDNport, this, CC_RELEASE_CR | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_CR_REQ, DIRECTION_OUT);
add_trace("callref", NULL, "0x%x", p_m_d_l3id);
end_trace();
if (p_m_d_ntmode)
@@ -3381,7 +3528,7 @@ wirklich erst 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);
@@ -3413,7 +3560,7 @@ wirklich erst proceeding?:
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
@@ -3529,7 +3676,7 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
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;
@@ -3620,6 +3767,110 @@ int Pdss1::message_epoint(unsigned long epoint_id, int message_id, union paramet
/*
* 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);
+
+ /* 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 == pid)
+ {
+ /* found port, the message belongs to */
+ break;
+ }
+ }
+ port = port->next;
+ }
+
+ /* aktueller prozess */
+ if (port)
+ {
+ /* if process id is master process, but a child disconnects */
+#warning hier das abfragen des child processes
+ if (0)
+ {
+ 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", hh->dinfo);
+ 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)
{
@@ -3711,9 +3962,11 @@ 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)
@@ -3730,9 +3983,11 @@ int stack2manager_nt(void *dat, void *arg)
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)
@@ -3741,9 +3996,6 @@ int stack2manager_nt(void *dat, void *arg)
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:
@@ -3794,6 +4046,7 @@ int stack2manager_nt(void *dat, void *arg)
free_msg(msg);
return(0);
}
+#endif // stacktomanager
/* NOTE: te mode use iframe_t as header */
int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg)
diff --git a/dss1.h b/dss1.h
index 7dba2d9..d3be055 100644
--- a/dss1.h
+++ b/dss1.h
@@ -32,6 +32,25 @@ class Pdss1 : public PmISDN
// void isdn_show_send_message(unsigned long prim, msg_t *msg);
int received_first_reply_to_setup(unsigned long prim, int channel, int exclusive);
int hunt_bchannel(int exclusive, int channel);
+#ifdef SOCKET_MISDN
+ void information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void release_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void release_complete_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void disconnect_ind_i(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void t312_timeout_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void notify_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void facility_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void hold_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void retrieve_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+ void resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+#else
void information_ind(unsigned long prim, unsigned long dinfo, void *data);
void setup_ind(unsigned long prim, unsigned long dinfo, void *data);
void setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void *data);
@@ -42,13 +61,14 @@ class Pdss1 : public PmISDN
void release_ind(unsigned long prim, unsigned long dinfo, void *data);
void release_complete_ind(unsigned long prim, unsigned long dinfo, void *data);
void disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data);
- void t312_timeout(unsigned long prim, unsigned long dinfo, void *data);
+ void t312_timeout_ind(unsigned long prim, unsigned long dinfo, void *data);
void notify_ind(unsigned long prim, unsigned long dinfo, void *data);
void facility_ind(unsigned long prim, unsigned long dinfo, void *data);
void hold_ind(unsigned long prim, unsigned long dinfo, void *data);
void retrieve_ind(unsigned long prim, unsigned long dinfo, void *data);
void suspend_ind(unsigned long prim, unsigned long dinfo, void *data);
void resume_ind(unsigned long prim, unsigned long dinfo, void *data);
+#endif
void message_information(unsigned long epoint_id, int message_id, union parameter *param);
void message_setup(unsigned long epoint_id, int message_id, union parameter *param);
void message_notify(unsigned long epoint_id, int message_id, union parameter *param);
diff --git a/mISDN.cpp b/mISDN.cpp
index 75cdadf..fd2625f 100644
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -10,26 +10,10 @@
\*****************************************************************************/
#include "main.h"
-#include <poll.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef SOCKET_MISDN
-#include <netinet/udp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <linux/mISDNif.h>
-#include <q931.h>
-#include <mlayer3.h>
-#else
+#ifndef SOCKET_MISDN
extern "C" {
#include <mISDNuser/net_l2.h>
}
-#endif
#ifndef CMX_TXDATA_ON
#define OLD_MISDN
@@ -71,10 +55,11 @@ extern "C" {
#ifndef ISDN_PID_L4_B_USER
#define ISDN_PID_L4_B_USER 0x440000ff
#endif
+#endif
// timeouts if activating/deactivating response from mISDN got lost
-#define B_TIMER_ACTIVATING 1
-#define B_TIMER_DEACTIVATING 1
+#define B_TIMER_ACTIVATING 1 // seconds
+#define B_TIMER_DEACTIVATING 1 // seconds
/* list of mISDN ports */
struct mISDNport *mISDNport_first;
@@ -83,7 +68,7 @@ struct mISDNport *mISDNport_first;
unsigned char mISDN_rand[256];
int mISDN_rand_count = 0;
-#ifdef MISDN_SOCKET
+#ifdef SOCKET_MISDN
int mISDNsocket = -1;
int mISDN_initialize(void)
@@ -325,41 +310,46 @@ 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_ESTABLISH", DL_ESTABLISH},
- {"DL_RELEASE", DL_RELEASE},
- {"PH_ACTIVATE", PH_ACTIVATE},
- {"PH_DEACTIVATE", PH_DEACTIVATE},
+ {"PH_ACTIVATE", L1_ACTIVATE_REQ},
+ {"PH_DEACTIVATE", L1_DEACTIVATE_REQ},
+ {"DL_ESTABLISH", L2_ESTABLISH_REQ},
+ {"DL_RELEASE", L2_RELEASE_REQ},
+ {"UNKNOWN", L3_UNKNOWN},
+ {"MT_TIMEOUT", L3_TIMEOUT_REQ},
+ {"MT_SETUP", L3_SETUP_REQ},
+ {"MT_SETUP_ACK", L3_SETUP_ACKNOWLEDGE_REQ},
+ {"MT_PROCEEDING", L3_PROCEEDING_REQ},
+ {"MT_ALERTING", L3_ALERTING_REQ},
+ {"MT_CONNECT", L3_CONNECT_REQ},
+ {"MT_CONNECT_ACK", L3_CONNECT_ACKNOWLEDGE_REQ},
+ {"MT_DISCONNECT", L3_DISCONNECT_REQ},
+ {"MT_RELEASE", L3_RELEASE_REQ},
+ {"MT_RELEASE_COMP", L3_RELEASE_COMPLETE_REQ},
+ {"MT_INFORMATION", L3_INFORMATION_REQ},
+ {"MT_PROGRESS", L3_PROGRESS_REQ},
+ {"MT_NOTIFY", L3_NOTIFY_REQ},
+ {"MT_SUSPEND", L3_SUSPEND_REQ},
+ {"MT_SUSPEND_ACK", L3_SUSPEND_ACKNOWLEDGE_REQ},
+ {"MT_SUSPEND_REJ", L3_SUSPEND_REJECT_REQ},
+ {"MT_RESUME", L3_RESUME_REQ},
+ {"MT_RESUME_ACK", L3_RESUME_ACKNOWLEDGE_REQ},
+ {"MT_RESUME_REJ", L3_RESUME_REJECT_REQ},
+ {"MT_HOLD", L3_HOLD_REQ},
+ {"MT_HOLD_ACK", L3_HOLD_ACKNOWLEDGE_REQ},
+ {"MT_HOLD_REJ", L3_HOLD_REJECT_REQ},
+ {"MT_RETRIEVE", L3_RETRIEVE_REQ},
+ {"MT_RETRIEVE_ACK", L3_RETRIEVE_ACKNOWLEDGE_REQ},
+ {"MT_RETRIEVE_REJ", L3_RETRIEVE_REJECT_REQ},
+ {"MT_FACILITY", L3_FACILITY_REQ},
+ {"MT_STATUS", L3_STATUS_REQ},
+ {"MT_RESTART", L3_RESTART_REQ},
+#ifdef SOCKET_MISDN
+ {"MT_ASSIGN", L3_ASSIGN_REQ},
+ {"MT_FREE", L3_FREE_REQ},
+#else
+ {"MT_NEW_CR", L3_NEW_CR_REQ},
+ {"MT_RELEASE_CR", L3_RELEASE_CR_REQ},
+#endif
{NULL, 0},
};
@@ -369,7 +359,7 @@ static char *isdn_prim[4] = {
" INDICATION",
" RESPONSE",
};
-void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long prim, int direction)
+void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long msg, int direction)
{
int i;
char msgtext[64] = "<<UNKNOWN MESSAGE>>";
@@ -378,17 +368,17 @@ void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsign
i = 0;
while(isdn_message[i].name)
{
- if (isdn_message[i].value == (prim&0xffffff00))
+ if (isdn_message[i].value == (msg&0xffffff00))
{
SCPY(msgtext, isdn_message[i].name);
break;
}
i++;
}
- SCAT(msgtext, isdn_prim[prim&0x00000003]);
+ SCAT(msgtext, isdn_prim[msg&0x00000003]);
/* add direction */
- if (direction && (prim&0xffffff00)!=CC_NEW_CR && (prim&0xffffff00)!=CC_RELEASE_CR)
+ if (direction && (msg&0xffffff00)!=L3_NEW_CR_REQ && (msg&0xffffff00)!=L3_RELEASE_CR_REQ)
{
if (mISDNport)
{
@@ -2230,7 +2220,7 @@ int mISDN_handler(void)
PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum);
mISDNport->ml3->to_layer2(mISDNport->ml3, DL_ESTABLISH_REQ);
- l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH_REQ, DIRECTION_OUT);
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT);
end_trace();
return(1);
}
@@ -2364,7 +2354,7 @@ int mISDN_handler(void)
act.len = 0;
mISDN_write(mISDNdevice, &act, mISDN_HEADER_LEN+act.len, TIMEOUT_1SEC);
}
- l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | REQUEST, DIRECTION_OUT);
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT);
end_trace();
return(1);
}
@@ -2501,19 +2491,19 @@ int mISDN_handler(void)
case MGR_SHORTSTATUS | CONFIRM:
switch(frm->dinfo) {
case SSTATUS_L1_ACTIVATED:
- l1l2l3_trace_header(mISDNport, NULL, PH_ACTIVATE | (frm->prim & 0x3), DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
goto ss_act;
case SSTATUS_L1_DEACTIVATED:
- l1l2l3_trace_header(mISDNport, NULL, PH_DEACTIVATE | (frm->prim & 0x3), DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
goto ss_deact;
case SSTATUS_L2_ESTABLISHED:
- l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH | (frm->prim & 0x3), DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
goto ss_estab;
case SSTATUS_L2_RELEASED:
- l1l2l3_trace_header(mISDNport, NULL, DL_RELEASE | (frm->prim & 0x3), DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
goto ss_rel;
}
@@ -2521,7 +2511,7 @@ int mISDN_handler(void)
case PH_ACTIVATE | CONFIRM:
case PH_ACTIVATE | INDICATION:
- l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
if (mISDNport->ntmode)
{
@@ -2536,7 +2526,7 @@ int mISDN_handler(void)
case PH_DEACTIVATE | CONFIRM:
case PH_DEACTIVATE | INDICATION:
- l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
if (mISDNport->ntmode)
{
@@ -2556,7 +2546,7 @@ int mISDN_handler(void)
case DL_ESTABLISH | INDICATION:
case DL_ESTABLISH | CONFIRM:
- l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
ss_estab:
@@ -2570,7 +2560,7 @@ int mISDN_handler(void)
case DL_RELEASE | INDICATION:
case DL_RELEASE | CONFIRM:
- l1l2l3_trace_header(mISDNport, NULL, frm->prim, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, DL_RELEASE_REQ | (frm->prim & 0x3), DIRECTION_IN);
end_trace();
if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
ss_rel:
@@ -2699,43 +2689,46 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3
if (cmd == MT_ASSIGN)
{
+ if (angeforderte, dann schreiben, weil wir )
ueberdenken!!!
}
/* lock LCR */
+ pthread_mutex_lock(&mutex_lcr);
achtung MT_ASSIGN kommt hier an
- lock it baby
/* d-message */
switch(cmd)
{
+#warning shortstatus
+#if 0
case MGR_SHORTSTATUS_IND:
case MGR_SHORTSTATUS_CONF:
switch(frm->dinfo) {
case SSTATUS_L1_ACTIVATED:
- l1l2l3_trace_header(mISDNport, NULL, PH_ACTIVATE_IND, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_IND, DIRECTION_IN);
end_trace();
goto ss_act;
case SSTATUS_L1_DEACTIVATED:
- l1l2l3_trace_header(mISDNport, NULL, PH_DEACTIVATE_IND, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_IND, DIRECTION_IN);
end_trace();
goto ss_deact;
case SSTATUS_L2_ESTABLISHED:
- l1l2l3_trace_header(mISDNport, NULL, DL_ESTABLISH_IND, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_IND, DIRECTION_IN);
end_trace();
goto ss_estab;
case SSTATUS_L2_RELEASED:
- l1l2l3_trace_header(mISDNport, NULL, DL_RELEASE_IND, DIRECTION_IN);
+ l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN);
end_trace();
goto ss_rel;
}
break;
+#endif
- case PH_ACTIVATE_CONF:
- case PH_ACTIVATE_IND:
- l1l2l3_trace_header(mISDNport, NULL, cmd, DIRECTION_IN);
+ case MT_L1ACTIVATE:
+ l1l2l3_trace_header(mISDNport, NULL, L1_ACTIVATE_IND, DIRECTION_IN);
end_trace();
- ss_act:
+// ss_act:
mISDNport->l1link = 1;
#if 0
if (mISDNport->ntmode)
@@ -2743,11 +2736,10 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3
#endif
break;
- case PH_DEACTIVATE | CONFIRM:
- case PH_DEACTIVATE | INDICATION:
- l1l2l3_trace_header(mISDNport, NULL, cmd, DIRECTION_IN);
+ case MT_L1DEACTIVATE:
+ l1l2l3_trace_header(mISDNport, NULL, L1_DEACTIVATE_IND, DIRECTION_IN);
end_trace();
- ss_deact:
+// ss_deact:
mISDNport->l1link = 0;
raus mit der setup-queue, da dies im stack geschieht
#if 0
@@ -2756,17 +2748,15 @@ raus mit der setup-queue, da dies im stack geschieht
#endif
break;
- case PH_CONTROL_CONFIRM:
- case PH_CONTROL_INDICATION:
+ case MT_L1CONTROL:
PDEBUG(DEBUG_ISDN, "Received PH_CONTROL for port %d (%s).\n", mISDNport->portnum, mISDNport->ifport->interface->name);
+ // special config commands for interface (ip-address/LOS/AIS/RDI/SLIP)
break;
- case DL_ESTABLISH_IND:
- case DL_ESTABLISH_CONF:
- l1l2l3_trace_header(mISDNport, NULL, cmd, DIRECTION_IN);
+ case MT_L2ESTABLISH:
+ l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_IND, DIRECTION_IN);
end_trace();
- if (!mISDNport->ntmode) break; /* !!!!!!!!!!!!!!!! */
- ss_estab:
+// ss_estab:
if (mISDNport->l2establish)
{
mISDNport->l2establish = 0;
@@ -2775,11 +2765,10 @@ raus mit der setup-queue, da dies im stack geschieht
mISDNport->l2link = 1;
break;
- case DL_RELEASE_IND:
- case DL_RELEASE_CONF:
- l1l2l3_trace_header(mISDNport, NULL, cmd, DIRECTION_IN);
+ case MT_L2RELEASE:
+ l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN);
end_trace();
- ss_rel:
+// ss_rel:
mISDNport->l2link = 0;
if (mISDNport->ptp)
{
@@ -2790,15 +2779,16 @@ raus mit der setup-queue, da dies im stack geschieht
default:
/* l3-data is sent to LCR */
- message_from_mlayer3(mISDNport, cmd, pid, l3m);
+ stack2manager(mISDNport, cmd, pid, l3m);
}
- /* unlock LCR */
- unlock it baby
-
/* free message */
if (l3m)
free_l3_msg(l3m);
+
+ /* unlock LCR */
+ pthread_mutex_unlock(&mutex_lcr);
+
return(0);
}
diff --git a/mISDN.h b/mISDN.h
index b14ea68..4e0d40d 100644
--- a/mISDN.h
+++ b/mISDN.h
@@ -87,16 +87,16 @@ void mISDN_port_reorder(void);
int mISDN_handler(void);
#ifdef SOCKET_MISDN
void enc_ie_cause_standalone(struct l3_msg *l3m, int location, int cause);
-int stack2manager_te(struct mISDNport *mISDNport,l3_msg *l3m);
+int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
#else
void enc_ie_cause_standalone(unsigned char **ntmode, msg_t *msg, int location, int cause);
int stack2manager_te(struct mISDNport *mISDNport, msg_t *msg);
+int stack2manager_nt(void *dat, void *arg);
msg_t *create_l2msg(int prim, int dinfo, int size);
#endif
void ph_control(struct mISDNport *mISDNport, class PmISDN *isdnport, unsigned long handle, unsigned long c1, unsigned long c2, char *trace_name, int trace_value);
void ph_control_block(struct mISDNport *mISDNport, unsigned long handle, unsigned long c1, void *c2, int c2_len, char *trace_name, int trace_value);
void setup_queue(struct mISDNport *mISDNport, int link);
-int stack2manager_nt(void *dat, void *arg);
void chan_trace_header(struct mISDNport *mISDNport, class PmISDN *port, char *msgtext, int direction);
void l1l2l3_trace_header(struct mISDNport *mISDNport, class PmISDN *port, unsigned long prim, int direction);
void bchannel_event(struct mISDNport *mISDNport, int i, int event);
diff --git a/main.c b/main.c
index 24c0039..8fe35a7 100644
--- a/main.c
+++ b/main.c
@@ -40,6 +40,7 @@ struct lcr_fdset lcr_fdset[FD_SETSIZE];
pthread_mutex_t mutexd; // debug output mutex
//pthread_mutex_t mutext; // trace output mutex
pthread_mutex_t mutexe; // error output mutex
+pthread_mutex_t mutex_lcr; // lcr process mutex
int memuse = 0;
int mmemuse = 0;
@@ -215,6 +216,9 @@ int main(int argc, char *argv[])
memset(lcr_fdset, 0, sizeof(lcr_fdset));
#endif
+ /* lock LCR process */
+ pthread_mutex_lock(&mutex_lcr);
+
/* current time */
GET_NOW();
@@ -469,6 +473,7 @@ int main(int argc, char *argv[])
quit = 0;
while(!quit)
{
+
last_d = now_d;
GET_NOW();
if (now_d-last_d > 1.0)
@@ -643,7 +648,9 @@ BUDETECT
/* did we do nothing? so we wait to give time to other processes */
if (all_idle)
{
+ pthread_mutex_unlock(&mutex_lcr); // unlock LCR
debug_usleep(4000, __FILE__, __LINE__, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec);
+ pthread_mutex_lock(&mutex_lcr); // lock LCR
idletime += 4000;
}
}
@@ -770,6 +777,9 @@ free:
MEMCHECK("file descriptor(s) left",fduse)
MEMCHECK("file handler(s) left",fhuse)
+ /* unlock LCR process */
+ pthread_mutex_unlock(&mutex_lcr);
+
/* take me out */
return(ret);
}
diff --git a/main.h b/main.h
index 42387b0..c0a479a 100644
--- a/main.h
+++ b/main.h
@@ -47,6 +47,8 @@ extern int classuse;
extern int fduse;
extern int fhuse;
+extern pthread_mutex_t mutex_lcr; // lcr process mutex
+
#ifdef SOCKET_MISDN
extern FILE *debug_fp;
#else
diff --git a/q931.h b/q931.h
index 3d41f1b..7e4173e 100644
--- a/q931.h
+++ b/q931.h
@@ -8,6 +8,8 @@
** information elements support header **
** **
\*****************************************************************************/
+
+
#ifndef SOCKET_MISDN
#define MT_ALERTING 0x01
diff --git a/trace.h b/trace.h
index dcedbe2..43578e6 100644
--- a/trace.h
+++ b/trace.h
@@ -9,6 +9,104 @@
** **
\*****************************************************************************/
+/* definitions of commands */
+#define L1_ACTIVATE_REQ 0x0001f000
+#define L1_ACTIVATE_CON 0x0001f001
+#define L1_ACTIVATE_IND 0x0001f002
+#define L1_ACTIVATE_RES 0x0001f003
+#define L1_DEACTIVATE_REQ 0x0001f100
+#define L1_DEACTIVATE_CON 0x0001f101
+#define L1_DEACTIVATE_IND 0x0001f102
+#define L1_DEACTIVATE_RES 0x0001f103
+#define L2_ESTABLISH_REQ 0x0002f000
+#define L2_ESTABLISH_CON 0x0002f001
+#define L2_ESTABLISH_IND 0x0002f002
+#define L2_ESTABLISH_RES 0x0002f003
+#define L2_RELEASE_REQ 0x0002f100
+#define L2_RELEASE_CON 0x0002f101
+#define L2_RELEASE_IND 0x0002f102
+#define L2_RELEASE_RES 0x0002f103
+#define L3_UNKNOWN 0x0003f200
+#define L3_ALERTING_REQ 0x00030100
+#define L3_ALERTING_IND 0x00030102
+#define L3_PROCEEDING_REQ 0x00030200
+#define L3_PROCEEDING_IND 0x00030202
+#define L3_CONNECT_REQ 0x00030700
+#define L3_CONNECT_IND 0x00030702
+#define L3_CONNECT_RES 0x00030703
+#define L3_CONNECT_ACKNOWLEDGE_REQ 0x00030f00
+#define L3_CONNECT_ACKNOWLEDGE_IND 0x00030f02
+#define L3_PROGRESS_REQ 0x00030300
+#define L3_PROGRESS_IND 0x00030302
+#define L3_SETUP_REQ 0x00030500
+#define L3_SETUP_IND 0x00030502
+#define L3_SETUP_ACKNOWLEDGE_REQ 0x00030d00
+#define L3_SETUP_ACKNOWLEDGE_IND 0x00030d02
+#define L3_RESUME_REQ 0x00032600
+#define L3_RESUME_IND 0x00032602
+#define L3_RESUME_ACKNOWLEDGE_REQ 0x00032e00
+#define L3_RESUME_ACKNOWLEDGE_IND 0x00032e02
+#define L3_RESUME_REJECT_REQ 0x00032200
+#define L3_RESUME_REJECT_IND 0x00032202
+#define L3_SUSPEND_REQ 0x00032500
+#define L3_SUSPEND_IND 0x00032502
+#define L3_SUSPEND_ACKNOWLEDGE_REQ 0x00032d00
+#define L3_SUSPEND_ACKNOWLEDGE_IND 0x00032d02
+#define L3_SUSPEND_REJECT_REQ 0x00032100
+#define L3_SUSPEND_REJECT_IND 0x00032102
+#define L3_USER_INFORMATION_REQ 0x00032000
+#define L3_USER_INFORMATION_IND 0x00032002
+#define L3_DISCONNECT_REQ 0x00034500
+#define L3_DISCONNECT_IND 0x00034502
+#define L3_RELEASE_REQ 0x00034d00
+#define L3_RELEASE_IND 0x00034d02
+#define L3_RELEASE_COMPLETE_REQ 0x00035a00
+#define L3_RELEASE_COMPLETE_IND 0x00035a02
+#define L3_RESTART_REQ 0x00034600
+#define L3_RESTART_IND 0x00034602
+#define L3_RESTART_ACKNOWLEDGE_REQ 0x00034e00
+#define L3_RESTART_ACKNOWLEDGE_IND 0x00034e02
+#define L3_SEGMENT_REQ 0x00036000
+#define L3_SEGMENT_IND 0x00036002
+#define L3_CONGESTION_CONTROL_REQ 0x00037900
+#define L3_CONGESTION_CONTROL_IND 0x00037902
+#define L3_INFORMATION_REQ 0x00037b00
+#define L3_INFORMATION_IND 0x00037b02
+#define L3_FACILITY_REQ 0x00036200
+#define L3_FACILITY_IND 0x00036202
+#define L3_NOTIFY_REQ 0x00036e00
+#define L3_NOTIFY_IND 0x00036e02
+#define L3_STATUS_REQ 0x00037d00
+#define L3_STATUS_IND 0x00037d02
+#define L3_STATUS_ENQUIRY_REQ 0x00037500
+#define L3_STATUS_ENQUIRY_IND 0x00037502
+#define L3_HOLD_REQ 0x00032400
+#define L3_HOLD_IND 0x00032402
+#define L3_HOLD_ACKNOWLEDGE_REQ 0x00032800
+#define L3_HOLD_ACKNOWLEDGE_IND 0x00032802
+#define L3_HOLD_REJECT_REQ 0x00033000
+#define L3_HOLD_REJECT_IND 0x00033002
+#define L3_RETRIEVE_REQ 0x00033100
+#define L3_RETRIEVE_IND 0x00033102
+#define L3_RETRIEVE_ACKNOWLEDGE_REQ 0x00033300
+#define L3_RETRIEVE_ACKNOWLEDGE_IND 0x00033302
+#define L3_RETRIEVE_REJECT_REQ 0x00033700
+#define L3_RETRIEVE_REJECT_IND 0x00033702
+#ifdef SOCKET_MISDN
+#define L3_ASSIGN_REQ 0x0003f000
+#define L3_ASSIGN_IND 0x0003f002
+#define L3_FREE_REQ 0x0003f100
+#define L3_FREE_IND 0x0003f102
+#else
+#define L3_NEW_CR_REQ 0x0003f000
+#define L3_NEW_CR_IND 0x0003f002
+#define L3_RELEASE_CR_REQ 0x0003f100
+#define L3_RELEASE_CR_IND 0x0003f102
+#endif
+#define L3_TIMEOUT_REQ 0x0003f200
+#define L3_TIMEOUT_IND 0x0003f202
+
+
struct trace_element {
char name[11];
char sub[11];