odhcpd: managed PD wait for 250ms initial period

[project/odhcpd.git] / src / dhcpv6-ia.c

diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c
index 4bfea18ec3b19e220e1a4a2b7794bda2c1d48ca0..844dfd30b7d507d119c500b622e223a9b54e7057 100644 (file)
--- a/src/dhcpv6-ia.c
+++ b/src/dhcpv6-ia.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <poll.h>
 #include <alloca.h>
 #include <resolv.h>
 #include <limits.h>
@@ -279,7 +280,7 @@ void dhcpv6_write_statefile(void)
                                                        md5_hash(c->hostname, strlen(c->hostname), &md5);
                                                }
 
-                                               l += snprintf(leasebuf + l, sizeof(leasebuf) - l, "%s/%hhu ", ipbuf,
+                                               l += snprintf(leasebuf + l, sizeof(leasebuf) - l, "%s/%d ", ipbuf,
                                                                (c->managed_size) ? addrs[i].prefix : c->length);
                                        }
                                        leasebuf[l - 1] = '\n';
@@ -464,6 +465,14 @@ static bool assign_pd(struct interface *iface, struct dhcpv6_assignment *assign)
                        assign->managed_size = -1;
                        assign->valid_until = odhcpd_time() + 15;
                        list_add(&assign->head, &iface->ia_assignments);
+
+                       // Wait initial period of up to 250ms for immediate assignment
+                       struct pollfd pfd = { .fd = fd, .events = POLLIN };
+                       poll(&pfd, 1, 250);
+                       managed_handle_pd_data(&assign->managed_sock.stream, 0);
+
+                       if (fcntl(fd, F_GETFL) >= 0 && assign->managed_size > 0)
+                               return true;
                }
 
                return false;