diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2009-06-14 16:25:33 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2009-06-14 16:25:33 +0000 |
| commit | ccacf84f7602946c76944aae6ce1d5e2aa2b4814 (patch) | |
| tree | e95ee463e16d02ced5c39a62a111ce70ca36f8b6 | |
| parent | cd98bf42c5ab3cb061a32068d866616c71c40bf9 (diff) | |
Fix type of length argument to sockset syscalls.
Various socket syscalls receive a length argument that should be a
socklen_t rsp. a ptr to a socklen_t but instead int rsp. ptr to int were
being passed. While in theory this was a bug it's harmless as dangerously
large values would not be used but the issue manifested itself in a
significant number of compilation warnings.
| -rw-r--r-- | ax25ipd/io.c | 2 | ||||
| -rw-r--r-- | ax25mond/ax25mond.c | 4 | ||||
| -rw-r--r-- | ax25rtd/ax25rtd.c | 8 | ||||
| -rw-r--r-- | ax25rtd/listener.c | 5 | ||||
| -rw-r--r-- | listen/listen.c | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/ax25ipd/io.c b/ax25ipd/io.c index 0c0f2d5..356ebdc 100644 --- a/ax25ipd/io.c +++ b/ax25ipd/io.c @@ -65,7 +65,7 @@ int icmpsock = -1; struct sockaddr_in udpbind; struct sockaddr_in to; struct sockaddr_in from; -int fromlen; +socklen_t fromlen; time_t last_bc_time; diff --git a/ax25mond/ax25mond.c b/ax25mond/ax25mond.c index 81b2da9..6f842e1 100644 --- a/ax25mond/ax25mond.c +++ b/ax25mond/ax25mond.c @@ -68,7 +68,7 @@ char sock_filename[MAX_SOCKETS][100]; int sock_num = 0; int conn_list[MAX_CONNECTS]; struct sockaddr conn_addr[MAX_CONNECTS]; -int conn_addrlen[MAX_CONNECTS]; +socklen_t conn_addrlen[MAX_CONNECTS]; char conn_monmode[MAX_CONNECTS]; int conn_num = 0; int highest_sock_fd; @@ -215,7 +215,7 @@ int main(int argc, char *argv[]) fd_set monavail; int monrx_fd, monrxtx_fd; struct sockaddr monfrom; - int monfromlen; + socklen_t monfromlen; fd_set conn_request; struct timeval tv; char buf[500]; diff --git a/ax25rtd/ax25rtd.c b/ax25rtd/ax25rtd.c index 39d2959..4d22c47 100644 --- a/ax25rtd/ax25rtd.c +++ b/ax25rtd/ax25rtd.c @@ -1,4 +1,4 @@ -/* $Id: ax25rtd.c,v 1.5 2006/10/05 11:50:39 dl9sau Exp $ +/* $Id: ax25rtd.c,v 1.6 2009/06/14 16:25:33 ralf Exp $ * * Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com) * @@ -66,7 +66,7 @@ #include "../pathnames.h" #include "ax25rtd.h" -const char *Version = "ax25rtd $Revision: 1.5 $"; +const char *Version = "ax25rtd $Revision: 1.6 $"; config *Config = NULL; int reload = 0; @@ -137,8 +137,8 @@ void daemon_shutdown(int reason) int main(int argc, char **argv) { unsigned char buf[256]; - int size, s; - int cntrl_s, cntrl_fd, cntrl_len; + int size, s, cntrl_s, cntrl_fd; + socklen_t cntrl_len; struct sockaddr_un cntrl_addr; fd_set read_fds, write_fds; int fd_max; diff --git a/ax25rtd/listener.c b/ax25rtd/listener.c index 44a0601..051d8c9 100644 --- a/ax25rtd/listener.c +++ b/ax25rtd/listener.c @@ -1,4 +1,4 @@ -/* $Id: listener.c,v 1.5 2006/10/05 11:50:39 dl9sau Exp $ +/* $Id: listener.c,v 1.6 2009/06/14 16:25:33 ralf Exp $ * * Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com) * @@ -394,10 +394,11 @@ void ax25_receive(int sock) struct sockaddr sa; ax25_address srccall, destcall, digipeater[AX25_MAX_DIGIS]; char extseq = 0; - int size, asize, action, ipmode, ctl, pid, ndigi, kdigi, mine; + int size, action, ipmode, ctl, pid, ndigi, kdigi, mine; time_t stamp; config *config; ax25_rt_entry *ax25rt; + socklen_t asize; asize = sizeof(sa); if ((size = recvfrom(sock, buf, sizeof(buf), 0, &sa, &asize)) < 0) { diff --git a/listen/listen.c b/listen/listen.c index 5b70fb9..f07a1f6 100644 --- a/listen/listen.c +++ b/listen/listen.c @@ -65,7 +65,7 @@ int main(int argc, char **argv) int s; char *port = NULL, *dev = NULL; struct sockaddr sa; - int asize = sizeof(sa); + socklen_t asize = sizeof(sa); struct ifreq ifr; int proto = ETH_P_AX25; |