Merge lp:~rene-hummen/hipl/mobility-fixes into lp:hipl

[René Hummen]

This branch refactors the update code to allow hooking into the modularization on a parameter level. Midauth functionality depends on this branch.

[René Hummen (rene-hummen)]

To support reviewers, that's what actually happened in this branch:
- hip_create_update_msg(): split into smaller parameter handling functions
- hip_send_update_to_one_peer(): packet type-specific code moved to the corresponding parameter handle functions
- hip_handle_X_update_packet(): split into smaller parameter handling functions

Otherwise, existing code has merely been moved into different files.

[lp:~rene-hummen/hipl/mobility-fixes]

5619. By Diego Biurrun on 2011-02-14

configfilereader: Refactor some redundant return statements.

In hip_cvl_add() 'return 0' statements were present in all branches of an
if/else block as well as directly below the block.

5620. By Diego Biurrun on 2011-02-14

Convert some instances of malloc() + memset(0) to calloc().

5621. By Diego Biurrun on 2011-02-14

Replace some memset(0) invocations by zero initializations.

5622. By Diego Biurrun on 2011-02-14

hipd: Get rid of some unnecessary zeroing of memory.

5623. By Diego Biurrun on 2011-02-14

lib: Get rid of some unnecessary zeroing of memory.

5624. By Diego Biurrun on 2011-02-14

Remove more instances of unnecessary zeroing of memory.

5625. By Diego Biurrun on 2011-02-14

Update links to bug tracker and revision control browser on Launchpad.

5626. By Diego Biurrun on 2011-02-14

doxygen: Drop unnecessary '*' from function parameter names.

5627. By Diego Biurrun on 2011-02-14

Fix the names of some multiple inclusion guards.

The multiple inclusion guards should be derived from filename and path.

[Diego Biurrun (diego-biurrun)]

 review needs-fixing

On Mon, Feb 14, 2011 at 10:45:32AM +0000, René Hummen wrote:
> René Hummen has proposed merging lp:~rene-hummen/hipl/mobility-fixes into lp:hipl.
>
> Requested reviews:
> HIPL core team (hipl-core)
>
> For more details, see:
> https://code.launchpad.net/~rene-hummen/hipl/mobility-fixes/+merge/49604
>
> This branch refactors the update code to allow hooking into the modularization on a parameter level. Midauth functionality depends on this branch.

This is laaaarge and hard to review. Maybe you can split off the code
moves? They're likely fine to commit as-is anyway...

> --- hipd/input.c 2011-02-14 08:44:19 +0000
> +++ hipd/input.c 2011-02-14 10:44:59 +0000
> @@ -654,6 +654,7 @@
> }
>
> /**
> +<<<<<<< TREE
> * This function stores the LOCATOR parameter into the hadb entry
> * of a connection in question. The whole LOCATOR is stored and
> * handled later as the LOCATOR is received before the connection
> @@ -683,6 +684,8 @@
> }
>
> /**
> +=======
> +>>>>>>> MERGE-SOURCE
> * Check a received R1 control packet.
> *
> * @param packet_type The packet type of the control message (RFC 5201, 5.3.)

It could be considered a bug in Bazaar/launchpad that it is possible at
all to submit branches with merge conflicts for merging, but this should
still not happen.

> --- hipd/output.c 2011-02-03 14:32:39 +0000
> +++ hipd/output.c 2011-02-14 10:44:59 +0000
> @@ -274,37 +274,27 @@
>
> -int hip_sign_and_mac_packet(UNUSED const uint8_t packet_type,
> - UNUSED const uint32_t ha_state,
> - struct hip_packet_context *ctx)
> +int hip_mac_and_sign_packet(struct hip_common *msg,
> + struct hip_hadb_state *hadb_entry)

Why the rename? Seems pointless to me...

> --- lib/core/builder.c 2011-02-06 10:08:14 +0000
> +++ lib/core/builder.c 2011-02-14 10:44:59 +0000
> @@ -3037,6 +3037,8 @@
> int err = 0;
> struct hip_esp_info esp_info;
>
> + HIP_DEBUG("old_spi=0x%x, new_spi=0x%x\n", old_spi, new_spi);

Unrelated; we have enough debugging output, I suggest dropping this.

> --- modules/update/hipd/update.c 2011-01-17 12:09:48 +0000
> +++ modules/update/hipd/update.c 2011-02-14 10:44:59 +0000
> @@ -28,398 +28,70 @@
> * This file defines various functions for sending, handling and receiving
> * UPDATE packets for the Host Identity Protocol (HIP)
> *
> - * @author Baris Boyvat <baris#boyvat.com>
> + * @author Baris Boyvat <baris#boyvat.com>
> + * @author Rene Hummen
> */

Unrelated; push right away.

