Current-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: dhcpd build break



On Fri, 21 Jun 2013, Paul Goyette wrote:

On Sat, 22 Jun 2013, Roy Marples wrote:

This should work equally well?

diff --git a/dhcp6.c b/dhcp6.c
index 205fce2..8c01a45 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -635,7 +635,7 @@ dhcp6_makemessage(struct interface *ifp)
                       o->len = encode_rfc1035(hostname, p + 1);
                       if (o->len == 0)
                               *p = 0x04;
-                       o->len = htons(++o->len);
+                       o->len = htons((++o->len));
               }

               if (n_options) {

This does not work - you get the same exact error.

Any more breaks or is that it for BE ports?

I'll let you know when we get past this point.

OK, with the change I originally proposed:

cvs diff: Diffing .
Index: dhcp6.c
===================================================================
RCS file: /cvsroot/src/external/bsd/dhcpcd/dist/dhcp6.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 dhcp6.c
--- dhcp6.c     21 Jun 2013 19:33:08 -0000      1.1.1.1
+++ dhcp6.c     22 Jun 2013 02:28:35 -0000
@@ -638,7 +638,8 @@ dhcp6_makemessage(struct interface *ifp)
                        o->len = encode_rfc1035(hostname, p + 1);
                        if (o->len == 0)
                                *p = 0x04;
-                       o->len = htons(++o->len);
+                       ++o->len;
+                       o->len = htons(o->len);
                }

                if (n_options) {

I get a successful "build.sh release".



-------------------------------------------------------------------------
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------


Home | Main Index | Thread Index | Old Index