Changeset ebb1489 in mainline for uspace/srv/net/dhcp/dhcp.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/srv/net/dhcp/dhcp.c (modified) (3 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -71 +71 @@
 static list_t dhcp_links;
 
+bool inetcfg_inited = false;
+
 static void dhcpsrv_discover_timeout(void *);
 static void dhcpsrv_request_timeout(void *);
@@ -468 +470 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
 
+        if (!inetcfg_inited) {
+                rc = inetcfg_init();
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Error contacting "
+                            "inet configuration service.\n");
+                        return EIO;
+                }
+
+                inetcfg_inited = true;
+        }
+
         if (dhcpsrv_link_find(link_id) != NULL) {
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu already added",