> +/**
> + * Prepare the creation of a new UPDATE packet.
> + *
> + * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
> + * @param ha_state The host association state (RFC 5201, 4.4.1.)
> + * @param *ctx Pointer to the packet context, containing all information for
> + * the packet handling (received message, source and destination
> + * address, the ports and the corresponding entry from the host
> + * association database).

Drop the * from the parameter name.

> @@ -1134,87 +276,235 @@
>
> /**
> + * Send an UPDATE packet depending on the updat...

review: Needs Fixing

[lp:~rene-hummen/hipl/mobility-fixes]

5628. By Diego Biurrun on 2011-02-14

cookie.c: Remove write-only all_zero_hit variables.

5629. By Diego Biurrun on 2011-02-14

maintenance.c: Remove pointless hip_fw_addr variable indirection.

5630. By Diego Biurrun on 2011-02-14

Replace bzero() invocations by zero initializations.

bzero() is deprecated, so this is doubly good.

5631. By Diego Biurrun on 2011-02-14

firewall: Replace bzero() invocation by memset(0).

bzero() is deprecated, memset(0) should be used instead.

5632. By Diego Biurrun on 2011-02-15

Remove secret member from struct netdev_address.

According to Samu it was part of the OpenDHT rm-message code that was
removed a while ago.

5633. By Diego Biurrun on 2011-02-15

build system: Ensure that version.h is created before compiling header files.

5634. By Diego Biurrun on 2011-02-15

Simplify the string length passed to gethostname().

It should just use the length of the character array, which is simpler
than the current construction and does not waste a byte.

5635. By Diego Biurrun on 2011-02-15

Fix error handling of gethostname().

The instance of gethostname in lib/core/hostid.c was handled differently
than the other instances in HIPL and negating the result of the function
invocation rendered the check ineffective anyway.

5636. By Diego Biurrun on 2011-02-14

hipd: Drop an instance of unnecessary memory zeroing with bzero().

5637. By Diego Biurrun on 2011-02-15

doxygen: Document return value of hip_netdev_white_list_add().

5638. By Diego Biurrun on 2011-02-15

Clean up hip_netdev_white_list_add().

Remove a pointless cast and assignment; make function parameter const correct.

5639. By Diego Biurrun on 2011-02-15

lib: Simplify string prefixing in hip_conf_handle_load().

Thanks to Stefan Götz for the idea and initial implementation.

5640. By Diego Biurrun on 2011-02-15

whitespace cosmetics: Consistently format sections in HACKING document.

5641. By Diego Biurrun on 2011-02-15

doc: Remove a stray reference to blind mode, which was removed.

5642. By Diego Biurrun on 2011-02-15

doc: Fix a bunch of typos and grammar errors.

5643. By Diego Biurrun on 2011-02-15

doc: Reword and fix the Bazaar section of HACKING.

5644. By Diego Biurrun on 2011-02-15

Restore some instances of memory zeroing, as discussed with Miika.

5645. By Samuel Richter on 2011-02-15

fix hipdnsproxy debian package

debhelper automatically tries to configure the DNS python module if python-support is installed.
This is done by dh_pysupport, but since our 'make install' already does all the work right, it just breaks things.
dh_pysupport is now disabled with an empty override_dh_pysupport rule.

5646. By Diego Biurrun on 2011-02-15

Restore some more zeroing of memory as the result of Miika's review.

[Stefan Götz (stefan.goetz-deactivatedaccount)]

Hi Rene!

> René Hummen has proposed merging lp:~rene-hummen/hipl/mobility-fixes into
> lp:hipl. For more details, see:
> https://code.launchpad.net/~rene-hummen/hipl/mobility-fixes/+merge/49604
>
> This branch refactors the update code to allow hooking into the
> modularization on a parameter level. Midauth functionality depends on this
> branch.

Ooof, even after looking at the individual commits, I was not able to do a
meaningful review. Esp. revision 5610 is so large it makes my limited brain
overflow - sorry :-(

Stefan

review: Abstain

[lp:~rene-hummen/hipl/mobility-fixes]

5647. By Diego Biurrun on 2011-02-18

hipd: Explicitly initialize variable in static storage to zero.

The C standard guarantees that variables in static storage get initialized to
zero, but to keep with the intentional programming paradigm it is preferable
to make this implicit guarantee explicit.

5648. By Diego Biurrun on 2011-02-18

build system: Really ensure that version.h is created before compiling headers.

5649. By Diego Biurrun on 2011-02-18

tests: Replace forward declarations for unit tests by proper header files.

Previously unit test functions were handled through forward declarations in
order to avoid adding one header file for each file that contained unit tests.
Adding one general header file for unit tests to each unit test subdirectory
avoids the header file clutter without ugly forward declaration hacks.

5650. By Diego Biurrun on 2011-02-18

Remove two outdated comments that referred to the long-gone blind mode.

5651. By Diego Biurrun on 2011-02-18

packaging: Drop -rpm suffix from HIPL specfile name.

Now that the spec file is only used for RPM systems and not for Debian-based
systems, it is no longer necessary to carry the suffix in the name.

5652. By Diego Biurrun on 2011-02-18

build system: Add header files in the test directory to the list of headers.

This guarantees that these headers show up in the dist tarball and get
compiled by the 'checkheaders' target.

5653. By Diego Biurrun on 2011-02-20

Restore initialization of req structure in hip_xfrm_policy_modify() to zero.

This should (hopefully) fix the breakage introduced by the memset(0) removals
in r5623. Sending pings between HIP hosts works again now.

5654. By Diego Biurrun on 2011-02-20

Replace instances of memset(0) by zero initializations.

Now that we have found a way to avoid warnings with zero initializations
they are a cleaner way of making sure that structures are zeroed.

5655. By Diego Biurrun on 2011-02-20

Skip redundantly zeroing the timestamp member in hip_add_address_to_list().

The timestamp member is part of struct netdev_address, which was already
allocated with calloc and thus has all members zeroed.

5656. By Diego Biurrun on 2011-02-20

Skip redundantly zeroing the peer_hostname member in hip_hadb_add_peer_info().

The containing struct is already initialized to zero.

5657. By Diego Biurrun on 2011-02-20

Restore zeroing the retransmission buffer in hip_queue_packet().

While there is no hard evidence that this is strictly necessary, Miika's gut
feeling is to err on the safe side and zero the buffer just in case. Trusting
Miika's intuition around HIPL is usually a good thing(TM), so zero the buffer.

5658. By Diego Biurrun on 2011-02-20

Remove one level of pointless variable indirection in hip_xfrm_policy_modify().

The tmpl struct was declared as a pointer, which then was aliased to a char
array of sufficient size to hold the contents of the struct. Get rid of this
pointless and confusing indirecton by directly declaring tmpl as a struct and
setting its members directly.

5659. By Christoph Viethen on 2011-02-21

Fix defective handling of return code from EVP_EncodeBlock(). This function
only ever returns the number of bytes which it output, so the only kind of
"error" that could happen is if that number is 0.

5660. By Christoph Viethen on 2011-02-21

Fix crashing bug: EVP_EncodeBlock() happily stomped over memory it wasn't
supposed to hit, due to insufficient size of allocated memory. Considering
that EVP_EncodeBlock(), since the old SSLeay days, never had any real
documentation beyond its source code: added a clear word of warning and
made a few places in the code rather obvious, to keep others from falling
into the same trap.

5661. By Christoph Viethen on 2011-02-21

Correct a few places where the wrong amount of memory gets allocated (too
much, typically) - now at least the RSA parts of hip_cert_spki_sign()
should be pretty exact in terms of allocated vs. actually needed memory.
(Plus slight cosmetics in one place.)

5662. By Christoph Viethen on 2011-02-21

Minor code cleanup. Oh, and look, a free() was missing ...

5663. By Diego Biurrun on 2011-02-21

Only compile hip_dump_msg() if debug is enabled.

This helps avoid warnings with -Wunused-but-set-variable.

5664. By Diego Biurrun on 2011-02-21

Give more suitable names to the parameters of ipv{4|6}_addr_copy().

a1 and a2 are completely non-descriptive while dest and src explain everything.

5665. By Diego Biurrun on 2011-02-21

Fix return value of hipfw_handle_relay_to_r2().

The function was unconditionally returning 0, not just on success as the
documentation claimed it would do.

5666. By Diego Biurrun on 2011-02-21

Rewrite hip_cache_create_hl_entry() without the use of HIP_IFEL.

This helps avoid a warning with -Wunused-but-set-variable in gcc 4.6.

5667. By Diego Biurrun on 2011-02-21

firewall: Refactor hip_firewall_cache_hadb_match().

Merge redundant if-else statements and get rid of two variable indirections.

5668. By Diego Biurrun on 2011-02-21

Fix @return doxygen for hip_netlink_receive(); it does not always return zero.

5669. By Diego Biurrun on 2011-02-21

Make hip_iproute_modify() return negative values on error.

5670. By Diego Biurrun on 2011-02-21

Directly initialize struct array idxmap to zero instead of via a for loop.

5671. By Diego Biurrun on 2011-02-21

Remove pointless continue statement directly after return.

5672. By Diego Biurrun on 2011-02-21

Refactor error handling in netlink_talk() to work without goto.

5673. By Diego Biurrun on 2011-02-21

prettyprinting cosmetics

5674. By Diego Biurrun on 2011-02-21

Make hip_opp_get_hadb_entry and hip_opp_get_hadb_entry_i1_r1 work without goto.

5675. By Diego Biurrun on 2011-02-21

Refactor make_env() helper function.

Merge some error checks, avoid the use of goto and be const correct.

5676. By Diego Biurrun on 2011-02-21

Get rid of a variable indirection in hip_map_first_hostname_to_ip_from_hosts().

5677. By Diego Biurrun on 2011-02-21

Delete a duplicate error check in hip_send_i2().

5678. By Diego Biurrun on 2011-02-21

Merge if-blocks in are_addresses_compatible().

5679. By Diego Biurrun on 2011-02-21

Do not lie about return values from functions; avoid goto where unnecessary.

5680. By Diego Biurrun on 2011-02-21

Refactor hip_hmac2_and_sign() to avoid the use of goto.

5681. By Diego Biurrun on 2011-02-21

Refactor hip_sign_and_mac_packet() to avoid the use of goto.

5682. By Diego Biurrun on 2011-02-21

Refactor hip_add_signed_echo_response() / hip_add_unsigned_echo_response().

The functions just differed in two parameters passed to helper functions.
Extract the code into a helper function that receives a parameter telling
it which packet variant to build.

5683. By Diego Biurrun on 2011-02-21

cosmetics: prettyprinting; remove pointless parentheses; kill leftover comment

5684. By Diego Biurrun on 2011-02-21

Refactor hip_check_i1() control flow to work without goto.

5685. By Diego Biurrun on 2011-02-21

Refactor hip_handle_i1() control flow to work without goto.

This eliminates the last instances of the HIP_IFF macro, so delete it.

5686. By Miika Komu on 2011-02-22

Solved a problem with RPM packaged DNS proxy.

Bug id #715607 describes a problem with RPM packaged DNS proxy:

The DNS proxy is not using python APIs in way compatible with python
2.7. Can we support both 2.6 and 2.7?

hipserver # /etc/init.d/hipdnsproxy start
Starting : [ OK ]
[root@hipserver hipl]# Traceback (most recent call last):
  File "/usr/sbin/hipdnsproxy", line 1029, in <module>
    main(sys.argv)
  File "/usr/sbin/hipdnsproxy", line 1026, in main
    gp.doit(args)
  File "/usr/sbin/hipdnsproxy", line 731, in doit
    gp.write_local_hits_to_hosts()
  File "/usr/sbin/hipdnsproxy", line 535, in write_local_hits_to_hosts
    if not gp.getaddr(hit):
  File "/usr/sbin/hipdnsproxy", line 410, in getaddr
    r = h.getaddr(ahn)
AttributeError: Hosts instance has no attribute 'getaddr'

The problem was that the system had also /usr/sbin/hosts.py which was
located before the HIPL version of hosts.py in the module search path. I
rolled the DNS proxy path to the front path and it started working
again. Tested on Fedora Core 14 and Ubuntu Maverick.

If you have a more elegant solution, feel free to contribute.

5687. By Diego Biurrun on 2011-02-22

hipd does not depend on iptables, hipfw does; update package deps accordingly.

5688. By Diego Biurrun on 2011-02-22

cookie: Replace some goto/HIP_IFE/HIP_IFEL statements by return error handling.

5689. By Diego Biurrun on 2011-02-22

doxygen: Fix @return comment for hip_create_r1().

5690. By Diego Biurrun on 2011-02-22

Rewrite error handling in hip_create_r1().

Currently error values are set to -1 via HIP_IFEL macros, but in the end
NULL is returned in case of error and the error values are ignored. Change
the HIP_IFEL instances to set the pointer holding the return value to NULL
instead and get rid of the int variable for the error values.

This code will not win a beauty contest, but it eliminates the write-only
integer variable err, which caused warnings with -Wunused-but-set-variable.

5691. By Diego Biurrun on 2011-02-22

whitespace cosmetics

5692. By Diego Biurrun on 2011-02-22

firewall: Remove write-only variables.

This avoids a bunch of warnings with -Wunused-but-set-variable in gcc 4.6.

5693. By Diego Biurrun on 2011-02-22

hipd: Remove write-only variables.

This avoids a bunch of warnings with -Wunused-but-set-variable in gcc 4.6.

5694. By Diego Biurrun on 2011-02-22

Fix return value of hip_ipaddr_modify().

The function was unconditionally returning 0 even though the Doxygen header
claimed it returns negative on error. Make it return the error integer
variable that is set in error conditions throughout the function instead.

5695. By Diego Biurrun on 2011-02-22

Remove write-only variables from the lib and tools subdirectories.

This avoids a bunch of warnings with -Wunused-but-set-variable in gcc 4.6.

5696. By Diego Biurrun on 2011-02-22

Rewrite error handling in hip_firewall_cache_hadb_match().

Currently error values are set to -1 via HIP_IFEL macros, but in the end
NULL is returned in case of error and the error values are ignored. Change
the HIP_IFEL instances to set the pointer holding the return value to NULL
instead and get rid of the int variable for the error values.

This code will not win a beauty contest, but it eliminates the write-only
integer variable err, which caused warnings with -Wunused-but-set-variable.

5697. By Diego Biurrun on 2011-02-22

Avoid using a write-only variable in time_clock().

This avoids a warning with -Wunused-but-set-variable in gcc 4.6.

5698. By Diego Biurrun on 2011-02-23

Remove some write-only variables from fw_port_bindings_performance.

The return value of the benchmarked functions is now discarded instead
of captured in a variable. Stefan and I doublechecked that gcc does not
optimize away the function invocations.

This avoids a bunch of warnings with -Wunused-but-set-variable in gcc 4.6.

5699. By David Martin on 2011-02-23

Rename hip_init_sockets() to hip_register_sockets(). Add doxygen documentation.

hip_init_sockets() is misleading as the function does not initialise the sockets.
Initialisation of the sockets happens in hipd_init(). Instead it registers the
sockets with their associated handler functions and it should be named accordingly.

Added a doxygen comment as well.

5700. By David Martin on 2011-02-23

Add doxygen documentation for hip_register_socket().

5701. By Diego Biurrun on 2011-02-23

Replace u_char BSD type by standard unsigned char.

5702. By Diego Biurrun on 2011-02-23

Update comment that explains the createion of struct inet6_pktinfo.

It is a GNUism that was copied into HIPL and should eventually be removed.

5703. By David Martin on 2011-02-23

Add hip_unregister_sockets() to free socket list.

The memory allocated by hip_register_sockets() was not freed on exit
resulting in a memory leak. This fixes it.

5704. By David Martin on 2011-02-23

Rewrite error handling in hip_register_socket() and catch possible memory leak.

Due to the simplicity of hip_register_socket() the HIP_IFEL macro is not necessary.
The memory allocated for the socketfd struct should be freed in case of an error
to avoid memory leakage.

5705. By Diego Biurrun on 2011-02-24

RPM: Remove unnecessary CentOS hack for installing pixmaps directory.

HIPL does not require that directory and RPMs build fine without the hack.

5706. By Diego Biurrun on 2011-02-24

build system: Consolidate all CentOS 5.5 hacks in configure.ac.

Carrying around CentOS 5.5 hacks in Makefile.am has sideeffects on non-broken
platforms, which is unacceptable. Forcing the user to pass flags to configure
for CentOS is a burden. Adding workarounds in configure.ac is ugly, because
the platform shortcomings are ugly, but causes the least amount of pain.

5707. By Diego Biurrun on 2011-02-24

build system: Fix docdir declaration for CentOS; the hipl/ subdir was missing.

5708. By Diego Biurrun on 2011-02-24

RPM: Place HIPL packages in the correct package groups/sections.

It should be 'System Environment/Daemons' and 'Documentation' for hipl-doc.

5709. By Diego Biurrun on 2011-02-24

RPM: Split summary and description fields in individual package stanzas.

The summary field should just contain a one-line short description.

5710. By Diego Biurrun on 2011-02-24

RPM: Preserve timestamps when installing HIPL init scripts.

5711. By Diego Biurrun on 2011-02-24

RPM: Run setup in quiet mode; this avoids a ton of useless debugging output.

5712. By Diego Biurrun on 2011-02-24

RPM: Fix infrahip HIPL source URL, MIT license name, spelling nits.

5713. By Diego Biurrun on 2011-02-24

RPM: Use SMP flags set by RPM instead of hardcoding '-j 32' as make parameter.

5714. By Diego Biurrun on 2011-02-24

RPM: Use predefined RPM variables when installing files into system paths.

5715. By Diego Biurrun on 2011-02-24

RPM: Remove unused/unwanted files from buildroot after make install.

This avoids some rpmbuild warnings about installed but unpackaged files.

5716. By Diego Biurrun on 2011-02-24

RPM: Add Python (>= 2.4.3) to BuildRequires.

5717. By Diego Biurrun on 2011-02-24

RPM: Set proper attributes on installed files.

This fixes a ton of rpmlint warnings.

5718. By Diego Biurrun on 2011-02-24

RPM: Exit build with unpackaged files.

Now that we have worked around the previously generated warnings we can be
strict about this and avoid further issues from slipping in.

5719. By David Martin on 2011-02-25

Cosmetics: fix some typos in doxygen documentation.

5720. By David Martin on 2011-02-25

Bring back HIP_IFEL error handling for hip_register_socket().

A HIP_IFEL occurrence was removed by myself in an earlier commit. This commit
reverts it and adds a second HIP_IFEL check.

5721. By René Hummen on 2011-03-01

add missing netinet/in.h includes

5722. By René Hummen on 2011-03-01

remove enabling of ip forwarding in /proc at firewall startup

I removed this for several reasons:
1) It was not disabled at hipfw shutdown.
2) The firewall can also be run on end-hosts, where forwarding is not
   desired.
3) There might be situations where IP forwarding is unwanted. However,
   in such case, hipfw could not be executed.

NOTE: Enabling of IP forwarding is already mentioned in the HOWTO.

5723. By René Hummen on 2011-03-01

remove unloading of kernel modules on hipd exit

This functionality is removed for several reasons:
1.) other programs started subsequent to hipd might depend on the loaded
     modules, and
2.) HIPL does currently not support reloading modules on OpenWRT.

5724. By René Hummen on 2011-03-01

rename dummy0 interface to hipl0

The rational behind this change is:
1.) dummy0 does not convey the purpose of the device, and
2.) the name does not instill trust in the maturity of HIPL
as mentioned by Stefan in the corresponding bug entry.

NOTE: The HOWTO does currently not mention retrieving the default HIT
      from the output of ifconfig and similar applications. Hence, there
      there is no need of modifying the documentation.

5725. By René Hummen on 2011-03-01

add HITs from HIP header contents to packet dump

5726. By René Hummen on 2011-03-01

change checksum comment to reflect truth

5727. By René Hummen on 2011-03-01

check packet content before printing debug

5728. By René Hummen on 2011-03-01

replace int state value with corresponding string

NOTE: the packet type will already be shown in the packet dump

5729. By René Hummen on 2011-03-01

modify misleading comment

5730. By René Hummen on 2011-03-01

remove redundant comments

5731. By René Hummen on 2011-03-01

remove incorrect comment

5732. By René Hummen on 2011-03-01

remove redundant address check

hip_hidb_hit_is_our will do the deal.

5733. By René Hummen on 2011-03-01

check dst hit and controls for _all_ BEX messages

5734. By René Hummen on 2011-03-01

remove more redundant per-packet output

5735. By René Hummen on 2011-03-01

mark function parameters as unused

5736. By René Hummen on 2011-03-03

fix setting of dummy interface MTU

dummy0 was hard-coded in the string executed as a command. Replaced
dummy0 by HIP_HIT_DEV to reflect the renaming of the device.

5737. By Diego Biurrun on 2011-03-04

doc: Add section about fixing bzr mistakes and warn against 'bzr uncommit'.

To drive the point about 'bzr uncommit' on central, published repositories
being evil home, the section comes with a tongue-in-cheek warning about the
dire straits awaiting perpetrators :)

5738. By Diego Biurrun on 2011-03-04

doc: Add section about avoiding C system and POSIX namespace pollution.

5739. By Diego Biurrun on 2011-03-04

doc: Adjust path to uncrustify configuration file.

5740. By Diego Biurrun on 2011-03-04

doc: FIX description of the 'make dist' automake target.

5741. By Diego Biurrun on 2011-03-04

doc: Fix sections about RPM and Debian packaging to match current behavior.

5742. By Diego Biurrun on 2011-03-04

doc: Fix a multitude of spelling, wording, formatting and style issues.

5743. By Diego Biurrun on 2011-03-04

Remove unused HIPL_OPENSSL_100 #define.

5744. By Diego Biurrun on 2011-03-04

Remove unnecessary HIPL_OPENSSL_100 macro indirection.

HIPL_OPENSSL_100 was semantically the same as LHASH_OF, so use the latter.

5745. By Diego Biurrun on 2011-03-04

OpenSSL: Restructure LHASH100_CAST handling.

Make the macro a complete cast statement, rename it to LHASH_CAST and skip
defining the macro when LHASH_OF is undefined.

5746. By Diego Biurrun on 2011-03-04

OpenSSL: Add back mistakenly removed LHASH_CAST #define.

LHASH_CAST needs to be #defined both when LHASH_OF is available or not,
so add an empty #define for the latter case.

5747. By Diego Biurrun on 2011-03-04

hashtable.h: Remove unnecessary list.h #include.

5748. By Diego Biurrun on 2011-03-04

Use the LHASH_CAST definition from hashtable.h instead of duplicating it.

5749. By David Martin on 2011-03-05

Cosmetics: make error prints in lmod_register_parameter_type a bit more pretty.

5750. By David Martin on 2011-03-05

Const correctness for lmod_register_parameter_type.

5751. By David Martin on 2011-03-05

Fix typos, clarify doxygen doc and error output for lmod_register_parameter_type.

Typos:
The method registers parameters and not packets.

Parameter types get freed by lmod_uninit_parameter_types and not by
lmod_uninit_packet_types as stated in the doxygen documentation. Make it clear
that the call frees all allocated memory as well.

Error output should reflect what went wrong. In this case a missing identifier
or an already registered parameter type.

5752. By David Martin on 2011-03-05

Fix memory leak, check successful registration in lmod_register_parameter_type().

The allocated memory has to be freed in case of an error.
Check the return value of hip_ll_add() to make sure the parameter does get
registered successfully.

5753. By David Martin on 2011-03-07

Check whether firewall cache db was initialised in hip_firewall_cache_delete_hldb().

Before deleting entries from the database make sure that it was actually
initialised. This fixes the segfault reported in bug 695328.

5754. By David Martin on 2011-03-07

Cosmetics: fix typo in hip_firewall_cache_delete_hldb() debug output.

5755. By Christof Mroz on 2011-03-08

Also free list links in free_esp_tuple().

Rather than just the data they contain.

5756. By Christof Mroz on 2011-03-10

Enable doxygen comment for hip_fw_handle_hip_output().

5757. By Christof Mroz on 2011-03-10

Emit a more specific debug message.

5758. By Christof Mroz on 2011-03-11

Actually do return a negative value on failure, where it is stated in the documentation.

5759. By Christof Mroz on 2011-03-11

Declare hip_list and esp_list as static.

5760. By René Hummen on 2011-03-08

revert revision 5724 -> renaming of dummy device

Aparently, the dummy device dummy0 is created automatically on
insertion of the dummy module. The only option to rename the device
actually would be to create another device via udev as described
here: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430528

An even better way would be to get rid of the dummy device althogther
and to replace it with a tun device. This way we could also get rid of
the Linux-specific raw sockets.

5761. By Christof Mroz on 2011-03-11

Simplify command line string concatenation.

5762. By David Martin on 2011-03-14

Const-correctness for lmod_register_packet_type().

5763. By David Martin on 2011-03-14

Add two missing consts in modularization.h.

Const-correctness of lmod_register_parameter_type() and lmod_register_packet_type()
was added in revision 5750 and 5762 but only in modularization.c. This applies
the change to modularization.h as well.

5764. By Christof Mroz on 2011-03-15

Remove virtual interface address (i.e., the HIT) before assigning it.

Because revision 5723 disabled module unloading, the dummy device was shut down but otherwise left in a non-initialized state.

In particular, the address (HIT) was kept. So on the next start of hipd, assigning the HIT again did not set up the 2001:10::/28 route correctly. Presumably, to netlink it looked like a no-op, because the address is set to the current value after all.
As an added bonus, removing the address probably triggers other side-effects of RTM_NEWADDR that you'd have with a blank interface.

5765. By Christof Mroz on 2011-03-16

Remove all assigned local HITs from the virtual interface on exit.

Also refactored hip_add_iface_local_hit() a bit in the process.

5766. By René Hummen on 2011-03-16

fix IS_LSI32 and IS_IPV4_LOOPBACK macros

Both macros checked for the wrong addresses on ARM platforms.
Specifically, they matched x.y.z.1 and x.y.z.127 respectively.

5767. By René Hummen on 2011-03-16

output error message in case hit/lsi resolves to hit/lsi

5768. By Christof Mroz on 2011-03-16

Fix const-correctness of hip_manage_iface_local_hit()

5769. By Christof Mroz on 2011-03-17

Define a more readable interface to hip_manage_iface_local_hit().

5770. By Christof Mroz on 2011-03-18

Merged rename-camelcased branch.

5771. By René Hummen on 2011-03-18

change startup option of hipfw on OpenWRT

The midauth extensions is currently broken and needs fixing. Furthermore,
use the firewall's kill switch in order to have comparable start-up
behaviour as hipd.

5772. By David Martin on 2011-03-18

Do not reset or free DH shared key in hip_handle_r1().

This fixes a memory leak as the reference to the allocated memory was lost by
resetting the pointer to NULL. The memory gets free'd during close procedure
in hip_del_peer_info_entry(), therefore remove the free() call in hip_handle_r1()
and adjust the comment in hip_create_keying_material() to reflect the change.

5773. By David Martin on 2011-03-18

Actually return -1 on error in hip_insert_dh() as stated in the documentation.

5774. By David Martin on 2011-03-18

Const-correctness for hip_generate_dh_key().

5775. By David Martin on 2011-03-18

Cosmetics: fix two typos and correct the placement of a parameter documentation.

in hip_produce_keying_material(): the documentation for the parameters should be
in the same order as the parameters themselves.

5776. By David Martin on 2011-03-21

On exit free memory allocated for Diffie-Hellman key generation.

Not all memory allocated with DH_new() gets free'd by DH_free(). Calling
CRYPTO_cleanup_all_ex_data() in hip_dh_uninit() when exiting hipd takes
care of that.

5777. By David Martin on 2011-03-21

Free memory allocated for state initialization functions on hipd exit.

During startup memory gets allocated for a linked list holding state initialization
functions but it is not free'd again. This commit introduces
lmod_uninit_state_init_functions() which frees the allocated memory and is called
by hip_exit() on shutdown.

5778. By Christof Mroz on 2011-03-22

Handle multiple invocations of signal handler.

5779. By Christof Mroz on 2011-03-22

Attempt graceful exit on failed assert(), using a SIGABRT handler.

5780. By Christof Mroz on 2011-03-22

Merged hipfw-split-main branch.

5781. By David Martin on 2011-03-22

Always close the opened file after reading / writing the certificate config.

During startup the certificate config file is read with fopen() but only
closed again when it is not yet existing. Make sure to close it in any case
to free the memory allocated during the access.

5782. By Diego Biurrun on 2011-03-23

autobuilder: Fix path to scratchbox environment, which was moved on the server.

5783. By Diego Biurrun on 2011-03-23

autobuild: Reenable scratchbox compilation test.

Now that the scratchbox environment is set up again, it should work.

5784. By Christof Mroz on 2011-03-24

Don't call cleanup routine on assertion.

This reverts revision 5779.

5785. By Diego Biurrun on 2011-03-24

Replace some pointless instances of HIP_IFEL by returns.

When HIP_IFEL is just used to return an integer, it makes more sense
to avoid the goto and the macro indirection.

5786. By Diego Biurrun on 2011-03-24

Remove some completely pointless debug statements.

5787. By Diego Biurrun on 2011-03-24

Remove some completely pointless debug statements.

5788. By Diego Biurrun on 2011-03-24

cosmetics: Place some '*' differently to make uncrustify happy.

5789. By Diego Biurrun on 2011-03-24

Remove unused struct hip_entry_list.

5790. By Diego Biurrun on 2011-03-24

Merge c99_declarations branch to get rid of most C++/C99 declarations.

5791. By Diego Biurrun on 2011-03-25

test/firewall: Add stdlib.h #include for mkstemp.

5792. By Diego Biurrun on 2011-03-25

autobuilder: Disable scratchbox test again until scratchbox is properly set up.

5793. By Diego Biurrun on 2011-03-25

build system: Link against firewall object files instead of #including .c files.

If a .c file needs symbols from other .c files then either all of them have to
be #included or the object files linked to the unit test; just link them to the
unit test right away.

This will simplify some firewall unit tests being added in other branches.

5794. By Diego Biurrun on 2011-03-27

cosmetics: Remove redundant parentheses around complete expressions.

5795. By Diego Biurrun on 2011-03-29

Mark hip_opp_get_hadb_entry() as static; it is only used within the file.

5796. By Diego Biurrun on 2011-03-29

Remove declaration for nonexisting hip_uninit_cipher() function.

5797. By Diego Biurrun on 2011-03-29

Move declaration for hip_init_cipher() to hipd/dh.h, where it belongs.

5798. By Diego Biurrun on 2011-03-29

Mark hip_get_any_localhost_hit() as static; it is only used within the file.

5799. By Stefan Götz on 2011-03-29

Introduce an initializer for 'struct hip_ll'. This allows to initialize a 'struct hip_ll' object statically in addition to the 'hip_ll_init()' function that needs to be called at runtime.

5800. By Stefan Götz on 2011-03-29

Add a necessary cast to the list initialization.

Without the cast, the code doesn't compile. It's rice cake, baby.

5801. By Stefan Götz on 2011-03-29

Add error handling to insert_connection_from_update().

So far, this function assumed that all memory allocations succeed without
checking that. This change introduces these checks and makes sure that
there are no memory leaks when the function aborts with an error.

5802. By Diego Biurrun on 2011-03-29

Mark hip_remove_iface_local_hit() as static; it is only used within the file.

5803. By Diego Biurrun on 2011-03-29

Make hip_del_pending_request_by_type() static; it is only used within the file.

5804. By Diego Biurrun on 2011-03-29

Move hip_use_userspace_ipsec extern declaration to hipd.h, where it belongs.

5805. By Diego Biurrun on 2011-03-29

Remove unused global variable hip_user_addr from hipd.

5806. By Diego Biurrun on 2011-03-29

Make hip_cert_spki_create_cert_sock() static; it is unused outside of the file.

5807. By Diego Biurrun on 2011-03-29

Make hip_dsa_*/hip_rsa_* functions only used within the file static.

