/ctdl/f/ to get a list of all floors

[citadel.git] / webcit-ng / webcit.h

diff --git a/webcit-ng/webcit.h b/webcit-ng/webcit.h
index 6a781b1c22c36a40d259a1f9506ff0314d367fd5..c98be4b71eeb2ccb763d682e2a6179818913f8e3 100644 (file)
--- a/webcit-ng/webcit.h
+++ b/webcit-ng/webcit.h
@@ -1,6 +1,6 @@
 // webcit.h - "header of headers"
 //
-// Copyright (c) 1996-2021 by the citadel.org team
+// Copyright (c) 1996-2022 by the citadel.org team
 //
 // This program is open source software.  You can redistribute it and/or
 // modify it under the terms of the GNU General Public License, version 3.
@@ -40,7 +40,7 @@
 #include <openssl/rand.h>
 #include <expat.h>
 #define _(x)   x                               // temporary hack until we add i18n back in
-//#define DEBUG_HTTP                           // uncomment to debug HTTP headers
+#define DEBUG_HTTP                             // uncomment to debug HTTP headers
 
 // XML_StopParser is present in expat 2.x
 #if XML_MAJOR_VERSION > 1
@@ -52,23 +52,23 @@ struct client_handle {                              // this gets passed up the stack from the webserver to
        SSL *ssl_handle;
 };
 
-struct http_header {                           // request and response headers in struct http_transaction use this format
-       struct http_header *next;
+struct keyval {                                        // key/value pair (for array)
        char *key;
        char *val;
 };
 
 struct http_transaction {                      // The lifetime of an HTTP request goes through this data structure.
        char *method;                           // The top half is built up by the web server and sent up to the
-       char *uri;                              // application stack.  The second half is built up by the application
+       char *url;                              // application stack.  The second half is built up by the application
        char *http_version;                     // stack and sent back down to the web server, which transmits it to
        char *site_prefix;                      // the client.
-       struct http_header *request_headers;
+       Array *request_headers;
        char *request_body;
        long request_body_length;
+       Array *request_parms;                   // anything after the "?" in the URL
        int response_code;
        char *response_string;
-       struct http_header *response_headers;
+       Array *response_headers;
        char *response_body;
        long response_body_length;
 };
@@ -92,8 +92,7 @@ struct ctdlsession {
 
 extern char *ssl_cipher_list;
 extern int is_https;                           // nonzero if we are an HTTPS server today
-extern char *ctdlhost;
-extern char *ctdlport;
+extern char *ctdl_dir;                         // directory where Citadel Server is running
 void init_ssl(void);
 void starttls(struct client_handle *);
 void endtls(struct client_handle *);
@@ -109,19 +108,13 @@ enum {
 #define TRACE syslog(LOG_DEBUG, "\033[3%dmCHECKPOINT: %s:%d\033[0m", ((__LINE__%6)+1), __FILE__, __LINE__)
 #define SLEEPING               180             // TCP connection timeout
 #define MAX_WORKER_THREADS     32              // Maximum number of worker threads permitted to exist
-#define        CTDL_CRYPTO_DIR         "keys"
-#define CTDL_KEY_PATH          CTDL_CRYPTO_DIR "/webcit.key"
-#define CTDL_CSR_PATH          CTDL_CRYPTO_DIR "/webcit.csr"
-#define CTDL_CER_PATH          CTDL_CRYPTO_DIR "/webcit.cer"
-#define SIGN_DAYS              3650            // how long our certificate should live
 #define DEFAULT_SSL_CIPHER_LIST "DEFAULT"       // See http://openssl.org/docs/apps/ciphers.html
 #define WEBSERVER_PORT         80
 #define WEBSERVER_INTERFACE    "*"
-#define CTDLHOST               "dev.citadel.org"
-#define CTDLPORT               "504"
+#define CTDL_DIR               "/usr/local/citadel"
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define TARGET                 "webcit01"      /* Window target for inline URL's */
+#define TARGET                 "webcit02"      /* Window target for inline URL's */
 
 void worker_entry(int *pointer_to_master_socket);
 void perform_one_http_transaction(struct client_handle *ch);
@@ -130,13 +123,14 @@ void perform_request(struct http_transaction *);
 void do_404(struct http_transaction *);
 void output_static(struct http_transaction *);
 int uds_connectsock(char *sockpath);
-int tcp_connectsock(char *host, char *service);
 void ctdl_a(struct http_transaction *, struct ctdlsession *);
+void ctdl_f(struct http_transaction *, struct ctdlsession *);
 void ctdl_r(struct http_transaction *, struct ctdlsession *);
 void ctdl_u(struct http_transaction *, struct ctdlsession *);
 struct ctdlsession *connect_to_citadel(struct http_transaction *);
 void disconnect_from_citadel(struct ctdlsession *);
 char *header_val(struct http_transaction *h, char *requested_header);
+char *get_url_param(struct http_transaction *h, char *requested_param);
 int unescape_input(char *);
 void http_redirect(struct http_transaction *h, char *to_where);
 char *http_datestring(time_t xtime);