Merge lp:~fahad-aizaz/hipl/hipd-relay-config into lp:hipl

[Fahad Aizaz]

Runtime generation for 'relay.conf' being removed. The configuration file content hard coded into HIP is removed and the configuration file is now distributed with HIPL package.

[Diego Biurrun (diego-biurrun)]

 review needs-info

On Tue, Dec 06, 2011 at 01:06:27PM +0000, Fahad Aizaz wrote:
> Fahad Aizaz has proposed merging lp:~fahad-aizaz/hipl/hipd-relay-config into lp:hipl with lp:~fahad-aizaz/hipl/hipd-init-conf as a prerequisite.

This merge request is not compatible with the previous one, as it
incorporates it completely. What are you trying to do?

> --- packaging/hipl.spec 2011-12-01 21:29:13 +0000
> +++ packaging/hipl.spec 2011-12-06 13:05:27 +0000
> @@ -154,6 +154,10 @@
> %{_sbindir}/pisacert
> %{_sbindir}/nsupdate.pl
> %{_initddir}/hipd
> +%config(noreplace) %{_sysconfdir}/hip/hipd.conf
> +%config(noreplace) %{_sysconfdir}/hip/hosts
> +%config(noreplace) %{_sysconfdir}/hip/nsupdate.conf
> +%config(noreplace) %{_sysconfdir}/hip/relay.conf

cf your other merge request

Diego

review: Needs Information

[Fahad Aizaz (fahad-aizaz)]

On 12/06/2011 11:43 PM, Diego Biurrun wrote:
> Review: Needs Information
>
> review needs-info
>
> On Tue, Dec 06, 2011 at 01:06:27PM +0000, Fahad Aizaz wrote:
>> Fahad Aizaz has proposed merging lp:~fahad-aizaz/hipl/hipd-relay-config into lp:hipl with lp:~fahad-aizaz/hipl/hipd-init-conf as a prerequisite.
>
> This merge request is not compatible with the previous one, as it
> incorporates it completely. What are you trying to do?
>
>> --- packaging/hipl.spec 2011-12-01 21:29:13 +0000
>> +++ packaging/hipl.spec 2011-12-06 13:05:27 +0000
>> @@ -154,6 +154,10 @@
>> %{_sbindir}/pisacert
>> %{_sbindir}/nsupdate.pl
>> %{_initddir}/hipd
>> +%config(noreplace) %{_sysconfdir}/hip/hipd.conf
>> +%config(noreplace) %{_sysconfdir}/hip/hosts
>> +%config(noreplace) %{_sysconfdir}/hip/nsupdate.conf
>> +%config(noreplace) %{_sysconfdir}/hip/relay.conf

Yes, you are right but I don't understand how this happened because I
created a branch of my other (the one proposed for merging) branch. And
made changed to it.

I don't understand why launchpad didn't start from where I committed my
previous changes.

Fahad

[Diego Biurrun (diego-biurrun)]

On Wed, Dec 07, 2011 at 03:04:23AM +0000, Fahad Aizaz wrote:
> On 12/06/2011 11:43 PM, Diego Biurrun wrote:
> > On Tue, Dec 06, 2011 at 01:06:27PM +0000, Fahad Aizaz wrote:
> >> Fahad Aizaz has proposed merging lp:~fahad-aizaz/hipl/hipd-relay-config into lp:hipl with lp:~fahad-aizaz/hipl/hipd-init-conf as a prerequisite.
> >
> > This merge request is not compatible with the previous one, as it
> > incorporates it completely. What are you trying to do?
>
> Yes, you are right but I don't understand how this happened because I
> created a branch of my other (the one proposed for merging) branch. And
> made changed to it.
>
> I don't understand why launchpad didn't start from where I committed my
> previous changes.

Because the merge proposal is for trunk, not for your other branch.
Thus what gets submitted is the diff to trunk, not to your other branch.

That said, I notice that launchpad did speak about branch prerequisites:

  Fahad Aizaz has proposed merging lp:~fahad-aizaz/hipl/hipd-relay-config
  into lp:hipl with lp:~fahad-aizaz/hipl/hipd-init-conf as a prerequisite.

Sometimes I long for git ...

Diego

[Diego Biurrun (diego-biurrun)]

 review approve

On Tue, Dec 06, 2011 at 01:06:27PM +0000, Fahad Aizaz wrote:
> Fahad Aizaz has proposed merging lp:~fahad-aizaz/hipl/hipd-relay-config into lp:hipl with lp:~fahad-aizaz/hipl/hipd-init-conf as a prerequisite.