5808. By Diego Biurrun on 2011-03-29

Make hip_reinject_packet() static, it is unused outside of the file.

5809. By Diego Biurrun on 2011-03-29

Make list_last() static, it is unused outside of its source file.

5810. By Stefan Götz on 2011-03-29

In insert_connection_from_update(), add NULL-pointer checks to error handler to avoid derefencing NULL pointers.

Thanks to Christof for spotting this in rev 5801.

5811. By David Martin on 2011-04-01

Cosmetics: reorder comparisons in if-statements in modularization.c.

When comparing the return value of a function to an integer, place the latter
on the right side of the equation.

5812. By Stefan Götz on 2011-04-02

Merge lp:~stefan.goetz/hipl/esp-destination-addresses / merge proposal 55640
https://code.launchpad.net/~stefan.goetz/hipl/esp-destination-addresses/+merge/55640

5813. By Miika Komu on 2011-04-02

Documented an issue related to the DNS proxy.

DNS proxy succeeded in injecting HITs from /etc/hip/hosts when invoked
with e.g. "host" command. However, the same failed to occur with a
normal application such as ssh.

Artturi spotted that the issue was not with the DNS proxy itself. After
some inspecting, I believe something has changed in libc of Ubuntu Lucid
and onwards because there hasn't been virtually any changes in the DNS
proxy.

The issue can be solved by modifying /etc/nsswitch.conf as I have now
documented in HOWTO.xml. See bug id #724246 in launchpad for further
information.

5814. By Christof Mroz on 2011-04-03

Revert update_esp_address() signature, and replace one inlined instance of it by a function call.

This was refactored to eliminate the esp_tuple parameter.
But Passing the whole tuple is actually nice: There is one unified hook to catch all address updates per-tuple, e.g. for writing extensions.

5815. By Christof Mroz on 2011-04-03

Revert one more inlining of update_esp_address().

Same rationale as detailed in commit log of rev 5814.

5816. By Christof Mroz on 2011-04-03

Clarify documentation of update_esp_address().

5817. By Stefan Götz on 2011-04-04

misc const correctness fixes

This was extracted from the hip-ll-extensions branch, courtesy of Stefan Götz.

5818. By Diego Biurrun on 2011-04-04

cosmetics: Reorder #includes to follow coding guidelines.

5819. By Diego Biurrun on 2011-04-04

Move esp_prot_transforms declaration to the only place it is used.

5820. By Diego Biurrun on 2011-04-04

Eliminate write-only variable load_time.

5821. By Diego Biurrun on 2011-04-04

Add some required #includes that were previously missed and used implicitly.

5822. By Diego Biurrun on 2011-04-04

Remove a bunch of unused global variables.

5823. By Diego Biurrun on 2011-04-04

Move number_dh_keys global variable into the only scope it is used in.

5824. By Diego Biurrun on 2011-04-04

Eliminate unnecessary global variables in test programs.

5825. By René Hummen on 2011-04-04

enable building HIPL for maemo5

directly use our make setup instead of dpkg-buildpackage.

5826. By René Hummen on 2011-04-04

fix copy-paste error in auto-builder

Replace $VERSION variable with regular expression.

5827. By Christof Mroz on 2011-04-05

Merged lp:~christof-mroz/hipl/mock-functions branch.

5828. By Christof Mroz on 2011-04-05

Merged lp:~christof-mroz/hipl/hipfw-timeout branch.

5829. By Christof Mroz on 2011-04-05

Merged lp:~christof-mroz/hipl/hipfw-esp-speedup branch.

5830. By Christof Mroz on 2011-04-05

Added missing doxygen parameter documentation.

5831. By Diego Biurrun on 2011-04-05

Fix copyright year in newly-added file.

5832. By Diego Biurrun on 2011-04-05

cosmetics: Sort entries in HIPL_HEADER_LOCATIONS differently.

5833. By Diego Biurrun on 2011-04-05

Move hip_firewall_is_alive() declaration to maintenance.h, where it belongs.

5834. By Diego Biurrun on 2011-04-05

Move extern variable declarations for maintenance.c to maintenance.h.

5835. By Diego Biurrun on 2011-04-05

Mark hip_private_rsa_host_id_to_hit() as static.

The function is unused outside of the file it is defined in.

5836. By Diego Biurrun on 2011-04-05

Mark action_handler function as static, it is unused outside of the file.

5837. By Diego Biurrun on 2011-04-05

Mark global variables unused outside of their translation units as static.

5838. By René Hummen on 2011-04-06

add missing includes

Missing <string.h> cause compiler issues in scratchbox environment.

5839. By René Hummen on 2011-04-06

