diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-09-20 09:13:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:53 -0500 |
| commit | be61c9d8773eb3d0dd97bcd5e9ccd3f1aabcd1d6 (patch) | |
| tree | 419697c4f043ce721b110da67def9678a4c90d82 /source4/lib/socket/socket.c | |
| parent | 635f5fa942c2ecd82a2a787b96bf2ce2a587c616 (diff) | |
| download | samba-be61c9d8773eb3d0dd97bcd5e9ccd3f1aabcd1d6.tar.gz samba-be61c9d8773eb3d0dd97bcd5e9ccd3f1aabcd1d6.tar.bz2 samba-be61c9d8773eb3d0dd97bcd5e9ccd3f1aabcd1d6.zip | |
r2439: - function that return just an int don't need a TALLOC_CTX
- fix some return and state bugs
metze
(This used to be commit 2757c593ab746b9dd7090f2cf5fcc31686adf67f)
Diffstat (limited to 'source4/lib/socket/socket.c')
| -rw-r--r-- | source4/lib/socket/socket.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c index 5fd587a635..6869114587 100644 --- a/source4/lib/socket/socket.c +++ b/source4/lib/socket/socket.c @@ -39,7 +39,7 @@ NTSTATUS socket_create(const char *name, enum socket_type type, struct socket_co (*new_sock)->ops = socket_getops_byname(name, type); if (!(*new_sock)->ops) { talloc_free((*new_sock)); - return status; + return NT_STATUS_INVALID_PARAMETER; } status = (*new_sock)->ops->init((*new_sock)); @@ -120,7 +120,7 @@ NTSTATUS socket_recv(struct socket_context *sock, TALLOC_CTX *mem_ctx, return NT_STATUS_INVALID_PARAMETER; } - if (sock->state != SOCKET_STATE_CLIENT_CONNECTED || + if (sock->state != SOCKET_STATE_CLIENT_CONNECTED && sock->state != SOCKET_STATE_SERVER_CONNECTED) { return NT_STATUS_INVALID_PARAMETER; } @@ -139,7 +139,7 @@ NTSTATUS socket_send(struct socket_context *sock, TALLOC_CTX *mem_ctx, return NT_STATUS_INVALID_PARAMETER; } - if (sock->state != SOCKET_STATE_CLIENT_CONNECTED || + if (sock->state != SOCKET_STATE_CLIENT_CONNECTED && sock->state != SOCKET_STATE_SERVER_CONNECTED) { return NT_STATUS_INVALID_PARAMETER; } @@ -169,13 +169,13 @@ char *socket_get_peer_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx) return sock->ops->get_peer_addr(sock, mem_ctx); } -int socket_get_peer_port(struct socket_context *sock, TALLOC_CTX *mem_ctx) +int socket_get_peer_port(struct socket_context *sock) { if (!sock->ops->get_peer_port) { return -1; } - return sock->ops->get_peer_port(sock, mem_ctx); + return sock->ops->get_peer_port(sock); } char *socket_get_my_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx) @@ -187,22 +187,22 @@ char *socket_get_my_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx) return sock->ops->get_my_addr(sock, mem_ctx); } -int socket_get_my_port(struct socket_context *sock, TALLOC_CTX *mem_ctx) +int socket_get_my_port(struct socket_context *sock) { if (!sock->ops->get_my_port) { return -1; } - return sock->ops->get_my_port(sock, mem_ctx); + return sock->ops->get_my_port(sock); } -int socket_get_fd(struct socket_context *sock, TALLOC_CTX *mem_ctx) +int socket_get_fd(struct socket_context *sock) { if (!sock->ops->get_fd) { return -1; } - return sock->ops->get_fd(sock, mem_ctx); + return sock->ops->get_fd(sock); } const struct socket_ops *socket_getops_byname(const char *name, enum socket_type type) |