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

Calculate broadcast IP instead of requiring it as a config parameter.

This commit is contained in:
pooka 2010-07-26 14:07:04 +00:00
parent 9cd958c424
commit 6b62441252
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/net/config/netconfig.c
View File

@ -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 @@ netcfg_rump_makeshmif(const char *busname, char *ifname)
}
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 @@ netcfg_rump_if(const char *ifname,
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) {

6
tests/net/icmp/t_forward.c
View File

@ -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 @@ sendttl(void)
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 */

6
tests/net/if_loop/t_pr.c
View File

@ -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 @@ ATF_TC_BODY(loopmtu, tc)
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)