← Back to team overview

hipl-core team mailing list archive

Re: [ipsec_esp] 4915 - factored out setting up SAs in BEX _and_ made hipd part of user_ipsec a module

 

On Aug 25, 2010, at 3:33 PM, Diego Biurrun wrote:
> On Wed, Aug 25, 2010 at 03:23:16PM +0200, René Hummen wrote:
>> 
>> message:
>>  factored out setting up SAs in BEX _and_ made hipd part of user_ipsec a module
>> 
>>  sorry for the large combined commit. i tried shelving to split, but bzr 
>>  threw an error...
> 
> Then do it the old manual way and split with diffs or whatever..
> 
> And what was the error?

I got a similar error to this one:
bzr: ERROR: Tree transform is malformed [('missing parent', 'new-2'), ('missing parent', 'new-3')]

This is actually the error I'm getting right now when trying to shelve. My unconfirmed guess is that shelving renamed files is causing the problem.

>> --- hipd/input.c	2010-08-20 14:34:13 +0000
>> +++ hipd/input.c	2010-08-25 12:53:17 +0000
>> @@ -1257,6 +1178,61 @@
>> 
>> +int hip_setup_ipsec_sa_r2(UNUSED const uint8_t packet_type,
>> +                    UNUSED const uint32_t ha_state,
>> +                    struct hip_packet_context *ctx)
> 
> Indentation is messed up.
> 
> There's more below, so I wonder what broken editor allows this in the first place?

Soon to be fixed.

>> --- modules/user_ipsec/hipd/user_ipsec.c	1970-01-01 00:00:00 +0000
>> +++ modules/user_ipsec/hipd/user_ipsec.c	2010-08-25 12:53:17 +0000
>> @@ -0,0 +1,54 @@
>> +/**
>> + * @file
>> + *
>> + * Copyright (c) 2010 Aalto University) and RWTH Aachen University.
> 
> I don't think the copyright header belongs in the Doxygen docs.

It's like this in every file I checked. Where would you put this information?


--
Dipl.-Inform. Rene Hummen, Ph.D. Student
Distributed Systems Group
RWTH Aachen University, Germany
tel: +49 241 80 20772
web: http://ds.rwth-aachen.de/members/hummen




References