X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=dss1.cpp;h=eabb0cd5256aee17fb0bb596ff1a392f1ec7990a;hp=75ff448a5ae824ec68576a2d7b59ae91a9bbd5ab;hb=7b103167ba7d7bdd863a8ea43c15680c9cfe3e20;hpb=473d6569efcad130f9a5044b182b75a1c07a1eee diff --git a/dss1.cpp b/dss1.cpp index 75ff448..eabb0cd 100644 --- a/dss1.cpp +++ b/dss1.cpp @@ -15,11 +15,15 @@ //#include extern "C" { } -#include +#include +#ifdef OLD_MT_ASSIGN extern unsigned int mt_assign_pid; +#endif #include "ie.cpp" +static int delete_event(struct lcr_work *work, void *instance, int index); + /* * constructor */ @@ -29,6 +33,8 @@ Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_ 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; @@ -44,6 +50,8 @@ Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_ */ Pdss1::~Pdss1() { + del_work(&p_m_d_delete); + /* remove queued message */ if (p_m_d_notify_pending) message_free(p_m_d_notify_pending); @@ -255,7 +263,7 @@ int Pdss1::received_first_reply_to_setup(unsigned int cmd, int channel, int excl 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 */ } @@ -422,7 +430,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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; @@ -453,7 +461,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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; } @@ -711,7 +719,7 @@ void Pdss1::setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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); @@ -795,6 +803,13 @@ void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_ 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) { @@ -803,7 +818,7 @@ void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_ 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; } @@ -844,6 +859,13 @@ void Pdss1::proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 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); @@ -851,7 +873,7 @@ void Pdss1::proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 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); @@ -920,6 +942,13 @@ void Pdss1::alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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) { @@ -928,7 +957,7 @@ void Pdss1::alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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); @@ -1005,7 +1034,7 @@ void Pdss1::connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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; } @@ -1093,6 +1122,13 @@ void Pdss1::disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 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; @@ -1117,7 +1153,7 @@ void Pdss1::disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3 free_epointlist(p_epointlist); } new_state(PORT_STATE_RELEASE); - p_m_delete = 1; + trigger_work(&p_m_d_delete); return; } @@ -1197,7 +1233,7 @@ void Pdss1::release_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) } new_state(PORT_STATE_RELEASE); - p_m_delete = 1; + trigger_work(&p_m_d_delete); } /* CC_RESTART INDICATION */ @@ -1247,7 +1283,7 @@ void Pdss1::release_complete_ind(unsigned int cmd, unsigned int pid, struct l3_m } new_state(PORT_STATE_RELEASE); - p_m_delete = 1; + trigger_work(&p_m_d_delete); } /* T312 timeout */ @@ -1351,8 +1387,8 @@ void Pdss1::hold_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) #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 @@ -1410,7 +1446,7 @@ void Pdss1::retrieve_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) /* set hold state */ p_m_hold = 0; - p_m_timeout = 0; + unsched_timer(&p_m_timeout); /* acknowledge retrieve */ l3m = create_l3msg(); @@ -1488,7 +1524,7 @@ void Pdss1::suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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 */ @@ -1515,7 +1551,7 @@ void Pdss1::resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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; @@ -1558,7 +1594,7 @@ void Pdss1::resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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); @@ -1633,6 +1669,13 @@ void Pdss1::progress_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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); + } } @@ -1778,8 +1821,8 @@ void Pdss1::message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m) 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) */ @@ -1814,35 +1857,39 @@ void Pdss1::new_state(int 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); } } @@ -1850,23 +1897,15 @@ void Pdss1::new_state(int state) } -/* - * 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; } @@ -1921,7 +1960,7 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete 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; } @@ -1974,10 +2013,18 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete /* creating l3id */ l1l2l3_trace_header(p_m_mISDNport, this, L3_NEW_L3ID_REQ, DIRECTION_OUT); +#ifdef OLD_MT_ASSIGN /* 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) { + if (mt_assign_pid == 0 || ret < 0) + p_m_d_l3id = mt_assign_pid; + mt_assign_pid = ~0; +#else + p_m_d_l3id = request_new_pid(p_m_mISDNport->ml3); + if (p_m_d_l3id == MISDN_PID_NONE) +#endif + { struct lcr_msg *message; add_trace("callref", NULL, "no free id"); @@ -1987,11 +2034,13 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete 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; } +#ifdef OLD_MT_ASSIGN p_m_d_l3id = mt_assign_pid; mt_assign_pid = ~0; +#endif add_trace("callref", "new", "0x%x", p_m_d_l3id); end_trace(); @@ -1999,7 +2048,7 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete l3m = create_l3msg(); l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_REQ, DIRECTION_OUT); /* channel information */ - if (channel >= 0) /* it should */ + if (p_m_d_ntmode || channel != CHANNEL_ANY) /* only omit channel id in te-mode/any channel */ enc_ie_channel_id(l3m, exclusive, channel); /* caller information */ plan = 1; @@ -2419,6 +2468,7 @@ void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parame 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) { @@ -2513,7 +2563,8 @@ void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parame /* 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 */ @@ -2552,7 +2603,7 @@ if (/* ||*/ p_state==PORT_STATE_OUT_SETUP) { 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; } @@ -2603,45 +2654,46 @@ void Pdss1::message_release(unsigned int epoint_id, int message_id, union parame 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 @@ -2857,7 +2909,7 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi 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) { @@ -2947,6 +2999,11 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi // facility als broadcast break; + case MT_L2IDLE: + // L2 became idle - we could sent a MT_L2RELEASE if we are the L2 master + PDEBUG(DEBUG_ISDN, "Got L2 idle\n"); + break; + default: PERROR("unhandled message: cmd(0x%x) pid(0x%x)\n", cmd, pid); port = port_first;