sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Use sockaddr_storage in async sendto/recvfrom

Browse Source
This commit is contained in:
Volker Lendecke 2010-12-29 08:46:08 +01:00
parent b222615b59
commit 65f4f22cb4
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/async_req/async_sock.c
View File

@ -41,7 +41,7 @@ struct sendto_state {
const void *buf;
size_t len;
int flags;
const struct sockaddr *addr;
const struct sockaddr_storage *addr;
socklen_t addr_len;
ssize_t sent;
};
@ -52,8 +52,7 @@ static void sendto_handler(struct tevent_context *ev,
struct tevent_req *sendto_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
int fd, const void *buf, size_t len, int flags,
const struct sockaddr *addr,
socklen_t addr_len)
const struct sockaddr_storage *addr)
{
struct tevent_req *result;
struct sendto_state *state;
@ -68,7 +67,23 @@ struct tevent_req *sendto_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
state->len = len;
state->flags = flags;
state->addr = addr;
state->addr_len = addr_len;
switch (addr->ss_family) {
case AF_INET:
state->addr_len = sizeof(struct sockaddr_in);
break;
#if defined(HAVE_IPV6)
case AF_INET6:
state->addr_len = sizeof(struct sockaddr_in6);
break;
#endif
case AF_UNIX:
state->addr_len = sizeof(struct sockaddr_un);
break;
default:
state->addr_len = sizeof(struct sockaddr_storage);
break;
}
fde = tevent_add_fd(ev, state, fd, TEVENT_FD_WRITE, sendto_handler,
result);
@ -89,7 +104,7 @@ static void sendto_handler(struct tevent_context *ev,
tevent_req_data(req, struct sendto_state);
state->sent = sendto(state->fd, state->buf, state->len, state->flags,
state->addr, state->addr_len);
(struct sockaddr *)state->addr, state->addr_len);
if ((state->sent == -1) && (errno == EINTR)) {
/* retry */
return;
@ -117,7 +132,7 @@ struct recvfrom_state {
void *buf;
size_t len;
int flags;
struct sockaddr *addr;
struct sockaddr_storage *addr;
socklen_t *addr_len;
ssize_t received;
};
@ -129,7 +144,8 @@ static void recvfrom_handler(struct tevent_context *ev,
struct tevent_req *recvfrom_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
int fd, void *buf, size_t len, int flags,
struct sockaddr *addr, socklen_t *addr_len)
struct sockaddr_storage *addr,
socklen_t *addr_len)
{
struct tevent_req *result;
struct recvfrom_state *state;
@ -165,7 +181,8 @@ static void recvfrom_handler(struct tevent_context *ev,
tevent_req_data(req, struct recvfrom_state);
state->received = recvfrom(state->fd, state->buf, state->len,
state->flags, state->addr, state->addr_len);
state->flags, (struct sockaddr *)state->addr,
state->addr_len);
if ((state->received == -1) && (errno == EINTR)) {
/* retry */
return;

6
lib/async_req/async_sock.h
View File

@ -29,14 +29,14 @@
struct tevent_req *sendto_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
int fd, const void *buf, size_t len, int flags,
const struct sockaddr *addr,
socklen_t addr_len);
const struct sockaddr_storage *addr);
ssize_t sendto_recv(struct tevent_req *req, int *perrno);
struct tevent_req *recvfrom_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
int fd, void *buf, size_t len, int flags,
struct sockaddr *addr, socklen_t *addr_len);
struct sockaddr_storage *addr,
socklen_t *addr_len);
ssize_t recvfrom_recv(struct tevent_req *req, int *perrno);
struct tevent_req *async_connect_send(TALLOC_CTX *mem_ctx,