gmane.comp.sysutils.netcf.devel

[PATCH 4/5] Wow, it compiles and everything.

Sean Bruno — 2012-05-18T16:38:53

---
 src/Makefile.am   |    2 +-
 src/drv_fbsd.c    |   94 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/dutil_fbsd.c  |   27 ---------------
 src/dutil_fbsd.h  |   40 +++++++++--------------
 src/dutil_linux.c |   73 +++++++++++++++++++++++++++++++++--------
 5 files changed, 171 insertions(+), 65 deletions(-)
 delete mode 100644 src/dutil_fbsd.c

diff --git a/src/Makefile.am b/src/Makefile.am
index e431eff..81aaadc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
< at >< at > -16,7 +16,7 < at >< at > noinst_PROGRAMS = ncftransform
 endif
 
 DRIVER_SOURCES_COMMON = dutil.h dutil.c
-DRIVER_SOURCES_FBSD = dutil_fbsd.h dutil_fbsd.c drv_fbsd.c
+DRIVER_SOURCES_FBSD = dutil_fbsd.h drv_fbsd.c
 DRIVER_SOURCES_LINUX = dutil_linux.h dutil_linux.c
 DRIVER_SOURCES_MSWINDOWS = dutil_mswindows.h dutil_mswindows.c drv_mswindows.c
 DRIVER_SOURCES_REDHAT = drv_redhat.c
