X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=socket_server.c;h=7bb69fcc8ffe11891d75a204f4fe096bd98b2e92;hp=5ad827fa35a2601ecc41a31a53995c6670628360;hb=04fc928a2c5f0262e85c09cced1ef20a9fd15f3d;hpb=d9d954e58d6acf8c3de95402110e691f0bc29688 diff --git a/socket_server.c b/socket_server.c index 5ad827f..7bb69fc 100644 --- a/socket_server.c +++ b/socket_server.c @@ -9,51 +9,42 @@ ** ** \*****************************************************************************/ -#include -//#include -//#include -#include -//#include -//#include -//#include -//#include -#include -//#include -//#include -//#include -//#include +#include "main.h" #include #include #include -#include "main.h" +#ifdef PACKAGE_VERSION +#undef PACKAGE_VERSION +#endif +#include "config.h" -char *socket_name = SOCKET_NAME; +char socket_name[128]; int sock = -1; struct sockaddr_un sock_address; struct admin_list *admin_first = NULL; +static struct lcr_fd admin_fd; + +int admin_handle(struct lcr_fd *fd, unsigned int what, void *instance, int index); /* * initialize admin socket */ int admin_init(void) { - unsigned long on = 1; - /* open and bind socket */ - if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) - { + if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { PERROR("Failed to create admin socket. (errno=%d)\n", errno); return(-1); } fhuse++; memset(&sock_address, 0, sizeof(sock_address)); + SPRINT(socket_name, SOCKET_NAME, options.lock); sock_address.sun_family = AF_UNIX; UCPY(sock_address.sun_path, socket_name); unlink(socket_name); - if (bind(sock, (struct sockaddr *)(&sock_address), SUN_LEN(&sock_address)) < 0) - { + if (bind(sock, (struct sockaddr *)(&sock_address), SUN_LEN(&sock_address)) < 0) { close(sock); unlink(socket_name); fhuse--; @@ -61,8 +52,7 @@ int admin_init(void) PERROR("Failed to bind admin socket to \"%s\". (errno=%d)\n", sock_address.sun_path, errno); return(-1); } - if (listen(sock, 5) < 0) - { + if (listen(sock, 5) < 0) { close(sock); unlink(socket_name); fhuse--; @@ -70,68 +60,85 @@ int admin_init(void) PERROR("Failed to listen to socket \"%s\". (errno=%d)\n", sock_address.sun_path, errno); return(-1); } - if (ioctl(sock, FIONBIO, (unsigned char *)(&on)) < 0) - { - close(sock); - unlink(socket_name); - fhuse--; - sock = -1; - PERROR("Failed to set socket \"%s\" into non-blocking mode. (errno=%d)\n", sock_address.sun_path, errno); - return(-1); + memset(&admin_fd, 0, sizeof(admin_fd)); + admin_fd.fd = sock; + register_fd(&admin_fd, LCR_FD_READ | LCR_FD_EXCEPT, admin_handle, NULL, 0); + if (chmod(socket_name, options.socketrights) < 0) { + PERROR("Failed to change socket rights to %d. (errno=%d)\n", options.socketrights, errno); } + if (chown(socket_name, options.socketuser, options.socketgroup) < 0) { + PERROR("Failed to change socket user/group to %d/%d. (errno=%d)\n", options.socketuser, options.socketgroup, errno); + } + return(0); } /* * 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; - - /* free remote joins */ - if (admin->remote_name[0]) - { - 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 */ + class Port *port, *portnext; + class Premote *remote; + struct admin_list **adminp; + + /* free remote ports */ + if (admin->remote_name[0]) { + start_trace(-1, + NULL, + NULL, + NULL, + DIRECTION_NONE, + 0, + 0, + "REMOTE APP release"); + add_trace("app", "name", "%s", admin->remote_name); + end_trace(); + /* 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 */ + } } - join = joinnext; + port = portnext; } } - if (admin->sock >= 0) - { + if (admin->sock >= 0) { + unregister_fd(&admin->fd); close(admin->sock); fhuse--; } -// printf("new\n", response); response = admin->response; - while (response) - { -//#warning -// printf("%x\n", response); + while (response) { temp = response->next; FREE(response, 0); memuse--; response = (struct admin_queue *)temp; } -// printf("new2\n", response); + + adminp = &admin_first; + while(*adminp) { + if (*adminp == admin) + break; + adminp = &((*adminp)->next); + } + if (*adminp) + *adminp = (*adminp)->next; + FREE(admin, 0); -// printf("new3\n", response); memuse--; } @@ -144,19 +151,19 @@ void admin_cleanup(void) struct admin_list *admin, *next;; admin = admin_first; - while(admin) - { -//printf("clean\n"); + while(admin) { next = admin->next; free_connection(admin); admin = next; } - if (sock >= 0) - { + if (sock >= 0) { + unregister_fd(&admin_fd); close(sock); fhuse--; } + + unlink(socket_name); } @@ -166,17 +173,15 @@ void admin_cleanup(void) int admin_interface(struct admin_queue **responsep) { struct admin_queue *response; /* response pointer */ - char *err_txt = ""; + const char *err_txt = ""; int err = 0; - if (read_interfaces()) - { + if (read_interfaces()) { relink_interfaces(); free_interfaces(interface_first); interface_first = interface_newlist; interface_newlist = NULL; - } else - { + } else { err_txt = interface_error; err = -1; } @@ -193,7 +198,6 @@ int admin_interface(struct admin_queue **responsep) /* attach to response chain */ *responsep = response; responsep = &response->next; - return(0); } @@ -215,20 +219,17 @@ int admin_route(struct admin_queue **responsep) #if 0 n = 0; apppbx = apppbx_first; - while(apppbx) - { + while(apppbx) { n++; apppbx = apppbx->next; } - if (apppbx_first) - { + if (apppbx_first) { SPRINT(err_txt, "Cannot reload routing, because %d endpoints active\n", n); err = -1; goto response; } #endif - if (!(ruleset_new = ruleset_parse())) - { + if (!(ruleset_new = ruleset_parse())) { SPRINT(err_txt, ruleset_error); err = -1; goto response; @@ -236,27 +237,20 @@ int admin_route(struct admin_queue **responsep) ruleset_free(ruleset_first); ruleset_first = ruleset_new; ruleset_main = getrulesetbyname("main"); - if (!ruleset_main) - { + if (!ruleset_main) { SPRINT(err_txt, "Ruleset reloaded, but rule 'main' not found.\n"); err = -1; } apppbx = apppbx_first; - while(apppbx) - { - if (apppbx->e_action) - { - switch(apppbx->e_action->index) - { + while(apppbx) { + if (apppbx->e_action) { + switch(apppbx->e_action->index) { case ACTION_INTERNAL: apppbx->e_action = &action_internal; break; 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; @@ -266,15 +260,14 @@ int admin_route(struct admin_queue **responsep) default: goto release; } - } else if (apppbx->e_state != EPOINT_STATE_CONNECT) - { + } else if (apppbx->e_state != EPOINT_STATE_CONNECT) { release: - apppbx->e_callback = 0; + unsched_timer(&apppbx->e_callback_timeout); apppbx->e_action = NULL; - apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL); - start_trace(0, + apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0); + start_trace(-1, NULL, - numberrize_callerinfo(apppbx->e_callerinfo.id, apppbx->e_callerinfo.ntype), + numberrize_callerinfo(apppbx->e_callerinfo.id, apppbx->e_callerinfo.ntype, options.national, options.international), apppbx->e_dialinginfo.id, DIRECTION_NONE, CATEGORY_EP, @@ -283,7 +276,7 @@ int admin_route(struct admin_queue **responsep) end_trace(); } - apppbx->e_action_timeout = NULL; + unsched_timer(&apppbx->e_action_timeout); apppbx->e_rule = NULL; apppbx->e_ruleset = NULL; @@ -304,7 +297,6 @@ int admin_route(struct admin_queue **responsep) /* attach to response chain */ *responsep = response; responsep = &response->next; - return(0); } @@ -326,8 +318,7 @@ int admin_dial(struct admin_queue **responsep, char *message) response->am[0].message = ADMIN_RESPONSE_CMD_DIAL; /* process request */ - if (!(p = strchr(message,':'))) - { + if (!(p = strchr(message,':'))) { response->am[0].u.x.error = -EINVAL; SPRINT(response->am[0].u.x.message, "no seperator ':' in message to seperate number from extension"); goto out; @@ -335,8 +326,7 @@ int admin_dial(struct admin_queue **responsep, char *message) *p++ = 0; /* modify extension */ - if (!read_extension(&ext, message)) - { + if (!read_extension(&ext, message)) { response->am[0].u.x.error = -EINVAL; SPRINT(response->am[0].u.x.message, "extension doesn't exist"); goto out; @@ -389,12 +379,11 @@ int admin_block(struct admin_queue **responsep, int portnum, int block) response->am[0].u.x.portnum = portnum; /* search for port */ + ifport = NULL; interface = interface_first; - while(interface) - { + while(interface) { ifport = interface->ifport; - while(ifport) - { + while(ifport) { if (ifport->portnum == portnum) break; ifport = ifport->next; @@ -404,31 +393,28 @@ int admin_block(struct admin_queue **responsep, int portnum, int block) interface = interface->next; } /* not found, we return -1 */ - if (!ifport) - { + if (!ifport) { response->am[0].u.x.block = -1; response->am[0].u.x.error = 1; SPRINT(response->am[0].u.x.message, "Port %d does not exist.", portnum); goto out; } +#ifdef WITH_MISDN /* no interface */ - if (!ifport->mISDNport) - { + if (!ifport->mISDNport) { /* not loaded anyway */ - if (block >= 2) - { + if (block >= 2) { response->am[0].u.x.block = 2; goto out; } /* try loading interface */ ifport->block = block; - load_port(ifport); + load_mISDN_port(ifport); /* port cannot load */ - if (ifport->block >= 2) - { + if (ifport->block >= 2) { response->am[0].u.x.block = 2; response->am[0].u.x.error = 1; SPRINT(response->am[0].u.x.message, "Port %d will not load.", portnum); @@ -441,13 +427,13 @@ int admin_block(struct admin_queue **responsep, int portnum, int block) } /* if we shall unload interface */ - if (block >= 2) - { + if (block >= 2) { mISDNport_close(ifport->mISDNport); ifport->mISDNport = 0; ifport->block = 2; goto out; } +#endif /* port new blocking state */ ifport->block = response->am[0].u.x.block = block; @@ -465,7 +451,7 @@ int admin_block(struct admin_queue **responsep, int portnum, int block) */ int admin_release(struct admin_queue **responsep, char *message) { - unsigned long id; + unsigned int id; struct admin_queue *response; /* response pointer */ class EndpointAppPBX *apppbx; @@ -478,21 +464,19 @@ int admin_release(struct admin_queue **responsep, char *message) id = atoi(message); apppbx = apppbx_first; - while(apppbx) - { + while(apppbx) { if (apppbx->ea_endpoint->ep_serial == id) break; apppbx = apppbx->next; } - if (!apppbx) - { + if (!apppbx) { response->am[0].u.x.error = -EINVAL; SPRINT(response->am[0].u.x.message, "Given endpoint %d doesn't exist.", id); goto out; } - apppbx->e_callback = 0; - apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL); + unsched_timer(&apppbx->e_callback_timeout); + apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, 0); out: /* attach to response chain */ @@ -512,18 +496,17 @@ 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; - SCPY(apppbx->e_callerinfo.id, nationalize_callerinfo(msg->u.call.callerid, &apppbx->e_callerinfo.ntype)); + SCPY(apppbx->e_callerinfo.id, nationalize_callerinfo(msg->u.call.callerid, &apppbx->e_callerinfo.ntype, options.national, options.international)); if (msg->u.call.present) apppbx->e_callerinfo.present = INFO_PRESENT_ALLOWED; else apppbx->e_callerinfo.present = INFO_PRESENT_RESTRICTED; apppbx->e_callerinfo.screen = INFO_SCREEN_NETWORK; -//printf("hh=%d\n", apppbx->e_capainfo.hlc); apppbx->e_capainfo.bearer_capa = msg->u.call.bc_capa; apppbx->e_capainfo.bearer_mode = msg->u.call.bc_mode; @@ -535,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); } @@ -543,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, 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 */ @@ -552,8 +535,7 @@ void admin_call_response(int adminid, int message, char *connected, int cause, i * maybe there is no admin instance, because the calling port was not * initiated by admin_call */ admin = admin_first; - while(admin) - { + while(admin) { if (adminid == admin->sockserial) break; admin = admin->next; @@ -564,8 +546,7 @@ void admin_call_response(int adminid, int message, char *connected, int cause, i /* seek to end of response list */ response = admin->response; responsep = &admin->response; - while(response) - { + while(response) { responsep = &response->next; response = response->next; } @@ -576,135 +557,141 @@ void admin_call_response(int adminid, int message, char *connected, int cause, i response->num = 1; /* message */ response->am[0].message = message; -// printf("MESSAGE: %d\n", message); 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; responsep = &response->next; + admin->fd.when |= LCR_FD_WRITE; } /* * send data to the remote socket join instance */ -int admin_message_to_join(struct admin_msg *msg, char *remote_name, int sock_id) +int admin_message_to_lcr(struct admin_msg *msg, struct admin_list *admin) { - class Join *join; - struct admin_list *admin; + class Port *port; + class Premote *remote = NULL; /* make GCC happy */ + struct interface *interface; + struct admin_list *temp; /* hello message */ - if (msg->type == MESSAGE_HELLO) - { - if (remote_name[0]) - { + if (msg->type == MESSAGE_HELLO) { + if (admin->remote_name[0]) { PERROR("Remote application repeats hello message.\n"); return(-1); } /* look for second application */ - admin = admin_first; - while(admin) - { - if (!strcmp(admin->remote_name, msg->param.hello.application)) + temp = admin_first; + while(temp) { + if (!strcmp(temp->remote_name, msg->param.hello.application)) break; - admin = admin->next; + temp = temp->next; } - if (admin) - { + if (temp) { PERROR("Remote application connects twice??? (ignoring)\n"); return(-1); } /* set remote socket instance */ - SCPY(remote_name, msg->param.hello.application); + SCPY(admin->remote_name, msg->param.hello.application); + start_trace(-1, + NULL, + NULL, + NULL, + DIRECTION_NONE, + 0, + 0, + "REMOTE APP registers"); + add_trace("app", "name", "%s", admin->remote_name); + end_trace(); return(0); } /* check we have no application name */ - if (remote_name[0]) - { + if (!admin->remote_name[0]) { PERROR("Remote application did not send us a hello message.\n"); return(-1); } - /* new join */ - if (msg->type == MESSAGE_NEWREF) - { - /* create new join instance */ - join = new JoinRemote(0, remote_name, sock_id); // must have no serial, because no endpoint is connected - if (!join) - FATAL("No memory for remote join instance\n"); - return(0); - } + /* new join. the reply (NEWREF assignment) is sent from constructor */ + if (msg->type == MESSAGE_NEWREF) { + 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; + } + if (!interface) { + union parameter param; + + 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))) - /* 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) - { - /* no ref, but address */ - message_bchannel_from_join(NULL, msg->param.bchannel.type, msg->param.bchannel.handle); + FATAL("Cannot create Port instance.\n"); return(0); } - + /* check for ref */ - if (!msg->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) - { - PERROR("No join found with serial %d.\n", msg->ref); - 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_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 (sock_id != ((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, 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 long 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 *response, **responsep; /* response pointer */ + struct admin_queue **responsep; /* response pointer */ /* searching for admin id * maybe there is no given remote application */ admin = admin_first; - while(admin) - { + while(admin) { if (admin->remote_name[0] && admin->sock==remote_id) break; admin = admin->next; @@ -714,28 +701,22 @@ int admin_message_from_join(int remote_id, unsigned long ref, int message_type, return(-1); /* seek to end of response list */ - response = admin->response; responsep = &admin->response; - while(response) - { - responsep = &response->next; - response = response->next; + while(*responsep) { + responsep = &(*responsep)->next; } /* create state response */ - response = (struct admin_queue *)MALLOC(sizeof(struct admin_queue)+sizeof(admin_message)); + *responsep = (struct admin_queue *)MALLOC(sizeof(struct admin_queue)+sizeof(admin_message)); memuse++; - response->num = 1; + (*responsep)->num = 1; /* message */ - response->am[0].u.msg.type = message_type; - response->am[0].u.msg.ref = ref; - memcpy(&response->am[0].u.msg.param, param, sizeof(union parameter)); - - /* attach to response chain */ - *responsep = response; - responsep = &response->next; - + (*responsep)->am[0].message = ADMIN_MESSAGE; + (*responsep)->am[0].u.msg.type = message_type; + (*responsep)->am[0].u.msg.ref = ref; + memcpy(&(*responsep)->am[0].u.msg.param, param, sizeof(union parameter)); + admin->fd.when |= LCR_FD_WRITE; return(0); } @@ -745,19 +726,23 @@ int admin_message_from_join(int remote_id, unsigned long ref, int message_type, */ 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; + time_t now; /* create state response */ response = (struct admin_queue *)MALLOC(sizeof(struct admin_queue)+sizeof(admin_message)); @@ -768,17 +753,19 @@ int admin_state(struct admin_queue **responsep) /* version */ SCPY(response->am[0].u.s.version_string, VERSION_STRING); /* time */ + time(&now); + now_tm = localtime(&now); memcpy(&response->am[0].u.s.tm, now_tm, sizeof(struct tm)); /* log file */ SCPY(response->am[0].u.s.logfile, options.log); /* interface count */ i = 0; interface = interface_first; - while(interface) - { + while(interface) { ifport = interface->ifport; - while(ifport) - { + if (!ifport) + i++; + while(ifport) { i++; ifport = ifport->next; } @@ -788,8 +775,7 @@ int admin_state(struct admin_queue **responsep) /* remote connection count */ i = 0; admin = admin_first; - while(admin) - { + while(admin) { if (admin->remote_name[0]) i++; admin = admin->next; @@ -798,8 +784,7 @@ int admin_state(struct admin_queue **responsep) /* join count */ join = join_first; i = 0; - while(join) - { + while(join) { i++; join = join->next; } @@ -807,8 +792,7 @@ int admin_state(struct admin_queue **responsep) /* apppbx count */ apppbx = apppbx_first; i = 0; - while(apppbx) - { + while(apppbx) { i++; apppbx = apppbx->next; } @@ -816,8 +800,7 @@ int admin_state(struct admin_queue **responsep) /* port count */ i = 0; port = port_first; - while(port) - { + while(port) { i++; port = port->next; } @@ -826,8 +809,12 @@ int admin_state(struct admin_queue **responsep) *responsep = response; responsep = &response->next; - /* create response for all interfaces */ - num = (response->am[0].u.s.interfaces)+(response->am[0].u.s.joins)+(response->am[0].u.s.epoints)+(response->am[0].u.s.ports); + /* create response for all instances */ + num = (response->am[0].u.s.interfaces) + + (response->am[0].u.s.remotes) + + (response->am[0].u.s.joins) + + (response->am[0].u.s.epoints) + + (response->am[0].u.s.ports); if (num == 0) return(0); response = (struct admin_queue *)MALLOC(sizeof(admin_queue)+(num*sizeof(admin_message))); @@ -837,27 +824,43 @@ int admin_state(struct admin_queue **responsep) responsep = &response->next; interface = interface_first; num = 0; - while(interface) - { + while(interface) { ifport = interface->ifport; - while(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; /* interface */ SCPY(response->am[num].u.i.interface_name, interface->name); /* portnum */ response->am[num].u.i.portnum = ifport->portnum; + /* portname */ + SCPY(response->am[num].u.i.portname, ifport->portname); /* iftype */ response->am[num].u.i.extension = interface->extension; /* block */ response->am[num].u.i.block = ifport->block; - if (ifport->mISDNport) - { +#ifdef WITH_MISDN + if (ifport->mISDNport) { mISDNport = ifport->mISDNport; /* ptp */ response->am[num].u.i.ptp = mISDNport->ptp; + /* l1hold */ + response->am[num].u.i.l1hold = mISDNport->l1hold; + /* l2hold */ + response->am[num].u.i.l2hold = mISDNport->l2hold; /* ntmode */ response->am[num].u.i.ntmode = mISDNport->ntmode; /* pri */ @@ -868,19 +871,63 @@ int admin_state(struct admin_queue **responsep) response->am[num].u.i.l1link = mISDNport->l1link; /* l2link */ response->am[num].u.i.l2link = mISDNport->l2link; + memcpy(response->am[num].u.i.l2mask, mISDNport->l2mask, 16); + /* los */ + response->am[num].u.i.los = mISDNport->los; + /* ais */ + response->am[num].u.i.ais = mISDNport->ais; + /* rdi */ + response->am[num].u.i.rdi = mISDNport->rdi; + /* slip */ + response->am[num].u.i.slip_tx = mISDNport->slip_tx; + 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) - { + while(i < mISDNport->b_num) { response->am[num].u.i.busy[i] = mISDNport->b_state[i]; if (mISDNport->b_port[i]) response->am[num].u.i.port[i] = mISDNport->b_port[i]->p_serial; + response->am[num].u.i.mode[i] = mISDNport->b_mode[i]; i++; } } +#endif num++; ifport = ifport->next; @@ -890,10 +937,8 @@ int admin_state(struct admin_queue **responsep) /* create response for all remotes */ admin = admin_first; - while(admin) - { - if (admin->remote_name[0]) - { + while(admin) { + if (admin->remote_name[0]) { /* message */ response->am[num].message = ADMIN_RESPONSE_S_REMOTE; /* name */ @@ -906,18 +951,16 @@ int admin_state(struct admin_queue **responsep) /* create response for all joins */ join = join_first; - while(join) - { + while(join) { /* message */ response->am[num].message = ADMIN_RESPONSE_S_JOIN; /* 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++; @@ -925,8 +968,7 @@ int admin_state(struct admin_queue **responsep) /* create response for all endpoint */ apppbx = apppbx_first; - while(apppbx) - { + while(apppbx) { /* message */ response->am[num].message = ADMIN_RESPONSE_S_EPOINT; /* serial */ @@ -938,8 +980,7 @@ int admin_state(struct admin_queue **responsep) /* tx notification */ response->am[num].u.e.tx_state = apppbx->e_tx_state; /* state */ - switch(apppbx->e_state) - { + switch(apppbx->e_state) { case EPOINT_STATE_IN_SETUP: response->am[num].u.e.state = ADMIN_STATE_IN_SETUP; break; @@ -992,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++; @@ -1002,8 +1045,7 @@ int admin_state(struct admin_queue **responsep) /* create response for all ports */ port = port_first; - while(port) - { + while(port) { /* message */ response->am[num].message = ADMIN_RESPONSE_S_PORT; /* serial */ @@ -1013,8 +1055,7 @@ int admin_state(struct admin_queue **responsep) /* epoint */ response->am[num].u.p.epoint = ACTIVE_EPOINT(port->p_epointlist); /* state */ - switch(port->p_state) - { + switch(port->p_state) { case PORT_STATE_IN_SETUP: response->am[num].u.p.state = ADMIN_STATE_IN_SETUP; break; @@ -1048,18 +1089,22 @@ int admin_state(struct admin_queue **responsep) case PORT_STATE_OUT_DISCONNECT: response->am[num].u.p.state = ADMIN_STATE_OUT_DISCONNECT; break; + case PORT_STATE_RELEASE: + response->am[num].u.p.state = ADMIN_STATE_RELEASE; + break; 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++; @@ -1071,252 +1116,175 @@ int sockserial = 1; // must start with 1, because 0 is used if no serial is set /* * handle admin socket (non blocking) */ -int admin_handle(void) +int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int index); + +int admin_handle(struct lcr_fd *fd, unsigned int what, void *instance, int index) { - struct admin_list *admin, **adminp; - void *temp; - struct admin_message msg; - int len; int new_sock; socklen_t sock_len = sizeof(sock_address); - unsigned long on = 1; - int work = 0; /* if work was done */ - struct Endpoint *epoint; - - if (sock < 0) - return(0); + struct admin_list *admin; /* check for new incoming connections */ - if ((new_sock = accept(sock, (struct sockaddr *)&sock_address, &sock_len)) >= 0) - { - work = 1; + if ((new_sock = accept(sock, (struct sockaddr *)&sock_address, &sock_len)) >= 0) { /* insert new socket */ admin = (struct admin_list *)MALLOC(sizeof(struct admin_list)); - if (ioctl(new_sock, FIONBIO, (unsigned char *)(&on)) >= 0) - { -//#warning -// PERROR("DEBUG incoming socket %d, serial=%d\n", new_sock, sockserial); - memuse++; - fhuse++; - admin->sockserial = sockserial++; - admin->next = admin_first; - admin_first = admin; - admin->sock = new_sock; - } else { - close(new_sock); - FREE(admin, sizeof(struct admin_list)); - } - } else - { - if (errno != EWOULDBLOCK) - { + memuse++; + fhuse++; + admin->sockserial = sockserial++; + admin->next = admin_first; + admin_first = admin; + admin->sock = new_sock; + admin->fd.fd = new_sock; + register_fd(&admin->fd, LCR_FD_READ | LCR_FD_EXCEPT, admin_handle_con, admin, 0); + } else { + if (errno != EWOULDBLOCK) { PERROR("Failed to accept connection from socket \"%s\". (errno=%d) Closing socket.\n", sock_address.sun_path, errno); admin_cleanup(); - return(1); + return 0; } } - /* loop all current socket connections */ - admin = admin_first; - adminp = &admin_first; - while(admin) - { + return 0; +} + +int admin_handle_con(struct lcr_fd *fd, unsigned int what, void *instance, int index) +{ + struct admin_list *admin = (struct admin_list *)instance; + void *temp; + struct admin_message msg; + int len; + struct Endpoint *epoint; + + if ((what & LCR_FD_READ)) { /* read command */ len = read(admin->sock, &msg, sizeof(msg)); - if (len < 0) - { - if (errno != EWOULDBLOCK) - { - work = 1; - brokenpipe: - printf("Broken pipe on socket %d. (errno=%d).\n", admin->sock, errno); - PDEBUG(DEBUG_LOG, "Broken pipe on socket %d. (errno=%d).\n", admin->sock, errno); - *adminp = admin->next; - free_connection(admin); - admin = *adminp; - continue; - } - goto send_data; - } - work = 1; -//#warning -//PERROR("DEBUG socket %d got data. serial=%d\n", admin->sock, admin->sockserial); - if (len == 0) - { + if (len < 0) { + brokenpipe: + PDEBUG(DEBUG_LOG, "Broken pipe on socket %d. (errno=%d).\n", admin->sock, errno); end: - /*release endpoint if exists */ - if (admin->epointid) - { + if (admin->epointid) { epoint = find_epoint_id(admin->epointid); - if (epoint) - { - ((class DEFAULT_ENDPOINT_APP *)epoint->ep_app)-> - release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL); + 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); } } -//#warning -//PERROR("DEBUG socket %d closed by remote.\n", admin->sock); - *adminp = admin->next; free_connection(admin); - admin = *adminp; -//PERROR("DEBUG (admin_first=%x)\n", admin_first); - continue; + return 0; } - if (len != sizeof(msg)) - { + 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)); - *adminp = admin->next; - free_connection(admin); - admin = *adminp; - continue; + goto end; } /* process socket command */ - if (admin->response) - { + if (admin->response && msg.message != ADMIN_MESSAGE) { PERROR("Data from socket %d while sending response.\n", admin->sock); - *adminp = admin->next; - free_connection(admin); - admin = *adminp; - continue; + goto end; } - switch (msg.message) - { + switch (msg.message) { case ADMIN_REQUEST_CMD_INTERFACE: - if (admin_interface(&admin->response) < 0) - { + if (admin_interface(&admin->response) < 0) { PERROR("Failed to create dial response for socket %d.\n", admin->sock); goto response_error; } + admin->fd.when |= LCR_FD_WRITE; break; case ADMIN_REQUEST_CMD_ROUTE: - if (admin_route(&admin->response) < 0) - { + if (admin_route(&admin->response) < 0) { PERROR("Failed to create dial response for socket %d.\n", admin->sock); goto response_error; } + admin->fd.when |= LCR_FD_WRITE; break; case ADMIN_REQUEST_CMD_DIAL: - if (admin_dial(&admin->response, msg.u.x.message) < 0) - { + if (admin_dial(&admin->response, msg.u.x.message) < 0) { PERROR("Failed to create dial response for socket %d.\n", admin->sock); goto response_error; } + admin->fd.when |= LCR_FD_WRITE; break; case ADMIN_REQUEST_CMD_RELEASE: - if (admin_release(&admin->response, msg.u.x.message) < 0) - { + if (admin_release(&admin->response, msg.u.x.message) < 0) { PERROR("Failed to create release response for socket %d.\n", admin->sock); goto response_error; } + admin->fd.when |= LCR_FD_WRITE; break; case ADMIN_REQUEST_STATE: - if (admin_state(&admin->response) < 0) - { + if (admin_state(&admin->response) < 0) { PERROR("Failed to create state response for socket %d.\n", admin->sock); goto response_error; } + admin->fd.when |= LCR_FD_WRITE; break; case ADMIN_TRACE_REQUEST: - if (admin_trace(admin, &msg.u.trace_req) < 0) - { + if (admin_trace(admin, &msg.u.trace_req) < 0) { PERROR("Failed to create trace response for socket %d.\n", admin->sock); goto response_error; } + admin->fd.when |= LCR_FD_WRITE; break; case ADMIN_REQUEST_CMD_BLOCK: - if (admin_block(&admin->response, msg.u.x.portnum, msg.u.x.block) < 0) - { + if (admin_block(&admin->response, msg.u.x.portnum, msg.u.x.block) < 0) { PERROR("Failed to create block response for socket %d.\n", admin->sock); goto response_error; } + admin->fd.when |= LCR_FD_WRITE; break; case ADMIN_MESSAGE: - if (admin_message_to_join(&msg.u.msg, admin->remote_name, admin->sock) < 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; } -#if 0 -#warning DEBUGGING -{ - struct admin_queue *response; - printf("Chain: "); - response = admin->response; - while(response) - { - printf("%c", '0'+response->am[0].message); - response=response->next; - } - printf("\n"); -} -#endif break; case ADMIN_CALL_SETUP: - if (admin_call(admin, &msg) < 0) - { + if (admin_call(admin, &msg) < 0) { PERROR("Failed to create call for socket %d.\n", admin->sock); response_error: - *adminp = admin->next; - free_connection(admin); - admin = *adminp; - continue; + goto end; } break; default: PERROR("Invalid message %d from socket %d.\n", msg.message, admin->sock); - *adminp = admin->next; - free_connection(admin); - admin = *adminp; - continue; + goto end; } + } + + if ((what & LCR_FD_WRITE)) { /* write queue */ - send_data: - if (admin->response) - { -//#warning -//PERROR("DEBUG socket %d sending data.\n", admin->sock); + if (admin->response) { len = write(admin->sock, ((unsigned char *)(admin->response->am))+admin->response->offset, sizeof(struct admin_message)*(admin->response->num)-admin->response->offset); - if (len < 0) - { - if (errno != EWOULDBLOCK) - { - work = 1; - goto brokenpipe; - } - goto next; + if (len < 0) { + goto brokenpipe; } - work = 1; if (len == 0) goto end; - if (len < (int)(sizeof(struct admin_message)*(admin->response->num)-admin->response->offset)) - { + if (len < (int)(sizeof(struct admin_message)*(admin->response->num) - admin->response->offset)) { admin->response->offset+=len; - goto next; - } else - { + return 0; + } else { temp = admin->response; admin->response = admin->response->next; FREE(temp, 0); memuse--; } - } - /* done with socket instance */ - next: - adminp = &admin->next; - admin = admin->next; + } else + admin->fd.when &= ~LCR_FD_WRITE; } - return(work); + return 0; }