Merge "Implement get/set IAID, DUID, DnsServers" into dev

vmware · May 18, 2016 · be387dc · be387dc
2 parents 4897f34 + f5ed980
commit be387dc
Show file tree

Hide file tree

Showing 11 changed files with 753 additions and 6 deletions.
diff --git a/include/constants.h b/include/constants.h
@@ -0,0 +1,9 @@
+#ifndef __CONSTANTS_H__
+#define __CONSTANTS_H__
+
+#define MAX_DUID_SIZE                  128
+
+
+#endif /* __CONSTANTS_H__ */
+
+
diff --git a/include/public/netmgr.h b/include/public/netmgr.h
@@ -34,13 +34,49 @@ free_interface(
 
 uint32_t
 ifup(
-    const char* pszInterfaceName
+    const char *pszInterfaceName
     );
 
 uint32_t
 ifdown(
-    const char* pszInterfaceName
+    const char * pszInterfaceName
     );
 
+int
+set_iaid(
+    const char *pszInterfaceName,
+    const uint32_t iaid
+);
+
+int
+get_iaid(
+    const char *pszInterfaceName,
+    uint32_t *iaid
+);
+
+int
+set_duid(
+    const char *pszInterfaceName,
+    const char *pszDuid
+);
+
+int
+get_duid(
+    const char *pszInterfaceName,
+    char *pszDuid
+);
+
+int
+set_dns_servers(
+    const char *pszInterfaceName,
+    const char *pszDnsServers
+);
+
+int
+get_dns_servers(
+    const char *pszInterfaceName,
+    char *pszDnsServers
+);
+
 #endif /* __NETMGR_H__ */
 
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -7,7 +7,8 @@ AM_CFLAGS += $(GLIB_CFLAGS)
 
 libnetmgr_la_SOURCES = \
     iniparser.c \
-    netmgr.c
+    netmgr.c \
+    utils.c
 
 libnetmgr_la_LIBADD = \
     @top_builddir@/common/libcommon.la \

diff --git a/src/defines.h b/src/defines.h
@@ -14,7 +14,19 @@
 
 #define IsNullOrEmptyString(str) (!(str) || !(*str))
 
+#ifndef __DEFINES_H__
+#define __DEFINES_H__
+
+
+#define MAX_LINE                       128
+
+#define SYSTEMD_PATH                   "/etc/systemd/"
+#define SYSTEMD_NET_PATH               "/etc/systemd/network/"
+
+
 #define bail_on_error(errcode) \
     if (errcode) { \
         goto error; \
     }
+
+#endif /* __DEFINES_H__ */
diff --git a/src/includes.h b/src/includes.h
@@ -19,14 +19,15 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 
+#include <constants.h>
 #include <netmgmtsys.h>
 
-
 #include <netmgr.h>
 #include <iniparser.h>
 
 #include "../common/prototypes.h"
 #include "defines.h"
 #include "structs.h"
 #include "prototypes.h"
+#include "utils.h"
 
diff --git a/src/iniparser.c b/src/iniparser.c
@@ -81,6 +81,10 @@ ini_cfg_read(
 
         if (!fgets(buffer, sizeof(buffer), fp))
         {
+            if (feof(fp))
+            {
+                break;
+            }
             err = errno;
             bail_on_error(err);
         }
@@ -292,6 +296,9 @@ ini_cfg_find_sections(
         bail_on_error(err);
     }
 
+    *pdwNumSections = 0;
+    *pppSections = NULL;
+
     for (pCursor = pConfig->pSection; pCursor; pCursor = pCursor->pNext)
     {
         if (!strcmp(pCursor->pszName, pszName))

diff --git a/src/netmgr.c b/src/netmgr.c
@@ -110,7 +110,7 @@ free_interface(
 
 uint32_t
 ifup(
-    const char* pszInterfaceName
+    const char *pszInterfaceName
     )
 {
     uint32_t err = 0;
@@ -131,7 +131,7 @@ ifup(
 
 uint32_t
 ifdown(
-    const char* pszInterfaceName
+    const char *pszInterfaceName
     )
 {
     uint32_t err = 0;
@@ -148,3 +148,231 @@ ifdown(
     goto cleanup;
 }
 
+int
+set_iaid(
+    const char *pszInterfaceName,
+    const uint32_t iaid
+)
+{
+    uint32_t err = 0;
+    char cfgFileName[MAX_LINE];
+    const char szSectionName[] = "Link";
+    const char szKey[] = "IAID";
+    char szValue[MAX_LINE] = "";
+
+    if (!pszInterfaceName)
+    {
+        err = EINVAL;
+        bail_on_error(err);
+    }
+
+    sprintf(cfgFileName, "%s10-%s.network", SYSTEMD_NET_PATH, pszInterfaceName);
+    sprintf(szValue, "%u", iaid);
+
+    if (iaid > 0)
+    {
+        err = set_key_value(cfgFileName, szSectionName, szKey, szValue, 0);
+    }
+    else
+    {
+        err = set_key_value(cfgFileName, szSectionName, szKey, NULL, 0);
+    }
+
+    bail_on_error(err);
+
+error:
+    return err;
+}
+
+int
+get_iaid(
+    const char *pszInterfaceName,
+    uint32_t *iaid
+)
+{
+    uint32_t err = 0;
+    char cfgFileName[MAX_LINE];
+    const char szSectionName[] = "Link";
+    const char szKey[] = "IAID";
+    char szIaid[MAX_LINE];
+
+    if (!pszInterfaceName)
+    {
+        err = EINVAL;
+        bail_on_error(err);
+    }
+
+    sprintf(cfgFileName, "%s10-%s.network", SYSTEMD_NET_PATH, pszInterfaceName);
+
+    err = get_key_value(cfgFileName, szSectionName, szKey, szIaid);
+    bail_on_error(err);
+
+    sscanf(szIaid, "%u", iaid);
+
+error:
+    return err;
+}
+
+int
+set_duid(
+    const char *pszInterfaceName,
+    const char *pszDuid
+)
+{
+    uint32_t err = 0;
+    char cfgFileName[MAX_LINE];
+    const char szSectionName[] = "DUID";
+    const char szKey[] = "RawData";
+
+    if (pszInterfaceName != NULL)
+    {
+        /* TODO: Add support */
+        err = ENOTSUP;
+        bail_on_error(err);
+    }
+    else
+    {
+        sprintf(cfgFileName, "%snetworkd.conf", SYSTEMD_PATH);
+    }
+
+    if (strlen(pszDuid) == 0)
+    {
+        err = set_key_value(cfgFileName, szSectionName, szKey, NULL, 0);
+    }
+    else
+    {
+        err = set_key_value(cfgFileName, szSectionName, szKey, pszDuid, 0);
+    }
+    bail_on_error(err);
+
+error:
+    return err;
+}
+
+int
+get_duid(
+    const char *pszInterfaceName,
+    char *pszDuid
+)
+{
+
+    uint32_t err = 0;
+    char cfgFileName[MAX_LINE];
+    const char szSectionName[] = "DUID";
+    const char szKey[] = "RawData";
+
+    if (pszInterfaceName != NULL)
+    {
+        /* TODO: Add support */
+        err = ENOTSUP;
+        bail_on_error(err);
+    }
+    else
+    {
+        sprintf(cfgFileName, "%snetworkd.conf", SYSTEMD_PATH);
+    }
+
+    err = get_key_value(cfgFileName, szSectionName, szKey, pszDuid);
+    bail_on_error(err);
+
+error:
+    return err;
+}
+
+int
+set_dns_servers(
+    const char *pszInterfaceName,
+    const char *pszDnsServers
+)
+{
+    uint32_t err = 0;
+    char cfgFileName[MAX_LINE];
+    char szSectionName[MAX_LINE];
+    char szKey[MAX_LINE] = "DNS";
+    char szValue[MAX_LINE];
+    DIR *dirFile = NULL;
+    struct dirent *hFile;
+
+    if (pszInterfaceName != NULL)
+    {
+        sprintf(cfgFileName, "%s10-%s.network", SYSTEMD_NET_PATH, pszInterfaceName);
+        sprintf(szSectionName, "Network");
+    }
+    else
+    {
+        sprintf(cfgFileName, "%sresolved.conf", SYSTEMD_PATH);
+        sprintf(szSectionName, "Resolve");
+    }
+
+    if (strlen(pszDnsServers) == 0)
+    {
+        sprintf(szValue, "true");
+        err = set_key_value(cfgFileName, szSectionName, szKey, NULL, 0);
+    }
+    else
+    {
+        sprintf(szValue, "false");
+        err = set_key_value(cfgFileName, szSectionName, szKey, pszDnsServers, 0);
+    }
+    bail_on_error(err);
+
+    /* For each .network file - set 'UseDNS=false' */
+    if (pszInterfaceName == NULL)
+    {
+        dirFile = opendir(SYSTEMD_NET_PATH);
+        if (dirFile != NULL)
+        {
+            errno = 0;
+            sprintf(szSectionName, "DHCP");
+            sprintf(szKey, "UseDNS");
+            while ((hFile = readdir(dirFile)) != NULL)
+            {
+                if (!strcmp(hFile->d_name, ".")) continue;
+                if (!strcmp(hFile->d_name, "..")) continue;
+                if (hFile->d_name[0] == '.') continue;
+                if (strstr(hFile->d_name, ".network"))
+                {
+                    sprintf(cfgFileName, "%s%s", SYSTEMD_NET_PATH, hFile->d_name);
+                    err = set_key_value(cfgFileName, szSectionName, szKey, szValue, 0);
+                    bail_on_error(err);
+                }
+            }
+        }
+    }
+
+error:
+    if (dirFile != NULL)
+    {
+        closedir(dirFile);
+    }
+    return err;
+}
+
+int
+get_dns_servers(
+    const char *pszInterfaceName,
+    char *pszDnsServers
+)
+{
+    uint32_t err = 0;
+    char cfgFileName[MAX_LINE];
+    char szSectionName[MAX_LINE];
+    char szKey[MAX_LINE] = "DNS";
+
+    if (pszInterfaceName != NULL)
+    {
+        sprintf(cfgFileName, "%s10-%s.network", SYSTEMD_NET_PATH, pszInterfaceName);
+        sprintf(szSectionName, "Network");
+    }
+    else
+    {
+        sprintf(cfgFileName, "%sresolved.conf", SYSTEMD_PATH);
+        sprintf(szSectionName, "Resolve");
+    }
+
+    err = get_key_value(cfgFileName, szSectionName, szKey, pszDnsServers);
+    bail_on_error(err);
+
+error:
+    return err;
+}