diff --git a/src/drv_fbsd.c b/src/drv_fbsd.c
index 1b3bb87..0ae2b8e 100644
--- a/src/drv_fbsd.c
+++ b/src/drv_fbsd.c
< at >< at > -59,6 +59,32 < at >< at > void drv_close(struct netc

[PATCH 0/5] Initial FreeBSD Support Patches

Sean Bruno — 2012-05-18T16:38:49

Its round 1 of our patchsets here in FreeBSD land.  This more or less
stubs out the code for FreeBSD support.  We will flush out that code in
following patchsets.

_______________________________________________
netcf-devel mailing list
netcf-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/netcf-devel

[PATCH 2/5] More modifications to detect freebsd

Sean Bruno — 2012-05-18T16:38:51

---
 .gitignore      |   10 +-
 INSTALL         |  365 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac    |    9 +-
 src/Makefile.am |    7 ++
 src/drv_fbsd.c  |   71 +----------
 5 files changed, 392 insertions(+), 70 deletions(-)
 create mode 100644 INSTALL

diff --git a/.gitignore b/.gitignore
index 91b3a7c..d46b950 100644
--- a/.gitignore
+++ b/.gitignore
< at >< at > -8,16 +8,16 < at >< at >
 *.pdf
 *.spec
 *~
-/.git-module-status
 .deps/
 .libs/
-/build-aux
+/.git-module-status
 /ChangeLog
-Makefile
-Makefile.in
 /TAGS
 /aclocal.m4
 /autom4te.cache/
+/build-aux
+Makefile
+Makefile.in
 build/
 config.guess
 config.h
< at >< at > -43,3 +43,5 < at >< at > stamp-h1
 tests/test-debian
 tests/test-redhat
 ylwrap
+/GNUmakefile
+/maint.mk
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..7d1c323
--- /dev/null
+++ b/INSTALL
< at >< at > -0,0 +1,365 < at >< at >
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation

[PATCH 5/5] More cleanup, remove some more functions,quiesce a lot of errors. Now the fun can begin

Sean Bruno — 2012-05-18T16:38:54

---
 src/drv_fbsd.c   |   15 ++++++---------
 src/dutil_fbsd.h |    9 +++++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/drv_fbsd.c b/src/drv_fbsd.c
index 0ae2b8e..9770ed0 100644
--- a/src/drv_fbsd.c
+++ b/src/drv_fbsd.c
< at >< at > -72,8 +72,8 < at >< at > static int list_interfaces(struct netcf *ncf, char ***intf) {
 
     /* Look for all interfaces */
     hackery = popen("r+","ifconfig|grep flags|awk '{print $1}'|wc -l"); // HACKERY
-read(&nint, sizeof(nint), 1, hackery);
-printf ("nint == %d\n");
+fread(&nint, sizeof(nint), 1, hackery);
+printf ("nint == %d\n", nint);
 pclose(hackery);
     ERR_BAIL(ncf);
     result = nint;
< at >< at > -144,8 +144,8 < at >< at > int drv_num_of_interfaces(struct netcf *ncf, unsigned int flags) {
 
 
 struct netcf_if *drv_lookup_by_name(struct netcf *ncf, const char *name) {
-int result;
 
+    printf("%s: attempted to lookup %s\n", __func__, name);
     ERR_THROW(1 == 1, ncf, EOTHER, "not implemented on this platform");
 error:
     return NULL;
< at >< at > -175,11 +175,10 < at >< at > error:

[PATCH 3/5] Objects now build,need to replace libnl calls with freebsdisms

Sean Bruno — 2012-05-18T16:38:52

---
 src/Makefile.am   |    1 +
 src/drv_fbsd.c    |  135 +++++++++++++++++++++++++++++++++++++++++++++++++----
 src/dutil_linux.c |   28 +++++++++++
 src/dutil_linux.h |    2 +
 4 files changed, 156 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 484ba97..e431eff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
< at >< at > -60,6 +60,7 < at >< at > endif
 if NETCF_DRIVER_FBSD
 DRIVER_SOURCES = \
 $(DRIVER_SOURCES_COMMON) \
+$(DRIVER_SOURCES_LINUX) \
 $(DRIVER_SOURCES_FBSD)
 endif
 
diff --git a/src/drv_fbsd.c b/src/drv_fbsd.c
index 7fd3025..1b3bb87 100644
--- a/src/drv_fbsd.c
+++ b/src/drv_fbsd.c
< at >< at > -1,9 +1,34 < at >< at >
 /*
+ * Copyright (c) 2012, Sean Bruno sbruno< at >freebsd.org
+ * All rights reserved.
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+

[PATCH 1/5] initial checkin to fix configure andautomake/build stuffs on fbsd

Sean Bruno — 2012-05-18T16:38:50

---
 src/drv_fbsd.c   |  176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/dutil_fbsd.c |   27 +++++++++
 src/dutil_fbsd.h |   30 ++++++++++
 3 files changed, 233 insertions(+)
 create mode 100644 src/drv_fbsd.c
 create mode 100644 src/dutil_fbsd.c
 create mode 100644 src/dutil_fbsd.h

diff --git a/src/drv_fbsd.c b/src/drv_fbsd.c
new file mode 100644
index 0000000..64b0e98
--- /dev/null
+++ b/src/drv_fbsd.c
< at >< at > -0,0 +1,176 < at >< at >
+/*
+ */
+
+#include <config.h>
+#include <internal.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <spawn.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "safe-alloc.h"
+#include "ref.h"
+#include "list.h"
+#include "dutil.h"
+#include "dutil_fbsd.h"
+
+int drv_init(struct netcf *ncf) {
+    return 0;
+}
+
+
+void drv_close(struct netcf *ncf) {
+    if (ncf == NULL || ncf->driver == NULL)
+        return;
+    FREE(ncf->driver);
+}
+
+
+void drv_entry(struct netcf *ncf ATTRIBUTE_UNUSED) {
+}
+
+static PIP_ADAPTER_ADDRESSES build_adapter_table(struct netcf

Re: netcf patches for debian (v2)

Serge Hallyn — 2012-05-15T17:58:02

Quoting Laine Stump (laine< at >laine.org):

No, thanks - I don't have anything blocked right now.  Just so I can
plan, do you have an approximate idea when?

-serge
_______________________________________________
netcf-devel mailing list
netcf-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/netcf-devel

Re: [PATCH 3/3] define NETCF_TRANSACTION as false in debian

Serge Hallyn — 2012-05-15T17:55:48

Quoting Laine Stump (laine< at >laine.org):

Oh, yeah, oops :)


Great, thanks Laine.

-serge
_______________________________________________
netcf-devel mailing list
netcf-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/netcf-devel

Re: netcf patches for debian (v2)

Laine Stump — 2012-05-15T17:00:13

I just pushed this series (including the libnl3 support).

I'm going to see if there are some other things I can clean up quickly
before doing another release. If lack of a release with these patches is
blocking something for you, please let me know and I'll do a release
now, then another later after I make other changes.
_______________________________________________
netcf-devel mailing list
netcf-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/netcf-devel

Re: [PATCH 3/3] define NETCF_TRANSACTION as false in debian

Laine Stump — 2012-05-15T16:42:41

No. I'm getting ready to push them all right now. My system is having
some trouble building, though (unrelated to your patches).


You mean 0.2.0? :-)

Yes, I'm going to try to do a release soon. I've been distracted away
from this for far too long...

_______________________________________________
netcf-devel mailing list
netcf-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/netcf-devel

Re: [PATCH] Add bundled(gnulib) to RPM specfile

Daniel P. Berrange — 2012-05-15T15:28:11

ACK


Daniel

Re: [PATCH 3/3] define NETCF_TRANSACTION as false in debian

Serge E. Hallyn — 2012-05-15T16:26:48

Quoting Daniel P. Berrange (berrange< at >redhat.com):

Thanks, Daniel.  I don't see these in the git tree yet.  Should I
be re-sending?

Also, will there be a new (2.0) release soon (hopefully after :)?

-serge
_______________________________________________
netcf-devel mailing list
netcf-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/netcf-devel

[PATCH] Add bundled(gnulib) to RPM specfile

Laine Stump — 2012-05-15T15:26:29

According to Fedora guidelines, because we bundle gnulib we
need to add a virtual Provides: bundled(gnulib).

https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Requirement_if_you_bundle
---
 netcf.spec.in |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/netcf.spec.in b/netcf.spec.in
index cec69c1..234561b 100644
--- a/netcf.spec.in
+++ b/netcf.spec.in
< at >< at > -14,6 +14,8 < at >< at > BuildRequires:  libxml2-devel libxslt-devel
 BuildRequires:  libnl-devel
 Requires:       %{name}-libs = %{version}-%{release}
 
+Provides: bundled(gnulib)
+
 %description
 Netcf is a library used to modify the network configuration of a
 system. Network configurations are expressed in a platform-independent

Re: Preparing for freebsd support pull request

Laine Stump — 2012-05-14T19:00:33

If, when you say "our repo", you mean a git repo that was initially
based from ours, then you can directly do git send-email from that.

Otherwise, here's a full synopsis of the steps that would give you
patches in the right format, while not messing up the "master" branch of
a checkout from the main repo:


   git clone git://git.fedorahosted.org/netcf.git
   cd netcf
   git checkout -b mybranch
   (make changes)
   git add [modified files]
   git commit (with useful commit log message)
   [repeat steps 4-6 as needed]
   git send email --compose -<number of patches>

(this way, you can later "git checkout master && git pull")
_______________________________________________
netcf-devel mailing list
netcf-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/netcf-devel

Re: Preparing for freebsd support pull request

Laine Stump — 2012-05-11T00:53:11

Pretty simple, really - just make sure your patches are on a local git
branch that's based off the fedorahosted master branch, and use git
send-email --compose -<# of patches>, giving the introductory message
the subject [PATCH 0/<# of patches>] <something descriptive> and a short
overview.

A series of small patches is much better than a single monolithic patch.
Especially - if you've done any refactoring of the existing code to make
your code fit in better, it would be better to put that first in a
separate patch (such that applying it would have 0 functional effect),
then your port-specific stuff in later patches.

_______________________________________________
netcf-devel mailing list
netcf-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/netcf-devel

Preparing for freebsd support pull request

Sean Bruno — 2012-05-11T00:07:25

So, Hiren and I are approaching our first milestone, where we think that
we're feature complete for freebsd.  We're working out a few details at
the moment, but its starting to look good.

In order for you guys to pull from us, what's the standard process for
us to follow such that you can review, accept(and/or reject) and pull
from our tree.

I assume there's some kind of "generate review-able patches" guidelines
we should follow to make your lives easy.

Sean


_______________________________________________
netcf-devel mailing list
netcf-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/netcf-devel

Re: [PATCH 4/3] support libnl-3 in addition to libnl-1

Daniel P. Berrange — 2012-04-30T18:32:41

ACK, that is alot smaller diff than I expected

Daniel

[PATCH 4/3] support libnl-3 in addition to libnl-1

Serge Hallyn — 2012-04-30T17:39:34

configure.ac:
If libnl-1 is not found, look for libnl-3, and (the also required)
libnl-route-3.

Makefile.am:
Add cflags and libs for libnl-3 and libnl-route-3

dutil_linux.{c,h}:
Switch the libnl calls over to new api if HAVE_LINBNL3.  Also do
not include <net/if.h> in that case, because <linux/if.h> is
included from the libnl3 include files, and can conflict with net/if.h.

Signed-off-by: Serge Hallyn <serge.hallyn< at >canonical.com>
---
 configure.ac      |    6 +++++-
 src/Makefile.am   |   10 ++++++----
 src/dutil_linux.c |   25 +++++++++++++++++++++++++
 src/dutil_linux.h |    4 ++++
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6705a0d..41dd49d 100644
--- a/configure.ac
+++ b/configure.ac
< at >< at > -103,7 +103,11 < at >< at > AM_CONDITIONAL([NETCF_INIT_SCRIPT_RED_HAT],
 if test "x$with_driver" != "xmswindows"
 then
     PKG_CHECK_MODULES([LIBAUGEAS], [augeas >= 0.5.0])
-    PKG_CHECK_MODULES([LIBNL], [libnl-1])
+    PKG_CHECK_MODULES([LIBNL], [libnl-1],
+       [AC_DEFI

Re: [PATCH 3/3] define NETCF_TRANSACTION as false in debian

Daniel P. Berrange — 2012-04-30T08:26:05

ACK

Daniel

Re: [PATCH 2/3] add debian-{get,put}.xsl to Makefile

Daniel P. Berrange — 2012-04-30T08:25:51

ACK


Daniel

Re: [PATCH 1/3] find ifup/ifdown in configure.ac and use in drv-debian

Daniel P. Berrange — 2012-04-30T08:25:36

ACK

Daniel