10:32 a.m.
Hi,
First of, sorry for my absence on this list. When the others leave for
vacation, the work load apparently increases for the ones that do not :)
Also, thanks for all your input earlier, David.
This is my first effort to divide utility functions into
OS-independent (dutil.c) and OS-dependent (dutil_linux.c) and move
them out of the drivers.
It is noteworthy that the 4th test (testDefineUndefine) started
failing after I added the 2nd patch. After some debugging, this seems
to be due to augeas trying to save /sys/class/net/br0/address, which I
thought was kind of strange. I attached gdb and set breakpoints on
aug_set, aug_rm, aug_mv and aug_insert but was unable to find any call
that changed /files/sys/class/net/br0/address. Does someone else
experience the same problem, or is there something wrong with my
libaugeas build?
For my future projects, besides adapting the suse-driver according to
Davids suggestions and this commit, I am thinking about adding debug
macros (as mentioned) and improve error reporting. I would like to get
some opinions on this suggestion:
When I was debugging the problem above with aug_save, it was quite
hard to get exact error messages from augeas. I of course added
temporary debuging code that gave me this information, although augeas
information ought to be more easily accessible than this. I therefore
suggest adding a EAUGEAS or similar that would trigger a dump of
/augeas//error and /augeas//error/message from ERR_*.
Regards,
Jonas
10:32 a.m.
New subject: [PATCH 1/3] Move all general functions to dutil.c
All functions that can be moved from drv_initscript.c without needing any large
code changes are moved to dutil.{c/h}.
---
src/Makefile.am | 2 +-
src/drv_initscripts.c | 220 +---------------------------------------
src/dutil.c | 269 +++++++++++++++++++++++++++++++++++++++++++++++++
src/dutil.h | 87 ++++++++++++++++
4 files changed, 363 insertions(+), 215 deletions(-)
create mode 100644 src/dutil.c
create mode 100644 src/dutil.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c84454..58f5d7c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST = netcf_public.syms \
netcf_private.syms
if NETCF_DRIVER_INITSCRIPTS
-DRIVER_SOURCES = drv_initscripts.c
+DRIVER_SOURCES = drv_initscripts.c dutil.c
endif
BUILT_SOURCES = datadir.h netcf.syms
diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
index 66d668f..d51ac97 100644
--- a/src/drv_initscripts.c
+++ b/src/drv_initscripts.c
@@ -31,13 +31,10 @@
#include <string.h>
#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-
#include "safe-alloc.h"
#include "ref.h"
#include "list.h"
+#include "dutil.h"
#include <libxml/parser.h>
#include <libxml/relaxng.h>
@@ -86,15 +83,6 @@ static const char *const lokkit_custom_rules =
static const char *const prog_rc_d_iptables = "/etc/init.d/iptables";
-struct driver {
- struct augeas *augeas;
- xsltStylesheetPtr put;
- xsltStylesheetPtr get;
- xmlRelaxNGPtr rng;
- int ioctl_fd;
- unsigned int load_augeas : 1;
-};
-
/* Entries in a ifcfg file that tell us that the interface
* is not a toplevel interface
*/
@@ -102,19 +90,6 @@ static const char *const subif_paths[] = {
"MASTER", "BRIDGE"
};
-/* Like asprintf, but set *STRP to NULL on error */
-static int xasprintf(char **strp, const char *format, ...) {
- va_list args;
- int result;
-
- va_start (args, format);
- result = vasprintf (strp, format, args);
- va_end (args);
- if (result < 0)
- *strp = NULL;
- return result;
-}
-
/* Get the Augeas instance; if we already initialized it, just return
* it. Otherwise, create a new one and return that.
*/
@@ -220,14 +195,6 @@ static int aug_submatch(struct netcf *ncf, const char *p1,
return -1;
}
-static void free_matches(int nint, char ***intf) {
- if (*intf != NULL) {
- for (int i=0; i < nint; i++)
- FREE((*intf)[i]);
- FREE(*intf);
- }
-}
-
static int is_slave(struct netcf *ncf, const char *intf) {
for (int s = 0; s < ARRAY_CARDINALITY(subif_paths); s++) {
int r;
@@ -238,18 +205,6 @@ static int is_slave(struct netcf *ncf, const char *intf) {
return 0;
}
-static int is_active(struct netcf *ncf, const char *intf) {
- struct ifreq ifr;
-
- MEMZERO(&ifr, 1);
- strncpy(ifr.ifr_name, intf, sizeof(ifr.ifr_name));
- ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
- if (ioctl(ncf->driver->ioctl_fd, SIOCGIFFLAGS, &ifr)) {
- return 0;
- }
- return ((ifr.ifr_flags & IFF_UP) == IFF_UP);
-}
-
static int list_interfaces(struct netcf *ncf, char ***intf) {
int nint = 0, result = 0;
struct augeas *aug = NULL;
@@ -393,92 +348,6 @@ static void bridge_physdevs(struct netcf *ncf) {
return;
}
-static xsltStylesheetPtr parse_stylesheet(struct netcf *ncf,
- const char *fname) {
- xsltStylesheetPtr result = NULL;
- char *path = NULL;
- int r;
-
- r = xasprintf(&path, "%s/xml/%s", ncf->data_dir, fname);
- ERR_COND_BAIL(r < 0, ncf, ENOMEM);
-
- // FIXME: Error checking ??
- result = xsltParseStylesheetFile(BAD_CAST path);
- error:
- free(path);
- return result;
-}
-
-/* Callback for reporting RelaxNG errors */
-static void rng_error(void *ctx, const char *format, ...) {
- struct netcf *ncf = ctx;
- va_list ap;
-
- va_start(ap, format);
- vreport_error(ncf, NETCF_EXMLINVALID, format, ap);
- va_end(ap);
-}
-
-static xmlRelaxNGPtr rng_parse(struct netcf *ncf, const char *fname) {
- char *path = NULL;
- xmlRelaxNGPtr result = NULL;
- xmlRelaxNGParserCtxtPtr ctxt = NULL;
- int r;
-
- r = xasprintf(&path, "%s/xml/%s", ncf->data_dir, fname);
- ERR_COND_BAIL(r < 0, ncf, ENOMEM);
-
- ctxt = xmlRelaxNGNewParserCtxt(path);
- xmlRelaxNGSetParserErrors(ctxt, rng_error, rng_error, ncf);
-
- result = xmlRelaxNGParse(ctxt);
-
- error:
- xmlRelaxNGFreeParserCtxt(ctxt);
- free(path);
- return result;
-}
-
-static void rng_validate(struct netcf *ncf, xmlDocPtr doc) {
- xmlRelaxNGValidCtxtPtr ctxt;
- int r;
-
- ctxt = xmlRelaxNGNewValidCtxt(ncf->driver->rng);
- xmlRelaxNGSetValidErrors(ctxt, rng_error, rng_error, ncf);
-
- r = xmlRelaxNGValidateDoc(ctxt, doc);
- if (r != 0 && ncf->errcode == NETCF_NOERROR)
- report_error(ncf, NETCF_EXMLINVALID,
- "Interface definition fails to validate");
-
- xmlRelaxNGFreeValidCtxt(ctxt);
-}
-
-static char *xml_prop(xmlNodePtr node, const char *name) {
- return (char *) xmlGetProp(node, BAD_CAST name);
-}
-
-static int init_ioctl_fd(struct netcf *ncf) {
-
- int ioctl_fd;
- int flags;
-
- ioctl_fd = socket(AF_INET, SOCK_STREAM, 0);
- ERR_THROW(ioctl_fd < 0, ncf, EINTERNAL, "failed to open socket for interface
ioctl");
-
- flags = fcntl(ioctl_fd, F_GETFD);
- ERR_THROW(flags < 0, ncf, EINTERNAL, "failed to get flags for ioctl
socket");
-
- flags = fcntl(ioctl_fd, F_SETFD, flags | FD_CLOEXEC);
- ERR_THROW(flags < 0, ncf, EINTERNAL, "failed to set FD_CLOEXEC flag on ioctl
socket");
- return ioctl_fd;
-
-error:
- if (ioctl_fd >= 0)
- close(ioctl_fd);
- return -1;
-}
-
int drv_init(struct netcf *ncf) {
int r;
@@ -732,51 +601,6 @@ static int aug_put_xml(struct netcf *ncf, xmlDocPtr xml) {
return result;
}
-/* Called from SAX on parsing errors in the XML. */
-static void
-catch_xml_error(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
- xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
-
- if (ctxt != NULL) {
- struct netcf *ncf = ctxt->_private;
-
- if (ctxt->lastError.level == XML_ERR_FATAL &&
- ctxt->lastError.message != NULL) {
- report_error(ncf, NETCF_EXMLPARSER,
- "at line %d: %s",
- ctxt->lastError.line,
- ctxt->lastError.message);
- }
- }
-}
-
-static xmlDocPtr parse_xml(struct netcf *ncf, const char *xml_str) {
- xmlParserCtxtPtr pctxt;
- xmlDocPtr xml = NULL;
-
- /* Set up a parser context so we can catch the details of XML errors. */
- pctxt = xmlNewParserCtxt();
- ERR_COND_BAIL(pctxt == NULL || pctxt->sax == NULL, ncf, ENOMEM);
-
- pctxt->sax->error = catch_xml_error;
- pctxt->_private = ncf;
-
- xml = xmlCtxtReadDoc (pctxt, BAD_CAST xml_str, "netcf.xml", NULL,
- XML_PARSE_NOENT | XML_PARSE_NONET |
- XML_PARSE_NOWARNING);
- ERR_THROW(xml == NULL, ncf, EXMLPARSER,
- "failed to parse xml document");
- ERR_THROW(xmlDocGetRootElement(xml) == NULL, ncf, EINTERNAL,
- "missing root element");
-
- xmlFreeParserCtxt(pctxt);
- return xml;
-error:
- xmlFreeParserCtxt (pctxt);
- xmlFreeDoc (xml);
- return NULL;
-}
-
char *drv_xml_desc(struct netcf_if *nif) {
char *path = NULL, *result = NULL;
struct augeas *aug;
@@ -1188,47 +1012,14 @@ int drv_if_down(struct netcf_if *nif) {
* Test interface
*/
int drv_get_aug(struct netcf *ncf, const char *ncf_xml, char **aug_xml) {
- xmlDocPtr ncf_doc = NULL, aug_doc = NULL;
- int result = -1;
-
- ncf_doc = parse_xml(ncf, ncf_xml);
- ERR_BAIL(ncf);
-
- rng_validate(ncf, ncf_doc);
- ERR_BAIL(ncf);
-
- // FIXME: Check for errors from ApplyStylesheet
- aug_doc = xsltApplyStylesheet(ncf->driver->get, ncf_doc, NULL);
-
- xmlDocDumpFormatMemory(aug_doc, (xmlChar **) aug_xml, NULL, 1);
- ERR_COND_BAIL(*aug_xml == NULL, ncf, EXMLINVALID);
- /* fallthrough intentional */
- result = 0;
- error:
- xmlFreeDoc(ncf_doc);
- xmlFreeDoc(aug_doc);
- return result;
+ /* Use utility implementation */
+ return _drv_get_aug(ncf, ncf_xml, aug_xml);
}
/* Transform the Augeas XML AUG_XML into interface XML NCF_XML */
int drv_put_aug(struct netcf *ncf, const char *aug_xml, char **ncf_xml) {
- xmlDocPtr ncf_doc = NULL, aug_doc = NULL;
- int result = -1;
-
- aug_doc = parse_xml(ncf, aug_xml);
- ERR_BAIL(ncf);
-
- // FIXME: Check for errors from ApplyStylesheet
- ncf_doc = xsltApplyStylesheet(ncf->driver->put, aug_doc, NULL);
-
- xmlDocDumpFormatMemory(ncf_doc, (xmlChar **) ncf_xml, NULL, 1);
- ERR_COND_BAIL(*ncf_xml == NULL, ncf, EXMLINVALID);
- /* fallthrough intentional */
- result = 0;
- error:
- xmlFreeDoc(ncf_doc);
- xmlFreeDoc(aug_doc);
- return result;
+ /* Use utility implementation */
+ return _drv_put_aug(ncf, aug_xml, ncf_xml);
}
/*
@@ -1239,3 +1030,4 @@ int drv_put_aug(struct netcf *ncf, const char *aug_xml, char
**ncf_xml) {
* tab-width: 4
* End:
*/
+/* vim: set ts=4 sw=4 et: */
diff --git a/src/dutil.c b/src/dutil.c
new file mode 100644
index 0000000..c15bfbc
--- /dev/null
+++ b/src/dutil.c
@@ -0,0 +1,269 @@
+/*
+ * dutil.c: Global utility functions for driver backends.
+ *
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: David Lutterkort <lutter(a)redhat.com>
+ */
+
+#include <config.h>
+#include <internal.h>
+
+#include <augeas.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+
+#include "safe-alloc.h"
+#include "ref.h"
+#include "list.h"
+#include "netcf.h"
+#include "dutil.h"
+
+#include <libxml/parser.h>
+#include <libxml/relaxng.h>
+#include <libxml/tree.h>
+#include <libxslt/xslt.h>
+#include <libxslt/xsltInternals.h>
+#include <libxslt/transform.h>
+
+/* Like asprintf, but set *STRP to NULL on error */
+int xasprintf(char **strp, const char *format, ...) {
+ va_list args;
+ int result;
+
+ va_start (args, format);
+ result = vasprintf (strp, format, args);
+ va_end (args);
+ if (result < 0)
+ *strp = NULL;
+ return result;
+}
+
+void free_matches(int nint, char ***intf) {
+ if (*intf != NULL) {
+ for (int i=0; i < nint; i++)
+ FREE((*intf)[i]);
+ FREE(*intf);
+ }
+}
+
+xsltStylesheetPtr parse_stylesheet(struct netcf *ncf,
+ const char *fname) {
+ xsltStylesheetPtr result = NULL;
+ char *path = NULL;
+ int r;
+
+ r = xasprintf(&path, "%s/xml/%s", ncf->data_dir, fname);
+ ERR_COND_BAIL(r < 0, ncf, ENOMEM);
+
+ // FIXME: Error checking ??
+ result = xsltParseStylesheetFile(BAD_CAST path);
+ error:
+ free(path);
+ return result;
+}
+
+/* Callback for reporting RelaxNG errors */
+void rng_error(void *ctx, const char *format, ...) {
+ struct netcf *ncf = ctx;
+ va_list ap;
+
+ va_start(ap, format);
+ vreport_error(ncf, NETCF_EXMLINVALID, format, ap);
+ va_end(ap);
+}
+
+xmlRelaxNGPtr rng_parse(struct netcf *ncf, const char *fname) {
+ char *path = NULL;
+ xmlRelaxNGPtr result = NULL;
+ xmlRelaxNGParserCtxtPtr ctxt = NULL;
+ int r;
+
+ r = xasprintf(&path, "%s/xml/%s", ncf->data_dir, fname);
+ ERR_COND_BAIL(r < 0, ncf, ENOMEM);
+
+ ctxt = xmlRelaxNGNewParserCtxt(path);
+ xmlRelaxNGSetParserErrors(ctxt, rng_error, rng_error, ncf);
+
+ result = xmlRelaxNGParse(ctxt);
+
+ error:
+ xmlRelaxNGFreeParserCtxt(ctxt);
+ free(path);
+ return result;
+}
+
+void rng_validate(struct netcf *ncf, xmlDocPtr doc) {
+ xmlRelaxNGValidCtxtPtr ctxt;
+ int r;
+
+ ctxt = xmlRelaxNGNewValidCtxt(ncf->driver->rng);
+ xmlRelaxNGSetValidErrors(ctxt, rng_error, rng_error, ncf);
+
+ r = xmlRelaxNGValidateDoc(ctxt, doc);
+ if (r != 0 && ncf->errcode == NETCF_NOERROR)
+ report_error(ncf, NETCF_EXMLINVALID,
+ "Interface definition fails to validate");
+
+ xmlRelaxNGFreeValidCtxt(ctxt);
+}
+
+/* Called from SAX on parsing errors in the XML. */
+void catch_xml_error(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
+ xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
+
+ if (ctxt != NULL) {
+ struct netcf *ncf = ctxt->_private;
+
+ if (ctxt->lastError.level == XML_ERR_FATAL &&
+ ctxt->lastError.message != NULL) {
+ report_error(ncf, NETCF_EXMLPARSER,
+ "at line %d: %s",
+ ctxt->lastError.line,
+ ctxt->lastError.message);
+ }
+ }
+}
+
+xmlDocPtr parse_xml(struct netcf *ncf, const char *xml_str) {
+ xmlParserCtxtPtr pctxt;
+ xmlDocPtr xml = NULL;
+
+ /* Set up a parser context so we can catch the details of XML errors. */
+ pctxt = xmlNewParserCtxt();
+ ERR_COND_BAIL(pctxt == NULL || pctxt->sax == NULL, ncf, ENOMEM);
+
+ pctxt->sax->error = catch_xml_error;
+ pctxt->_private = ncf;
+
+ xml = xmlCtxtReadDoc (pctxt, BAD_CAST xml_str, "netcf.xml", NULL,
+ XML_PARSE_NOENT | XML_PARSE_NONET |
+ XML_PARSE_NOWARNING);
+ ERR_THROW(xml == NULL, ncf, EXMLPARSER,
+ "failed to parse xml document");
+ ERR_THROW(xmlDocGetRootElement(xml) == NULL, ncf, EINTERNAL,
+ "missing root element");
+
+ xmlFreeParserCtxt(pctxt);
+ return xml;
+error:
+ xmlFreeParserCtxt (pctxt);
+ xmlFreeDoc (xml);
+ return NULL;
+}
+
+char *xml_prop(xmlNodePtr node, const char *name) {
+ return (char *) xmlGetProp(node, BAD_CAST name);
+}
+
+int init_ioctl_fd(struct netcf *ncf) {
+ int ioctl_fd;
+ int flags;
+
+ ioctl_fd = socket(AF_INET, SOCK_STREAM, 0);
+ ERR_THROW(ioctl_fd < 0, ncf, EINTERNAL, "failed to open socket for interface
ioctl");
+
+ flags = fcntl(ioctl_fd, F_GETFD);
+ ERR_THROW(flags < 0, ncf, EINTERNAL, "failed to get flags for ioctl
socket");
+
+ flags = fcntl(ioctl_fd, F_SETFD, flags | FD_CLOEXEC);
+ ERR_THROW(flags < 0, ncf, EINTERNAL, "failed to set FD_CLOEXEC flag on ioctl
socket");
+ return ioctl_fd;
+
+error:
+ if (ioctl_fd >= 0)
+ close(ioctl_fd);
+ return -1;
+}
+
+int is_active(struct netcf *ncf, const char *intf) {
+ struct ifreq ifr;
+
+ MEMZERO(&ifr, 1);
+ strncpy(ifr.ifr_name, intf, sizeof(ifr.ifr_name));
+ ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
+ if (ioctl(ncf->driver->ioctl_fd, SIOCGIFFLAGS, &ifr)) {
+ return 0;
+ }
+ return ((ifr.ifr_flags & IFF_UP) == IFF_UP);
+}
+
+/*
+ * Test interface
+ */
+int _drv_get_aug(struct netcf *ncf, const char *ncf_xml, char **aug_xml) {
+ xmlDocPtr ncf_doc = NULL, aug_doc = NULL;
+ int result = -1;
+
+ ncf_doc = parse_xml(ncf, ncf_xml);
+ ERR_BAIL(ncf);
+
+ rng_validate(ncf, ncf_doc);
+ ERR_BAIL(ncf);
+
+ // FIXME: Check for errors from ApplyStylesheet
+ aug_doc = xsltApplyStylesheet(ncf->driver->get, ncf_doc, NULL);
+
+ xmlDocDumpFormatMemory(aug_doc, (xmlChar **) aug_xml, NULL, 1);
+ ERR_COND_BAIL(*aug_xml == NULL, ncf, EXMLINVALID);
+ /* fallthrough intentional */
+ result = 0;
+ error:
+ xmlFreeDoc(ncf_doc);
+ xmlFreeDoc(aug_doc);
+ return result;
+}
+
+/* Transform the Augeas XML AUG_XML into interface XML NCF_XML */
+int _drv_put_aug(struct netcf *ncf, const char *aug_xml, char **ncf_xml) {
+ xmlDocPtr ncf_doc = NULL, aug_doc = NULL;
+ int result = -1;
+
+ aug_doc = parse_xml(ncf, aug_xml);
+ ERR_BAIL(ncf);
+
+ // FIXME: Check for errors from ApplyStylesheet
+ ncf_doc = xsltApplyStylesheet(ncf->driver->put, aug_doc, NULL);
+
+ xmlDocDumpFormatMemory(ncf_doc, (xmlChar **) ncf_xml, NULL, 1);
+ ERR_COND_BAIL(*ncf_xml == NULL, ncf, EXMLINVALID);
+ /* fallthrough intentional */
+ result = 0;
+ error:
+ xmlFreeDoc(ncf_doc);
+ xmlFreeDoc(aug_doc);
+ return result;
+}
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */
+/* vim: set ts=4 sw=4 et: */
diff --git a/src/dutil.h b/src/dutil.h
new file mode 100644
index 0000000..e5ec383
--- /dev/null
+++ b/src/dutil.h
@@ -0,0 +1,87 @@
+/*
+ * dutil.h: Global utility functions for driver backends.
+ *
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: David Lutterkort <lutter(a)redhat.com>
+ */
+
+#ifndef DUTIL_H_
+#define DUTIL_H_
+
+#include <libxml/relaxng.h>
+#include <libxslt/xsltInternals.h>
+
+struct driver {
+ struct augeas *augeas;
+ xsltStylesheetPtr put;
+ xsltStylesheetPtr get;
+ xmlRelaxNGPtr rng;
+ int ioctl_fd;
+ unsigned int load_augeas : 1;
+};
+
+/* Like asprintf, but set *STRP to NULL on error */
+int xasprintf(char **strp, const char *format, ...);
+
+/* Free matches from aug_match (or aug_submatch) */
+void free_matches(int nint, char ***intf);
+
+/* Parse an XSLT stylesheet residing in the file @ncf->data_dir/xml/@fname */
+xsltStylesheetPtr parse_stylesheet(struct netcf *ncf, const char *fname);
+
+/* Callback for reporting RelaxNG errors */
+void rng_error(void *ctx, const char *format, ...);
+
+/* Initialize a rng pointer from the file @ncf->data_dir/xml/@fname */
+xmlRelaxNGPtr rng_parse(struct netcf *ncf, const char *fname);
+
+/* Validate the xml document doc using the previously initialized rng pointer */
+void rng_validate(struct netcf *ncf, xmlDocPtr doc);
+
+/* Called from SAX on parsing errors in the XML. */
+void catch_xml_error(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...);
+
+/* Parse the xml in @xml_str and return a xmlDocPtr to the parsed structure */
+xmlDocPtr parse_xml(struct netcf *ncf, const char *xml_str);
+
+/* Return the content the property @name in @node */
+char *xml_prop(xmlNodePtr node, const char *name);
+
+/* Get a file descriptor to a ioctl socket */
+int init_ioctl_fd(struct netcf *ncf);
+
+/* Check if the interface @intf is up using a ioctl call */
+int is_active(struct netcf *ncf, const char *intf);
+
+/* Transform the interface XML NCF_XML into Augeas XML AUG_XML */
+int _drv_get_aug(struct netcf *ncf, const char *ncf_xml, char **aug_xml);
+
+/* Transform the Augeas XML AUG_XML into interface XML NCF_XML */
+int _drv_put_aug(struct netcf *ncf, const char *aug_xml, char **ncf_xml);
+
+#endif
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */
+/* vim: set ts=4 sw=4 et: */
--
1.6.2
10:32 a.m.
New subject: [PATCH 2/3] Move get_augeas and aug_submatch to dutil.c
In order to include augeas_xfm in the driver struct, the type of augeas_xfm had
to be reworked to a struct array. The inclusion of augeas_xfm in the driver
struct was necessary in order to move get_augeas and aug_submatch from
drv_initscripts.c to dutil.c. This also prepares for future utility functions
operating on the augeas instance.
---
src/drv_initscripts.c | 85 ++-----------------------------------------------
src/dutil.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++
src/dutil.h | 14 ++++++++
3 files changed, 99 insertions(+), 82 deletions(-)
diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
index d51ac97..7aba42d 100644
--- a/src/drv_initscripts.c
+++ b/src/drv_initscripts.c
@@ -47,7 +47,7 @@ static const char *const ifcfg_path =
"/files/etc/sysconfig/network-scripts/*";
/* Augeas should only load the files we are interested in */
-static const char *const augeas_xfm[][2] = {
+static const struct augeas_pv augeas_xfm[] = {
/* Ifcfg files */
{ "/augeas/load/Ifcfg/lens", "Shellvars.lns" },
{ "/augeas/load/Ifcfg/incl",
@@ -90,68 +90,6 @@ static const char *const subif_paths[] = {
"MASTER", "BRIDGE"
};
-/* Get the Augeas instance; if we already initialized it, just return
- * it. Otherwise, create a new one and return that.
- */
-static struct augeas *get_augeas(struct netcf *ncf) {
- int r;
-
- if (ncf->driver->augeas == NULL) {
- struct augeas *aug;
- char *path;
-
- r = xasprintf(&path, "%s/lenses", ncf->data_dir);
- ERR_COND_BAIL(r < 0, ncf, ENOMEM);
-
- aug = aug_init(ncf->root, path, AUG_NO_MODL_AUTOLOAD);
- FREE(path);
- ERR_THROW(aug == NULL, ncf, EOTHER, "aug_init failed");
- ncf->driver->augeas = aug;
- /* Only look at a few config files */
- r = aug_rm(aug, "/augeas/load/*");
- ERR_THROW(r < 0, ncf, EOTHER, "aug_rm failed in get_augeas");
-
- for (int i=0; i < ARRAY_CARDINALITY(augeas_xfm); i++) {
- r = aug_set(aug, augeas_xfm[i][0], augeas_xfm[i][1]);
- ERR_THROW(r < 0, ncf, EOTHER,
- "transform setup failed to set %s",
- augeas_xfm[i][0]);
- }
- r = aug_load(aug);
- ERR_THROW(r < 0, ncf, EOTHER, "failed to load config files");
-
- /* FIXME: we need to produce _much_ better diagnostics here - need
- * to analyze what came back in /augeas//error; ultimately, we need
- * to understand whether this is harmless or a real error. For real
- * errors, we need to return an error.
- */
- r = aug_match(aug, "/augeas//error", NULL);
- if (r > 0) {
- fprintf(stderr, "warning: augeas initialization had errors\n");
- fprintf(stderr, "please file a bug with the following lines in the bug
report:\n");
- aug_print(aug, stderr, "/augeas//error");
- }
- } else {
- if (ncf->driver->load_augeas) {
- struct augeas *aug = ncf->driver->augeas;
- /* Undefine all our variables to work around bug 79 in Augeas */
- aug_defvar(aug, "iptables", NULL);
- aug_defvar(aug, "fw", NULL);
- aug_defvar(aug, "fw_custom", NULL);
- aug_defvar(aug, "ipt_filter", NULL);
-
- r = aug_load(ncf->driver->augeas);
- ERR_THROW(r < 0, ncf, EOTHER, "failed to reload config files");
- ncf->driver->load_augeas = 0;
- }
- }
- return ncf->driver->augeas;
- error:
- aug_close(ncf->driver->augeas);
- ncf->driver->augeas = NULL;
- return NULL;
-}
-
ATTRIBUTE_FORMAT(printf, 4, 5)
static int defnode(struct netcf *ncf, const char *name, const char *value,
const char *format, ...) {
@@ -176,25 +114,6 @@ static int defnode(struct netcf *ncf, const char *name, const char
*value,
return (r < 0) ? -1 : created;
}
-static int aug_submatch(struct netcf *ncf, const char *p1,
- const char *p2, char ***matches) {
- struct augeas *aug = get_augeas(ncf);
- char *path = NULL;
- int r;
-
- r = xasprintf(&path, "%s/%s", p1, p2);
- ERR_COND_BAIL(r < 0, ncf, EOTHER);
-
- r = aug_match(aug, path, matches);
- ERR_COND_BAIL(r < 0, ncf, EOTHER);
-
- free(path);
- return r;
- error:
- free(path);
- return -1;
-}
-
static int is_slave(struct netcf *ncf, const char *intf) {
for (int s = 0; s < ARRAY_CARDINALITY(subif_paths); s++) {
int r;
@@ -355,6 +274,8 @@ int drv_init(struct netcf *ncf) {
return -1;
ncf->driver->ioctl_fd = -1;
+ ncf->driver->augeas_xfm_size = ARRAY_CARDINALITY(augeas_xfm);
+ ncf->driver->augeas_xfm = augeas_xfm;
// FIXME: Check for errors
xsltInit();
diff --git a/src/dutil.c b/src/dutil.c
index c15bfbc..d0cdb22 100644
--- a/src/dutil.c
+++ b/src/dutil.c
@@ -62,6 +62,88 @@ int xasprintf(char **strp, const char *format, ...) {
return result;
}
+/* Get the Augeas instance; if we already initialized it, just return
+ * it. Otherwise, create a new one and return that.
+ */
+struct augeas *get_augeas(struct netcf *ncf) {
+ int r;
+
+ if (ncf->driver->augeas == NULL) {
+ struct augeas *aug;
+ char *path;
+
+ r = xasprintf(&path, "%s/lenses", ncf->data_dir);
+ ERR_COND_BAIL(r < 0, ncf, ENOMEM);
+
+ aug = aug_init(ncf->root, path, AUG_NO_MODL_AUTOLOAD);
+ FREE(path);
+ ERR_THROW(aug == NULL, ncf, EOTHER, "aug_init failed");
+ ncf->driver->augeas = aug;
+ /* Only look at a few config files */
+ r = aug_rm(aug, "/augeas/load/*");
+ ERR_THROW(r < 0, ncf, EOTHER, "aug_rm failed in get_augeas");
+
+ for (int i=0; i < ncf->driver->augeas_xfm_size; i++) {
+ r = aug_set(aug, ncf->driver->augeas_xfm[i].path,
+ ncf->driver->augeas_xfm[i].value);
+ ERR_THROW(r < 0, ncf, EOTHER,
+ "transform setup failed to set %s",
+ ncf->driver->augeas_xfm[i].path);
+ }
+ r = aug_load(aug);
+ ERR_THROW(r < 0, ncf, EOTHER, "failed to load config files");
+
+ /* FIXME: we need to produce _much_ better diagnostics here - need
+ * to analyze what came back in /augeas//error; ultimately, we need
+ * to understand whether this is harmless or a real error. For real
+ * errors, we need to return an error.
+ */
+ r = aug_match(aug, "/augeas//error", NULL);
+ if (r > 0) {
+ fprintf(stderr, "warning: augeas initialization had errors\n");
+ fprintf(stderr, "please file a bug with the following lines in the bug
report:\n");
+ aug_print(aug, stderr, "/augeas//error");
+ }
+ } else {
+ if (ncf->driver->load_augeas) {
+ struct augeas *aug = ncf->driver->augeas;
+ /* Undefine all our variables to work around bug 79 in Augeas */
+ aug_defvar(aug, "iptables", NULL);
+ aug_defvar(aug, "fw", NULL);
+ aug_defvar(aug, "fw_custom", NULL);
+ aug_defvar(aug, "ipt_filter", NULL);
+
+ r = aug_load(ncf->driver->augeas);
+ ERR_THROW(r < 0, ncf, EOTHER, "failed to reload config files");
+ ncf->driver->load_augeas = 0;
+ }
+ }
+ return ncf->driver->augeas;
+ error:
+ aug_close(ncf->driver->augeas);
+ ncf->driver->augeas = NULL;
+ return NULL;
+}
+
+int aug_submatch(struct netcf *ncf, const char *p1,
+ const char *p2, char ***matches) {
+ struct augeas *aug = get_augeas(ncf);
+ char *path = NULL;
+ int r;
+
+ r = xasprintf(&path, "%s/%s", p1, p2);
+ ERR_COND_BAIL(r < 0, ncf, EOTHER);
+
+ r = aug_match(aug, path, matches);
+ ERR_COND_BAIL(r < 0, ncf, EOTHER);
+
+ free(path);
+ return r;
+ error:
+ free(path);
+ return -1;
+}
+
void free_matches(int nint, char ***intf) {
if (*intf != NULL) {
for (int i=0; i < nint; i++)
diff --git a/src/dutil.h b/src/dutil.h
index e5ec383..8f6f293 100644
--- a/src/dutil.h
+++ b/src/dutil.h
@@ -33,11 +33,25 @@ struct driver {
xmlRelaxNGPtr rng;
int ioctl_fd;
unsigned int load_augeas : 1;
+ unsigned int augeas_xfm_size;
+ const struct augeas_pv *augeas_xfm;
+};
+
+struct augeas_pv {
+ const char *const path;
+ const char *const value;
};
/* Like asprintf, but set *STRP to NULL on error */
int xasprintf(char **strp, const char *format, ...);
+/* Get or create the augeas instance from @ncf */
+struct augeas *get_augeas(struct netcf *ncf);
+
+/* Like aug_match, but match @p1/@p2 */
+int aug_submatch(struct netcf *ncf, const char *p1,
+ const char *p2, char ***matches);
+
/* Free matches from aug_match (or aug_submatch) */
void free_matches(int nint, char ***intf);
--
1.6.2
10:32 a.m.
New subject: [PATCH 3/3] Introducing Linux-specific utility functions for MAC address lookup
Created dutil_linux.c:
* aug_match_mac - similarly to aug_match, write the interface name that
have a given MAC address to a freeable char*-array.
* aug_get_mac - similarly to aug_get, write the MAC address to a char*.
Changed drv_initscripts.c:
* Make use of aug_match_mac and aug_get_mac
---
src/Makefile.am | 2 +-
src/drv_initscripts.c | 25 ++---------
src/dutil_linux.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++
src/dutil_linux.h | 42 +++++++++++++++++++
4 files changed, 153 insertions(+), 21 deletions(-)
create mode 100644 src/dutil_linux.c
create mode 100644 src/dutil_linux.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 58f5d7c..f481adf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ EXTRA_DIST = netcf_public.syms \
netcf_private.syms
if NETCF_DRIVER_INITSCRIPTS
-DRIVER_SOURCES = drv_initscripts.c dutil.c
+DRIVER_SOURCES = drv_initscripts.c dutil.c dutil_linux.c
endif
BUILT_SOURCES = datadir.h netcf.syms
diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
index 7aba42d..6751290 100644
--- a/src/drv_initscripts.c
+++ b/src/drv_initscripts.c
@@ -35,6 +35,7 @@
#include "ref.h"
#include "list.h"
#include "dutil.h"
+#include "dutil_linux.h"
#include <libxml/parser.h>
#include <libxml/relaxng.h>
@@ -794,11 +795,7 @@ int drv_lookup_by_mac_string(struct netcf *ncf, const char *mac,
aug = get_augeas(ncf);
ERR_BAIL(ncf);
- r = xasprintf(&path,
- "/files/sys/class/net/*[address/content = '%s']",
mac);
- ERR_COND_BAIL(r < 0, ncf, ENOMEM);
-
- nmatches = aug_match(aug, path, &matches);
+ nmatches = aug_match_mac(ncf, mac, &matches);
ERR_THROW(nmatches < 0, ncf, EOTHER, "looking up %s failed", mac);
if (nmatches == 0) {
result = 0;
@@ -810,15 +807,11 @@ int drv_lookup_by_mac_string(struct netcf *ncf, const char *mac,
int cnt = 0;
for (int i = 0; i < nmatches; i++) {
- const char *n = strrchr(matches[i], '/');
- ERR_THROW(n == NULL, ncf, EINTERNAL, "missing / in sysfs path");
- n += 1;
-
- r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path, n);
+ r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path,
matches[i]);
ERR_COND_BAIL(r < 0, ncf, ENOMEM);
if (! is_slave(ncf, ifcfg))
- names[cnt++] = n;
+ names[cnt++] = matches[i];
FREE(ifcfg);
}
for (int i=0; i < cnt && i < maxifaces; i++) {
@@ -843,19 +836,11 @@ int drv_lookup_by_mac_string(struct netcf *ncf, const char *mac,
const char *drv_mac_string(struct netcf_if *nif) {
struct netcf *ncf = nif->ncf;
- struct augeas *aug = NULL;
const char *mac;
char *path = NULL;
int r;
- aug = get_augeas(ncf);
- ERR_BAIL(ncf);
-
- r = xasprintf(&path, "/files/sys/class/net/%s/address/content",
- nif->name);
- ERR_COND_BAIL(r < 0, ncf, ENOMEM);
-
- r = aug_get(aug, path, &mac);
+ r = aug_get_mac(ncf, nif->name, &mac);
ERR_THROW(r <= 0, ncf, EOTHER, "could not lookup MAC of %s",
nif->name);
if (nif->mac == NULL || STRNEQ(nif->mac, mac)) {
diff --git a/src/dutil_linux.c b/src/dutil_linux.c
new file mode 100644
index 0000000..b229547
--- /dev/null
+++ b/src/dutil_linux.c
@@ -0,0 +1,105 @@
+/*
+ * dutil_linux.c: Linux utility functions for driver backends.
+ *
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: David Lutterkort <lutter(a)redhat.com>
+ */
+
+#include <config.h>
+#include <internal.h>
+
+#include <augeas.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+
+#include "safe-alloc.h"
+#include "ref.h"
+#include "list.h"
+#include "netcf.h"
+#include "dutil.h"
+#include "dutil_linux.h"
+
+/* Returns a list of all interfaces with MAC address @intf */
+int aug_match_mac(struct netcf *ncf, const char *mac, char ***matches) {
+ int r, nmatches;
+ char *path;
+ struct augeas *aug = get_augeas(ncf);
+
+ r = xasprintf(&path,
+ "/files/sys/class/net/*[address/content = '%s']", mac);
+ ERR_COND_BAIL(r < 0, ncf, ENOMEM);
+
+ r = aug_match(aug, path, matches);
+ /* Messages for a aug_match-fail are handled outside this function */
+ if (r < 0)
+ goto error;
+
+ nmatches = r;
+ r = -1;
+ for (int i = 0; i < nmatches; i++) {
+ char *n = strrchr((*matches)[i], '/');
+ ERR_THROW(n == NULL, ncf, EINTERNAL, "missing / in sysfs path");
+ n += 1;
+
+ /* Replace with freeable copy */
+ n = strdup(n);
+ ERR_COND_BAIL(n == NULL, ncf, ENOMEM);
+
+ free((*matches)[i]);
+ (*matches)[i] = n;
+ }
+
+ return nmatches;
+
+ error:
+ FREE(path);
+ return r;
+}
+
+/* Get the MAC address of the interface @intf */
+int aug_get_mac(struct netcf *ncf, const char *intf, const char **mac) {
+ int r;
+ char *path;
+ struct augeas *aug = get_augeas(ncf);
+
+ r = xasprintf(&path, "/files/sys/class/net/%s/address/content", intf);
+ ERR_COND_BAIL(r < 0, ncf, ENOMEM);
+
+ r = aug_get(aug, path, mac);
+ /* Messages for a aug_match-fail are handled outside this function */
+
+ /* fallthrough intentional */
+ error:
+ FREE(path);
+ return r;
+}
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */
+/* vim: set ts=4 sw=4 et: */
diff --git a/src/dutil_linux.h b/src/dutil_linux.h
new file mode 100644
index 0000000..14b71ff
--- /dev/null
+++ b/src/dutil_linux.h
@@ -0,0 +1,42 @@
+/*
+ * dutil_linux.h: Linux utility functions for driver backends.
+ *
+ * Copyright (C) 2009 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: David Lutterkort <lutter(a)redhat.com>
+ */
+
+#ifndef DUTIL_LINUX_H_
+#define DUTIL_LINUX_H_
+
+/* Returns a list of all interfaces with MAC address @intf */
+int aug_match_mac(struct netcf *ncf, const char *mac, char ***matches);
+
+/* Get the MAC address of the interface @intf */
+int aug_get_mac(struct netcf *ncf, const char *intf, const char **mac);
+
+#endif
+
+/*
+ * Local variables:
+ * indent-tabs-mode: nil
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */
+/* vim: set ts=4 sw=4 et: */
--
1.6.2
11:25 a.m.
New subject: [PATCH 3/3] Introducing Linux-specific utility functions for MAC address lookup
On Fri, 2009-07-17 at 17:32 +0200, Jonas Eriksson wrote:
Created dutil_linux.c:
* aug_match_mac - similarly to aug_match, write the interface name that
have a given MAC address to a freeable char*-array.
* aug_get_mac - similarly to aug_get, write the MAC address to a char*.
Changed drv_initscripts.c:
* Make use of aug_match_mac and aug_get_mac
ACK, looks good.
David
1:44 a.m.
New subject: [PATCH 2/3] Move get_augeas and aug_submatch to dutil.c
Well, this was not the best commit message of all times, never
mind the two first sentences with basically the same message..
Anyway, the problem was that the [n][2]-array could not be
included in a struct (as a **), as it apparently was stored as a
[n*2] array (I would not bet on the portability of accessing it
as such), and as it could not be casted to a [][2]-array.
The reason for including it in a struct was to make get_augeas
callable from outside drv_*.c.
Regards,
Jonas
On Fri, Jul 17, 2009 at 05:32:43PM +0200 Jonas Eriksson wrote:
In order to include augeas_xfm in the driver struct, the type of
augeas_xfm had
to be reworked to a struct array. The inclusion of augeas_xfm in the driver
struct was necessary in order to move get_augeas and aug_submatch from
drv_initscripts.c to dutil.c. This also prepares for future utility functions
operating on the augeas instance.
---
src/drv_initscripts.c | 85 ++-----------------------------------------------
src/dutil.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++
src/dutil.h | 14 ++++++++
3 files changed, 99 insertions(+), 82 deletions(-)
diff --git a/src/drv_initscripts.c b/src/drv_initscripts.c
index d51ac97..7aba42d 100644
--- a/src/drv_initscripts.c
+++ b/src/drv_initscripts.c
@@ -47,7 +47,7 @@ static const char *const ifcfg_path =
"/files/etc/sysconfig/network-scripts/*";
/* Augeas should only load the files we are interested in */
-static const char *const augeas_xfm[][2] = {
+static const struct augeas_pv augeas_xfm[] = {
/* Ifcfg files */
{ "/augeas/load/Ifcfg/lens", "Shellvars.lns" },
{ "/augeas/load/Ifcfg/incl",
@@ -90,68 +90,6 @@ static const char *const subif_paths[] = {
"MASTER", "BRIDGE"
};
-/* Get the Augeas instance; if we already initialized it, just return
- * it. Otherwise, create a new one and return that.
- */
-static struct augeas *get_augeas(struct netcf *ncf) {
- int r;
-
- if (ncf->driver->augeas == NULL) {
- struct augeas *aug;
- char *path;
-
- r = xasprintf(&path, "%s/lenses", ncf->data_dir);
- ERR_COND_BAIL(r < 0, ncf, ENOMEM);
-
- aug = aug_init(ncf->root, path, AUG_NO_MODL_AUTOLOAD);
- FREE(path);
- ERR_THROW(aug == NULL, ncf, EOTHER, "aug_init failed");
- ncf->driver->augeas = aug;
- /* Only look at a few config files */
- r = aug_rm(aug, "/augeas/load/*");
- ERR_THROW(r < 0, ncf, EOTHER, "aug_rm failed in get_augeas");
-
- for (int i=0; i < ARRAY_CARDINALITY(augeas_xfm); i++) {
- r = aug_set(aug, augeas_xfm[i][0], augeas_xfm[i][1]);
- ERR_THROW(r < 0, ncf, EOTHER,
- "transform setup failed to set %s",
- augeas_xfm[i][0]);
- }
- r = aug_load(aug);
- ERR_THROW(r < 0, ncf, EOTHER, "failed to load config files");
-
- /* FIXME: we need to produce _much_ better diagnostics here - need
- * to analyze what came back in /augeas//error; ultimately, we need
- * to understand whether this is harmless or a real error. For real
- * errors, we need to return an error.
- */
- r = aug_match(aug, "/augeas//error", NULL);
- if (r > 0) {
- fprintf(stderr, "warning: augeas initialization had errors\n");
- fprintf(stderr, "please file a bug with the following lines in the bug
report:\n");
- aug_print(aug, stderr, "/augeas//error");
- }
- } else {
- if (ncf->driver->load_augeas) {
- struct augeas *aug = ncf->driver->augeas;
- /* Undefine all our variables to work around bug 79 in Augeas */
- aug_defvar(aug, "iptables", NULL);
- aug_defvar(aug, "fw", NULL);
- aug_defvar(aug, "fw_custom", NULL);
- aug_defvar(aug, "ipt_filter", NULL);
-
- r = aug_load(ncf->driver->augeas);
- ERR_THROW(r < 0, ncf, EOTHER, "failed to reload config
files");
- ncf->driver->load_augeas = 0;
- }
- }
- return ncf->driver->augeas;
- error:
- aug_close(ncf->driver->augeas);
- ncf->driver->augeas = NULL;
- return NULL;
-}
-
ATTRIBUTE_FORMAT(printf, 4, 5)
static int defnode(struct netcf *ncf, const char *name, const char *value,
const char *format, ...) {
@@ -176,25 +114,6 @@ static int defnode(struct netcf *ncf, const char *name, const char
*value,
return (r < 0) ? -1 : created;
}
-static int aug_submatch(struct netcf *ncf, const char *p1,
- const char *p2, char ***matches) {
- struct augeas *aug = get_augeas(ncf);
- char *path = NULL;
- int r;
-
- r = xasprintf(&path, "%s/%s", p1, p2);
- ERR_COND_BAIL(r < 0, ncf, EOTHER);
-
- r = aug_match(aug, path, matches);
- ERR_COND_BAIL(r < 0, ncf, EOTHER);
-
- free(path);
- return r;
- error:
- free(path);
- return -1;
-}
-
static int is_slave(struct netcf *ncf, const char *intf) {
for (int s = 0; s < ARRAY_CARDINALITY(subif_paths); s++) {
int r;
@@ -355,6 +274,8 @@ int drv_init(struct netcf *ncf) {
return -1;
ncf->driver->ioctl_fd = -1;
+ ncf->driver->augeas_xfm_size = ARRAY_CARDINALITY(augeas_xfm);
+ ncf->driver->augeas_xfm = augeas_xfm;
// FIXME: Check for errors
xsltInit();
diff --git a/src/dutil.c b/src/dutil.c
index c15bfbc..d0cdb22 100644
--- a/src/dutil.c
+++ b/src/dutil.c
@@ -62,6 +62,88 @@ int xasprintf(char **strp, const char *format, ...) {
return result;
}
+/* Get the Augeas instance; if we already initialized it, just return
+ * it. Otherwise, create a new one and return that.
+ */
+struct augeas *get_augeas(struct netcf *ncf) {
+ int r;
+
+ if (ncf->driver->augeas == NULL) {
+ struct augeas *aug;
+ char *path;
+
+ r = xasprintf(&path, "%s/lenses", ncf->data_dir);
+ ERR_COND_BAIL(r < 0, ncf, ENOMEM);
+
+ aug = aug_init(ncf->root, path, AUG_NO_MODL_AUTOLOAD);
+ FREE(path);
+ ERR_THROW(aug == NULL, ncf, EOTHER, "aug_init failed");
+ ncf->driver->augeas = aug;
+ /* Only look at a few config files */
+ r = aug_rm(aug, "/augeas/load/*");
+ ERR_THROW(r < 0, ncf, EOTHER, "aug_rm failed in get_augeas");
+
+ for (int i=0; i < ncf->driver->augeas_xfm_size; i++) {
+ r = aug_set(aug, ncf->driver->augeas_xfm[i].path,
+ ncf->driver->augeas_xfm[i].value);
+ ERR_THROW(r < 0, ncf, EOTHER,
+ "transform setup failed to set %s",
+ ncf->driver->augeas_xfm[i].path);
+ }
+ r = aug_load(aug);
+ ERR_THROW(r < 0, ncf, EOTHER, "failed to load config files");
+
+ /* FIXME: we need to produce _much_ better diagnostics here - need
+ * to analyze what came back in /augeas//error; ultimately, we need
+ * to understand whether this is harmless or a real error. For real
+ * errors, we need to return an error.
+ */
+ r = aug_match(aug, "/augeas//error", NULL);
+ if (r > 0) {
+ fprintf(stderr, "warning: augeas initialization had errors\n");
+ fprintf(stderr, "please file a bug with the following lines in the bug
report:\n");
+ aug_print(aug, stderr, "/augeas//error");
+ }
+ } else {
+ if (ncf->driver->load_augeas) {
+ struct augeas *aug = ncf->driver->augeas;
+ /* Undefine all our variables to work around bug 79 in Augeas */
+ aug_defvar(aug, "iptables", NULL);
+ aug_defvar(aug, "fw", NULL);
+ aug_defvar(aug, "fw_custom", NULL);
+ aug_defvar(aug, "ipt_filter", NULL);
+
+ r = aug_load(ncf->driver->augeas);
+ ERR_THROW(r < 0, ncf, EOTHER, "failed to reload config
files");
+ ncf->driver->load_augeas = 0;
+ }
+ }
+ return ncf->driver->augeas;
+ error:
+ aug_close(ncf->driver->augeas);
+ ncf->driver->augeas = NULL;
+ return NULL;
+}
+
+int aug_submatch(struct netcf *ncf, const char *p1,
+ const char *p2, char ***matches) {
+ struct augeas *aug = get_augeas(ncf);
+ char *path = NULL;
+ int r;
+
+ r = xasprintf(&path, "%s/%s", p1, p2);
+ ERR_COND_BAIL(r < 0, ncf, EOTHER);
+
+ r = aug_match(aug, path, matches);
+ ERR_COND_BAIL(r < 0, ncf, EOTHER);
+
+ free(path);
+ return r;
+ error:
+ free(path);
+ return -1;
+}
+
void free_matches(int nint, char ***intf) {
if (*intf != NULL) {
for (int i=0; i < nint; i++)
diff --git a/src/dutil.h b/src/dutil.h
index e5ec383..8f6f293 100644
--- a/src/dutil.h
+++ b/src/dutil.h
@@ -33,11 +33,25 @@ struct driver {
xmlRelaxNGPtr rng;
int ioctl_fd;
unsigned int load_augeas : 1;
+ unsigned int augeas_xfm_size;
+ const struct augeas_pv *augeas_xfm;
+};
+
+struct augeas_pv {
+ const char *const path;
+ const char *const value;
};
/* Like asprintf, but set *STRP to NULL on error */
int xasprintf(char **strp, const char *format, ...);
+/* Get or create the augeas instance from @ncf */
+struct augeas *get_augeas(struct netcf *ncf);
+
+/* Like aug_match, but match @p1/@p2 */
+int aug_submatch(struct netcf *ncf, const char *p1,
+ const char *p2, char ***matches);
+
/* Free matches from aug_match (or aug_submatch) */
void free_matches(int nint, char ***intf);
--
1.6.2
--
Jonas Eriksson
Consultant at AS/EAB/FLJ/IL
Phone: +46 8 58086281
Combitech AB
Älvsjö, Sweden
11:12 a.m.
New subject: [PATCH 2/3] Move get_augeas and aug_submatch to dutil.c
On Fri, 2009-07-17 at 17:32 +0200, Jonas Eriksson wrote:
In order to include augeas_xfm in the driver struct, the type of
augeas_xfm had
to be reworked to a struct array. The inclusion of augeas_xfm in the driver
struct was necessary in order to move get_augeas and aug_submatch from
drv_initscripts.c to dutil.c. This also prepares for future utility functions
operating on the augeas instance.
ACK.
David
11:05 a.m.
New subject: [PATCH 1/3] Move all general functions to dutil.c
On Fri, 2009-07-17 at 17:32 +0200, Jonas Eriksson wrote:
All functions that can be moved from drv_initscript.c without needing
any large
code changes are moved to dutil.{c/h}.
This all looks good, though I'd prefer calling _drv_get_aug and
_drv_put_aug something like util_get_aug etc. If you are fine with that,
I'll make that small change to your patch and commit.
David
11:09 a.m.
New subject: [PATCH 1/3] Move all general functions to dutil.c
On Wed, Jul 22, 2009 at 04:05:59PM +0000 David Lutterkort wrote:
On Fri, 2009-07-17 at 17:32 +0200, Jonas Eriksson wrote:
> All functions that can be moved from drv_initscript.c without needing any large
> code changes are moved to dutil.{c/h}.
This all looks good, though I'd prefer calling _drv_get_aug and
_drv_put_aug something like util_get_aug etc. If you are fine with that,
I'll make that small change to your patch and commit.
No problem, I was unsure about the first naming scheme myself.
/Jonas
--
Jonas Eriksson
Consultant at AS/EAB/FLJ/IL
Combitech AB
Älvsjö, Sweden
11:33 p.m.
I pushed these now with some minor changes:
* rename -drv_get_aug and _drv_put_aug to dutil_get_aug and
dutil_put_aug
* in comments, instead of @var write VAR
David
5398
days inactive
5404
days old
netcf-devel@lists.fedorahosted.org
9 comments
2 participants
participants (2)
-
David Lutterkort -
Jonas Eriksson