mirror of
https://github.com/owntone/owntone-server.git
synced 2024-12-25 22:55:56 -05:00
Begin removing support for libevent 1
This commit is contained in:
ejurgensen
parent
5973875881
commit
fa4496c729
8
INSTALL
8
INSTALL
@ -31,10 +31,8 @@ libavresample-dev.
|
|||||||
To build with LastFM support, you should also install libcurl4-openssl-dev.
|
To build with LastFM support, you should also install libcurl4-openssl-dev.
|
||||||
|
|
||||||
Note that while forked-daapd will work with versions of libevent between 2.0.0
|
Note that while forked-daapd will work with versions of libevent between 2.0.0
|
||||||
and 2.1.3, it is recommended to use either libevent 1 or 2.1.4+. Otherwise you
|
and 2.1.3, it is recommended to use 2.1.4+. Otherwise you may not have support
|
||||||
will not have support for Shoutcast metadata and simultaneous streaming to
|
for Shoutcast metadata and simultaneous streaming to multiple clients.
|
||||||
multiple clients. Libevent 1 is not in the Debian repository, but you can get
|
|
||||||
the packages in the Ubuntu repository.
|
|
||||||
|
|
||||||
Then run the following:
|
Then run the following:
|
||||||
|
|
||||||
@ -120,7 +118,7 @@ Libraries:
|
|||||||
from <http://libav.org/releases/>
|
from <http://libav.org/releases/>
|
||||||
- libconfuse
|
- libconfuse
|
||||||
from <http://www.nongnu.org/confuse/>
|
from <http://www.nongnu.org/confuse/>
|
||||||
- libevent 1.4+ (best with version 1.4 or 2.1.4+)
|
- libevent 2.0+ (best with 2.1.4+)
|
||||||
from <http://libevent.org/>
|
from <http://libevent.org/>
|
||||||
- MiniXML (aka mxml or libmxml)
|
- MiniXML (aka mxml or libmxml)
|
||||||
from <http://minixml.org/software.php>
|
from <http://minixml.org/software.php>
|
||||||
|
|||||||
25
configure.ac
25
configure.ac
@ -159,28 +159,19 @@ LIBS="$save_LIBS"
|
|||||||
PKG_CHECK_MODULES(MINIXML, [ mxml ])
|
PKG_CHECK_MODULES(MINIXML, [ mxml ])
|
||||||
|
|
||||||
PKG_CHECK_MODULES(LIBEVENT, [ libevent >= 2 ],
|
PKG_CHECK_MODULES(LIBEVENT, [ libevent >= 2 ],
|
||||||
AC_DEFINE(HAVE_LIBEVENT2, 1, [Define to 1 if you have libevent 2]),
|
AC_DEFINE(HAVE_LIBEVENT2, 1, [Define to 1 if you have libevent 2])
|
||||||
try_libevent1=true;
|
|
||||||
)
|
)
|
||||||
|
|
||||||
AM_CONDITIONAL(COND_LIBEVENT1, false)
|
|
||||||
AM_CONDITIONAL(COND_LIBEVENT20, false)
|
AM_CONDITIONAL(COND_LIBEVENT20, false)
|
||||||
AM_CONDITIONAL(COND_LIBEVENT21, false)
|
AM_CONDITIONAL(COND_LIBEVENT21, false)
|
||||||
|
|
||||||
if test x$try_libevent1 = xtrue; then
|
PKG_CHECK_EXISTS([ libevent >= 2.1 ],
|
||||||
AC_CHECK_HEADER(event.h, , AC_MSG_ERROR([event.h not found]))
|
AM_CONDITIONAL(COND_LIBEVENT21, true),
|
||||||
AC_CHECK_LIB([event_core], [event_init], [LIBEVENT_LIBS="-levent_core"], AC_MSG_ERROR([libevent not found]))
|
AM_CONDITIONAL(COND_LIBEVENT20, true)
|
||||||
AC_SUBST(LIBEVENT_LIBS)
|
)
|
||||||
AM_CONDITIONAL(COND_LIBEVENT1, true)
|
PKG_CHECK_EXISTS([ libevent >= 2.1.4 ], ,
|
||||||
else
|
AC_DEFINE(HAVE_LIBEVENT2_OLD, 1, [Define to 1 if you have libevent 2 (<2.1.4)])
|
||||||
PKG_CHECK_EXISTS([ libevent >= 2.1 ],
|
)
|
||||||
AM_CONDITIONAL(COND_LIBEVENT21, true),
|
|
||||||
AM_CONDITIONAL(COND_LIBEVENT20, true)
|
|
||||||
)
|
|
||||||
PKG_CHECK_EXISTS([ libevent >= 2.1.4 ], ,
|
|
||||||
AC_DEFINE(HAVE_LIBEVENT2_OLD, 1, [Define to 1 if you have libevent 2 (<2.1.4)])
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CHECK_HEADER(antlr3.h, , AC_MSG_ERROR([antlr3.h not found]))
|
AC_CHECK_HEADER(antlr3.h, , AC_MSG_ERROR([antlr3.h not found]))
|
||||||
AC_CHECK_LIB([antlr3c], [antlr3BaseRecognizerNew], [ANTLR3C_LIBS="-lantlr3c"], AC_MSG_ERROR([ANTLR3 C runtime (libantlr3c) not found]))
|
AC_CHECK_LIB([antlr3c], [antlr3BaseRecognizerNew], [ANTLR3C_LIBS="-lantlr3c"], AC_MSG_ERROR([ANTLR3 C runtime (libantlr3c) not found]))
|
||||||
|
|||||||
@ -33,18 +33,11 @@ if COND_OSS4
|
|||||||
OSS4_SRC=laudio_oss4.c
|
OSS4_SRC=laudio_oss4.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if COND_LIBEVENT1
|
|
||||||
EVHTTP_SRC=evhttp/http.c evhttp/evhttp.h evhttp/evhttp_compat.c evhttp/evhttp_compat.h evhttp/http-internal.h evhttp/log.h
|
|
||||||
RTSP_SRC=evrtsp/rtsp-libevent1.c evrtp/evrtsp.h evrtsp/rtsp-internal.h evrtsp/log.h
|
|
||||||
endif
|
|
||||||
|
|
||||||
if COND_LIBEVENT20
|
if COND_LIBEVENT20
|
||||||
EVHTTP_SRC=
|
|
||||||
RTSP_SRC=evrtsp/rtsp-libevent20.c evrtp/evrtsp.h evrtsp/rtsp-internal.h evrtsp/log.h
|
RTSP_SRC=evrtsp/rtsp-libevent20.c evrtp/evrtsp.h evrtsp/rtsp-internal.h evrtsp/log.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if COND_LIBEVENT21
|
if COND_LIBEVENT21
|
||||||
EVHTTP_SRC=
|
|
||||||
RTSP_SRC=evrtsp/rtsp.c evrtp/evrtsp.h evrtsp/rtsp-internal.h evrtsp/log.h
|
RTSP_SRC=evrtsp/rtsp.c evrtp/evrtsp.h evrtsp/rtsp-internal.h evrtsp/log.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -102,7 +95,6 @@ forked_daapd_SOURCES = main.c \
|
|||||||
filescanner_smartpl.c $(ITUNES_SRC) \
|
filescanner_smartpl.c $(ITUNES_SRC) \
|
||||||
mdns_avahi.c mdns.h \
|
mdns_avahi.c mdns.h \
|
||||||
remote_pairing.c remote_pairing.h \
|
remote_pairing.c remote_pairing.h \
|
||||||
$(EVHTTP_SRC) \
|
|
||||||
avio_evbuffer.c avio_evbuffer.h \
|
avio_evbuffer.c avio_evbuffer.h \
|
||||||
httpd.c httpd.h \
|
httpd.c httpd.h \
|
||||||
httpd_rsp.c httpd_rsp.h \
|
httpd_rsp.c httpd_rsp.h \
|
||||||
|
|||||||
@ -1,385 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* 3. The name of the author may not be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
#ifndef _EVHTTP_H_
|
|
||||||
#define _EVHTTP_H_
|
|
||||||
|
|
||||||
#include <event.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef WIN32
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
|
||||||
#include <winsock2.h>
|
|
||||||
#include <windows.h>
|
|
||||||
#undef WIN32_LEAN_AND_MEAN
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** @file evhttp.h
|
|
||||||
*
|
|
||||||
* Basic support for HTTP serving.
|
|
||||||
*
|
|
||||||
* As libevent is a library for dealing with event notification and most
|
|
||||||
* interesting applications are networked today, I have often found the
|
|
||||||
* need to write HTTP code. The following prototypes and definitions provide
|
|
||||||
* an application with a minimal interface for making HTTP requests and for
|
|
||||||
* creating a very simple HTTP server.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Response codes */
|
|
||||||
#define HTTP_OK 200
|
|
||||||
#define HTTP_NOCONTENT 204
|
|
||||||
#define HTTP_MOVEPERM 301
|
|
||||||
#define HTTP_MOVETEMP 302
|
|
||||||
#define HTTP_NOTMODIFIED 304
|
|
||||||
#define HTTP_BADREQUEST 400
|
|
||||||
#define HTTP_NOTFOUND 404
|
|
||||||
#define HTTP_SERVUNAVAIL 503
|
|
||||||
|
|
||||||
struct evhttp;
|
|
||||||
struct evhttp_request;
|
|
||||||
struct evkeyvalq;
|
|
||||||
struct evhttp_connection;
|
|
||||||
|
|
||||||
/** Create a new HTTP server
|
|
||||||
*
|
|
||||||
* @param base (optional) the event base to receive the HTTP events
|
|
||||||
* @return a pointer to a newly initialized evhttp server structure
|
|
||||||
*/
|
|
||||||
struct evhttp *evhttp_new(struct event_base *base);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Binds an HTTP server on the specified address and port.
|
|
||||||
*
|
|
||||||
* Can be called multiple times to bind the same http server
|
|
||||||
* to multiple different ports.
|
|
||||||
*
|
|
||||||
* @param http a pointer to an evhttp object
|
|
||||||
* @param address a string containing the IP address to listen(2) on
|
|
||||||
* @param port the port number to listen on
|
|
||||||
* @return a newly allocated evhttp struct
|
|
||||||
* @see evhttp_free()
|
|
||||||
*/
|
|
||||||
int evhttp_bind_socket(struct evhttp *http, const char *address, u_short port);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Makes an HTTP server accept connections on the specified socket
|
|
||||||
*
|
|
||||||
* This may be useful to create a socket and then fork multiple instances
|
|
||||||
* of an http server, or when a socket has been communicated via file
|
|
||||||
* descriptor passing in situations where an http servers does not have
|
|
||||||
* permissions to bind to a low-numbered port.
|
|
||||||
*
|
|
||||||
* Can be called multiple times to have the http server listen to
|
|
||||||
* multiple different sockets.
|
|
||||||
*
|
|
||||||
* @param http a pointer to an evhttp object
|
|
||||||
* @param fd a socket fd that is ready for accepting connections
|
|
||||||
* @return 0 on success, -1 on failure.
|
|
||||||
* @see evhttp_free(), evhttp_bind_socket()
|
|
||||||
*/
|
|
||||||
int evhttp_accept_socket(struct evhttp *http, int fd);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Free the previously created HTTP server.
|
|
||||||
*
|
|
||||||
* Works only if no requests are currently being served.
|
|
||||||
*
|
|
||||||
* @param http the evhttp server object to be freed
|
|
||||||
* @see evhttp_start()
|
|
||||||
*/
|
|
||||||
void evhttp_free(struct evhttp* http);
|
|
||||||
|
|
||||||
/** Set a callback for a specified URI */
|
|
||||||
void evhttp_set_cb(struct evhttp *, const char *,
|
|
||||||
void (*)(struct evhttp_request *, void *), void *);
|
|
||||||
|
|
||||||
/** Removes the callback for a specified URI */
|
|
||||||
int evhttp_del_cb(struct evhttp *, const char *);
|
|
||||||
|
|
||||||
/** Set a callback for all requests that are not caught by specific callbacks
|
|
||||||
*/
|
|
||||||
void evhttp_set_gencb(struct evhttp *,
|
|
||||||
void (*)(struct evhttp_request *, void *), void *);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the timeout for an HTTP request.
|
|
||||||
*
|
|
||||||
* @param http an evhttp object
|
|
||||||
* @param timeout_in_secs the timeout, in seconds
|
|
||||||
*/
|
|
||||||
void evhttp_set_timeout(struct evhttp *, int timeout_in_secs);
|
|
||||||
|
|
||||||
/* Request/Response functionality */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send an HTML error message to the client.
|
|
||||||
*
|
|
||||||
* @param req a request object
|
|
||||||
* @param error the HTTP error code
|
|
||||||
* @param reason a brief explanation of the error
|
|
||||||
*/
|
|
||||||
void evhttp_send_error(struct evhttp_request *req, int error,
|
|
||||||
const char *reason);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send an HTML reply to the client.
|
|
||||||
*
|
|
||||||
* @param req a request object
|
|
||||||
* @param code the HTTP response code to send
|
|
||||||
* @param reason a brief message to send with the response code
|
|
||||||
* @param databuf the body of the response
|
|
||||||
*/
|
|
||||||
void evhttp_send_reply(struct evhttp_request *req, int code,
|
|
||||||
const char *reason, struct evbuffer *databuf);
|
|
||||||
|
|
||||||
/* Low-level response interface, for streaming/chunked replies */
|
|
||||||
void evhttp_send_reply_start(struct evhttp_request *, int, const char *);
|
|
||||||
void evhttp_send_reply_chunk_with_cb(struct evhttp_request *, struct evbuffer *,
|
|
||||||
void (*cb)(struct evhttp_connection *, void *), void *arg);
|
|
||||||
void evhttp_send_reply_chunk(struct evhttp_request *, struct evbuffer *);
|
|
||||||
void evhttp_send_reply_end(struct evhttp_request *);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start an HTTP server on the specified address and port
|
|
||||||
*
|
|
||||||
* DEPRECATED: it does not allow an event base to be specified
|
|
||||||
*
|
|
||||||
* @param address the address to which the HTTP server should be bound
|
|
||||||
* @param port the port number on which the HTTP server should listen
|
|
||||||
* @return an struct evhttp object
|
|
||||||
*/
|
|
||||||
struct evhttp *evhttp_start(const char *address, u_short port);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Interfaces for making requests
|
|
||||||
*/
|
|
||||||
enum evhttp_cmd_type { EVHTTP_REQ_GET, EVHTTP_REQ_POST, EVHTTP_REQ_HEAD };
|
|
||||||
|
|
||||||
enum evhttp_request_kind { EVHTTP_REQUEST, EVHTTP_RESPONSE };
|
|
||||||
|
|
||||||
/**
|
|
||||||
* the request structure that a server receives.
|
|
||||||
* WARNING: expect this structure to change. I will try to provide
|
|
||||||
* reasonable accessors.
|
|
||||||
*/
|
|
||||||
struct evhttp_request {
|
|
||||||
#if defined(TAILQ_ENTRY)
|
|
||||||
TAILQ_ENTRY(evhttp_request) next;
|
|
||||||
#else
|
|
||||||
struct {
|
|
||||||
struct evhttp_request *tqe_next;
|
|
||||||
struct evhttp_request **tqe_prev;
|
|
||||||
} next;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* the connection object that this request belongs to */
|
|
||||||
struct evhttp_connection *evcon;
|
|
||||||
int flags;
|
|
||||||
#define EVHTTP_REQ_OWN_CONNECTION 0x0001
|
|
||||||
#define EVHTTP_PROXY_REQUEST 0x0002
|
|
||||||
|
|
||||||
struct evkeyvalq *input_headers;
|
|
||||||
struct evkeyvalq *output_headers;
|
|
||||||
|
|
||||||
/* address of the remote host and the port connection came from */
|
|
||||||
char *remote_host;
|
|
||||||
u_short remote_port;
|
|
||||||
|
|
||||||
enum evhttp_request_kind kind;
|
|
||||||
enum evhttp_cmd_type type;
|
|
||||||
|
|
||||||
char *uri; /* uri after HTTP request was parsed */
|
|
||||||
|
|
||||||
char major; /* HTTP Major number */
|
|
||||||
char minor; /* HTTP Minor number */
|
|
||||||
|
|
||||||
int response_code; /* HTTP Response code */
|
|
||||||
char *response_code_line; /* Readable response */
|
|
||||||
|
|
||||||
struct evbuffer *input_buffer; /* read data */
|
|
||||||
ev_int64_t ntoread;
|
|
||||||
int chunked:1, /* a chunked request */
|
|
||||||
userdone:1; /* the user has sent all data */
|
|
||||||
|
|
||||||
struct evbuffer *output_buffer; /* outgoing post or data */
|
|
||||||
|
|
||||||
/* Callback */
|
|
||||||
void (*cb)(struct evhttp_request *, void *);
|
|
||||||
void *cb_arg;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Chunked data callback - call for each completed chunk if
|
|
||||||
* specified. If not specified, all the data is delivered via
|
|
||||||
* the regular callback.
|
|
||||||
*/
|
|
||||||
void (*chunk_cb)(struct evhttp_request *, void *);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Callback added for forked-daapd so we can collect ICY
|
|
||||||
* (shoutcast) metadata from the http header. If return
|
|
||||||
* int is negative the connection will be closed.
|
|
||||||
*/
|
|
||||||
int (*header_cb)(struct evhttp_request *, void *);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new request object that needs to be filled in with the request
|
|
||||||
* parameters. The callback is executed when the request completed or an
|
|
||||||
* error occurred.
|
|
||||||
*/
|
|
||||||
struct evhttp_request *evhttp_request_new(
|
|
||||||
void (*cb)(struct evhttp_request *, void *), void *arg);
|
|
||||||
|
|
||||||
/** enable delivery of chunks to requestor */
|
|
||||||
void evhttp_request_set_chunked_cb(struct evhttp_request *,
|
|
||||||
void (*cb)(struct evhttp_request *, void *));
|
|
||||||
|
|
||||||
/** Frees the request object and removes associated events. */
|
|
||||||
void evhttp_request_free(struct evhttp_request *req);
|
|
||||||
|
|
||||||
/** Returns the connection object associated with the request or NULL */
|
|
||||||
struct evhttp_connection *evhttp_request_get_connection(struct evhttp_request *req);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A connection object that can be used to for making HTTP requests. The
|
|
||||||
* connection object tries to establish the connection when it is given an
|
|
||||||
* http request object.
|
|
||||||
*/
|
|
||||||
struct evhttp_connection *evhttp_connection_new(
|
|
||||||
const char *address, unsigned short port);
|
|
||||||
|
|
||||||
/** Frees an http connection */
|
|
||||||
void evhttp_connection_free(struct evhttp_connection *evcon);
|
|
||||||
|
|
||||||
/** sets the ip address from which http connections are made */
|
|
||||||
void evhttp_connection_set_local_address(struct evhttp_connection *evcon,
|
|
||||||
const char *address);
|
|
||||||
|
|
||||||
/** sets the local port from which http connections are made */
|
|
||||||
void evhttp_connection_set_local_port(struct evhttp_connection *evcon,
|
|
||||||
unsigned short port);
|
|
||||||
|
|
||||||
/** Sets the timeout for events related to this connection */
|
|
||||||
void evhttp_connection_set_timeout(struct evhttp_connection *evcon,
|
|
||||||
int timeout_in_secs);
|
|
||||||
|
|
||||||
/** Sets the retry limit for this connection - -1 repeats indefnitely */
|
|
||||||
void evhttp_connection_set_retries(struct evhttp_connection *evcon,
|
|
||||||
int retry_max);
|
|
||||||
|
|
||||||
/** Set a callback for connection close. */
|
|
||||||
void evhttp_connection_set_closecb(struct evhttp_connection *evcon,
|
|
||||||
void (*)(struct evhttp_connection *, void *), void *);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Associates an event base with the connection - can only be called
|
|
||||||
* on a freshly created connection object that has not been used yet.
|
|
||||||
*/
|
|
||||||
void evhttp_connection_set_base(struct evhttp_connection *evcon,
|
|
||||||
struct event_base *base);
|
|
||||||
|
|
||||||
/** Get the remote address and port associated with this connection. */
|
|
||||||
void evhttp_connection_get_peer(struct evhttp_connection *evcon,
|
|
||||||
char **address, u_short *port);
|
|
||||||
|
|
||||||
/** The connection gets ownership of the request */
|
|
||||||
int evhttp_make_request(struct evhttp_connection *evcon,
|
|
||||||
struct evhttp_request *req,
|
|
||||||
enum evhttp_cmd_type type, const char *uri);
|
|
||||||
|
|
||||||
const char *evhttp_request_uri(struct evhttp_request *req);
|
|
||||||
|
|
||||||
/* Interfaces for dealing with HTTP headers */
|
|
||||||
|
|
||||||
const char *evhttp_find_header(const struct evkeyvalq *, const char *);
|
|
||||||
int evhttp_remove_header(struct evkeyvalq *, const char *);
|
|
||||||
int evhttp_add_header(struct evkeyvalq *, const char *, const char *);
|
|
||||||
void evhttp_clear_headers(struct evkeyvalq *);
|
|
||||||
|
|
||||||
/* Miscellaneous utility functions */
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
Helper function to encode a URI.
|
|
||||||
|
|
||||||
The returned string must be freed by the caller.
|
|
||||||
|
|
||||||
@param uri an unencoded URI
|
|
||||||
@return a newly allocated URI-encoded string
|
|
||||||
*/
|
|
||||||
char *evhttp_encode_uri(const char *uri);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
Helper function to decode a URI.
|
|
||||||
|
|
||||||
The returned string must be freed by the caller.
|
|
||||||
|
|
||||||
@param uri an encoded URI
|
|
||||||
@return a newly allocated unencoded URI
|
|
||||||
*/
|
|
||||||
char *evhttp_decode_uri(const char *uri);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper function to parse out arguments in a query.
|
|
||||||
*
|
|
||||||
* Parsing a uri like
|
|
||||||
*
|
|
||||||
* http://foo.com/?q=test&s=some+thing
|
|
||||||
*
|
|
||||||
* will result in two entries in the key value queue.
|
|
||||||
|
|
||||||
* The first entry is: key="q", value="test"
|
|
||||||
* The second entry is: key="s", value="some thing"
|
|
||||||
*
|
|
||||||
* @param uri the request URI
|
|
||||||
* @param headers the head of the evkeyval queue
|
|
||||||
*/
|
|
||||||
void evhttp_parse_query(const char *uri, struct evkeyvalq *headers);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Escape HTML character entities in a string.
|
|
||||||
*
|
|
||||||
* Replaces <, >, ", ' and & with <, >, ",
|
|
||||||
* ' and & correspondingly.
|
|
||||||
*
|
|
||||||
* The returned string needs to be freed by the caller.
|
|
||||||
*
|
|
||||||
* @param html an unescaped HTML string
|
|
||||||
* @return an escaped HTML string
|
|
||||||
*/
|
|
||||||
char *evhttp_htmlescape(const char *html);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _EVHTTP_H_ */
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2009-2010 Julien BLACHE <jb@jblache.org>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include "evhttp_compat.h"
|
|
||||||
|
|
||||||
struct evhttp_connection *
|
|
||||||
evhttp_connection_base_new(struct event_base *base, void *ignore, const char *address, unsigned short port)
|
|
||||||
{
|
|
||||||
struct evhttp_connection *evcon;
|
|
||||||
|
|
||||||
if (!base || !address || !port)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
evcon = evhttp_connection_new(address, port);
|
|
||||||
if (evcon)
|
|
||||||
evhttp_connection_set_base(evcon, base);
|
|
||||||
|
|
||||||
return evcon;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
evhttp_request_set_header_cb(struct evhttp_request *req, int (*cb)(struct evhttp_request *, void *))
|
|
||||||
{
|
|
||||||
req->header_cb = cb;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
#ifndef _EVHTTP_COMPAT_H_
|
|
||||||
#define _EVHTTP_COMPAT_H_
|
|
||||||
|
|
||||||
#include "evhttp.h"
|
|
||||||
|
|
||||||
/* This file should only be included if using libevent 1
|
|
||||||
*
|
|
||||||
* The following adds libevent 2 evhttp functions to libevent 1, so we avoid
|
|
||||||
* the need of having many HAVE_LIBEVENT2 conditions inside the code
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define evhttp_request_get_response_code(x) x->response_code
|
|
||||||
|
|
||||||
#define evhttp_request_get_input_headers(x) x->input_headers
|
|
||||||
#define evhttp_request_get_output_headers(x) x->output_headers
|
|
||||||
|
|
||||||
#define evhttp_request_get_input_buffer(x) x->input_buffer
|
|
||||||
#define evhttp_request_get_output_buffer(x) x->output_buffer
|
|
||||||
|
|
||||||
#define evhttp_request_get_host(x) x->remote_host
|
|
||||||
|
|
||||||
#define evhttp_request_get_uri evhttp_request_uri
|
|
||||||
|
|
||||||
struct evhttp_connection *
|
|
||||||
evhttp_connection_base_new(struct event_base *base, void *ignore, const char *address, unsigned short port);
|
|
||||||
|
|
||||||
void
|
|
||||||
evhttp_request_set_header_cb(struct evhttp_request *req, int (*cb)(struct evhttp_request *, void *));
|
|
||||||
|
|
||||||
#endif /* _EVHTTP_COMPAT_H_ */
|
|
||||||
@ -1,155 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* This header file contains definitions for dealing with HTTP requests
|
|
||||||
* that are internal to libevent. As user of the library, you should not
|
|
||||||
* need to know about these.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _HTTP_H_
|
|
||||||
#define _HTTP_H_
|
|
||||||
|
|
||||||
#define HTTP_CONNECT_TIMEOUT 45
|
|
||||||
#define HTTP_WRITE_TIMEOUT 50
|
|
||||||
#define HTTP_READ_TIMEOUT 50
|
|
||||||
|
|
||||||
#define HTTP_PREFIX "http://"
|
|
||||||
#define HTTP_DEFAULTPORT 80
|
|
||||||
|
|
||||||
enum message_read_status {
|
|
||||||
ALL_DATA_READ = 1,
|
|
||||||
MORE_DATA_EXPECTED = 0,
|
|
||||||
DATA_CORRUPTED = -1,
|
|
||||||
REQUEST_CANCELED = -2
|
|
||||||
};
|
|
||||||
|
|
||||||
enum evhttp_connection_error {
|
|
||||||
EVCON_HTTP_TIMEOUT,
|
|
||||||
EVCON_HTTP_EOF,
|
|
||||||
EVCON_HTTP_INVALID_HEADER
|
|
||||||
};
|
|
||||||
|
|
||||||
struct evbuffer;
|
|
||||||
struct addrinfo;
|
|
||||||
struct evhttp_request;
|
|
||||||
|
|
||||||
/* A stupid connection object - maybe make this a bufferevent later */
|
|
||||||
|
|
||||||
enum evhttp_connection_state {
|
|
||||||
EVCON_DISCONNECTED, /**< not currently connected not trying either*/
|
|
||||||
EVCON_CONNECTING, /**< tries to currently connect */
|
|
||||||
EVCON_IDLE, /**< connection is established */
|
|
||||||
EVCON_READING_FIRSTLINE,/**< reading Request-Line (incoming conn) or
|
|
||||||
**< Status-Line (outgoing conn) */
|
|
||||||
EVCON_READING_HEADERS, /**< reading request/response headers */
|
|
||||||
EVCON_READING_BODY, /**< reading request/response body */
|
|
||||||
EVCON_READING_TRAILER, /**< reading request/response chunked trailer */
|
|
||||||
EVCON_WRITING /**< writing request/response headers/body */
|
|
||||||
};
|
|
||||||
|
|
||||||
struct event_base;
|
|
||||||
|
|
||||||
struct evhttp_connection {
|
|
||||||
/* we use tailq only if they were created for an http server */
|
|
||||||
TAILQ_ENTRY(evhttp_connection) (next);
|
|
||||||
|
|
||||||
int fd;
|
|
||||||
struct event ev;
|
|
||||||
struct event close_ev;
|
|
||||||
struct evbuffer *input_buffer;
|
|
||||||
struct evbuffer *output_buffer;
|
|
||||||
|
|
||||||
char *bind_address; /* address to use for binding the src */
|
|
||||||
u_short bind_port; /* local port for binding the src */
|
|
||||||
|
|
||||||
char *address; /* address to connect to */
|
|
||||||
int family;
|
|
||||||
u_short port;
|
|
||||||
|
|
||||||
int flags;
|
|
||||||
#define EVHTTP_CON_INCOMING 0x0001 /* only one request on it ever */
|
|
||||||
#define EVHTTP_CON_OUTGOING 0x0002 /* multiple requests possible */
|
|
||||||
#define EVHTTP_CON_CLOSEDETECT 0x0004 /* detecting if persistent close */
|
|
||||||
|
|
||||||
int timeout; /* timeout in seconds for events */
|
|
||||||
int retry_cnt; /* retry count */
|
|
||||||
int retry_max; /* maximum number of retries */
|
|
||||||
|
|
||||||
enum evhttp_connection_state state;
|
|
||||||
|
|
||||||
/* for server connections, the http server they are connected with */
|
|
||||||
struct evhttp *http_server;
|
|
||||||
|
|
||||||
TAILQ_HEAD(evcon_requestq, evhttp_request) requests;
|
|
||||||
|
|
||||||
void (*cb)(struct evhttp_connection *, void *);
|
|
||||||
void *cb_arg;
|
|
||||||
|
|
||||||
void (*closecb)(struct evhttp_connection *, void *);
|
|
||||||
void *closecb_arg;
|
|
||||||
|
|
||||||
struct event_base *base;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct evhttp_cb {
|
|
||||||
TAILQ_ENTRY(evhttp_cb) next;
|
|
||||||
|
|
||||||
char *what;
|
|
||||||
|
|
||||||
void (*cb)(struct evhttp_request *req, void *);
|
|
||||||
void *cbarg;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* both the http server as well as the rpc system need to queue connections */
|
|
||||||
TAILQ_HEAD(evconq, evhttp_connection);
|
|
||||||
|
|
||||||
/* each bound socket is stored in one of these */
|
|
||||||
struct evhttp_bound_socket {
|
|
||||||
TAILQ_ENTRY(evhttp_bound_socket) (next);
|
|
||||||
|
|
||||||
struct event bind_ev;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct evhttp {
|
|
||||||
TAILQ_HEAD(boundq, evhttp_bound_socket) sockets;
|
|
||||||
|
|
||||||
TAILQ_HEAD(httpcbq, evhttp_cb) callbacks;
|
|
||||||
struct evconq connections;
|
|
||||||
|
|
||||||
int timeout;
|
|
||||||
|
|
||||||
void (*gencb)(struct evhttp_request *req, void *);
|
|
||||||
void *gencbarg;
|
|
||||||
|
|
||||||
struct event_base *base;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* resets the connection; can be reused for more requests */
|
|
||||||
void evhttp_connection_reset(struct evhttp_connection *);
|
|
||||||
|
|
||||||
/* connects if necessary */
|
|
||||||
int evhttp_connection_connect(struct evhttp_connection *);
|
|
||||||
|
|
||||||
/* notifies the current request that it failed; resets connection */
|
|
||||||
void evhttp_connection_fail(struct evhttp_connection *,
|
|
||||||
enum evhttp_connection_error error);
|
|
||||||
|
|
||||||
void evhttp_get_request(struct evhttp *, int, struct sockaddr *, socklen_t);
|
|
||||||
|
|
||||||
int evhttp_hostportfile(char *, char **, u_short *, char **);
|
|
||||||
|
|
||||||
int evhttp_parse_firstline(struct evhttp_request *, struct evbuffer*);
|
|
||||||
int evhttp_parse_headers(struct evhttp_request *, struct evbuffer*);
|
|
||||||
|
|
||||||
void evhttp_start_read(struct evhttp_connection *);
|
|
||||||
void evhttp_make_header(struct evhttp_connection *, struct evhttp_request *);
|
|
||||||
|
|
||||||
void evhttp_write_buffer(struct evhttp_connection *,
|
|
||||||
void (*)(struct evhttp_connection *, void *), void *);
|
|
||||||
|
|
||||||
/* response sending HTML the data in the buffer */
|
|
||||||
void evhttp_response_code(struct evhttp_request *, int, const char *);
|
|
||||||
void evhttp_send_page(struct evhttp_request *, struct evbuffer *);
|
|
||||||
|
|
||||||
#endif /* _HTTP_H */
|
|
||||||
2951
src/evhttp/http.c
2951
src/evhttp/http.c
File diff suppressed because it is too large
Load Diff
@ -1,51 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* 1. Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* 3. The name of the author may not be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
||||||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
||||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
||||||
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
||||||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
||||||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
#ifndef _LOG_H_
|
|
||||||
#define _LOG_H_
|
|
||||||
|
|
||||||
#ifdef __GNUC__
|
|
||||||
#define EV_CHECK_FMT(a,b) __attribute__((format(printf, a, b)))
|
|
||||||
#else
|
|
||||||
#define EV_CHECK_FMT(a,b)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void event_err(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3);
|
|
||||||
void event_warn(const char *fmt, ...) EV_CHECK_FMT(1,2);
|
|
||||||
void event_errx(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3);
|
|
||||||
void event_warnx(const char *fmt, ...) EV_CHECK_FMT(1,2);
|
|
||||||
void event_msgx(const char *fmt, ...) EV_CHECK_FMT(1,2);
|
|
||||||
void _event_debugx(const char *fmt, ...) EV_CHECK_FMT(1,2);
|
|
||||||
|
|
||||||
#ifdef USE_DEBUG
|
|
||||||
#define event_debug(x) _event_debugx x
|
|
||||||
#else
|
|
||||||
#define event_debug(x) do {;} while (0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef EV_CHECK_FMT
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Loading…
Reference in New Issue
Block a user