------------------------------------------------------------ revno: 5170 committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> branch nick: mobility-fixes timestamp: Fri 2010-11-19 16:49:18 +0100 message: removed unused state members modified: lib/core/state.h -- lp:~hipl-core/hipl/mobility-fixes https://code.launchpad.net/~hipl-core/hipl/mobility-fixes Your team HIPL core team is subscribed to branch lp:~hipl-core/hipl/mobility-fixes. To unsubscribe from this branch go to https://code.launchpad.net/~hipl-core/hipl/mobility-fixes/+edit-subscription
=== modified file 'lib/core/state.h' --- lib/core/state.h 2010-11-19 15:09:43 +0000 +++ lib/core/state.h 2010-11-19 15:49:18 +0000 @@ -136,8 +136,6 @@ uint32_t lifetime; struct timeval modified_time; /* time when this address was * added or updated */ - uint32_t seq_update_id; /* the Update ID in SEQ parameter - * this address is related to */ uint8_t echo_data[4]; /* data put into the ECHO_REQUEST parameter */ //NAT branch uint8_t transport_protocol; /*value 1 for UDP*/ @@ -156,19 +154,11 @@ /* ifindex if the netdev to which this is related to */ int ifindex; unsigned long timestamp; /* when SA was created */ - int updating; /* UPDATE is in progress */ uint32_t esp_info_spi_out; /* UPDATE, the stored outbound * SPI related to the inbound * SPI we sent in reply (useless?)*/ uint16_t keymat_index; /* advertised keymat index */ - int update_state_flags; /* 0x1=received ack for - * sent SEQ, 0x2=received - * peer's ESP_INFO, - * both=0x3=can move back - * to established */ /* the Update ID in SEQ parameter these SPI are related to */ - uint32_t seq_update_id; - /* the corresponding esp_info of peer */ struct hip_esp_info stored_received_esp_info; /* our addresses this SPI is related to, reuse struct to ease coding */ struct hip_locator_info_addr_item *addresses; @@ -178,12 +168,6 @@ struct hip_spi_out_item { uint32_t spi; uint32_t new_spi; /* spi is changed to this when rekeying */ - - /* USELESS, IF SEQ ID WILL BE RELATED TO ADDRESS ITEMS, - * NOT OUTBOUND SPIS */ - /* the Update ID in SEQ parameter these SPI are related to */ - uint32_t seq_update_id; - HIP_HASHTABLE * peer_addr_list; /* Peer's IPv6 addresses */ struct in6_addr preferred_address; };