remove constness from esp_tuple pointer

The scratchbox environment would not compile otherwise.

5840. By René Hummen on 2011-04-06

remove unnecessary include for tcp

5841. By René Hummen on 2011-04-06

remove configure option "opportunistic" and related ifdefs

We have always been running HIPL with the remaining basic opportunistic
mode enabled. The functionality didn't cause any trouble (fairly limited
code size). So, removing an unnecessary compilation path.

5842. By René Hummen on 2011-04-06

Minor refactoring of struct hip_fw_context

Make packet type constants globally available as an enum, and remove
unused TCP packet type. This change was originally made by Christof Mroz.

5843. By René Hummen on 2011-04-06

Unit test for IPv4 and UDP checksum routines.

These unit-tests have originally been implemented by Christof Mroz.

5844. By Christof Mroz on 2011-04-06

Don't export fixed return value of system(3) mock as a (currently unused) global variable.

This can easily be reintroduced when needed later.

5845. By Christof Mroz on 2011-04-06

Specify correct year in license boilerplate for newly added files.

5846. By René Hummen on 2011-04-07

fix unused variable issue

Some variables are only used with CONFIG_HIP_RVS enabled. Before, these
variables were dependent on CONFIG_HIP_OPPORTUNISTIC, which was removed
earlier.

5847. By René Hummen on 2011-04-07

remove --enable/--disable-opportunistic from autobuilder options

5848. By René Hummen on 2011-04-07

Split monolithic R1 handler into a number of smaller handlers.

This allows for more granular module hooking. The current R1 handler was too
monolithic to incorporate midauth as a module, for example. This is mostly
needed to ensure the correct parameter order in the packet. This split has
originally been done by Christof Mroz.

5849. By Christof Mroz on 2011-04-02

Move keymat generation code back to its original place.

The keymat must be generated before producing any parameters. This was violated by the previous commit but has been restored now.

Also added some (related) const qualifiers to ensure that the input packet is not modified, avoiding confusion in subsequently called handler functions.
We are striving for modularization in this branch, after all.

5850. By René Hummen on 2011-04-07

remove unused parameter from hip_produce_keying_material()

5851. By René Hummen on 2011-04-07

remove pointless changing of byte-order

5852. By René Hummen on 2011-04-08

remove write-only variables solved_puzzle and I

5853. By Diego Biurrun on 2011-03-29

Remove unused function hip_del_peer_info().

5854. By Diego Biurrun on 2011-04-08

Fix compilation when libconfig is not available on the system.

Some symbols were recently made static, but only used if libconfig was
detected during compilation. Surround these symbols by the appropriate
#ifdef to protect against the compiler complaining about unused symbols.

5856. By René Hummen on 2011-04-08

split mac and sign function into parameter handler and general function

We now have the function with an API to be used directly and one
to be used in combination with packet handling. This will be needed
by the mobility extension.

5857. By René Hummen on 2011-04-08

add test/check_lib_tool to bzr ignore list

5858. By René Hummen on 2011-04-08

rename update_legacy.{c,h} to update_locator.{c,h}

The only code in update_legacy.c is locator related. Furthermore, locator-
related functionality is also located in update.c. This prepares moving
of locator-related functionality to the renamed file.

5859. By René Hummen on 2011-04-11

fixed return value for failing malloc

5860. By René Hummen on 2011-04-11

add constness to hip_mac_and_sign_packet()

5861. By René Hummen on 2011-04-11

document cron integration of the auto-builder

5862. By David Martin on 2011-04-11

On hipd exit free memory allocated for parameter types.

hip_exit() now calls lmod_uninit_parameter_types() so that memory allocated
for the parameter types will be free'd on exit.

5863. By David Martin on 2011-04-12

In make_env() use strcpy() instead of strcat() to copy a string to allocated memory.

strcat() uses the null-termination of the destination to decide where to append
a string. Using it to write into freshly allocated uninitialised memory results
in undefined behaviour as it writes wherever the first \0 occurs. Use strcpy()
instead.

5864. By René Hummen on 2011-04-12

fix inclusion guards

5865. By René Hummen on 2011-04-13

refactor update functions to work on packets instead of parameters

This step has been done to prepare for the upcoming update refactoring.

5866. By René Hummen on 2011-04-13

move handle_locator() to update module

5867. By René Hummen on 2011-04-13

move locator-related functionality to update_locator.c

5868. By René Hummen on 2011-04-13

make update_types available to modules depending on update

5869. By René Hummen on 2011-04-13

move hip_handle_locator_parameter() to new file

also move dependent static functions to the same file and make
struct update_state accessible outside update.c.

5870. By René Hummen on 2011-04-13

fix doxygen comments

5871. By René Hummen on 2011-04-13

split mobility handle functions into parameter handle functions

Hook the new parameter handle functions into the modularization
framework.

NOTE: We cannot differentiate between different UPDATE packets by packet
      type and hook the corresponding parameter handle functions
      correspondingly. Instead, we need to classify the packet at the
      beginning of each parameter handler.

5872. By René Hummen on 2011-04-13

make check for locator conditional

The locator parameter is only included in the first update packet.

5873. By René Hummen on 2011-04-13

remove UNUSED keyword from parameter in header

5874. By René Hummen on 2011-04-13

make update of SAs dependent on packet classification

5875. By René Hummen on 2011-04-13

always reply to an echo request parameter independent from classification

5876. By René Hummen on 2011-04-13

remove variable indirection of update_type

5877. By René Hummen on 2011-04-13

fix doxygen comments

[René Hummen (rene-hummen)]

> > +/**
> > + * Retrieve the number of locators inside a LOCATOR parameter.
> > + * Type 1 and 2 parameters are supported.
> > + *
> > + * @param locator a LOCATOR parameter
> > + * @return the number of locators
> > + */
> > +int hip_get_locator_addr_item_count(const struct hip_locator *locator)
> > +{
> > + const char *address_pointer = (const char *) (locator + 1);
> > + int loc_count = 0;
> > + uint8_t type;
> > +
> > + while (address_pointer <
> > + ((const char *) locator) + hip_get_param_contents_len(locator))
> {
> > + type = ((const struct hip_locator_info_addr_item *)
> > + address_pointer)->locator_type;
>
> The casting is making my head spin.
>
> > + if (type == HIP_LOCATOR_LOCATOR_TYPE_UDP) {
> > + address_pointer += sizeof(struct hip_locator_info_addr_item2);
> > + loc_count += 1;
> > + } else if (type == HIP_LOCATOR_LOCATOR_TYPE_ESP_SPI
> > + || type == HIP_LOCATOR_LOCATOR_TYPE_IPV6) {
>
> nit: This could be more readable with the || on the previous line.
>
> > + address_pointer += sizeof(struct hip_locator_info_addr_item);
> > + loc_count += 1;
> > + } else {
> > + address_pointer += sizeof(struct hip_locator_info_addr_item);
> > + }
> > + }
> > + return loc_count;
> > +}
>
> I know HIPL is full of similar stuff, but all this pointer arithmetic
> trickery is brittle and not the way forward. We should try to work
> with assignments and accessor functions instead IMO.

While I agree that pointer arithmetic is not we want to go, refactoring of the LOCATOR parameter is not in the focus of this branch.

[lp:~rene-hummen/hipl/mobility-fixes]

5878. By René Hummen on 2011-04-13

fix inclusion guards

5879. By René Hummen on 2011-04-15

replace HIP_IFELs by if statements where appropriate

5880. By René Hummen on 2011-04-15

replace ipv6_addr_copy() by assignments

5881. By René Hummen on 2011-04-15

remove mask variable

it is only used once in a function call as an input parameter.

5882. By René Hummen on 2011-04-18

add const-correctness

5883. By René Hummen on 2011-04-18

remove unnecessary variable-indirection

5884. By René Hummen on 2011-04-18

fix doxygen comments

5885. By René Hummen on 2011-04-19

merge trunk revision 5879

Unmerged revisions

5885. By René Hummen on 2011-04-19

merge trunk revision 5879

5884. By René Hummen on 2011-04-18

fix doxygen comments

5883. By René Hummen on 2011-04-18

remove unnecessary variable-indirection

5882. By René Hummen on 2011-04-18

add const-correctness

5881. By René Hummen on 2011-04-15

remove mask variable

it is only used once in a function call as an input parameter.

5880. By René Hummen on 2011-04-15

replace ipv6_addr_copy() by assignments

5879. By René Hummen on 2011-04-15

replace HIP_IFELs by if statements where appropriate

5878. By René Hummen on 2011-04-13

fix inclusion guards

5877. By René Hummen on 2011-04-13

fix doxygen comments

5876. By René Hummen on 2011-04-13

remove variable indirection of update_type

=== modified file 'modules/heartbeat_update/hipd/hb_update.c'
--- modules/heartbeat_update/hipd/hb_update.c	2011-04-13 09:15:41 +0000
+++ modules/heartbeat_update/hipd/hb_update.c	2011-04-13 13:57:39 +0000
@@ -58,10 +58,8 @@
 static int hip_hb_update_trigger(struct hip_hadb_state *hadb_entry,
                                  UNUSED void *opaque)
 {
-    int                                err               = 0;
-    uint8_t                           *heartbeat_counter = NULL;
-    struct hip_common                 *locator_msg       = NULL;
-    struct hip_locator_info_addr_item *locators          = NULL;
+    int      err               = 0;
+    uint8_t *heartbeat_counter = NULL;
 
     if ((hadb_entry->state == HIP_STATE_ESTABLISHED) &&
         (hadb_entry->outbound_sa_count > 0)) {
@@ -71,24 +69,14 @@
         if (*heartbeat_counter >= hip_heartbeat_trigger_update_threshold) {
             HIP_DEBUG("HEARTBEAT counter reached threshold, trigger UPDATE\n");
 
-            HIP_IFEL(!(locator_msg = hip_msg_alloc()), -ENOMEM,
-                     "Out of memory while allocation memory for the packet\n");
-            HIP_IFE(hip_create_locators(locator_msg, &locators), -1);
-
-            HIP_IFEL(hip_send_update_to_one_peer(NULL,
-                                                 hadb_entry,
-                                                 &hadb_entry->our_addr,
-                                                 &hadb_entry->peer_addr,
-                                                 locators,
-                                                 HIP_UPDATE_LOCATOR),
-                     -1, "Failed to trigger update\n");
+            HIP_IFEL(hip_trigger_update(hadb_entry),
+                     -1, "failed to trigger update\n");
 
             *heartbeat_counter = 0;
         }
     }
 
 out_err:
-    free(locator_msg);
     return err;
 }
 

=== modified file 'modules/update/hipd/update.c'
--- modules/update/hipd/update.c	2011-04-13 13:32:46 +0000
+++ modules/update/hipd/update.c	2011-04-13 13:57:39 +0000
@@ -28,297 +28,70 @@
  * This file defines various functions for sending, handling and receiving
  * UPDATE packets for the Host Identity Protocol (HIP)
  *
- * @author  Baris Boyvat <baris#boyvat.com>
+ * @author Baris Boyvat <baris#boyvat.com>
+ * @author Rene Hummen
  */
 
 #define _BSD_SOURCE
 
 #include <errno.h>
-#include <stdint.h>
 #include <string.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <openssl/lhash.h>
-#include <openssl/rand.h>
 
 #include "config.h"
 #include "hipd/cookie.h"
-#include "hipd/esp_prot_hipd_msg.h"
 #include "hipd/hadb.h"
+#include "hipd/hidb.h"
 #include "hipd/hipd.h"
 #include "hipd/input.h"
 #include "hipd/maintenance.h"
 #include "hipd/netdev.h"
 #include "hipd/nsupdate.h"
 #include "hipd/output.h"
-#include "hipd/pisa.h"
 #include "hipd/pkt_handling.h"
 #include "hipd/user.h"
-#include "lib/core/common.h"
-#include "lib/core/crypto.h"
+#include "lib/core/builder.h"
 #include "lib/core/debug.h"
-#include "lib/core/hashtable.h"
 #include "lib/core/hip_udp.h"
 #include "lib/core/ife.h"
-#include "lib/core/list.h"
-#include "lib/core/performance.h"
+#include "lib/core/modularization.h"
 #include "lib/core/prefix.h"
-#include "lib/core/protodefs.h"
-#include "lib/core/solve.h"
-#include "lib/core/modularization.h"
+#include "lib/core/state.h"
 #include "update_builder.h"
 #include "update_locator.h"
 #include "update_param_handling.h"
 #include "update.h"
 
