//#include <sys/socket.h>
extern "C" {
}
-#include <q931.h>
+#include <mISDN/q931.h>
extern unsigned int mt_assign_pid;
#include "ie.cpp"
+static int delete_event(struct lcr_work *work, void *instance, int index);
+
/*
* constructor
*/
p_m_d_ntmode = mISDNport->ntmode;
p_m_d_tespecial = mISDNport->tespecial;
p_m_d_l3id = 0;
+ memset(&p_m_d_delete, 0, sizeof(p_m_d_delete));
+ add_work(&p_m_d_delete, delete_event, this, 0);
p_m_d_ces = -1;
p_m_d_queue[0] = '\0';
p_m_d_notify_pending = NULL;
*/
Pdss1::~Pdss1()
{
+ del_work(&p_m_d_delete);
+
/* remove queued message */
if (p_m_d_notify_pending)
message_free(p_m_d_notify_pending);
end_trace();
p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return(-34); /* to epoint: no channel available */
}
int bearer_coding, bearer_capability, bearer_mode, bearer_rate, bearer_multi, bearer_user;
int exclusive, channel;
int ret;
- unsigned char keypad[32] = "";
+ unsigned char keypad[33] = "";
unsigned char useruser[128];
int useruser_len = 0, useruser_protocol;
class Endpoint *epoint;
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;
+ trigger_work(&p_m_d_delete);
return;
}
p_m_d_l3id = pid;
end_trace();
p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
case 0:
p_callerinfo.screen = INFO_SCREEN_USER;
break;
+ case 1:
+ p_callerinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED;
+ break;
+ case 2:
+ p_callerinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED;
+ break;
default:
p_callerinfo.screen = INFO_SCREEN_NETWORK;
break;
case 0:
p_callerinfo.screen2 = INFO_SCREEN_USER;
break;
+ case 1:
+ p_callerinfo.screen2 = INFO_SCREEN_USER_VERIFIED_PASSED;
+ break;
+ case 2:
+ p_callerinfo.screen2 = INFO_SCREEN_USER_VERIFIED_FAILED;
+ break;
default:
p_callerinfo.screen2 = INFO_SCREEN_NETWORK;
break;
case 0:
p_redirinfo.screen = INFO_SCREEN_USER;
break;
+ case 1:
+ p_redirinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED;
+ break;
+ case 2:
+ p_redirinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED;
+ break;
default:
p_redirinfo.screen = INFO_SCREEN_NETWORK;
break;
end_trace();
p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
void Pdss1::information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
{
int type, plan;
- unsigned char keypad[32] = "", display[128] = "";
+ unsigned char keypad[33] = "", display[128] = "";
struct lcr_msg *message;
l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_IND, DIRECTION_IN);
p_dialinginfo.ntype = INFO_NTYPE_UNKNOWN;
break;
}
- SCAT(p_dialinginfo.display, (char *)display);
+ SCPY(p_dialinginfo.display, (char *)display);
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_INFORMATION);
memcpy(&message->param.information, &p_dialinginfo, sizeof(struct dialing_info));
message_put(message);
dec_ie_progress(l3m, &coding, &location, &progress);
end_trace();
+ if (progress >= 0) {
+ message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+ message->param.progressinfo.progress = progress;
+ message->param.progressinfo.location = location;
+ message_put(message);
+ }
+
/* process channel */
ret = received_first_reply_to_setup(cmd, channel, exclusive);
if (ret < 0) {
message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
message_put(message);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
dec_ie_redir_dn(l3m, &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
end_trace();
+ if (progress >= 0) {
+ message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+ message->param.progressinfo.progress = progress;
+ message->param.progressinfo.location = location;
+ message_put(message);
+ }
+
ret = received_first_reply_to_setup(cmd, channel, exclusive);
if (ret < 0) {
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_RELEASE);
message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
message_put(message);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROCEEDING);
dec_ie_redir_dn(l3m, &type, &plan, &present, (unsigned char *)redir, sizeof(redir));
end_trace();
+ if (progress >= 0) {
+ message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+ message->param.progressinfo.progress = progress;
+ message->param.progressinfo.location = location;
+ message_put(message);
+ }
+
/* process channel */
ret = received_first_reply_to_setup(cmd, channel, exclusive);
if (ret < 0) {
message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
message_put(message);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_ALERTING);
message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
message_put(message);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
case 0:
p_connectinfo.screen = INFO_SCREEN_USER;
break;
+ case 1:
+ p_connectinfo.screen = INFO_SCREEN_USER_VERIFIED_PASSED;
+ break;
+ case 2:
+ p_connectinfo.screen = INFO_SCREEN_USER_VERIFIED_FAILED;
+ break;
default:
p_connectinfo.screen = INFO_SCREEN_NETWORK;
break;
location = LOCATION_PRIVATE_LOCAL;
}
+ if (progress >= 0) {
+ message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+ message->param.progressinfo.progress = progress;
+ message->param.progressinfo.location = proglocation;
+ message_put(message);
+ }
+
/* release if remote sends us no tones */
if (!p_m_mISDNport->earlyb) {
l3_msg *l3m;
free_epointlist(p_epointlist);
}
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
}
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
}
/* CC_RESTART INDICATION */
}
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
}
/* T312 timeout */
#if 0
epoint = find_epoint_id(ACTIVE_EPOINT(p_epointlist));
if (epoint && p_m_d_ntmode) {
- p_m_timeout = p_settings.tout_hold;
- time(&p_m_timer);
+ if (p_settings.tout_hold)
+ schedule_timer(&p_m_timeout, p_settings.tout_hold, 0);
}
#endif
/* set hold state */
p_m_hold = 0;
- p_m_timeout = 0;
+ unsched_timer(&p_m_timeout);
/* acknowledge retrieve */
l3m = create_l3msg();
p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_SUSPEND_ACKNOWLEDGE, p_m_d_l3id, l3m);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
}
/* CC_RESUME INDICATION */
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;
+ trigger_work(&p_m_d_delete);
return;
}
p_m_d_l3id = pid;
end_trace();
p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RESUME_REJECT, p_m_d_l3id, l3m);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
l1l2l3_trace_header(p_m_mISDNport, this, L3_PROGRESS_IND, DIRECTION_IN);
dec_ie_progress(l3m, &coding, &location, &progress);
end_trace();
+
+ if (progress >= 0) {
+ message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_PROGRESS);
+ message->param.progressinfo.progress = progress;
+ message->param.progressinfo.location = location;
+ message_put(message);
+ }
}
add_trace("callref", NULL, "0x%x", p_m_d_l3id);
end_trace();
p_m_d_l3id = 0;
+ trigger_work(&p_m_d_delete);
p_m_d_ces = -1;
- p_m_delete = 1;
/* 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)
*/
/* set timeout */
if (state == PORT_STATE_IN_OVERLAP) {
- p_m_timeout = p_m_mISDNport->ifport->tout_dialing;
- time(&p_m_timer);
+ if (p_m_mISDNport->ifport->tout_dialing)
+ schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_dialing, 0);
}
if (state != p_state) {
+ unsched_timer(&p_m_timeout);
if (state == PORT_STATE_IN_SETUP
|| state == PORT_STATE_OUT_SETUP
|| state == PORT_STATE_IN_OVERLAP
|| state == PORT_STATE_OUT_OVERLAP) {
- p_m_timeout = p_m_mISDNport->ifport->tout_setup;
- time(&p_m_timer);
+ if (p_m_mISDNport->ifport->tout_setup)
+ schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_setup, 0);
}
if (state == PORT_STATE_IN_PROCEEDING
|| state == PORT_STATE_OUT_PROCEEDING) {
- p_m_timeout = p_m_mISDNport->ifport->tout_proceeding;
- time(&p_m_timer);
+ if (p_m_mISDNport->ifport->tout_proceeding)
+ schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_proceeding, 0);
}
if (state == PORT_STATE_IN_ALERTING
|| state == PORT_STATE_OUT_ALERTING) {
- p_m_timeout = p_m_mISDNport->ifport->tout_alerting;
- time(&p_m_timer);
+ if (p_m_mISDNport->ifport->tout_alerting)
+ schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_alerting, 0);
}
+#if 0
if (state == PORT_STATE_CONNECT
|| state == PORT_STATE_CONNECT_WAITING) {
- p_m_timeout = 0;
+ if (p_m_mISDNport->ifport->tout_connect)
+ schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_connect, 0);
}
+#endif
if (state == PORT_STATE_IN_DISCONNECT
|| state == PORT_STATE_OUT_DISCONNECT) {
- p_m_timeout = p_m_mISDNport->ifport->tout_disconnect;
- time(&p_m_timer);
+ if (p_m_mISDNport->ifport->tout_disconnect)
+ schedule_timer(&p_m_timeout, p_m_mISDNport->ifport->tout_disconnect, 0);
}
}
}
-/*
- * handler
- */
-int Pdss1::handler(void)
+/* deletes only if l3id is release, otherwhise it will be triggered then */
+static int delete_event(struct lcr_work *work, void *instance, int index)
{
- int ret;
+ class Pdss1 *isdnport = (class Pdss1 *)instance;
- if ((ret = PmISDN::handler()))
- return(ret);
+ if (!isdnport->p_m_d_l3id)
+ delete isdnport;
- /* handle destruction */
- if (p_m_delete && p_m_d_l3id==0) {
- delete this;
- return(-1);
- }
-
- return(0);
+ return 0;
}
}
-int newteid = 0;
-
/* MESSAGE_SETUP */
void Pdss1::message_setup(unsigned int epoint_id, int message_id, union parameter *param)
{
message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
message_put(message);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
message_put(message);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
p_m_d_l3id = mt_assign_pid;
case INFO_SCREEN_USER:
screen = 0;
break;
+ case INFO_SCREEN_USER_VERIFIED_PASSED:
+ screen = 1;
+ break;
+ case INFO_SCREEN_USER_VERIFIED_FAILED:
+ screen = 2;
+ break;
default: /* INFO_SCREEN_NETWORK */
screen = 3;
break;
case INFO_SCREEN_USER:
screen2 = 0;
break;
+ case INFO_SCREEN_USER_VERIFIED_PASSED:
+ screen2 = 1;
+ break;
+ case INFO_SCREEN_USER_VERIFIED_FAILED:
+ screen2 = 2;
+ break;
default: /* INFO_SCREEN_NETWORK */
screen2 = 3;
break;
enc_ie_called_pn(l3m, 0, 1, (unsigned char *)p_dialinginfo.id, max);
SCPY(p_m_d_queue, p_dialinginfo.id + max);
}
+ /* keypad */
+ if (p_dialinginfo.keypad[0])
+ enc_ie_keypad(l3m, (unsigned char *)p_dialinginfo.keypad);
/* sending complete */
if (p_dialinginfo.sending_complete)
enc_ie_complete(l3m, 1);
case INFO_SCREEN_USER:
screen = 0;
break;
+ case INFO_SCREEN_USER_VERIFIED_PASSED:
+ screen = 1;
+ break;
+ case INFO_SCREEN_USER_VERIFIED_FAILED:
+ screen = 2;
+ break;
default: /* INFO_SCREE_NETWORK */
screen = 3;
break;
int notify;
int plan = 0, type = -1, present = 0;
- printf("if = %d\n", param->notifyinfo.notify);
+ if (p_m_mISDNport->ifport->nonotify) {
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_NOTIFY_REQ, DIRECTION_OUT);
+ add_trace("info", NULL, "blocked by config");
+ end_trace();
+ return;
+ }
+
+// printf("if = %d\n", param->notifyinfo.notify);
if (param->notifyinfo.notify>INFO_NOTIFY_NONE)
notify = param->notifyinfo.notify & 0x7f;
else
l3_msg *l3m;
int type, plan, present, screen;
class Endpoint *epoint;
+ time_t current_time;
/* NT-MODE in setup state we must send PROCEEDING first */
if (p_m_d_ntmode && p_state==PORT_STATE_IN_SETUP) {
case INFO_SCREEN_USER:
screen = 0;
break;
+ case INFO_SCREEN_USER_VERIFIED_PASSED:
+ screen = 1;
+ break;
+ case INFO_SCREEN_USER_VERIFIED_FAILED:
+ screen = 2;
+ break;
default: /* INFO_SCREE_NETWORK */
screen = 3;
break;
/* date & time */
if (p_m_d_ntmode || p_m_d_tespecial) {
epoint = find_epoint_id(epoint_id);
- enc_ie_date(l3m, now, p_settings.no_seconds);
+ time(¤t_time);
+ enc_ie_date(l3m, current_time, p_settings.no_seconds);
}
end_trace();
/* finally send message */
end_trace();
p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
new_state(PORT_STATE_RELEASE);
- p_m_delete = 1;
+ trigger_work(&p_m_d_delete);
return;
}
char *p = NULL;
/*
- * we may only release during incoming disconnect state.
- * this means that the endpoint doesnt require audio anymore
+ * if we are on incoming call setup, we may reject by sending a release_complete
+ * also on outgoing call setup, we send a release complete, BUT this is not conform. (i don't know any other way)
*/
- if (p_state == PORT_STATE_IN_DISCONNECT
- || p_state == PORT_STATE_OUT_DISCONNECT) {
- /* sending release */
+ if (p_state==PORT_STATE_IN_SETUP
+ || p_state==PORT_STATE_OUT_SETUP) {
+//#warning remove me
+//PDEBUG(DEBUG_LOG, "JOLLY sending release complete %d\n", p_serial);
+ /* sending release complete */
l3m = create_l3msg();
l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT);
/* send cause */
enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
end_trace();
- p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE, p_m_d_l3id, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
new_state(PORT_STATE_RELEASE);
/* remove epoint */
free_epointid(epoint_id);
// wait for callref to be released
return;
-
}
/*
- * if we are on incoming call setup, we may reject by sending a release_complete
- * also on outgoing call setup, we send a release complete, BUT this is not conform. (i don't know any other way)
+ * we may only release during incoming disconnect state.
+ * this means that the endpoint doesnt require audio anymore
*/
- if (p_state==PORT_STATE_IN_SETUP
- || p_state==PORT_STATE_OUT_SETUP) {
-//#warning remove me
-//PDEBUG(DEBUG_LOG, "JOLLY sending release complete %d\n", p_serial);
- /* sending release complete */
+ if (p_state == PORT_STATE_IN_DISCONNECT
+ || p_state == PORT_STATE_OUT_DISCONNECT
+ || param->disconnectinfo.force) {
+ /* sending release */
l3m = create_l3msg();
l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_REQ, DIRECTION_OUT);
/* send cause */
enc_ie_cause(l3m, (p_m_mISDNport->locally && param->disconnectinfo.location==LOCATION_PRIVATE_LOCAL)?LOCATION_PRIVATE_LOCAL:param->disconnectinfo.location, param->disconnectinfo.cause);
end_trace();
- p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE_COMPLETE, p_m_d_l3id, l3m);
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_RELEASE, p_m_d_l3id, l3m);
new_state(PORT_STATE_RELEASE);
/* remove epoint */
free_epointid(epoint_id);
// wait for callref to be released
return;
+
}
#if 0
port = port_first;
while(port) {
/* are we ISDN ? */
- if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1) {
+ if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_DSS1) {
pdss1 = (class Pdss1 *)port;
/* check out correct stack and id */
if (pdss1->p_m_mISDNport == mISDNport) {
projects / lcr.git / blobdiff