So I am going to finally approve this, just note the change I mention
below and one more thing: The history of both your branches is confusing
and not particularly enlightening, so just squash this branch into one
commit and push that. See the '--forget-merges' parameter of bzr revert.

> --- hipd/hiprelay.c 2011-11-29 11:37:54 +0000
> +++ hipd/hiprelay.c 2011-12-06 13:05:27 +0000
> @@ -1401,23 +1340,10 @@
> "Unable to initialize HIP relay / RVS database.\n");
> HIP_IFEL(relwl_init(), -1,
> "Unable to initialize HIP relay / RVS whitelist.\n");
> -
> - if (relay_read_config() == -ENOENT) {
> - HIP_ERROR("The configuration file \"%s\" could not be read.\n"
> - "Trying to write a new configuration file from "
> - "scratch.\n", HIP_RELAY_CONFIG_FILE);
> - if (relay_write_config() == -ENOENT) {
> - HIP_ERROR("Could not create a configuration file "
> - "\"%s\".\n", HIP_RELAY_CONFIG_FILE);
> - } else {
> - HIP_DEBUG("Created a new configuration file \"%s\".\n",
> - HIP_RELAY_CONFIG_FILE);
> - }
> - } else {
> - HIP_DEBUG("Read configuration file \"%s\" successfully.\n",
> - HIP_RELAY_CONFIG_FILE);
> - }
> -
> + HIP_IFEL(relay_read_config(), -ENOENT,
> + "Loading configuration file failed.\n");
> + HIP_DEBUG("Read configuration file \"%s\" successfully.\n",
> + HIP_RELAY_CONFIG_FILE);
> out_err:
> if (hiprelay_wl == NULL) {
> relht_uninit();

Do not remove the empty line before the goto label.

Diego

review: Approve

[Miika Komu (miika-iki)]

Fine by me, good work!

review: Approve

[Fahad Aizaz (fahad-aizaz)]

On 12/07/2011 09:16 AM, Diego Biurrun wrote:
> Review: Approve

So I have been reading documentation about bazaar in relation to 'bzr
revert' with --forget-merges. Since the second branch contains changes
also from the first branch that I uploaded for review.

Okay, since I am not really confident with bazaar (still) and I don't
want to mess the main trunk, Is it okay that I merge the first
'approved' branch and then merge the second one. I am sure the way you
have suggested would be easier but I don't fully understand it and I am
short on time. (I have to push another branch related to firewall
configuration file)

So please let me know if this is fine.

regards
Fahad

[Diego Biurrun (diego-biurrun)]

On Fri, Dec 09, 2011 at 04:31:28AM +0000, Fahad Aizaz wrote:
> On 12/07/2011 09:16 AM, Diego Biurrun wrote:
> > Review: Approve
>
> So I have been reading documentation about bazaar in relation to 'bzr
> revert' with --forget-merges. Since the second branch contains changes
> also from the first branch that I uploaded for review.

The second branch does not "contain changes from" the first branch,
it is a strict superset.

> Okay, since I am not really confident with bazaar (still) and I don't
> want to mess the main trunk, Is it okay that I merge the first
> 'approved' branch and then merge the second one.

No.

Try the merge you propose (into a sandbox branch) and witness the result.
You will get a huge number of conflicts due to the related changes.

> I am sure the way you have suggested would be easier but I don't fully
> understand it and I am short on time.

I suggested two things:

1) Only merge the second branch.
2) Drop the history of the second branch.

How to do 1) and why it is easier should be obvious.

You can achieve 2) by

- merging hipd-relay-config into your trunk (or whatever) branch
- running "bzr revert --forget-merges" in that branch so that the
  changes remain, but the merged history is dropped
- committing all the changes and
- pushing the resulting commit to the central repository.

You should peruse the Bazaar manual some more. Here's a sensible
point to start:

http://doc.bazaar.canonical.com/bzr.2.4/en/user-guide/adv_merging.html

Diego

[Diego Biurrun (diego-biurrun)]

On Fri, Dec 09, 2011 at 03:58:46PM +0100, Diego Biurrun wrote:
> [... lengthy explanation that was ignored ...]

So I take the time to elaborate and explain how to merge this properly
and outline two alternative ways to go about this correctly that would
result in either a single merge or a single commit.

Instead of picking one of those two, you instead decide to split your
work arbitrarily and push seven commits, six of which are broken in
different ways and all of which have bad log messages.

