[srm-cvs] CVS Update: - Test before commit :-)

Date: Sat Oct 19 14:30:01 CEST 2002
User: Derick Rethans
Directory: srm/main

Log Message:
 [0.10]
 - Test before commit :-)
 @- Added the no_tcp_ip setting to the "srm" section in the config file.
 @ When you set this setting to 1 (the default) then you can only connect to
 @ SRM through the UNIX domain socket. When you set the setting to 0 you can
 @ also connect with TCP/IP sockets. (Derick)
 
Modified files:
           srm/main/main.c (version: 1.61)

[FILE: /srm/main/main.c]

--- srm/main/main.c:1.60 Sat Oct 19 10:22:48 2002 GMT
+++ srm/main/main.c Sat Oct 19 10:30:01 2002 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.60 2002/10/19 12:22:48 derick Exp $ */
+/* $Id: cvstemp,v 1.61 2002/10/19 12:30:01 derick Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -266,9 +266,9 @@
 ** Initializing connections
 */
 
- if (!INI_SETTING(no_tcp_ip)) {
- srm_setup_socket (&rendezvous_s_in, AF_INET, (int) INI_SETTING(port), NULL);
- CP_SETUP(rendezvous_s_in, rendezvous_s_in);
+ if (INI_SETTING(no_tcp_ip)) {
+ srm_setup_socket (&rendezvous_s_un, AF_UNIX, 0, INI_SETTING(sockname));
+ CP_SETUP(rendezvous_s_un, rendezvous_s_un);
         } else {
                 srm_setup_socket (&rendezvous_s_in, AF_INET, (int) INI_SETTING(port), NULL);
                 srm_setup_socket (&rendezvous_s_un, AF_UNIX, 0, INI_SETTING(sockname));
@@ -285,7 +285,7 @@
                 timeout.tv_usec = 0;
                 CP_SELECT(timeout);
 
- if (CP_ISNEWCONNECT(rendezvous_s_in)) {
+ if (!INI_SETTING(no_tcp_ip) && CP_ISNEWCONNECT(rendezvous_s_in)) {
                         client_in_len = sizeof (client_in);
                         fd = accept (rendezvous_s_in, (struct sockaddr *) &client_in, &client_in_len);
                         iaddr = &client_in.sin_addr;
Received on Sat Oct 19 14:32:59 2002