From 003dcbcf2a588cc14d7fba5183b51fe085c2d119 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 3 Oct 2005 22:21:51 +0000 Subject: [PATCH] removing in favor of new router code git-svn-id: svn://svn.open-ils.org/ILS/trunk@1893 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- OpenSRF/src/router/router.c | 1220 ----------------------------------- OpenSRF/src/router/router.h | 266 -------- 2 files changed, 1486 deletions(-) delete mode 100644 OpenSRF/src/router/router.c delete mode 100644 OpenSRF/src/router/router.h diff --git a/OpenSRF/src/router/router.c b/OpenSRF/src/router/router.c deleted file mode 100644 index 71fe7454b9..0000000000 --- a/OpenSRF/src/router/router.c +++ /dev/null @@ -1,1220 +0,0 @@ -#include "router.h" -#include -#include - -#define ROUTER_MAX_MSGS_PER_PACKET 256 -char* router_resource; -transport_router_registrar* routt; -void _build_trusted_sites( transport_router_registrar* router ); - - -void sig_hup_handler( int a ) { - router_registrar_free( routt ); - osrfConfigCleanup(); - log_free(); - free( router_resource ); - exit(0); -} - - -int main( int argc, char* argv[] ) { - - if( argc < 2 ) { - fatal_handler( "Usage: %s ", argv[0] ); - exit(0); - } - - osrfConfig* cfg = osrfConfigInit( argv[1], "router" ); - osrfConfigSetDefaultConfig(cfg); - - init_proc_title( argc, argv ); - set_proc_title( "OpenSRF Router" ); - - /* load the config options */ - char* server = osrfConfigGetValue(NULL, "/transport/server"); - char* port = osrfConfigGetValue(NULL, "/transport/port"); - char* unixpath = osrfConfigGetValue(NULL, "/transport/unixpath"); - char* username = osrfConfigGetValue(NULL, "/transport/username"); - char* password = osrfConfigGetValue(NULL, "/transport/password"); - router_resource = osrfConfigGetValue(NULL, "/transport/resource"); - char* con_timeout = osrfConfigGetValue(NULL, "/transport/connect_timeout" ); - char* max_retries = osrfConfigGetValue(NULL, "/transport/max_reconnect_attempts" ); - char* component = osrfConfigGetValue(NULL, "/component" ); - - fprintf(stderr, "Router connecting with uname %s, server %s, port %s, unixpath %s", - username, server, port, unixpath ); - - /* set up the logger */ - char* level = osrfConfigGetValue(NULL, "/loglevel"); - char* log_file = osrfConfigGetValue(NULL, "/logfile"); - - int llevel = atoi(level); - fprintf(stderr, "Level %d; file %s\n", llevel, log_file ); - - if(!log_init( llevel, log_file )) - fprintf(stderr, "Unable to init logging, going to stderr...\n" ); - - - free(level); - free(log_file); - - fprintf(stderr, "Router connecting as \nserver: %s \nport: %s \nunixpath: %s\nuser:%s \nresource:%s\n", - server, port, unixpath, username, router_resource ); - - int iport = 0; - if(port) iport = atoi( port ); - - int con_itimeout = atoi( con_timeout ); - int max_retries_ = atoi(max_retries); - int icomponent = 0; - if(component) - icomponent = atoi(component); - - /* build the router_registrar */ - transport_router_registrar* router_registrar = - router_registrar_init( server, iport, unixpath, username, password, router_resource, 0, con_itimeout, icomponent ); - - routt = router_registrar; - - free(server); - free(port); - free(unixpath); - free(username); - free(password); - free(con_timeout); - free(max_retries); - - daemonize(); - - signal(SIGHUP,sig_hup_handler); - signal(SIGINT,sig_hup_handler); - signal(SIGTERM,sig_hup_handler); - - - int counter = 0; - /* wait for incoming... */ - while( ++counter <= max_retries_ ) { - - /* connect to jabber */ - if( router_registrar_connect( router_registrar ) ) { - info_handler( "Connected..." ); - fprintf(stderr, "- Connected -\n"); - counter = 0; - listen_loop( router_registrar ); - } else - fatal_handler( "Could not connect to Jabber Server" ); - - /* this should never happen */ - warning_handler( "Jabber server probably went away, attempting reconnect" ); - - sleep(5); - } - - - router_registrar_free( router_registrar ); - return 1; - -} - -transport_router_registrar* router_registrar_init( char* server, - int port, char* unixpath, char* username, char* password, - char* resource, int client_timeout, int con_timeout, int component ) { - - if( server == NULL ) { return NULL; } - - /* allocate a new router_registrar object */ - size_t size = sizeof( transport_router_registrar ); - transport_router_registrar* router_registrar = (transport_router_registrar*) safe_malloc( size ); - - router_registrar->client_timeout = client_timeout; - router_registrar->jabber = jabber_connect_init( server, port, unixpath, username, password, resource, con_timeout, component ); - _build_trusted_sites( router_registrar ); - - return router_registrar; -} - -void _build_trusted_sites( transport_router_registrar* router ) { - - router->trusted_servers = osrfNewStringArray(4); - router->trusted_clients = osrfNewStringArray(4); - osrfConfigGetValueList(NULL, router->trusted_servers, "/trusted_domains/server" ); - osrfConfigGetValueList(NULL, router->trusted_clients, "/trusted_domains/client" ); - - if(router->trusted_servers->size < 1 || - router->trusted_clients->size < 1 ) - fatal_handler( "You must specify at least one trusted server and client in the config file"); -} - - -jabber_connect* jabber_connect_init( - char* server, int port, char* unixpath, char* username, - char* password, char* resource, int connect_timeout, int component ) { - - size_t len = sizeof(jabber_connect); - jabber_connect* jabber = (jabber_connect*) safe_malloc( len ); - - jabber->port = port; - jabber->connect_timeout = connect_timeout; - jabber->unixpath = strdup(unixpath); - - jabber->server = strdup(server); - jabber->username = strdup(username); - jabber->password = strdup(password); - jabber->resource = strdup(resource); - - if( jabber->server == NULL || jabber->username == NULL || - jabber->password == NULL || jabber->resource == NULL ) { - fatal_handler( "jabber_init(): Out of Memory" ); - return NULL; - } - - /* build the transport client */ - jabber->t_client = client_init( jabber->server, jabber->port, unixpath, component ); - - return jabber; -} - -/* connect the router_registrar to jabber */ -int router_registrar_connect( transport_router_registrar* router ) { - return j_connect( router->jabber ); -} - -/* connect a jabber_connect object jabber */ -int j_connect( jabber_connect* jabber ) { - if( jabber == NULL ) { return 0; } - return client_connect( jabber->t_client, - jabber->username, jabber->password, jabber->resource, - jabber->connect_timeout, AUTH_DIGEST ); -} - -int fill_fd_set( transport_router_registrar* router, fd_set* set ) { - - int max_fd; - FD_ZERO(set); - - int router_fd = router->jabber->t_client->session->sock_id; - max_fd = router_fd; - FD_SET( router_fd, set ); - - while(1) { - - server_class_node* cur_node = router->server_class_list; - while( cur_node != NULL ) { - int cur_class_fd = cur_node->jabber->t_client->session->sock_id; - - if( check_fd(cur_class_fd) < 0 ) { - warning_handler("Found a dead node for %s", cur_node->server_class); - remove_server_class( router, cur_node ); - break; - - } else { - if( cur_class_fd > max_fd ) max_fd = cur_class_fd; - FD_SET( cur_class_fd, set ); - } - cur_node = cur_node->next; - } - if( cur_node == NULL ) break; - } - - FD_CLR( 0, set ); - return max_fd; -} - -int check_fd( int fd ) { - - fd_set tmpset; - FD_ZERO(&tmpset); - FD_SET(fd, &tmpset); - - struct timeval tv; - tv.tv_sec = 0; - tv.tv_usec = 0; - - return select(fd + 1, &tmpset, NULL, NULL, &tv); -} - - -void listen_loop( transport_router_registrar* router ) { - - if( router == NULL ) - return; - - int select_ret; - int router_fd = router->jabber->t_client->session->sock_id; - transport_message* cur_msg; - - while(1) { - - fd_set listen_set; - int max_fd = fill_fd_set( router, &listen_set ); - - if( max_fd < 1 ) - fatal_handler( "fill_fd_set return bogus max_fd: %d", max_fd ); - - int num_handled = 0; - info_handler( "Router going into select() wait..." ); - - if( (select_ret=select(max_fd+ 1, &listen_set, NULL, NULL, NULL)) < 0 ) { - - warning_handler( "Select returned error %d", select_ret ); - warning_handler( "Select Error %d on fd %d", errno ); - perror( "Select Error" ); - warning_handler( "Errors: EBADF %d, EINTR %d, EINVAL %d, ENOMEM %d", - EBADF, EINTR, EINVAL, ENOMEM ); - continue; - - } else { - - info_handler( "Select returned %d", select_ret ); - - if( FD_ISSET( router_fd, &listen_set ) ) { - cur_msg = client_recv( router->jabber->t_client, 1 ); - - /* We only process a message if we have some trusted servers and the current - message came from one of those servers */ - if(cur_msg) { - - if( router->trusted_servers->size > 0 ) { - - int i = 0; - int found = 0; - - if( cur_msg->sender ) { - - int len = strlen(cur_msg->sender) + 1; /* there's no way it could be that big, but... */ - char server_buf[len]; - memset(server_buf,0,len); - jid_get_domain( cur_msg->sender, server_buf ); - info_handler("Received top level message from %s", server_buf ); - - while(1) { - char* domain = osrfStringArrayGetString(router->trusted_servers, i); - if(domain) { - if(!strcmp(domain, server_buf)) { - found = 1; - break; - } - } - i++; - } - } - - if(found) - router_registrar_handle_msg( router, cur_msg ); - else - warning_handler( "Received top level message from unpriveleged sender %s", cur_msg->sender ); - } - - message_free( cur_msg ); - } - - if( ++num_handled == select_ret ) - continue; - } - - /* cycle through the children and find any whose fd's are ready for reading */ - server_class_node* cur_node = router->server_class_list; - while( cur_node != NULL ) { - debug_handler( "Checking File Descriptor" ); - int cur_fd = cur_node->jabber->t_client->session->sock_id; - - debug_handler("Router checking file descriptor %d", cur_fd); - - if( FD_ISSET(cur_fd, &listen_set) ) { - ++num_handled; - FD_CLR(cur_fd,&listen_set); - - debug_handler("Router has data on file descriptor %d", cur_fd); - cur_msg = client_recv( cur_node->jabber->t_client, 1 ); - - if(cur_msg) { - - info_handler( "%s received from %s", cur_node->server_class, cur_msg->sender ); - int handle_ret = server_class_handle_msg( router, cur_node, cur_msg ); - - if( handle_ret == -1 ) { - warning_handler( "server_class_handle_msg() returned -1" ); - cur_node = router->server_class_list; /*start over*/ - continue; - - } else if( handle_ret == 0 ) { - /* delete and continue */ - warning_handler( "server_class_handle_msg() returned 0" ); - remove_server_class( router, cur_node ); - debug_handler( "Removed Server Class" ); - cur_node = router->server_class_list; /*start over*/ - continue; - } - - info_handler( "%s handled message successfully", cur_node->server_class ); - /* dont free message here */ - if( num_handled == select_ret ) - break; - } - - } - - if( num_handled == select_ret ) - break; - - cur_node = cur_node->next; - - } /* cycling through the server_class list */ - - } /* no select errors */ - } -} - - -/* determine where to route top level messages */ -int router_registrar_handle_msg( transport_router_registrar* router_registrar, transport_message* msg ) { - - info_handler( "Received class: %s : command %s ", msg->router_class, msg->router_command ); - - if( router_registrar == NULL || msg == NULL ) { return 0; } - - if( msg->router_command == NULL || !strcmp(msg->router_command,"") ) { - return router_registrar_handle_app_request( router_registrar, msg ); - } - - // user issued a ruoter query - /* a query command has router_command="query" and the actual query type - is the content of the message */ - if( !strcmp(msg->router_command,"query")) { - info_handler( "Router received query command" ); - - // user issues a servers query - if( !strcmp(msg->body, "servers")) { - - info_handler( "Router received servers query command" ); - router_return_server_info( router_registrar, msg ); - return 1; - } - } - - - info_handler("Looking for server_class_node %s...",msg->router_class); - server_class_node* active_class_node = find_server_class( router_registrar, msg->router_class ); - - if( active_class_node == NULL ) { - info_handler("Could not find server_class_node %s, creating one.",msg->router_class); - - /* there is no server_class for msg->router_class so we build it here */ - if( strcmp( msg->router_command, "register") == 0 ) { - - info_handler("Adding server_class_node for %s",msg->router_class); - active_class_node = - init_server_class( router_registrar, msg->sender, msg->router_class ); - - if( active_class_node == NULL ) { - fatal_handler( "router_listen(): active_class_node == NULL for %s", msg->sender ); - return 0; - } - - if (router_registrar->server_class_list != NULL) { - active_class_node->next = router_registrar->server_class_list; - router_registrar->server_class_list->prev = active_class_node; - } - router_registrar->server_class_list = active_class_node; - - //spawn_server_class( (void*) active_class_node ); - - } else { - warning_handler( "router_register_handler_msg(): Bad Command [%s] for class [%s]", - msg->router_command, msg->router_class ); - } - - } else if( strcmp( msg->router_command, "register") == 0 ) { - /* there is a server_class for msg->router_class so we - need to either add a new server_node or update the existing one */ - - - server_node* s_node = find_server_node( active_class_node, msg->sender ); - - if( s_node != NULL ) { - s_node->available = 1; - s_node->upd_time = time(NULL); - info_handler( "Found matching registered server: %s. Updating.", - s_node->remote_id ); - } else { - s_node = init_server_node( msg->sender ); - - info_handler( "Adding server_node for: %s.", s_node->remote_id ); - - if (s_node == NULL ) { - warning_handler( " Could not create new xerver_node for %s.", - msg->sender ); - return 0; - } - - s_node->next = active_class_node->current_server_node->next; - s_node->prev = active_class_node->current_server_node; - - active_class_node->current_server_node->next->prev = s_node; - active_class_node->current_server_node->next = s_node; - } - - - } else if( strcmp( msg->router_command, "unregister") == 0 ) { - - if( ! unregister_server_node( active_class_node, msg->sender ) ) { - remove_server_class( router_registrar, active_class_node ); - debug_handler( "Removed server class after final unregister"); - } - - } else { - warning_handler( "router_register_handler_msg(): Bad Command [%s] for class [%s]", - msg->router_command, msg->router_class ); - } - - return 1; -} - - -/* removes a server class node from the top level router_registrar */ -int unregister_server_node( server_class_node* active_class_node, char* remote_id ) { - - server_node* d_node = find_server_node( active_class_node, remote_id ); - - if ( d_node != NULL ) { - - info_handler( "Removing server_node for: %s.", d_node->remote_id ); - - if ( d_node->next == NULL ) { - warning_handler( "NEXT is NULL in ring [%s] -- " - "THIS SHOULD NEVER HAPPEN", - d_node->remote_id ); - - } - - if ( d_node->prev == NULL ) { - warning_handler( "PREV is NULL in a ring [%s] -- " - "THIS SHOULD NEVER HAPPEN", - d_node->remote_id ); - - } - - if ( d_node->next == d_node && d_node->prev == d_node) { - info_handler( "Last node, setting ring to NULL: %s.", - d_node->remote_id ); - - active_class_node->current_server_node = NULL; - - server_node_free( d_node ); - return 0; - - } else { - info_handler( "Nodes remain, splicing: %s, %s", - d_node->prev->remote_id, - d_node->next->remote_id); - - info_handler( "d_node => %x, next => %x, prev => %x", - d_node, d_node->next, d_node->prev ); - - - d_node->prev->next = d_node->next; - d_node->next->prev = d_node->prev; - - info_handler( "prev => %x, prev->next => %x, prev->prev => %x", - d_node->prev, d_node->prev->next, d_node->prev->prev ); - - info_handler( "next => %x, next->next => %x, next->prev => %x", - d_node->next, d_node->next->next, d_node->next->prev ); - - if (active_class_node->current_server_node == d_node) - active_class_node->current_server_node = d_node->next; - - - server_node_free( d_node ); - } - } - - return 1; -} - -server_node * find_server_node ( server_class_node * class, const char * remote_id ) { - - if ( class == NULL ) { - warning_handler(" find_server_node(): bad arg!"); - return NULL; - } - - server_node * start_node = class->current_server_node; - server_node * node = class->current_server_node; - - do { - if (node == NULL) - return NULL; - - if ( strcmp(node->remote_id, remote_id) == 0 ) - return node; - - node = node->next; - - } while ( node != start_node ); - - return NULL; -} - -/* if we return -1, then we just deleted the server_class you were looking for - if we return 0, then some other error has occured - we return 1 otherwise */ -int remove_server_class( transport_router_registrar* router, server_class_node* class ) { - if( class == NULL ) - return 0; - - transport_message * msg = NULL; - while ( (msg = client_recv(class->jabber->t_client, 0)) != NULL ) { - debug_handler( "Looping on messages to dead class" ); - if( server_class_handle_msg(router, class, msg) < 0 ) { - debug_handler( "This class was freed by a recursive call, exiting 'remove_server_class'"); - //message_free(msg); - this will be freed by server_class_handle_msg - debug_handler( "Message Freed"); - return -1; - } - message_free(msg); - } - - - free( class->server_class ); - class->server_class = NULL; - - find_server_class( router, router_resource ); /* find deletes for us */ - debug_handler( "Successfuly called 'find_server_class' on class to delete" ); - - if( router->server_class_list == NULL ) - return 0; - return 1; -} - -server_class_node * find_server_class ( transport_router_registrar * router, const char * class_id ) { - - if ( router == NULL ) { - warning_handler(" find_server_class(): bad arg!"); - return NULL; - } - - info_handler( "Finding server class for %s", class_id ); - server_class_node * class = router->server_class_list; - server_class_node * dead_class = NULL; - - while ( class != NULL ) { - - if ( class->server_class == NULL ) { - info_handler( "Found an empty server class" ); - - if ( class->prev != NULL ) { - class->prev->next = class->next; - if( class->next != NULL ) { - class->next->prev = class->prev; - } - - } else { - info_handler( "Empty class is the first on the list" ); - if( class->next != NULL ) - router->server_class_list = class->next; - - else { /* we're the last class node in the class node list */ - info_handler( "Empty class is the last on the list" ); - server_class_node_free( router->server_class_list ); - router->server_class_list = NULL; - break; - } - - } - - dead_class = class; - class = class->next; - - info_handler( "Tossing our dead class" ); - server_class_node_free( dead_class ); - - if ( class == NULL ) - return NULL; - } - - if ( strcmp(class->server_class, class_id) == 0 ) - return class; - info_handler( "%s != %s", class->server_class, class_id ); - - class = class->next; - } - - debug_handler( "Returning NULL from find_server_class()" ); - return NULL; -} - -/* builds a new server class and connects to the jabber server with the new resource */ -server_class_node* init_server_class( - transport_router_registrar* router, char* remote_id, char* server_class ) { - - size_t len = sizeof( server_class_node ); - server_class_node* node = (server_class_node*) safe_malloc( len ); - - node->jabber = jabber_connect_init( router->jabber->server, - router->jabber->port, router->jabber->unixpath, router->jabber->username, - router->jabber->password, server_class, router->jabber->connect_timeout, router->component ); - - - - node->server_class = strdup( server_class ); - if( server_class == NULL ) { - fatal_handler( "imit_server_class(): out of memory for %s", server_class ); - return NULL; - } - - info_handler( "Received class to init_server_class: %s", server_class ); - node->current_server_node = init_server_node( remote_id ); - if( node->current_server_node == NULL ) { - fatal_handler( "init_server_class(): NULL server_node for %s", remote_id ); - return NULL; - } - - - if( ! j_connect( node->jabber ) ) { - fatal_handler( "Unable to init server class %s", node->server_class ); - return NULL; - } - - info_handler( "Jabber address in init for %s : address %x : username %s : resource %s", - node->server_class, node->jabber->t_client->session->sock_id, - node->jabber->username, node->jabber->resource ); - - return node; - -} - -/* builds a new server_node to be added to the ring of server_nodes */ -server_node* init_server_node( char* remote_id ) { - - info_handler( "Initing server node for %s", remote_id ); - server_node* current_server_node; - size_t size = sizeof( server_node); - current_server_node = (server_node*) safe_malloc( size ); - - current_server_node->remote_id = strdup(remote_id); - if( current_server_node->remote_id == NULL ) { - fatal_handler("init_server_class(): Out of Memory for %s", remote_id ); - return NULL; - } - - current_server_node->reg_time = time(NULL); - current_server_node->available = 1; - current_server_node->next = current_server_node; - current_server_node->prev = current_server_node; - - - return current_server_node; - -} - -int server_class_handle_msg( transport_router_registrar* router, - server_class_node* s_node, transport_message* msg ) { - - if( s_node->current_server_node == NULL ) { - /* return error to client ??!*/ - /* WE have no one to send the message to */ - warning_handler( "We no longer have any servers for %s : " - "no one to send the message to. Sending error message to %s", s_node->server_class, msg->sender ); - free( msg->recipient ); - - char* rec = strdup( msg->sender ); - if( rec == NULL ) { - fatal_handler( "class msg_handler: out of memory"); - return 0; - } - - info_handler( "Building error message to return for %s", s_node->server_class); - msg->recipient = rec; - set_msg_error(msg, "cancel", 501); - - client_send_message( s_node->jabber->t_client, msg ); - message_free( msg ); - - remove_server_class( router, s_node ); - debug_handler( "Successfully removed server class" ); - - return -1; - } - - info_handler( "[%s] Received \nfrom: %s \nto: %s", - s_node->server_class, msg->sender, msg->recipient ); - - if( msg->is_error ) { - warning_handler( "We've received an error message type: %s : code: %d", - msg->error_type, msg->error_code ); - - if( strcmp( msg->error_type, "cancel" ) == 0 ) { - warning_handler( "Looks like we've lost a server!" ); - server_node* dead_node = find_server_node( s_node, msg->sender ); - - if( dead_node != NULL ) { - //message_free( msg ); - transport_message* tmp = dead_node->last_sent; - - /* copy over last sent, it will be freed in the unregister function */ - transport_message* tmp2 = message_init( tmp->body, tmp->subject, tmp->thread, - tmp->recipient, tmp->sender ); - - message_set_router_info( tmp2, tmp->router_from, - tmp->router_to, tmp->router_class, tmp->router_command, tmp->broadcast ); - - if( ! unregister_server_node( s_node, dead_node->remote_id ) ) { - /* WE have no one to send the message to */ - warning_handler( "We no longer have any servers for %s : " - "no one to send the message to.", s_node->server_class ); - free( msg->recipient ); - - char* rec = strdup( msg->router_from ); - if( rec == NULL ) { - fatal_handler( "class msg_handler: out of memory"); - return 0; - } - - info_handler( "Building error message to return for %s", s_node->server_class); - msg->recipient = rec; - client_send_message( s_node->jabber->t_client, msg ); - message_free( tmp2 ); - message_free( msg ); - return 0; - - } else { - msg = tmp2; - } - } - } - } - - - server_node* c_node = s_node->current_server_node->next; - - /* not implemented yet */ - while( ! c_node->available ) { - if( c_node == s_node->current_server_node ) { - warning_handler("No server_node's are available for %s", s_node->server_class ); - /* XXX send error message to client */ - return 0; - } - c_node = c_node->next; - } - s_node->current_server_node = c_node; - - transport_message * new_msg = - message_init( msg->body, msg->subject, msg->thread, - s_node->current_server_node->remote_id, msg->sender ); - - message_set_router_info( new_msg, msg->sender, NULL, NULL, NULL, 0 ); - - info_handler( "[%s] Routing message from [%s]\nto [%s]", s_node->server_class, msg->sender, new_msg->recipient ); - //info_handler( "New Message Details: sender:%s recipient: %s \nbody: %s", - // new_msg->sender, new_msg->recipient, new_msg->body ); - - message_free( s_node->current_server_node->last_sent ); - s_node->current_server_node->last_sent = msg; - - if ( new_msg != NULL && client_send_message( s_node->jabber->t_client, new_msg ) ) { - s_node->current_server_node->serve_count++; - s_node->current_server_node->la_time = time(NULL); - message_free( new_msg ); // XXX - return 1; - } - message_free( new_msg ); // XXX - - return 0; -} - - -int router_return_server_info( - transport_router_registrar* router, transport_message* msg ) { - - server_class_node* cur_class = router->server_class_list; - growing_buffer* buffer = buffer_init(1024); - - while( cur_class != NULL ) { - - server_node* start_node = cur_class->current_server_node; - server_node* cur_node = start_node; - if( cur_node == NULL ) continue; - - do { - - char tbuf[124]; - memset(tbuf,0,124); - sprintf( tbuf, "%d", (int)cur_node->reg_time ); - buffer_add( buffer, tbuf ); - buffer_add( buffer, " | "); - - memset(tbuf,0,124); - sprintf( tbuf, "%d", (int)cur_node->upd_time ); - buffer_add( buffer, tbuf ); - buffer_add( buffer, " | "); - - memset(tbuf,0,124); - sprintf( tbuf, "%d", (int)cur_node->la_time ); - buffer_add( buffer, tbuf ); - buffer_add( buffer, " | "); - - - char sbuf[64]; - memset(sbuf,0,64); - sprintf(sbuf,"%d",cur_node->serve_count); - - buffer_add( buffer, "#" ); - buffer_add( buffer, sbuf ); - buffer_add( buffer, " | "); - - buffer_add( buffer, cur_class->server_class ); - buffer_add( buffer, " | "); - - buffer_add( buffer, cur_node->remote_id ); - - buffer_add( buffer, "\n" ); - cur_node = cur_node->next; - - } while( cur_node != start_node ); - - cur_class = cur_class->next; - - } - - info_handler( "Router returning servers query command: %s", buffer->buf ); - - transport_message* new_msg; - - if( buffer->buf == NULL || strlen(buffer->buf) == 0 ) - new_msg = message_init( "0", NULL, NULL, msg->sender, NULL ); - else - new_msg = message_init( buffer->buf, NULL, NULL, msg->sender, NULL ); - - client_send_message( router->jabber->t_client, new_msg ); - message_free( new_msg ); - - return 1; - -} - -int router_registrar_handle_app_request( - transport_router_registrar* router, transport_message* msg ) { - - osrf_message* arr[ROUTER_MAX_MSGS_PER_PACKET]; - memset(arr, 0, ROUTER_MAX_MSGS_PER_PACKET ); - //int num_msgs = osrf_message_from_xml( msg->body, arr ); - int num_msgs = osrf_message_deserialize( msg->body, arr, ROUTER_MAX_MSGS_PER_PACKET ); - - int i; - for( i = 0; i != num_msgs; i++ ) { - - osrf_message* omsg = arr[i]; - osrf_message* success = NULL; - osrf_message** result = NULL; - int num_responses; - - //char* newxml = osrf_message_to_xml(omsg); - //debug_handler( "Received potential app request from client:\n%s\n", newxml ); - //free(newxml); - - if(omsg->m_type == CONNECT) { - - success = osrf_message_init( - STATUS, omsg->thread_trace, omsg->protocol ); - - osrf_message_set_status_info( - success, "osrfConnectStatus", "Connection Successful", OSRF_STATUS_OK ); - - } else if( omsg->m_type == REQUEST ) { - - result = router_registrar_process_app_request( router, omsg, &num_responses ); - - } else if(omsg->m_type == DISCONNECT) { - success = NULL; - - } else { - - success = osrf_message_init( - STATUS, omsg->thread_trace, omsg->protocol ); - osrf_message_set_status_info( - success, "osrfMethodException", "Method Not Found", OSRF_STATUS_NOTFOUND ); - } - - - /* now send our new message back */ - if(success) { - - char* xml = osrf_message_serialize(success); - debug_handler( "Sending XML to client app request:\n%s\n", xml ); - transport_message* return_m = message_init( - xml, "", msg->thread, msg->sender, "" ); - - - client_send_message(router->jabber->t_client, return_m); - - free(xml); - osrf_message_free(success); - } else if(result) { - int i; - - for(i=0; i!= num_responses; i++){ - char* xml = osrf_message_serialize(result[i]); - debug_handler( "Sending XML to client app request:\n%s\n", xml ); - transport_message* return_m = message_init( - xml, "", msg->thread, msg->sender, "" ); - - - client_send_message(router->jabber->t_client, return_m); - - free(xml); - osrf_message_free(result[i]); - } - - osrf_message* complete = osrf_message_init( - STATUS, result[i-1]->thread_trace, result[i-1]->protocol ); - osrf_message_set_status_info( complete, - "osrfConnectStatus", "Request Complete", OSRF_STATUS_COMPLETE ); - char* complete_xml = osrf_message_serialize(complete); - transport_message* complete_m = message_init( - complete_xml, "", msg->thread, msg->sender, "" ); - client_send_message(router->jabber->t_client, complete_m); - free(complete_xml); - osrf_message_free(complete); - free(result); - - } - - } - - return 1; - -} - - - - -osrf_message** router_registrar_process_app_request( - transport_router_registrar* router, osrf_message* omsg, int* num_responses ) { - - - if( omsg->method_name == NULL ) - return NULL; - - osrf_message** result_array = NULL; - - - debug_handler( "Received method from client: %s", omsg->method_name ); - - if(!strcmp(omsg->method_name,"opensrf.router.info.class.list")) { - - jsonObject* result_content = jsonParseString("[]"); - - debug_handler("Processing opensrf.router.info.class.list request"); - - server_class_node* cur_class = router->server_class_list; - while( cur_class != NULL ) { - - debug_handler("Adding %s to request list", cur_class->server_class); - - jsonObjectPush(result_content, jsonNewObject(cur_class->server_class)); - cur_class = cur_class->next; - } - result_array = safe_malloc(sizeof(osrf_message*)); - *num_responses = 1; - - result_array[0] = osrf_message_init( - RESULT, omsg->thread_trace, omsg->protocol ); - - osrf_message_set_result_content( result_array[0], jsonObjectToJSON(result_content)); - jsonObjectFree(result_content); - - - } else if(!strcmp(omsg->method_name,"opensrf.router.info.stats")) { - - /* we have a server_class array which holds an array of node_objects. - each node_object contains an array of stats - */ - - debug_handler("Processing opensrf.router.info.stats request"); - - jsonObject* result_content = jsonParseString("{}"); - - server_class_node* cur_class = router->server_class_list; - - while( cur_class != NULL ) { - - server_node* start_node = cur_class->current_server_node; - server_node* cur_node = start_node; - if( cur_node == NULL ) continue; - - jsonObject* server_object = jsonParseString("{}"); - - do { - - jsonObject* node_stats_array = jsonParseString("[]"); - - jsonObject* json_reg_time = jsonParseString("{}"); - - jsonObjectSetKey( json_reg_time, "reg_time", - jsonNewNumberObject((double) cur_node->reg_time)); - - jsonObjectPush( node_stats_array, json_reg_time ); - - jsonObject* json_upd_time = jsonParseString("{}"); - - - jsonObjectSetKey( json_upd_time, "upd_time", - jsonNewNumberObject((int)cur_node->upd_time)); - - - - jsonObjectPush( node_stats_array, json_upd_time ); - - - - jsonObject* json_la_time = jsonParseString("{}"); - - - - jsonObjectSetKey( json_la_time, "la_time", - jsonNewNumberObject((int)cur_node->la_time)); - - - jsonObjectPush( node_stats_array, json_la_time ); - - jsonObject* json_serve_count = jsonParseString("{}"); - - - jsonObjectSetKey( json_serve_count, "serve_count", - jsonNewNumberObject((int)cur_node->serve_count)); - - - jsonObjectPush( node_stats_array, json_serve_count ); - - - jsonObjectSetKey( server_object, cur_node->remote_id, node_stats_array ); - - cur_node = cur_node->next; - - } while( cur_node != start_node ); - - jsonObjectSetKey( result_content, cur_class->server_class, server_object ); - - cur_class = cur_class->next; - - - } - - result_array = safe_malloc(sizeof(osrf_message*)); - *num_responses = 1; - - result_array[0] = osrf_message_init( - RESULT, omsg->thread_trace, omsg->protocol ); - - osrf_message_set_result_content(result_array[0], jsonObjectToJSON(result_content)); - - jsonObjectFree(result_content); - - - } else if(!strcmp(omsg->method_name,"opensrf.system.method.all")) { - - jsonObject* content = jsonParseString("{}"); - jsonObjectSetKey(content, "api_level", jsonNewObject("1")); - jsonObjectSetKey(content, "api_name", jsonNewObject("opensrf.router.info.class.list")); - jsonObjectSetKey(content, "server_class", jsonNewObject("router")); - jsonObjectSetKey(content, "stream", jsonNewObject("0")); - - jsonObject* content2 = jsonParseString("{}"); - jsonObjectSetKey(content2, "api_level", jsonNewObject("1")); - jsonObjectSetKey(content2, "api_name", jsonNewObject("opensrf.router.info.stats")); - jsonObjectSetKey(content2, "server_class", jsonNewObject("router")); - jsonObjectSetKey(content2, "stream", jsonNewObject("0")); - - jsonObject* content3 = jsonParseString("{}"); - jsonObjectSetKey(content3, "api_level", jsonNewObject("1")); - jsonObjectSetKey(content3, "api_name", jsonNewObject("opensrf.system.method.all")); - jsonObjectSetKey(content3, "server_class", jsonNewObject("router")); - jsonObjectSetKey(content3, "stream", jsonNewObject("1")); - - result_array = safe_malloc(3*sizeof(osrf_message*)); - *num_responses = 3; - - result_array[0] = osrf_message_init( - RESULT, omsg->thread_trace, omsg->protocol ); - - osrf_message_set_result_content( result_array[0], jsonObjectToJSON(content)); - jsonObjectFree(content); - - result_array[1] = osrf_message_init( - RESULT, omsg->thread_trace, omsg->protocol ); - osrf_message_set_result_content( result_array[1], jsonObjectToJSON(content2) ); - jsonObjectFree(content2); - - result_array[2] = osrf_message_init( - RESULT, omsg->thread_trace, omsg->protocol ); - osrf_message_set_result_content( result_array[1], jsonObjectToJSON(content3) ); - jsonObjectFree(content3); - - - } - - - if( result_array == NULL || result_array[0] == NULL ) - return NULL; - - return result_array; -} - - - - -int router_registrar_free( transport_router_registrar* router_registrar ) { - if( router_registrar == NULL ) return 0; - jabber_connect_free( router_registrar->jabber ); - - /* free the server_class list XXX */ - while( router_registrar->server_class_list != NULL ) { - remove_server_class(router_registrar, router_registrar->server_class_list); - debug_handler( "Removed server classes in registrar free"); - } - - osrfStringArrayFree(router_registrar->trusted_servers); - osrfStringArrayFree(router_registrar->trusted_clients); - - free( router_registrar ); - return 1; -} - - -int server_class_node_free( server_class_node* node ) { - if( node == NULL ) { return 0; } - if( node->server_class != NULL ) - free( node->server_class ); - - jabber_connect_free( node->jabber ); - - /* just in case, free the list */ - while( node->current_server_node != NULL ) { - unregister_server_node( node, node->current_server_node->remote_id ); - } - free( node ); - return 1; -} - -int server_node_free( server_node* node ) { - if( node == NULL ) { return 0; } - message_free( node->last_sent ); - free( node->remote_id ); - free( node ); - return 1; -} - -int jabber_connect_free( jabber_connect* jabber ) { - if( jabber == NULL ) { return 0; } - client_free( jabber->t_client ); - free( jabber->unixpath ); - free( jabber->username ); - free( jabber->password ); - free( jabber->resource ); - free( jabber->server ); - free( jabber ); - return 1; -} - - diff --git a/OpenSRF/src/router/router.h b/OpenSRF/src/router/router.h deleted file mode 100644 index 85a5f7491f..0000000000 --- a/OpenSRF/src/router/router.h +++ /dev/null @@ -1,266 +0,0 @@ -#include "opensrf/transport_client.h" -#include "opensrf/transport_message.h" -#include "opensrf/osrf_message.h" - -#include "opensrf/utils.h" -#include "opensrf/logging.h" -#include "opensrf/osrfConfig.h" - -#include -#include - -#ifndef ROUTER_H -#define ROUTER_H - -#define ROUTER_MAX_TRUSTED 256 - -// ---------------------------------------------------------------------- -// Jabber router_registrar/load balancer. There is a top level linked list of -// server_class_nodes. A server class represents the a cluster of Jabber -// clients that define a single logical routing endpoint. Each of these -// server_class_nodes maintains a list of connected server_nodes, which -// represents the pool of connected server endpoints. A request -// directed at a particular class is routed to the next available -// server endpoint. -// -// ---------------------------------------------------------------------- - - -// ---------------------------------------------------------------------- -// Defines an element in a server list. The server list is a circular -// doubly linked list. User is responsible for freeing a server_node with -// server_node_free() -// ---------------------------------------------------------------------- -struct server_node_struct { - - struct server_node_struct* next; - struct server_node_struct* prev; - - time_t la_time; /* last time we sent a message to a server */ - time_t reg_time; /* time we originally registered */ - time_t upd_time; /* last re-register time */ - int available; /* true if we may be used */ - - int serve_count; /* how many messages we've sent */ - - /* jabber remote id for this server node*/ - char* remote_id; - - /* we cache the last sent message in case our remote - endpoint has gone away. If it has, the next server - node in the list will re-send our last message */ - transport_message* last_sent; - -}; -typedef struct server_node_struct server_node; - - -// ---------------------------------------------------------------------- -// Models a basic jabber connection structure. Any component that -// connects to jabber will have one of these. -// ---------------------------------------------------------------------- -struct jabber_connect_struct { - - char* server; - int port; - char* username; - char* password; - char* resource; - char* unixpath; - int connect_timeout; - - transport_client* t_client; -}; -typedef struct jabber_connect_struct jabber_connect; - - - -// ---------------------------------------------------------------------- -// Defines an element in the list of server classes. User is -// responsible for freeing a server_class_node with -// server_class_node_free(). -// The server_node_list is a doubly (not circular) linked list -// ---------------------------------------------------------------------- -struct server_class_node_struct { - - /* the name of our class. This will be used as the jabber - resource when we create a class level connection*/ - char* server_class; - - /* the current node in the ring of available server nodes */ - server_node* current_server_node; - - /* next and prev class_node pointers */ - struct server_class_node_struct* next; - struct server_class_node_struct* prev; - - /* our jabber connection struct */ - jabber_connect* jabber; - -}; -typedef struct server_class_node_struct server_class_node; - - -// ---------------------------------------------------------------------- -// Top level router_registrar object. Maintains the list of -// server_class_nodes and the top level router jabber connection. -// ---------------------------------------------------------------------- -struct transport_router_registrar_struct { - - /* the list of server class nodes */ - server_class_node* server_class_list; - - /* if we don't hear from the client in this amount of time - we consider them dead... */ - /* not currently used */ - int client_timeout; /* seconds */ - - /* our top level connection to the jabber server */ - jabber_connect* jabber; - - /* true if we connect to jabber as a jabber component */ - int component; - - osrfStringArray* trusted_servers; - osrfStringArray* trusted_clients; - - //char** trusted_servers; - //char** trusted_clients; - - -}; -typedef struct transport_router_registrar_struct transport_router_registrar; - - -// ---------------------------------------------------------------------- -// Returns an allocated transport_router_registrar. The user is responsible for -// freeing the allocated memory with router_registrar_free() -// client_timeout is unused at this time. -// connect_timeout is how long we will wait for a failed jabber connect -// attempt for the top level connection. -// ---------------------------------------------------------------------- -transport_router_registrar* router_registrar_init( char* server, - int port, char* unixpath, char* username, char* password, char* resource, - int client_timeout, int connect_timeout, int component ); - -// ---------------------------------------------------------------------- -// Connects the top level router_registrar object to the Jabber server. -// ---------------------------------------------------------------------- -int router_registrar_connect( transport_router_registrar* router ); - -// ---------------------------------------------------------------------- -// Connects the given jabber_connect object to the Jabber server -// ---------------------------------------------------------------------- -int j_connect( jabber_connect* jabber ); - - -// ---------------------------------------------------------------------- -// Builds and initializes a jabber_connect object. User is responsible -// for freeing the memory with jabber_connect_free(); -// ---------------------------------------------------------------------- -jabber_connect* jabber_connect_init( char* server, - int port, char* unixpath, char* username, char* password, - char* resource, int connect_timeout, int component ); - -// ---------------------------------------------------------------------- -// Allocates and initializes a server class instance. This will be -// called when a new class message arrives. It will connect to Jabber -// as router_registrar->username@router_registrar->server/new_class -// ---------------------------------------------------------------------- -server_class_node* init_server_class( - transport_router_registrar* router_registrar, char* remote_id, char* server_class ); - -// ---------------------------------------------------------------------- -// Allocates and initializes a server_node object. The object must -// be freed with server_node_free(). -// remote_id is the full jabber login for the remote server connection -// I.e. where we send messages when we want to send them to this -// server. -// ---------------------------------------------------------------------- -server_node* init_server_node( char* remote_id ); - - -// ---------------------------------------------------------------------- -// Routes messages sent to the provided server_class_node's class -// ---------------------------------------------------------------------- -int server_class_handle_msg( transport_router_registrar* router, - server_class_node* s_node, transport_message* msg ); - -// ---------------------------------------------------------------------- -// Determines what to do with an inbound register/unregister message. -// ---------------------------------------------------------------------- -int router_registrar_handle_msg( transport_router_registrar*, transport_message* msg ); - -// ---------------------------------------------------------------------- -// Deallocates the memory occupied by the given server_node -// ---------------------------------------------------------------------- -int server_node_free( server_node* node ); - -// ---------------------------------------------------------------------- -// Deallocates the memory used by the given server_class_node. This -// will also free any attached server_node's. -// ---------------------------------------------------------------------- -int server_class_node_free( server_class_node* node ); - -// ---------------------------------------------------------------------- -// Deallocates the memory used by a server_node -// ---------------------------------------------------------------------- -int server_node_free( server_node* node ); - - -// ---------------------------------------------------------------------- -// Deallocates a jabber_connect node -// ---------------------------------------------------------------------- -int jabber_connect_free( jabber_connect* jabber ); - -// ---------------------------------------------------------------------- -// Deallocates the memory used by the router_registrar. This will also call -// server_class_node_free on any attached server_class_nodes. -// ---------------------------------------------------------------------- -int router_registrar_free( transport_router_registrar* router_registrar ); - - -// ---------------------------------------------------------------------- -// Returns the server_node with the given Jabber remote_id -// ---------------------------------------------------------------------- -server_node * find_server_node ( server_class_node * class, const char * remote_id ); - - -// ---------------------------------------------------------------------- -// Returns the server_class_node object with the given class_name -// ---------------------------------------------------------------------- -server_class_node * find_server_class ( transport_router_registrar * router, const char * class_id ); - -// ---------------------------------------------------------------------- -// Removes a server class from the top level router_registrar -// ---------------------------------------------------------------------- -int unregister_server_node( server_class_node* active_class_node, char* remote_id ); - -int fill_fd_set( transport_router_registrar* router, fd_set* set ); - -void listen_loop( transport_router_registrar* router ); - - -int router_return_server_info( transport_router_registrar* router, transport_message* msg ); - -int remove_server_class( transport_router_registrar* router, server_class_node* class ); - - - -int router_registrar_handle_app_request( transport_router_registrar*, transport_message* msg ); - -osrf_message** router_registrar_process_app_request( - transport_router_registrar* , osrf_message* omsg, int* num_responses ); - - -/* returns < 0 if the fd is not valid */ -int check_fd( int fd ); - - -// ---------------------------------------------------------------------- -// Adds a handler for the SIGUSR1 that we send to wake all the -// listening threads. -// ---------------------------------------------------------------------- -//void sig_handler( int sig ); - -#endif -- 2.43.2