repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dont leak every single buffer we read from the socket.
[deb_libnfs.git]
/
lib
/
socket.c
diff --git
a/lib/socket.c
b/lib/socket.c
index 32c09457c09b9189bf9c4bf65542dc4f860cd886..762dbfac2fc5d5ff092b5ade6a205d0900f6933e 100644
(file)
--- a/
lib/socket.c
+++ b/
lib/socket.c
@@
-14,31
+14,56
@@
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#endif
+
#ifdef WIN32
#include "win32_compat.h"
#ifdef WIN32
#include "win32_compat.h"
-#e
lse
-#include <unistd.h>
-#i
nclude <poll.h>
+#e
ndif
+
+#i
fdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#include <sys/socket.h>
-#include <netdb.h>
-#endif/*WIN32*/
+#endif
-#ifdef HAVE_
CONFIG
_H
-#include
"config.h"
+#ifdef HAVE_
NETDB
_H
+#include
<netdb.h>
#endif
#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+
#ifdef HAVE_SYS_FILIO_H
#include <sys/filio.h>
#endif
#ifdef HAVE_SYS_FILIO_H
#include <sys/filio.h>
#endif
+
#ifdef HAVE_SYS_SOCKIO_H
#include <sys/sockio.h>
#endif
#ifdef HAVE_SYS_SOCKIO_H
#include <sys/sockio.h>
#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
#include <sys/types.h>
#include "libnfs-zdr.h"
#include "libnfs.h"
#include <sys/types.h>
#include "libnfs-zdr.h"
#include "libnfs.h"
@@
-60,7
+85,7
@@
static void set_nonblocking(int fd)
int v = 0;
#if defined(WIN32)
long nonblocking=1;
int v = 0;
#if defined(WIN32)
long nonblocking=1;
- v = ioctl
socket(fd, FIONBIO,
&nonblocking);
+ v = ioctl
(fd, FIONBIO,
&nonblocking);
#else
v = fcntl(fd, F_GETFL, 0);
fcntl(fd, F_SETFL, v | O_NONBLOCK);
#else
v = fcntl(fd, F_GETFL, 0);
fcntl(fd, F_SETFL, v | O_NONBLOCK);
@@
-69,12
+94,18
@@
static void set_nonblocking(int fd)
int rpc_get_fd(struct rpc_context *rpc)
{
int rpc_get_fd(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
return rpc->fd;
}
int rpc_which_events(struct rpc_context *rpc)
{
return rpc->fd;
}
int rpc_which_events(struct rpc_context *rpc)
{
- int events = rpc->is_connected ? POLLIN : POLLOUT;
+ int events;
+
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+ events = rpc->is_connected ? POLLIN : POLLOUT;
if (rpc->is_udp != 0) {
/* for udp sockets we only wait for pollin */
if (rpc->is_udp != 0) {
/* for udp sockets we only wait for pollin */
@@
-91,9
+122,8
@@
static int rpc_write_to_socket(struct rpc_context *rpc)
{
int32_t count;
{
int32_t count;
- if (rpc == NULL) {
- return -1;
- }
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->fd == -1) {
rpc_set_error(rpc, "trying to write but not connected");
return -1;
if (rpc->fd == -1) {
rpc_set_error(rpc, "trying to write but not connected");
return -1;
@@
-104,11
+134,7
@@
static int rpc_write_to_socket(struct rpc_context *rpc)
total = rpc->outqueue->outdata.size;
total = rpc->outqueue->outdata.size;
-#if defined(WIN32)
count = send(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written, 0);
count = send(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written, 0);
-#else
- count = write(rpc->fd, rpc->outqueue->outdata.data + rpc->outqueue->written, total - rpc->outqueue->written);
-#endif
if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0;
if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0;
@@
-135,11
+161,9
@@
static int rpc_read_from_socket(struct rpc_context *rpc)
int pdu_size;
int32_t count;
int pdu_size;
int32_t count;
-#if defined(WIN32)
- if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
-#else
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
-#endif
rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
return -1;
}
rpc_set_error(rpc, "Ioctl FIONREAD returned error : %d. Closing socket.", errno);
return -1;
}
@@
-184,11
+208,7
@@
static int rpc_read_from_socket(struct rpc_context *rpc)
if (rpc->inpos < 4) {
size = 4 - rpc->inpos;
if (rpc->inpos < 4) {
size = 4 - rpc->inpos;
-#if defined(WIN32)
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
- count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
if (count == -1) {
if (errno == EINTR) {
return 0;
if (count == -1) {
if (errno == EINTR) {
return 0;
@@
-224,11
+244,7
@@
static int rpc_read_from_socket(struct rpc_context *rpc)
size = rpc->insize - rpc->inpos;
}
size = rpc->insize - rpc->inpos;
}
-#if defined(WIN32)
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
count = recv(rpc->fd, rpc->inbuf + rpc->inpos, size, 0);
-#else
- count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
-#endif
if (count == -1) {
if (errno == EINTR) {
return 0;
if (count == -1) {
if (errno == EINTR) {
return 0;
@@
-240,14
+256,17
@@
static int rpc_read_from_socket(struct rpc_context *rpc)
rpc->inpos += count;
if (rpc->inpos == rpc->insize) {
rpc->inpos += count;
if (rpc->inpos == rpc->insize) {
- if (rpc_process_pdu(rpc, rpc->inbuf, pdu_size) != 0) {
- rpc_set_error(rpc, "Invalid/garbage pdu received from server. Closing socket");
- return -1;
- }
- free(rpc->inbuf);
+ char *buf = rpc->inbuf;
+
rpc->inbuf = NULL;
rpc->insize = 0;
rpc->inpos = 0;
rpc->inbuf = NULL;
rpc->insize = 0;
rpc->inpos = 0;
+
+ if (rpc_process_pdu(rpc, buf, pdu_size) != 0) {
+ rpc_set_error(rpc, "Invalid/garbage pdu received from server. Closing socket");
+ return -1;
+ }
+ free(buf);
}
return 0;
}
return 0;
@@
-257,6
+276,8
@@
static int rpc_read_from_socket(struct rpc_context *rpc)
int rpc_service(struct rpc_context *rpc, int revents)
{
int rpc_service(struct rpc_context *rpc, int revents)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (revents & POLLERR) {
#ifdef WIN32
char err = 0;
if (revents & POLLERR) {
#ifdef WIN32
char err = 0;
@@
-335,11
+356,15
@@
int rpc_service(struct rpc_context *rpc, int revents)
void rpc_set_autoreconnect(struct rpc_context *rpc)
{
void rpc_set_autoreconnect(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
rpc->auto_reconnect = 1;
}
void rpc_unset_autoreconnect(struct rpc_context *rpc)
{
rpc->auto_reconnect = 1;
}
void rpc_unset_autoreconnect(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
rpc->auto_reconnect = 0;
}
rpc->auto_reconnect = 0;
}
@@
-347,6
+372,8
@@
static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
{
int socksize;
{
int socksize;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
switch (s->ss_family) {
case AF_INET:
socksize = sizeof(struct sockaddr_in);
switch (s->ss_family) {
case AF_INET:
socksize = sizeof(struct sockaddr_in);
@@
-385,8
+412,12
@@
static int rpc_connect_sockaddr_async(struct rpc_context *rpc, struct sockaddr_s
static int portOfs = 0;
const int firstPort = 512; /* >= 512 according to Sun docs */
const int portCount = IPPORT_RESERVED - firstPort;
static int portOfs = 0;
const int firstPort = 512; /* >= 512 according to Sun docs */
const int portCount = IPPORT_RESERVED - firstPort;
- int startOfs
= portOfs
, port, rc;
+ int startOfs, port, rc;
+ if (portOfs == 0) {
+ portOfs = time(NULL) % 400;
+ }
+ startOfs = portOfs;
do {
rc = -1;
port = htons(firstPort + portOfs);
do {
rc = -1;
port = htons(firstPort + portOfs);
@@
-423,6
+454,8
@@
int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
{
struct sockaddr_in *sin = (struct sockaddr_in *)&rpc->s;
{
struct sockaddr_in *sin = (struct sockaddr_in *)&rpc->s;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->fd != -1) {
rpc_set_error(rpc, "Trying to connect while already connected");
return -1;
if (rpc->fd != -1) {
rpc_set_error(rpc, "Trying to connect while already connected");
return -1;
@@
-463,14
+496,12
@@
int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
int rpc_disconnect(struct rpc_context *rpc, char *error)
{
int rpc_disconnect(struct rpc_context *rpc, char *error)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
rpc_unset_autoreconnect(rpc);
if (rpc->fd != -1) {
rpc_unset_autoreconnect(rpc);
if (rpc->fd != -1) {
-#if defined(WIN32)
- closesocket(rpc->fd);
-#else
close(rpc->fd);
close(rpc->fd);
-#endif
}
rpc->fd = -1;
}
rpc->fd = -1;
@@
-483,6
+514,8
@@
int rpc_disconnect(struct rpc_context *rpc, char *error)
static void reconnect_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
{
static void reconnect_cb(struct rpc_context *rpc, int status, void *data _U_, void *private_data)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (status != RPC_STATUS_SUCCESS) {
rpc_error_all_pdus(rpc, "RPC ERROR: Failed to reconnect async");
return;
if (status != RPC_STATUS_SUCCESS) {
rpc_error_all_pdus(rpc, "RPC ERROR: Failed to reconnect async");
return;
@@
-497,12
+530,10
@@
static int rpc_reconnect_requeue(struct rpc_context *rpc)
{
struct rpc_pdu *pdu;
{
struct rpc_pdu *pdu;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->fd != -1) {
if (rpc->fd != -1) {
-#if defined(WIN32)
- closesocket(rpc->fd);
-#else
close(rpc->fd);
close(rpc->fd);
-#endif
}
rpc->fd = -1;
}
rpc->fd = -1;
@@
-536,6
+567,8
@@
int rpc_bind_udp(struct rpc_context *rpc, char *addr, int port)
struct addrinfo *ai = NULL;
char service[6];
struct addrinfo *ai = NULL;
char service[6];
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->is_udp == 0) {
rpc_set_error(rpc, "Cant not bind UDP. Not UDP context");
return -1;
if (rpc->is_udp == 0) {
rpc_set_error(rpc, "Cant not bind UDP. Not UDP context");
return -1;
@@
-579,6
+612,8
@@
int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
struct addrinfo *ai = NULL;
char service[6];
struct addrinfo *ai = NULL;
char service[6];
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (rpc->is_udp == 0) {
rpc_set_error(rpc, "Can not set destination sockaddr. Not UDP context");
return -1;
if (rpc->is_udp == 0) {
rpc_set_error(rpc, "Can not set destination sockaddr. Not UDP context");
return -1;
@@
-612,6
+647,8
@@
int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int i
struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
{
struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
{
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
return (struct sockaddr *)&rpc->udp_src;
}
return (struct sockaddr *)&rpc->udp_src;
}
@@
-620,6
+657,8
@@
int rpc_queue_length(struct rpc_context *rpc)
int i=0;
struct rpc_pdu *pdu;
int i=0;
struct rpc_pdu *pdu;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
for(pdu = rpc->outqueue; pdu; pdu = pdu->next) {
i++;
}
for(pdu = rpc->outqueue; pdu; pdu = pdu->next) {
i++;
}