use socklen_t in iputils rather than just int
Subsystems (2)
PATCH 1/1 use socklen_t in iputils rather than just int
a bunch of places in iputils utilize "int" lengths when in reality they should be using socklen_t
-mike
Use socklen_t in all the right places.
Signed-off-by Mike Frysinger <[email protected]>
arping.c +4 -4
@@ -439,7 +439,7 @@ main(int argc, char **argv) } }else if (!dad) {int on =1 ; -int alen =sizeof (saddr); +socklen_t alen =sizeof (saddr); saddr.sin_port =htons (1025 ); saddr.sin_addr = dst;
@@ -468,7 +468,7 @@ main(int argc, char **argv) }if (1 ) { -int alen =sizeof (me); +socklen_t alen =sizeof (me);if (getsockname (s, (struct sockaddr *)&me, &alen) ==-1 ) {perror ("getsockname" );exit (2 );
@@ -500,9 +500,9 @@ main(int argc, char **argv) while(1) { sigset_t sset, osset; - char packet[4096]; + unsigned char packet[4096]; struct sockaddr_ll from; - int alen = sizeof(from); + socklen_t alen = sizeof(from); int cc; if ((cc = recvfrom(s, packet, sizeof(packet), 0,
clockdiff.c +3 -3
@@ -121,7 +121,7 @@ long rtt_sigma = 0;int measure (struct sockaddr_in * addr) { -int length; +socklen_t length;int msgcount;int cc, count;fd_set ready;
@@ -299,7 +299,7 @@ char *myname, *hisname;int measure_opt (struct sockaddr_in * addr) { -int length; +socklen_t length;int msgcount;int cc, count;fd_set ready;
@@ -602,7 +602,7 @@ main(int argc, char *argv[]) }if (ip_opt_len) {struct sockaddr_in myaddr; -int addrlen =sizeof (myaddr); +socklen_t addrlen =sizeof (myaddr);unsigned char rspace[ip_opt_len];bzero (rspace,sizeof (rspace));
ping.c +1 -1
@@ -259,7 +259,7 @@ main(int argc, char **argv) }if (source.sin_addr.s_addr ==0 ) { -int alen; +socklen_t alen;struct sockaddr_in dst = whereto;int probe_fd =socket (AF_INET ,SOCK_DGRAM ,0 );
ping6.c +1 -1
@@ -344,7 +344,7 @@ int main(int argc, char *argv[]) hostname = target;if (ipv6_addr_any (&source.sin6_addr)) { -int alen; +socklen_t alen;int probe_fd =socket (AF_INET6 ,SOCK_DGRAM ,0 );if (probe_fd <0 ) {
ping_common.c +3 -3
@@ -67,7 +67,7 @@ static void fill(char *patp)int ii, jj, kk;int pat[16 ];char *cp; -char *bp = outpack+8 ; +u_char *bp = outpack+8 ;for (cp = patp; *cp; cp++) {if (!isxdigit (*cp)) {
@@ -393,7 +393,7 @@ resend:void sock_setbufs (int icmp_sock,int alloc) {int rcvbuf, hold; -int tmplen =sizeof (hold); +socklen_t tmplen =sizeof (hold);if (!sndbuf) sndbuf = alloc;
@@ -464,7 +464,7 @@ void setup(int icmp_sock)if (!(options &F_PINGFILLED )) {int i; -char *p = outpack+8 ; +u_char *p = outpack+8 ;/* Do not forget about case of small datalen, * fill timestamp area too!
rarpd.c +1 -1
@@ -417,7 +417,7 @@ void serve_it(int fd) {unsigned char buf[1024 ];struct sockaddr_ll sll; -int sll_len =sizeof (sll); +socklen_t sll_len =sizeof (sll);struct arphdr *a = (struct arphdr *)buf;struct rarp_map *rmap;unsigned char *ptr;
rdisc.c +1 -1
@@ -451,7 +451,7 @@ next:for (;;) {u_char packet[MAXPACKET ];int len =sizeof (packet); -int fromlen =sizeof (from); +socklen_t fromlen =sizeof (from);int cc; cc=recvfrom(s, (char *)packet, len, 0,
tftpd.c +3 -2
@@ -88,7 +88,7 @@ union {struct sockaddr_in sin;struct sockaddr_in6 sin6; } from; -int fromlen; +socklen_t fromlen;#define MAXARG 1char *dirs[MAXARG +1 ];
@@ -148,7 +148,8 @@ int main(int ac, char **av)*/ {int pid; -int i, j; +int i; +socklen_t j;for (i =1 ; i <20 ; i++) { pid =fork ();
traceroute6.c +1 -1
@@ -510,7 +510,7 @@ int main(int argc, char *argv[]) (char *)&on, sizeof(on));if (source ==NULL ) { -int alen; +socklen_t alen;int probe_fd =socket (AF_INET6 ,SOCK_DGRAM ,0 );if (probe_fd <0 ) {
In article <[email protected]> (at Wed, 20 Dec 2006 10:00:32 -0500), Mike Frysinger <[email protected]> says:
Quoted 2 lines
a bunch of places in iputils utilize "int" lengths when in reality they should be using
socklen_t
Patch applied. Thanks.
Please add some prefix in subject, please;
e.g. Subject: [IPUTILS] Use socklen_t in all the right places.
Regards,
Signature · 2 lines
YOSHIFUJI Hideaki @ USAGI Project <[email protected]> GPG-FP : 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA