From edda3d36064dba517c9b312210d56c28f880db4a Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Thu, 7 Nov 2019 14:14:32 +0100
Subject: n-dhcp4/lease: expose the server IP address

This is useful for network booting.

https://github.com/nettools/n-dhcp4/pull/7
---
 shared/n-dhcp4/src/libndhcp4.sym     |  1 +
 shared/n-dhcp4/src/n-dhcp4-c-lease.c | 14 ++++++++++++++
 shared/n-dhcp4/src/n-dhcp4.h         |  1 +
 shared/n-dhcp4/src/test-api.c        |  1 +
 4 files changed, 17 insertions(+)

(limited to 'shared/n-dhcp4')

diff --git a/shared/n-dhcp4/src/libndhcp4.sym b/shared/n-dhcp4/src/libndhcp4.sym
index b9ba800a3b..0659926bec 100644
--- a/shared/n-dhcp4/src/libndhcp4.sym
+++ b/shared/n-dhcp4/src/libndhcp4.sym
@@ -34,6 +34,7 @@ global:
         n_dhcp4_client_lease_ref;
         n_dhcp4_client_lease_unref;
         n_dhcp4_client_lease_get_yiaddr;
+        n_dhcp4_client_lease_get_siaddr;
         n_dhcp4_client_lease_get_lifetime;
         n_dhcp4_client_lease_query;
         n_dhcp4_client_lease_select;
diff --git a/shared/n-dhcp4/src/n-dhcp4-c-lease.c b/shared/n-dhcp4/src/n-dhcp4-c-lease.c
index 208ad92a6a..c14a9daf0a 100644
--- a/shared/n-dhcp4/src/n-dhcp4-c-lease.c
+++ b/shared/n-dhcp4/src/n-dhcp4-c-lease.c
@@ -203,6 +203,20 @@ _c_public_ void n_dhcp4_client_lease_get_yiaddr(NDhcp4ClientLease *lease, struct
         yiaddr->s_addr = header->yiaddr;
 }
 
+/**
+ * n_dhcp4_client_lease_get_siaddr() - get the server IP address
+ * @lease:                      the lease to operate on
+ * @siaddr:                     return argument for the IP address
+ *
+ * Gets the server IP address cotained in the lease. Or INADDR_ANY if the
+ * lease does not contain an IP address.
+ */
+_c_public_ void n_dhcp4_client_lease_get_siaddr(NDhcp4ClientLease *lease, struct in_addr *siaddr) {
+        NDhcp4Header *header = n_dhcp4_incoming_get_header(lease->message);
+
+        siaddr->s_addr = header->siaddr;
+}
+
 /**
  * n_dhcp4_client_lease_get_lifetime() - get the lifetime
  * @lease:                      the lease to operate on
diff --git a/shared/n-dhcp4/src/n-dhcp4.h b/shared/n-dhcp4/src/n-dhcp4.h
index 58a3cb803a..ef75eca7c8 100644
--- a/shared/n-dhcp4/src/n-dhcp4.h
+++ b/shared/n-dhcp4/src/n-dhcp4.h
@@ -156,6 +156,7 @@ NDhcp4ClientLease *n_dhcp4_client_lease_ref(NDhcp4ClientLease *lease);
 NDhcp4ClientLease *n_dhcp4_client_lease_unref(NDhcp4ClientLease *lease);
 
 void n_dhcp4_client_lease_get_yiaddr(NDhcp4ClientLease *lease, struct in_addr *yiaddr);
+void n_dhcp4_client_lease_get_siaddr(NDhcp4ClientLease *lease, struct in_addr *siaddr);
 void n_dhcp4_client_lease_get_lifetime(NDhcp4ClientLease *lease, uint64_t *ns_lifetimep);
 int n_dhcp4_client_lease_query(NDhcp4ClientLease *lease, uint8_t option, uint8_t **datap, size_t *n_datap);
 
diff --git a/shared/n-dhcp4/src/test-api.c b/shared/n-dhcp4/src/test-api.c
index 9e7b6bcaa7..be2d7b36a0 100644
--- a/shared/n-dhcp4/src/test-api.c
+++ b/shared/n-dhcp4/src/test-api.c
@@ -104,6 +104,7 @@ static void test_api_functions(void) {
                 (void *)n_dhcp4_client_lease_unrefp,
                 (void *)n_dhcp4_client_lease_unrefv,
                 (void *)n_dhcp4_client_lease_get_yiaddr,
+                (void *)n_dhcp4_client_lease_get_siaddr,
                 (void *)n_dhcp4_client_lease_get_lifetime,
                 (void *)n_dhcp4_client_lease_query,
                 (void *)n_dhcp4_client_lease_select,
-- 
cgit v1.2.1