GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

be: replace conn_address by full struct instead of pointer

Browse Source
This commit is contained in:
Azat Khuzhin 2014-11-16 00:29:19 +03:00
parent f4874d8c1f
commit e5615aa7a3
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bufferevent-internal.h
View File

@ -213,7 +213,7 @@ struct bufferevent_private {
* So we need to save it, just after we connected to remote server, or * So we need to save it, just after we connected to remote server, or
* after resolving (to avoid extra dns requests during retrying, since UDP * after resolving (to avoid extra dns requests during retrying, since UDP
* is slow) */ * is slow) */
struct sockaddr_storage *conn_address; struct sockaddr_storage conn_address;
}; };
/** Possible operations for a control callback. */ /** Possible operations for a control callback. */

21
bufferevent_sock.c
View File

@ -106,29 +106,21 @@ bufferevent_socket_get_conn_address_(struct bufferevent *bev)
struct bufferevent_private *bev_p = struct bufferevent_private *bev_p =
EVUTIL_UPCAST(bev, struct bufferevent_private, bev); EVUTIL_UPCAST(bev, struct bufferevent_private, bev);
return (struct sockaddr *)bev_p->conn_address; return (struct sockaddr *)&bev_p->conn_address;
} }
static void static void
bufferevent_socket_set_conn_address_fd(struct bufferevent_private *bev_p, int fd) bufferevent_socket_set_conn_address_fd(struct bufferevent_private *bev_p, int fd)
{ {
socklen_t len = sizeof(*bev_p->conn_address); socklen_t len = sizeof(bev_p->conn_address);
if (!bev_p->conn_address) { struct sockaddr *addr = (struct sockaddr *)&bev_p->conn_address;
bev_p->conn_address = mm_malloc(sizeof(*bev_p->conn_address)); getpeername(fd, addr, &len);
}
if (getpeername(fd, (struct sockaddr *)bev_p->conn_address, &len)) {
mm_free(bev_p->conn_address);
bev_p->conn_address = NULL;
}
} }
static void static void
bufferevent_socket_set_conn_address(struct bufferevent_private *bev_p, bufferevent_socket_set_conn_address(struct bufferevent_private *bev_p,
struct sockaddr *addr, size_t addrlen) struct sockaddr *addr, size_t addrlen)
{ {
if (!bev_p->conn_address) { memcpy(&bev_p->conn_address, addr, addrlen);
bev_p->conn_address = mm_malloc(sizeof(*bev_p->conn_address));
}
memcpy(bev_p->conn_address, addr, addrlen);
} }
static void static void
@ -623,9 +615,6 @@ be_socket_destruct(struct bufferevent *bufev)
if ((bufev_p->options & BEV_OPT_CLOSE_ON_FREE) && fd >= 0) if ((bufev_p->options & BEV_OPT_CLOSE_ON_FREE) && fd >= 0)
EVUTIL_CLOSESOCKET(fd); EVUTIL_CLOSESOCKET(fd);
mm_free(bufev_p->conn_address);
bufev_p->conn_address = NULL;
} }
static int static int