Module Name: src
Committed By: pooka
Date: Mon Jul 26 14:07:05 UTC 2010
Modified Files:
src/tests/net/config: netconfig.c
src/tests/net/icmp: t_forward.c
src/tests/net/if_loop: t_pr.c
Log Message:
Calculate broadcast IP instead of requiring it as a config parameter.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/config/netconfig.c
cvs rdiff -u -r1.3 -r1.4 src/tests/net/icmp/t_forward.c
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if_loop/t_pr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/config/netconfig.c
diff -u src/tests/net/config/netconfig.c:1.2 src/tests/net/config/netconfig.c:1.3
--- src/tests/net/config/netconfig.c:1.2 Sun Jul 25 22:28:48 2010
+++ src/tests/net/config/netconfig.c Mon Jul 26 14:07:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: netconfig.c,v 1.2 2010/07/25 22:28:48 pooka Exp $ */
+/* $NetBSD: netconfig.c,v 1.3 2010/07/26 14:07:04 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: netconfig.c,v 1.2 2010/07/25 22:28:48 pooka Exp $");
+__RCSID("$NetBSD: netconfig.c,v 1.3 2010/07/26 14:07:04 pooka Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -62,11 +62,11 @@
}
static void
-netcfg_rump_if(const char *ifname,
- const char *addr, const char *mask, const char *bcast)
+netcfg_rump_if(const char *ifname, const char *addr, const char *mask)
{
struct ifaliasreq ia;
struct sockaddr_in *sin;
+ in_addr_t inaddr, inmask;
int s, rv;
s = -1;
@@ -74,25 +74,28 @@
atf_tc_fail_errno("if config socket");
}
+ inaddr = inet_addr(addr);
+ inmask = inet_addr(mask);
+
/* Address */
memset(&ia, 0, sizeof(ia));
strcpy(ia.ifra_name, ifname);
sin = (struct sockaddr_in *)&ia.ifra_addr;
sin->sin_family = AF_INET;
sin->sin_len = sizeof(struct sockaddr_in);
- sin->sin_addr.s_addr = inet_addr(addr);
+ sin->sin_addr.s_addr = inaddr;
/* Netmask */
sin = (struct sockaddr_in *)&ia.ifra_mask;
sin->sin_family = AF_INET;
sin->sin_len = sizeof(struct sockaddr_in);
- sin->sin_addr.s_addr = inet_addr(mask);
+ sin->sin_addr.s_addr = inmask;
/* Broadcast address */
sin = (struct sockaddr_in *)&ia.ifra_broadaddr;
sin->sin_family = AF_INET;
sin->sin_len = sizeof(struct sockaddr_in);
- sin->sin_addr.s_addr = inet_addr(bcast);
+ sin->sin_addr.s_addr = inaddr | ~inmask;
rv = rump_sys_ioctl(s, SIOCAIFADDR, &ia);
if (rv) {
Index: src/tests/net/icmp/t_forward.c
diff -u src/tests/net/icmp/t_forward.c:1.3 src/tests/net/icmp/t_forward.c:1.4
--- src/tests/net/icmp/t_forward.c:1.3 Sun Jul 25 21:39:21 2010
+++ src/tests/net/icmp/t_forward.c Mon Jul 26 14:07:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_forward.c,v 1.3 2010/07/25 21:39:21 pooka Exp $ */
+/* $NetBSD: t_forward.c,v 1.4 2010/07/26 14:07:04 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: t_forward.c,v 1.3 2010/07/25 21:39:21 pooka Exp $");
+__RCSID("$NetBSD: t_forward.c,v 1.4 2010/07/26 14:07:04 pooka Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -180,7 +180,7 @@
int s;
netcfg_rump_makeshmif("bus1", ifname);
- netcfg_rump_if(ifname, "1.0.0.1", "255.255.255.0", "1.0.0.255");
+ netcfg_rump_if(ifname, "1.0.0.1", "255.255.255.0");
netcfg_rump_route("0.0.0.0", "0.0.0.0", "1.0.0.2"); /* default router */
/* set global ttl to 1 */
Index: src/tests/net/if_loop/t_pr.c
diff -u src/tests/net/if_loop/t_pr.c:1.1 src/tests/net/if_loop/t_pr.c:1.2
--- src/tests/net/if_loop/t_pr.c:1.1 Sun Jul 25 21:42:08 2010
+++ src/tests/net/if_loop/t_pr.c Mon Jul 26 14:07:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_pr.c,v 1.1 2010/07/25 21:42:08 pooka Exp $ */
+/* $NetBSD: t_pr.c,v 1.2 2010/07/26 14:07:04 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: t_pr.c,v 1.1 2010/07/25 21:42:08 pooka Exp $");
+__RCSID("$NetBSD: t_pr.c,v 1.2 2010/07/26 14:07:04 pooka Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -78,7 +78,7 @@
rump_init();
/* first, config lo0 & route */
- netcfg_rump_if(ifname, "127.0.0.1", "255.0.0.0", "127.255.255.255");
+ netcfg_rump_if(ifname, "127.0.0.1", "255.0.0.0");
netcfg_rump_route("127.0.0.1", "255.0.0.0", "127.0.0.1");
if ((s = rump_sys_socket(PF_ROUTE, SOCK_RAW, 0)) == -1)
