[Linuxisns-commit] isnsNT/isnsserver/src iSNSLinux.c, 1.5, 1.6 iSNScomm.c, 1.3, 1.4 iSNSnt.c, 1.2,

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	iSNSLinux.c iSNScomm.c iSNSnt.c 
Log Message:
allow a default ip address

Index: iSNScomm.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNScomm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** iSNScomm.c	3 Nov 2006 20:22:29 -0000	1.3
--- iSNScomm.c	22 Nov 2006 21:01:52 -0000	1.4
***************
*** 37,61 ****
  #include "iSNSmsg.h"
  #include "iSNSparse.h"
- 
  #include "iSNSdebug.h"
  int sns_comm_debug = 0;
  int sns_comm_msg_filter = 0;
  
! #define  SNSifAddrGet(a, b)  ifAddrGet(a,b) 
! 
! 
! 
! char  snsp_ip[16];
! char  snsp_bip[16];
  int   snsp_port;
! char    sns_if_name[10]         = {SNS_IF_NAME};
  
  int ifAddrGet(char *ifname, char *ip)
  {
!     if (strcmp(ifname, sns_if_name) == 0) {
          strcpy(ip, snsp_ip);
      }
      else
!         printf("unknown interface\n");
  
      return(SUCCESS);
--- 37,61 ----
  #include "iSNSmsg.h"
  #include "iSNSparse.h"
  #include "iSNSdebug.h"
+ 
  int sns_comm_debug = 0;
  int sns_comm_msg_filter = 0;
  
! char  snsp_ip[16]=""; 
! char  snsp_bip[16]=SNS_BROADCAST_ADDR;
  int   snsp_port;
! char  sns_if_name[10] = {SNS_IF_NAME};
  
  int ifAddrGet(char *ifname, char *ip)
  {
!     //if (strcmp(ifname, sns_if_name) == 0) {
!     if (strlen (snsp_ip) != 0) {
          strcpy(ip, snsp_ip);
      }
      else
!     {
!         //printf("unknown interface\n");
!         return (ERROR);
!     }
  
      return(SUCCESS);
***************
*** 163,173 ****
       }
  
- 	  /* Allow reuse of addresses */
  #ifdef SNS_LINUX
! 	  if (setsockopt (sd, SOL_SOCKET, SO_REUSEADDR, &not_needed, sizeof(not_needed)) != 0)
! 	  {
! 		  perror ("Reuse address");
! 		  return (-1);
! 	  }
  #endif
  
--- 163,173 ----
       }
  
  #ifdef SNS_LINUX
!      /* Allow reuse of addresses */
!      if (setsockopt (sd, SOL_SOCKET, SO_REUSEADDR, &not_needed, sizeof(not_needed)) != 0)
!      {
! 	  perror ("Reuse address");
! 	  return (-1);
!      }
  #endif
  
***************
*** 178,188 ****
       }
  
- 	  /* Allow reuse of addresses */
  #ifdef SNS_LINUX
! 	  if (setsockopt (mc_sd, SOL_SOCKET, SO_REUSEADDR, &not_needed, sizeof(not_needed)) != 0)
! 	  {
! 		  perror ("Reuse address");
! 		  return (-1);
! 	  }
  #endif
  
--- 178,188 ----
       }
  
  #ifdef SNS_LINUX
!      /* Allow reuse of addresses */
!     if (setsockopt (mc_sd, SOL_SOCKET, SO_REUSEADDR, &not_needed, sizeof(not_needed)) != 0)
!     {
!        perror ("Reuse address");
!        return (-1);
!     }
  #endif
  
***************
*** 199,216 ****
       mc_sock.sin_port      = htons ((short)sns_comm_mcast_port);
  
- #ifdef GENERIC_NIC
       local_sock.sin_addr.s_addr = SNSGetIfAddr(); 
- #else
-    SNSifAddrGet(sns_if_name, ip_addr);
-    local_sock.sin_addr.s_addr = inet_addr(ip_addr);
- #endif
  
- 		/* Allow reuse of addresses */
  #ifdef SNS_LINUX
! 	  if (setsockopt (sd, SOL_SOCKET, SO_REUSEADDR, &not_needed, sizeof(not_needed)) < 0)
! 	  {
! 		  perror ("Reuse address");
! 		  return (-1);
! 	  }
  #endif
  
--- 199,211 ----
       mc_sock.sin_port      = htons ((short)sns_comm_mcast_port);
  
       local_sock.sin_addr.s_addr = SNSGetIfAddr(); 
  
  #ifdef SNS_LINUX
!      /* Allow reuse of addresses */
!      if (setsockopt (sd, SOL_SOCKET, SO_REUSEADDR, &not_needed, sizeof(not_needed)) < 0)
!      {
! 	  perror ("Reuse address");
! 	  return (-1);
!      }
  #endif
  
***************
*** 745,752 ****
     char  ip_addr[16];
  
!    if (SNSifAddrGet(sns_if_name, ip_addr) == ERROR)
!       return(htonl(INADDR_ANY));
     else
!       return(htonl(inet_addr(ip_addr)));
  }
  
--- 740,747 ----
     char  ip_addr[16];
  
!    if (ifAddrGet(sns_if_name, ip_addr) == ERROR)
!       return(INADDR_ANY);
     else
!       return(inet_addr(ip_addr));
  }
  

Index: iSNSnt.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSnt.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iSNSnt.c	2 Apr 2002 20:56:54 -0000	1.2
--- iSNSnt.c	22 Nov 2006 21:01:52 -0000	1.3
***************
*** 152,159 ****
     NOTES: IP-Addresses must be in IP dotted notation.\n\
  Options:\n\
