#include <sys/stat.h>
#include <fcntl.h>
extern "C" {
-#include <net_l2.h>
+#include <mISDNuser/net_l2.h>
}
//#define CENTREX
p_m_d_ces = -1;
p_m_d_queue = NULL;
p_m_d_notify_pending = NULL;
- p_m_d_collect_cause = CAUSE_NOUSER;
- p_m_d_collect_location = LOCATION_PRIVATE_LOCAL;
+ p_m_d_collect_cause = 0;
+ p_m_d_collect_location = 0;
PDEBUG(DEBUG_ISDN, "Created new mISDNPort(%s). Currently %d objects use, %s port #%d\n", portname, mISDNport->use, (mISDNport->ntmode)?"NT":"TE", p_m_portnum);
}
end_trace();
/* activate our exclusive channel */
- bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
} else
if (p_m_b_channel)
{
add_trace("connect", "channel", "%d", p_m_b_channel);
end_trace();
p_m_b_exclusive = 1; // we are done
- bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
return(0);
}
end_trace();
/* activate channel given by remote */
- bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
} else
if (p_m_b_reserve)
{
end_trace();
/* activate channel given by remote */
- bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
} else
{
/*** we sent 'no channel available' ***/
p_m_b_exclusive = 1; // we are done
/* activate channel given by remote */
- bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
return(0);
}
p_m_b_exclusive = 1; // we are done
/* activate channel given by remote */
- bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
}
return(0);
}
if (channel <= 0) /* not given, no channel, whatever.. */
channel = CHANNEL_ANY; /* any channel */
+ add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved);
if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) // of out chan..
{
- add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved);
add_trace("conclusion", NULL, "all channels are reserved");
end_trace();
return(-34); // no channel
p_m_delete = 1;
return;
}
- bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
/* create endpoint */
if (p_epointlist)
FATAL("Incoming call but already got an endpoint.\n");
- if (!(epoint = new Endpoint(p_serial, 0, 0)))
+ if (!(epoint = new Endpoint(p_serial, 0)))
FATAL("No memory for Endpoint instance\n");
- if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint)))
+ if (!(epoint->ep_app = new DEFAULT_ENDPOINT_APP(epoint, 0))) //incomming
FATAL("No memory for Endpoint Application instance\n");
epointlist_new(epoint->ep_serial);
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_SETUP);
message->param.setup.isdn_port = p_m_portnum;
message->param.setup.port_type = p_type;
+ message->param.setup.dtmf = !p_m_mISDNport->ifport->nodtmf;
memcpy(&message->param.setup.dialinginfo, &p_dialinginfo, sizeof(struct dialing_info));
memcpy(&message->param.setup.callerinfo, &p_callerinfo, sizeof(struct caller_info));
memcpy(&message->param.setup.redirinfo, &p_redirinfo, sizeof(struct redir_info));
add_trace("old-cause", "value", "%d", p_m_d_collect_cause);
}
dec_ie_cause(disconnect->CAUSE, (Q931_info_t *)((unsigned long)data+headerlen), &location, &cause);
- end_trace();
if (location == LOCATION_PRIVATE_LOCAL)
location = LOCATION_PRIVATE_REMOTE;
collect_cause(&p_m_d_collect_cause, &p_m_d_collect_location, cause, location);
add_trace("new-cause", "location", "%d", p_m_d_collect_location);
add_trace("new-cause", "value", "%d", p_m_d_collect_cause);
+ end_trace();
}
while(p_epointlist)
{
message = message_create(p_serial, p_epointlist->epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
- message->param.disconnectinfo.cause = p_m_d_collect_cause;
- message->param.disconnectinfo.location = p_m_d_collect_location;
+ if (p_m_d_collect_cause)
+ {
+ message->param.disconnectinfo.cause = p_m_d_collect_cause;
+ message->param.disconnectinfo.location = p_m_d_collect_location;
+ } else
+ {
+ message->param.disconnectinfo.cause = CAUSE_NOUSER;
+ message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+ }
message_put(message);
/* remove epoint */
free_epointlist(p_epointlist);
NOTIFY_t *notifying = (NOTIFY_t *)((unsigned long)data + headerlen);
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);
dec_ie_notify(notifying->NOTIFY, (Q931_info_t *)((unsigned long)data+headerlen), ¬ify);
- dec_ie_redir_dn(notifying->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, (unsigned char *)message->param.notifyinfo.id, sizeof(message->param.notifyinfo.id));
+ dec_ie_redir_dn(notifying->REDIR_DN, (Q931_info_t *)((unsigned long)data+headerlen), &type, &plan, &present, notifyid, sizeof(notifyid));
end_trace();
if (!ACTIVE_EPOINT(p_epointlist))
notify |= 0x80;
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_NOTIFY);
message->param.notifyinfo.notify = notify;
+ SCPY(message->param.notifyinfo.id, (char *)notifyid);
/* redirection number */
switch (present)
{
cause = -ret;
goto reject;
}
- bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
/* set hold state */
p_m_hold = 0;
p_m_delete = 1;
return;
}
- bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_ACTIVATE);
+ bchannel_event(p_m_mISDNport, p_m_b_index, B_EVENT_USE);
/* create endpoint */
if (p_epointlist)
}
p_m_d_l3id = 0;
p_m_delete = 1;
-#warning remove me
-PDEBUG(DEBUG_LOG, "JOLLY release cr %d\n", p_serial);
+//#warning remove me
+//PDEBUG(DEBUG_LOG, "JOLLY release cr %d\n", p_serial);
/* sending release to endpoint in case we still have an endpoint
* this is because we don't get any response if a release_complete is received (or a release in release state)
*/
class Endpoint *epoint;
/* set timeout */
- epoint = find_epoint_id(ACTIVE_EPOINT(p_epointlist));
- if (epoint && p_m_d_ntmode)
+ if (state == PORT_STATE_IN_OVERLAP)
+ {
+ p_m_timeout = p_m_mISDNport->ifport->tout_dialing;
+ time(&p_m_timer);
+ }
+ if (state != p_state)
{
- if (state == PORT_STATE_IN_OVERLAP)
+ 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_settings.tout_dialing;
+ p_m_timeout = p_m_mISDNport->ifport->tout_setup;
time(&p_m_timer);
}
- if (state != p_state)
+ if (state == PORT_STATE_IN_PROCEEDING
+ || state == PORT_STATE_OUT_PROCEEDING)
{
- if (state == PORT_STATE_IN_SETUP
- || state == PORT_STATE_IN_OVERLAP)
- {
- p_m_timeout = p_settings.tout_setup;
- time(&p_m_timer);
- }
- if (state == PORT_STATE_IN_PROCEEDING
- || state == PORT_STATE_OUT_PROCEEDING)
- {
- p_m_timeout = p_settings.tout_proceeding;
- time(&p_m_timer);
- }
- if (state == PORT_STATE_IN_ALERTING
- || state == PORT_STATE_OUT_ALERTING)
- {
- p_m_timeout = p_settings.tout_alerting;
- time(&p_m_timer);
- }
- if (state == PORT_STATE_CONNECT
- || state == PORT_STATE_CONNECT_WAITING)
- {
- p_m_timeout = 0;
- }
- if (state == PORT_STATE_IN_DISCONNECT
- || state == PORT_STATE_OUT_DISCONNECT)
- {
- p_m_timeout = p_settings.tout_disconnect;
- time(&p_m_timer);
- }
+ p_m_timeout = p_m_mISDNport->ifport->tout_proceeding;
+ time(&p_m_timer);
+ }
+ 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 (state == PORT_STATE_CONNECT
+ || state == PORT_STATE_CONNECT_WAITING)
+ {
+ p_m_timeout = 0;
+ }
+ if (state == PORT_STATE_IN_DISCONNECT
+ || state == PORT_STATE_OUT_DISCONNECT)
+ {
+ p_m_timeout = p_m_mISDNport->ifport->tout_disconnect;
+ time(&p_m_timer);
}
}
{
int ret;
-if (p_m_delete && p_m_d_l3id==0)
- printf("ping! %d", p_serial);
+//if (p_m_delete && p_m_d_l3id==0)
+// printf("ping! %d", p_serial);
if ((ret = PmISDN::handler()))
return(ret);
/* handle destruction */
if (p_m_delete && p_m_d_l3id==0)
{
-#warning remove
-PDEBUG(DEBUG_LOG, "JOLLY destroy object %d\n", p_serial);
+//#warning remove
+//PDEBUG(DEBUG_LOG, "JOLLY destroy object %d\n", p_serial);
delete this;
return(-1);
memcpy(&p_capainfo, ¶m->setup.capainfo, sizeof(p_capainfo));
memcpy(&p_redirinfo, ¶m->setup.redirinfo, sizeof(p_redirinfo));
// SCPY(&p_m_tones_dir, param->setup.ext.tones_dir);
+ /* screen outgoing caller id */
+ do_screen(1, p_callerinfo.id, sizeof(p_callerinfo.id), &p_callerinfo.ntype, &p_callerinfo.present, p_m_mISDNport->ifport->interface);
/* only display at connect state: this case happens if endpoint is in connected mode */
if (p_state==PORT_STATE_CONNECT)
/* copy connected information */
memcpy(&p_connectinfo, ¶m->connectinfo, sizeof(p_connectinfo));
+ /* screen outgoing caller id */
+ do_screen(1, p_connectinfo.id, sizeof(p_connectinfo.id), &p_connectinfo.ntype, &p_connectinfo.present, p_m_mISDNport->ifport->interface);
/* only display at connect state */
if (p_state == PORT_STATE_CONNECT)
* we may only release during incomming disconnect state.
* this means that the endpoint doesnt require audio anymore
*/
- if (p_state == PORT_STATE_IN_DISCONNECT)
+ if (p_state == PORT_STATE_IN_DISCONNECT
+ || p_state == PORT_STATE_OUT_DISCONNECT)
{
/* sending release */
dmsg = create_l3msg(CC_RELEASE | REQUEST, MT_RELEASE, p_m_d_l3id, sizeof(RELEASE_t), p_m_d_ntmode);
// // NOTE: a bug in mISDNuser (see disconnect_req_out !!!)
// || p_state==PORT_STATE_OUT_DISCO)
{
-#warning remove me
-PDEBUG(DEBUG_LOG, "JOLLY sending release complete %d\n", p_serial);
+//#warning remove me
+//PDEBUG(DEBUG_LOG, "JOLLY sending release complete %d\n", p_serial);
/* sending release complete */
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);
/* remove epoint */
free_epointid(epoint_id);
// wait for release and callref to be released
-#warning remove me
-PDEBUG(DEBUG_LOG, "JOLLY sending disconnect %d\n", p_serial);
+//#warning remove me
+//PDEBUG(DEBUG_LOG, "JOLLY sending disconnect %d\n", p_serial);
}
/* check out correct stack */
if (pdss1->p_m_mISDNport == mISDNport)
/* check out correct id */
- if ((hh->dinfo&0xffff0000) == (pdss1->p_m_d_l3id&0xffff0000))
+ if ((pdss1->p_m_d_l3id&0x0000ff00) != 0x000ff00)
{
- /* found port, the message belongs to */
- break;
+ /* a single process */
+ if (hh->dinfo == pdss1->p_m_d_l3id)
+ {
+ /* found port, the message belongs to */
+ break;
+ }
+ } else
+ {
+ /* a broadcast process */
+ if ((hh->dinfo&0xffff0000) == (pdss1->p_m_d_l3id&0xffff0000))
+ {
+ /* found port, the message belongs to */
+ break;
+ }
}
}
port = port->next;
}
if (port)
{
+//printf("%x %x\n", hh->dinfo, pdss1->p_m_d_l3id);
/* if process id is master process, but a child disconnects */
- if ((hh->dinfo&0x0000ff00)!=0x0000ff00 && (pdss1->p_m_d_l3id&0x0000ff00)==0x0000ff00 && hh->prim==(CC_DISCONNECT|INDICATION))
+ if ((hh->dinfo&0x0000ff00)!=0x0000ff00 && (pdss1->p_m_d_l3id&0x0000ff00)==0x0000ff00)
{
- /* send special indication for child disconnect */
- pdss1->disconnect_ind_i(hh->prim, hh->dinfo, msg->data);
+ if (hh->prim == (CC_DISCONNECT|INDICATION))
+ {
+ /* send special indication for child disconnect */
+ pdss1->disconnect_ind_i(hh->prim, hh->dinfo, msg->data);
+ free_msg(msg);
+ return(0);
+ }
+ // ignoring other messages from child processes
free_msg(msg);
return(0);
}
time(&mISDNport->l2establish);
PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n");
}
+//#warning debugging usleep crash
+// printf("JOLLY release port %d\n", mISDNport->portnum);
+ usleep(1);
break;
case CC_SETUP | INDICATION:
PERROR("unhandled message from stack: call ref released (l3id=0x%x)\n", hh->dinfo);
break;
- case CC_DISCONNECT | INDICATION:
+ case CC_RELEASE_COMPLETE | INDICATION:
+ break;
+
+ case CC_FACILITY | INDICATION:
+ break;
- // fall throug
default:
PERROR("unhandled message: prim(0x%x) dinfo(0x%x) msg->len(%d)\n", hh->prim, hh->dinfo, msg->len);
+ 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;
+ //PDEBUG(DEBUG_ISDN, "comparing dinfo = 0x%x with l3id 0x%x\n", hh->dinfo, pdss1->p_m_d_l3id);
+ /* check out correct stack */
+ if (pdss1->p_m_mISDNport == mISDNport)
+ /* check out correct id */
+ PERROR("unhandled message: dinfo=%x is not associated with port-dinfo=%x\n",hh->dinfo,pdss1->p_m_d_l3id);
+ }
+ port = port->next;
+ }
return(-EINVAL);
}
free_msg(msg);
projects / lcr.git / blobdiff