[hipl-commit] [trunk] Rev 4483: Applied review suggestions from Diego for patch 4479.
- From: Miika Komu <miika@xxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Tue, 11 May 2010 15:01:57 +0300
Committer: Miika Komu <miika@xxxxxx>
Date: 11/05/2010 at 15:01:57
Revision: 4483
Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Applied review suggestions from Diego for patch 4479.
Quite from the the review:
Just try grepping the tree for the remainders of "conntest".
The patches/opendht directory is now empty, but still referenced.
More things, but probably not an exhaustive list:
> > --- Makefile.am 2010-05-09 13:09:02 +0000
> > +++ Makefile.am 2010-05-11 07:02:11 +0000
> > @@ -88,26 +77,11 @@
> >
> >
> > -### source declarations ###
There are still source declarations below this line.
> > --- doc/HOWTO.xml 2010-05-09 12:30:33 +0000
> > +++ doc/HOWTO.xml 2010-05-11 07:02:11 +0000
> > @@ -980,9 +980,6 @@
> > $(INSTALL_DATA) ./files/hipfw.init $(1)/etc/init.d/hipfw
> > $(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
> > $(INSTALL_DATA) ./files/test/* $(1)/etc/init.d/test/
The above line looks very suspicious.
Modified:
M Makefile.am
M doc/HOWTO.xml
M hipd/input.c
=== modified file 'Makefile.am'
--- Makefile.am 2010-05-11 11:36:57 +0000
+++ Makefile.am 2010-05-11 12:01:55 +0000
@@ -77,6 +77,7 @@
i3/chord/libchord.la
endif
+### source declarations ###
test_auth_performance_SOURCES = test/auth_performance.c
test_certteststub_SOURCES = test/certteststub.c
=== modified file 'doc/HOWTO.xml'
--- doc/HOWTO.xml 2010-05-11 07:02:11 +0000
+++ doc/HOWTO.xml 2010-05-11 12:01:55 +0000
@@ -979,7 +979,6 @@
$(INSTALL_DATA) ./files/hipd.init $(1)/etc/init.d/hipd
$(INSTALL_DATA) ./files/hipfw.init $(1)/etc/init.d/hipfw
$(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
- $(INSTALL_DATA) ./files/test/* $(1)/etc/init.d/test/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
endif
</programlisting>
@@ -2719,9 +2718,9 @@
"hipconf dht get <hostname|HIT>".
</para></listitem>
<listitem><para>
- To test, just run normally nc6
+ To test, just run normally nc6 with -v flag
between the two hosts. You would see messages
- from hipd and conntest showing DNS->HIT->IP lookups. Everything
+ from hipd and nc6 connecting to a HIT. Everything
should work without additional actions.
</para></listitem>
</itemizedlist>
@@ -2785,115 +2784,6 @@
please also check <ulink url="http://kom.aau.dk/group/05gr680/"; />
</para>
</section>
-
-<!--
-
- <section id="sec_opendht_bamboo">
- <title>Bamboo OpenDHT server with IPv6 Support</title>
- <para>
- This section describes how to set up up an own IPv6 enabled
- Bamboo server to look up hostnames, HITs and IP addresses.
- Bamboo can be used as an alternative name look up instructure
- to DNS. InfraHIP servers are also already running bamboo
- service if you don't want to run your own service (see
- <xref linkend="ch_opendht" />). The clients can contact the
- server through HIP if necessary.
- </para>
- <para>
- To start the Bamboo opendht server, first the code has to be obtained.
- You can obtain Bamboo with IPv4 support from the Bamboo website,
- http://www.bamboo-dht.org/download.html. Bamboo with IPv6 support can
- be obtained from http://lxpworkroom.googlepages.com/bambooipv6version.
- The code is compiled by executing make in the downloaded directory.
- Some instructions and patches are also in patches/opendht directory of
- HIPL software bundle.
- </para>
- <para>
- In order to run the Bamboo server, a configuration file needs to be
- created. You can find a sample in this link:
- http://www.cs.helsinki.fi/u/sklvarjo/sample.cfg.
- </para>
- <para>
- Bamboo opendht server for a single machine:
- </para>
- <para>
- If you want to try the bamboo opendht server on a single machine,
- you have to assign 1 to the min_replica_count argument.
- </para>
- <para>
- For IPV6 Bamboo:
- </para>
- <para>
- Sample configuration files for IPv6 Bamboo can also be found at
- http://lxpworkroom.googlepages.com/bambooipv6version. One change to
- notice is that the ipv6 addresses are enclosed inside [] braces. IPv6
- Bamboo configuration file requires also the setting of the network
- argument, as shown in the IPv6 configuration samples.
- </para>
- <para>
- In case you want to configure Bamboo based on HIP, you have to put a
HIT
- in the configuration file insted of the IPv6 address.
- </para>
- </section>
-
- <section id="sec_opendht_several_bamboos">
- <title>Joining Several Bamboo Servers into a Single Ring</title>
- <para>
- This section describes how to join two or more bamboo servers to a
- single ring.
- </para>
- <para>
- The first thing to note is that Bamboo servers that support different
- ip versions cannot be configured to run together successfully.
- All Bamboo servers should suport either ipv4 or ipv6.
- </para>
- <para>
- In order to configure several bamboo servers together, there are
several
- changes to be made to each configuration file of each instance.
- </para>
- <para>
- First of all, inside 'Router', in the 'initargs', we have to add the
- 'gateway_count' argument followed by the overall number of servers to
be
- configured together. After that, we should specify a list of the
gateways.
- The following paragraph illustrates a sample for configuring two
servers
- together, at the configuration file of one of the servers.
- </para>
- <para>
- <Router></para><para>
- class bamboo.router.Router</para><para>
- <initargs></para><para>
- gateway_count 2</para><para>
- gateway_0 193.167.187.133:5850</para><para>
- gateway_1 193.167.187.31:5850</para><para>
- leaf_set_size 4</para><para>
- digit_values 2</para><para>
- immediate_join true</para><para>
- </initargs></para><para>
- </Router></para><para>
- </para>
-
- <para>
- </para>
-
- <para>
- An additional change to be made is assigning the 'min_replica_count'
- argument to the overall number of servers that are to be configured
- together. This is illustrated below:
- </para>
- <para>
- <Dht></para><para>
- class bamboo.dht.Dht</para><para>
- <initargs></para><para>
- storage_manager_stage StorageManager</para><para>
- min_replica_count 2</para><para>
- </initargs></para><para>
- </Dht></para><para>
- </para>
-
- </section>
-
--->
-
</section>
</chapter> <!-- Name Look-up -->
=== modified file 'hipd/input.c'
--- hipd/input.c 2010-04-29 19:36:31 +0000
+++ hipd/input.c 2010-05-11 12:01:55 +0000
@@ -611,7 +611,7 @@
entry->hip_opp_fallback_disable = filter;
}
} else {
- /* Ugly bug fix for "conntest-client hostname tcp 12345"
+ /* Ugly bug fix for "nc6 hostname tcp 12345"
* where hostname maps to HIT and IP in hosts files.
* Why the heck the receive function points here to
* receive_opp_r1 even though we have a regular entry? */
Other related posts:
- » [hipl-commit] [trunk] Rev 4483: Applied review suggestions from Diego for patch 4479. - Miika Komu