Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the in_cksum declaration conflict between the stack one in psoix/netinet/in.h

Browse Source 
(should not be here but in private/net, in fact...) and
the internal one in traceroute.c


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2676 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin 2003-02-09 22:42:12 +00:00
parent 8ef9e5a016
commit 471e3978a1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/apps/bin/traceroute/traceroute.c
View File

@ -256,7 +256,7 @@ void send_probe (int, int, int, struct sockaddr_in *);
int packet_ok (u_char *, int, struct sockaddr_in *, int, int);
void print (u_char *, int, struct sockaddr_in *);
char *inetname (struct in_addr);
u_short in_cksum (uint16 *, int);
u_short compute_in_cksum (uint16 *, int);
void usage (void);
int s; /* receive (icmp) socket file descriptor */
@ -794,7 +794,7 @@ send_probe(seq, ttl, iflag, to)
if (proto == IPPROTO_ICMP && icmp_type == ICMP_ECHO) {
icmpp->icmp_cksum = 0;
icmpp->icmp_cksum = in_cksum((u_short *)icmpp,
icmpp->icmp_cksum = compute_in_cksum((u_short *)icmpp,
datalen - sizeof(struct ip) - lsrrlen);
if (icmpp->icmp_cksum == 0) icmpp->icmp_cksum = 0xffff;
}
@ -949,7 +949,7 @@ print(buf, cc, from)
* Checksum routine for Internet Protocol family headers (C Version)
*/
u_short
in_cksum(addr, len)
compute_in_cksum(addr, len)
u_short *addr;
int len;
{