!    [-i addr]  IP-Address for SNSP traffic.\n\
     [-b addr]  Broadcast Address for SNSP traffic.\n\
!    [-l]       Loads DD/DDS.\n\
!    [-u port]  primary port for SNSP traffic.\n\
     [-d]       Full debug options on.\n\
     [-?]       Help.\n\
--- 152,158 ----
     NOTES: IP-Addresses must be in IP dotted notation.\n\
  Options:\n\
!    [-a addr]  IP-Address for SNSP traffic.\n\
     [-b addr]  Broadcast Address for SNSP traffic.\n\
!    [-p port]  primary port for SNSP traffic.\n\
     [-d]       Full debug options on.\n\
     [-?]       Help.\n\
***************
*** 174,178 ****
  
     memset (snsp_ip, 0, sizeof (snsp_ip));
-    memset (snsp_bip, 0, sizeof (snsp_bip));
  
     if (argc < 3)
--- 173,176 ----
***************
*** 185,189 ****
     while (optind != argc)
     {
!       c = getopt (argc, argv, "ldi:b:u:c:");
  
        switch (c)
--- 183,187 ----
     while (optind != argc)
     {
!       c = getopt (argc, argv, "da:b:p:c:");
  
        switch (c)
***************
*** 194,202 ****
           break;
  
!       case 'l':
!          loadFlag = TRUE;
!          break;
! 
!       case 'i':
           strcpy (snsp_ip, optarg);
           break;
--- 192,196 ----
           break;
  
!       case 'a':
           strcpy (snsp_ip, optarg);
           break;
***************
*** 210,214 ****
           break;
  
!       case 'u':
           sns_comm_main_port_set = atoi (optarg);
           break;
--- 204,208 ----
           break;
  
!       case 'p':
           sns_comm_main_port_set = atoi (optarg);
           break;
***************
*** 218,224 ****
           break;
  
-       case 'p':
-          break;
- 
        case '?':
        default:
--- 212,215 ----
***************
*** 228,232 ****
     }
  
!    if (strlen (snsp_ip) == 0 || strlen (snsp_bip) == 0)
     {
        fprintf (stderr, Usage);
--- 219,223 ----
     }
  
!    if (strlen (snsp_ip) == 0 )
     {
        fprintf (stderr, Usage);

Index: iSNSLinux.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSLinux.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** iSNSLinux.c	31 Oct 2006 19:00:17 -0000	1.5
--- iSNSLinux.c	22 Nov 2006 21:01:52 -0000	1.6
***************
*** 132,139 ****
  NOTES: IP-Addresses must be in IP dotted notation.\n\
  Options:\n\
!    [-i addr]  IP-Address for SNSP traffic.\n\
     [-b addr]  Broadcast Address for SNSP traffic.\n\
!    [-l]       Loads DD/DDS.\n\
!    [-u port]  primary port for SNSP traffic.\n\
     [-d]       Full debug options on.\n\
     [-?]       Help.\n";
--- 132,138 ----
  NOTES: IP-Addresses must be in IP dotted notation.\n\
  Options:\n\
!    [-a addr]  IP-Address for SNSP traffic.\n\
     [-b addr]  Broadcast Address for SNSP traffic.\n\
!    [-p port]  primary port for SNSP traffic.\n\
     [-d]       Full debug options on.\n\
     [-?]       Help.\n";
***************
*** 148,164 ****
     ISNS_Entity role = ISNS_SECONDARY_SERVER;
  
-    memset (snsp_ip, 0, sizeof (snsp_ip));
-    memset (snsp_bip, 0, sizeof (snsp_bip));
- 
-    if (argc < 3)
-    {
-       fprintf (stderr, Usage);
-       exit (0);
-    }
- 
     /* Don't forget to init the rest */
     while (optind != argc)
     {
!       c = getopt (argc, argv, "ldi:b:u:c:");
  
        switch (c)
--- 147,154 ----
     ISNS_Entity role = ISNS_SECONDARY_SERVER;
  
     /* Don't forget to init the rest */
     while (optind != argc)
     {
!       c = getopt (argc, argv, "da:b:p:c:");
  
        switch (c)
***************
*** 169,177 ****
           break;
  
!       case 'l':
!          loadFlag = TRUE;
!          break;
! 
!       case 'i':
           strcpy (snsp_ip, optarg);
           break;
--- 159,163 ----
           break;
  
!       case 'a':
           strcpy (snsp_ip, optarg);
           break;
***************
*** 185,189 ****
           break;
  
!       case 'u':
           sns_comm_main_port_set = atoi (optarg);
           break;
--- 171,175 ----
           break;
  
!       case 'p':
           sns_comm_main_port_set = atoi (optarg);
           break;
***************
*** 193,199 ****
           break;
  
-       case 'p':
-          break;
- 
        case '?':
        default:
--- 179,182 ----
***************
*** 203,213 ****
     }
  
-    if (strlen (snsp_ip) == 0 || strlen (snsp_bip) == 0)
-    {
-       fprintf (stderr, Usage);
-       exit (0);
-    }
- 
- 
     pauseFlag = FALSE;
  
--- 186,189 ----

[Linuxisns-commit] isnsNT/isnsserver/src iSNSLinux.c, 1.5, 1.6 iSNScomm.c, 1.3, 1.4 iSNSnt.c, 1.2,

[Linuxisns-commit] isnsNT/isnsserver/src iSNSLinux.c, 1.5, 1.6 iSNScomm.c, 1.3, 1.4 iSNSnt.c, 1.2, 1.3