Why?

Diego

[Fahad Aizaz (fahad-aizaz)]

On 12/12/2011 08:34 PM, Diego Biurrun wrote:
> On Fri, Dec 09, 2011 at 03:58:46PM +0100, Diego Biurrun wrote:
>> [... lengthy explanation that was ignored ...]
>
> So I take the time to elaborate and explain how to merge this properly
> and outline two alternative ways to go about this correctly that would
> result in either a single merge or a single commit.
>
> Instead of picking one of those two, you instead decide to split your
> work arbitrarily and push seven commits, six of which are broken in
> different ways and all of which have bad log messages.

1) Only merge the second branch.
2) Drop the history of the second branch.

- merging hipd-relay-config into your trunk (or whatever) branch
- running "bzr revert --forget-merges" in that branch so that the
   changes remain, but the merged history is dropped
- committing all the changes and
- pushing the resulting commit to the central repository.

I followed what you mentioned in your email.

1. I discarded the first branch.
2. Merged 2nd on into a sandbox (branch) and I didn't find any
    conflicts.
3. Merged this branch into trunk with and used
    bzr revert --forget-merges switch to remove all the history.
4. I committed the changes into the trunk any typed all log messages
    again.

Fahad

[Diego Biurrun (diego-biurrun)]

On Mon, Dec 12, 2011 at 08:52:24PM +0000, Fahad Aizaz wrote:
> On 12/12/2011 08:34 PM, Diego Biurrun wrote:
> > On Fri, Dec 09, 2011 at 03:58:46PM +0100, Diego Biurrun wrote:
> >> [... lengthy explanation that was ignored ...]
> >
> > So I take the time to elaborate and explain how to merge this properly
> > and outline two alternative ways to go about this correctly that would
> > result in either a single merge or a single commit.
> >
> > Instead of picking one of those two, you instead decide to split your
> > work arbitrarily and push seven commits, six of which are broken in
> > different ways and all of which have bad log messages.
>
> 1) Only merge the second branch.
> 2) Drop the history of the second branch.
>
> - merging hipd-relay-config into your trunk (or whatever) branch
> - running "bzr revert --forget-merges" in that branch so that the
> changes remain, but the merged history is dropped
> - committing all the changes and
> - pushing the resulting commit to the central repository.
>
> I followed what you mentioned in your email.
>
> 1. I discarded the first branch.
> 2. Merged 2nd on into a sandbox (branch) and I didn't find any
> conflicts.
> 3. Merged this branch into trunk with and used
> bzr revert --forget-merges switch to remove all the history.

Good so far - note the operative term here: remove all the history.

> 4. I committed the changes into the trunk any typed all log messages
> again.

So now you are recreating the history which I told you to drop!

I told you to commit *all* the changes, not split the changes into
multiple commits again. And I told you to push the resulting commit
to the central repository. Note the singular, it should have been a
single one.

You have some very deep-seated misunderstandings about what a commit is
and what it should do. A commit must be atomic and it must work.

None of the commits you pushed fit that bill, most don't even compile, at
least on some platform, but trunk must *always* compile[1]. And related
changes *must* be grouped into one commit, not split arbitrarily by files
as you did.

Also your log messages are bad. You should describe what the commit does
and why, not just list the files created or touched by the commit. This
information is already in the Bazaar metadata.

I notice that HIPL's HACKING document does not say much about the subject,
so go read PISA's HACKING document again instead. Some of that and more
will need to get ported over...

Diego

[1] Hey, of course people may sometimes screw up, but not knowingly.
That's why we have private branches. To screw up in private and then
push a cleaned-up history without the messups.

Unmerged revisions

6193. By Fahad Aizaz on 2011-12-06

Updating multiple packages to handle 'relay.conf' file.

6192. By Fahad Aizaz on 2011-12-06

Adding 'relay.conf' to Makefile.am

6191. By Fahad Aizaz on 2011-12-06

Configuration file 'relay.conf' as part of HIP package.

6190. By Fahad Aizaz on 2011-12-06

Runtime generation for configuration file 'relay.conf' needs to be removed.

6189. By Fahad Aizaz on 2011-12-06

Stylecheck fix

6188. By Fahad Aizaz on 2011-12-06

The runtime generation of configuration files needs to be removed.

The changes made to 'init.c' removes the run-time generation of the
the following configuration files:

hipd.conf
hosts
nsupdate.conf

6187. By Fahad Aizaz on 2011-12-06

