X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_server.c;h=2cb78457a8d61be3d87412acfe341ca553c75b92;hb=ec7eb240abd60e667d1a26f89df1b064e1b3786d;hp=40378b8b0f126ad5f3e4ffb7aaea9476902e9343;hpb=6a41e15944691f6428fdf667afd80ffb0e63e1c5;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c index 40378b8b0f..2cb78457a8 100644 --- a/bacula/src/dird/ua_server.c +++ b/bacula/src/dird/ua_server.c @@ -1,55 +1,50 @@ /* - * - * Bacula Director -- User Agent Server - * - * Kern Sibbald, September MM - * - * Version $Id$ - */ + Bacula® - The Network Backup Solution -/* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2007 Free Software Foundation Europe e.V. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation and included + in the file LICENSE. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ +/* + * + * Bacula Director -- User Agent Server + * + * Kern Sibbald, September MM + * + * Version $Id$ */ #include "bacula.h" #include "dird.h" -/* Imported subroutines */ -extern void run_job(JCR *jcr); - /* Imported variables */ extern int r_first; extern int r_last; extern struct s_res resources[]; -extern int console_msg_pending; -extern char my_name[]; - -/* Static variables */ - -/* Exported variables */ -int quit_cmd_thread = 0; -/* Imported functions */ /* Forward referenced functions */ - -static void *connect_thread(void *arg); +extern "C" void *connect_thread(void *arg); static void *handle_UA_client_request(void *arg); @@ -59,130 +54,179 @@ static workq_t ua_workq; struct s_addr_port { char *addr; - int port; + char *port; }; /* Called here by Director daemon to start UA (user agent) * command thread. This routine creates the thread and then * returns. */ -void start_UA_server(char *UA_addr, int UA_port) +void start_UA_server(dlist *addrs) { pthread_t thid; int status; - static struct s_addr_port arg; + static dlist *myaddrs = addrs; - arg.port = UA_port; - arg.addr = UA_addr; - if ((status=pthread_create(&thid, NULL, connect_thread, (void *)&arg)) != 0) { - Emsg1(M_ABORT, 0, _("Cannot create UA thread: %s\n"), strerror(status)); + if ((status=pthread_create(&thid, NULL, connect_thread, (void *)myaddrs)) != 0) { + berrno be; + Emsg1(M_ABORT, 0, _("Cannot create UA thread: %s\n"), be.bstrerror(status)); } started = TRUE; return; } -static void *connect_thread(void *arg) +extern "C" +void *connect_thread(void *arg) { - struct s_addr_port *UA = (struct s_addr_port *)arg; - pthread_detach(pthread_self()); - /* ****FIXME**** put # 5 on config parameter */ - bnet_thread_server(UA->addr, UA->port, 5, &ua_workq, handle_UA_client_request); + /* Permit 20 console connections */ + bnet_thread_server((dlist*)arg, 20, &ua_workq, handle_UA_client_request); return NULL; } /* - * Handle Director User Agent commands + * Create a Job Control Record for a control "job", + * filling in all the appropriate fields. + */ +JCR *new_control_jcr(const char *base_name, int job_type) +{ + JCR *jcr; + jcr = new_jcr(sizeof(JCR), dird_free_jcr); + /* + * The job and defaults are not really used, but + * we set them up to ensure that everything is correctly + * initialized. + */ + LockRes(); + jcr->job = (JOB *)GetNextRes(R_JOB, NULL); + set_jcr_defaults(jcr, jcr->job); + UnlockRes(); + jcr->sd_auth_key = bstrdup("dummy"); /* dummy Storage daemon key */ + create_unique_job_name(jcr, base_name); + jcr->sched_time = jcr->start_time; + jcr->JobType = job_type; + jcr->JobLevel = L_NONE; + set_jcr_job_status(jcr, JS_Running); + jcr->JobId = 0; + return jcr; +} + +/* + * Handle Director User Agent commands * */ static void *handle_UA_client_request(void *arg) { int stat; - UAContext ua; - BSOCK *UA_sock = (BSOCK *) arg; + UAContext *ua; + JCR *jcr; + BSOCK *user = (BSOCK *)arg; pthread_detach(pthread_self()); - memset(&ua, 0, sizeof(ua)); - ua.automount = TRUE; - ua.verbose = 1; - ua.jcr = new_jcr(sizeof(JCR), dird_free_jcr); - ua.jcr->sd_auth_key = bstrdup("dummy"); /* dummy Storage daemon key */ - ua.UA_sock = UA_sock; - ua.cmd = get_pool_memory(PM_FNAME); - ua.args = get_pool_memory(PM_FNAME); - - create_unique_job_name(ua.jcr, "*Console*"); - ua.jcr->sched_time = ua.jcr->start_time; - ua.jcr->JobType = JT_CONSOLE; - - bnet_recv(ua.UA_sock); /* Get first message */ - if (!authenticate_user_agent(ua.UA_sock)) { + jcr = new_control_jcr("-Console-", JT_CONSOLE); + + ua = new_ua_context(jcr); + ua->UA_sock = user; + + user->recv(); /* Get first message */ + if (!authenticate_user_agent(ua)) { goto getout; } - while (!ua.quit) { - stat = bnet_recv(ua.UA_sock); + while (!ua->quit) { + if (ua->api) user->signal(BNET_MAIN_PROMPT); + stat = user->recv(); if (stat >= 0) { - ua.cmd = check_pool_memory_size(ua.cmd, ua.UA_sock->msglen+1); - bstrncpy(ua.cmd, ua.UA_sock->msg, ua.UA_sock->msglen+1); - parse_command_args(&ua); - if (ua.argc > 0 && ua.argk[0][0] == '.') { - do_a_dot_command(&ua, ua.cmd); - } else { - do_a_command(&ua, ua.cmd); - } - if (!ua.quit) { - if (ua.auto_display_messages) { - strcpy(ua.cmd, "messages"); - qmessagescmd(&ua, ua.cmd); - ua.user_notified_msg_pending = FALSE; - } else if (!ua.user_notified_msg_pending && console_msg_pending) { - bsendmsg(&ua, _("You have messages.\n")); - ua.user_notified_msg_pending = TRUE; - } - bnet_sig(ua.UA_sock, BNET_EOD); /* send end of command */ - } - } else if (is_bnet_stop(ua.UA_sock)) { - ua.quit = TRUE; - break; + pm_strcpy(ua->cmd, ua->UA_sock->msg); + parse_ua_args(ua); + if (ua->argc > 0 && ua->argk[0][0] == '.') { + do_a_dot_command(ua, ua->cmd); + } else { + do_a_command(ua, ua->cmd); + } + dequeue_messages(ua->jcr); + if (!ua->quit) { + if (console_msg_pending && acl_access_ok(ua, Command_ACL, "messages", 8)) { + if (ua->auto_display_messages) { + pm_strcpy(ua->cmd, "messages"); + qmessagescmd(ua, ua->cmd); + ua->user_notified_msg_pending = false; + } else if (!ua->gui && !ua->user_notified_msg_pending && console_msg_pending) { + if (ua->api) { + user->signal(BNET_MSGS_PENDING); + } else { + bsendmsg(ua, _("You have messages.\n")); + } + ua->user_notified_msg_pending = true; + } + } + if (!ua->api) user->signal(BNET_EOD); /* send end of command */ + } + } else if (is_bnet_stop(user)) { + ua->quit = true; } else { /* signal */ - bnet_sig(ua.UA_sock, BNET_POLL); + user->signal(BNET_POLL); } } getout: - if (ua.UA_sock) { - bnet_close(ua.UA_sock); - ua.UA_sock = NULL; - } + close_db(ua); + free_ua_context(ua); + free_jcr(jcr); - close_db(&ua); /* do this before freeing JCR */ + return NULL; +} - if (ua.jcr) { - free_jcr(ua.jcr); - ua.jcr = NULL; +/* + * Create a UAContext for a Job that is running so that + * it can the User Agent routines and + * to ensure that the Job gets the proper output. + * This is a sort of mini-kludge, and should be + * unified at some point. + */ +UAContext *new_ua_context(JCR *jcr) +{ + UAContext *ua; + + ua = (UAContext *)malloc(sizeof(UAContext)); + memset(ua, 0, sizeof(UAContext)); + ua->jcr = jcr; + ua->db = jcr->db; + ua->cmd = get_pool_memory(PM_FNAME); + ua->args = get_pool_memory(PM_FNAME); + ua->verbose = true; + ua->automount = true; + return ua; +} + +void free_ua_context(UAContext *ua) +{ + if (ua->cmd) { + free_pool_memory(ua->cmd); } - if (ua.prompt) { - free(ua.prompt); + if (ua->args) { + free_pool_memory(ua->args); } - if (ua.cmd) { - free_pool_memory(ua.cmd); + if (ua->prompt) { + free(ua->prompt); } - if (ua.args) { - free_pool_memory(ua.args); + + if (ua->UA_sock) { + bnet_close(ua->UA_sock); + ua->UA_sock = NULL; } - return NULL; + free(ua); } + /* - * Called from main Bacula thread + * Called from main Bacula thread */ void term_ua_server() { if (!started) { return; } - quit_cmd_thread = TRUE; }