X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=3faa14530231e03d45bf15203f51d8ea3dfe9980;hb=ff90a10d56bd25ce276eab48c5cebfe7e7324f70;hp=61166d886629c46bf34981e3ab1c483e6601582a;hpb=bb76bca1e2b4969ea08cf2f1f57d74cfa31dd026;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 61166d8..3faa145 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -113,10 +113,12 @@ struct conf_service
 
     struct database *databases;
     struct conf_targetprofiles *targetprofiles;
+    struct conf_config *config;
 };
 
-struct conf_service * conf_service_create(int num_metadata, int num_sortkeys,
-    const char *service_id);
+struct conf_service * conf_service_create(struct conf_config *config,
+                                          int num_metadata, int num_sortkeys,
+                                          const char *service_id);
 
 struct conf_metadata* conf_service_add_metadata(struct conf_service *service,
                                                 int field_id,
@@ -140,7 +142,6 @@ int conf_service_metadata_field_id(struct conf_service *service, const char * na
 
 int conf_service_sortkey_field_id(struct conf_service *service, const char * name);
 
-
 struct conf_server
 {
     char *host;
@@ -148,12 +149,14 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
+    struct sockaddr_in *proxy_addr;
+    int listener_socket;
+
     char *server_settings;
 
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
     pp2_charset_t mergekey_pct;
-
     struct conf_service *service;
     struct conf_server *next;
 };
@@ -166,22 +169,23 @@ struct conf_targetprofiles
     char *src;
 };
 
-struct conf_config
-{
-    NMEM nmem; /* for conf_config and servers memory */
-    struct conf_server *servers;
-};
-
-struct conf_config *read_config(const char *fname);
-xsltStylesheet *conf_load_stylesheet(const char *fname);
+struct conf_config *config_create(const char *fname, int verbose);
+void config_destroy(struct conf_config *config);
+xsltStylesheet *conf_load_stylesheet(struct conf_config *config,
+                                     const char *fname);
 
-void config_read_settings(struct conf_config *config,
-                          const char *path_override);
+void config_read_settings(struct conf_config *config);
 
 struct conf_service *locate_service(struct conf_server *server,
                                     const char *service_id);
 
 
+int config_start_listeners(struct conf_config *conf,
+                           const char *listener_override,
+                           const char *proxy_override);
+
+void config_stop_listeners(struct conf_config *conf);
+
 #endif
 
 /*