From 76cdf1d071442a6dec34c59a2c32397e58691757 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Thu, 16 Feb 2017 11:09:54 -0800 Subject: [PATCH 1/1] fix timeout setting on discoverydb commands --- usr/idbm.c | 2 ++ usr/iscsiadm.c | 1 + 2 files changed, 3 insertions(+) diff --git a/usr/idbm.c b/usr/idbm.c index 3b8a5a2..eb46e94 100644 --- a/usr/idbm.c +++ b/usr/idbm.c @@ -914,6 +914,7 @@ idbm_discovery_setup_defaults(discovery_rec_t *rec, discovery_type_e type) rec->startup = ISCSI_STARTUP_MANUAL; rec->type = type; + rec->iscsid_req_tmo = -1; switch (type) { case DISCOVERY_TYPE_SENDTARGETS: rec->u.sendtargets.discoveryd_poll_inval = 30; @@ -1914,6 +1915,7 @@ idbm_discovery_read(discovery_rec_t *out_rec, int drec_type, return ISCSI_ERR_INVAL; memset(out_rec, 0, sizeof(discovery_rec_t)); + out_rec->iscsid_req_tmo = -1; info = idbm_recinfo_alloc(MAX_KEYS); if (!info) diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c index 4b2bd34..5818596 100644 --- a/usr/iscsiadm.c +++ b/usr/iscsiadm.c @@ -2860,6 +2860,7 @@ static int exec_disc2_op(int disc_type, char *ip, int port, int rc = 0; memset(&drec, 0, sizeof(struct discovery_rec)); + drec.iscsid_req_tmo = -1; if (disc_type != -1) drec.type = disc_type; -- 1.8.3.1