Menu
▾
▴
[Linuxisns-commit] isnsNT/isnsserver/src iSNSMain.c, 1.6, 1.7 iSNSUtil.c, 1.6, 1.7 iSNScomm.c, 1.2, 1.3 iSNSdb.c, 1.9, 1.10 iSNSdereg.c, 1.2, 1.3 iSNSesi.c, 1.1, 1.2 iSNSfsm.c, 1.2, 1.3 iSNSipc.c, 1.2, 1.3 iSNSquery.c, 1.2, 1.3 iSNSreg.c, 1.2, 1.3 iSNSresponse.c, 1.1, 1.2 iSNSscn.c, 1.1, 1.2 iSNStrcv.c, 1.2, 1.3
|
From: Robert W. <wrw...@us...> - 2006-11-03 20:22:35
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/src In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9512/src Modified Files: iSNSMain.c iSNSUtil.c iSNScomm.c iSNSdb.c iSNSdereg.c iSNSesi.c iSNSfsm.c iSNSipc.c iSNSquery.c iSNSreg.c iSNSresponse.c iSNSscn.c iSNStrcv.c Log Message: separate out include files Index: iSNScomm.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNScomm.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNScomm.c 2 Apr 2002 20:56:54 -0000 1.2 --- iSNScomm.c 3 Nov 2006 20:22:29 -0000 1.3 *************** *** 322,326 **** if (recvfrom (rsd, (char *) &md->msg, sizeof (ISNS_Msg), 0, (struct sockaddr *) &md->cb.sock.addr, ! (int *) &md->cb.sock.len) == -1 ) { // printf ("\n%s:%d sd %d",__FILE__,__LINE__,sd); --- 322,326 ---- if (recvfrom (rsd, (char *) &md->msg, sizeof (ISNS_Msg), 0, (struct sockaddr *) &md->cb.sock.addr, ! &md->cb.sock.len) == -1 ) { // printf ("\n%s:%d sd %d",__FILE__,__LINE__,sd); Index: iSNSipc.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSipc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNSipc.c 2 Apr 2002 20:56:54 -0000 1.2 --- iSNSipc.c 3 Nov 2006 20:22:29 -0000 1.3 *************** *** 166,170 **** len=sizeof(ipc_ep[ep_name].their_addr); cnt = recvfrom( ipc_ep[ep_name].s, p_msg, max_len, 0, ! (struct sockaddr * )&ipc_ep[ep_name].their_addr, &len); if (cnt < 0) --- 166,170 ---- len=sizeof(ipc_ep[ep_name].their_addr); cnt = recvfrom( ipc_ep[ep_name].s, p_msg, max_len, 0, ! (struct sockaddr * )&ipc_ep[ep_name].their_addr, (socklen_t *)&len); if (cnt < 0) Index: iSNSresponse.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSresponse.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iSNSresponse.c 3 Nov 2006 18:55:41 -0000 1.1 --- iSNSresponse.c 3 Nov 2006 20:22:29 -0000 1.2 *************** *** 54,89 **** #endif - extern int sns_scn_debug; - extern int sns_scn_msg_filter; - extern int sns_rsync_debug; - extern int SNSGetMgmtAddr (void); - extern int sns_esi_interval; - - #ifndef SNS_LINUX - extern void NTWriteToFile(int len, void *ptr); - extern int NTReadFromFile(int *lenPtr, void *ptr); - #endif - /* Global */ extern int isns_db_debug; - extern int isns_scn_debug; - extern int isns_scn_msg_filter; - extern int isns_rsync_debug; - extern int sns_heartbeat_interval; - - extern datum ndb_fetch_sns (); - extern datum ndb_firstkey_isns (uint32_t key_type, char *key); - extern datum ndb_nextkey_isns (uint32_t key_type, datum key, char *pkey); - extern ISNS_ATTR_VALS_CB * ISNSAttrGetList (ISNS_Msg_Descp *p_md); /* - * GDBM errno - */ - extern ndb_error ndb_errno; - - /* * static common variables for gdbm fetches * entry is for common registrations and queries --- 54,64 ---- *************** *** 113,419 **** IDX_HASH_ENTRY *iscsiIdxHashTbl[MAX_HASH]; IDX_HASH_ENTRY *portalIdxHashTbl[MAX_HASH]; - /* - * Local function prototypes - */ - int - ISNS_GetDD_ID_from_sym ( char *p_sym ); - - int - ISNS_GetDDS_ID_from_sym ( char *p_sym ); - - int - ISNSGetNextEntityPortal( ISNS_Msg_Descp *p_md, ISNS_Msg * p_rspmsg ); - - int - ISNSGetNextDDIscsiMember( ISNS_Msg_Descp *p_md, ISNS_Msg * p_rspmsg ); - - int - ISNSGetNextDDSMember( ISNS_Msg_Descp *p_md, ISNS_Msg * p_rspmsg ); - - int - send_iscsi_scn_on_dd_mem_change( SOIP_Iscsi * p_src_node, char *p_src_name, - SOIP_Dd *p_dd, uint32_t dd_id, uint32_t event_bitmap); - - int - send_scn_parameter_change_to_all( ISNS_Msg *p_msg, uint32_t bitmap ); - - int - send_scn_object_change_to_all( uint32_t src_type, uint32_t src_len, - void *src_val, uint32_t bitmap ); - - int - change_dd_member_active_flag( SOIP_Dd *p_dd ); - - int - ISNS_DeRegisterSCN ( ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); - - int - ISNS_RegisterSCN (ISNS_Msg_Descp * p_md, ISNS_Msg * rspmsg); - - int - ISNSdbRemoveAttr (ISNS_Msg_Descp * p_md); - - int - ISNSdbAddAttr ( ISNS_Msg_Descp * p_md, ISNS_Msg *rspMsg ); - - int - ISNSdbGetAttr ( ISNS_Msg_Descp * p_md, ISNS_Msg_Descp * md ); - - int - ISNSGetNextAttr( ISNS_Msg_Descp *p_md, ISNS_Msg * p_rspmsg ); - - int - ISNSdbRemoveAttrDD ( ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg ); - - int - ISNSdbRemoveAttrDDS ( ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg ); - - int - SNSdbFetchDD (int id, SOIP_Dd ** p_dd, SOIP_DB_Entry * p_entry); - - int - send_dd_iscsi_scn( SOIP_Dd *p_dd, int dd_id, uint32_t scn_bitmap ); - - int - IsDDActive(int dd_id, int exclude_dds_id); - - int - IsDDSActive(int dds_id); - - int - ISNSAddSCNEntry(uint32_t type, char *nodename, uint32_t bitmap, int sockfd); - - int - ISNSRemoveSCNEntry(uint32_t type, char *nodename); - - int - ISNSRemoveESIEntry(IP_Address *p_ip, uint32_t port, char *p_eid); - - int - ISNSAddESIEntry(IP_Address *p_ip, uint32_t port, char *p_eid); - - int - SNSdbGetAttrDD (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md, - ISNS_Msg * p_rspmsg); - - int - Copy_DD_List(ISNS_LIST *dd_list, ISNS_DD_LIST p_dlist); - - int - Get_Active_DD_List (ISNS_LIST *dd_list, ISNS_DD_LIST p_dlist, int flag); - - int - SNSRemovePortalEntry (char *portal_key, ISNS_Attr * src_attr, - ISNS_Msg * p_rspmsg); - - int - ISNSdbAddAttrPortal (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); - - int - RemoveCert (void **ptr); - - int - SNSRemoveIFCPNodeEntry (char *ifcp_node_key, ISNS_Attr * src_attr, - ISNS_Msg * p_rspmsg); - - int - Activate_DD_Membership (uint32_t type, void *p_node); - - int - SNSRemoveFCNodeEntry (char *p_key, ISNS_Msg * p_rspmsg); - - int - ISNSdbProcessISCSIOpAttr (ISNS_Msg * p_msg, ISNS_Attr ** attr_indx, - SOIP_Iscsi * p_node); - int - SNSdbFetchEntity (char *p_entity_id, SOIP_Entity ** p_entity, - SOIP_DB_Entry * p_entry); - - int - SNSdbGetAttrDDS (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, - ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); - - int - Get_Active_DD_List_From_ISCSI_Node (char *nodename, ISNS_DD_LIST p_dlist, - int flag); - - int - Append_Nodes_From_DD_List (ISNS_DD_LIST p_dlist, - SOIP_Dd_Member p_ddmem[], uint32_t type); - - int - Check_Overlap_DD (ISNS_DD_LIST p_dlist_src, ISNS_DD_LIST p_dlist_node); - - int - Get_Active_DD_List_From_IFCP_Node (char *nodename, ISNS_DD_LIST p_dlist, - int flag); - int - ISNSdbGetAttrISCSI (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, - ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); - - int - SNSRemoveISCSINodeEntry (char *iscsi_node_key, ISNS_Attr * src_attr, - ISNS_Msg * p_rspmsg); - - int - Send_IFCP_SCN (SOIP_Ifcp * p_src_node, char *p_src_name, - uint32_t event_bitmap); - - int - ISNSdbAddAttrNode (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, - ISNS_Msg * p_rspmsg); - - int - send_iscsi_scn_to_members ( SOIP_Iscsi * p_src_node, char *p_src_name, - ISNS_Msg *p_msg, uint32_t event_bitmap ); - - int - SNSdbAddAttrEntity (char **attr_indx, char **key_indx, - ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); - - int - Remove_DD_from_ISCSI_Node (SOIP_Dd *p_dd, char *p_node_name); - - int - SNSdbGetNextOfKey (ISNS_Key * key); - - void - ISNSExceptionHdlr (void); - - int - Add_dds_to_dd (SOIP_Dds *p_dds, int dd_id); - - int - Remove_DD_from_IFCP_Node (int id, char *p_node_name); - - int - Add_DD_to_ISCSI_Node (SOIP_Dd *p_dd, char *p_node_name); - - int - Add_DD_Member (SOIP_Dd * p_dd, char *ptr, int p_len, uint32_t type, uint32_t status, uint32_t index); - - int - Remove_DD_Member (SOIP_Dd *p_dd, char *ptr, uint32_t type); - - int - Add_DD_to_IFCP_Node (int id, char *p_node_name); - - int - SNSGet_Active_DD_List_From_Src (ISNS_Attr * src_attr, - ISNS_DD_LIST p_dlist_src, int flag); - - int - Get_Active_DD_List_From_ENTITY_Node (char *p_entity_name, - SOIP_Entity * p_entity, - ISNS_DD_LIST p_list, int flag); - - int - Remove_dd_from_dds (SOIP_Dds * p_dds, int id); - - int - SNSProcessPortalOpAttr (ISNS_Msg * p_msg, ISNS_Attr ** attr_indx, - SOIP_Portal * p_portal); - - int - ISNSdbProcessPortOpAttr (ISNS_Msg * p_msg, ISNS_Attr ** attr_indx, - SOIP_Ifcp * p_port); - - int - ISNSdbProcessEntityOpAttr (ISNS_Msg * p_msg, ISNS_Attr ** attr_indx, - SOIP_Entity *p_entity); - - int - ISNSdbAddAttrISCSINode (char **attr_indx, char **key_indx, - ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg); - - int - ISNSFindTag (int start_indx, int key, char **attr_indx); - - ISNS_Attr * - ISNSFindKeyInResponseMsg (int key, ISNS_Msg * msg); - - int - ISNS_Process_SCN_Event (ISNS_Msg *p_msg); - - int - ISNSAppendAttr (ISNS_Msg * msg, int tag, int size, char *p_value, int value); - - int - ISNSAppendKey (ISNS_Msg * msg, int tag, int size, char *p_value, int value); - - int - SNSdbGetAttrEntity (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, - ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); - - int - SNSdbAddAttrPort (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, - ISNS_Msg * 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 - SNSdbGetAttrNode (char **attr_indx, char **key_indx, ISNS_Msg_Descp * md, - ISNS_Msg * p_rspmsg); - - int - SNSdbGetAttrPort (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, - ISNS_Msg_Descp * md, ISNS_Msg * p_rspmsg); - - int - SNSdbGetAttrPortal (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, - ISNS_Msg_Descp * md, ISNS_Msg * p_rsp_msg); - - 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 - ISNS_Process_SCN_Event (ISNS_Msg *p_msg); - - int - ISNSdbAddAttrDDS ( ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg ); - - int - ISNSdbAddAttrDD ( ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg ); - - int - ISNS_Process_SCN(ISNS_Msg_Descp *p_md, ISNS_Msg *p_rsp_msg); - - int - ISNS_ProcessESI ( ISNS_Msg_Descp *p_md ); - - int - ISNSdbRead (ISNS_Key *key, SOIP_DB_Entry *entry); - - int - ISNSdbWrite (ISNS_Key *key, SOIP_DB_Entry entry); - - int - ISNSdbDelete (ISNS_Key *key); /********************************************************************* --- 88,92 ---- Index: iSNSesi.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSesi.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iSNSesi.c 3 Nov 2006 18:55:41 -0000 1.1 --- iSNSesi.c 3 Nov 2006 20:22:29 -0000 1.2 *************** *** 37,47 **** */ #include "iSNS.h" #include "iSNSdb.h" #include "iSNStypes.h" - #include "iSNSmsg.h" #include "iSNScomm.h" #include "iSNSbuffer.h" #include "iSNStbl.h" - #include "iSNSList.h" #include "iSNSparse.h" --- 37,50 ---- */ #include "iSNS.h" + #include "iSNSmsg.h" + #include "iSNSList.h" #include "iSNSdb.h" + #include "iSNSesi.h" + #include "iSNSresponse.h" + #include "iSNSreg.h" #include "iSNStypes.h" #include "iSNScomm.h" #include "iSNSbuffer.h" #include "iSNStbl.h" #include "iSNSparse.h" Index: iSNSUtil.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSUtil.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** iSNSUtil.c 2 Nov 2006 21:19:20 -0000 1.6 --- iSNSUtil.c 3 Nov 2006 20:22:29 -0000 1.7 *************** *** 47,51 **** #include "iSNSdebug.h" - void SNSDisplay_Trace_Data (datum data); void SNSDisplay_Entity (SOIP_Entity *p_entity); --- 47,50 ---- *************** *** 376,380 **** * are enabled in the bit mask */ ! for (i = 0, nptr = (char *) ((FC4_Types *)fc4_types)->bitmap; i < 8; i++, nptr++) --- 375,379 ---- * are enabled in the bit mask */ ! for (i = 0, nptr = (uint32_t *) ((FC4_Types *)fc4_types)->bitmap; i < 8; i++, nptr++) Index: iSNSdereg.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSdereg.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNSdereg.c 3 Nov 2006 18:55:41 -0000 1.2 --- iSNSdereg.c 3 Nov 2006 20:22:29 -0000 1.3 *************** *** 38,48 **** */ #include "iSNS.h" #include "iSNSdb.h" #include "iSNStypes.h" - #include "iSNSmsg.h" #include "iSNScomm.h" #include "iSNSbuffer.h" #include "iSNStbl.h" - #include "iSNSList.h" #include "iSNSparse.h" --- 38,52 ---- */ #include "iSNS.h" + #include "iSNSmsg.h" + #include "iSNSList.h" #include "iSNSdb.h" + #include "iSNSreg.h" + #include "iSNSquery.h" + #include "iSNSscn.h" + #include "iSNSresponse.h" #include "iSNStypes.h" #include "iSNScomm.h" #include "iSNSbuffer.h" #include "iSNStbl.h" #include "iSNSparse.h" *************** *** 54,96 **** #endif - extern int sns_scn_debug; - extern int sns_scn_msg_filter; - extern int sns_rsync_debug; - extern int SNSGetMgmtAddr (void); - extern int sns_esi_interval; - - #ifndef SNS_LINUX - extern void NTWriteToFile(int len, void *ptr); - extern int NTReadFromFile(int *lenPtr, void *ptr); - #endif - /* Global */ extern int isns_db_debug;; - - extern int isns_scn_debug; - extern int isns_scn_msg_filter; - extern int isns_rsync_debug; - extern int sns_heartbeat_interval; - extern uint32_t isns_esi_interval; - extern datum ndb_fetch_sns (); - extern datum ndb_firstkey_isns (uint32_t key_type, char *key); - extern datum ndb_nextkey_isns (uint32_t key_type, datum key, char *pkey); - extern ISNS_ATTR_VALS_CB * ISNSAttrGetList (ISNS_Msg_Descp *p_md); /* - * SoIP service Database file descriptor - */ - //wrw static NDB_FILE dbfp; - - /* - * GDBM errno - */ - extern ndb_error ndb_errno; - - /* * static common variables for gdbm fetches * entry is for common registrations and queries --- 58,69 ---- Index: iSNSfsm.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSfsm.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNSfsm.c 2 Apr 2002 20:56:54 -0000 1.2 --- iSNSfsm.c 3 Nov 2006 20:22:29 -0000 1.3 *************** *** 87,93 **** static void - SNSSendCommAck(ISNS_Msg_Descp *); - - static void SNSSendHeartbeat(void); --- 87,90 ---- Index: iSNSreg.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSreg.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNSreg.c 3 Nov 2006 18:55:41 -0000 1.2 --- iSNSreg.c 3 Nov 2006 20:22:29 -0000 1.3 *************** *** 38,48 **** */ #include "iSNS.h" - #include "iSNSdb.h" #include "iSNStypes.h" #include "iSNSmsg.h" #include "iSNScomm.h" #include "iSNSbuffer.h" #include "iSNStbl.h" - #include "iSNSList.h" #include "iSNSparse.h" --- 38,52 ---- */ #include "iSNS.h" #include "iSNStypes.h" #include "iSNSmsg.h" + #include "iSNSList.h" + #include "iSNSdb.h" + #include "iSNSreg.h" + #include "iSNSscn.h" + #include "iSNSquery.h" + #include "iSNSresponse.h" #include "iSNScomm.h" #include "iSNSbuffer.h" #include "iSNStbl.h" #include "iSNSparse.h" Index: iSNSdb.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSdb.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** iSNSdb.c 3 Nov 2006 18:55:41 -0000 1.9 --- iSNSdb.c 3 Nov 2006 20:22:29 -0000 1.10 *************** *** 39,42 **** --- 39,43 ---- #include "iSNS.h" #include "iSNSdb.h" + #include "ndb.h" #include "iSNStypes.h" #include "iSNSmsg.h" *************** *** 54,61 **** int isns_db_debug = 0; - extern datum ndb_fetch_sns (); - extern datum ndb_firstkey_isns (uint32_t key_type, char *key); - extern datum ndb_nextkey_isns (uint32_t key_type, datum key, char *pkey); - /* * SoIP service Database file descriptor --- 55,58 ---- Index: iSNSscn.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSscn.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iSNSscn.c 3 Nov 2006 18:55:41 -0000 1.1 --- iSNSscn.c 3 Nov 2006 20:22:29 -0000 1.2 *************** *** 48,56 **** #include "iSNSdebug.h" - - //#ifndef MAX_PARSE_ATTRS - //#define MAX_PARSE_ATTRS 30 - //#endif - extern int sns_scn_debug; extern int sns_scn_msg_filter; --- 48,51 ---- *************** *** 59,67 **** extern int sns_esi_interval; - //#ifndef SNS_LINUX - //extern void NTWriteToFile(int len, void *ptr); - //extern int NTReadFromFile(int *lenPtr, void *ptr); - //#endif - /* Global */ extern int isns_db_debug; --- 54,57 ---- *************** *** 71,86 **** extern int isns_scn_msg_filter; extern int isns_rsync_debug; - //extern int sns_heartbeat_interval; - - //extern uint32_t isns_esi_interval; - - //extern datum ndb_fetch_sns (); - //extern datum ndb_firstkey_isns (uint32_t key_type, char *key); - //extern datum ndb_nextkey_isns (uint32_t key_type, datum key, char *pkey); - - /* - * GDBM errno - */ - //extern ndb_error ndb_errno; /* --- 61,64 ---- *************** *** 100,104 **** SOIP_Dd_Member *ddmem; /* [100]; */ - //ISNS_LIST esi_list; ISNS_LIST scn_list; ISNS_LIST scn_callback_list; --- 78,81 ---- *************** *** 117,120 **** --- 94,98 ---- IDX_HASH_ENTRY *iscsiIdxHashTbl[MAX_HASH]; IDX_HASH_ENTRY *portalIdxHashTbl[MAX_HASH]; + /* * Local function prototypes Index: iSNStrcv.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNStrcv.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNStrcv.c 2 Apr 2002 20:56:54 -0000 1.2 --- iSNStrcv.c 3 Nov 2006 20:22:29 -0000 1.3 *************** *** 121,125 **** if ((sockfd = accept (sock, (struct sockaddr *) &their_addr, ! &len)) < 0) { printf ("Fatal Error while doing an Accept.\n"); --- 121,125 ---- if ((sockfd = accept (sock, (struct sockaddr *) &their_addr, ! (socklen_t *)&len)) < 0) { printf ("Fatal Error while doing an Accept.\n"); Index: iSNSMain.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSMain.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** iSNSMain.c 3 Nov 2006 18:55:41 -0000 1.6 --- iSNSMain.c 3 Nov 2006 20:22:29 -0000 1.7 *************** *** 65,69 **** #include "iSNStbl.h" #include "iSNSdb.h" ! #ifdef SNS_DEBUG --- 65,72 ---- #include "iSNStbl.h" #include "iSNSdb.h" ! #include "iSNSreg.h" ! #include "iSNSquery.h" ! #include "iSNSesi.h" ! #include "iSNSscn.h" #ifdef SNS_DEBUG Index: iSNSquery.c =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNSquery.c 3 Nov 2006 18:55:41 -0000 1.2 --- iSNSquery.c 3 Nov 2006 20:22:29 -0000 1.3 *************** *** 38,48 **** */ #include "iSNS.h" #include "iSNSdb.h" #include "iSNStypes.h" - #include "iSNSmsg.h" #include "iSNScomm.h" #include "iSNSbuffer.h" #include "iSNStbl.h" - #include "iSNSList.h" #include "iSNSparse.h" --- 38,51 ---- */ #include "iSNS.h" + #include "iSNSmsg.h" + #include "iSNSList.h" #include "iSNSdb.h" + #include "iSNSquery.h" + #include "iSNSresponse.h" + #include "iSNSreg.h" #include "iSNStypes.h" #include "iSNScomm.h" #include "iSNSbuffer.h" #include "iSNStbl.h" #include "iSNSparse.h" *************** *** 54,91 **** #endif - extern int sns_scn_debug; - extern int sns_scn_msg_filter; - extern int sns_rsync_debug; - extern int SNSGetMgmtAddr (void); - extern int sns_esi_interval; - - #ifndef SNS_LINUX - extern void NTWriteToFile(int len, void *ptr); - extern int NTReadFromFile(int *lenPtr, void *ptr); - #endif - /* Global */ extern int isns_db_debug;; - - extern int isns_scn_debug; - extern int isns_scn_msg_filter; - extern int isns_rsync_debug; - extern int sns_heartbeat_interval; - extern uint32_t isns_esi_interval; - extern datum ndb_fetch_sns (); - extern datum ndb_firstkey_isns (uint32_t key_type, char *key); - extern datum ndb_nextkey_isns (uint32_t key_type, datum key, char *pkey); - extern ISNS_ATTR_VALS_CB * ISNSAttrGetList (ISNS_Msg_Descp *p_md); /* - * GDBM errno - */ - extern ndb_error ndb_errno; - - /* * static common variables for gdbm fetches * entry is for common registrations and queries --- 57,68 ---- *************** *** 112,116 **** extern ISNS_Msg_Descp *p_rspMd; - extern dbStats iSNS_stats; --- 89,92 ---- *************** *** 3728,3748 **** /* Fetch each DDS. */ dd_key.id = *(uint32_t *)GetNodeData(pnode2); - k.dptr = (char *) &dd_key; - k.dsize = DD_KEY_SIZE; - - d = ndb_fetch_sns (DD_ID_KEY, k, (char *) &lentry3); - - if (d.dptr == NULL) - { - printf ("***ERROR: Fetching DDS.\n"); - return (ERROR); - } ! if (lentry3.data_type != DDS_ID_KEY) ! { ! DEBUG_2 (isns_db_debug & 1, (Database key mismatch %u %u), ! lentry3.data_type, DDS_ID_KEY); ! return (ISNS_UNKNOWN_ERR); ! } p_dds = (SOIP_Dds *)&lentry3.data; --- 3704,3714 ---- /* Fetch each DDS. */ dd_key.id = *(uint32_t *)GetNodeData(pnode2); ! ISNS_Key read_key; ! read_key.tag = DD_ID_KEY; ! read_key.val.dd_id=dd_key.id; ! rval = ISNSdbRead(&read_key,&lentry3); ! if (rval != SUCCESS) ! return rval; p_dds = (SOIP_Dds *)&lentry3.data; |
