cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-09 20:41:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

use evhttp_connection_base_new()

Browse Source 
svn:r816
This commit is contained in:
Niels Provos 2008-05-13 03:51:10 +00:00
parent ef0221cc39
commit 1bce6f7434
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
http.c
View File

@ -1397,21 +1397,14 @@ evhttp_read_header_cb(struct bufferevent *bufev, void *arg)
*/ */
struct evhttp_connection * struct evhttp_connection *
evhttp_connection_base_new(struct event_base *base, evhttp_connection_new(const char *address, unsigned short port)
const char *address, unsigned short port)
{ {
struct evhttp_connection *evcon = evhttp_connection_new(address, port); return (evhttp_connection_base_new(NULL, address, port));
if (evcon == NULL)
return (NULL);
if (base != NULL)
evhttp_connection_set_base(evcon, base);
return (evcon);
} }
struct evhttp_connection * struct evhttp_connection *
evhttp_connection_new(const char *address, unsigned short port) evhttp_connection_base_new(struct event_base *base,
const char *address, unsigned short port)
{ {
struct evhttp_connection *evcon = NULL; struct evhttp_connection *evcon = NULL;
@ -1444,6 +1437,11 @@ evhttp_connection_new(const char *address, unsigned short port)
evcon->state = EVCON_DISCONNECTED; evcon->state = EVCON_DISCONNECTED;
TAILQ_INIT(&evcon->requests); TAILQ_INIT(&evcon->requests);
if (base != NULL) {
evcon->base = base;
bufferevent_base_set(base, evcon->bufev);
}
return (evcon); return (evcon);
error: error:
@ -1452,7 +1450,8 @@ evhttp_connection_new(const char *address, unsigned short port)
return (NULL); return (NULL);
} }
void evhttp_connection_set_base(struct evhttp_connection *evcon, void
evhttp_connection_set_base(struct evhttp_connection *evcon,
struct event_base *base) struct event_base *base)
{ {
assert(evcon->base == NULL); assert(evcon->base == NULL);
@ -2432,7 +2431,7 @@ evhttp_get_request_connection(
char *hostname = NULL, *portname = NULL; char *hostname = NULL, *portname = NULL;
name_from_addr(sa, salen, &hostname, &portname); name_from_addr(sa, salen, &hostname, &portname);
if (hostname==NULL || portname==NULL) { if (hostname == NULL || portname == NULL) {
if (hostname) mm_free(hostname); if (hostname) mm_free(hostname);
if (portname) mm_free(portname); if (portname) mm_free(portname);
return (NULL); return (NULL);
@ -2442,16 +2441,13 @@ evhttp_get_request_connection(
__func__, hostname, portname, fd)); __func__, hostname, portname, fd));
/* we need a connection object to put the http request on */ /* we need a connection object to put the http request on */
evcon = evhttp_connection_new(hostname, atoi(portname)); evcon = evhttp_connection_base_new(
http->base, hostname, atoi(portname));
mm_free(hostname); mm_free(hostname);
mm_free(portname); mm_free(portname);
if (evcon == NULL) if (evcon == NULL)
return (NULL); return (NULL);
/* associate the base if we have one */
if (http->base != NULL)
evhttp_connection_set_base(evcon, http->base);
evcon->flags |= EVHTTP_CON_INCOMING; evcon->flags |= EVHTTP_CON_INCOMING;
evcon->state = EVCON_CONNECTED; evcon->state = EVCON_CONNECTED;