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 9f2a4911efcb25b05d51eccfc42217ffcf8937c0..8a8de08288f6630e1a2e8c84d2f659de92921cd3 100644 (file)
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -59,7 +59,6 @@ static RES_ITEM store_items[] = {
    {"sdaddresses",           store_addresses,  ITEM(res_store.sdaddrs), 0, ITEM_DEFAULT, 9103},
    {"messages",              store_res,  ITEM(res_store.messages),   0, R_MSGS, 0},
    {"sdport",                store_addresses_port,  ITEM(res_store.sdaddrs),     0, ITEM_DEFAULT, 9103},
-   {"sddport",               store_addresses_port,  ITEM(res_store.sddaddrs),    0, 0, 0}, /* deprecated */
    {"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},
@@ -76,6 +75,7 @@ static RES_ITEM dir_items[] = {
    {"description", store_str,      ITEM(res_dir.hdr.desc),   0, 0, 0},
    {"password",    store_password, ITEM(res_dir.password),   0, ITEM_REQUIRED, 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} 
 };
 
@@ -101,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},
@@ -165,16 +167,16 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
       sendit(sock, "Storage: name=%s SDaddr=%s SDport=%d SDDport=%d HB=%s\n",
           res->res_store.hdr.name, 
           NPRT(get_first_address(res->res_store.sdaddrs, buf, sizeof(buf))),
-          get_first_port(res->res_store.sdaddrs), 
-          get_first_port(res->res_store.sddaddrs),
-          edit_utime(res->res_store.heartbeat_interval, 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());
+                            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());
+                            p->get_address(buf, sizeof(buf)), p->get_port_host_order());
          }
       break;
    case R_DEVICE:
@@ -311,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);
         }