Menu
▾
▴
linuxisns-commit — code repos update notification
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(23) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(13) |
Mar
(7) |
Apr
|
May
(2) |
Jun
(1) |
Jul
|
Aug
(31) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
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")) |
|
From: Robert W. <wrw...@us...> - 2007-02-06 23:13:13
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28668/src Modified Files: iSNSquery.c Log Message: group id,symbol on dds query Index: iSNSquery.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** iSNSquery.c 16 Jan 2007 20:21:50 -0000 1.19 --- iSNSquery.c 6 Feb 2007 23:13:10 -0000 1.20 *************** *** 2545,2548 **** --- 2545,2553 ---- ISNS_Attr *attr; ISNS_LIST_NODE *pnode; + int dd_id_Flag = -1; + int dd_sym_Flag = -1; + + dd_id_Flag = ISNSFindTag (0, ISNS_DD_ID, attr_indx); + dd_sym_Flag = ISNSFindTag (0, ISNS_DDS_SYM_NAME, attr_indx); for (ii = 0; (ii < SNS_MAX_ATTRS) && (attr_indx[ii]); ii++) *************** *** 2572,2575 **** --- 2577,2583 ---- int rval; + if (dd_id_Flag != -1 ) + ISNSAppendAttr (p_msg, ISNS_DD_ID, ISNS_DD_ID_SIZE, NULL, *(uint32_t *)GetNodeData(pnode)); + read_key.tag = DD_ID_KEY; read_key.val.dd_key.id = *(uint32_t *)GetNodeData(pnode); *************** *** 2585,2591 **** case ISNS_DD_ID: pnode=NULL; ! while ((pnode=GetNextNode(&p_dds->dd_list, pnode))) { ! ISNSAppendAttr (p_msg, ISNS_DD_ID, ISNS_DD_ID_SIZE, NULL, *(uint32_t *)GetNodeData(pnode)); } break; --- 2593,2602 ---- case ISNS_DD_ID: pnode=NULL; ! if (dd_sym_Flag == -1) { ! while ((pnode=GetNextNode(&p_dds->dd_list, pnode))) ! { ! ISNSAppendAttr (p_msg, ISNS_DD_ID, ISNS_DD_ID_SIZE, NULL, *(uint32_t *)GetNodeData(pnode)); ! } } break; |
|
From: Robert W. <wrw...@us...> - 2007-02-06 23:12:20
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28282/src Modified Files: payloads.c Log Message: change to allow display of dds members only Index: payloads.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/payloads.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** payloads.c 6 Feb 2007 16:33:46 -0000 1.1 --- payloads.c 6 Feb 2007 23:12:16 -0000 1.2 *************** *** 48,52 **** /*********************************************************************/ void ! queryDDS (void) { char buffer[1024]={0}; --- 48,52 ---- /*********************************************************************/ void ! queryDDS (char *id) { char buffer[1024]={0}; *************** *** 54,63 **** 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_DDS_ID, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DDS_SYM_NAME, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DDS_STATUS, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) --- 54,77 ---- ISNSCreateHdr (ISNS_DEV_ATTR_QRY_REQ, &cmd, sizeof(cmd), 0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); ! ! if (strlen(id)) ! { ! int ddsid; ! ddsid = atoi(id); ! ISNSAppendAttr (&cmd, ISNS_DDS_ID, 4, NULL, ddsid); ! ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DDS_SYM_NAME, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); ! } ! else ! { ! ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DDS_ID, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DDS_SYM_NAME, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DDS_STATUS, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); ! ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); ! } if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) *************** *** 451,455 **** case 'q': if(0 == strcmp(command,"dds")) ! queryDDS(); else if ( 0 == strcmp(command,"dd")) --- 465,469 ---- case 'q': if(0 == strcmp(command,"dds")) ! queryDDS(id); else if ( 0 == strcmp(command,"dd")) |
|
From: Robert W. <wrw...@us...> - 2007-02-06 16:34:04
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15167 Added Files: payloads.c Log Message: add for command line support --- NEW FILE: payloads.c --- /*********************************************************************** Copyright (c) 2001, Nishan Systems, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - Neither the name of the Nishan Systems, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NISHAN SYSTEMS, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #include "isns.h" #include "comm.h" #include "util.h" #include "iscsi.h" #include "entity.h" #include "portal.h" static ISNS_CMD cmd; /******************************************* Command line support functions *******************************************/ /*********************************************************************/ /* queryDDS */ /*********************************************************************/ void queryDDS (void) { char buffer[1024]={0}; 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_DDS_ID, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DDS_SYM_NAME, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DDS_STATUS, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) ParseDDSQuery (buffer); } /*********************************************************************/ /* queryDD */ /*********************************************************************/ void queryDD (void) { char buffer[1024]={0}; 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_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))) ParseDDQuery (buffer); } /*********************************************************************/ /* regDDS */ /*********************************************************************/ void regDDS (char * sym) { uint32_t status=0; extern int replaceFlag; ISNSCreateHdr (ISNS_REG_DDS_REQ, &cmd, sizeof (cmd), replaceFlag?ISNS_FLAG_REPLACE_REG:0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); /* Delimiter */ ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DDS_ID, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DDS_SYM_NAME, PAD4 (strlen (sym)), sym, 0); status = 0x1; ISNSAppendAttr (&cmd, ISNS_DDS_STATUS, 4, NULL, status); ISNSSendCmd (&cmd); } /*********************************************************************/ /* regDDSMember */ /*********************************************************************/ void regDDSMember (char * ddsid, char * ddid ) { int dds_id; int dd_id; dds_id = atoi (ddsid); dd_id = atoi (ddid); ISNSCreateHdr (ISNS_REG_DDS_REQ, &cmd, sizeof (cmd), 0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); ISNSAppendAttr (&cmd, ISNS_DDS_ID, 4, NULL, dds_id); ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ID, 4, NULL, dd_id); ISNSSendCmd (&cmd); } /*********************************************************************/ /* regDDMember */ /*********************************************************************/ void regDDMember (char * ddid, char * iscsi_node ) { int dd_id; dd_id = atoi (ddid); ISNSCreateHdr (ISNS_REG_DD_REQ, &cmd, sizeof (cmd), 0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); ISNSAppendAttr (&cmd, ISNS_DD_ID, 4, NULL, dd_id); ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, PAD4 (strlen(iscsi_node)), iscsi_node, 0); ISNSSendCmd (&cmd); } /*********************************************************************/ /* regDD */ /*********************************************************************/ void regDD (char * sym) { extern int replaceFlag; ISNSCreateHdr (ISNS_REG_DD_REQ, &cmd, sizeof (cmd), replaceFlag?ISNS_FLAG_REPLACE_REG:0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); /* Delimiter */ ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, PAD4 (strlen (sym)), sym, 0); ISNSSendCmd (&cmd); } /*********************************************************************/ /*********************************************************************/ void regISCSI (char * sym, char *id) { extern int replaceFlag; ISNSCreateHdr (ISNS_REG_DEV_ATTR_REQ, &cmd, sizeof (cmd), replaceFlag?ISNS_FLAG_REPLACE_REG:0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); ISNSAppendAttr (&cmd, ISNS_ENTITY_ID, PAD4(strlen(id)),id,0); ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4(strlen(sym)),sym,0); ISNSAppendAttr (&cmd, ISNS_ISCSI_TYPE, 4, NULL, 1); ISNSSendCmd (&cmd); } /*********************************************************************/ /*********************************************************************/ void regEntity (char * sym) { extern int replaceFlag; int type; ISNSCreateHdr (ISNS_REG_DEV_ATTR_REQ, &cmd, sizeof (cmd), replaceFlag?ISNS_FLAG_REPLACE_REG:0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); /* Delimiter */ ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_ENTITY_ID, PAD4 (strlen (sym)), sym, 0); type = 2; ISNSAppendAttr (&cmd, ISNS_ENTITY_TYPE, 4, NULL, type); ISNSSendCmd (&cmd); } /*********************************************************************/ /*********************************************************************/ void regPortal (char * ip_address, char * id, char *port_value) { extern int replaceFlag; int port; int portal_type = 1; int ip; char tempb[256]; port = atoi(port_value); printf("port_value:%s\n",port_value); ISNSCreateHdr (ISNS_REG_DEV_ATTR_REQ, &cmd, sizeof (cmd), replaceFlag?ISNS_FLAG_REPLACE_REG:0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); ISNSAppendAttr (&cmd, ISNS_ENTITY_ID, PAD4(strlen(id)),id,0); ISNSAppendAttr (&cmd, 0, 0, NULL, 0); printf("ipaddress:%s\n",ip_address); ip = inet_addr(ip_address); memset (tempb, 0, sizeof(tempb)); tempb[10] = tempb[11] = 0xff; memcpy(tempb + 12, &ip, sizeof(ip)); ISNSAppendAttr (&cmd, ISNS_PORTAL_IP, 16, tempb, 0); ISNSAppendAttr (&cmd, ISNS_PORTAL_PORT, 4, NULL, port | (portal_type == 0 ? 0x10000: 0)); ISNSSendCmd (&cmd); } /*********************************************************************/ /* deregisters a DDS */ /*********************************************************************/ void deregDDS (char *ddsid) { int id; ISNSCreateHdr (ISNS_DEREG_DDS_REQ, &cmd, sizeof (cmd), 0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); id = atoi (ddsid); ISNSAppendAttr (&cmd, ISNS_DDS_ID, 4, NULL, id); ISNSSendCmd (&cmd); } /*********************************************************************/ /* deregisters a DD */ /*********************************************************************/ void deregDD (char *ddid) { int id; ISNSCreateHdr (ISNS_DEREG_DD_REQ, &cmd, sizeof (cmd), 0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); id = atoi (ddid); ISNSAppendAttr (&cmd, ISNS_DD_ID, 4, NULL, id); ISNSSendCmd (&cmd); } /*********************************************************************/ /*********************************************************************/ void deregISCSI (char *iscsi) { ISNSCreateHdr (ISNS_DEREG_DEV_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, PAD4(strlen(iscsi)),iscsi, 0); ISNSSendCmd (&cmd); } /*********************************************************************/ /*********************************************************************/ void deregEntity (char *entity) { ISNSCreateHdr (ISNS_DEREG_DEV_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_ENTITY_ID, PAD4(strlen(entity)),entity, 0); ISNSSendCmd (&cmd); } /*********************************************************************/ /*********************************************************************/ void deregPortal (char *ip_address, char * port_value) { extern int replaceFlag; int port; int portal_type = 1; int ip; char tempb[256]; port = atoi(port_value); ISNSCreateHdr (ISNS_DEREG_DEV_REQ, &cmd, sizeof (cmd), 0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ip = inet_addr(ip_address); memset (tempb, 0, sizeof(tempb)); tempb[10] = tempb[11] = 0xff; memcpy(tempb + 12, &ip, sizeof(ip)); ISNSAppendAttr (&cmd, ISNS_PORTAL_IP, 16, tempb, 0); ISNSAppendAttr (&cmd, ISNS_PORTAL_PORT, 4, NULL, port | (portal_type == 0 ? 0x10000: 0)); ISNSSendCmd (&cmd); } /*********************************************************************/ /* Removes a DD from a DDS */ /*********************************************************************/ void deregDDSMember (char *ddsid, char *ddid) { int dds_id; int dd_id; ISNSCreateHdr (ISNS_DEREG_DDS_REQ, &cmd, sizeof (cmd), 0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); dds_id = atoi (ddsid); ISNSAppendAttr (&cmd, ISNS_DDS_ID, 4, NULL, dds_id); ISNSAppendAttr (&cmd, 0, 0, NULL, 0); dd_id = atoi (ddid); ISNSAppendAttr (&cmd, ISNS_DD_ID, 4, NULL, dd_id); ISNSSendCmd (&cmd); } /*********************************************************************/ /* Removes a DD from a DDS */ /*********************************************************************/ void deregDDMember (char *ddid, char * iscsi_node) { int dd_id; ISNSCreateHdr (ISNS_DEREG_DD_REQ, &cmd, sizeof (cmd), 0); ISNSAppendAttr (&cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); dd_id = atoi (ddid); ISNSAppendAttr (&cmd, ISNS_DD_ID, 4, NULL, dd_id); ISNSAppendAttr (&cmd, 0, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, PAD4(strlen(iscsi_node)), iscsi_node, 0); ISNSSendCmd (&cmd); } /******************************************** This will query for iSCSI Node(s) attributes. ********************************************/ 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))) { ParseISCSIQuery (buffer); } } /******************************************** queryEntity ********************************************/ void queryEntity (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_ENTITY_ID, 0, NULL, 0); if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) { ParseEntityQuery (buffer); } } /******************************************** queryPortal ********************************************/ void queryPortal (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_PORTAL_IP, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_PORTAL_PORT, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_ENTITY_ID, 0, NULL, 0); if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) { ParsePortalQuery (buffer); } } /********************************************************************* commandLineDispatch *********************************************************************/ void CommandLineDispatch (char function, char *command, char *id, char *id2, char *id3) { switch (function) { case 'q': if(0 == strcmp(command,"dds")) queryDDS(); else if ( 0 == strcmp(command,"dd")) queryDD(); else if ( 0 == strcmp(command,"iscsi")) queryISCSI(); else if ( 0 == strcmp(command,"entity")) queryEntity(); else if ( 0 == strcmp(command,"portal")) queryPortal(); else printf("invalid query type\n"); break; case 'r': if(0 == strcmp(command,"dds")) regDDS(id); else if ( 0 == strcmp(command,"dd")) regDD(id); else if ( 0 == strcmp(command,"ddsmember")) regDDSMember(id,id2); else if ( 0 == strcmp(command,"ddmember")) regDDMember(id,id2); else if ( 0 == strcmp(command,"iscsi")) regISCSI(id,id2); else if ( 0 == strcmp(command,"entity")) regEntity(id); else if ( 0 == strcmp(command,"portal")) regPortal(id,id2,id3); else printf("invalid register type\n"); break; case 'd': if(0 == strcmp(command,"dds")) deregDDS(id); else if ( 0 == strcmp(command,"dd")) deregDD(id); else if ( 0 == strcmp(command,"ddsmember")) deregDDSMember (id,id2); else if ( 0 == strcmp(command,"ddmember")) deregDDMember (id,id2); else if ( 0 == strcmp(command,"iscsi")) deregISCSI(id); else if ( 0 == strcmp(command,"entity")) deregEntity(id); else if ( 0 == strcmp(command,"portal")) deregPortal(id,id2); else printf("invalid deregister type\n"); break; } } |
|
From: Robert W. <wrw...@us...> - 2007-02-05 19:29:35
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9328 Modified Files: Makefile Log Message: remove error return Index: Makefile =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 15 Dec 2006 01:13:29 -0000 1.8 --- Makefile 5 Feb 2007 19:29:17 -0000 1.9 *************** *** 32,36 **** exec_prefix = initddir = $(etcdir)/init.d ! sbindir = $(exec_prefix)/sbin PROGRAMS = isnssd --- 32,36 ---- exec_prefix = initddir = $(etcdir)/init.d ! sbindir = $(exec_prefix)/usr/sbin PROGRAMS = isnssd |
|
From: Robert W. <wrw...@us...> - 2007-02-05 19:29:29
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9328/src Modified Files: iSNSdereg.c Log Message: remove error return Index: iSNSdereg.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSdereg.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** iSNSdereg.c 4 Jan 2007 19:00:06 -0000 1.23 --- iSNSdereg.c 5 Feb 2007 19:29:17 -0000 1.24 *************** *** 463,466 **** --- 463,468 ---- ISNS_Attr *key_indx[SNS_MAX_ATTRS]; + DEBUG_0 (isns_dereg_debug & 1, "Entering RemoveAttrDD()\n"); + ISNSParseMsg( &p_md->msg, attr_indx, key_indx, &src_attr ); *************** *** 1408,1411 **** --- 1410,1415 ---- ISNS_DBKey key; + DEBUG_0 (isns_dereg_debug & 1, "Entering RemoveDD_Member()\n"); + dd_key.id = id; *************** *** 1430,1438 **** { case ISNS_DD_ISCSI_MEMBER: ! if (ISNS_NO_ERR != ! Remove_DD_from_ISCSI_Node (p_dd, (char *)&p_attr->val)) ! { ! return (ERROR); ! } Remove_DD_Member (p_dd, (char *)&p_attr->val, ISNS_DD_ISCSI_MEMBER); --- 1434,1438 ---- { case ISNS_DD_ISCSI_MEMBER: ! Remove_DD_from_ISCSI_Node (p_dd, (char *)&p_attr->val); Remove_DD_Member (p_dd, (char *)&p_attr->val, ISNS_DD_ISCSI_MEMBER); |
|
From: Robert W. <wrw...@us...> - 2007-02-05 17:37:30
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24750 Modified Files: Makefile Log Message: correct name of executable Index: Makefile =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 2 Feb 2007 23:21:38 -0000 1.5 --- Makefile 5 Feb 2007 17:37:14 -0000 1.6 *************** *** 60,71 **** sbindir = $(exec_prefix)/sbin ! PROGRAMS = isnsc isnsclient all : $(PROGRAMS) ! isnsc: $(PROG1) $(OBJECTS) $(CC) $^ -o $@ $(LIBS) ! isnsclient: $(PROG2) $(OBJECTS) $(CC) $^ -o $@ $(LIBS) --- 60,71 ---- sbindir = $(exec_prefix)/sbin ! PROGRAMS = isnsc isnsadm all : $(PROGRAMS) ! isnsc: $(PROG2) $(OBJECTS) $(CC) $^ -o $@ $(LIBS) ! isnsadm: $(PROG1) $(OBJECTS) $(CC) $^ -o $@ $(LIBS) |
|
From: Robert W. <wrw...@us...> - 2007-02-02 23:21:43
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3958/src Modified Files: comm.c main.c util.c Added Files: main_ui.c Log Message: add a command line version --- NEW FILE: main_ui.c --- /*********************************************************************** Copyright (c) 2001, Nishan Systems, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - Neither the name of the Nishan Systems, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NISHAN SYSTEMS, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ #ifdef SNS_LINUX #include <pthread.h> #else #include "getarg.h" #endif #include "isns.h" #include "iscsi.h" #include "portal.h" #include "entity.h" #include "ifcp.h" #include "fcnode.h" #include "util.h" #include "comm.h" #include "menu.h" /*************************************** Globals **************************************/ char p_ip[256]; extern int isns_port; extern int enableESIFlag; extern char multicast_addr[20]; /******************************** Locals ********************************/ static char query[100]=""; static char reg[100]=""; static char dereg[100]=""; static char idvalue[100]=""; static char idvaluemember[256]=""; /***************** Usage Message *****************/ char Usage[] = "\ Usage: isnsclient [options] \n\ Options:\n\ -h Listen for L2 heartbeat from an iSNS.\n\ -a ip iSNS Address.\n\ -t TCP mode.\n\ -p port Port used for sending. Default is port 3205.\n\ -? Help.\n\ \n\ "; /***********************************************************************/ int main (int argc, char **argv) { int l3_hb_flag; int hb_flag; int c; int tcpFlag; memset (p_ip, 0, sizeof (p_ip)); printf ("IETF iSNS Open Source Client, v%s.\n", ISNS_VERSION); if (argc < 1) { fprintf (stderr, Usage); exit (0); } /* init ESI */ InitESITable (); /* Default Values */ isns_port = ISNS_SERVER_PORT; tcpFlag = FALSE; enableESIFlag = TRUE; hb_flag = FALSE; l3_hb_flag = FALSE; /* Parse Command Line arguments */ while (optind != argc) { c = getopt (argc, argv, "htd:p:a:m:q:r:n:e:"); switch (c) { case EOF: optarg = argv[optind]; optind++; break; case 't': tcpFlag = TRUE; break; case 'p': isns_port = atoi (optarg); break; case 'a': strcpy (p_ip, optarg); break; case 'h': hb_flag=TRUE; break; case 'c': l3_hb_flag=TRUE; strcpy (multicast_addr, optarg); break; case 'q': strcpy (query, optarg); break; case 'r': strcpy (reg, optarg); break; case 'd': strcpy (dereg, optarg); break; case 'n': strcpy (idvalue, optarg); break; case 'm': strcpy (idvaluemember, optarg); break; case '?': default: fprintf (stderr, Usage); exit (0); } } if (0 == strlen (p_ip) && hb_flag==FALSE && l3_hb_flag==FALSE) { /* Error case: No IP */ fprintf (stderr, Usage); exit (0); } /* Init the Communications sockets */ if (-1==InitComm(hb_flag, l3_hb_flag, tcpFlag)) exit(-1); Interact (); return (0); } Index: util.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/util.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** util.c 8 Dec 2006 20:05:49 -0000 1.4 --- util.c 2 Feb 2007 23:21:38 -0000 1.5 *************** *** 40,44 **** int hexDumpFlag; ! int parserFlag=TRUE; /*************************************************** --- 40,44 ---- int hexDumpFlag; ! int parserFlag=FALSE; /*************************************************** Index: main.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** main.c 22 Nov 2006 21:01:52 -0000 1.3 --- main.c 2 Feb 2007 23:21:38 -0000 1.4 *************** *** 31,35 **** ***********************************************************************/ - /* -bli0 -i3 -ts3 -nut*/ #ifdef SNS_LINUX --- 31,34 ---- *************** *** 39,45 **** #endif - #include "isns.h" - #include "iscsi.h" #include "portal.h" --- 38,42 ---- *************** *** 51,62 **** #include "menu.h" /*************************************** Globals **************************************/ - int debugFlag = FALSE; char p_ip[256]; - - /******************************** - ********************************/ extern int isns_port; extern int enableESIFlag; --- 48,57 ---- #include "menu.h" + extern void CommandLineDispatch (char , char *, char *, char *,char *); + /*************************************** Globals **************************************/ char p_ip[256]; extern int isns_port; extern int enableESIFlag; *************** *** 64,69 **** /******************************** ********************************/ ! /***************** --- 59,70 ---- /******************************** + Locals ********************************/ ! static char query[100]=""; ! static char reg[100]=""; ! static char dereg[100]=""; ! static char idvalue[100]=""; ! static char idvaluemember[256]=""; ! static char id3[256]=""; /***************** *************** *** 73,86 **** Usage: isnsc [options] \n\ Options:\n\ ! [-h] Listen for L2 heartbeat from an iSNS.\n\ ! [-a ip] iSNS Address.\n\ ! [-t] TCP mode.\n\ ! [-p port] Port used for sending. Default is port 3205.\n\ ! [-?] Help.\n\ \n\ "; - #if 0 - [-m grp] Listens for L3 heartbeat. - #endif /***********************************************************************/ --- 74,108 ---- Usage: isnsc [options] \n\ Options:\n\ ! -h Listen for L2 heartbeat from an iSNS.\n\ ! -a ip iSNS Address.\n\ ! -t TCP mode.\n\ ! -p port Port used for sending. Default is port 3205.\n\ ! -? Help.\n\ ! -q type Query\n\ ! type: dds\n\ ! type: dd\n\ ! type: iscsi\n\ ! type: entity\n\ ! type: portal\n\ ! -r type -n name -m member -v portvalue \n\ ! Register\n\ ! type:dds name:id\n\ ! type:dd name:id\n\ ! type:ddsmember name:ddsid member:ddid\n\ ! type:ddmember name:ddid member:iscsinode\n\ ! type:entity name:id\n\ ! type:iscsi name:iqnvalue member:entityid\n\ ! type:portal name:ipvalue member:entityid -v port\n\ ! -d type -n name -m member\n\ ! Deregister\n\ ! type:dds name=index\n\ ! type:dd name=index\n\ ! type:ddsmember name=ddsid member:ddid\n\ ! type:ddmember name:ddid member:iscsinode\n\ ! type:entity name:id\n\ ! type:iscsi name:iqnvalue\n\ ! type:portal name:ipvalue member:port\n\ \n\ "; /***********************************************************************/ *************** *** 115,119 **** while (optind != argc) { ! c = getopt (argc, argv, "htd:p:a:m:"); switch (c) --- 137,141 ---- while (optind != argc) { ! c = getopt (argc, argv, "htd:p:a:m:q:r:n:e:v:"); switch (c) *************** *** 131,138 **** break; - case 'd': - debugFlag = TRUE; - break; - case 'a': strcpy (p_ip, optarg); --- 153,156 ---- *************** *** 143,151 **** break; ! case 'm': l3_hb_flag=TRUE; strcpy (multicast_addr, optarg); break; case '?': default: --- 161,193 ---- break; ! case 'c': l3_hb_flag=TRUE; strcpy (multicast_addr, optarg); break; + case 'q': + strcpy (query, optarg); + break; + + case 'r': + strcpy (reg, optarg); + break; + + case 'd': + strcpy (dereg, optarg); + break; + + case 'n': + strcpy (idvalue, optarg); + break; + + case 'm': + strcpy (idvaluemember, optarg); + break; + + case 'v': + strcpy (id3, optarg); + break; + case '?': default: *************** *** 157,161 **** if (0 == strlen (p_ip) && hb_flag==FALSE && l3_hb_flag==FALSE) { - /* Error case: No IP */ fprintf (stderr, Usage); exit (0); --- 199,202 ---- *************** *** 166,177 **** exit(-1); ! printf ("Using iSNS IP: %s.\n", p_ip); ! ! Interact (); ! /* We Should never return. */ - #ifndef SNS_LINUX - WSACleanup (); - #endif return (0); } --- 207,227 ---- exit(-1); ! if (strcmp(query,"")) ! CommandLineDispatch ('q',query,idvalue,idvaluemember,id3); ! else if (strcmp(reg,"")) ! { ! if ( 0 == strlen(idvalue)) ! printf ("-n parameter required\n"); ! else ! CommandLineDispatch ('r',reg,idvalue,idvaluemember,id3); ! } ! else if (strcmp(dereg,"")) ! { ! if ( 0 == strlen(idvalue)) ! printf ("-n parameter required\n"); ! else ! CommandLineDispatch ('d',dereg,idvalue,idvaluemember,id3); ! } return (0); } Index: comm.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/comm.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** comm.c 12 Dec 2006 22:14:31 -0000 1.5 --- comm.c 2 Feb 2007 23:21:38 -0000 1.6 *************** *** 65,69 **** int isns_port; /* iSNS port */ ! extern char *optarg; extern int enableESIFlag; --- 65,69 ---- int isns_port; /* iSNS port */ ! extern int parserFlag; extern char *optarg; extern int enableESIFlag; *************** *** 203,207 **** cmd->hdr.len = htons (cmd->hdr.len); e = SendPDU (cmd, len); ! printf("PDU sent-->\n"); DumpHex (cmd, e); if (e < 0) --- 203,209 ---- cmd->hdr.len = htons (cmd->hdr.len); e = SendPDU (cmd, len); ! ! if (parserFlag) ! printf("PDU sent-->\n"); DumpHex (cmd, e); if (e < 0) *************** *** 307,311 **** return (e); } ! printf("PDU sent-->\n"); DumpHex (cmd, len); len = sizeof (their_addr); --- 309,315 ---- return (e); } ! if (parserFlag) ! printf("PDU sent-->\n"); ! DumpHex (cmd, len); len = sizeof (their_addr); *************** *** 315,319 **** printf ("Error Receiving.\n"); } ! printf("PDU rcv-->\n"); DumpHex (buffer, e); --- 319,326 ---- printf ("Error Receiving.\n"); } ! ! if (parserFlag) ! printf("PDU rcv-->\n"); ! DumpHex (buffer, e); *************** *** 360,364 **** printf ("Error Sending.\n"); } ! printf("PDU sent-->\n"); DumpHex (cmd, len); len = sizeof (their_addr); --- 367,373 ---- printf ("Error Sending.\n"); } ! ! if (parserFlag) ! printf("PDU sent-->\n"); DumpHex (cmd, len); len = sizeof (their_addr); *************** *** 369,373 **** printf ("Error Receiving.\n"); } ! printf("PDU rcv-->\n"); DumpHex (rcvBuffer, e); --- 378,385 ---- printf ("Error Receiving.\n"); } ! ! if (parserFlag) ! printf("PDU rcv-->\n"); ! DumpHex (rcvBuffer, e); |
|
From: Robert W. <wrw...@us...> - 2007-02-02 23:21:43
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3958 Modified Files: Makefile Log Message: add a command line version Index: Makefile =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 8 Dec 2006 20:05:49 -0000 1.4 --- Makefile 2 Feb 2007 23:21:38 -0000 1.5 *************** *** 33,37 **** OBJECTS = getarg.o - OBJECTS += main.o OBJECTS += comm.o OBJECTS += entity.o --- 33,36 ---- *************** *** 39,42 **** --- 38,42 ---- OBJECTS += parse.o OBJECTS += isns.o + OBJECTS += payloads.o OBJECTS += ifcp.o OBJECTS += fcnode.o *************** *** 46,49 **** --- 46,52 ---- OBJECTS += menu.o + PROG1 = main.o + PROG2 = main_ui.o + WARNFLAGS = -Wall OPTFLAGS ?= -g -O2 *************** *** 53,61 **** LIBS = -lpthread ! PROGRAMS = isnsc all : $(PROGRAMS) ! isnsc: $(OBJECTS) $(CC) $^ -o $@ $(LIBS) --- 56,71 ---- LIBS = -lpthread ! DESTDIR ?= ! INSTALL = install ! sbindir = $(exec_prefix)/sbin ! ! PROGRAMS = isnsc isnsclient all : $(PROGRAMS) ! isnsc: $(PROG1) $(OBJECTS) ! $(CC) $^ -o $@ $(LIBS) ! ! isnsclient: $(PROG2) $(OBJECTS) $(CC) $^ -o $@ $(LIBS) *************** *** 66,69 **** --- 76,82 ---- $(CC) -I$(INCDIR) $(CFLAGS) -c $< -o $@ + main_ui.o : $(SRCDIR)main_ui.c + $(CC) -I$(INCDIR) $(CFLAGS) -c $< -o $@ + comm.o : $(SRCDIR)comm.c $(CC) -I$(INCDIR) $(CFLAGS) -c $< -o $@ *************** *** 84,87 **** --- 97,103 ---- $(CC) -I$(INCDIR) $(CFLAGS) -c $< -o $@ + payloads.o : $(SRCDIR)payloads.c + $(CC) -I$(INCDIR) $(CFLAGS) -c $< -o $@ + ifcp.o : $(SRCDIR)ifcp.c $(CC) -I$(INCDIR) $(CFLAGS) -c $< -o $@ *************** *** 99,103 **** $(CC) -I$(INCDIR) $(CFLAGS) -c $< -o $@ - clean : ! rm $(OBJECTS) isnsc --- 115,125 ---- $(CC) -I$(INCDIR) $(CFLAGS) -c $< -o $@ clean : ! rm $(PROG1) $(PROG2) $(OBJECTS) isnsc isnsclient ! ! install: install_programs ! ! install_programs: $(PROGRAMS) ! $(INSTALL) -d $(DESTDIR)$(sbindir) ! $(INSTALL) -m 755 $^ $(DESTDIR)$(sbindir) ! |
|
From: Robert W. <wrw...@us...> - 2007-01-17 01:12:05
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/etc In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23940/etc Modified Files: initd.suse Log Message: start isnsdfrom correct location on disk Index: initd.suse =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/etc/initd.suse,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** initd.suse 8 Dec 2006 20:05:50 -0000 1.2 --- initd.suse 17 Jan 2007 01:12:02 -0000 1.3 *************** *** 17,21 **** PID_FILE=/var/run/isns.pid CONFIG_FILE=/etc/isns/isns.conf ! DAEMON=/sbin/isnsd ARGS="" --- 17,21 ---- PID_FILE=/var/run/isns.pid CONFIG_FILE=/etc/isns/isns.conf ! DAEMON=/usr/sbin/isnsd ARGS="" |
|
From: Robert W. <wrw...@us...> - 2007-01-16 20:23:00
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6824/src Modified Files: isns.c parse.c Log Message: enhance DD and DDS information Index: isns.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/isns.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** isns.c 12 Jan 2007 21:12:33 -0000 1.8 --- isns.c 16 Jan 2007 20:22:54 -0000 1.9 *************** *** 213,222 **** case ISNS_DDS_STATUS: p_attr->val.etype = ntohl (p_attr->val.etype); ! printf ("Status: %#x\n", p_attr->val.etype); break; case ISNS_DD_ID: p_attr->val.etype = ntohl (p_attr->val.etype); ! printf ("DD ID : %d\n", p_attr->val.etype); break; default: break; --- 213,228 ---- case ISNS_DDS_STATUS: p_attr->val.etype = ntohl (p_attr->val.etype); ! printf ("Status: %s\n", p_attr->val.etype?"Active":"Disabled"); break; case ISNS_DD_ID: p_attr->val.etype = ntohl (p_attr->val.etype); ! printf (" DD ID : %d\n", p_attr->val.etype); ! break; ! case ISNS_DD_SYM_NAME: ! printf (" DD Sym Name : %s\n",(char *)&p_attr->val); break; + case ISNS_DD_ACTIVE: + p_attr->val.etype = ntohl (p_attr->val.etype); + printf ("Status: %s\n", p_attr->val.etype?"Active":"Disabled"); default: break; *************** *** 287,290 **** --- 293,297 ---- ISNSAppendAttr (&cmd, ISNS_DDS_STATUS, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); + ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) *************** *** 320,331 **** case ISNS_DDS_ID: p_attr->val.etype = ntohl (p_attr->val.etype); ! printf ("DDS ID : %d\n", p_attr->val.etype); break; case ISNS_DD_ISCSI_MEMBER_IDX: p_attr->val.etype = ntohl (p_attr->val.etype); ! printf ("DD iSCSI Member Index : %d\n", p_attr->val.etype); break; case ISNS_DD_ISCSI_MEMBER: ! printf ("DD iSCSI Member : %s\n",(char *)&p_attr->val); break; case ISNS_DD_IFCP_MEMBER: --- 327,341 ---- case ISNS_DDS_ID: p_attr->val.etype = ntohl (p_attr->val.etype); ! printf (" DDS ID : %d\n", p_attr->val.etype); ! break; ! case ISNS_DDS_SYM_NAME: ! printf (" DDS Sym Name : %s\n",(char *)&p_attr->val); break; case ISNS_DD_ISCSI_MEMBER_IDX: p_attr->val.etype = ntohl (p_attr->val.etype); ! printf (" DD iSCSI Member Index : %d\n", p_attr->val.etype); break; case ISNS_DD_ISCSI_MEMBER: ! printf (" DD iSCSI Member : %s\n",(char *)&p_attr->val); break; case ISNS_DD_IFCP_MEMBER: *************** *** 333,337 **** char buffer2[256]; memset (buffer2, 0, sizeof (buffer2)); ! printf ("iFCP WWPN : %s\n", HexToAscii ((char *)&p_attr->val, p_attr->len, buffer2)); break; --- 343,347 ---- char buffer2[256]; memset (buffer2, 0, sizeof (buffer2)); ! printf (" iFCP WWPN : %s\n", HexToAscii ((char *)&p_attr->val, p_attr->len, buffer2)); break; *************** *** 403,411 **** ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); - ISNSAppendAttr (&cmd, ISNS_DDS_ID, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_FEATURE_BITMAP, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_IFCP_MEMBER, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER_IDX, 0, NULL, 0); if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) --- 413,422 ---- ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_FEATURE_BITMAP, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_IFCP_MEMBER, 0, NULL, 0); ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER_IDX, 0, NULL, 0); + ISNSAppendAttr (&cmd, ISNS_DDS_ID, 0, NULL, 0); + ISNSAppendAttr (&cmd, ISNS_DDS_SYM_NAME, 0, NULL, 0); if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer))) Index: parse.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/parse.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** parse.c 19 Dec 2006 20:33:49 -0000 1.6 --- parse.c 16 Jan 2007 20:22:54 -0000 1.7 *************** *** 332,336 **** case ISNS_FC_NODE_CERT : case ISNS_COMPANY_OUI : - default: printf ("Tag: %s = ", isnsTagText(attrtag)); for (valword=(int *)&p_attr->val.etype, i = 0; i<attrlen; i+=4) { --- 332,335 ---- *************** *** 339,342 **** --- 338,344 ---- printf("\n"); break; + default: + printf ("Tag: %s \n", isnsTagText(attrtag)); + break; } ptr += (attrlen + 8); |
|
From: Robert W. <wrw...@us...> - 2007-01-16 20:22:03
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6372/src Modified Files: iSNSList.c iSNSquery.c Log Message: correct DD_DDS_LIST database read/write Index: iSNSquery.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** iSNSquery.c 4 Jan 2007 19:00:07 -0000 1.18 --- iSNSquery.c 16 Jan 2007 20:21:50 -0000 1.19 *************** *** 2563,2575 **** NULL, p_dds->status); break; ! case ISNS_DD_ID: pnode=NULL; while ((pnode=GetNextNode(&p_dds->dd_list, pnode))) { ! ISNSAppendAttr (p_msg, ISNS_DD_ID, ISNS_DD_ID_SIZE, NULL, ! *(uint32_t *)GetNodeData(pnode)); } break; ! default: break; } --- 2563,2594 ---- NULL, p_dds->status); break; ! case ISNS_DD_SYM_NAME: ! pnode=NULL; ! while ((pnode=GetNextNode(&p_dds->dd_list, pnode))) ! { ! SOIP_Dd *p_dd; ! ISNS_DBKey read_key; ! SOIP_DB_Entry lentry; ! int rval; ! ! read_key.tag = DD_ID_KEY; ! read_key.val.dd_key.id = *(uint32_t *)GetNodeData(pnode); ! rval = ISNSdbRead(&read_key,&lentry); ! if (rval == SUCCESS) ! { ! p_dd = (SOIP_Dd *)&lentry.data; ! ISNSAppendAttr (p_msg, ISNS_DD_SYM_NAME, ! PAD4 (strlen (p_dd->sym_name)), p_dd->sym_name, 0); ! } ! } ! break; ! case ISNS_DD_ID: pnode=NULL; while ((pnode=GetNextNode(&p_dds->dd_list, pnode))) { ! ISNSAppendAttr (p_msg, ISNS_DD_ID, ISNS_DD_ID_SIZE, NULL, *(uint32_t *)GetNodeData(pnode)); } break; ! default: break; } *************** *** 2587,2590 **** --- 2606,2610 ---- ISNS_LIST_NODE *pnode; SOIP_Dd_Member *p_member; + SOIP_DB_Entry lentry; for (ii = 0; (ii < SNS_MAX_ATTRS) && (attr_indx[ii]); ii++) *************** *** 2612,2615 **** --- 2632,2652 ---- } break; + case ISNS_DDS_SYM_NAME: + pnode=NULL; + while ((pnode=GetNextNode(&p_dd->dds_list, pnode))) + { + int rval; + SOIP_Dds *p_dds; + ISNS_DBKey key; + key.tag = DDS_ID_KEY; + key.val.dds_key.id = *(uint32_t *)GetNodeData(pnode); + rval = ISNSdbRead(&key,&lentry); + if (rval == SUCCESS) + { + p_dds = (SOIP_Dds *)&lentry.data; + ISNSAppendAttr (p_msg, ISNS_DDS_SYM_NAME, PAD4(strlen(p_dds->sym_name)),p_dds->sym_name,0); + } + } + break; case ISNS_DD_ISCSI_MEMBER: pnode=NULL; *************** *** 2645,2651 **** } break; - case ISNS_DD_ACTIVE: - ISNSAppendAttr (p_msg, ISNS_DD_ACTIVE, ISNS_DD_ACTIVE_SIZE, NULL, p_dd->activeFlag); - break; default: break; --- 2682,2685 ---- Index: iSNSList.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSList.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** iSNSList.c 21 Dec 2006 00:50:51 -0000 1.11 --- iSNSList.c 16 Jan 2007 20:21:50 -0000 1.12 *************** *** 257,260 **** --- 257,265 ---- key.val.list.key.dds.id = p_dds->id; } + else if (plist->list_id == DD_DDS_LIST) + { + p_dd = plist->p_entry; + key.val.list.key.dd.id = p_dd->id; + } else if (plist->list_id == DD_MEMBER_LIST) { *************** *** 422,425 **** --- 427,436 ---- memcpy(&entry.data.list.key.dd,pdata,data_size); } + else if (plist->list_id == DD_DDS_LIST) + { + p_dd = plist->p_entry; + key.val.list.key.dd.id = p_dd->id; + memcpy(&entry.data.list.key.dds,pdata,data_size); + } else if (plist->list_id == DD_MEMBER_LIST) { |
|
From: Robert W. <wrw...@us...> - 2007-01-12 21:14:57
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20501/src Modified Files: isns.c portal.c Log Message: fix src attr for adding dd to dds Index: isns.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/isns.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** isns.c 4 Jan 2007 18:58:36 -0000 1.7 --- isns.c 12 Jan 2007 21:12:33 -0000 1.8 *************** *** 832,835 **** --- 832,838 ---- /* SRC */ + if (-1 == GetSrc (&cmd, 0)) + return; + ISNSAppendAttr (&cmd, 0, 0, NULL, 0); Index: portal.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/portal.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** portal.c 19 Dec 2006 20:33:49 -0000 1.8 --- portal.c 12 Jan 2007 21:13:01 -0000 1.9 *************** *** 322,325 **** --- 322,326 ---- char tempb[256]; memset (tempb, 0, sizeof (tempb)); + tempb[10] = tempb[11] = 0xff; memcpy (tempb + 12, &ip, sizeof (ip)); ISNSAppendAttr (&cmd, ISNS_PORTAL_IP, 16, tempb, 0); |
|
From: Robert W. <wrw...@us...> - 2007-01-12 21:12:17
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/include In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20023/include Modified Files: iSNStypes.h Log Message: buffer overflow fix Index: iSNStypes.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNStypes.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** iSNStypes.h 4 Jan 2007 19:00:06 -0000 1.12 --- iSNStypes.h 12 Jan 2007 21:10:22 -0000 1.13 *************** *** 154,158 **** typedef struct soip_node_name { ! char v[ISNS_NODE_NAME_SIZE]; } SOIP_Node_Name, SOIP_Node_Key; --- 154,158 ---- typedef struct soip_node_name { ! char v[NODE_SYM_NAME_SIZE]; } SOIP_Node_Name, SOIP_Node_Key; *************** *** 164,168 **** typedef struct soip_db_node_name { ! char v[DB_NODE_NAME_SIZE]; char pad[3]; --- 164,168 ---- typedef struct soip_db_node_name { ! char v[NODE_SYM_NAME_SIZE]; char pad[3]; |
|
From: Robert W. <wrw...@us...> - 2007-01-04 19:48:57
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22501/isnsserver Modified Files: README.txt ReleaseNotes.txt Log Message: update readme and release notes Index: ReleaseNotes.txt =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/ReleaseNotes.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReleaseNotes.txt 4 Jan 2007 19:28:54 -0000 1.1 --- ReleaseNotes.txt 4 Jan 2007 19:48:54 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + Release 2.0 01/04/2007 + ------------------------------- + Upgraded to latest RFC specification + Added persistent database support + Fixed much of the registration, degregistration, and query processing. + Release 1.2.1 4/2/2002 ------------------------- Index: README.txt =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/README.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README.txt 22 Nov 2006 21:01:52 -0000 1.3 --- README.txt 4 Jan 2007 19:48:54 -0000 1.4 *************** *** 2,68 **** ______________________ iSNS Release ! Version 1.2.x ______________________ Introduction ! 1) Please read and accept the "iSNS License" before use 2) The client and server application can be built with ! For Linux: gcc ! Linux OS v6.2 and v7.1 were used during test [...1548 lines suppressed...] - --------------------------------- - iSCSI ID : is1 - Type: 0x1 (Target ). - Alias : target is1 - DD ID : 1 - DD ID : 3 - DD ID : 4 - Entity ID : et1 - Version: Max=7, Min=5. - Portal IP : 10.1.1.1. - Portal Port : 4000. - Portal Type : TCP. - Portal IP : 10.1.1.1. - Portal Port : 4001. - Portal Type : TCP. - Please select an option (0 for Help): - - - End of Steps <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< --- 164,165 ---- |
|
From: Robert W. <wrw...@us...> - 2007-01-04 19:48:57
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22501/isnsclient Modified Files: README.txt ReleaseNotes.txt Log Message: update readme and release notes Index: ReleaseNotes.txt =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/ReleaseNotes.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReleaseNotes.txt 4 Jan 2007 19:33:59 -0000 1.1 --- ReleaseNotes.txt 4 Jan 2007 19:48:54 -0000 1.2 *************** *** 1,2 **** --- 1,7 ---- + Release 2.0 01/04/2007 + ------------------------- + Updated to work with 2.0 release of the isns server + + Release 1.2.1 4/2/2002 ------------------------- Index: README.txt =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/README.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README.txt 22 Nov 2006 21:01:52 -0000 1.3 --- README.txt 4 Jan 2007 19:48:54 -0000 1.4 *************** *** 2,68 **** ______________________ iSNS Release ! Version 1.2.x ______________________ Introduction ! 1) Please read and accept the "iSNS License" before use 2) The client and server application can be built with ! For Linux: gcc ! Linux OS v6.2 and v7.1 were used during test [...1548 lines suppressed...] - --------------------------------- - iSCSI ID : is1 - Type: 0x1 (Target ). - Alias : target is1 - DD ID : 1 - DD ID : 3 - DD ID : 4 - Entity ID : et1 - Version: Max=7, Min=5. - Portal IP : 10.1.1.1. - Portal Port : 4000. - Portal Type : TCP. - Portal IP : 10.1.1.1. - Portal Port : 4001. - Portal Type : TCP. - Please select an option (0 for Help): - - - End of Steps <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< --- 164,165 ---- |
|
From: Robert W. <wrw...@us...> - 2007-01-04 19:34:03
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16516 Added Files: LICENSE.TXT ReleaseNotes.txt Removed Files: Release 1.2.txt iSNS License.txt Log Message: rename license and release --- NEW FILE: LICENSE.TXT --- Copyright (c) 2001, Nishan Systems, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - Neither the name of the Nishan Systems, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NISHAN SYSTEMS, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- iSNS License.txt DELETED --- --- Release 1.2.txt DELETED --- --- NEW FILE: ReleaseNotes.txt --- Release 1.2.1 4/2/2002 ------------------------- Update to public release BUG FIX: corrected reported issues Release 1.2.0 10/3/2001 ------------------------- Update to public release FEATURE: this version supports both Linux v7.1/v6.2 and Windows NT4.0/2000 FEATURE: added entity, node and portal indexes to allow use with SNMP CHANGE: added replace bit functionality BUG FIX: corrected many issues in DD/DDS/Node and SCN processing Release 1.1.5 8/22/2001 ------------------------- Update to public release CHANGE: Modified Open Source License Release 1.1.4 8/6/2001 ------------------------- Update to public release CHANGE: Modified DD/DDS description in the README documentation of the release. (client) BUG FIX: Portal ports of type UDP were not registered correctly. (server) BUG FIX: Portals from different entities were not correctly returned in a query. Release 1.1.3 6/22/2001 ------------------------- Update to public release CHANGE: Added more text to the README documentation of the release. FEATURE: Added control type node support to the server. Release 1.1.2 6/19/2001 ------------------------- Update to public release (server) CHANGE : Added msg type "SAVE_DB_REQ" to enum to test out save/load feature. FEATURE: iSNS now will save and load DD/DDS information on startup use the [-l] option. BUG FIX: SCN was not sent out for all DDS updates. BUG FIX: Many other small SCN problems. (client) FEATURE: Added Save DD/DDS option to the menu. BUG FIX: Removed some unnecessary enum. Release 1.1.1 6/6/2001 ------------------------- Update to public release (server) FEATURE: Entity ID and iSCSI ID can be the same name. BUG FIX: Entity timestamp wasn't being updated during some updates. BUG FIX: DD/DDS ID of 0 is being rejected. BUG FIX: iSCSI Node Query with iSCSI Node key has been fixed. BUG FIX: Removed "-c" from server help. BUG FIX: Queries with certain src returned wrong nodes. (client) CHANGE : replaced all occurrances of "iSCSI Type" with "Node Type Bitmask." CHANGE : removed option to have source of type Entity ID CHANGE : Clarified the wording for iSCSI Node queries FEATURE: Added PORTAL/ENTITY attr to iSCSI queries. Release 1.1.0 5/29/2001 ------------------------- Public Distribution Release |
|
From: Robert W. <wrw...@us...> - 2007-01-04 19:31:08
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15206 Added Files: LICENSE.TXT Removed Files: iSNS License.txt Log Message: rename license.txt --- iSNS License.txt DELETED --- --- NEW FILE: LICENSE.TXT --- Copyright (c) 2001, Nishan Systems, Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - Neither the name of the Nishan Systems, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NISHAN SYSTEMS, INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
From: Robert W. <wrw...@us...> - 2007-01-04 19:28:58
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14345 Added Files: ReleaseNotes.txt Removed Files: Release 1.2.txt Log Message: rename ReleaseNotes --- Release 1.2.txt DELETED --- --- NEW FILE: ReleaseNotes.txt --- Release 1.2.1 4/2/2002 ------------------------- Update to public release BUG FIX: corrected reported issues Release 1.2.0 10/3/2001 ------------------------- Update to public release FEATURE: this version supports both Linux v7.1/v6.2 and Windows NT4.0/2000 FEATURE: added entity, node and portal indexes to allow use with SNMP CHANGE: added replace bit functionality BUG FIX: corrected many issues in DD/DDS/Node and SCN processing Release 1.1.5 8/22/2001 ------------------------- Update to public release CHANGE: Modified Open Source License Release 1.1.4 8/6/2001 ------------------------- Update to public release CHANGE: Modified DD/DDS description in the README documentation of the release. (client) BUG FIX: Portal ports of type UDP were not registered correctly. (server) BUG FIX: Portals from different entities were not correctly returned in a query. Release 1.1.3 6/22/2001 ------------------------- Update to public release CHANGE: Added more text to the README documentation of the release. FEATURE: Added control type node support to the server. Release 1.1.2 6/19/2001 ------------------------- Update to public release (server) CHANGE : Added msg type "SAVE_DB_REQ" to enum to test out save/load feature. FEATURE: iSNS now will save and load DD/DDS information on startup use the [-l] option. BUG FIX: SCN was not sent out for all DDS updates. BUG FIX: Many other small SCN problems. (client) FEATURE: Added Save DD/DDS option to the menu. BUG FIX: Removed some unnecessary enum. Release 1.1.1 6/6/2001 ------------------------- Update to public release (server) FEATURE: Entity ID and iSCSI ID can be the same name. BUG FIX: Entity timestamp wasn't being updated during some updates. BUG FIX: DD/DDS ID of 0 is being rejected. BUG FIX: iSCSI Node Query with iSCSI Node key has been fixed. BUG FIX: Removed "-c" from server help. BUG FIX: Queries with certain src returned wrong nodes. (client) CHANGE : replaced all occurrances of "iSCSI Type" with "Node Type Bitmask." CHANGE : removed option to have source of type Entity ID CHANGE : Clarified the wording for iSCSI Node queries FEATURE: Added PORTAL/ENTITY attr to iSCSI queries. Release 1.1.0 5/29/2001 ------------------------- Public Distribution Release |
Update of /cvsroot/linuxisns/isnsNT/isnsserver/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2632/src Modified Files: iSNSUtil.c iSNScomm.c iSNSdereg.c iSNSesi.c iSNSparse.c iSNSquery.c iSNSreg.c iSNSscn.c Log Message: remove type casting of attr_indx Index: iSNSquery.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** iSNSquery.c 2 Jan 2007 20:15:24 -0000 1.17 --- iSNSquery.c 4 Jan 2007 19:00:07 -0000 1.18 *************** *** 72,88 **** /* local prototypes */ static int ! SNSdbGetAttrNode (char **attr_indx, char **key_indx, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! SNSdbGetAttrPort (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! SNSdbGetAttrPortal (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rsp_msg); static int ! SNSdbGetAttrDDEntry (int id, char **attr_indx, ISNS_Msg * p_msg); int --- 72,88 ---- /* local prototypes */ static int ! SNSdbGetAttrNode (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! SNSdbGetAttrPort (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! SNSdbGetAttrPortal (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rsp_msg); static int ! SNSdbGetAttrDDEntry (int id, ISNS_Attr **attr_indx, ISNS_Msg * p_msg); int *************** *** 90,109 **** static int ! SNSdbGetAttrDD (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! SNSdbGetAttrDDSEntry (int id, char **attr_indx, ISNS_Msg * p_msg); static int ! SNSdbGetAttrDDS (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! ISNSdbGetAttrISCSI (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! SNSdbGetAttrEntity (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); --- 90,109 ---- static int ! SNSdbGetAttrDD (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! SNSdbGetAttrDDSEntry (int id, ISNS_Attr **attr_indx, ISNS_Msg * p_msg); static int ! SNSdbGetAttrDDS (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! ISNSdbGetAttrISCSI (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); static int ! SNSdbGetAttrEntity (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); *************** *** 119,124 **** ISNS_Attr *attr; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; ISNSParseMsg( &p_md->msg, attr_indx, key_indx, &src_attr ); --- 119,124 ---- ISNS_Attr *attr; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; ISNSParseMsg( &p_md->msg, attr_indx, key_indx, &src_attr ); *************** *** 214,218 **** *********************************************************************/ static int ! SNSdbGetAttrEntity (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { --- 214,218 ---- *********************************************************************/ static int ! SNSdbGetAttrEntity (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { *************** *** 524,528 **** *********************************************************************/ static int ! SNSdbGetAttrDDSEntry (int id, char **attr_indx, ISNS_Msg * p_msg) { SOIP_Dds *p_dds; --- 524,528 ---- *********************************************************************/ static int ! SNSdbGetAttrDDSEntry (int id, ISNS_Attr **attr_indx, ISNS_Msg * p_msg) { SOIP_Dds *p_dds; *************** *** 552,556 **** *********************************************************************/ static int ! SNSdbGetAttrDDS (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { --- 552,556 ---- *********************************************************************/ static int ! SNSdbGetAttrDDS (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { *************** *** 673,677 **** *********************************************************************/ static int ! SNSdbGetAttrDDEntry (int id, char **attr_indx, ISNS_Msg * p_msg) { SOIP_Dd *p_dd; --- 673,677 ---- *********************************************************************/ static int ! SNSdbGetAttrDDEntry (int id, ISNS_Attr **attr_indx, ISNS_Msg * p_msg) { SOIP_Dd *p_dd; *************** *** 703,707 **** *********************************************************************/ static int ! SNSdbGetAttrDD (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { --- 703,707 ---- *********************************************************************/ static int ! SNSdbGetAttrDD (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { *************** *** 855,859 **** *********************************************************************/ static int ! SNSdbGetAttrNode (char **attr_indx, char **key_indx, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { --- 855,859 ---- *********************************************************************/ static int ! SNSdbGetAttrNode (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { *************** *** 986,990 **** *********************************************************************/ static int ! SNSdbGetAttrPortal (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rsp_msg) { --- 986,990 ---- *********************************************************************/ static int ! SNSdbGetAttrPortal (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rsp_msg) { *************** *** 1280,1284 **** *********************************************************************/ static int ! SNSdbGetAttrPort (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { --- 1280,1284 ---- *********************************************************************/ static int ! SNSdbGetAttrPort (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { *************** *** 1543,1547 **** *********************************************************************/ static int ! ISNSdbGetAttrISCSI (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { --- 1543,1547 ---- *********************************************************************/ static int ! ISNSdbGetAttrISCSI (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg) { *************** *** 1864,1869 **** ISNS_Key *key; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; SOIP_Iscsi *p_node; int rval; --- 1864,1869 ---- ISNS_Key *key; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; SOIP_Iscsi *p_node; int rval; *************** *** 2315,2320 **** ISNS_LIST_NODE *plnode; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; ISNS_DBKey key; int rval; --- 2315,2320 ---- ISNS_LIST_NODE *plnode; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; ISNS_DBKey key; int rval; *************** *** 2377,2382 **** ISNS_LIST_NODE *plnode; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; int foundFlag; void *ptr; --- 2377,2382 ---- ISNS_LIST_NODE *plnode; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; int foundFlag; void *ptr; *************** *** 2467,2472 **** ISNS_LIST_NODE *plnode; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; SOIP_Dd_Member *p_member; int foundFlag; --- 2467,2472 ---- ISNS_LIST_NODE *plnode; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; SOIP_Dd_Member *p_member; int foundFlag; Index: iSNSdereg.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSdereg.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** iSNSdereg.c 2 Jan 2007 20:15:24 -0000 1.22 --- iSNSdereg.c 4 Jan 2007 19:00:06 -0000 1.23 *************** *** 92,97 **** int deregPortalFlag; int deregISCSIFlag; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; ISNS_Attr *src_attr; --- 92,97 ---- int deregPortalFlag; int deregISCSIFlag; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; ISNS_Attr *src_attr; *************** *** 164,176 **** status = ISNS_NO_ERR; if (deregEnitityFlag) ! status = SNSdbRemoveAttrEntity (attr_indx, (ISNS_Attr *)src_attr, p_md, &p_rspMd->msg); if (deregPortalFlag && status == ISNS_NO_ERR) status = SNSdbRemoveAttrPortal (attr_indx, src_attr, p_md, &p_rspMd->msg); if (deregFCNodeFlag && status == ISNS_NO_ERR) ! status = SNSdbRemoveAttrNode (attr_indx, (char *)src_attr, p_md, &p_rspMd->msg); if (deregFCPortFlag && status == ISNS_NO_ERR) status = SNSdbRemoveAttrPort (attr_indx, src_attr, p_md, &p_rspMd->msg); if (deregISCSIFlag && status == ISNS_NO_ERR) ! status = SNSdbRemoveAttrISCSI (attr_indx, (char *)src_attr, p_md, &p_rspMd->msg); return status; --- 164,176 ---- status = ISNS_NO_ERR; if (deregEnitityFlag) ! status = SNSdbRemoveAttrEntity (attr_indx, src_attr, p_md, &p_rspMd->msg); if (deregPortalFlag && status == ISNS_NO_ERR) status = SNSdbRemoveAttrPortal (attr_indx, src_attr, p_md, &p_rspMd->msg); if (deregFCNodeFlag && status == ISNS_NO_ERR) ! status = SNSdbRemoveAttrNode (attr_indx, src_attr, p_md, &p_rspMd->msg); if (deregFCPortFlag && status == ISNS_NO_ERR) status = SNSdbRemoveAttrPort (attr_indx, src_attr, p_md, &p_rspMd->msg); if (deregISCSIFlag && status == ISNS_NO_ERR) ! status = SNSdbRemoveAttrISCSI (attr_indx, src_attr, p_md, &p_rspMd->msg); return status; *************** *** 286,290 **** *********************************************************************/ int ! SNSdbRemoveAttrDDS_Member (int id, char **attr_indx, ISNS_Attr * src_attr, ISNS_Msg * p_rspmsg) { --- 286,290 ---- *********************************************************************/ int ! SNSdbRemoveAttrDDS_Member (int id, ISNS_Attr **attr_indx, ISNS_Attr * src_attr, ISNS_Msg * p_rspmsg) { *************** *** 398,403 **** int keyRemovedFlag; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; DEBUG_0 (isns_dereg_debug & 1, "Entering RemoveAttrDDS()\n"); --- 398,403 ---- int keyRemovedFlag; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; DEBUG_0 (isns_dereg_debug & 1, "Entering RemoveAttrDDS()\n"); *************** *** 460,465 **** int ddKeyIndex; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; ISNSParseMsg( &p_md->msg, attr_indx, key_indx, &src_attr ); --- 460,465 ---- int ddKeyIndex; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; ISNSParseMsg( &p_md->msg, attr_indx, key_indx, &src_attr ); *************** *** 788,792 **** *********************************************************************/ int ! SNSdbRemoveAttrPortal (char **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { --- 788,792 ---- *********************************************************************/ int ! SNSdbRemoveAttrPortal (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { *************** *** 876,880 **** *********************************************************************/ int ! SNSdbRemoveAttrPort (char **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { --- 876,880 ---- *********************************************************************/ int ! SNSdbRemoveAttrPort (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { *************** *** 909,913 **** *********************************************************************/ int ! SNSdbRemoveAttrISCSI (char **key_indx, char *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { --- 909,913 ---- *********************************************************************/ int ! SNSdbRemoveAttrISCSI (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { *************** *** 942,946 **** *********************************************************************/ int ! SNSdbRemoveAttrNode (char **key_indx, char *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { ISNS_Key *key; --- 942,946 ---- *********************************************************************/ int ! SNSdbRemoveAttrNode (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { ISNS_Key *key; *************** *** 972,976 **** *********************************************************************/ int ! SNSdbRemoveAttrEntity (char **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { --- 972,976 ---- *********************************************************************/ int ! SNSdbRemoveAttrEntity (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg) { *************** *** 1398,1402 **** *********************************************************************/ int ! SNSdbRemoveDD_Member (int id, char **attr_indx, ISNS_Attr * src_attr, ISNS_Msg * p_rspmsg) { --- 1398,1402 ---- *********************************************************************/ int ! SNSdbRemoveDD_Member (int id, ISNS_Attr **attr_indx, ISNS_Attr * src_attr, ISNS_Msg * p_rspmsg) { *************** *** 1670,1675 **** SOIP_Ifcp *p_ifcp_node; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; rval = ISNS_UNKNOWN_ERR; --- 1670,1675 ---- SOIP_Ifcp *p_ifcp_node; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; rval = ISNS_UNKNOWN_ERR; Index: iSNSreg.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSreg.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** iSNSreg.c 2 Jan 2007 20:15:24 -0000 1.22 --- iSNSreg.c 4 Jan 2007 19:00:07 -0000 1.23 *************** *** 94,99 **** int regPortalGroupFlag; int regFlag; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; ISNS_Attr *src_attr; --- 94,99 ---- int regPortalGroupFlag; int regFlag; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; ISNS_Attr *src_attr; *************** *** 232,236 **** *********************************************************************/ int ! ISNSdbAddAttrPortal (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { --- 232,236 ---- *********************************************************************/ int ! ISNSdbAddAttrPortal (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { *************** *** 677,681 **** *********************************************************************/ int ! ISNSdbAddAttrPortalGroup (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { --- 677,681 ---- *********************************************************************/ int ! ISNSdbAddAttrPortalGroup (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { *************** *** 991,996 **** ISNS_LIST_NODE *pnode; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; int symIndex; char *p_sym; --- 991,996 ---- ISNS_LIST_NODE *pnode; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; int symIndex; char *p_sym; *************** *** 1299,1304 **** SOIP_DD_Key dd_key; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; char *p_sym; int symIndex; --- 1299,1304 ---- SOIP_DD_Key dd_key; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; char *p_sym; int symIndex; *************** *** 1627,1631 **** *********************************************************************/ int ! SNSdbAddAttrEntity ( char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { --- 1627,1631 ---- *********************************************************************/ int ! SNSdbAddAttrEntity ( ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { *************** *** 1827,1831 **** *********************************************************************/ int ! ISNSdbAddAttrNode (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { --- 1827,1831 ---- *********************************************************************/ int ! ISNSdbAddAttrNode (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { *************** *** 1997,2001 **** *********************************************************************/ int ! SNSdbAddAttrPort (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { --- 1997,2001 ---- *********************************************************************/ int ! SNSdbAddAttrPort (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg) { *************** *** 2312,2316 **** *********************************************************************/ int ! ISNSdbAddAttrISCSINode ( char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg ) { --- 2312,2316 ---- *********************************************************************/ int ! ISNSdbAddAttrISCSINode ( ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg ) { *************** *** 2628,2633 **** ISNS_LIST_NODE *pnode = NULL; ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; DEBUG_0 (isns_reg_debug &1,(RegisterSCN)); --- 2628,2633 ---- ISNS_LIST_NODE *pnode = NULL; ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; DEBUG_0 (isns_reg_debug &1,(RegisterSCN)); *************** *** 3070,3077 **** void *func; ISNS_Attr *attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; ! ISNSParseMsg( &p_md->msg, (char **) attr_indx, (char **) key_indx, NULL ); if ( key_indx && key_indx[ 0 ] == NULL ) { --- 3070,3077 ---- void *func; ISNS_Attr *attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; ! ISNSParseMsg( &p_md->msg, attr_indx, key_indx, NULL ); if ( key_indx && key_indx[ 0 ] == NULL ) { *************** *** 3080,3084 **** } ! if (-1 == (bitmapIdx = ISNSFindTag(0, ISNS_ISCSI_SCN_BITMAP, (char **)attr_indx))) { DEBUG_0( isns_reg_debug & 1, (Missing key) ); --- 3080,3084 ---- } ! if (-1 == (bitmapIdx = ISNSFindTag(0, ISNS_ISCSI_SCN_BITMAP, attr_indx))) { DEBUG_0( isns_reg_debug & 1, (Missing key) ); *************** *** 3086,3090 **** } ! if (-1 == (cbIdx = ISNSFindTag(0, ISNS_SCN_CALLBACK, (char **)attr_indx))) { DEBUG_0( isns_reg_debug & 1, (Missing key) ); --- 3086,3090 ---- } ! if (-1 == (cbIdx = ISNSFindTag(0, ISNS_SCN_CALLBACK, attr_indx))) { DEBUG_0( isns_reg_debug & 1, (Missing key) ); Index: iSNSscn.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSscn.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** iSNSscn.c 29 Dec 2006 20:40:18 -0000 1.10 --- iSNSscn.c 4 Jan 2007 19:00:07 -0000 1.11 *************** *** 329,334 **** ISNS_Attr *p_attr; /* query attr, response attr */ ISNS_Attr *src_attr; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; --- 329,334 ---- ISNS_Attr *p_attr; /* query attr, response attr */ ISNS_Attr *src_attr; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; Index: iSNSesi.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSesi.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** iSNSesi.c 18 Dec 2006 19:02:47 -0000 1.9 --- iSNSesi.c 4 Jan 2007 19:00:07 -0000 1.10 *************** *** 197,202 **** int i; int len; ! char *attr_indx[SNS_MAX_ATTRS]; ! char *key_indx[SNS_MAX_ATTRS]; int rval; SOIP_Entity_Id db_entity_id; --- 197,202 ---- int i; int len; ! ISNS_Attr *attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr *key_indx[SNS_MAX_ATTRS]; int rval; SOIP_Entity_Id db_entity_id; Index: iSNScomm.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNScomm.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** iSNScomm.c 20 Dec 2006 07:14:33 -0000 1.9 --- iSNScomm.c 4 Jan 2007 19:00:06 -0000 1.10 *************** *** 364,369 **** ISNSSendMsg(ISNS_Msg_Descp *p_md) { ! char * attr_indx[SNS_MAX_ATTRS]; ! char * key_indx[SNS_MAX_ATTRS]; int rval; --- 364,369 ---- ISNSSendMsg(ISNS_Msg_Descp *p_md) { ! ISNS_Attr * attr_indx[SNS_MAX_ATTRS]; ! ISNS_Attr * key_indx[SNS_MAX_ATTRS]; int rval; Index: iSNSparse.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSparse.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** iSNSparse.c 19 Dec 2006 20:34:38 -0000 1.17 --- iSNSparse.c 4 Jan 2007 19:00:07 -0000 1.18 *************** *** 45,50 **** static int ISNSProfileKeysAttr (ISNS_Msg * msg, ! char **attr_index, int *num_attrs, ! char **key_index, int *num_keys, ISNS_Attr **src_attr); /************************************************************* --- 45,50 ---- static int ISNSProfileKeysAttr (ISNS_Msg * msg, ! ISNS_Attr **attr_index, int *num_attrs, ! ISNS_Attr **key_index, int *num_keys, ISNS_Attr **src_attr); /************************************************************* *************** *** 52,56 **** *************************************************************/ int ! ISNSParseMsg (ISNS_Msg * msg, char **attr_index, char **key_index, ISNS_Attr **src_attr) { --- 52,56 ---- *************************************************************/ int ! ISNSParseMsg (ISNS_Msg * msg, ISNS_Attr **attr_index, ISNS_Attr **key_index, ISNS_Attr **src_attr) { *************** *** 250,255 **** static int ISNSProfileKeysAttr (ISNS_Msg * msg, ! char **attr_index, int *num_attrs, ! char **key_index, int *num_keys, ISNS_Attr **src_attr) { int ii, jj; --- 250,255 ---- static int ISNSProfileKeysAttr (ISNS_Msg * msg, ! ISNS_Attr **attr_index, int *num_attrs, ! ISNS_Attr **key_index, int *num_keys, ISNS_Attr **src_attr) { int ii, jj; *************** *** 310,314 **** break; } ! key_index[jj] = (char *)ptr; jj++; offset += ISNS_SIZEOF_TAG + ptr->len; --- 310,314 ---- break; } ! key_index[jj] = ptr; jj++; offset += ISNS_SIZEOF_TAG + ptr->len; *************** *** 336,340 **** return (ERROR); ! attr_index[ii] = (char *) attr; ii++; --- 336,340 ---- return (ERROR); ! attr_index[ii] = attr; ii++; *************** *** 663,667 **** *********************************************************************/ int ! ISNSFindTag (int startIndex, int key, char **attr_indx) { int ii; --- 663,667 ---- *********************************************************************/ int ! ISNSFindTag (int startIndex, int key, ISNS_Attr **attr_indx) { int ii; Index: iSNSUtil.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSUtil.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** iSNSUtil.c 18 Dec 2006 23:00:04 -0000 1.13 --- iSNSUtil.c 4 Jan 2007 19:00:06 -0000 1.14 *************** *** 716,720 **** printf ("Reg Period : %d\n", p_entity->period); //ISNSDisplay_IPAddress ((struct IP_address *)p_entity->mgmt_ip_addr.v); ! printf ("TimeStamp : %s", ctime((time_t *)&p_entity->timestamp.t_time)); pnode = NULL; --- 716,720 ---- printf ("Reg Period : %d\n", p_entity->period); //ISNSDisplay_IPAddress ((struct IP_address *)p_entity->mgmt_ip_addr.v); ! printf ("TimeStamp : %s", ctime((const time_t *)&p_entity->timestamp.t_time)); pnode = NULL; |
|
From: Robert W. <wrw...@us...> - 2007-01-04 19:00:10
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/include In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2632/include Modified Files: iSNSparse.h iSNSquery.h iSNSreg.h iSNSresponse.h iSNStypes.h Log Message: remove type casting of attr_indx Index: iSNSquery.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSquery.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** iSNSquery.h 19 Dec 2006 22:25:31 -0000 1.3 --- iSNSquery.h 4 Jan 2007 19:00:06 -0000 1.4 *************** *** 41,49 **** extern int ! SNSdbGetAttr (char **attr_indx, char **key_indx, ! char *src_attr, ISNS_Msg_Descp * md); extern ISNS_Msg_Descp * ! SNSdbGetPorts(char **attr_indx, ISNS_Msg_Descp *); extern int --- 41,49 ---- extern int ! SNSdbGetAttr (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ! ISNS_Attr *src_attr, ISNS_Msg_Descp * md); extern ISNS_Msg_Descp * ! SNSdbGetPorts(ISNS_Attr **attr_indx, ISNS_Msg_Descp *); extern int Index: iSNSresponse.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSresponse.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNSresponse.h 15 Dec 2006 01:13:29 -0000 1.2 --- iSNSresponse.h 4 Jan 2007 19:00:06 -0000 1.3 *************** *** 41,45 **** int ! ISNSFindTag (int start_indx, int key, char **attr_indx); ISNS_Attr * --- 41,45 ---- int ! ISNSFindTag (int start_indx, int key, ISNS_Attr **attr_indx); ISNS_Attr * Index: iSNStypes.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNStypes.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** iSNStypes.h 21 Dec 2006 00:50:51 -0000 1.11 --- iSNStypes.h 4 Jan 2007 19:00:06 -0000 1.12 *************** *** 373,377 **** typedef struct _soip_time { uint32_t t_pad; ! uint32_t t_time; } SOIP_Time; --- 373,377 ---- typedef struct _soip_time { uint32_t t_pad; ! time_t t_time; } SOIP_Time; Index: iSNSreg.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSreg.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** iSNSreg.h 2 Jan 2007 20:15:24 -0000 1.6 --- iSNSreg.h 4 Jan 2007 19:00:06 -0000 1.7 *************** *** 95,109 **** int ! ISNSdbAddAttrPortal (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int ! ISNSdbAddAttrPortalGroup (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int ! SNSdbAddAttrPort (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int AddCert (void **ptr, int *size, void *p_cert, int cert_size); --- 95,113 ---- int ! ISNSdbAddAttrPortal (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int ! ISNSdbAddAttrPortalGroup (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int ! SNSdbAddAttrPort (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int + SNSdbRemoveAttrPort (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, + ISNS_Msg * rspmsg); + + int AddCert (void **ptr, int *size, void *p_cert, int cert_size); *************** *** 131,139 **** int ! ISNSdbAddAttrNode (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int ! SNSdbAddAttrEntity (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); --- 135,143 ---- int ! ISNSdbAddAttrNode (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int ! SNSdbAddAttrEntity (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); *************** *** 163,194 **** int ! ISNSdbAddAttrISCSINode (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int ! SNSdbRemoveAttrEntity (char **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * md, ISNS_Msg * rspmsg); int - SNSdbRemoveAttrNode (char **key_indx, char *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); - - int - SNSdbRemoveAttrPort (char **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, - ISNS_Msg * rspmsg); - - int ISNSdbRemoveAttrEntityEntry (char *p_entity_id, ISNS_Attr * src_attr, ISNS_Msg * p_rspmsg); - int - SNSdbRemoveAttrISCSI (char **key_indx, char *src_attr, ISNS_Msg_Descp * p_md, - ISNS_Msg * rspmsg); - - int - SNSdbRemoveAttrNode (char **key_indx, char *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); - - int - SNSdbRemoveAttrPortal (char **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, - ISNS_Msg * rspmsg); int --- 167,181 ---- int ! ISNSdbAddAttrISCSINode (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); int ! SNSdbRemoveAttrEntity (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * md, ISNS_Msg * rspmsg); int ISNSdbRemoveAttrEntityEntry (char *p_entity_id, ISNS_Attr * src_attr, ISNS_Msg * p_rspmsg); int *************** *** 214,218 **** int ! SNSdbRemoveDD_Member (int id, char **attr_indx, ISNS_Attr * src_attr, ISNS_Msg * p_rspmsg); int --- 201,205 ---- int ! SNSdbRemoveDD_Member (int id, ISNS_Attr **attr_indx, ISNS_Attr * src_attr, ISNS_Msg * p_rspmsg); int *************** *** 220,236 **** int ! SNSdbAddAttrPort (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); int ! SNSdbRemoveAttrISCSI (char **key_indx, char *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); int ! SNSdbRemoveAttrNode (char **key_indx, char *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); int ! SNSdbRemoveAttrPortal (char **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); --- 207,223 ---- int ! SNSdbAddAttrPort (ISNS_Attr **attr_indx, ISNS_Attr **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); int ! SNSdbRemoveAttrISCSI (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); int ! SNSdbRemoveAttrNode (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); int ! SNSdbRemoveAttrPortal (ISNS_Attr **key_indx, ISNS_Attr *src_attr, ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); Index: iSNSparse.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSparse.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** iSNSparse.h 15 Dec 2006 01:13:29 -0000 1.4 --- iSNSparse.h 4 Jan 2007 19:00:06 -0000 1.5 *************** *** 42,46 **** extern int ! ISNSParseMsg (ISNS_Msg * msg, char **attr_index, char **key_index, ISNS_Attr **src_attr); --- 42,46 ---- extern int ! ISNSParseMsg (ISNS_Msg * msg, ISNS_Attr **attr_index, ISNS_Attr **key_index, ISNS_Attr **src_attr); |
|
From: Robert W. <wrw...@us...> - 2007-01-04 18:58:41
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2024/src Modified Files: isns.c Log Message: update control node Index: isns.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/isns.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** isns.c 2 Jan 2007 20:15:24 -0000 1.6 --- isns.c 4 Jan 2007 18:58:36 -0000 1.7 *************** *** 134,138 **** src_type = 0; if (0 != GetInput (cmdLine,"SRC type", ! "*0:Control Node 1:iSCSI Node 3:iFCP Node", sizeof (cmdLine))) { src_type = atoi (cmdLine); --- 134,138 ---- src_type = 0; if (0 != GetInput (cmdLine,"SRC type", ! "*Default Control Node *1:Control Node 2:iSCSI Node 3:iFCP Node", sizeof (cmdLine))) { src_type = atoi (cmdLine); *************** *** 142,155 **** { case 0: ! if (0 == GetInput (cmdLine, "SRC: iSCSI Node Id", "(none)",sizeof (cmdLine))) { ! ISNSAppendAttr (p_cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); } ! else ! ISNSAppendAttr (p_cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (cmdLine)),cmdLine, 0); break; ! case 1: if (0 == GetInput (cmdLine, "SRC: iSCSI Node Id", "(none)", sizeof (cmdLine))) { --- 142,160 ---- { case 0: ! ISNSAppendAttr (p_cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0); ! break; ! ! case 1: ! if (0 == GetInput (cmdLine, "SRC: Control Node Id", "(none)",sizeof (cmdLine))) { ! printf ("***ERROR: You must enter an Node Id.\n"); ! return (-1); } ! ! ISNSAppendAttr (p_cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (cmdLine)),cmdLine, 0); break; ! case 2: if (0 == GetInput (cmdLine, "SRC: iSCSI Node Id", "(none)", sizeof (cmdLine))) { *************** *** 161,165 **** break; ! case 2: if (0 == GetHexInput (cmdLine, "SRC: iFCP Node WWPN", NULL, sizeof (cmdLine))) { --- 166,171 ---- break; ! ! case 3: if (0 == GetHexInput (cmdLine, "SRC: iFCP Node WWPN", NULL, sizeof (cmdLine))) { |
|
From: Robert W. <wrw...@us...> - 2007-01-02 20:15:32
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24842/isnsserver/src Modified Files: iSNSInit.c iSNSdereg.c iSNSquery.c iSNSreg.c Log Message: add control node Index: iSNSInit.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSInit.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** iSNSInit.c 19 Dec 2006 22:25:31 -0000 1.5 --- iSNSInit.c 2 Jan 2007 20:15:24 -0000 1.6 *************** *** 149,152 **** --- 149,153 ---- ISNSInitDBTables(); Create_Default_DD(); + strcpy(isns_control_node, CONTROL_NODE); if ( SNSStartFSM() == ERROR ) Index: iSNSreg.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSreg.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** iSNSreg.c 29 Dec 2006 20:40:18 -0000 1.21 --- iSNSreg.c 2 Jan 2007 20:15:24 -0000 1.22 *************** *** 1002,1005 **** --- 1002,1009 ---- ISNSParseMsg( &p_md->msg, attr_indx, key_indx, &src_attr ); + rval = Check_Authorization (src_attr); + if (rval != SUCCESS) + return (ISNS_AUTH_FAILED_ERR); + /* Search the keys for DD_Set. */ ddKeyIndex = ISNSFindTag (0, ISNS_DDS_ID, key_indx); *************** *** 1306,1309 **** --- 1310,1317 ---- ISNSParseMsg(&p_md->msg, attr_indx, key_indx, &src_attr); + rval = Check_Authorization (src_attr); + if (rval != SUCCESS) + return (ISNS_AUTH_FAILED_ERR); + /* Search the keys for DD_Set. */ ddKeyIndex = ISNSFindTag (0, ISNS_DD_ID, key_indx); *************** *** 3636,3639 **** --- 3644,3649 ---- } + /********************************************************************* + *********************************************************************/ int Create_Default_DD () *************** *** 3758,3759 **** --- 3768,3781 ---- } + /********************************************************************* + *********************************************************************/ + int + Check_Authorization (ISNS_Attr *src_attr) + { + DEBUG_1 (isns_reg_debug &1,Check_Authorization:%s,src_attr->val.node_name.v); + + if ( 0 == strcmp (src_attr->val.node_name.v,isns_control_node) ) + return SUCCESS; + else + return ISNS_AUTH_FAILED_ERR; + } Index: iSNSdereg.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSdereg.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** iSNSdereg.c 29 Dec 2006 20:40:17 -0000 1.21 --- iSNSdereg.c 2 Jan 2007 20:15:24 -0000 1.22 *************** *** 210,219 **** return (rval); p_dds = (SOIP_Dds *)&entry.data; - - rval = Check_Permission(src_attr, DDS_ID_KEY, p_dds); - if (rval != SUCCESS) - { - return (ISNS_NO_SUCH_ENTRY_ERR); - } /* Remove DDS from DD's DDS List */ --- 210,213 ---- *************** *** 319,328 **** p_dds = (SOIP_Dds *)&entry.data; - rval = Check_Permission(src_attr, DDS_ID_KEY, p_dds); - if (rval != SUCCESS) - { - return (ISNS_NO_SUCH_ENTRY_ERR); - } - /* Remove DDS from DD's DDS List */ memberRemovedFlag = FALSE; --- 313,316 ---- *************** *** 416,419 **** --- 404,414 ---- ISNSParseMsg(&p_md->msg, attr_indx, key_indx, &src_attr); + + rval = Check_Authorization (src_attr); + if (rval != SUCCESS) + { + return (ISNS_AUTH_FAILED_ERR); + } + ddKeyIndex = ISNSFindTag (0, ISNS_DDS_ID, key_indx); keyRemovedFlag = FALSE; *************** *** 469,472 **** --- 464,474 ---- ISNSParseMsg( &p_md->msg, attr_indx, key_indx, &src_attr ); + + rval = Check_Authorization (src_attr); + if (rval != SUCCESS) + { + return (ISNS_AUTH_FAILED_ERR); + } + ddKeyIndex = ISNSFindTag (0, ISNS_DD_ID, key_indx); flag = FALSE; *************** *** 1302,1311 **** p_dd = (SOIP_Dd *)&entry.data; - rval = Check_Permission(src_attr, DD_ID_KEY, p_dd); - if (rval != SUCCESS) - { - return (ISNS_NO_SUCH_ENTRY_ERR); - } - /* Remove DD Members */ pnode = NULL; --- 1304,1307 ---- *************** *** 1422,1431 **** p_dd = (SOIP_Dd *)&entry.data; - rval = Check_Permission(src_attr, DD_ID_KEY, p_dd); - if (rval != SUCCESS) - { - return (ISNS_NO_SUCH_ENTRY_ERR); - } - /* Prepare the SCN */ memset(p_scn_all_msg_buffer, 0, sizeof(ISNS_Msg)); --- 1418,1421 ---- Index: iSNSquery.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** iSNSquery.c 21 Dec 2006 23:28:11 -0000 1.16 --- iSNSquery.c 2 Jan 2007 20:15:24 -0000 1.17 *************** *** 567,570 **** --- 567,574 ---- SOIP_Dds *p_dds; + rval = Check_Authorization (src_attr); + if (rval != SUCCESS) + return (ISNS_AUTH_FAILED_ERR); + ISNSTouchEntity( src_attr ); *************** *** 718,721 **** --- 722,729 ---- DEBUG_0 (isns_query_debug &1, SNSdbGetAttrDD); + rval = Check_Authorization (src_attr); + if (rval != SUCCESS) + return (ISNS_AUTH_FAILED_ERR); + ISNSTouchEntity( src_attr ); *************** *** 3487,3494 **** --- 3495,3508 ---- } + /********************************************************************* + *********************************************************************/ int Check_Permission (ISNS_Attr *src_attr, int rectype, void * ptr) { int rval; + + /* check if control node */ + if ( 0 == strcmp (src_attr->val.node_name.v, isns_control_node) ) + return SUCCESS; memset (dlist_src, 0, MAX_DD_PER_LIST*sizeof(uint32_t)); *************** *** 3496,3500 **** if (rval !=SUCCESS) { ! return (ISNS_INVALID_QUERY_ERR); } --- 3510,3514 ---- if (rval !=SUCCESS) { ! return (ISNS_AUTH_FAILED_ERR); } *************** *** 3514,3518 **** { DEBUG_0(isns_query_debug & 1, "***ERROR*** Invalid DD"); ! return (ISNS_INVALID_QUERY_ERR); } } --- 3528,3532 ---- { DEBUG_0(isns_query_debug & 1, "***ERROR*** Invalid DD"); ! return (ISNS_AUTH_FAILED_ERR); } } *************** *** 3533,3537 **** { DEBUG_0(isns_query_debug & 1, "***ERROR*** Invalid DD"); ! return (ISNS_INVALID_QUERY_ERR); } } --- 3547,3551 ---- { DEBUG_0(isns_query_debug & 1, "***ERROR*** Invalid DD"); ! return (ISNS_AUTH_FAILED_ERR); } } *************** *** 3549,3553 **** { DEBUG_0(isns_query_debug & 1, "***ERROR: Invalid DD"); ! return (ISNS_NO_SUCH_ENTRY_ERR); } } --- 3563,3567 ---- { DEBUG_0(isns_query_debug & 1, "***ERROR: Invalid DD"); ! return (ISNS_AUTH_FAILED_ERR); } } *************** *** 3567,3571 **** { DEBUG_0(isns_query_debug & 1, "***ERROR*** Invalid DD"); ! return (ISNS_INVALID_QUERY_ERR); } } --- 3581,3585 ---- { DEBUG_0(isns_query_debug & 1, "***ERROR*** Invalid DD"); ! return (ISNS_AUTH_FAILED_ERR); } } *************** *** 3610,3614 **** break; default: ! return (ISNS_INVALID_QUERY_ERR); break; } --- 3624,3628 ---- break; default: ! return (ISNS_AUTH_FAILED_ERR); break; } |
|
From: Robert W. <wrw...@us...> - 2007-01-02 20:15:31
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/include In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24842/isnsserver/include Modified Files: iSNS.h iSNSreg.h Log Message: add control node Index: iSNS.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNS.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNS.h 2 Apr 2002 20:56:54 -0000 1.2 --- iSNS.h 2 Jan 2007 20:15:24 -0000 1.3 *************** *** 49,52 **** --- 49,57 ---- #define SNS_VERSION 1 + /* control node name */ + #define CONTROL_NODE "iqn.control.node" + + char isns_control_node[256]; + /* * iSNS Readyness Typedefs Index: iSNSreg.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSreg.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** iSNSreg.h 19 Dec 2006 22:25:31 -0000 1.5 --- iSNSreg.h 2 Jan 2007 20:15:24 -0000 1.6 *************** *** 241,243 **** --- 241,246 ---- Create_Default_DD(); + int + Check_Authorization (ISNS_Attr *src_attr); + #endif |
|
From: Robert W. <wrw...@us...> - 2007-01-02 20:15:30
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient/include In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24842/isnsclient/include Modified Files: isns.h Log Message: add control node Index: isns.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/include/isns.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** isns.h 22 Nov 2006 21:01:52 -0000 1.3 --- isns.h 2 Jan 2007 20:15:24 -0000 1.4 *************** *** 207,210 **** --- 207,212 ---- #define ISNS_VERSION "1.2.0" + #define CONTROL_NODE "iqn.control.node" + /* This should be an integer, and is the protocol version */ #define ISNSP_VERSION 1 |