-
-/**
- * hip_update_get_out_id
- *
- * @note RFC 5201 Section 5.2.13:
- *       Notice that the section says 'The Update ID is an unsigned quantity,
- *       initialized by a host to zero upon moving to ESTABLISHED state' and
- *       'The Update ID is incremented by one before each new UPDATE that is
- *       sent by the host; the first UPDATE packet originated by a host has
- *       an Update ID of 0'. Therefore we initialize the Update ID with 0 and
- *       increment this value before a new UPDATE packet is sent. Because the
- *       first UPDATE packet should contain 0 as value, we need to decrement
- *       the packet value by one for each UPDATE packet.
- *
- * @param state Pointer to the update state.
- *
- * @return The next UPDATE out ID if state is set, -1 on error
- */
-static inline uint32_t hip_update_get_out_id(struct update_state *state)
-{
-    if (state) {
-        return state->update_id_out - 1;
-    } else {
-        return -1;
-    }
-}
-
-/**
- * construct any UPDATE message based on an incoming UPDATE packet
- *
- * @param received_update_packet the received UPDATE packet if any
- * @param ha the related host association
- * @param update_packet_to_send a preallocated message where the UPDATE
- *                              packet will be written
- * @param locators the locators of the local host
- * @param type the type of the incoming packet
- * @return zero on success or negative on failure
- *
- * @todo : should we implement base draft update with ifindex 0 stuff ??
- * @todo :  Divide this function into more pieces, handle_spi, handle_seq, etc
- * @todo : Remove the uncommented lines?
- */
-static int hip_create_update_msg(struct hip_common *received_update_packet,
-                                 struct hip_hadb_state *ha,
-                                 struct hip_common *update_packet_to_send,
-                                 struct hip_locator_info_addr_item *locators,
-                                 int type)
-{
-    int                            err              = 0;
-    uint32_t                       esp_info_old_spi = 0, esp_info_new_spi = 0;
-    uint16_t                       mask             = 0;
-    const struct hip_seq          *seq              = NULL;
-    const struct hip_echo_request *echo_request     = NULL;
-    struct update_state           *localstate       = NULL;
-
-    HIP_DEBUG("Creating the UPDATE packet\n");
-
-    if (type != HIP_UPDATE_LOCATOR) {
-        HIP_DEBUG("UPDATE without locators\n");
-    }
-
-    hip_build_network_hdr(update_packet_to_send,
+/**
+ * Prepare the creation of a new UPDATE packet.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+static int hip_prepare_update_response(UNUSED const uint8_t packet_type,
+                                       UNUSED const uint32_t ha_state,
+                                       struct hip_packet_context *ctx)
+{
+    uint16_t mask = 0;
+
+    hip_msg_init(ctx->output_msg);
+
+    hip_build_network_hdr(ctx->output_msg,
                           HIP_UPDATE,
                           mask,
-                          &ha->hit_our,
-                          &ha->hit_peer);
-
-    // Add ESP_INFO
-    if (type == HIP_UPDATE_LOCATOR      ||
-        type == HIP_UPDATE_ECHO_REQUEST ||
-        type == HIP_UPDATE_ESP_ANCHOR_ACK) {
-        // Handle SPI numbers
-        esp_info_old_spi = ha->spi_inbound_current;
-        esp_info_new_spi = ha->spi_inbound_current;
-
-        HIP_DEBUG("esp_info_old_spi=0x%x esp_info_new_spi=0x%x\n",
-                  esp_info_old_spi, esp_info_new_spi);
-
-        HIP_IFEL(hip_build_param_esp_info(update_packet_to_send,
-                                          ha->current_keymat_index,
-                                          esp_info_old_spi, esp_info_new_spi),
-                 -1, "Building of ESP_INFO param failed\n");
-    }
-
-    // Add LOCATOR
-    if (type == HIP_UPDATE_LOCATOR) {
-        HIP_DEBUG("locators = 0x%p locator_count = %d\n", locators, address_count);
-        err = hip_build_param_locator(update_packet_to_send, locators, address_count);
-    }
-
-#ifdef CONFIG_HIP_MIDAUTH
-    /* TODO: no caching is done for PUZZLE_M parameters. This may be
-     * a DOS attack vector.
-     */
-    if (received_update_packet && type == HIP_UPDATE_ECHO_REQUEST) {
-        HIP_IFEL(hip_solve_puzzle_m(update_packet_to_send, received_update_packet), -1,
-                 "Building of Challenge_Response failed\n");
-    } else {
-        HIP_DEBUG("msg is NULL, midauth parameters not included in reply\n");
-    }
-
-    /* TODO: no caching is done for PUZZLE_M parameters. This may be
-     * a DOS attack vector.
-     */
-    if (type == HIP_UPDATE_ECHO_RESPONSE) {
-        HIP_IFEL(hip_solve_puzzle_m(update_packet_to_send, received_update_packet), -1,
-                 "Building of Challenge_Response failed\n");
-    }
-#endif
-
-    // Add SEQ
-    if (type == HIP_UPDATE_LOCATOR      ||
-        type == HIP_UPDATE_ECHO_REQUEST ||
-        type == HIP_UPDATE_ESP_ANCHOR) {
-        localstate = lmod_get_state_item(ha->hip_modular_state, "update");
-        localstate->update_id_out++;
-        HIP_DEBUG("outgoing UPDATE ID=%u\n", hip_update_get_out_id(localstate));
-        /** @todo Handle this case. */
-        HIP_IFEL(hip_build_param_seq(update_packet_to_send,
-                                     hip_update_get_out_id(localstate)),
-                 -1,
-                 "Building of SEQ parameter failed\n");
-
-        /************************************************/
-    }
-
-    // Add ACK
-    if (type == HIP_UPDATE_ECHO_REQUEST  ||
-        type == HIP_UPDATE_ECHO_RESPONSE ||
-        type == HIP_UPDATE_ESP_ANCHOR_ACK) {
-        HIP_IFEL(!(seq = hip_get_param(received_update_packet,
-                                       HIP_PARAM_SEQ)),
-                 -1, "SEQ not found\n");
-
-        HIP_IFEL(hip_build_param_ack(update_packet_to_send,
-                                     ntohl(seq->update_id)),
-                 -1, "Building of ACK failed\n");
-    }
-
-    if (type == HIP_UPDATE_ESP_ANCHOR) {
-        HIP_IFEL(esp_prot_update_add_anchor(update_packet_to_send, ha),
-                 -1, "failed to add esp_prot anchor element\n");
-    }
-
-#ifdef CONFIG_HIP_MIDAUTH
-
-    if (type == HIP_UPDATE_ECHO_RESPONSE) {
-        HIP_IFEL(hip_build_param(update_packet_to_send, ha->our_pub), -1,
-                 "Building of host id failed\n");
-    }
-
-    if (type == HIP_UPDATE_ECHO_REQUEST) {
-        char *midauth_cert = hip_pisa_get_certificate();
-
-        HIP_IFEL(hip_build_param(update_packet_to_send, ha->our_pub), -1,
-                 "Building of host id failed\n");
-
-        /* For now we just add some random data to see if it works */
-        HIP_IFEL(hip_build_param_cert(update_packet_to_send,
-                                      1,
-                                      1,
-                                      1,
-                                      1,
-                                      midauth_cert,
-                                      strlen(midauth_cert)),
-                 -1,
-                 "Building of cert failed\n");
-    }
-
-#endif
-
-    /* Add ECHO_REQUEST (signed)
-     * Notice that ECHO_REQUEST is same for the identical UPDATE packets
-     * sent between different address combinations.
-     */
-    if (type == HIP_UPDATE_ECHO_REQUEST) {
-        HIP_HEXDUMP("ECHO_REQUEST in the host association",
-                    ha->echo_data, sizeof(ha->echo_data));
-        HIP_IFEL(hip_build_param_echo(update_packet_to_send,
-                                      ha->echo_data,
-                                      sizeof(ha->echo_data),
-                                      1,
-                                      1),
-                 -1,
-                 "Building of ECHO_REQUEST failed\n");
-    }
-
-    /* Add ECHO_RESPONSE (signed) */
-    if (type == HIP_UPDATE_ECHO_RESPONSE) {
-        echo_request = hip_get_param(received_update_packet,
-                                     HIP_PARAM_ECHO_REQUEST_SIGN);
-        HIP_IFEL(!echo_request, -1, "ECHO REQUEST not found!\n");
-
-        HIP_DEBUG("echo opaque data len=%d\n",
-                  hip_get_param_contents_len(echo_request));
-        HIP_HEXDUMP("ECHO_REQUEST ",
-                    (const uint8_t *) echo_request + sizeof(struct hip_tlv_common),
-                    hip_get_param_contents_len(echo_request));
-        HIP_IFEL(hip_build_param_echo(update_packet_to_send,
-                                      (const uint8_t *) echo_request + sizeof(struct hip_tlv_common),
-                                      hip_get_param_contents_len(echo_request), 1, 0),
-                 -1, "Building of ECHO_RESPONSE failed\n");
-    }
-
-    // Add HMAC
-    HIP_IFEL(hip_build_param_hmac_contents(update_packet_to_send,
-                                           &ha->hip_hmac_out), -1, "Building of HMAC failed\n");
-
-    // Add SIGNATURE
-    HIP_IFEL(ha->sign(ha->our_priv_key, update_packet_to_send), -EINVAL,
-             "Could not sign UPDATE. Failing\n");
-
-
-out_err:
-    return err;
-}
-
-/**
- * deliver an UPDATE packet to the network
- *
- * @param update_packet_to_send the packet to deliver
- * @param ha host association
- * @param src_addr the source address to use for sending
- * @param dst_addr the destination address to use for sending
- * @return zero on success or negative on failure
- */
-static int hip_send_update_pkt(struct hip_common *update_packet_to_send,
-                               struct hip_hadb_state *ha,
-                               const struct in6_addr *src_addr,
-                               const struct in6_addr *dst_addr)
-{
-    int       err        = 0;
-    const int retransmit = 1;
-
-    /** @todo set the local address unverified for that dst_hit(); */
-    err = hip_send_pkt(src_addr,
-                       dst_addr,
-                       (ha->nat_mode ? hip_get_local_nat_udp_port() : 0),
-                       ha->peer_udp_port,
-                       update_packet_to_send,
-                       ha,
-                       retransmit);
-
-    return err;
-}
-
-/**
- * choose a sensible source address for an UPDATE packet with LOCATOR
+                          &ctx->hadb_entry->hit_our,
+                          &ctx->hadb_entry->hit_peer);
+
+    return 0;
+}
+
+/**
+ * Choose a sensible source address for an UPDATE packet with LOCATOR
  *
  * @param ha the related host association
  * @param src_addr currently unused
@@ -383,353 +156,6 @@
 }
 
 /**
- * a wrapper function to handle any incoming UPDATE packet
- *
- * @param received_update_packet the received UPDATE packet if any
- * @param ha the related host association
- * @param src_addr the source address of the received packet
- * @param dst_addr the destination address of the received packet
- * @param locators the locators of the local host
- * @param type the type of the received packet
- * @return zero on success or negative on failure
- *
- * @todo locators should be sent to the whole verified addresses?
- */
-int hip_send_update_to_one_peer(struct hip_common *received_update_packet,
-                                struct hip_hadb_state *ha,
-                                struct in6_addr *src_addr,
-                                struct in6_addr *dst_addr,
-                                struct hip_locator_info_addr_item *locators,
-                                int type)
-{
-    int                  err                   = 0, i = 0;
-    LHASH_NODE          *item                  = NULL, *tmp = NULL;
-    struct hip_common   *update_packet_to_send = NULL;
-    struct update_state *localstate            = NULL;
-    struct in6_addr      local_addr;
-
-    HIP_IFEL(!(update_packet_to_send = hip_msg_alloc()), -ENOMEM,
-             "Out of memory while allocation memory for the update packet\n");
-    err = hip_create_update_msg(received_update_packet, ha,
-                                update_packet_to_send, locators, type);
-    if (err) {
-        goto out_err;
-    }
-
-    switch (type) {
-    case HIP_UPDATE_LOCATOR:
-        HIP_IFEL(hip_select_local_addr_for_first_update(ha,
-                                                        src_addr,
-                                                        dst_addr,
-                                                        &local_addr),
-                 -1,
-                 "No source address found for first update\n");
-        HIP_DEBUG_IN6ADDR("Sending update from", &local_addr);
-        HIP_DEBUG_IN6ADDR("to", dst_addr);
-
-        hip_send_update_pkt(update_packet_to_send, ha, &local_addr,
-                            dst_addr);
-
-        break;
-    case HIP_UPDATE_ECHO_RESPONSE:
-        HIP_DEBUG_IN6ADDR("Sending update from", src_addr);
-        HIP_DEBUG_IN6ADDR("to", dst_addr);
-
-        hip_send_update_pkt(update_packet_to_send, ha, src_addr,
-                            dst_addr);
-
-        break;
-    case HIP_UPDATE_ECHO_REQUEST:
-        localstate = lmod_get_state_item(ha->hip_modular_state, "update");
-
-        // Randomize the echo response opaque data before sending ECHO_REQUESTS.
-        // Notice that we're using the same opaque value for the identical
-        // UPDATE packets sent between different address combinations.
-        RAND_bytes(ha->echo_data, sizeof(ha->echo_data));
-
-        list_for_each_safe(item, tmp, localstate->addresses_to_send_echo_request, i) {
-            dst_addr = list_entry(item);
-
-            if (!are_addresses_compatible(src_addr, dst_addr)) {
-                continue;
-            }
-
-            HIP_DEBUG_IN6ADDR("Sending echo requests from", src_addr);
-            HIP_DEBUG_IN6ADDR("to", dst_addr);
-
-            hip_send_update_pkt(update_packet_to_send, ha,
-                                src_addr, dst_addr);
-        }
-
-        break;
-    case HIP_UPDATE_ESP_ANCHOR:
-    case HIP_UPDATE_ESP_ANCHOR_ACK:
-        // TODO re-implement sending of esp prot anchors
-        HIP_DEBUG_IN6ADDR("Sending update from", src_addr);
-        HIP_DEBUG_IN6ADDR("to", dst_addr);
-
-        hip_send_update_pkt(update_packet_to_send, ha, src_addr, dst_addr);
-        break;
-    }
-
-out_err:
-    free(update_packet_to_send);
-    return err;
-}
-
-/**
- * publish the locator set of the local host to all peers
- *
- * @return zero on success or negative on failure
- */
-static int hip_send_locators_to_all_peers(void)
-{
-    int                                err = 0, i = 0;
-    struct hip_locator_info_addr_item *locators;
-    struct hip_hadb_state             *ha          = NULL;
-    struct hip_common                 *locator_msg = NULL;
-    LHASH_NODE                        *item        = NULL, *tmp = NULL;
-
-    HIP_IFEL(!(locator_msg = hip_msg_alloc()), -ENOMEM,
-             "Out of memory while allocation memory for the packet\n");
-    HIP_IFE(hip_create_locators(locator_msg, &locators), -1);
-
-    // Go through all the peers and send update packets
-    list_for_each_safe(item, tmp, hadb_hit, i) {
-        ha = list_entry(item);
-
-        if (ha->hastate == HIP_HASTATE_VALID &&
-            ha->state == HIP_STATE_ESTABLISHED) {
-            err = hip_send_update_to_one_peer(NULL,
-                                              ha,
-                                              &ha->our_addr,
-                                              &ha->peer_addr,
-                                              locators,
-                                              HIP_UPDATE_LOCATOR);
-            if (err) {
-                goto out_err;
-            }
-        }
-    }
-
-out_err:
-    /* Update DNS data in hit-to-ip domain name. This is done after
-     * sending UPDATE packets. See the discussion for the reasoning:
-     * http://www.freelists.org/post/hipl-users/HIP-UPDATE-select-error-Interrupted-system-call,2 */
-    if (hip_get_nsupdate_status()) {
-        nsupdate(0);
-    }
-
-    if (hip_locator_status == HIP_MSG_SET_LOCATOR_ON) {
-        hip_recreate_all_precreated_r1_packets();
-    }
-    free(locator_msg);
-    return err;
-}
-
-/**
- * process the first UPDATE packet (i.e. with a LOCATOR parameter)
- *
- * @param ctx the packet context
- * @return zero on success or negative on failure
- */
-static int hip_handle_first_update_packet(struct hip_packet_context *const ctx)
-{
-    const struct hip_esp_info *esp_info   = NULL;
-    struct hip_locator        *locator    = NULL;
-    const struct hip_seq      *seq        = NULL;
-    struct update_state       *localstate = NULL;
-    int                        err        = 0;
-
-    esp_info = hip_get_param(ctx->input_msg, HIP_PARAM_ESP_INFO);
-    locator  = hip_get_param_readwrite(ctx->input_msg, HIP_PARAM_LOCATOR);
-    seq      = hip_get_param(ctx->input_msg, HIP_PARAM_SEQ);
-
-    HIP_IFEL(!(localstate = lmod_get_state_item(ctx->hadb_entry->hip_modular_state,
-                                                "update")),
-             -1,
-             "failed to look up UPDATE-specific state\n");
-
-    HIP_IFEL(hip_handle_locator_parameter(ctx->hadb_entry,
-                                          &ctx->src_addr,
-                                          locator),
-             -1,
-             "failed to process LOCATOR parameter\n");
-
-    // set the new spi value for the association
-    ctx->hadb_entry->spi_outbound_new = ntohl(esp_info->new_spi);
-
-    // progress update sequence to currently processed update
-    if (localstate->update_id_in < ntohl(seq->update_id)) {
-        localstate->update_id_in = ntohl(seq->update_id);
-    }
-
-    HIP_IFEL(hip_send_update_to_one_peer(ctx->input_msg,
-                                         ctx->hadb_entry,
-                                         &ctx->dst_addr,
-                                         &ctx->src_addr,
-                                         NULL,
-                                         HIP_UPDATE_ECHO_REQUEST),
-             -1,
-             "failed to send UPDATE\n");
-
-out_err:
-    return err;
-}
-
-/**
- * process the second UPDATE packet (i.e. with echo request)
- *
- * @param ctx           the packet context
- * @return zero on success or negative on failure
- */
-static int hip_handle_second_update_packet(struct hip_packet_context *const ctx)
-{
-    const struct hip_esp_info *esp_info   = NULL;
-    const struct hip_seq      *seq        = NULL;
-    struct update_state       *localstate = NULL;
-    int                        err        = 0;
-
-    esp_info = hip_get_param(ctx->input_msg, HIP_PARAM_ESP_INFO);
-    seq      = hip_get_param(ctx->input_msg, HIP_PARAM_SEQ);
-
-    HIP_IFEL(!(localstate = lmod_get_state_item(ctx->hadb_entry->hip_modular_state,
-                                                "update")),
-             -1,
-             "failed to look up UPDATE-specific state\n");
-
-    // set active addresses
-    ipv6_addr_copy(&ctx->hadb_entry->our_addr,
-                   &ctx->dst_addr);
-    ipv6_addr_copy(&ctx->hadb_entry->peer_addr,
-                   &ctx->src_addr);
-
-    // set the new spi value for the association
-    ctx->hadb_entry->spi_outbound_new = ntohl(esp_info->new_spi);
-
-    // progress update sequence to currently processed update
-    if (localstate->update_id_in < ntohl(seq->update_id)) {
-        localstate->update_id_in = ntohl(seq->update_id);
-    }
-
-    HIP_IFEL(hip_send_update_to_one_peer(ctx->input_msg,
-                                         ctx->hadb_entry,
-                                         &ctx->dst_addr,
-                                         &ctx->src_addr,
-                                         NULL,
-                                         HIP_UPDATE_ECHO_RESPONSE),
-             -1,
-             "failed to send UPDATE\n");
-
-out_err:
-    return err;
-}
-
-/**
- * process the third update (i.e. with echo response)
- *
- * @param ctx the packet context
- * @return zero on success or negative on failure
- */
-static void hip_handle_third_update_packet(struct hip_packet_context *ctx)
-{
-    // set active addresses
-    ipv6_addr_copy(&ctx->hadb_entry->our_addr,
-                   &ctx->dst_addr);
-    ipv6_addr_copy(&ctx->hadb_entry->peer_addr,
-                   &ctx->src_addr);
-}
-
-static int hip_update_ipsec_sa(UNUSED const uint8_t packet_type,
-                               UNUSED const uint32_t ha_state,
-                               struct hip_packet_context *ctx)
-{
-    int err = 0;
-
-    // don't update IPsec SAs and SPs for 1st UPDATE packet
-    if (!hip_get_param(ctx->input_msg, HIP_PARAM_LOCATOR)) {
-        HIP_IFEL(hip_create_or_update_security_associations_and_sp(ctx->hadb_entry,
-                                                                   &ctx->src_addr,
-                                                                   &ctx->dst_addr),
-                 -1, "failed to update IPsec SAs and SPs\n");
-    }
-
-out_err:
-    return err;
-}
-
-/**
- * Thin wrapper function around hip_send_locators_to_all_peers. Needed for
- * registration as user message handle function.
- *
- * @param msg unused, needed due to type check of handle functions
- * @param src unused, needed due to type check of handle functions
- *
- * @return zero on success or negative on failure
- */
-static int hip_update_manual_update(UNUSED struct hip_common *msg,
-                                    UNUSED struct sockaddr_in6 *src)
-{
-    HIP_DEBUG("Manual UPDATE triggered.\n");
-    return hip_send_locators_to_all_peers();
-}
-
-/**
- * Check if update should be sent.
- *
- * @return 0 on success, else negative value
- */
-static int hip_update_maintenance(void)
-{
-    int err = 0;
-
-    if (address_change_time_counter == 0) {
-        address_change_time_counter = -1;
-
-        HIP_DEBUG("Triggering UPDATE\n");
-        err = hip_send_locators_to_all_peers();
-
-        if (err) {
-            HIP_ERROR("Error sending UPDATE\n");
-        }
-    } else if (address_change_time_counter > 0) {
-        HIP_DEBUG("Delay mobility triggering (count %d)\n",
-                  address_change_time_counter - 1);
-        address_change_time_counter--;
-    }
-
-    return err;
-}
-
-/**
- * Initialize an update_state instance.
- *
- * Allocates the required memory and sets the members to the start values.
- *
- *  @return Success = Index of the update state item in the global state. (>0)
- *          Error   = -1
- */
-static int hip_update_init_state(struct modular_state *state)
-{
-    int                  err          = 0;
-    struct update_state *update_state = NULL;
-
-    HIP_IFEL(!(update_state = malloc(sizeof(struct update_state))),
-             -1,
-             "Error on allocating memory for a update state instance.\n");
-
-    update_state->update_state                   = 0;
-    update_state->addresses_to_send_echo_request = hip_linked_list_init();
-    update_state->update_id_out                  = 0;
-    update_state->update_id_in                   = 0;
-
-    err = lmod_add_state_item(state, update_state, "update");
-
-out_err:
-    return err;
-}
-
-/**
  * Check if UPDATE sequence and acknowledgment numbers are as expected.
  *
  * @param packet_type the packet type
@@ -846,61 +272,241 @@
 }
 
 /**
- * Process an received and checked UPDATE packet.
- *
- * @param packet_type the packet type
- * @param ha_state the HA state
- * @param ctx the packet context
+ * Send an UPDATE packet depending on the update type.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+static int hip_send_update_packet(UNUSED const uint8_t packet_type,
+                                  UNUSED const uint32_t ha_state,
+                                  struct hip_packet_context *ctx)
+{
+    int                  err         = 0, i          = 0;
+    LHASH_NODE          *item        = NULL, *tmp = NULL;
+    struct in6_addr     *dst_addr    = NULL;
+    struct update_state *localstate  = NULL;
+    enum update_types    update_type = UNKNOWN_UPDATE_PACKET;
+    const int            retransmit  = 1;
+
+    update_type = hip_classify_update_type(ctx->input_msg);
+
+    switch (update_type) {
+    case FIRST_UPDATE_PACKET:
+        // send challenge to all advertised locators
+        localstate = lmod_get_state_item(ctx->hadb_entry->hip_modular_state, "update");
+
+        list_for_each_safe(item, tmp, localstate->addresses_to_send_echo_request, i) {
+            dst_addr = list_entry(item);
+
+            if (!are_addresses_compatible(&ctx->dst_addr, dst_addr)) {
+                continue;
+            }
+
+            HIP_DEBUG_IN6ADDR("Sending echo requests from", &ctx->dst_addr);
+            HIP_DEBUG_IN6ADDR("to", dst_addr);
+
+            err = hip_send_pkt(&ctx->dst_addr,
+                               dst_addr,
+                               (ctx->hadb_entry->nat_mode ? hip_get_local_nat_udp_port() : 0),
+                               ctx->hadb_entry->peer_udp_port,
+                               ctx->output_msg,
+                               ctx->hadb_entry,
+                               retransmit);
+        }
+        break;
+    case THIRD_UPDATE_PACKET:
+        // mobility update is concluded after 3rd packet has been received
+        break;
+    default:
+        // send a response to default peer IP
+        err = hip_send_pkt(&ctx->hadb_entry->our_addr,
+                           &ctx->hadb_entry->peer_addr,
+                           (ctx->hadb_entry->nat_mode ? hip_get_local_nat_udp_port() : 0),
+                           ctx->hadb_entry->peer_udp_port,
+                           ctx->output_msg,
+                           ctx->hadb_entry,
+                           retransmit);
+    }
+
+    return err;
+}
+
+/**
+ * publish the locator set of the local host to all peers
+ *
  * @return zero on success or negative on failure
  */
-static int hip_handle_update_packet(UNUSED const uint8_t packet_type,
+static int hip_trigger_update_for_all_peers(void)
+{
+    int                    err  = 0, i = 0;
+    struct hip_hadb_state *ha   = NULL;
+    LHASH_NODE            *item = NULL, *tmp = NULL;
+
+    // Go through all the peers and send update packets
+    list_for_each_safe(item, tmp, hadb_hit, i) {
+        ha = list_entry(item);
+
+        if (ha->hastate == HIP_HASTATE_VALID &&
+            ha->state == HIP_STATE_ESTABLISHED) {
+            err = hip_trigger_update(ha);
+            if (err) {
+                goto out_err;
+            }
+        }
+    }
+
+out_err:
+    /* Update DNS data in hit-to-ip domain name. This is done after
+     * sending UPDATE packets. See the discussion for the reasoning:
+     * http://www.freelists.org/post/hipl-users/HIP-UPDATE-select-error-Interrupted-system-call,2 */
+    if (hip_get_nsupdate_status()) {
+        nsupdate(0);
+    }
+
+    if (hip_locator_status == HIP_MSG_SET_LOCATOR_ON) {
+        hip_recreate_all_precreated_r1_packets();
+    }
+
+    return err;
+}
+
+/**
+ * Update the port and IP address information.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+static int hip_set_active_addresses(UNUSED const uint8_t packet_type,
                                     UNUSED const uint32_t ha_state,
                                     struct hip_packet_context *ctx)
 {
-    enum update_types update_type = UNKNOWN_PACKET;
-    int               err         = 0;
-
     /* set local UDP port just in case the original communications
      * changed from raw to UDP or vice versa */
     ctx->hadb_entry->local_udp_port = ctx->msg_ports.dst_port;
     /* @todo: a workaround for bug id 592200 */
     ctx->hadb_entry->peer_udp_port = ctx->msg_ports.src_port;
 
+    ipv6_addr_copy(&ctx->hadb_entry->our_addr,
+                   &ctx->dst_addr);
+    ipv6_addr_copy(&ctx->hadb_entry->peer_addr,
+                   &ctx->src_addr);
+
+    return 0;
+}
+
+/**
+ * Update the IPsec security associations of the current connection.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+static int hip_update_ipsec_sa(UNUSED const uint8_t packet_type,
+                               UNUSED const uint32_t ha_state,
+                               struct hip_packet_context *ctx)
+{
+    enum update_types update_type = UNKNOWN_UPDATE_PACKET;
+    int               err         = 0;
+
     update_type = hip_classify_update_type(ctx->input_msg);
-    switch (update_type) {
-    case FIRST_PACKET:
-        err = hip_handle_first_update_packet(ctx);
-        break;
-    case SECOND_PACKET:
-        err = hip_handle_second_update_packet(ctx);
-        break;
-    case THIRD_PACKET:
-        hip_handle_third_update_packet(ctx);
-        break;
-    default:
-        if (esp_prot_update_type(ctx->input_msg)
-            == ESP_PROT_FIRST_UPDATE_PACKET) {
-            esp_prot_handle_first_update_packet(ctx->input_msg,
-                                                ctx->hadb_entry,
-                                                &ctx->src_addr,
-                                                &ctx->dst_addr);
-        } else if (esp_prot_update_type(ctx->input_msg)
-                   == ESP_PROT_SECOND_UPDATE_PACKET) {
-            esp_prot_handle_second_update_packet(ctx->hadb_entry,
-                                                 &ctx->src_addr,
-                                                 &ctx->dst_addr);
-        } else {
-            HIP_ERROR("UPDATE packet unknown\n");
-            err = -1;
-            goto out_err;
+
+    // don't update IPsec SAs and SPs for 1st UPDATE packet
+    if (update_type == SECOND_UPDATE_PACKET ||
+        update_type == THIRD_UPDATE_PACKET) {
+        HIP_IFEL(hip_create_or_update_security_associations_and_sp(ctx->hadb_entry,
+                                                                   &ctx->src_addr,
+                                                                   &ctx->dst_addr),
+                 -1, "failed to update IPsec SAs and SPs\n");
+    }
+
+out_err:
+    return err;
+}
+
+/**
+ * Check if update should be sent.
+ *
+ * @return 0 on success, else negative value
+ */
+static int hip_update_maintenance(void)
+{
+    int err = 0;
+
+    if (address_change_time_counter == 0) {
+        address_change_time_counter = -1;
+
+        HIP_DEBUG("Triggering UPDATE\n");
+        err = hip_trigger_update_for_all_peers();
+
+        if (err) {
+            HIP_ERROR("Error sending UPDATE\n");
         }
+    } else if (address_change_time_counter > 0) {
+        HIP_DEBUG("Delay mobility triggering (count %d)\n",
+                  address_change_time_counter - 1);
+        address_change_time_counter--;
     }
 
+    return err;
+}
+
+/**
+ * Initialize an update_state instance.
+ *
+ * Allocates the required memory and sets the members to the start values.
+ *
+ *  @return Success = Index of the update state item in the global state. (>0)
+ *          Error   = -1
+ */
+static int hip_update_init_state(struct modular_state *state)
+{
+    int                  err          = 0;
+    struct update_state *update_state = NULL;
+
+    HIP_IFEL(!(update_state = malloc(sizeof(struct update_state))),
+             -1,
+             "Error on allocating memory for a update state instance.\n");
+
+    update_state->update_state                   = 0;
+    update_state->addresses_to_send_echo_request = hip_linked_list_init();
+    update_state->update_id_out                  = 0;
+    update_state->update_id_in                   = 0;
+
+    err = lmod_add_state_item(state, update_state, "update");
+
 out_err:
-    ctx->error = err;
     return err;
 }
 
+/**
+ * Transition the connection state based on a successful update.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
 static int hip_update_change_state(UNUSED const uint8_t packet_type,
                                    UNUSED const uint32_t ha_state,
                                    struct hip_packet_context *ctx)
@@ -926,9 +532,51 @@
 }
 
 /**
- * Classifies an UPDATE packet by means of contained parameters.
- *
- * @param hip_msg   the received packet
+ * Thin wrapper function around hip_send_locators_to_all_peers. Needed for
+ * registration as user message handle function.
+ *
+ * @param msg unused, needed due to type check of handle functions
+ * @param src unused, needed due to type check of handle functions
+ *
+ * @return zero on success or negative on failure
+ */
+static int hip_update_manual_update(UNUSED struct hip_common *msg,
+                                    UNUSED struct sockaddr_in6 *src)
+{
+    HIP_DEBUG("Manual UPDATE triggered.\n");
+    return hip_trigger_update_for_all_peers();
+}
+
+/**
+ * Getter for the sequence number value.
+ *
+ * @note RFC 5201 Section 5.2.13:
+ *       Notice that the section says 'The Update ID is an unsigned quantity,
+ *       initialized by a host to zero upon moving to ESTABLISHED state' and
+ *       'The Update ID is incremented by one before each new UPDATE that is
+ *       sent by the host; the first UPDATE packet originated by a host has
+ *       an Update ID of 0'. Therefore we initialize the Update ID with 0 and
+ *       increment this value before a new UPDATE packet is sent. Because the
+ *       first UPDATE packet should contain 0 as value, we need to decrement
+ *       the packet value by one for each UPDATE packet.
+ *
+ * @param state    Pointer to the update state.
+ *
+ * @return The next UPDATE out ID if state is set, -1 on error
+ */
+uint32_t hip_update_get_out_id(struct update_state *state)
+{
+    if (state) {
+        return state->update_id_out - 1;
+    } else {
+        return -1;
+    }
+}
+
+/**
+ * Classify an UPDATE packet by means of contained parameters.
+ *
+ * @param hip_msg The update message to be classified.
  * @return member of enum update_types
  */
 enum update_types hip_classify_update_type(const struct hip_common *const hip_msg)
@@ -951,17 +599,89 @@
     echo_response = hip_get_param(hip_msg, HIP_PARAM_ECHO_RESPONSE_SIGN);
 
     if (esp_info && locator && seq) {
-        return FIRST_PACKET;
+        return FIRST_UPDATE_PACKET;
     } else if (esp_info && seq && ack && echo_request) {
-        return SECOND_PACKET;
+        return SECOND_UPDATE_PACKET;
     } else if (ack && echo_response) {
-        return THIRD_PACKET;
+        return THIRD_UPDATE_PACKET;
     } else {
-        return UNKNOWN_PACKET;
+        return UNKNOWN_UPDATE_PACKET;
     }
 }
 
 /**
+ * Trigger the update for a specific connection.
+ *
+ * @param hadb_entry    the association state of the connection to be updated
+ * @return 0 on success, negative value in case of an error
+ */
+int hip_trigger_update(struct hip_hadb_state *hadb_entry)
+{
+    struct hip_common                 *locator_update_packet = NULL;
+    struct hip_common                 *locator_msg           = NULL;
+    struct hip_locator_info_addr_item *locators              = NULL;
+    struct update_state               *localstate            = NULL;
+    uint16_t                           mask                  = 0;
+    struct in6_addr                    local_addr;
+    int                                err        = 0;
+    const int                          retransmit = 1;
+
+    localstate = lmod_get_state_item(hadb_entry->hip_modular_state, "update");
+
+    HIP_IFEL(!(locator_update_packet = hip_msg_alloc()), -ENOMEM,
+             "Out of memory while allocation memory for the update packet\n");
+
+    hip_build_network_hdr(locator_update_packet,
+                          HIP_UPDATE,
+                          mask,
+                          &hadb_entry->hit_our,
+                          &hadb_entry->hit_peer);
+
+    HIP_IFEL(hip_build_param_esp_info(locator_update_packet,
+                                      hadb_entry->current_keymat_index,
+                                      hadb_entry->spi_inbound_current,
+                                      hadb_entry->spi_inbound_current),
+             -1, "Building of ESP_INFO param failed\n");
+
+    HIP_IFEL(!(locator_msg = hip_msg_alloc()),
+             -ENOMEM, "Out of memory while allocation memory for the packet\n");
+    HIP_IFE(hip_create_locators(locator_msg, &locators), -1);
+
+    HIP_IFEL(hip_build_param_locator(locator_update_packet,
+                                     locators,
+                                     address_count),
+             -1, "failed to build locator parameter\n");
+
+    localstate->update_id_out++;
+    HIP_DEBUG("outgoing UPDATE ID=%u\n", hip_update_get_out_id(localstate));
+    HIP_IFEL(hip_build_param_seq(locator_update_packet,
+                                 hip_update_get_out_id(localstate)),
+             -1, "Building of SEQ parameter failed\n");
+
+    hip_mac_and_sign_packet(locator_update_packet, hadb_entry);
+
+    HIP_IFEL(hip_select_local_addr_for_first_update(hadb_entry,
+                                                    &hadb_entry->our_addr,
+                                                    &hadb_entry->peer_addr,
+                                                    &local_addr),
+             -1, "No source address found for first update\n");
+    HIP_DEBUG_IN6ADDR("Sending update from", &local_addr);
+    HIP_DEBUG_IN6ADDR("to", &hadb_entry->peer_addr);
+
+    err = hip_send_pkt(&local_addr,
+                       &hadb_entry->peer_addr,
+                       (hadb_entry->nat_mode ? hip_get_local_nat_udp_port() : 0),
+                       hadb_entry->peer_udp_port,
+                       locator_update_packet,
+                       hadb_entry,
+                       retransmit);
+
+out_err:
+    free(locator_update_packet);
+    return err;
+}
+
+/**
  * Initialization function for update module.
  *
  * @return Success =  0
@@ -987,7 +707,57 @@
              -1, "Error on registering UPDATE handle function.\n");
     HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
                                           HIP_STATE_R2_SENT,
-                                          &hip_handle_update_packet,
+                                          &hip_prepare_update_response,
+                                          20200),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_add_esp_info_param,
+                                          20300),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_handle_esp_info_param,
+                                          20400),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_handle_locator_parameter,
+                                          20500),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_add_seq_param,
+                                          20600),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_handle_seq_param,
+                                          20700),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_add_echo_request_param,
+                                          20800),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_handle_echo_request_param,
+                                          20900),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_set_active_addresses,
+                                          21000),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_mac_and_sign_handler,
+                                          29900),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_R2_SENT,
+                                          &hip_send_update_packet,
                                           30000),
              -1, "Error on registering UPDATE handle function.\n");
     HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
@@ -1013,7 +783,57 @@
              -1, "Error on registering UPDATE handle function.\n");
     HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
                                           HIP_STATE_ESTABLISHED,
-                                          &hip_handle_update_packet,
+                                          &hip_prepare_update_response,
+                                          20200),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_add_esp_info_param,
+                                          20300),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_handle_esp_info_param,
+                                          20400),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_handle_locator_parameter,
+                                          20500),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_add_seq_param,
+                                          20600),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_handle_seq_param,
+                                          20700),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_add_echo_request_param,
+                                          20800),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_handle_echo_request_param,
+                                          20900),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_set_active_addresses,
+                                          21000),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_mac_and_sign_handler,
+                                          29900),
+             -1, "Error on registering UPDATE handle function.\n");
+    HIP_IFEL(hip_register_handle_function(HIP_UPDATE,
+                                          HIP_STATE_ESTABLISHED,
+                                          &hip_send_update_packet,
                                           30000),
              -1, "Error on registering UPDATE handle function.\n");
     HIP_IFEL(hip_register_handle_function(HIP_UPDATE,

=== modified file 'modules/update/hipd/update.h'
--- modules/update/hipd/update.h	2011-04-13 13:28:58 +0000
+++ modules/update/hipd/update.h	2011-04-13 13:57:39 +0000
@@ -30,8 +30,8 @@
  * @date    3.5.2009
  */
 