The OpenWRT package needs to be updated for configuration files.

The following configuration files are part of OpenWRT package:

hipd.conf
hosts
nsupdate.conf

6186. By Fahad Aizaz on 2011-12-06

The RPM package needs to be updated for configuration files.

The following configuration files are part of RPM package:

hipd.conf
hosts
nsupdate.conf

6185. By Fahad Aizaz on 2011-12-06

The configuration files need to be added to the Makefile.am.

The following configuration files are part of Makefile.am

hipd.conf
hosts
nsupdate.conf

6184. By Fahad Aizaz on 2011-12-06

Fix merge conflict

=== modified file 'Makefile.am'
--- Makefile.am	2011-11-25 13:52:20 +0000
+++ Makefile.am	2011-12-06 13:05:27 +0000
@@ -134,6 +134,11 @@
                     modules/midauth/hipd/midauth.c      \
                     hipd/main.c
 
+dist_sysconf_DATA = hipd/hipd.conf        \
+                    hipd/hosts            \
+                    hipd/nsupdate.conf    \
+                    hipd/relay.conf
+
 hipfw_hipfw_sources = hipfw/cache.c               \
                       hipfw/dlist.c               \
                       hipfw/esp_prot_api.c        \

=== modified file 'debian/hipl-daemon.dirs'
--- debian/hipl-daemon.dirs	2010-12-28 16:53:40 +0000
+++ debian/hipl-daemon.dirs	2011-12-06 13:05:27 +0000
@@ -1,1 +1,2 @@
 usr/sbin
+etc/hip

=== modified file 'debian/hipl-daemon.install'
--- debian/hipl-daemon.install	2010-12-28 16:53:40 +0000
+++ debian/hipl-daemon.install	2011-12-06 13:05:27 +0000
@@ -2,3 +2,7 @@
 debian/tmp/usr/sbin/hipconf usr/sbin/
 debian/tmp/usr/sbin/pisacert usr/sbin/
 debian/tmp/usr/sbin/nsupdate.pl usr/sbin/
+debian/tmp/etc/hip/hipd.conf etc/hip/
+debian/tmp/etc/hip/hosts etc/hip/
+debian/tmp/etc/hip/nsupdate.conf etc/hip/
+debian/tmp/etc/hip/relay.conf etc/hip/

=== added file 'hipd/hipd.conf'
--- hipd/hipd.conf	1970-01-01 00:00:00 +0000
+++ hipd/hipd.conf	2011-12-06 13:05:27 +0000
@@ -0,0 +1,21 @@
+# Format of this file is as with hipconf, but without "hipconf daemon" prefix
+# add hi default    # add all four HITs (see bug id 592127)
+# add map HIT IP    # preload some HIT-to-IP mappings to hipd
+# add service rvs   # the host acts as HIP rendezvous (also see relay.conf)
+# add server rvs [RVS-HIT] <RVS-IP-OR-HOSTNAME> <lifetime-secs> # register to rendezvous server
+# add server relay [RELAY-HIT] <RVS-IP-OR-HOSTNAME> <lifetime-secs> # register to relay server
+# add server full-relay [RELAY-HIT] <RVS-IP-OR-HOSTNAME> <lifetime-secs> # register to relay server
+hit-to-ip on # resolve HITs to locators in dynamic DNS zone
+# hit-to-ip set hit-to-ip.infrahip.net. # resolve HITs to locators in dynamic DNS zone
+nsupdate on # send dynamic DNS updates
+# add server rvs hiprvs.infrahip.net 50000 # Register to free RVS at infrahip
+# heartbeat 10 # send ICMPv6 messages inside HIP tunnels
+# locator on        # host sends all of its locators in base exchange
+# shotgun on # use all possible src/dst IP combinations to send I1/UPDATE
+# broadcast on # broadcast to LAN if no matching IP address found
+# opp normal|advanced|none
+# transform order 213 # crypto preference order (1=AES, 2=3DES, 3=NULL)
+nat plain-udp       # use UDP capsulation (for NATted environments)
+#nat port local 11111 # change local default UDP port
+#nat port peer 22222 # change local peer UDP port
+debug medium        # debug verbosity: all, medium, low or none

=== modified file 'hipd/hiprelay.c'
--- hipd/hiprelay.c	2011-11-29 11:37:54 +0000
+++ hipd/hiprelay.c	2011-12-06 13:05:27 +0000
@@ -661,6 +661,7 @@
 
     return ((struct lhash_st *) hiprelay_wl)->num_items;
 }
