From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCYTO-0001Lz-7p for qemu-devel@nongnu.org; Mon, 04 Mar 2013 11:42:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCYTJ-00089D-44 for qemu-devel@nongnu.org; Mon, 04 Mar 2013 11:42:46 -0500 Received: from e9.ny.us.ibm.com ([32.97.182.139]:58056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCYTI-000893-Vw for qemu-devel@nongnu.org; Mon, 04 Mar 2013 11:42:41 -0500 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 Mar 2013 11:41:07 -0500 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id CDABBC9007B for ; Mon, 4 Mar 2013 11:41:01 -0500 (EST) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r24Gf1Ds295200 for ; Mon, 4 Mar 2013 11:41:01 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r24Gf0ME016220 for ; Mon, 4 Mar 2013 13:41:00 -0300 Message-ID: <5134CE99.9000607@linux.vnet.ibm.com> Date: Mon, 04 Mar 2013 11:40:57 -0500 From: Corey Bryant MIME-Version: 1.0 References: <1361757620-23318-1-git-send-email-cardoe@cardoe.com> <1362207528-27804-1-git-send-email-cardoe@cardoe.com> <1362207528-27804-3-git-send-email-cardoe@cardoe.com> In-Reply-To: <1362207528-27804-3-git-send-email-cardoe@cardoe.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv2 2/2] bridge helper: support conf dirs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Doug Goldstein Cc: Richa Marwaha , Anthony Liguori , qemu-devel@nongnu.org On 03/02/2013 01:58 AM, Doug Goldstein wrote: > Allow the bridge helper to take a config directory rather than having to > specify every file in the directory manually via an include statement. > > Signed-off-by: Doug Goldstein > CC: Anthony Liguori > CC: Richa Marwaha > CC: Corey Bryant > TO: qemu-devel@nongnu.org > --- > qemu-bridge-helper.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 55 insertions(+) > > diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c > index ee67740..39d343c 100644 > --- a/qemu-bridge-helper.c > +++ b/qemu-bridge-helper.c > @@ -16,6 +16,7 @@ > #include "config-host.h" > > #include > +#include > #include > #include > #include > @@ -70,12 +71,27 @@ static void usage(void) > "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n"); > } > > +static int filter_bridge_conf_dir(const struct dirent *entry) > +{ > + ssize_t len = strlen(entry->d_name); > + > + /* We only want files ending in .conf */ > + if (len > 5 && > + strcmp(".conf", &entry->d_name[len-5]) == 0) > + return 1; QEMU prefers braces on single statement blocks. Check out the CODING_STYLE file. Also you'll want to run scripts/checkpatch.pl against your patches and make sure it's not flagging any issues. It'll catch things like this. > + > + return 0; > +} > + > static int parse_acl_file(const char *filename, ACLList *acl_list) > { > FILE *f; > char line[4096]; > int ret = -EINVAL; > ACLRule *acl_rule; > + struct dirent **include_list = NULL; > + int i, include_count = 0; > + char *conf_file; > > f = fopen(filename, "r"); > if (f == NULL) { > @@ -137,6 +153,37 @@ static int parse_acl_file(const char *filename, ACLList *acl_list) > snprintf(acl_rule->iface, IFNAMSIZ, "%s", arg); > } > QSIMPLEQ_INSERT_TAIL(acl_list, acl_rule, entry); > + } else if (strcmp(cmd, "includedir") == 0) { > + include_count = scandir(arg, &include_list, > + filter_bridge_conf_dir, alphasort); > + if (include_count < 0) { > + ret = -errno; > + fprintf(stderr, "Unable to retrieve conf files from '%s': %s\n", > + arg, strerror(errno)); > + goto failure; > + } > + > + for (i = 0; i < include_count; i++) { > + if (asprintf(&conf_file, "%s/%s", arg, > + include_list[i]->d_name) < 0) { > + fprintf(stderr, "Failed to allocate memory for " > + "file path: %s/%s\n", > + arg, include_list[i]->d_name); > + ret = -ENOMEM; > + goto failure; > + } > + > + /* ignore errors like 'include' cmd */ > + parse_acl_file(conf_file, acl_list); > + > + free(conf_file); > + free(include_list[i]); > + include_list[i] = NULL; > + } > + free(include_list); > + include_list = NULL; > + include_count = 0; > + > } else if (strcmp(cmd, "include") == 0) { > /* ignore errors */ > parse_acl_file(arg, acl_list); > @@ -152,6 +199,14 @@ static int parse_acl_file(const char *filename, ACLList *acl_list) > failure: > fclose(f); > > + if (include_list) { > + for (i = 0; i < include_count; i++) { > + if (include_list[i]) > + free(include_list[i]); Same comment here. > + } > + free(include_list); > + } > + > return ret; > } > -- Regards, Corey Bryant