[Qemu-devel] [PATCH] slirp: Reassign same address to same DHCP client

[Qemu-devel] [PATCH] slirp: Reassign same address to same DHCP client

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 1390 bytes --]

In case a client restarts a DHCP recovery without releasing its old
address, reassign the same address to prevent consuming free addresses
and moving away from the standard client address.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 slirp/bootp.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/slirp/bootp.c b/slirp/bootp.c
index ae71e46..4e0082d 100644
--- a/slirp/bootp.c
+++ b/slirp/bootp.c
@@ -49,13 +49,15 @@ if (slirp_debug & DBG_CALL) { fprintf(dfd, fmt, ##  __VA_ARGS__); fflush(dfd); }
 #define dprintf(fmt, ...)
 #endif
 
-static BOOTPClient *get_new_addr(struct in_addr *paddr)
+static BOOTPClient *get_new_addr(struct in_addr *paddr,
+                                 const uint8_t *macaddr)
 {
     BOOTPClient *bc;
     int i;
 
     for(i = 0; i < NB_ADDR; i++) {
-        if (!bootp_clients[i].allocated)
+        bc = &bootp_clients[i];
+        if (!bc->allocated || !memcmp(macaddr, bc->macaddr, 6))
             goto found;
     }
     return NULL;
@@ -192,7 +194,7 @@ static void bootp_reply(const struct bootp_t *bp)
         }
         if (!bc) {
          new_addr:
-            bc = get_new_addr(&daddr.sin_addr);
+            bc = get_new_addr(&daddr.sin_addr, client_ethaddr);
             if (!bc) {
                 dprintf("no address left\n");
                 return;


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

Re: [Qemu-devel] [PATCH] slirp: Reassign same address to same DHCP client

[Avi Kivity]

Jan Kiszka wrote:
> In case a client restarts a DHCP recovery without releasing its old
> address, reassign the same address to prevent consuming free addresses
> and moving away from the standard client address.
>   

Yes please.  Some autotest failures can be attibuted to this (I think).


-- 
error compiling committee.c: too many arguments to function