Menu
▾
▴
[Linuxisns-commit] isnsNT/isnsserver/src iSNSUtil.c, 1.13, 1.14 iSNScomm.c, 1.9, 1.10 iSNSdereg.c, 1.22, 1.23 iSNSesi.c, 1.9, 1.10 iSNSparse.c, 1.17, 1.18 iSNSquery.c, 1.17, 1.18 iSNSreg.c, 1.22, 1.23 iSNSscn.c, 1.10, 1.11
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; |
