+/*
+ Bacula(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2015 Kern Sibbald
+ Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+
+ The original author of Bacula is Kern Sibbald, with contributions
+ from many others, a complete list can be found in the file AUTHORS.
+
+ You may use this file and others of this release according to the
+ license defined in the LICENSE file, which includes the Affero General
+ Public License, v3.0 ("AGPLv3") and some additional permissions and
+ terms pursuant to its AGPLv3 Section 7.
+
+ This notice must be preserved when any source code is
+ conveyed and/or propagated.
+
+ Bacula(R) is a registered trademark of Kern Sibbald.
+*/
/*
*
* Bacula Director -- User Agent Server
*
* Kern Sibbald, September MM
*
- * Version $Id$
- */
-/*
- Copyright (C) 2000-2005 Kern Sibbald
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- 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
- the file LICENSE for additional details.
-
*/
#include "bacula.h"
#include "dird.h"
/* Imported variables */
-extern int r_first;
-extern int r_last;
-extern struct s_res resources[];
-extern int console_msg_pending;
-extern char my_name[];
/* Forward referenced functions */
if ((status=pthread_create(&thid, NULL, connect_thread, (void *)myaddrs)) != 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("Cannot create UA thread: %s\n"), be.strerror(status));
+ Emsg1(M_ABORT, 0, _("Cannot create UA thread: %s\n"), be.bstrerror(status));
}
started = TRUE;
return;
void *connect_thread(void *arg)
{
pthread_detach(pthread_self());
+ set_jcr_in_tsd(INVALID_JCR);
- /* Permit 10 console connections */
- bnet_thread_server((dlist*)arg, 10, &ua_workq, handle_UA_client_request);
+ /* Permit MaxConsoleConnect console connections */
+ bnet_thread_server((dlist*)arg, director->MaxConsoleConnect, &ua_workq, handle_UA_client_request);
return NULL;
}
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;
- jcr->JobStatus = JS_Running;
+ jcr->setJobType(job_type);
+ jcr->setJobLevel(L_NONE);
+ jcr->setJobStatus(JS_Running);
jcr->JobId = 0;
return jcr;
}
int stat;
UAContext *ua;
JCR *jcr;
+ BSOCK *user = (BSOCK *)arg;
pthread_detach(pthread_self());
- jcr = new_control_jcr("*Console*", JT_CONSOLE);
+ jcr = new_control_jcr("-Console-", JT_CONSOLE);
ua = new_ua_context(jcr);
- ua->UA_sock = (BSOCK *)arg;
+ ua->UA_sock = user;
+ set_jcr_in_tsd(INVALID_JCR);
- bnet_recv(ua->UA_sock); /* Get first message */
+ user->recv(); /* Get first message */
if (!authenticate_user_agent(ua)) {
goto getout;
}
while (!ua->quit) {
- stat = bnet_recv(ua->UA_sock);
+ if (ua->api) user->signal(BNET_MAIN_PROMPT);
+ stat = user->recv();
if (stat >= 0) {
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);
+ do_a_dot_command(ua);
} else {
- do_a_command(ua, ua->cmd);
+ do_a_command(ua);
}
+ dequeue_messages(ua->jcr);
if (!ua->quit) {
- if (ua->auto_display_messages) {
- pm_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;
+ 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;
+ }
}
- bnet_sig(ua->UA_sock, BNET_EOD); /* send end of command */
+ if (!ua->api) user->signal(BNET_EOD); /* send end of command */
}
- } else if (is_bnet_stop(ua->UA_sock)) {
+ } else if (user->is_stop()) {
ua->quit = true;
} else { /* signal */
- bnet_sig(ua->UA_sock, BNET_POLL);
+ user->signal(BNET_POLL);
}
+
+ /* At the end of each command, revert to the main shared SQL link */
+ ua->db = ua->shared_db;
}
getout:
ua = (UAContext *)malloc(sizeof(UAContext));
memset(ua, 0, sizeof(UAContext));
ua->jcr = jcr;
- ua->db = jcr->db;
+ ua->shared_db = ua->db = jcr->db;
ua->cmd = get_pool_memory(PM_FNAME);
ua->args = get_pool_memory(PM_FNAME);
- ua->verbose = 1;
- ua->automount = TRUE;
+ ua->errmsg = get_pool_memory(PM_FNAME);
+ ua->verbose = true;
+ ua->automount = true;
return ua;
}
if (ua->args) {
free_pool_memory(ua->args);
}
+ if (ua->errmsg) {
+ free_pool_memory(ua->errmsg);
+ }
if (ua->prompt) {
free(ua->prompt);
}
-
- if (ua->UA_sock) {
- bnet_close(ua->UA_sock);
- ua->UA_sock = NULL;
+ if (ua->unique) {
+ free(ua->unique);
}
+ free_bsock(ua->UA_sock);
free(ua);
}
projects / bacula / bacula / blobdiff