p_m_d_tespecial = mISDNport->tespecial;
p_m_d_l3id = 0;
p_m_d_ces = -1;
- p_m_d_queue = NULL;
+ p_m_d_queue[0] = '\0';
p_m_d_notify_pending = NULL;
p_m_d_collect_cause = 0;
p_m_d_collect_location = 0;
Pdss1::~Pdss1()
{
/* remove queued message */
- if (p_m_d_queue)
- message_free(p_m_d_queue);
-
if (p_m_d_notify_pending)
message_free(p_m_d_notify_pending);
}
int coding, location, progress;
int ret;
struct lcr_msg *message;
+ int max = p_m_mISDNport->ifport->dialmax;
+ char *number;
+ l3_msg *nl3m;
l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_IND, DIRECTION_IN);
dec_ie_channel_id(l3m, &exclusive, &channel);
message_put(message);
new_state(PORT_STATE_OUT_OVERLAP);
+
+ number = p_m_d_queue;
+ while (number[0]) /* as long we have something to dial */
+ {
+ if (max > strlen(number) || max == 0)
+ max = strlen(number);
+
+ nl3m = create_l3msg();
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
+ enc_ie_called_pn(nl3m, 0, 1, (unsigned char *)number, max);
+ end_trace();
+ p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, nl3m);
+ number += max;
+ }
+ p_m_d_queue[0] = '\0';
}
/* CC_PROCEEDING INDICATION */
}
+/* CC_PROGRESS INDICATION */
+void Pdss1::progress_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m)
+{
+ unsigned char facil[256];
+ int facil_len;
+ struct lcr_msg *message;
+ int coding, location, progress;
+
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_PROGRESS_IND, DIRECTION_IN);
+ dec_ie_progress(l3m, &coding, &location, &progress);
+ end_trace();
+}
+
+
/*
* handler for isdn connections
* incoming information are parsed and sent via message to the endpoint
facility_ind(cmd, pid, l3m);
break;
+ case MT_PROGRESS:
+ progress_ind(cmd, pid, l3m);
+ break;
+
case MT_FREE:
l1l2l3_trace_header(p_m_mISDNport, this, L3_RELEASE_L3ID_IND, DIRECTION_IN);
add_trace("callref", NULL, "0x%x", p_m_d_l3id);
break;
default:
- l1l2l3_trace_header(p_m_mISDNport, this, L3_UNKNOWN, DIRECTION_IN);
+ l1l2l3_trace_header(p_m_mISDNport, this, L3_UNKNOWN_IND, DIRECTION_IN);
add_trace("unhandled", "cmd", "0x%x", cmd);
end_trace();
}
void Pdss1::message_information(unsigned int epoint_id, int message_id, union parameter *param)
{
l3_msg *l3m;
+ char *display = param->information.display;
+ char *number = param->information.id;
+ int max = p_m_mISDNport->ifport->dialmax;
- if (param->information.id[0]) /* only if we have something to dial */
+ while (number[0]) /* as long we have something to dial */
{
+ if (max > strlen(number) || max == 0)
+ max = strlen(number);
+
l3m = create_l3msg();
l1l2l3_trace_header(p_m_mISDNport, this, L3_INFORMATION_REQ, DIRECTION_OUT);
- enc_ie_called_pn(l3m, 0, 1, (unsigned char *)param->information.id);
- if (p_m_d_ntmode || p_m_d_tespecial)
- enc_ie_display(l3m, (unsigned char *)param->information.display);
+ enc_ie_called_pn(l3m, 0, 1, (unsigned char *)number, max);
+ if ((p_m_d_ntmode || p_m_d_tespecial) && display[0]) {
+ enc_ie_display(l3m, (unsigned char *)display);
+ display = "";
+ }
end_trace();
p_m_mISDNport->ml3->to_layer3(p_m_mISDNport->ml3, MT_INFORMATION, p_m_d_l3id, l3m);
+ number += max;
}
new_state(p_state);
}
int capability, mode, rate, coding, user, presentation, interpretation, hlc, exthlc;
int channel, exclusive;
struct epoint_list *epointlist;
+ int max = p_m_mISDNport->ifport->dialmax;
/* release if port is blocked */
if (p_m_mISDNport->ifport->block)
/* dialing information */
if (p_dialinginfo.id[0]) /* only if we have something to dial */
{
- enc_ie_called_pn(l3m, 0, 1, (unsigned char *)p_dialinginfo.id);
+ if (max > strlen(p_dialinginfo.id) || max == 0)
+ max = strlen(p_dialinginfo.id);
+ enc_ie_called_pn(l3m, 0, 1, (unsigned char *)p_dialinginfo.id, max);
+ SCPY(p_m_d_queue, p_dialinginfo.id + max);
}
/* sending complete */
if (p_dialinginfo.sending_complete)
int notify;
int plan = 0, type = -1, present = 0;
+ printf("if = %d\n", param->notifyinfo.notify);
if (param->notifyinfo.notify>INFO_NOTIFY_NONE)
notify = param->notifyinfo.notify & 0x7f;
else
notify = -1;
- if (p_state != PORT_STATE_CONNECT)
- {
- /* notify only allowed in active state */
- notify = -1;
- }
if (notify >= 0)
{
plan = 1;
if (notify >= 0)
{
- if (p_state!=PORT_STATE_CONNECT)
+ if (p_state!=PORT_STATE_CONNECT && p_state!=PORT_STATE_IN_PROCEEDING && p_state!=PORT_STATE_IN_ALERTING)
{
/* queue notification */
if (p_m_d_notify_pending)
break;
}
message_proceeding(epoint_id, message_id, param);
+ if (p_m_d_notify_pending)
+ {
+ /* send pending notify message during connect */
+ message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
+ message_free(p_m_d_notify_pending);
+ p_m_d_notify_pending = NULL;
+ }
break;
case MESSAGE_ALERTING: /* call of endpoint is ringing */
break;
}
message_alerting(epoint_id, message_id, param);
+ if (p_m_d_notify_pending)
+ {
+ /* send pending notify message during connect */
+ message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
+ message_free(p_m_d_notify_pending);
+ p_m_d_notify_pending = NULL;
+ }
break;
case MESSAGE_CONNECT: /* call of endpoint is connected */
break;
}
message_connect(epoint_id, message_id, param);
+ if (p_m_d_notify_pending)
+ {
+ /* send pending notify message during connect */
+ message_notify(ACTIVE_EPOINT(p_epointlist), p_m_d_notify_pending->type, &p_m_d_notify_pending->param);
+ message_free(p_m_d_notify_pending);
+ p_m_d_notify_pending = NULL;
+ }
break;
case MESSAGE_DISCONNECT: /* call has been disconnected */
}
-#if 0
-/*
- * sending message that were queued during L1 activation
- * or releasing port if link is down
- */
-void setup_queue(struct mISDNport *mISDNport, int link)
-{
- class Port *port;
- class Pdss1 *pdss1;
- struct lcr_msg *message;
-
- if (!mISDNport->ntmode)
- return;
-
- /* check all port objects for pending message */
- port = port_first;
- while(port)
- {
- if ((port->p_type&PORT_CLASS_mISDN_MASK) == PORT_CLASS_mISDN_DSS1)
- {
- pdss1 = (class Pdss1 *)port;
- if (pdss1->p_m_mISDNport == mISDNport)
- {
- if (pdss1->p_m_d_queue)
- {
- if (link)
- {
- PDEBUG(DEBUG_ISDN, "the L1 became active, so we send queued message for portnum=%d (%s).\n", mISDNport->portnum, pdss1->p_name);
- /* LAYER 1 is up, so we send */
- pdss1->message_setup(pdss1->p_m_d_queue->id_from, pdss1->p_m_d_queue->type, &pdss1->p_m_d_queue->param);
- message_free(pdss1->p_m_d_queue);
- pdss1->p_m_d_queue = NULL;
- } else
- {
- PDEBUG(DEBUG_ISDN, "the L1 became NOT active, so we release port for portnum=%d (%s).\n", mISDNport->portnum, pdss1->p_name);
- message = message_create(pdss1->p_serial, pdss1->p_m_d_queue->id_from, PORT_TO_EPOINT, MESSAGE_RELEASE);
- message->param.disconnectinfo.cause = 27;
- message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
- message_put(message);
- pdss1->new_state(PORT_STATE_RELEASE);
- pdss1->p_m_delete = 1;
- }
- }
- }
- }
- port = port->next;
- }
-}
-
-#endif
projects / lcr.git / blobdiff