/*
- * uhttpd - Tiny single-threaded httpd - Main header
+ * uhttpd - Tiny single-threaded httpd
*
- * Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef __UHTTPD_H
#include <libubox/ustream.h>
#include <libubox/blob.h>
#include <libubox/utils.h>
+#ifdef HAVE_UBUS
+#include <libubus.h>
+#include <json/json.h>
+#endif
+#ifdef HAVE_TLS
+#include <libubox/ustream-ssl.h>
+#endif
#include "utils.h"
#define UH_LIMIT_CLIENTS 64
-#define __enum_header(_name) HDR_##_name,
-#define __blobmsg_header(_name) [HDR_##_name] = { .name = #_name, .type = BLOBMSG_TYPE_STRING },
+#define __enum_header(_name, _val) HDR_##_name,
+#define __blobmsg_header(_name, _val) [HDR_##_name] = { .name = #_val, .type = BLOBMSG_TYPE_STRING },
struct client;
const char *error_handler;
const char *cgi_prefix;
const char *cgi_path;
+ const char *lua_handler;
+ const char *lua_prefix;
+ const char *ubus_prefix;
+ const char *ubus_socket;
int no_symlinks;
int no_dirlists;
int network_timeout;
int rfc1918_filter;
int tcp_keepalive;
- int max_requests;
+ int max_script_requests;
+ int max_connections;
int http_keepalive;
int script_timeout;
};
UH_HTTP_VER_1_1,
};
+enum http_user_agent {
+ UH_UA_UNKNOWN,
+ UH_UA_GECKO,
+ UH_UA_CHROME,
+ UH_UA_SAFARI,
+ UH_UA_MSIE,
+ UH_UA_KONQUEROR,
+ UH_UA_OPERA,
+ UH_UA_MSIE_OLD,
+ UH_UA_MSIE_NEW,
+};
+
struct http_request {
enum http_method method;
enum http_version version;
- bool expect_cont;
+ enum http_user_agent ua;
int redirect_status;
- const char *url;
+ int content_length;
+ bool expect_cont;
+ bool connection_close;
+ uint8_t transfer_chunked;
const struct auth_realm *realm;
};
void (*close)(struct relay *r, int ret);
};
+struct dispatch_proc {
+ struct uloop_timeout timeout;
+ struct blob_buf hdr;
+ struct uloop_fd wrfd;
+ struct relay r;
+ int status_code;
+ char *status_msg;
+};
+
struct dispatch_handler {
struct list_head list;
+ bool script;
bool (*check_url)(const char *url);
bool (*check_path)(struct path_info *pi, const char *url);
- void (*handle_request)(struct client *cl, const char *url, struct path_info *pi);
+ void (*handle_request)(struct client *cl, char *url, struct path_info *pi);
};
+#ifdef HAVE_UBUS
+struct dispatch_ubus {
+ struct ubus_request req;
+
+ struct uloop_timeout timeout;
+ struct json_tokener *jstok;
+ struct json_object *jsobj;
+ struct json_object *jsobj_cur;
+ int post_len;
+
+ const char *sid;
+ uint32_t obj;
+ const char *func;
+
+ struct blob_buf buf;
+ bool req_pending;
+ bool array;
+ int array_idx;
+};
+#endif
+
struct dispatch {
+ int (*data_send)(struct client *cl, const char *data, int len);
+ void (*data_done)(struct client *cl);
void (*write_cb)(struct client *cl);
void (*close_fds)(struct client *cl);
void (*free)(struct client *cl);
+
+ void *req_data;
+ void (*req_free)(struct client *cl);
+
+ bool data_blocked;
+
union {
struct {
struct blob_attr **hdr;
int fd;
} file;
- struct {
- struct blob_buf hdr;
- struct relay r;
- int status_code;
- char *status_msg;
- } proc;
+ struct dispatch_proc proc;
+#ifdef HAVE_UBUS
+ struct dispatch_ubus ubus;
+#endif
};
};
struct ustream *us;
struct ustream_fd sfd;
#ifdef HAVE_TLS
- struct ustream_ssl stream_ssl;
+ struct ustream_ssl ssl;
#endif
struct uloop_timeout timeout;
+ int requests;
enum client_state state;
+ bool tls;
struct http_request request;
struct uh_addr srv_addr, peer_addr;
void uh_index_add(const char *filename);
-void uh_accept_client(int fd);
+bool uh_accept_client(int fd, bool tls);
void uh_unblock_listeners(void);
void uh_setup_listeners(void);
uh_client_error(struct client *cl, int code, const char *summary, const char *fmt, ...);
void uh_handle_request(struct client *cl);
+void client_poll_post_data(struct client *cl);
+void uh_client_read_cb(struct client *cl);
+void uh_client_notify_state(struct client *cl);
void uh_auth_add(const char *path, const char *user, const char *pass);
bool uh_auth_check(struct client *cl, struct path_info *pi);
void uh_relay_open(struct client *cl, struct relay *r, int fd, int pid);
void uh_relay_close(struct relay *r, int ret);
void uh_relay_free(struct relay *r);
+void uh_relay_kill(struct client *cl, struct relay *r);
struct env_var *uh_get_process_vars(struct client *cl, struct path_info *pi);
-bool uh_create_process(struct client *cl, struct path_info *pi,
- void (*cb)(struct client *cl, struct path_info *pi, int fd));
+bool uh_create_process(struct client *cl, struct path_info *pi, char *url,
+ void (*cb)(struct client *cl, struct path_info *pi, char *url));
+
+int uh_plugin_init(const char *name);
+void uh_plugin_post_init(void);
#endif
projects / project / uhttpd.git / blobdiff