Massive SD calling sequence reorganization

[bacula/bacula] / bacula / src / stored / stored_conf.c

diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c
index b4c84f5b1ca70f486a5479f8a43c455a7ab863f6..8a8de08288f6630e1a2e8c84d2f659de92921cd3 100644 (file)
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -35,6 +35,8 @@ extern int debug_level;
 /* First and last resource ids */
 int r_first = R_FIRST;
 int r_last  = R_LAST;
+static RES *sres_head[R_LAST - R_FIRST + 1];
+RES **res_head = sres_head;
 
 
 /* Forward referenced subroutines */
@@ -53,11 +55,10 @@ int res_all_size = sizeof(res_all);
 static RES_ITEM store_items[] = {
    {"name",                  store_name, ITEM(res_store.hdr.name),   0, ITEM_REQUIRED, 0},
    {"description",           store_str,  ITEM(res_dir.hdr.desc),     0, 0, 0},
-   {"address",               store_str,  ITEM(res_store.address),    0, 0, 0}, /* deprecated */
-   {"sdaddress",             store_str,  ITEM(res_store.SDaddr),     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},
-   {"sdport",                store_int,  ITEM(res_store.SDport),     0, ITEM_DEFAULT, 9103},
-   {"sddport",               store_int,  ITEM(res_store.SDDport),    0, 0, 0}, /* deprecated */
+   {"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},
    {"subsysdirectory",       store_dir,  ITEM(res_store.subsys_directory), 0, 0, 0},
@@ -73,8 +74,8 @@ static RES_ITEM dir_items[] = {
    {"name",        store_name,     ITEM(res_dir.hdr.name),   0, ITEM_REQUIRED, 0},
    {"description", store_str,      ITEM(res_dir.hdr.desc),   0, 0, 0},
    {"password",    store_password, ITEM(res_dir.password),   0, ITEM_REQUIRED, 0},
-   {"address",     store_str,      ITEM(res_dir.address),    0, 0, 0},
    {"enablessl",   store_yesno,    ITEM(res_dir.enable_ssl), 1, ITEM_DEFAULT, 0},
+   {"monitor",     store_yesno,    ITEM(res_dir.monitor),   1, ITEM_DEFAULT, 0},
    {NULL, NULL, 0, 0, 0, 0} 
 };
 
@@ -100,8 +101,10 @@ static RES_ITEM dev_items[] = {
    {"alwaysopen",            store_yesno,  ITEM(res_dev.cap_bits), CAP_ALWAYSOPEN, ITEM_DEFAULT, 1},
    {"autochanger",           store_yesno,  ITEM(res_dev.cap_bits), CAP_AUTOCHANGER, ITEM_DEFAULT, 0},
    {"closeonpoll",           store_yesno,  ITEM(res_dev.cap_bits), CAP_CLOSEONPOLL, ITEM_DEFAULT, 0},
+   {"blockpositioning",      store_yesno,  ITEM(res_dev.cap_bits), CAP_POSITIONBLOCKS, 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},
    {"maximumopenvolumes",    store_pint,   ITEM(res_dev.max_open_vols), 0, ITEM_DEFAULT, 1},
@@ -130,21 +133,23 @@ extern RES_ITEM msgs_items[];
 
 /* This is the master resource definition */
 RES_TABLE resources[] = {
-   {"director",      dir_items,   R_DIRECTOR,  NULL},
-   {"storage",       store_items, R_STORAGE,   NULL},
-   {"device",        dev_items,   R_DEVICE,    NULL},
-   {"messages",      msgs_items,  R_MSGS,      NULL},
-   {NULL,           NULL,        0,           NULL}
+   {"director",      dir_items,   R_DIRECTOR},
+   {"storage",       store_items, R_STORAGE},
+   {"device",        dev_items,   R_DEVICE},
+   {"messages",      msgs_items,  R_MSGS},
+   {NULL,           NULL,        0}
 };
 
 
 
+
 /* Dump contents of resource */
 void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fmt, ...), void *sock)
 {
    URES *res = (URES *)reshdr;
    char buf[MAXSTRING];
    int recurse = 1;
+   IPADDR *p;
    if (res == NULL) {
       sendit(sock, _("Warning: no \"%s\" resource (%d) defined.\n"), res_to_str(type), type);
       return;
@@ -160,9 +165,19 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
       break;
    case R_STORAGE:
       sendit(sock, "Storage: name=%s SDaddr=%s SDport=%d SDDport=%d HB=%s\n",
-        res->res_store.hdr.name, NPRT(res->res_store.SDaddr),
-        res->res_store.SDport, res->res_store.SDDport,
-        edit_utime(res->res_store.heartbeat_interval, buf));
+          res->res_store.hdr.name, 
+          NPRT(get_first_address(res->res_store.sdaddrs, buf, sizeof(buf))),
+          get_first_port_host_order(res->res_store.sdaddrs), 
+          get_first_port_host_order(res->res_store.sddaddrs),
+          edit_utime(res->res_store.heartbeat_interval, buf, sizeof(buf)));
+         foreach_dlist(p, res->res_store.sdaddrs) {
+                sendit(sock, "        SDaddr=%s SDport=%d\n", 
+                            p->get_address(buf, sizeof(buf)), p->get_port_host_order());
+         }
+         foreach_dlist(p, res->res_store.sddaddrs) {
+                sendit(sock, "        SDDaddr=%s SDDport=%d\n", 
+                            p->get_address(buf, sizeof(buf)), p->get_port_host_order());
+         }
       break;
    case R_DEVICE:
       sendit(sock, "Device: name=%s MediaType=%s Device=%s\n",
@@ -269,11 +284,11 @@ void free_resource(RES *sres, int type)
         }
         break;
       case R_STORAGE:
-        if (res->res_store.address) {  /* ***FIXME*** deprecated */
-           free(res->res_store.address);
+        if (res->res_store.sdaddrs) {
+           free_addresses(res->res_store.sdaddrs);
         }
-        if (res->res_store.SDaddr) {
-           free(res->res_store.SDaddr);
+        if (res->res_store.sddaddrs) {
+           free_addresses(res->res_store.sddaddrs);
         }
         if (res->res_store.working_directory) {
            free(res->res_store.working_directory);
@@ -298,6 +313,9 @@ void free_resource(RES *sres, int type)
         if (res->res_dev.changer_command) {
            free(res->res_dev.changer_command);
         }
+        if (res->res_dev.alert_command) {
+           free(res->res_dev.alert_command);
+        }
         if (res->res_dev.spool_directory) {
            free(res->res_dev.spool_directory);
         }
@@ -414,12 +432,12 @@ void save_resource(int type, RES_ITEM *items, int pass)
    if (!error) {
       res = (URES *)malloc(size);
       memcpy(res, &res_all, size);
-      if (!resources[rindex].res_head) {
-        resources[rindex].res_head = (RES *)res; /* store first entry */
+      if (!res_head[rindex]) {
+        res_head[rindex] = (RES *)res; /* store first entry */
       } else {
         RES *next;
         /* Add new res to end of chain */
-        for (next=resources[rindex].res_head; next->next; next=next->next) {
+        for (next=res_head[rindex]; next->next; next=next->next) {
            if (strcmp(next->name, res->res_dir.hdr.name) == 0) {
               Emsg2(M_ERROR_TERM, 0,
                   _("Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n"),