From a9a6cc7e181aca2db900235cd5f1cea9bc74f3b5 Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Wed, 3 Jun 2015 14:27:29 -0700 Subject: dhcpcd: Send proper DUID Since we go to all the trouble to save and read back the DUID, we might as well actually *use* it instead of sending random heap garbage over the wire. This is fixed upstream as part of a larger commit: http://roy.marples.name/projects/dhcpcd/ci/d10652b16bf97708?sbs=1 That (and other fixes) should probably be merged at some point, but this fixes the immediate issue. Note this issue was exposed after the DUID file location was fixed by I009cc0b4e4e94fc0adffd0418d0a9b1e3e485f2a. Prior to that commit, the DUID command line option was ineffective. Also note that AOSP uses the (ineffective) -D option for all devices, but CAF does not. Change-Id: I3f319a956cb500cf041d5e37dc35a51896ee544c Fixes: BACON-3269 (cherry picked from commit b92246818a9eaece78d09d173e16fe18357f7429) --- dhcpcd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dhcpcd.c b/dhcpcd.c index 6eae970..a98034a 100644 --- a/dhcpcd.c +++ b/dhcpcd.c @@ -834,6 +834,7 @@ configure_interface1(struct interface *iface) ifl = htonl(if_nametoindex(iface->name)); memcpy(iface->clientid + 2, &ifl, 4); } + memcpy(iface->clientid + 6, duid, len); } else if (len == 0) { len = iface->hwlen + 1; iface->clientid = xmalloc(len + 1); -- cgit v1.2.3