X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=socket_server.c;h=7bb69fcc8ffe11891d75a204f4fe096bd98b2e92;hp=30830853320aa7f0e61dc76fab06782b5bd7a6a4;hb=04fc928a2c5f0262e85c09cced1ef20a9fd15f3d;hpb=8bb49ccb7b3eba0a3f20d3b097541304b3580f70 diff --git a/socket_server.c b/socket_server.c index 3083085..7bb69fc 100644 --- a/socket_server.c +++ b/socket_server.c @@ -13,6 +13,10 @@ #include #include #include +#ifdef PACKAGE_VERSION +#undef PACKAGE_VERSION +#endif +#include "config.h" char socket_name[128]; @@ -72,19 +76,17 @@ int admin_init(void) /* * free connection - * also releases all remote joins */ void free_connection(struct admin_list *admin) { struct admin_queue *response; void *temp; union parameter param; - class Join *join, *joinnext; - struct mISDNport *mISDNport; - int i, ii; + class Port *port, *portnext; + class Premote *remote; struct admin_list **adminp; - /* free remote joins */ + /* free remote ports */ if (admin->remote_name[0]) { start_trace(-1, NULL, @@ -96,34 +98,21 @@ void free_connection(struct admin_list *admin) "REMOTE APP release"); add_trace("app", "name", "%s", admin->remote_name); end_trace(); - /* release all exported channels */ - mISDNport = mISDNport_first; - while(mISDNport) { - i = 0; - ii = mISDNport->b_num; - while(i < ii) { - if (mISDNport->b_remote_id[i] == admin->sock) { - mISDNport->b_state[i] = B_STATE_IDLE; - unsched_timer(&mISDNport->b_timer[i]); - mISDNport->b_remote_id[i] = 0; - mISDNport->b_remote_ref[i] = 0; + /* 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_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 */ } - i++; - } - mISDNport = mISDNport->next; - } - /* release join */ - join = join_first; - while(join) { - joinnext = join->next; - if (join->j_type==JOIN_TYPE_REMOTE) if (((class JoinRemote *)join)->j_remote_id == admin->sock) { - memset(¶m, 0, sizeof(param)); - param.disconnectinfo.cause = CAUSE_OUTOFORDER; - param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; - ((class JoinRemote *)join)->message_remote(MESSAGE_RELEASE, ¶m); - /* join is now destroyed, so we go to next join */ } - join = joinnext; + port = portnext; } } @@ -262,9 +251,6 @@ int admin_route(struct admin_queue **responsep) case ACTION_EXTERNAL: apppbx->e_action = &action_external; break; - case ACTION_REMOTE: - apppbx->e_action = &action_remote; - break; case ACTION_VBOX_RECORD: apppbx->e_action = &action_vbox; break; @@ -414,6 +400,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 */ @@ -424,7 +411,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) { @@ -446,6 +433,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; @@ -508,7 +496,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; @@ -530,7 +518,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg) apppbx->e_dialinginfo.sending_complete = 1; apppbx->new_state(PORT_STATE_OUT_SETUP); - apppbx->out_setup(); + apppbx->out_setup(0); return(0); } @@ -538,7 +526,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg) /* * this function is called for response whenever a call state changes. */ -void admin_call_response(int adminid, int message, const char *connected, int cause, int location, int notify) +void admin_call_response(int adminid, int message, const char *connected, int cause, int location, int notify_progress) { struct admin_list *admin; struct admin_queue *response, **responsep; /* response pointer */ @@ -573,7 +561,7 @@ void admin_call_response(int adminid, int message, const char *connected, int ca SCPY(response->am[0].u.call.callerid, connected); response->am[0].u.call.cause = cause; response->am[0].u.call.location = location; - response->am[0].u.call.notify = notify; + response->am[0].u.call.notify_progress = notify_progress; /* attach to response chain */ *responsep = response; @@ -585,9 +573,11 @@ 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) { - class Join *join; + class Port *port; + class Premote *remote = NULL; /* make GCC happy */ + struct interface *interface; struct admin_list *temp; /* hello message */ @@ -628,67 +618,71 @@ int admin_message_to_join(struct admin_msg *msg, struct admin_list *admin) return(-1); } - /* new join */ + /* 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); + char name[32]; + /* find remote port */ + interface = interface_first; + while(interface) { + if (interface->remote && !strcmp(interface->remote_app, admin->remote_name)) + break; + interface = interface->next; } - return(0); - } + if (!interface) { + union parameter param; - /* bchannel message - * no ref given for *_ack */ - if (msg->type == MESSAGE_BCHANNEL) - if (msg->param.bchannel.type == BCHANNEL_ASSIGN_ACK - || msg->param.bchannel.type == BCHANNEL_REMOVE_ACK - || msg->param.bchannel.type == BCHANNEL_RELEASE) { - /* no ref, but address */ - message_bchannel_from_remote(NULL, msg->param.bchannel.type, msg->param.bchannel.handle); + memset(¶m, 0, sizeof(union parameter)); + param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL; + param.disconnectinfo.cause = CAUSE_RESSOURCEUNAVAIL; + admin_message_from_lcr(admin->sock, 0, MESSAGE_RELEASE, ¶m); + return 0; + } + /* creating port object, transparent until setup with hdlc */ + SPRINT(name, "%s-%s-in", interface->name, interface->remote_app); + if (!(remote = new Premote(PORT_TYPE_REMOTE_IN, name, NULL, interface, admin->sock))) + + FATAL("Cannot create Port instance.\n"); return(0); } - + /* check for ref */ if (!msg->ref) { PERROR("Remote application did not send us a valid ref with a message.\n"); return(-1); } - /* find join instance */ - join = join_first; - while(join) { - if (join->j_serial == 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); - return(0); + /* 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_r_ref == msg->ref) + break; + } + port = port->next; } + if (port) { + if (admin->sock != remote->p_r_remote_id) { + PERROR("Ref %d belongs to remote application %s, but not to sending application %s.\n", msg->ref, remote->p_r_remote_app, admin->remote_name); + return(-1); + } - /* 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); - } + /* send message */ + remote->message_remote(msg->type, &msg->param); - /* send message */ - ((class JoinRemote *)join)->message_remote(msg->type, &msg->param); + return(0); + } + 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 */ @@ -735,13 +729,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; @@ -766,6 +763,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; @@ -827,6 +826,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; @@ -840,6 +851,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; @@ -871,7 +883,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) { @@ -882,6 +927,7 @@ int admin_state(struct admin_queue **responsep) i++; } } +#endif num++; ifport = ifport->next; @@ -911,11 +957,10 @@ int admin_state(struct admin_queue **responsep) /* serial */ response->am[num].u.j.serial = join->j_serial; /* partyline */ - if (join->j_type == JOIN_TYPE_PBX) + if (join->j_type == JOIN_TYPE_PBX) { response->am[num].u.j.partyline = ((class JoinPBX *)join)->j_partyline; - /* remote application */ - if (join->j_type == JOIN_TYPE_REMOTE) - SCPY(response->am[num].u.j.remote, ((class JoinRemote *)join)->j_remote_name); + response->am[num].u.j.threepty = ((class JoinPBX *)join)->j_3pty; + } /* */ join = join->next; num++; @@ -988,9 +1033,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++; @@ -1048,14 +1095,16 @@ 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_mISDN_DSS1) { + if ((port->p_type & PORT_CLASS_mISDN_MASK) == PORT_CLASS_DSS1) { response->am[num].u.p.isdn = 1; pdss1 = (class Pdss1 *)port; response->am[num].u.p.isdn_chan = pdss1->p_m_b_channel; 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++; @@ -1112,17 +1161,12 @@ int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int i if (len < 0) { brokenpipe: PDEBUG(DEBUG_LOG, "Broken pipe on socket %d. (errno=%d).\n", admin->sock, errno); - free_connection(admin); - return 0; - } - if (len == 0) { end: - /*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); } } @@ -1130,16 +1174,16 @@ int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int i free_connection(admin); return 0; } + if (len == 0) + goto end; if (len != sizeof(msg)) { PERROR("Short/long read on socket %d. (len=%d != size=%d).\n", admin->sock, len, sizeof(msg)); - free_connection(admin); - return 0; + goto end; } /* process socket command */ if (admin->response && msg.message != ADMIN_MESSAGE) { PERROR("Data from socket %d while sending response.\n", admin->sock); - free_connection(admin); - return 0; + goto end; } switch (msg.message) { case ADMIN_REQUEST_CMD_INTERFACE: @@ -1199,7 +1243,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; } @@ -1209,15 +1253,13 @@ int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int i if (admin_call(admin, &msg) < 0) { PERROR("Failed to create call for socket %d.\n", admin->sock); response_error: - free_connection(admin); - return 0; + goto end; } break; default: PERROR("Invalid message %d from socket %d.\n", msg.message, admin->sock); - free_connection(admin); - return 0; + goto end; } }