opnsense / dhcp6c

OPNsense WIDE-DHCPv6 client
Other
23 stars 30 forks source link

dhcp6c MIA #3

Closed marjohn56 closed 6 years ago

marjohn56 commented 6 years ago

Seems config.c missed the bus...

fichtner commented 6 years ago

Merged, thanks!

What do you make of the changes in dhcp6c.c that were not in the original patch? Do we need those?

diff --git a/dhcp6c.c b/dhcp6c.c
index 490bd97..93838c7 100644
--- a/dhcp6c.c
+++ b/dhcp6c.c
@@ -922,7 +922,6 @@ client6_send(struct dhcp6_event *ev)
    struct dhcp6_optinfo optinfo;
    ssize_t optlen, len;
    struct dhcp6_eventdata *evd;
-   struct rawoption *rawop;

    ifp = ev->ifp;

@@ -1082,10 +1081,6 @@ client6_send(struct dhcp6_event *ev)
        goto end;
    }

-   /* XXX */
-   rawop_clear_list(&optinfo.rawops);
-   rawop_copy_list(&optinfo.rawops, &ifp->rawops);
-
    /* set options in the message */
    if ((optlen = dhcp6_set_options(dh6->dh6_msgtype,
        (struct dhcp6opt *)(dh6 + 1),
marjohn56 commented 6 years ago

I'm about to compile the current master with the missing config.c, I'll get Kev to test it. I suspect we need those too. Bit alarmed I seemed to have missed these on the original PR.

fichtner commented 6 years ago

Just to clarify: the diff is reversed. master has these dhcp6c.c changes and the RAW ports option didn't.

marjohn56 commented 6 years ago

OK, well if the master has them in that's fine.

fichtner commented 6 years ago

ok :)

marjohn56 commented 6 years ago

I've compiled it with the missing config.c and sent it to Kev, waiting for his ack._

nivek1612 commented 6 years ago

That fixed it cheers

fichtner commented 6 years ago

ok, I'll prepare another release then. thanks guys!

nivek1612 commented 6 years ago

whats the ETA on RC3 ? I'll block out some time to test it

fichtner commented 6 years ago

No rc3, 18.7 in the 31st.

On 21. Jul 2018, at 09:30, Kev Willers notifications@github.com wrote:

whats the ETA on RC3 ? I'll block out some time to test it

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub, or mute the thread.