32 lines
1010 B
Plaintext
32 lines
1010 B
Plaintext
$OpenBSD: patch-src_intf_c,v 1.2 2013/05/10 11:40:02 mpi Exp $
|
|
|
|
Do not issue an SIOCSIFNETMASK before SIOCSIFADDR it is not
|
|
needed even if the XXX says otherwise.
|
|
|
|
--- src/intf.c.orig Mon Jan 9 08:09:49 2006
|
|
+++ src/intf.c Thu Apr 11 16:16:02 2013
|
|
@@ -66,7 +66,13 @@
|
|
/* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */
|
|
struct dnet_ifaliasreq {
|
|
char ifra_name[IFNAMSIZ];
|
|
- struct sockaddr ifra_addr;
|
|
+ union {
|
|
+ struct sockaddr ifrau_addr;
|
|
+ int ifrau_align;
|
|
+ } ifra_ifrau;
|
|
+#ifndef ifra_addr
|
|
+#define ifra_addr ifra_ifrau.ifrau_addr
|
|
+#endif
|
|
struct sockaddr ifra_brdaddr;
|
|
struct sockaddr ifra_mask;
|
|
int ifra_cookie; /* XXX - IRIX!@#$ */
|
|
@@ -281,7 +287,7 @@ intf_set(intf_t *intf, const struct intf_entry *entry)
|
|
}
|
|
/* Set interface address. */
|
|
if (entry->intf_addr.addr_type == ADDR_TYPE_IP) {
|
|
-#ifdef BSD
|
|
+#if defined(BSD) && !defined(__OpenBSD__)
|
|
/* XXX - why must this happen before SIOCSIFADDR? */
|
|
if (addr_btos(entry->intf_addr.addr_bits,
|
|
&ifr.ifr_addr) == 0) {
|