review approve
On Thu, Nov 24, 2011 at 01:36:51PM +0000, Henrik Ziegeldorf wrote: > Henrik Ziegeldorf has proposed merging lp:~henrik-ziegeldorf/hipl/locator-type1-fix into lp:hipl.
LGTM
> --- modules/update/hipd/update.h 2011-08-18 10:11:46 +0000 > +++ modules/update/hipd/update.h 2011-11-24 13:35:59 +0000 > @@ -91,12 +91,18 @@ > > +/** > + * type 1 locator item > + */ > struct hip_locator_info_addr_item { > uint8_t traffic_type; > uint8_t locator_type; > uint8_t locator_length; > uint8_t reserved; /**< last bit is P (preferred) */ > uint32_t lifetime; > + /* The locator field comprises of the ESP SPI and address (32 bit, IPv6 or IPv4-in-IPv6)
comprises the
> --- modules/update/hipd/update_builder.c 2011-08-15 14:11:56 +0000 > +++ modules/update/hipd/update_builder.c 2011-11-24 13:35:59 +0000 > @@ -33,10 +33,16 @@ > > +#include "hipd/hadb.h" > +#include "hipd/hipd.h" > #include "lib/core/builder.h" > #include "lib/core/ife.h" > +#include "lib/core/list.h" > +#include "lib/core/prefix.h" > #include "update_builder.h" > > +#define HIP_LOCATOR_TRAFFIC_TYPE_DUAL 0 > +#define HIP_LOCATOR_TRAFFIC_TYPE_SIGNAL 1
enum? just a suggestion, feel free to ignore ...
Diego
« Back to merge proposal
review approve
On Thu, Nov 24, 2011 at 01:36:51PM +0000, Henrik Ziegeldorf wrote:
> Henrik Ziegeldorf has proposed merging lp:~henrik-ziegeldorf/hipl/locator-type1-fix into lp:hipl.
LGTM
> --- modules/ update/ hipd/update. h 2011-08-18 10:11:46 +0000 update/ hipd/update. h 2011-11-24 13:35:59 +0000 info_addr_ item {
> +++ modules/
> @@ -91,12 +91,18 @@
>
> +/**
> + * type 1 locator item
> + */
> struct hip_locator_
> uint8_t traffic_type;
> uint8_t locator_type;
> uint8_t locator_length;
> uint8_t reserved; /**< last bit is P (preferred) */
> uint32_t lifetime;
> + /* The locator field comprises of the ESP SPI and address (32 bit, IPv6 or IPv4-in-IPv6)
comprises the
> --- modules/ update/ hipd/update_ builder. c 2011-08-15 14:11:56 +0000 update/ hipd/update_ builder. c 2011-11-24 13:35:59 +0000 builder. h" TRAFFIC_ TYPE_DUAL 0 TRAFFIC_ TYPE_SIGNAL 1
> +++ modules/
> @@ -33,10 +33,16 @@
>
> +#include "hipd/hadb.h"
> +#include "hipd/hipd.h"
> #include "lib/core/
> #include "lib/core/ife.h"
> +#include "lib/core/list.h"
> +#include "lib/core/prefix.h"
> #include "update_builder.h"
>
> +#define HIP_LOCATOR_
> +#define HIP_LOCATOR_
enum? just a suggestion, feel free to ignore ...
Diego