Page MenuHomeFreeBSD
Files F154580390

D15329.id42312.diff
No OneTemporary
Actions

D15329.id42312.diff
View Options

Index: sys/net/if_epair.c
===================================================================
--- sys/net/if_epair.c
+++ sys/net/if_epair.c
@@ -53,10 +53,14 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/hash.h>
+#include <sys/jail.h>
#include <sys/kernel.h>
+#include <sys/libkern.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
+#include <sys/proc.h>
#include <sys/refcount.h>
#include <sys/queue.h>
#include <sys/smp.h>
@@ -714,6 +718,9 @@
char *dp;
int error, unit, wildcard;
uint8_t eaddr[ETHER_ADDR_LEN]; /* 00:00:00:00:00:00 */
+ uint64_t hostid;
+ uint32_t key[3];
+ uint32_t hash;
/*
* We are abusing params to create our second interface.
@@ -724,10 +731,8 @@
if (params) {
scb = (struct epair_softc *)params;
ifp = scb->ifp;
- /* Assign a hopefully unique, locally administered etheraddr. */
- eaddr[0] = 0x02;
- eaddr[3] = (ifp->if_index >> 8) & 0xff;
- eaddr[4] = ifp->if_index & 0xff;
+ /* Copy epairNa etheraddr and change the last byte. */
+ memcpy(eaddr, scb->oifp->if_hw_addr, ETHER_ADDR_LEN);
eaddr[5] = 0x0b;
ether_ifattach(ifp, eaddr);
/* Correctly set the name for the cloner list. */
@@ -835,10 +840,21 @@
ifp->if_init = epair_init;
if_setsendqlen(ifp, ifqmaxlen);
if_setsendqready(ifp);
- /* Assign a hopefully unique, locally administered etheraddr. */
+
+ /*
+ * Calculate the etheraddr hashing the hostid and the
+ * interface index. The result would be hopefully unique
+ */
+ getcredhostid(curthread->td_ucred, (unsigned long *)&hostid);
+ if (hostid == 0)
+ arc4rand(&hostid, sizeof(hostid), 0);
+ key[0] = (uint32_t)ifp->if_index;
+ key[1] = (uint32_t)(hostid & 0xffffffff);
+ key[2] = (uint32_t)((hostid >> 32) & 0xfffffffff);
+ hash = jenkins_hash32(key, 3, 0);
+
eaddr[0] = 0x02;
- eaddr[3] = (ifp->if_index >> 8) & 0xff;
- eaddr[4] = ifp->if_index & 0xff;
+ memcpy( &eaddr[1], &hash, 4 );
eaddr[5] = 0x0a;
ether_ifattach(ifp, eaddr);
sca->if_qflush = ifp->if_qflush;

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 29, 11:23 PM (10 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32410454
Default Alt Text
D15329.id42312.diff (1 KB)

Event Timeline