summaryrefslogtreecommitdiff
path: root/usr.sbin/mrouted
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2002-08-01 03:40:34 +0000
committeritojun <itojun@NetBSD.org>2002-08-01 03:40:34 +0000
commit896f6ff22781c19f8e7db2328cde21b8f82b5f19 (patch)
tree4cd77bda0b64a650d134ede1855cf18d791a135b /usr.sbin/mrouted
parenteb78c879ca2eabf0aad458cbdb4b82490062c430 (diff)
u_short cleansing (should be u_int16_t)
Diffstat (limited to 'usr.sbin/mrouted')
-rw-r--r--usr.sbin/mrouted/igmp.c4
-rw-r--r--usr.sbin/mrouted/inet.c10
-rw-r--r--usr.sbin/mrouted/snmp.c6
-rw-r--r--usr.sbin/mrouted/snmp.h4
4 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c
index 058ec36d268..a06c74f9724 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/usr.sbin/mrouted/igmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: igmp.c,v 1.7 2002/07/14 16:30:42 wiz Exp $ */
+/* $NetBSD: igmp.c,v 1.8 2002/08/01 03:40:34 itojun Exp $ */
/*
* The mrouted program is covered by the license in the accompanying file
@@ -316,7 +316,7 @@ send_igmp(u_int32_t src, u_int32_t dst, int type, int code, u_int32_t group,
igmp->igmp_code = code;
igmp->igmp_group.s_addr = group;
igmp->igmp_cksum = 0;
- igmp->igmp_cksum = inet_cksum((u_short *)igmp,
+ igmp->igmp_cksum = inet_cksum((u_int16_t *)igmp,
IGMP_MINLEN + datalen);
if (IN_MULTICAST(ntohl(dst))) {
diff --git a/usr.sbin/mrouted/inet.c b/usr.sbin/mrouted/inet.c
index 2e369f700e4..02e49b4f09a 100644
--- a/usr.sbin/mrouted/inet.c
+++ b/usr.sbin/mrouted/inet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inet.c,v 1.5 2002/07/14 16:30:42 wiz Exp $ */
+/* $NetBSD: inet.c,v 1.6 2002/08/01 03:40:34 itojun Exp $ */
/*
* The mrouted program is covered by the license in the accompanying file
@@ -185,12 +185,12 @@ inet_parse(char *s)
*
*/
int
-inet_cksum(u_short *addr, u_int len)
+inet_cksum(u_int16_t *addr, u_int len)
{
int nleft = (int)len;
- u_short *w = addr;
- u_short answer = 0;
- int sum = 0;
+ u_int16_t *w = addr;
+ u_int16_t answer = 0;
+ int32_t sum = 0;
/*
* Our algorithm is simple, using a 32 bit accumulator (sum),
diff --git a/usr.sbin/mrouted/snmp.c b/usr.sbin/mrouted/snmp.c
index 8cd65397b64..3396a494c63 100644
--- a/usr.sbin/mrouted/snmp.c
+++ b/usr.sbin/mrouted/snmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: snmp.c,v 1.6 2002/07/14 16:30:42 wiz Exp $ */
+/* $NetBSD: snmp.c,v 1.7 2002/08/01 03:40:34 itojun Exp $ */
#include "defs.h"
#include <netinet/in_var.h>
@@ -9,7 +9,7 @@
#define MROUTED
#include "snmpd/snmp_vars.h"
- u_short dest_port = 0;
+ in_port_t dest_port = 0;
int sdlen = 0;
struct addrCache {
@@ -27,7 +27,7 @@ static struct addrCache addrCache[10];
*/
int /* returns: 0 on success, true on error */
snmp_init(dest_port)
- u_short dest_port;
+ in_port_t dest_port;
{
u_long myaddr;
int ret;
diff --git a/usr.sbin/mrouted/snmp.h b/usr.sbin/mrouted/snmp.h
index b2e203e700c..6889dfdf1f4 100644
--- a/usr.sbin/mrouted/snmp.h
+++ b/usr.sbin/mrouted/snmp.h
@@ -1,7 +1,7 @@
-/* $NetBSD: snmp.h,v 1.3 1995/12/10 10:07:18 mycroft Exp $ */
+/* $NetBSD: snmp.h,v 1.4 2002/08/01 03:40:34 itojun Exp $ */
extern int portlist[32], sdlen;
-extern u_short dest_port;
+extern in_port_t dest_port;
extern int quantum;
extern int snmp_read_packet();