[Linuxisns-commit] isnsNT/isnsserver/src iSNSMain.c, 1.13, 1.14 iSNScomm.c, 1.8, 1.9

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

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

Modified Files:
	iSNSMain.c iSNScomm.c 
Log Message:
fix heartbeat

Index: iSNScomm.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNScomm.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** iSNScomm.c	13 Dec 2006 19:45:57 -0000	1.8
--- iSNScomm.c	20 Dec 2006 07:14:33 -0000	1.9
***************
*** 32,36 ****
  ***********************************************************************/
  #include <signal.h>
! 
  #include "iSNS.h"
  #include "iSNStypes.h"
--- 32,36 ----
  ***********************************************************************/
  #include <signal.h>
! #include <netdb.h>
  #include "iSNS.h"
  #include "iSNStypes.h"
***************
*** 755,761 ****
  {
     char  ip_addr[16];
  
     if (ifAddrGet(sns_if_name, ip_addr) == ERROR)
!       return(INADDR_ANY);
     else
        return(inet_addr(ip_addr));
--- 755,766 ----
  {
     char  ip_addr[16];
+    int ip;
  
     if (ifAddrGet(sns_if_name, ip_addr) == ERROR)
!    {
!       //return(INADDR_ANY);
!       ip = SNSGetIPAddress();
!       return ip;
!    }
     else
        return(inet_addr(ip_addr));
***************
*** 804,805 ****
--- 809,823 ----
        return(inet_addr(ip_addr));
  }
+ 
+ int
+ SNSGetIPAddress()
+ {
+    char hostname[256];
+    struct hostent *host;
+    struct in_addr h_addr;
+ 
+    gethostname(hostname,sizeof(hostname));
+    host = gethostbyname(hostname);
+    h_addr.s_addr= *(uint32_t *)(host->h_addr_list[0]);
+    return h_addr.s_addr;
+ }

Index: iSNSMain.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSMain.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** iSNSMain.c	19 Dec 2006 22:25:31 -0000	1.13
--- iSNSMain.c	20 Dec 2006 07:14:33 -0000	1.14
***************
*** 302,306 ****
        break;
     case ISNS_HEART_BEAT:
-       DEBUG_0 (isns_main_debug & 1, ISNS_HEART_BEAT Not Implemented);
        break;
     case ISNS_REG_DDS_REQ:
--- 302,305 ----