[hipl-dev] [Branch ~hipl-core/hipl/mobility-fixes] Rev 5179: removed further dead state
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Mon, 22 Nov 2010 14:03:32 -0000
------------------------------------------------------------
revno: 5179
committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
branch nick: mobility-fixes
timestamp: Mon 2010-11-22 15:00:10 +0100
message:
removed further dead state
this fixes previous commits where the state variable and function sets
have been removed, but references remained in the codebase.
modified:
hipd/hadb.h
modules/update/hipd/update.c
--
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 'hipd/hadb.h'
--- hipd/hadb.h 2010-10-15 15:29:14 +0000
+++ hipd/hadb.h 2010-11-22 14:00:10 +0000
@@ -42,8 +42,6 @@
/* For switch userspace / kernel IPsec */
extern int hip_use_userspace_ipsec;
-extern hip_xmit_func_set_t nat_xmit_func_set;
-
extern HIP_HASHTABLE *hadb_hit;
void hip_hadb_hold_entry(void *entry);
=== modified file 'modules/update/hipd/update.c'
--- modules/update/hipd/update.c 2010-11-19 17:53:48 +0000
+++ modules/update/hipd/update.c 2010-11-22 14:00:10 +0000
@@ -70,11 +70,6 @@
@todo Remove this kludge. */
int update_state;
- /** Update function set.
- @note Do not modify this value directly. Use
- hip_hadb_set_handle_function_set() instead. */
- hip_update_func_set_t *hadb_update_func;
-
/** This "linked list" includes the locators we recieved in the initial
* UPDATE packet. Locators are stored as "struct in6_addr *"s.
*
@@ -942,7 +937,6 @@
"Error on allocating memory for a update state instance.\n");
update_state->update_state = 0;
- update_state->hadb_update_func = NULL;
update_state->addresses_to_send_echo_request = hip_linked_list_init();
update_state->update_id_out = 0;
update_state->update_id_in = 0;
@@ -1086,8 +1080,6 @@
ack_peer_update_id = ntohl(ack->peer_update_id);
HIP_DEBUG("ACK parameter found with peer Update ID %u.\n",
ack_peer_update_id);
- /*ha->hadb_update_func->hip_update_handle_ack(
- * ha, ack, has_esp_info);*/
if (ack_peer_update_id != hip_update_get_out_id(localstate)) {
// Simplified logic of RFC 5201 6.12.2, 1st step:
// We drop the packet if the Update ID in the ACK
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/mobility-fixes] Rev 5179: removed further dead state - noreply
