[Linuxisns-commit] isnsNT/isnsserver/src iSNSUtil.c, 1.5, 1.6 iSNSdb.c, 1.6, 1.7

[Robert W. <wrw...@us...>]

Update of /cvsroot/linuxisns/isnsNT/isnsserver/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5471/src

Modified Files:
	iSNSUtil.c iSNSdb.c 
Log Message:
Provide a higher-level (abstracted) database interface

Index: iSNSUtil.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSUtil.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** iSNSUtil.c	25 Oct 2006 21:19:37 -0000	1.5
--- iSNSUtil.c	2 Nov 2006 21:19:20 -0000	1.6
***************
*** 527,531 ****
        printf("Portal IP: %s\n", dot_no);
  
!       printf("Portal Port: %#x\n", p_lentry->portal_ip_port.ip_port & 0xFFFF);
        printf("Portal Type: %s\n", (p_lentry->portal_ip_port.ip_port & 0x10000)?"UDP":"TCP");
        printf("Portal Idx : %u\n", p_lentry->portal_idx);
--- 527,532 ----
        printf("Portal IP: %s\n", dot_no);
  
!       //printf("Portal Port: %#x\n", p_lentry->portal_ip_port.ip_port & 0xFFFF);
!       printf("Portal Port: %i\n", p_lentry->portal_ip_port.ip_port);
        printf("Portal Type: %s\n", (p_lentry->portal_ip_port.ip_port & 0x10000)?"UDP":"TCP");
        printf("Portal Idx : %u\n", p_lentry->portal_idx);
***************
*** 719,723 ****
                  p_entity->prot_ver.ver_max, p_entity->prot_ver.ver_min);
         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));
  
--- 720,724 ----
                  p_entity->prot_ver.ver_max, p_entity->prot_ver.ver_min);
         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));
  

Index: iSNSdb.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSdb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** iSNSdb.c	25 Oct 2006 21:19:37 -0000	1.6
--- iSNSdb.c	2 Nov 2006 21:19:21 -0000	1.7
***************
*** 220,228 ****
  ISNSAddESIEntry(IP_Address *p_ip, uint32_t port, char *p_eid);
  
- #if 0
- static int
- SNSdbStoreEntity(char *p_entity_id, datum d);
- #endif
- 
  static int
  SNSdbGetAttrDD (char **attr_indx, char **key_indx, ISNS_Attr * src_attr, ISNS_Msg_Descp * md,
--- 220,223 ----
[...7496 lines suppressed...]
        }
        else
--- 13240,13256 ----
        {
           /* Save DD record */
           entry.data_type = ISNS_DD_ID;
!          key.tag = DD_ID_KEY;
!          key.val.dd_id = dd_key.id;
!          ISNSdbWrite(&key,entry);
        }
        else if (recType == DDS_ID_FILE_REC)
        {
           /* Save DDS record */
           entry.data_type = ISNS_DDS_ID;
!          ISNS_Key key;
!          key.tag = DDS_ID_KEY;
!          key.val.dds_id = dds_key.id;
!          ISNSdbWrite(&key,entry);
        }
        else