Resolves: #740054
This commit is contained in:
Mike Christie
parent
292c3acb97
commit
ac41650cec
@ -5,7 +5,7 @@
|
||||
* some other maintainer could merge a patch without going through us
|
||||
*/
|
||||
-#define ISCSI_VERSION_STR "2.0-872"
|
||||
+#define ISCSI_VERSION_STR "2.0-872.40.el6"
|
||||
+#define ISCSI_VERSION_STR "2.0-872.41.el6"
|
||||
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
|
||||
|
||||
#endif
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_if.h 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -270,7 +270,8 @@ struct iscsi_uevent {
|
||||
} host_event;
|
||||
struct msg_ping_comp {
|
||||
@ -32,9 +32,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_if.h open-iscsi-2.0-872-r
|
||||
#define iscsi_ptr(_handle) ((void*)(unsigned long)_handle)
|
||||
#define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr)
|
||||
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/include/iscsi_net_util.h 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -7,5 +7,6 @@ extern int net_get_transport_name_from_n
|
||||
extern int net_get_netdev_from_hwaddress(char *hwaddress, char *netdev);
|
||||
extern int net_setup_netdev(char *netdev, char *local_ip, char *mask,
|
||||
@ -42,9 +42,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/include/iscsi_net_util.h open-iscsi-2.0
|
||||
+extern int net_ifup_netdev(char *netdev);
|
||||
|
||||
#endif
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/iscsiuio/include/config.h 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -59,6 +59,9 @@ typedef struct iface_rec {
|
||||
* 1 = enable */
|
||||
uint16_t mtu;
|
||||
@ -55,9 +55,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/iscsiuio/include/config.h open-iscsi-2.
|
||||
/*
|
||||
* TODO: we may have to make this bigger and interconnect
|
||||
* specific for infinniband
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/libiscsi/libiscsi.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -626,12 +626,15 @@ int libiscsi_node_set_parameter(struct l
|
||||
const char *parameter, const char *value)
|
||||
{
|
||||
@ -79,9 +79,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/libiscsi/libiscsi.c open-iscsi-2.0-872-
|
||||
(char *)node->name, node->tpgt,
|
||||
(char *)node->address, node->port))
|
||||
if (nr_found == 0) {
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/config.h 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/config.h 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/config.h 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -229,6 +229,8 @@ typedef struct iface_rec {
|
||||
* 1 = enable */
|
||||
uint16_t mtu;
|
||||
@ -91,9 +91,21 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/config.h open-iscsi-2.0-872-rc4-bnx
|
||||
/*
|
||||
* TODO: we may have to make this bigger and interconnect
|
||||
* specific for infinniband
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/host.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/discovery.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/discovery.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/discovery.c 2012-04-05 16:03:05.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/discovery.c 2012-04-05 16:04:20.000000000 -0500
|
||||
@@ -849,7 +849,7 @@ iscsi_alloc_session(struct iscsi_sendtar
|
||||
session->isid[4] = 0;
|
||||
session->isid[5] = 0;
|
||||
|
||||
- if (iface && strlen(iface->iname)) {
|
||||
+ if (strlen(iface->iname)) {
|
||||
strcpy(initiator_name, iface->iname);
|
||||
/* MNC TODO add iface alias */
|
||||
} else {
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/host.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/host.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -174,6 +174,16 @@ static int print_host_iface(void *data,
|
||||
iface->ipv6_router);
|
||||
}
|
||||
@ -119,9 +131,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/host.c open-iscsi-2.0-872-rc4-bnx2i
|
||||
err = iscsi_sysfs_for_each_host(&flags, &num_found,
|
||||
host_info_print_tree);
|
||||
break;
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c 2012-04-04 20:58:47.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -608,6 +608,7 @@ setup_passwd_len:
|
||||
for (i=0; i<MAX_KEYS; i++) {
|
||||
if (!strcmp(name, info[i].name)) {
|
||||
@ -278,9 +290,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.c open-iscsi-2.0-872-rc4-bnx2i
|
||||
|
||||
rc = idbm_discovery_write((discovery_rec_t *)rec);
|
||||
if (rc)
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/idbm.h 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <sys/types.h>
|
||||
#include "initiator.h"
|
||||
@ -313,9 +325,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/idbm.h open-iscsi-2.0-872-rc4-bnx2i
|
||||
extern void idbm_node_setup_defaults(node_rec_t *rec);
|
||||
extern struct node_rec *idbm_find_rec_in_list(struct list_head *rec_list,
|
||||
char *targetname, char *addr,
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -169,7 +169,7 @@ free_conf:
|
||||
int iface_conf_read(struct iface_rec *iface)
|
||||
{
|
||||
@ -452,9 +464,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.c open-iscsi-2.0-872-rc4-bnx2
|
||||
if (!t) {
|
||||
log_error("Could not get transport for host%u. "
|
||||
"Make sure the iSCSI driver is loaded.",
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iface.h 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -26,7 +26,6 @@
|
||||
|
||||
struct iface_rec;
|
||||
@ -472,9 +484,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iface.h open-iscsi-2.0-872-rc4-bnx2
|
||||
struct iface_rec *iface);
|
||||
extern int iface_conf_write(struct iface_rec *iface);
|
||||
extern int iface_conf_delete(struct iface_rec *iface);
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/initiator_common.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "host.h"
|
||||
#include "sysdeps.h"
|
||||
@ -514,9 +526,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator_common.c open-iscsi-2.0-8
|
||||
rc = iscsi_set_net_config(t, session, iface);
|
||||
if (rc != 0)
|
||||
return rc;
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsiadm.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -110,6 +110,7 @@ static struct option const long_options[
|
||||
{"ip", required_argument, NULL, 'a'},
|
||||
{"packetsize", required_argument, NULL, 'b'},
|
||||
@ -986,9 +998,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsiadm.c open-iscsi-2.0-872-rc4-b
|
||||
goto out;
|
||||
}
|
||||
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsid.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -409,11 +409,6 @@ int main(int argc, char *argv[])
|
||||
exit(ISCSI_ERR);
|
||||
}
|
||||
@ -1001,9 +1013,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsid.c open-iscsi-2.0-872-rc4-bnx
|
||||
umask(0177);
|
||||
|
||||
mgmt_ipc_fd = -1;
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_ipc.h 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -137,7 +137,7 @@ struct iscsi_ipc {
|
||||
|
||||
int (*exec_ping) (uint64_t transport_handle, uint32_t host_no,
|
||||
@ -1013,9 +1025,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_ipc.h open-iscsi-2.0-872-rc4-
|
||||
|
||||
int (*get_chap) (uint64_t transport_handle, uint32_t host_no,
|
||||
uint16_t chap_tbl_idx, uint32_t num_entries,
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_net_util.c 2012-04-05 16:04:24.000000000 -0500
|
||||
@@ -72,7 +72,7 @@ int net_get_transport_name_from_netdev(c
|
||||
ifr.ifr_data = (caddr_t)&drvinfo;
|
||||
err = ioctl(fd, SIOCETHTOOL, &ifr);
|
||||
@ -1025,6 +1037,33 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872
|
||||
err = errno;
|
||||
goto close_sock;
|
||||
}
|
||||
@@ -228,7 +228,7 @@ int net_setup_netdev(char *netdev, char
|
||||
|
||||
/* Bring up interface */
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
- strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
ifr.ifr_flags = IFF_UP | IFF_RUNNING;
|
||||
if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) {
|
||||
log_error("Could not bring up netdev %s (err %d - %s)",
|
||||
@@ -238,7 +238,7 @@ int net_setup_netdev(char *netdev, char
|
||||
}
|
||||
/* Set IP address */
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
- strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
memcpy(&ifr.ifr_addr, &sk_ipaddr, sizeof(struct sockaddr));
|
||||
if (ioctl(sock, SIOCSIFADDR, &ifr) < 0) {
|
||||
log_error("Could not set ip for %s (err %d - %s)",
|
||||
@@ -249,7 +249,7 @@ int net_setup_netdev(char *netdev, char
|
||||
|
||||
/* Set netmask */
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
- strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
memcpy(&ifr.ifr_addr, &sk_netmask, sizeof(struct sockaddr));
|
||||
if (ioctl(sock, SIOCSIFNETMASK, &ifr) < 0) {
|
||||
log_error("Could not set ip for %s (err %d - %s)",
|
||||
@@ -304,6 +304,59 @@ int net_setup_netdev(char *netdev, char
|
||||
done:
|
||||
close(sock);
|
||||
@ -1054,7 +1093,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872
|
||||
+ }
|
||||
+
|
||||
+ memset(&ifr, 0, sizeof(ifr));
|
||||
+ strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
+ if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
|
||||
+ log_error("Could not bring up netdev %s (err %d - %s)",
|
||||
+ netdev, errno, strerror(errno));
|
||||
@ -1071,7 +1110,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872
|
||||
+
|
||||
+ /* Bring up interface */
|
||||
+ memset(&ifr, 0, sizeof(ifr));
|
||||
+ strncpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
+ strlcpy(ifr.ifr_name, netdev, IFNAMSIZ);
|
||||
+ ifr.ifr_flags = IFF_UP;
|
||||
+ if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) {
|
||||
+ log_error("Could not bring up netdev %s (err %d - %s)",
|
||||
@ -1085,9 +1124,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_net_util.c open-iscsi-2.0-872
|
||||
}
|
||||
|
||||
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsistart.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "log.h"
|
||||
#include "iscsi_util.h"
|
||||
@ -1224,9 +1263,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsistart.c open-iscsi-2.0-872-rc4
|
||||
if (err)
|
||||
exit(err);
|
||||
break;
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -532,6 +532,12 @@ static int iscsi_sysfs_read_iface(struct
|
||||
ret = 0;
|
||||
}
|
||||
@ -1329,9 +1368,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.c open-iscsi-2.0-872-rc
|
||||
- ISCSI_VERSION_FILE);
|
||||
- return -1;
|
||||
-}
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_sysfs.h 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -36,7 +36,6 @@ struct iscsi_auth_config;
|
||||
|
||||
extern void free_transports(void);
|
||||
@ -1348,9 +1387,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_sysfs.h open-iscsi-2.0-872-rc
|
||||
extern int iscsi_sysfs_session_supports_nop(int sid);
|
||||
extern int iscsi_sysfs_session_user_created(int sid);
|
||||
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/iscsi_util.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -90,13 +90,24 @@ str_to_ipport(char *str, int *port, int
|
||||
|
||||
if (!strchr(ip, '.')) {
|
||||
@ -1394,9 +1433,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/iscsi_util.c open-iscsi-2.0-872-rc4
|
||||
if ((f = fopen(pathname, "r"))) {
|
||||
while ((line = fgets(buffer, sizeof (buffer), f))) {
|
||||
param = strstr(line, key);
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/Makefile 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -33,7 +33,7 @@ endif
|
||||
OPTFLAGS ?= -O2 -g
|
||||
WARNFLAGS ?= -Wall -Wstrict-prototypes
|
||||
@ -1415,9 +1454,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/Makefile open-iscsi-2.0-872-rc4-bnx
|
||||
|
||||
iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o
|
||||
$(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/netlink.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -1085,13 +1085,15 @@ ksend_ping(uint64_t transport_handle, ui
|
||||
|
||||
static int kexec_ping(uint64_t transport_handle, uint32_t host_no,
|
||||
@ -1448,9 +1487,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/netlink.c open-iscsi-2.0-872-rc4-bn
|
||||
break;
|
||||
}
|
||||
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.c 2012-04-05 16:04:16.000000000 -0500
|
||||
@@ -19,7 +19,17 @@
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
@ -1469,7 +1508,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-
|
||||
#include "initiator.h"
|
||||
#include "transport.h"
|
||||
#include "log.h"
|
||||
@@ -100,6 +110,151 @@ static struct iscsi_transport_template *
|
||||
@@ -100,6 +110,152 @@ static struct iscsi_transport_template *
|
||||
NULL
|
||||
};
|
||||
|
||||
@ -1513,6 +1552,7 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-
|
||||
+
|
||||
+ transport_load_kmod(transport_name);
|
||||
+ }
|
||||
+ close(sockfd);
|
||||
+
|
||||
+free_ifni:
|
||||
+ if_freenameindex(ifni);
|
||||
@ -1621,9 +1661,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.c open-iscsi-2.0-872-rc4-
|
||||
int set_transport_template(struct iscsi_transport *t)
|
||||
{
|
||||
struct iscsi_transport_template *tmpl;
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/usr/transport.h 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -51,5 +51,7 @@ struct iscsi_transport {
|
||||
};
|
||||
|
||||
@ -1632,9 +1672,9 @@ diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/usr/transport.h open-iscsi-2.0-872-rc4-
|
||||
+extern int transport_probe_for_offload(void);
|
||||
|
||||
#endif
|
||||
diff -Naurp open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c 2012-04-04 20:58:29.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c 2012-04-04 20:58:40.000000000 -0500
|
||||
diff -aurp open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c
|
||||
--- open-iscsi-2.0-872-rc4-bnx2i/utils/fwparam_ibft/fw_entry.c 2012-04-05 16:03:19.000000000 -0500
|
||||
+++ open-iscsi-2.0-872-rc4-bnx2i.work/utils/fwparam_ibft/fw_entry.c 2012-04-05 16:04:06.000000000 -0500
|
||||
@@ -35,6 +35,8 @@
|
||||
#include "idbm_fields.h"
|
||||
#include "iscsi_net_util.h"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,7 +3,7 @@
|
||||
Summary: iSCSI daemon and utility programs
|
||||
Name: iscsi-initiator-utils
|
||||
Version: 6.2.0.872
|
||||
Release: 40%{?dist}
|
||||
Release: 41%{?dist}
|
||||
Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz
|
||||
Source1: iscsid.init
|
||||
Source2: iscsidevs.init
|
||||
@ -37,7 +37,7 @@ Patch11: iscsi-initiator-utils-libiscsi-to-support-offload.patch
|
||||
# sync to upstream commit f9f627fbf0fc96545931ae65aa2b6214841bfd4e to
|
||||
# add iscsiadm ping and host chap support and fix default iface handling
|
||||
Patch12: iscsi-initiator-utils-ping-and-chap.patch
|
||||
# sync to upstream d43143e673eec118e6645a2f46a9f202f341afd7
|
||||
# sync to upstream 6676a1cf6f2d23961e9db70155b5d0e5ce511989
|
||||
Patch13: iscsi-initiator-utils-mod-iface-andport-fixes.patch
|
||||
# add rhel version info to iscsi tools
|
||||
Patch14: iscsi-initiator-utils-add-rh-ver.patch
|
||||
@ -208,6 +208,10 @@ fi
|
||||
%{_includedir}/libiscsi.h
|
||||
|
||||
%changelog
|
||||
* Thu Apr 5 2012 Mike Christie <mcrhsit@redhat.com> 6.2.0.872.41
|
||||
- 810197 Coverity fixes.
|
||||
- 740054 fix iscsiuio version string
|
||||
|
||||
* Wed Apr 4 2012 Mike Christie <mcrhsit@redhat.com> 6.2.0.872.40
|
||||
- 738192 Fix regression added when handling 738192 where unknown params
|
||||
messages got logged by mistake.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user