* Version $Id$
*/
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2000-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
/* Forward referenced subroutines */
+static void store_devtype(LEX *lc, RES_ITEM *item, int index, int pass);
/* We build the current resource here statically,
* then move it to dynamic memory */
{"description", store_str, ITEM(res_dir.hdr.desc), 0, 0, 0},
{"sdaddress", store_addresses_address, ITEM(res_store.sdaddrs), 0, ITEM_DEFAULT, 9103},
{"sdaddresses", store_addresses, ITEM(res_store.sdaddrs), 0, ITEM_DEFAULT, 9103},
- {"messages", store_res, ITEM(res_store.messages), 0, R_MSGS, 0},
+ {"messages", store_res, ITEM(res_store.messages), R_MSGS, 0, 0},
{"sdport", store_addresses_port, ITEM(res_store.sdaddrs), 0, ITEM_DEFAULT, 9103},
{"workingdirectory", store_dir, ITEM(res_store.working_directory), 0, ITEM_REQUIRED, 0},
{"piddirectory", store_dir, ITEM(res_store.pid_directory), 0, ITEM_REQUIRED, 0},
{"scriptsdirectory", store_dir, ITEM(res_store.scripts_directory), 0, 0, 0},
{"maximumconcurrentjobs", store_pint, ITEM(res_store.max_concurrent_jobs), 0, ITEM_DEFAULT, 10},
{"heartbeatinterval", store_time, ITEM(res_store.heartbeat_interval), 0, ITEM_DEFAULT, 0},
- {"tlsenable", store_yesno, ITEM(res_store.tls_enable), 1, ITEM_DEFAULT, 0},
- {"tlsrequire", store_yesno, ITEM(res_store.tls_require), 1, ITEM_DEFAULT, 0},
- {"tlsverifypeer", store_yesno, ITEM(res_store.tls_verify_peer), 1, ITEM_DEFAULT, 0},
+ {"tlsenable", store_yesno, ITEM(res_store.tls_enable), 1, 0, 0},
+ {"tlsrequire", store_yesno, ITEM(res_store.tls_require), 1, 0, 0},
+ {"tlsverifypeer", store_yesno, ITEM(res_store.tls_verify_peer), 1, ITEM_DEFAULT, 1},
{"tlscacertificatefile", store_dir, ITEM(res_store.tls_ca_certfile), 0, 0, 0},
{"tlscacertificatedir", store_dir, ITEM(res_store.tls_ca_certdir), 0, 0, 0},
{"tlscertificate", store_dir, ITEM(res_store.tls_certfile), 0, 0, 0},
{"description", store_str, ITEM(res_dir.hdr.desc), 0, 0, 0},
{"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
{"monitor", store_yesno, ITEM(res_dir.monitor), 1, ITEM_DEFAULT, 0},
- {"tlsenable", store_yesno, ITEM(res_dir.tls_enable), 1, ITEM_DEFAULT, 0},
- {"tlsrequire", store_yesno, ITEM(res_dir.tls_require), 1, ITEM_DEFAULT, 0},
- {"tlsverifypeer", store_yesno, ITEM(res_dir.tls_verify_peer), 1, ITEM_DEFAULT, 0},
+ {"tlsenable", store_yesno, ITEM(res_dir.tls_enable), 1, 0, 0},
+ {"tlsrequire", store_yesno, ITEM(res_dir.tls_require), 1, 0, 0},
+ {"tlsverifypeer", store_yesno, ITEM(res_dir.tls_verify_peer), 1, ITEM_DEFAULT, 1},
{"tlscacertificatefile", store_dir, ITEM(res_dir.tls_ca_certfile), 0, 0, 0},
{"tlscacertificatedir", store_dir, ITEM(res_dir.tls_ca_certdir), 0, 0, 0},
{"tlscertificate", store_dir, ITEM(res_dir.tls_certfile), 0, 0, 0},
{"name", store_name, ITEM(res_dev.hdr.name), 0, ITEM_REQUIRED, 0},
{"description", store_str, ITEM(res_dir.hdr.desc), 0, 0, 0},
{"mediatype", store_strname,ITEM(res_dev.media_type), 0, ITEM_REQUIRED, 0},
+ {"devicetype", store_devtype,ITEM(res_dev.dev_type), 0, 0, 0},
{"archivedevice", store_strname,ITEM(res_dev.device_name), 0, ITEM_REQUIRED, 0},
{"hardwareendoffile", store_yesno, ITEM(res_dev.cap_bits), CAP_EOF, ITEM_DEFAULT, 1},
{"hardwareendofmedium", store_yesno, ITEM(res_dev.cap_bits), CAP_EOM, ITEM_DEFAULT, 1},
{"changerdevice", store_strname,ITEM(res_dev.changer_name), 0, 0, 0},
{"changercommand", store_strname,ITEM(res_dev.changer_command), 0, 0, 0},
{"alertcommand", store_strname,ITEM(res_dev.alert_command), 0, 0, 0},
- {"maximumchangerwait", store_pint, ITEM(res_dev.max_changer_wait), 0, ITEM_DEFAULT, 5 * 60},
- {"maximumopenwait", store_pint, ITEM(res_dev.max_open_wait), 0, ITEM_DEFAULT, 5 * 60},
+ {"maximumchangerwait", store_time, ITEM(res_dev.max_changer_wait), 0, ITEM_DEFAULT, 5 * 60},
+ {"maximumopenwait", store_time, ITEM(res_dev.max_open_wait), 0, ITEM_DEFAULT, 5 * 60},
{"maximumopenvolumes", store_pint, ITEM(res_dev.max_open_vols), 0, ITEM_DEFAULT, 1},
{"maximumnetworkbuffersize", store_pint, ITEM(res_dev.max_network_buffer_size), 0, 0, 0},
{"volumepollinterval", store_time, ITEM(res_dev.vol_poll_interval), 0, 0, 0},
- {"maximumrewindwait", store_pint, ITEM(res_dev.max_rewind_wait), 0, ITEM_DEFAULT, 5 * 60},
+ {"maximumrewindwait", store_time, ITEM(res_dev.max_rewind_wait), 0, ITEM_DEFAULT, 5 * 60},
{"minimumblocksize", store_pint, ITEM(res_dev.min_block_size), 0, 0, 0},
{"maximumblocksize", store_pint, ITEM(res_dev.max_block_size), 0, 0, 0},
{"maximumvolumesize", store_size, ITEM(res_dev.max_volume_size), 0, 0, 0},
{NULL, NULL, 0}
};
+/*
+ * Device types
+ *
+ * device type device code = token
+ */
+struct s_kw {
+ const char *name;
+ int token;
+};
+static s_kw dev_types[] = {
+ {"file", B_FILE_DEV},
+ {"tape", B_TAPE_DEV},
+ {"dvd", B_DVD_DEV},
+ {"fifo", B_FIFO_DEV},
+ {NULL, 0}
+};
+
+
+/*
+ * Store Device Type (File, FIFO, Tape, DVD)
+ *
+ */
+static void store_devtype(LEX *lc, RES_ITEM *item, int index, int pass)
+{
+ int token, i;
+
+ token = lex_get_token(lc, T_NAME);
+ /* Store the label pass 2 so that type is defined */
+ for (i=0; dev_types[i].name; i++) {
+ if (strcasecmp(lc->str, dev_types[i].name) == 0) {
+ *(int *)(item->value) = dev_types[i].token;
+ i = 0;
+ break;
+ }
+ }
+ if (i != 0) {
+ scan_err1(lc, _("Expected a Device Type keyword, got: %s"), lc->str);
+ }
+ scan_to_eol(lc);
+ set_bit(index, res_all.hdr.item_present);
+}
/* Dump contents of resource */
sendit(sock, _("Warning: no \"%s\" resource (%d) defined.\n"), res_to_str(type), type);
return;
}
- sendit(sock, "dump_resource type=%d\n", type);
+ sendit(sock, _("dump_resource type=%d\n"), type);
if (type < 0) { /* no recursion */
type = - type;
recurse = 0;
res->res_dev.hdr.name,
res->res_dev.media_type, res->res_dev.device_name,
res->res_dev.label_type);
- sendit(sock, " rew_wait=%d min_bs=%d max_bs=%d\n",
+ sendit(sock, " rew_wait=%d min_bs=%d max_bs=%d chgr_wait=%d\n",
res->res_dev.max_rewind_wait, res->res_dev.min_block_size,
- res->res_dev.max_block_size);
+ res->res_dev.max_block_size, res->res_dev.max_changer_wait);
sendit(sock, " max_jobs=%d max_files=%" lld " max_size=%" lld "\n",
res->res_dev.max_volume_jobs, res->res_dev.max_volume_files,
res->res_dev.max_volume_size);
sendit(sock, " max_file_size=%" lld " capacity=%" lld "\n",
res->res_dev.max_file_size, res->res_dev.volume_capacity);
- sendit(sock, " spool_directory=%s\n", NPRT(res->res_dev.spool_directory));
- sendit(sock, " max_spool_size=%" lld " max_job_spool_size=%" lld "\n",
+ sendit(sock, " spool_directory=%s\n", NPRT(res->res_dev.spool_directory));
+ sendit(sock, " max_spool_size=%" lld " max_job_spool_size=%" lld "\n",
res->res_dev.max_spool_size, res->res_dev.max_job_spool_size);
if (res->res_dev.changer_res) {
sendit(sock, " changer=%p\n", res->res_dev.changer_res);
res = NULL;
break;
default:
- Dmsg1(0, "Unknown resource type %d\n", type);
+ Dmsg1(0, _("Unknown resource type %d\n"), type);
break;
}
/* Common stuff again -- free the resource, recurse to next one */
/* Resources containing a resource or an alist */
case R_DIRECTOR:
if ((res = (URES *)GetResWithName(R_DIRECTOR, res_all.res_dir.hdr.name)) == NULL) {
- Emsg1(M_ERROR_TERM, 0, "Cannot find Director resource \"%s\"\n", res_all.res_dir.hdr.name);
+ Emsg1(M_ERROR_TERM, 0, _("Cannot find Director resource %s\n"), res_all.res_dir.hdr.name);
}
res->res_dir.tls_allowed_cns = res_all.res_dir.tls_allowed_cns;
break;
case R_STORAGE:
if ((res = (URES *)GetResWithName(R_STORAGE, res_all.res_dir.hdr.name)) == NULL) {
- Emsg1(M_ERROR_TERM, 0, "Cannot find Storage resource \"%s\"\n", res_all.res_dir.hdr.name);
+ Emsg1(M_ERROR_TERM, 0, _("Cannot find Storage resource %s\n"), res_all.res_dir.hdr.name);
}
res->res_store.messages = res_all.res_store.messages;
res->res_store.tls_allowed_cns = res_all.res_store.tls_allowed_cns;
break;
case R_AUTOCHANGER:
if ((res = (URES *)GetResWithName(type, res_all.res_changer.hdr.name)) == NULL) {
- Emsg1(M_ERROR_TERM, 0, "Cannot find AutoChanger resource %s\n",
+ Emsg1(M_ERROR_TERM, 0, _("Cannot find AutoChanger resource %s\n"),
res_all.res_changer.hdr.name);
}
/* we must explicitly copy the device alist pointer */
}
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf(_("Unknown resource type %d\n"), type);
error = 1;
break;
}
size = sizeof(AUTOCHANGER);
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf(_("Unknown resource type %d\n"), type);
error = 1;
size = 1;
break;
projects / bacula / bacula / blobdiff