From: Robert W. <wrw...@us...> - 2007-02-07 00:39:51
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32133/src Modified Files: payloads.c Log Message: update queryDD Index: payloads.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/payloads.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** payloads.c 6 Feb 2007 23:12:16 -0000 1.2 --- payloads.c 7 Feb 2007 00:39:47 -0000 1.3 *************** *** 83,87 **** /*********************************************************************/ void ! queryDD (void) { char buffer[1024]={0}; --- 83,87 ---- /*********************************************************************/ void ! queryDD (char *id) { char buffer[1024]={0}; *************** *** 90,98 **** ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); ! ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ! ! ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, 0, NULL, 0); if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) --- 90,109 ---- ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); ! if (strlen(id)) ! { ! int ddid; ! ddid = atoi(id); ! ISNSAppendAttr (&cmd, ISNS_DD_ID, 4, NULL, ddid); ! ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, 0, NULL, 0); ! } ! else ! { ! ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, 0, NULL, 0); ! } if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) *************** *** 468,472 **** else if ( 0 == strcmp(command,"dd")) ! queryDD(); else if ( 0 == strcmp(command,"iscsi")) --- 479,483 ---- else if ( 0 == strcmp(command,"dd")) ! queryDD(id); else if ( 0 == strcmp(command,"iscsi")) |