+
 #endif /* CONFIG_HIP_DEBUG */
 
 /** A callback wrapper of the prototype required by @c lh_doall(). */
@@ -811,68 +812,6 @@
 }
 
 /**
- * Writes RVS / HIP Relay configuration file with default content. Writes a RVS
- * / HIP Relay configuration file to @c HIP_RELAY_CONFIG_FILE. The file is
- * opened with "w" argument mode, which means that a possibly existing file is
- * truncated to zero length.
- *
- * @return zero on success, -ENOENT if the file could not be opened for writing.
- * @note   Truncates existing file to zero length.
- */
-static int relay_write_config(void)
-{
-    int   err = 0;
-    FILE *fp  = NULL;
-
-    HIP_IFEL((fp = fopen(HIP_RELAY_CONFIG_FILE, "w")) == NULL, -ENOENT,
-             "Cannot open file %s for writing.\n", HIP_RELAY_CONFIG_FILE);
-
-    fprintf(fp,
-            "# HIP relay / RVS configuration file.\n"
-            "#\n"
-            "# This file consists of stanzas of the following form:\n"
-            "#\n"
-            "# parametername = \"value1\", \"value2\", ... \"valueN\"\n"
-            "#\n"
-            "# where there can be as many values as needed per line with the limitation of\n"
-            "# total line length of %d characters. The 'parametername' is at most %d\n"
-            "# characters long and 'values' are at most %d characters long. A value itself\n"
-            "# may not contain a '%c' character.\n"
-            "#\n"
-            "# The '%c' character is used for comments. End of line comments are not allowed.\n"
-            "\n"
-            "# Relay whitelist status. When this is set to 'yes', only clients whose HIT is\n"
-            "# listed on the whitelist are allowed to register to the relay / RVS service.\n"
-            "# When this is set to 'no', any client is allowed to register. This defaults as\n"
-            "# 'yes' when no value is given.\n"
-            "whitelist_enabled = \"no\"\n"
-            "\n"
-            "# Relay whitelist. The HITs of the clients that are allowed to register to\n"
-            "# the relay / RVS service. You may use multiple stanzas of the same name.\n"
-            "whitelist = \"\"\n"
-            "\n"
-            "# The minimum number of seconds the relay / RVS client is granted the service.\n"
-            "# If the service request defines a value smaller than this value, this value is\n"
-            "# used.\n"
-            "minimum_lifetime = \"60\"\n"
-            "\n"
-            "# The maximum number of seconds the relay / RVS client is granted the service.\n"
-            "# If the service request defines a value bigger than this value, this value is\n"
-            "# used.\n"
-            "maximum_lifetime = \"3600\"\n",
-            HIP_RELAY_MAX_LINE_LEN, HIP_RELAY_MAX_PAR_LEN,
-            HIP_RELAY_MAX_VAL_LEN, HIP_RELAY_VAL_SEP, HIP_RELAY_COMMENT);
-
-    if (fclose(fp) != 0) {
-        HIP_ERROR("Cannot close file %s.\n", HIP_RELAY_CONFIG_FILE);
-    }
-
-out_err:
-
-    return err;
-}
-
-/**
  * forward a control packet in relay or rvs mode
  *
  * @param ctx the packet context corresponding to the packet
@@ -1401,23 +1340,10 @@
              "Unable to initialize HIP relay / RVS database.\n");
     HIP_IFEL(relwl_init(), -1,
              "Unable to initialize HIP relay / RVS whitelist.\n");
-
-    if (relay_read_config() == -ENOENT) {
-        HIP_ERROR("The configuration file \"%s\" could not be read.\n"
-                  "Trying to write a new configuration file from "
-                  "scratch.\n", HIP_RELAY_CONFIG_FILE);
-        if (relay_write_config() == -ENOENT) {
-            HIP_ERROR("Could not create a configuration file "
-                      "\"%s\".\n", HIP_RELAY_CONFIG_FILE);
-        } else {
-            HIP_DEBUG("Created a new configuration file \"%s\".\n",
-                      HIP_RELAY_CONFIG_FILE);
-        }
-    } else {
-        HIP_DEBUG("Read configuration file \"%s\" successfully.\n",
-                  HIP_RELAY_CONFIG_FILE);
-    }
-
+    HIP_IFEL(relay_read_config(), -ENOENT,
+             "Loading configuration file failed.\n");
+    HIP_DEBUG("Read configuration file \"%s\" successfully.\n",
+              HIP_RELAY_CONFIG_FILE);
 out_err:
     if (hiprelay_wl == NULL) {
         relht_uninit();

=== added file 'hipd/hosts'
--- hipd/hosts	1970-01-01 00:00:00 +0000
+++ hipd/hosts	2011-12-06 13:05:27 +0000
@@ -0,0 +1,4 @@
+# This file stores the HITs of the hosts, in a similar fashion to /etc/hosts.
+# The aliases are optional.  Examples:
+#2001:1e:361f:8a55:6730:6f82:ef36:2fff kyle kyle.com # This is a HIT with alias
+#2001:17:53ab:9ff1:3cba:15f:86d6:ea2e kenny       # This is a HIT without alias

=== modified file 'hipd/init.c'
--- hipd/init.c	2011-11-29 11:37:54 +0000
+++ hipd/init.c	2011-12-06 13:05:27 +0000
@@ -141,117 +141,6 @@
 }
 
 /**
- * Create a file with the given contents unless it already exists
- *
- * @param path the file with its path
- * @param contents a string to write to the file
- */
-static void create_file_unless_exists(const char *path, const char *contents)
-{
-    struct stat status;
-    FILE       *fp;
-    size_t      items;
-
-    if (stat(path, &status) == 0) {
-        return;
-    }
-
-    fp = fopen(path, "w");
-    HIP_ASSERT(fp);
-    items = fwrite(contents, strlen(contents), 1, fp);
-    HIP_ASSERT(items > 0);
-    fclose(fp);
-}
-
-#define HIPL_CONFIG_FILE_EX \
-    "# Format of this file is as with hipconf, but without \"hipconf daemon\" prefix\n\
-# add hi default    # add all four HITs (see bug id 592127)\n\
-# add map HIT IP    # preload some HIT-to-IP mappings to hipd\n\
-# add service rvs   # the host acts as HIP rendezvous (also see relay.conf)\n\
-# add server rvs [RVS-HIT] <RVS-IP-OR-HOSTNAME> <lifetime-secs> # register to rendezvous server\n\
-# add server relay [RELAY-HIT] <RVS-IP-OR-HOSTNAME> <lifetime-secs> # register to relay server\n\
-# add server full-relay [RELAY-HIT] <RVS-IP-OR-HOSTNAME> <lifetime-secs> # register to relay server\n\
-hit-to-ip on # resolve HITs to locators in dynamic DNS zone\n\
-# hit-to-ip set hit-to-ip.infrahip.net. # resolve HITs to locators in dynamic DNS zone\n\
-nsupdate on # send dynamic DNS updates\n\
-# add server rvs hiprvs.infrahip.net 50000 # Register to free RVS at infrahip\n\
-# heartbeat 10 # send ICMPv6 messages inside HIP tunnels\n\
-# locator on        # host sends all of its locators in base exchange\n\
-# shotgun on # use all possible src/dst IP combinations to send I1/UPDATE\n\
-# broadcast on # broadcast to LAN if no matching IP address found\n\
-# opp normal|advanced|none\n\
-# transform order 213 # crypto preference order (1=AES, 2=3DES, 3=NULL)\n\
-nat plain-udp       # use UDP capsulation (for NATted environments)\n\
-#nat port local 11111 # change local default UDP port\n\
-#nat port peer 22222 # change local peer UDP port\n\
-debug medium        # debug verbosity: all, medium, low or none\n"
-
-#define HIPL_HOSTS_FILE_EX \
-    "# This file stores the HITs of the hosts, in a similar fashion to /etc/hosts.\n\
-# The aliases are optional.  Examples:\n\
-#2001:1e:361f:8a55:6730:6f82:ef36:2fff kyle kyle.com # This is a HIT with alias\n\
-#2001:17:53ab:9ff1:3cba:15f:86d6:ea2e kenny       # This is a HIT without alias\n"
-
-#define HIPL_NSUPDATE_CONF_FILE     HIPL_SYSCONFDIR "/nsupdate.conf"
-
-#define HIPL_NSUPDATE_CONF_FILE_EX \
-    "##########################################################\n" \
-    "# configuration examples\n" \
-    "##########################################################\n" \
-    "# update records for 5.7.d.1.c.c.8.d.0.6.3.b.a.4.6.2.5.0.5.2.e.4.7.5.e.1.0.0.1.0.0.2.hit-to-ip.infrahip.net.\n" \
-    "# $HIT_TO_IP_ZONE = 'hit-to-ip.infrahip.net.';\n" \
-    "# or in some other zone\n" \
-    "# $HIT_TO_IP_ZONE = 'hit-to-ip.example.org.';\n" \
-    "\n" \
-    "# update is sent to SOA if server empty\n" \
-    "# $HIT_TO_IP_SERVER = '';\n" \
-    "# or you may define it \n" \
-    "# $HIT_TO_IP_SERVER = 'ns.example.net.';\n" \
-    "\n" \
-    "# name of key if you configured it on the server\n" \
-    "# please also chown this file to nobody and chmod 400\n" \
-    "# $HIT_TO_IP_KEY_NAME='key.hit-to-ip';\n" \
-    "# $HIT_TO_IP_KEY_NAME = '';\n" \
-    "\n" \
-    "# secret of that key\n" \
-    "# $HIT_TO_IP_KEY_SECRET='Ousu6700S9sfYSL4UIKtvnxY4FKwYdgXrnEgDAu/rmUAoyBGFwGs0eY38KmYGLT1UbcL/O0igGFpm+NwGftdEQ==';\n" \
-    "# $HIT_TO_IP_KEY_SECRET = '';\n" \
-    "\n" \
-    "# TTL inserted for the records\n" \
-    "# $HIT_TO_IP_TTL = 1;\n" \
-    "###########################################################\n" \
-    "# domain with ORCHID prefix \n" \
-    "# $REVERSE_ZONE = '1.0.0.1.0.0.2.ip6.arpa.'; \n" \
-    "# \n" \
-    "# $REVERSE_SERVER = 'ptr-soa-hit.infrahip.net.'; # since SOA 1.0.0.1.0.0.2.ip6.arpa. is dns1.icann.org. now\n" \
-    "# $REVERSE_KEY_NAME = '';\n" \
-    "# $REVERSE_KEY_SECRET = '';\n" \
-    "# $REVERSE_TTL = 86400;\n" \
-    "# System hostname is used if empty\n" \
-    "# $REVERSE_HOSTNAME = 'stargazer-hit.pc.infrahip.net';\n" \
-    "###########################################################\n"
-
-/**
- * load hipd configuration files
- */
-static void load_configuration(void)
-{
-    const char *cfile = "default";
-
-    create_file_unless_exists(HIPL_CONFIG_FILE, HIPL_CONFIG_FILE_EX);
-
-    create_file_unless_exists(HIPL_HOSTS_FILE, HIPL_HOSTS_FILE_EX);
-
-    create_file_unless_exists(HIPL_NSUPDATE_CONF_FILE, HIPL_NSUPDATE_CONF_FILE_EX);
-
-    /* Load the configuration. The configuration is loaded as a sequence
-     * of hipd system calls. Assumably the user socket buffer is large
-     * enough to buffer all of the hipconf commands.. */
-
-    hip_conf_handle_load(NULL, 0, &cfile, 1, 1);
-}
-
-/**
  * initialize OS-dependent variables
  */
 static void set_os_dep_variables(void)