-#ifndef HIP_MODULES_HIPD_UPDATE_H
-#define HIP_MODULES_HIPD_UPDATE_H
+#ifndef MODULES_UPDATE_HIPD_UPDATE_H
+#define MODULES_UPDATE_HIPD_UPDATE_H
 
 #include <stdint.h>
 #include <netinet/in.h>
@@ -51,7 +51,8 @@
 #define HIP_LOCATOR_LOCATOR_TYPE_ESP_SPI 1
 #define HIP_LOCATOR_LOCATOR_TYPE_UDP     2
 
-enum update_types { UNKNOWN_PACKET, FIRST_PACKET, SECOND_PACKET, THIRD_PACKET };
+enum update_types { UNKNOWN_UPDATE_PACKET, FIRST_UPDATE_PACKET,
+                    SECOND_UPDATE_PACKET, THIRD_UPDATE_PACKET };
 
 struct update_state {
     /** A kludge to get the UPDATE retransmission to work.
@@ -121,16 +122,12 @@
     struct hip_locator_info_addr_item2 type2;
 } __attribute__ ((packed));
 
+uint32_t hip_update_get_out_id(struct update_state *state);
 
-int hip_send_update_to_one_peer(struct hip_common *received_update_packet,
-                                struct hip_hadb_state *ha,
-                                struct in6_addr *src_addr,
-                                struct in6_addr *dst_addr,
-                                struct hip_locator_info_addr_item *locators,
-                                int type);
+int hip_trigger_update(struct hip_hadb_state *ha_entry);
 
 enum update_types hip_classify_update_type(const struct hip_common *const hip_msg);
 
 int hip_update_init(void);
 
-#endif /* HIP_MODULES_HIPD_UPDATE_H */
+#endif /* MODULES_UPDATE_HIPD_UPDATE_H */

=== modified file 'modules/update/hipd/update_param_handling.c'
--- modules/update/hipd/update_param_handling.c	2011-04-13 13:28:58 +0000
+++ modules/update/hipd/update_param_handling.c	2011-04-13 13:57:39 +0000
@@ -31,11 +31,14 @@
  * @author  Rene Hummen
  */
 
+#include <openssl/rand.h>
+
 #include "lib/core/builder.h"
 #include "lib/core/debug.h"
 #include "lib/core/ife.h"
 #include "lib/core/list.h"
 #include "lib/core/prefix.h"
+#include "update_builder.h"
 #include "update_locator.h"
 #include "update_param_handling.h"
 
@@ -43,6 +46,7 @@
 /**
  * Removes all the addresses from the addresses_to_send_echo_request list
  * and deallocates them.
+ *
  * @param state pointer to a host association
  */
 static void hip_remove_addresses_to_send_echo_request(struct update_state *state)
@@ -80,16 +84,253 @@
 }
 
 /**
- * process a LOCATOR paramter
- *
- * @param ha the related host association
- * @param src_addr the source address where the locator arrived from
- * @param locator the LOCATOR parameter
- * @return zero on success or negative on failure
- */
-int hip_handle_locator_parameter(struct hip_hadb_state *ha,
-                                 const struct in6_addr *src_addr,
-                                 struct hip_locator *locator)
+ * Add ESP_INFO parameter to second update packet.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+int hip_add_esp_info_param(UNUSED const uint8_t packet_type,
+                           UNUSED const uint32_t ha_state,
+                           struct hip_packet_context *ctx)
+{
+    enum update_types update_type = UNKNOWN_UPDATE_PACKET;
+    int               err         = 0;
+
+    update_type = hip_classify_update_type(ctx->input_msg);
+
+    if (update_type == FIRST_UPDATE_PACKET) {
+        HIP_IFEL(hip_build_param_esp_info(ctx->output_msg,
+                                          ctx->hadb_entry->current_keymat_index,
+                                          ctx->hadb_entry->spi_inbound_current,
+                                          ctx->hadb_entry->spi_inbound_current),
+                 -1, "Building of ESP_INFO param failed\n");
+    }
+
+out_err:
+    return err;
+}
+
+/**
+ * Handle ESP_INFO parameter in first and second update packet.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+int hip_handle_esp_info_param(UNUSED const uint8_t packet_type,
+                              UNUSED const uint32_t ha_state,
+                              struct hip_packet_context *ctx)
+{
+    const struct hip_esp_info *esp_info    = NULL;
+    enum update_types          update_type = UNKNOWN_UPDATE_PACKET;
+    int                        err         = 0;
+
+    update_type = hip_classify_update_type(ctx->input_msg);
+
+    if (update_type == FIRST_UPDATE_PACKET ||
+        update_type == SECOND_UPDATE_PACKET) {
+        HIP_IFEL(!(esp_info = hip_get_param(ctx->input_msg, HIP_PARAM_ESP_INFO)),
+                 -1, "no ESP_INFO parameter found\n");
+
+        // set the new spi value for the association
+        // TODO add rekeying functionality here
+        ctx->hadb_entry->spi_outbound_new = ntohl(esp_info->new_spi);
+    }
+
+out_err:
+    return err;
+}
+
+/**
+ * Add SEQ parameter to second update packet.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+int hip_add_seq_param(UNUSED const uint8_t packet_type,
+                      UNUSED const uint32_t ha_state,
+                      struct hip_packet_context *ctx)
+{
+    enum update_types    update_type = UNKNOWN_UPDATE_PACKET;
+    struct update_state *localstate  = NULL;
+    int                  err         = 0;
+
+    update_type = hip_classify_update_type(ctx->input_msg);
+
+    if (update_type == FIRST_UPDATE_PACKET) {
+        HIP_IFEL(!(localstate = lmod_get_state_item(ctx->hadb_entry->hip_modular_state,
+                                                    "update")),
+                 -1, "failed to look up update state\n");
+        localstate->update_id_out++;
+        HIP_DEBUG("outgoing UPDATE ID=%u\n", hip_update_get_out_id(localstate));
+        HIP_IFEL(hip_build_param_seq(ctx->output_msg,
+                                     hip_update_get_out_id(localstate)),
+                 -1,
+                 "Building of SEQ parameter failed\n");
+    }
+
+out_err:
+    return err;
+}
+
+/**
+ * Handle SEQ parameter in first and second update packet.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+int hip_handle_seq_param(UNUSED const uint8_t packet_type,
+                         UNUSED const uint32_t ha_state,
+                         struct hip_packet_context *ctx)
+{
+    const struct hip_seq *seq         = NULL;
+    enum update_types     update_type = UNKNOWN_UPDATE_PACKET;
+    struct update_state  *localstate  = NULL;
+    int                   err         = 0;
+
+    update_type = hip_classify_update_type(ctx->input_msg);
+
+    if (update_type == FIRST_UPDATE_PACKET ||
+        update_type == SECOND_UPDATE_PACKET) {
+        HIP_IFEL(!(seq = hip_get_param(ctx->input_msg, HIP_PARAM_SEQ)),
+                 -1, "SEQ parameter not found\n");
+
+        HIP_IFEL(!(localstate = lmod_get_state_item(ctx->hadb_entry->hip_modular_state,
+                                                    "update")),
+                 -1, "failed to look up update state\n");
+
+        // progress update sequence to currently processed update
+        if (localstate->update_id_in < ntohl(seq->update_id)) {
+            localstate->update_id_in = ntohl(seq->update_id);
+        }
+
+        HIP_IFEL(hip_build_param_ack(ctx->output_msg, ntohl(seq->update_id)),
+                 -1, "Building of ACK parameter failed\n");
+    }
+
+out_err:
+    return err;
+}
+
+/**
+ * Add ECHO_REQUEST parameter to second update packet.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+int hip_add_echo_request_param(UNUSED const uint8_t packet_type,
+                               UNUSED const uint32_t ha_state,
+                               struct hip_packet_context *ctx)
+{
+    enum update_types update_type = UNKNOWN_UPDATE_PACKET;
+    int               err         = 0;
+
+    update_type = hip_classify_update_type(ctx->input_msg);
+
+    if (update_type == FIRST_UPDATE_PACKET) {
+        // Randomize the echo response opaque data before sending ECHO_REQUESTS.
+        // Notice that we're using the same opaque value for the identical
+        // UPDATE packets sent between different address combinations.
+        RAND_bytes(ctx->hadb_entry->echo_data,
+                   sizeof(ctx->hadb_entry->echo_data));
+
+        HIP_HEXDUMP("ECHO_REQUEST in the host association",
+                    ctx->hadb_entry->echo_data,
+                    sizeof(ctx->hadb_entry->echo_data));
+        HIP_IFEL(hip_build_param_echo(ctx->output_msg,
+                                      ctx->hadb_entry->echo_data,
+                                      sizeof(ctx->hadb_entry->echo_data),
+                                      1,
+                                      1),
+                 -1,
+                 "Building of ECHO_REQUEST failed\n");
+    }
+
+out_err:
+    return err;
+}
+
+/**
+ * Handle ECHO_REQUEST parameter in second update packet.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+int hip_handle_echo_request_param(UNUSED const uint8_t packet_type,
+                                  UNUSED const uint32_t ha_state,
+                                  struct hip_packet_context *ctx)
+{
+    const struct hip_echo_request *echo_request = NULL;
+    int                            err          = 0;
+
+    HIP_IFEL(!(echo_request = hip_get_param(ctx->input_msg,
+                                            HIP_PARAM_ECHO_REQUEST_SIGN)),
+             -1, "ECHO_REQUEST parameter not found!\n");
+
+    HIP_DEBUG("echo opaque data len=%d\n",
+              hip_get_param_contents_len(echo_request));
+    HIP_HEXDUMP("ECHO_REQUEST ",
+                (const uint8_t *) echo_request + sizeof(struct hip_tlv_common),
+                hip_get_param_contents_len(echo_request));
+    HIP_IFEL(hip_build_param_echo(ctx->output_msg,
+                                  (const uint8_t *) echo_request + sizeof(struct hip_tlv_common),
+                                  hip_get_param_contents_len(echo_request), 1, 0),
+             -1, "Building of ECHO_RESPONSE failed\n");
+
+out_err:
+    return err;
+}
+
+/**
+ * Handle LOCATOR parameter in first update packet.
+ *
+ * @param packet_type The packet type of the control message (RFC 5201, 5.3.)
+ * @param ha_state The host association state (RFC 5201, 4.4.1.)
+ * @param ctx Pointer to the packet context, containing all information for
+ *             the packet handling (received message, source and destination
+ *             address, the ports and the corresponding entry from the host
+ *             association database).
+ *
+ * @return zero on success, or negative error value on error.
+ */
+int hip_handle_locator_parameter(UNUSED const uint8_t packet_type,
+                                 UNUSED const uint32_t ha_state,
+                                 struct hip_packet_context *ctx)
 {
     int                                err                  = 0;
     int                                locator_addr_count   = 0;
@@ -99,56 +340,63 @@
     struct hip_locator_info_addr_item *locator_address_item = NULL;
     struct in6_addr                   *peer_addr            = 0;
     struct update_state               *localstate           = NULL;
-
-    HIP_IFEL(!locator, -1, "locator is NULL");
-
-    locator_addr_count = hip_get_locator_addr_item_count(locator);
-
-    HIP_DEBUG("LOCATOR has %d address(es), loc param len=%d\n",
-              locator_addr_count, hip_get_param_total_len(locator));
-
-    // Empty the addresses_to_send_echo_request list before adding the
-    // new addresses
-    localstate = lmod_get_state_item(ha->hip_modular_state, "update");
-    HIP_DEBUG("hip_get_state_item returned localstate: %p\n", localstate);
-    hip_remove_addresses_to_send_echo_request(localstate);
-
-    locator_address_item =  (struct hip_locator_info_addr_item *) (locator + 1);
-    for (i = 0; i < locator_addr_count; i++) {
-        locator_info_addr = hip_get_locator_item(locator_address_item, i);
-
-        peer_addr = malloc(sizeof(struct in6_addr));
-        if (!peer_addr) {
-            HIP_ERROR("Couldn't allocate memory for peer_addr.\n");
-            return -1;
-        }
-
-        ipv6_addr_copy(peer_addr, hip_get_locator_item_address(locator_info_addr));
-
-        list_add(peer_addr, localstate->addresses_to_send_echo_request);
-
-        HIP_DEBUG_IN6ADDR("Comparing", src_addr);
-        HIP_DEBUG_IN6ADDR("to ", peer_addr);
-
-        if (ipv6_addr_cmp(src_addr, peer_addr) == 0) {
-            src_addr_included = 1;
-        }
-    }
-
-    if (!src_addr_included) {
-        HIP_DEBUG("Preferred address was not in locator (NAT?)\n");
-
-        peer_addr = malloc(sizeof(struct in6_addr));
-        if (!peer_addr) {
-            HIP_ERROR("Couldn't allocate memory for peer_addr.\n");
-            return -1;
-        }
-
-        ipv6_addr_copy(peer_addr, src_addr);
-        list_add(peer_addr, localstate->addresses_to_send_echo_request);
-    }
-
-    hip_print_addresses_to_send_update_request(ha);
+    struct hip_locator                *locator              = NULL;
+
+    if (hip_classify_update_type(ctx->input_msg) == FIRST_UPDATE_PACKET) {
+        HIP_IFEL(!(locator = hip_get_param_readwrite(ctx->input_msg,
+                                                     HIP_PARAM_LOCATOR)),
+                 -1, "no LOCATOR parameter found\n");
+
+        locator_addr_count = hip_get_locator_addr_item_count(locator);
+
+        HIP_DEBUG("LOCATOR has %d address(es), loc param len=%d\n",
+                  locator_addr_count, hip_get_param_total_len(locator));
+
+        // Empty the addresses_to_send_echo_request list before adding the
+        // new addresses
+        localstate = lmod_get_state_item(ctx->hadb_entry->hip_modular_state,
+                                         "update");
+
+        HIP_DEBUG("hip_get_state_item returned localstate: %p\n", localstate);
+        hip_remove_addresses_to_send_echo_request(localstate);
+
+        locator_address_item =  (struct hip_locator_info_addr_item *) (locator + 1);
+        for (i = 0; i < locator_addr_count; i++) {
+            locator_info_addr = hip_get_locator_item(locator_address_item, i);
+
+            peer_addr = malloc(sizeof(struct in6_addr));
+            if (!peer_addr) {
+                HIP_ERROR("Couldn't allocate memory for peer_addr.\n");
+                return -1;
+            }
+
+            ipv6_addr_copy(peer_addr, hip_get_locator_item_address(locator_info_addr));
+
+            list_add(peer_addr, localstate->addresses_to_send_echo_request);
+
+            HIP_DEBUG_IN6ADDR("Comparing", &ctx->src_addr);
+            HIP_DEBUG_IN6ADDR("to ", peer_addr);
+
+            if (ipv6_addr_cmp(&ctx->src_addr, peer_addr) == 0) {
+                src_addr_included = 1;
+            }
+        }
+
+        if (!src_addr_included) {
+            HIP_DEBUG("Preferred address was not in locator (NAT?)\n");
+
+            peer_addr = malloc(sizeof(struct in6_addr));
+            if (!peer_addr) {
+                HIP_ERROR("Couldn't allocate memory for peer_addr.\n");
+                return -1;
+            }
+
+            ipv6_addr_copy(peer_addr, &ctx->src_addr);
+            list_add(peer_addr, localstate->addresses_to_send_echo_request);
+        }
+
+        hip_print_addresses_to_send_update_request(ctx->hadb_entry);
+    }
 
 out_err:
     return err;

=== modified file 'modules/update/hipd/update_param_handling.h'
--- modules/update/hipd/update_param_handling.h	2011-04-13 13:28:58 +0000
+++ modules/update/hipd/update_param_handling.h	2011-04-13 13:57:39 +0000
@@ -37,8 +37,32 @@
 #include "lib/core/protodefs.h"
 #include "update.h"
 
-int hip_handle_locator_parameter(struct hip_hadb_state *ha,
-                                 const struct in6_addr *src_addr,
-                                 struct hip_locator *locator);
+int hip_add_esp_info_param(const uint8_t packet_type,
+                           const uint32_t ha_state,
+                           struct hip_packet_context *ctx);
+
+int hip_handle_esp_info_param(const uint8_t packet_type,
+                              const uint32_t ha_state,
+                              struct hip_packet_context *ctx);
+
+int hip_add_seq_param(const uint8_t packet_type,
+                      const uint32_t ha_state,
+                      struct hip_packet_context *ctx);
+
+int hip_handle_seq_param(const uint8_t packet_type,
+                         const uint32_t ha_state,
+                         struct hip_packet_context *ctx);
+
+int hip_add_echo_request_param(const uint8_t packet_type,
+                               const uint32_t ha_state,
+                               struct hip_packet_context *ctx);
+
+int hip_handle_echo_request_param(const uint8_t packet_type,
+                                  const uint32_t ha_state,
+                                  struct hip_packet_context *ctx);
+
+int hip_handle_locator_parameter(const uint8_t packet_type,
+                                 const uint32_t ha_state,
+                                 struct hip_packet_context *ctx);
 
 #endif /* MODULES_UPDATE_HIPD_UPDATE_PARAM_HANDLING_H */