diff options
author | Eric Andersen <andersen@codepoet.org> | 2003-10-08 19:35:20 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2003-10-08 19:35:20 +0000 |
commit | abd02d7387069439373d40c2f9afba93c76df650 (patch) | |
tree | b9d78f9594b542bcdcec04bf6b02b2b726224ddd /libc/inet/rpc | |
parent | 027d12aeef4386c638f73a4df7171a5d027604f4 (diff) |
Atsushi Nemoto writes:
I found inappropriate data types are used in some places in networking
codes.
* tcp_seq is 32bit (u_long -> u_int32_t)
* in_addt_t should be used for internet address (unsigned long -> in_addr_t)
* socklen_t should be used for accept()
This is a patch against uclibc-0.9.21 (can be applied for current
CVS). 64bit platforms (sizeof(int)!=sizeof(long)) will need this. I
believe this patch does not harm any 32bit platforms.
Diffstat (limited to 'libc/inet/rpc')
-rw-r--r-- | libc/inet/rpc/rcmd.c | 4 | ||||
-rw-r--r-- | libc/inet/rpc/rexec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c index 618a6f1b2..f1c732d41 100644 --- a/libc/inet/rpc/rcmd.c +++ b/libc/inet/rpc/rcmd.c @@ -192,7 +192,7 @@ int rcmd(ahost, rport, locuser, remuser, cmd, fd2p) } else { char num[8]; int s2 = rresvport(&lport), s3; - size_t len = sizeof(from); + socklen_t len = sizeof(from); if (s2 < 0) goto bad; @@ -541,7 +541,7 @@ __icheckhost (u_int32_t raddr, char *lhost, const char *rhost) } /* Try for raw ip address first. */ - if (isdigit (*lhost) && (long) (laddr = inet_addr (lhost)) != -1) + if (isdigit (*lhost) && (laddr = inet_addr (lhost)) != INADDR_NONE) return negate * (! (raddr ^ laddr)); /* Better be a hostname. */ diff --git a/libc/inet/rpc/rexec.c b/libc/inet/rpc/rexec.c index a084ccde7..7af948991 100644 --- a/libc/inet/rpc/rexec.c +++ b/libc/inet/rpc/rexec.c @@ -135,7 +135,7 @@ retry: port = atoi(servbuff); (void) sprintf(num, "%u", port); (void) write(s, num, strlen(num)+1); - { int len = sizeof (from); + { socklen_t len = sizeof (from); s3 = accept(s2, (struct sockaddr *)&from, &len); close(s2); if (s3 < 0) { |