*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
#include "bacula.h"
#include "dird.h"
-#include "ua.h"
/* Imported subroutines */
-extern void run_job(JCR *jcr);
/* Imported variables */
extern int r_first;
/* Forward referenced functions */
-static void *connect_thread(void *arg);
-static void handle_UA_client_request(void *arg);
+extern "C" void *connect_thread(void *arg);
+
+static void *handle_UA_client_request(void *arg);
/* Global variables */
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;
+ be.set_errno(status);
+ Emsg1(M_ABORT, 0, _("Cannot create UA thread: %s\n"), be.strerror());
}
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);
+ /* ****FIXME**** put # 10 (timeout) on config parameter */
+ bnet_thread_server((dlist*)arg, 10, &ua_workq, handle_UA_client_request);
return NULL;
}
+/*
+ * 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);
+ 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->JobId = 0;
+ /*
+ * None of these are really defined for control JCRs, so we
+ * simply take the first of each one. This ensures that there
+ * will be no null pointer references.
+ */
+ LockRes();
+ jcr->job = (JOB *)GetNextRes(R_JOB, NULL);
+ jcr->messages = (MSGS *)GetNextRes(R_MSGS, NULL);
+ jcr->client = (CLIENT *)GetNextRes(R_CLIENT, NULL);
+ jcr->pool = (POOL *)GetNextRes(R_POOL, NULL);
+ jcr->catalog = (CAT *)GetNextRes(R_CATALOG, NULL);
+ jcr->store = (STORE *)GetNextRes(R_STORAGE, NULL);
+ jcr->fileset = (FILESET *)GetNextRes(R_FILESET, NULL);
+ UnlockRes();
+ return jcr;
+}
+
/*
* Handle Director User Agent commands
*
*/
-static void handle_UA_client_request(void *arg)
+static void *handle_UA_client_request(void *arg)
{
int stat;
- UAContext ua;
- BSOCK *UA_sock = (BSOCK *) arg;
+ UAContext *ua;
+ JCR *jcr;
+ BSOCK *UA_sock = (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 = UA_sock;
+
+ bnet_recv(ua->UA_sock); /* Get first message */
+ if (!authenticate_user_agent(ua)) {
goto getout;
}
- while (!ua.quit) {
- stat = bnet_recv(ua.UA_sock);
+ while (!ua->quit) {
+ stat = bnet_recv(ua->UA_sock);
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);
+ 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);
+ 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;
+ 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 */
+ bnet_sig(ua->UA_sock, BNET_EOD); /* send end of command */
}
- } else if (is_bnet_stop(ua.UA_sock)) {
- ua.quit = TRUE;
+ } else if (is_bnet_stop(ua->UA_sock)) {
+ ua->quit = TRUE;
break;
} else { /* signal */
- bnet_sig(ua.UA_sock, BNET_POLL);
+ bnet_sig(ua->UA_sock, BNET_POLL);
}
}
getout:
- if (ua.UA_sock) {
- bnet_close(ua.UA_sock);
- ua.UA_sock = NULL;
- }
- close_db(&ua); /* do this before freeing JCR */
+ close_db(ua);
+ free_ua_context(ua);
+ free_jcr(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 = 1;
+ 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);
}
- return;
+ free(ua);
}
+
/*
* Called from main Bacula thread
*/
projects / bacula / bacula / blobdiff