@@ -1145,7 +1034,11 @@
                   sizeof(daemon_addr)), -1,
              "Bind on daemon addr failed\n");
 
-    load_configuration();
+    const char *cfile = "default";
+    if (hip_conf_handle_load(NULL, 0, &cfile, 1, 1) == -1) {
+        HIP_ERROR("Loading configuration file failed.\n");
+        return -1;
+    }
 
     certerr = 0;
     certerr = init_certs();
@@ -1158,7 +1051,9 @@
 
 #ifdef CONFIG_HIP_RVS
     HIP_INFO("Initializing HIP relay / RVS.\n");
-    hip_relay_init();
+    if (hip_relay_init() == -ENOENT) {
+        return -ENOENT;
+    }
 #endif
 
     if (flags & HIPD_START_LOWCAP) {

=== added file 'hipd/nsupdate.conf'
--- hipd/nsupdate.conf	1970-01-01 00:00:00 +0000
+++ hipd/nsupdate.conf	2011-12-06 13:05:27 +0000
@@ -0,0 +1,35 @@
+##########################################################
+# configuration examples
+##########################################################
+# update records for 5.7.d.1.c.c.8.d.0.6.3.b.a.4.6.2.5.0.5.2.e.4.7.5.e.1.0.0.1.0.0.2.hit-to-ip.infrahip.net.
+# $HIT_TO_IP_ZONE = 'hit-to-ip.infrahip.net.';
+# or in some other zone
+# $HIT_TO_IP_ZONE = 'hit-to-ip.example.org.';
+
+# update is sent to SOA if server empty
+# $HIT_TO_IP_SERVER = '';
+# or you may define it 
+# $HIT_TO_IP_SERVER = 'ns.example.net.';
+
+# name of key if you configured it on the server
+# please also chown this file to nobody and chmod 400
+# $HIT_TO_IP_KEY_NAME='key.hit-to-ip';
+# $HIT_TO_IP_KEY_NAME = '';
+
+# secret of that key
+# $HIT_TO_IP_KEY_SECRET='Ousu6700S9sfYSL4UIKtvnxY4FKwYdgXrnEgDAu/rmUAoyBGFwGs0eY38KmYGLT1UbcL/O0igGFpm+NwGftdEQ==';
+# $HIT_TO_IP_KEY_SECRET = '';
+
+# TTL inserted for the records
+# $HIT_TO_IP_TTL = 1;
+###########################################################
+# domain with ORCHID prefix 
+# $REVERSE_ZONE = '1.0.0.1.0.0.2.ip6.arpa.'; 
+# 
+# $REVERSE_SERVER = 'ptr-soa-hit.infrahip.net.'; # since SOA 1.0.0.1.0.0.2.ip6.arpa. is dns1.icann.org. now
+# $REVERSE_KEY_NAME = '';
+# $REVERSE_KEY_SECRET = '';
+# $REVERSE_TTL = 86400;
+# System hostname is used if empty
+# $REVERSE_HOSTNAME = 'stargazer-hit.pc.infrahip.net';
+###########################################################

=== added file 'hipd/relay.conf'
--- hipd/relay.conf	1970-01-01 00:00:00 +0000
+++ hipd/relay.conf	2011-12-06 13:05:27 +0000
@@ -0,0 +1,32 @@
+# HIP relay / RVS configuration file.
+#
+# This file consists of stanzas of the following form:
+#
+# parametername = "value1", "value2", ... "valueN"
+#
+# where there can be as many values as needed per line with the limitation of
+# total line length of 2048 characters. The 'parametername' is at most 32
+# characters long and 'values' are at most 64 characters long. A value itself
+# may not contain a ',' character.
+#
+# The '#' character is used for comments. End of line comments are not allowed.
+
+# Relay whitelist status. When this is set to 'yes', only clients whose HIT is
+# listed on the whitelist are allowed to register to the relay / RVS service.
+# When this is set to 'no', any client is allowed to register. This defaults as
+# 'yes' when no value is given.
+whitelist_enabled = "no"
+
+# Relay whitelist. The HITs of the clients that are allowed to register to
+# the relay / RVS service. You may use multiple stanzas of the same name.
+whitelist = ""
+
+# The minimum number of seconds the relay / RVS client is granted the service.
+# If the service request defines a value smaller than this value, this value is
+# used.
+minimum_lifetime = "60"
+
+# The maximum number of seconds the relay / RVS client is granted the service.
+# If the service request defines a value bigger than this value, this value is
+# used.
+maximum_lifetime = "3600"

=== modified file 'packaging/hipl.spec'
--- packaging/hipl.spec	2011-12-01 21:29:13 +0000
+++ packaging/hipl.spec	2011-12-06 13:05:27 +0000
@@ -154,6 +154,10 @@
 %{_sbindir}/pisacert
 %{_sbindir}/nsupdate.pl
 %{_initddir}/hipd
+%config(noreplace) %{_sysconfdir}/hip/hipd.conf
+%config(noreplace) %{_sysconfdir}/hip/hosts
+%config(noreplace) %{_sysconfdir}/hip/nsupdate.conf
+%config(noreplace) %{_sysconfdir}/hip/relay.conf
 
 %files dnsproxy
 %{_sbindir}/hipdnsproxy

=== modified file 'packaging/openwrt/hipl/Makefile.in'
--- packaging/openwrt/hipl/Makefile.in	2011-12-01 13:34:53 +0000
+++ packaging/openwrt/hipl/Makefile.in	2011-12-06 13:05:27 +0000
@@ -73,6 +73,10 @@
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipd $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipconf $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipdnsproxy $(1)/usr/sbin/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/hip/hipd.conf $(1)/etc/hip/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/hip/hosts $(1)/etc/hip/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/hip/nsupdate.conf $(1)/etc/hip/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/hip/relay.conf $(1)/etc/hip/
 endef
 
 define Package/hipl-firewall/install