GFS: Allow multiple listenrefs YAZ-554

diff --git a/doc/gfs-virtual.xml b/doc/gfs-virtual.xml
index 18d68dd..1250331 100644 (file)
--- a/doc/gfs-virtual.xml
+++ b/doc/gfs-virtual.xml
@@ -84,10 +84,11 @@
   <varlistentry><term>attribute <literal>listenref</literal> (optional)</term>
    <listitem>
     <para>
   <varlistentry><term>attribute <literal>listenref</literal> (optional)</term>
    <listitem>
     <para>

-     Specifies listener for this server. If this attribute is not
-     given, the server is accessible from all listener. In order
-     for the server to be used for real, howeever, the virtual host
-     must match (if specified in the configuration).
+     Specifies one or more listeners for this server. Each server ID is
+     separated by a comma.
+     If this attribute is not given, the server is accessible from all
+     listeners. In order for the server to be used for real, however, the
+     virtual host must match if specified in the configuration.

     </para>
    </listitem>
   </varlistentry>
     </para>
    </listitem>
   </varlistentry>

@@ -220,7 +221,7 @@
     <directory>/var/www/s1</directory>
     <config>config.cfg</config>
   </server>
     <directory>/var/www/s1</directory>
     <config>config.cfg</config>
   </server>

-  <server id="server2">
+  <server id="server2" listenref="public,internal">

     <host>server2.mydomain</host>
     <directory>/var/www/s2</directory>
     <config>config.cfg</config>
     <host>server2.mydomain</host>
     <directory>/var/www/s2</directory>
     <config>config.cfg</config>

@@ -243,9 +244,11 @@
 <para>
  There are three configured backend servers. The first two
  servers, <literal>"server1"</literal> and <literal>"server2"</literal>,
 <para>
  There are three configured backend servers. The first two
  servers, <literal>"server1"</literal> and <literal>"server2"</literal>,

- can be reached by both listener addresses - since
- no <literal>listenref</literal> attribute is specified.
- In order to distinguish between the two a virtual host has
+ can be reached by both listener addresses.
+ <literal>"server1"</literal> is reached by all (two) since no
+  <literal>listenref</literal> attribute is specified.
+ <literal>"server2"</literal> is reached by the two listeners specified.
+ In order to distinguish between the two, a virtual host has

  been specified for each of server in the <literal>host</literal>
  elements.
 </para>
  been specified for each of server in the <literal>host</literal>
  elements.
 </para>

diff --git a/src/session.h b/src/session.h
index 1b13364..90ee0b1 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -44,7 +44,7 @@ struct gfs_server {
     statserv_options_block cb;
     char *host;
     char *id;
     statserv_options_block cb;
     char *host;
     char *id;

-    int listen_ref;
+    int *listen_ref;

     cql_transform_t cql_transform;
     CCL_bibset ccl_transform;
     void *server_node_ptr;
     cql_transform_t cql_transform;
     CCL_bibset ccl_transform;
     void *server_node_ptr;

diff --git a/src/statserv.c b/src/statserv.c
index adf1443..e3b09c5 100644 (file)
--- a/src/statserv.c
+++ b/src/statserv.c
@@ -286,9 +286,15 @@ int control_association(association *assoc, const char *host, int force_open)
             int host_match = 0;
             if ( !gfs->host || (host && gfs->host && !strcmp(host, gfs->host)))
                 host_match = 1;
             int host_match = 0;
             if ( !gfs->host || (host && gfs->host && !strcmp(host, gfs->host)))
                 host_match = 1;

-            if (!gfs->listen_ref ||
-                gfs->listen_ref == assoc->client_chan->chan_id)
+            if (!gfs->listen_ref)

                 listen_match = 1;
                 listen_match = 1;

+            else
+            {
+                int i;
+                for (i = 0; gfs->listen_ref[i] != -1; i++)
+                    if (gfs->listen_ref[i] == assoc->client_chan->chan_id)
+                        listen_match = 1;
+            }

             if (listen_match && host_match)
             {
                 if (force_open ||
             if (listen_match && host_match)
             {
                 if (force_open ||

@@ -390,17 +396,27 @@ static void xml_config_read(const char *base_path)
             gfs->server_node_ptr = ptr_server;
             if (listenref)
             {
             gfs->server_node_ptr = ptr_server;
             if (listenref)
             {

-                int id_no;
-                struct gfs_listen *gl = gfs_listen_list;
-                for (id_no = 1; gl; gl = gl->next, id_no++)
-                    if (gl->id && !strcmp(gl->id, listenref))
-                    {
-                        gfs->listen_ref = id_no;
-                        break;
-                    }
-                if (!gl)
-                    yaz_log(YLOG_WARN, "Non-existent listenref '%s' in server "
-                            "config element", listenref);
+                char **refs;
+                int num, i;
+                nmem_strsplit(gfs_nmem, ",", listenref, &refs, &num);
+                gfs->listen_ref = (int*) nmem_malloc(gfs_nmem,
+                                                     sizeof(int) * (num + 1));
+                for (i = 0; i < num; i++)
+                {
+                    int id_no;
+                    struct gfs_listen *gl = gfs_listen_list;
+                    gfs->listen_ref[i] = 0;
+                    for (id_no = 1; gl; gl = gl->next, id_no++)
+                        if (gl->id && !strcmp(gl->id, refs[i]))
+                        {
+                            gfs->listen_ref[i] = id_no;
+                            break;
+                        }
+                    if (!gl)
+                        yaz_log(YLOG_WARN, "Non-existent listenref '%s' "
+                                "in server config element", refs[i]);
+                }
+                gfs->listen_ref[i] = -1;

             }
             for (ptr = ptr_server->children; ptr; ptr = ptr->next)
             {
             }
             for (ptr = ptr_server->children; ptr; ptr = ptr->next)
             {