X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=socket_server.c;h=ba4ff084b10b3ef5fe42fc35480d5fa7edfa9595;hp=47626c488b867ff78d768829718c3a80e036db85;hb=f854931ffbee9464b278c433c4fdc7c3ea5af2fb;hpb=911f737f2b92dd922a9dc9e0710207f9a0ae9130 diff --git a/socket_server.c b/socket_server.c index 47626c4..ba4ff08 100644 --- a/socket_server.c +++ b/socket_server.c @@ -13,6 +13,9 @@ #include #include #include +#ifdef PACKAGE_VERSION +#undef PACKAGE_VERSION +#endif #include "config.h" @@ -79,10 +82,14 @@ void free_connection(struct admin_list *admin) { struct admin_queue *response; void *temp; +#ifdef WITH_MISDN union parameter param; class Join *join, *joinnext; struct mISDNport *mISDNport; int i, ii; + class Port *port, *portnext; + class Premote *remote; +#endif struct admin_list **adminp; /* free remote joins */ @@ -97,6 +104,7 @@ void free_connection(struct admin_list *admin) "REMOTE APP release"); add_trace("app", "name", "%s", admin->remote_name); end_trace(); +#ifdef WITH_MISDN /* release all exported channels */ mISDNport = mISDNport_first; while(mISDNport) { @@ -113,6 +121,8 @@ void free_connection(struct admin_list *admin) } mISDNport = mISDNport->next; } +#endif +#ifdef WITH_MISDN /* release join */ join = join_first; while(join) { @@ -126,6 +136,23 @@ void free_connection(struct admin_list *admin) } join = joinnext; } + /* release remote port */ + port = port_first; + while(port) { + portnext = port->next; + if ((port->p_type & PORT_CLASS_MASK) == PORT_CLASS_REMOTE) { + remote = (class Premote *) port; + if (remote->p_m_r_remote_id == admin->sock) { + memset(¶m, 0, sizeof(param)); + param.disconnectinfo.cause = CAUSE_OUTOFORDER; + param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; + remote->message_remote(MESSAGE_RELEASE, ¶m); + /* port is now destroyed, so we go to next join */ + } + } + port = portnext; + } +#endif } if (admin->sock >= 0) { @@ -415,6 +442,7 @@ int admin_block(struct admin_queue **responsep, int portnum, int block) goto out; } +#ifdef WITH_MISDN /* no interface */ if (!ifport->mISDNport) { /* not loaded anyway */ @@ -425,7 +453,7 @@ int admin_block(struct admin_queue **responsep, int portnum, int block) /* try loading interface */ ifport->block = block; - load_port(ifport); + load_mISDN_port(ifport); /* port cannot load */ if (ifport->block >= 2) { @@ -447,6 +475,7 @@ int admin_block(struct admin_queue **responsep, int portnum, int block) ifport->block = 2; goto out; } +#endif /* port new blocking state */ ifport->block = response->am[0].u.x.block = block; @@ -509,7 +538,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg) if (!(epoint = new Endpoint(0, 0))) FATAL("No memory for Endpoint instance\n"); - if (!(epoint->ep_app = apppbx = new DEFAULT_ENDPOINT_APP(epoint, 1))) // outgoing + if (!(epoint->ep_app = apppbx = new EndpointAppPBX(epoint, 1))) // outgoing FATAL("No memory for Endpoint Application instance\n"); apppbx->e_adminid = admin->sockserial; admin->epointid = epoint->ep_serial; @@ -586,9 +615,15 @@ void admin_call_response(int adminid, int message, const char *connected, int ca /* * send data to the remote socket join instance */ -int admin_message_to_join(struct admin_msg *msg, struct admin_list *admin) +int admin_message_to_lcr(struct admin_msg *msg, struct admin_list *admin) { +#ifdef WITH_MISDN + struct mISDNport *mISDNport; + class Port *port; + class Premote *remote = NULL; /* make GCC happy */ class Join *join; + class JoinRemote *joinremote = NULL; /* make GCC happy */ +#endif struct admin_list *temp; /* hello message */ @@ -629,17 +664,51 @@ int admin_message_to_join(struct admin_msg *msg, struct admin_list *admin) return(-1); } - /* new join */ +#ifdef WITH_MISDN + /* new join. the reply (NEWREF assignment) is sent from constructor */ if (msg->type == MESSAGE_NEWREF) { - /* create new join instance */ - join = new JoinRemote(0, admin->remote_name, admin->sock); // must have no serial, because no endpoint is connected - if (!join) { - FATAL("No memory for remote join instance\n"); - return(-1); + if (msg->param.newref.mode) { + char name[32]; + /* find remote port */ + mISDNport = mISDNport_first; + while(mISDNport) { + if (mISDNport->ifport->remote && !strcmp(mISDNport->ifport->remote_app, admin->remote_name)) + break; + mISDNport = mISDNport->next; + } + if (!mISDNport) { + union parameter param; + + /* create new join instance */ + join = joinremote = new JoinRemote(0, admin->remote_name, admin->sock); // must have no serial, because no endpoint is connected + if (!join) { + FATAL("No memory for remote join instance\n"); + return(-1); + } + memset(¶m, 0, sizeof(union parameter)); + param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; + param.disconnectinfo.cause = CAUSE_RESSOURCEUNAVAIL; + admin_message_from_lcr(joinremote->j_remote_id, joinremote->j_remote_ref, MESSAGE_RELEASE, ¶m); + return 0; + } + /* creating port object, transparent until setup with hdlc */ + SPRINT(name, "%s-%s-in", mISDNport->ifport->interface->name, mISDNport->ifport->remote_app); + if (!(remote = new Premote(PORT_TYPE_REMOTE_IN, mISDNport, name, NULL, 0, 0, B_MODE_TRANSPARENT, admin->sock))) + + FATAL("Cannot create Port instance.\n"); + } else { + /* create new join instance */ + join = new JoinRemote(0, admin->remote_name, admin->sock); // must have no serial, because no endpoint is connected + if (!join) { + FATAL("No memory for remote join instance\n"); + return(-1); + } } return(0); } +#endif +#ifdef WITH_MISDN /* bchannel message * no ref given for *_ack */ if (msg->type == MESSAGE_BCHANNEL) @@ -650,6 +719,7 @@ int admin_message_to_join(struct admin_msg *msg, struct admin_list *admin) message_bchannel_from_remote(NULL, msg->param.bchannel.type, msg->param.bchannel.handle); return(0); } +#endif /* check for ref */ if (!msg->ref) { @@ -657,39 +727,61 @@ int admin_message_to_join(struct admin_msg *msg, struct admin_list *admin) return(-1); } +#ifdef WITH_MISDN /* find join instance */ join = join_first; while(join) { - if (join->j_serial == msg->ref) - break; + if (join->j_type == JOIN_TYPE_REMOTE) { + joinremote = (class JoinRemote *)join; + if (joinremote->j_remote_ref == msg->ref) + break; + } join = join->next; } - if (!join) { - PDEBUG(DEBUG_LOG, "No join found with serial %d. (May have been already released.)\n", msg->ref); + if (join) { + if (admin->sock != joinremote->j_remote_id) { + PERROR("Ref %d belongs to remote application %s, but not to sending application %s.\n", msg->ref, joinremote->j_remote_name, admin->remote_name); + return(-1); + } + /* send message */ + joinremote->message_remote(msg->type, &msg->param); + return(0); } - /* check application */ - if (join->j_type != JOIN_TYPE_REMOTE) { - PERROR("Ref %d does not belong to a remote join instance.\n", msg->ref); - return(-1); - } - if (admin->sock != ((class JoinRemote *)join)->j_remote_id) { - PERROR("Ref %d belongs to remote application %s, but not to sending application %s.\n", msg->ref, ((class JoinRemote *)join)->j_remote_name, admin->remote_name); - return(-1); + /* find port instance */ + port = port_first; + while(port) { + if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_REMOTE) { + remote = (class Premote *) port; + if (remote->p_m_r_ref == msg->ref) + break; + } + port = port->next; } + if (port) { + if (admin->sock != remote->p_m_r_remote_id) { + PERROR("Ref %d belongs to remote application %s, but not to sending application %s.\n", msg->ref, remote->p_m_r_remote_app, admin->remote_name); + return(-1); + } + + /* send message */ + remote->message_remote(msg->type, &msg->param); - /* send message */ - ((class JoinRemote *)join)->message_remote(msg->type, &msg->param); + return(0); + } +#endif + PDEBUG(DEBUG_LOG, "No remote instance found with ref %d. (May have been already released.)\n", msg->ref); return(0); + } /* * this function is called for every message to remote socket */ -int admin_message_from_join(int remote_id, unsigned int ref, int message_type, union parameter *param) +int admin_message_from_lcr(int remote_id, unsigned int ref, int message_type, union parameter *param) { struct admin_list *admin; struct admin_queue **responsep; /* response pointer */ @@ -736,13 +828,16 @@ int admin_state(struct admin_queue **responsep) class Port *port; class EndpointAppPBX *apppbx; class Join *join; +#ifdef WITH_MISDN class Pdss1 *pdss1; + struct mISDNport *mISDNport; + struct select_channel *selchannel; + int anybusy; +#endif struct interface *interface; struct interface_port *ifport; - struct mISDNport *mISDNport; int i; int num; - int anybusy; struct admin_queue *response; struct admin_list *admin; struct tm *now_tm; @@ -767,6 +862,8 @@ int admin_state(struct admin_queue **responsep) interface = interface_first; while(interface) { ifport = interface->ifport; + if (!ifport) + i++; while(ifport) { i++; ifport = ifport->next; @@ -828,6 +925,18 @@ int admin_state(struct admin_queue **responsep) num = 0; while(interface) { ifport = interface->ifport; + if (!ifport) { + /* message */ + response->am[num].message = ADMIN_RESPONSE_S_INTERFACE; + /* interface */ + SCPY(response->am[num].u.i.interface_name, interface->name); + /* portnum */ + response->am[num].u.i.portnum = -100; /* indicate: no ifport */ + /* iftype */ + response->am[num].u.i.extension = interface->extension; + /* block */ + num++; + } while(ifport) { /* message */ response->am[num].message = ADMIN_RESPONSE_S_INTERFACE; @@ -841,6 +950,7 @@ int admin_state(struct admin_queue **responsep) response->am[num].u.i.extension = interface->extension; /* block */ response->am[num].u.i.block = ifport->block; +#ifdef WITH_MISDN if (ifport->mISDNport) { mISDNport = ifport->mISDNport; @@ -872,7 +982,40 @@ int admin_state(struct admin_queue **responsep) response->am[num].u.i.slip_rx = mISDNport->slip_rx; /* channels */ response->am[num].u.i.channels = mISDNport->b_num; - /* channel info */ + /* channel selection */ + selchannel = ifport->out_channel; + if (ifport->channel_force) + SCAT(response->am[num].u.i.out_channel, "force"); + while (selchannel) { + if (response->am[num].u.i.out_channel[0]) + SCAT(response->am[num].u.i.out_channel, ","); + switch (selchannel->channel) { + case CHANNEL_NO: + SCAT(response->am[num].u.i.out_channel, "no"); + break; + case CHANNEL_ANY: + SCAT(response->am[num].u.i.out_channel, "any"); + break; + case CHANNEL_FREE: + SCAT(response->am[num].u.i.out_channel, "free"); + break; + default: + SPRINT(strchr(response->am[num].u.i.out_channel, '\0'), "%d", selchannel->channel); + } + selchannel = selchannel->next; + } + selchannel = ifport->in_channel; + while (selchannel) { + switch (selchannel->channel) { + case CHANNEL_FREE: + SCAT(response->am[num].u.i.in_channel, "free"); + break; + default: + SPRINT(strchr(response->am[num].u.i.in_channel, '\0'), "%d", selchannel->channel); + } + selchannel = selchannel->next; + } + /* channel state */ i = 0; anybusy = 0; while(i < mISDNport->b_num) { @@ -883,6 +1026,7 @@ int admin_state(struct admin_queue **responsep) i++; } } +#endif num++; ifport = ifport->next; @@ -989,9 +1133,11 @@ int admin_state(struct admin_queue **responsep) if (apppbx->ea_endpoint->ep_park && apppbx->ea_endpoint->ep_park_len && apppbx->ea_endpoint->ep_park_len<=(int)sizeof(response->am[num].u.e.park_callid)) memcpy(response->am[num].u.e.park_callid, apppbx->ea_endpoint->ep_park_callid, apppbx->ea_endpoint->ep_park_len); response->am[num].u.e.park_len = apppbx->ea_endpoint->ep_park_len; +#ifdef WITH_CRYPT /* crypt */ if (apppbx->e_crypt == CRYPT_ON) response->am[num].u.e.crypt = 1; +#endif /* */ apppbx = apppbx->next; num++; @@ -1049,6 +1195,7 @@ int admin_state(struct admin_queue **responsep) default: response->am[num].u.p.state = ADMIN_STATE_IDLE; } +#ifdef WITH_MISDN /* isdn */ if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_DSS1) { response->am[num].u.p.isdn = 1; @@ -1057,6 +1204,7 @@ int admin_state(struct admin_queue **responsep) response->am[num].u.p.isdn_hold = pdss1->p_m_hold; response->am[num].u.p.isdn_ces = pdss1->p_m_d_ces; } +#endif /* */ port = port->next; num++; @@ -1122,8 +1270,8 @@ int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int i /*release endpoint if exists */ if (admin->epointid) { epoint = find_epoint_id(admin->epointid); - if (epoint) { - ((class DEFAULT_ENDPOINT_APP *)epoint->ep_app)-> + if (epoint && epoint->ep_app_type == EAPP_TYPE_PBX) { + ((class EndpointAppPBX *)epoint->ep_app)-> release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0); } } @@ -1200,7 +1348,7 @@ int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int i break; case ADMIN_MESSAGE: - if (admin_message_to_join(&msg.u.msg, admin) < 0) { + if (admin_message_to_lcr(&msg.u.msg, admin) < 0) { PERROR("Failed to deliver message for socket %d.\n", admin->sock); goto response_error; } @@ -1247,3 +1395,24 @@ int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int i return 0; } +void message_bchannel_to_remote(unsigned int remote_id, unsigned int ref, int type, unsigned int handle, int tx_gain, int rx_gain, char *pipeline, unsigned char *crypt, int crypt_len, int crypt_type, int isloopback) +{ + union parameter param; + + memset(¶m, 0, sizeof(union parameter)); + param.bchannel.isloopback = isloopback; + param.bchannel.type = type; + param.bchannel.handle = handle; + param.bchannel.tx_gain = tx_gain; + param.bchannel.rx_gain = rx_gain; + if (pipeline) + SCPY(param.bchannel.pipeline, pipeline); + if (crypt_len) + memcpy(param.bchannel.crypt, crypt, crypt_len); + param.bchannel.crypt_type = crypt_type; + if (admin_message_from_lcr(remote_id, ref, MESSAGE_BCHANNEL, ¶m)<0) { + PERROR("No socket with remote id %d found, this happens, if the socket is closed before all bchannels are imported.\n", remote_id); + return; + } +} +