Update of /cvsroot/linuxisns/isnsNT/isnsclient/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29873/src
Modified Files:
iscsi.c main.c payloads.c
Log Message:
Add type to query command
Index: payloads.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/payloads.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** payloads.c 7 Feb 2007 00:39:47 -0000 1.3
--- payloads.c 30 Mar 2007 22:55:22 -0000 1.4
***************
*** 98,101 ****
--- 98,102 ----
ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0);
ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, 0, NULL, 0);
+ ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER_IDX, 0, NULL, 0);
}
else
***************
*** 105,108 ****
--- 106,110 ----
ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0);
ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, 0, NULL, 0);
+ ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER_IDX, 0, NULL, 0);
}
***************
*** 408,420 ****
********************************************/
void
! queryISCSI (void)
{
char buffer[2048];
! ISNSCreateHdr (ISNS_DEV_ATTR_QRY_REQ, &cmd, sizeof (cmd), 0);
! ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0);
! ISNSAppendAttr (&cmd, 0, 0, NULL, 0);
! ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, 0, NULL, 0);
if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer)))
--- 410,436 ----
********************************************/
void
! queryISCSI (char * id)
{
char buffer[2048];
! if (strlen(id) )
! {
! ISNSCreateHdr (ISNS_DEV_ATTR_QRY_REQ, &cmd, sizeof (cmd), 0);
! ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0);
! ISNSAppendAttr (&cmd, ISNS_ISCSI_IDX, ISNS_INDEX_SIZE, NULL, atoi(id));
! ISNSAppendAttr (&cmd, 0, 0, NULL, 0);
! ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, 0, NULL, 0);
! ISNSAppendAttr (&cmd, ISNS_ISCSI_TYPE, 0, NULL, 0);
! }
! else
! {
! ISNSCreateHdr (ISNS_DEV_ATTR_QRY_REQ, &cmd, sizeof (cmd), 0);
! ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0);
!
! ISNSAppendAttr (&cmd, 0, 0, NULL, 0);
! ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, 0, NULL, 0);
! ISNSAppendAttr (&cmd, ISNS_ISCSI_TYPE, 0, NULL, 0);
! }
if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer)))
***************
*** 482,486 ****
else if ( 0 == strcmp(command,"iscsi"))
! queryISCSI();
else if ( 0 == strcmp(command,"entity"))
--- 498,502 ----
else if ( 0 == strcmp(command,"iscsi"))
! queryISCSI(id);
else if ( 0 == strcmp(command,"entity"))
Index: main.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.c 2 Feb 2007 23:21:38 -0000 1.4
--- main.c 30 Mar 2007 22:55:22 -0000 1.5
***************
*** 72,76 ****
*****************/
char Usage[] = "\
! Usage: isnsc [options] \n\
Options:\n\
-h Listen for L2 heartbeat from an iSNS.\n\
--- 72,76 ----
*****************/
char Usage[] = "\
! Usage: isnsadm [options] \n\
Options:\n\
-h Listen for L2 heartbeat from an iSNS.\n\
Index: iscsi.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/iscsi.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** iscsi.c 2 Jan 2007 20:15:24 -0000 1.8
--- iscsi.c 30 Mar 2007 22:55:22 -0000 1.9
***************
*** 404,411 ****
printf ("Type: %#x (", p_attr->val.etype);
if (p_attr->val.etype & 1)
! printf ("Target ");
if (p_attr->val.etype & 2)
printf ("Initiator");
! printf (").\n");
break;
case ISNS_ISCSI_ALIAS:
--- 404,411 ----
printf ("Type: %#x (", p_attr->val.etype);
if (p_attr->val.etype & 1)
! printf ("Target");
if (p_attr->val.etype & 2)
printf ("Initiator");
! printf (")\n");
break;
case ISNS_ISCSI_ALIAS:
|
