Fix handling of bad config

[pazpar2-moved-to-github.git] / src / pazpar2_config.h

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 3118631..ee62aad 100644 (file)
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -111,12 +111,14 @@ struct conf_service
     pp2_charset_t sort_pct;
     pp2_charset_t mergekey_pct;
 
-
     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,15 +169,9 @@ struct conf_targetprofiles
     char *src;
 };
 
-struct conf_config
-{
-    NMEM nmem;
-    struct conf_server *servers;
-    struct conf_targetprofiles *targetprofiles;
-};
-
 struct conf_config *read_config(const char *fname);
-xsltStylesheet *conf_load_stylesheet(const char *fname);
+xsltStylesheet *conf_load_stylesheet(struct conf_config *config,
+                                     const char *fname);
 
 void config_read_settings(struct conf_config *config,
                           const char *path_override);
@@ -183,6 +180,12 @@ 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
 
 /*