------------------------------------------------------------ revno: 5181 committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> branch nick: mobility-fixes timestamp: Mon 2010-11-22 15:27:43 +0100 message: moved locator-specific defines from state.h to update modules modified: lib/core/debug.c lib/core/state.h modules/update/hipd/update.h modules/update/hipd/update_legacy.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 'lib/core/debug.c' --- lib/core/debug.c 2010-11-19 17:08:06 +0000 +++ lib/core/debug.c 2010-11-22 14:27:43 +0000 @@ -83,6 +83,7 @@ #include "lib/core/list.h" #include "lib/core/prefix.h" #include "lib/tool/lutil.h" +#include "modules/update/hipd/update.h" #include "builder.h" #include "ife.h" #include "state.h" === modified file 'lib/core/state.h' --- lib/core/state.h 2010-11-19 15:49:18 +0000 +++ lib/core/state.h 2010-11-22 14:27:43 +0000 @@ -80,16 +80,6 @@ /* #define PEER_ADDR_STATE_UNVERIFIED 1 */ #define PEER_ADDR_STATE_ACTIVE 2 -#define HIP_LOCATOR_TRAFFIC_TYPE_DUAL 0 -#define HIP_LOCATOR_TRAFFIC_TYPE_SIGNAL 1 - -#define HIP_LOCATOR_LOCATOR_TYPE_IPV6 0 -#define HIP_LOCATOR_LOCATOR_TYPE_ESP_SPI 1 -//NAT branch -#define HIP_LOCATOR_LOCATOR_TYPE_UDP 2 - -/* #define HIP_LOCATOR_LOCATOR_TYPE_ESP_SPI_PRIORITY 126 */ -/* #define HIP_LOCATOR_LOCATOR_TYPE_REFLEXIVE_PRIORITY 120 */ /** for the triple nat mode*/ #define HIP_NAT_MODE_NONE 0 #define HIP_NAT_MODE_PLAIN_UDP 1 === modified file 'modules/update/hipd/update.h' --- modules/update/hipd/update.h 2010-11-19 17:37:09 +0000 +++ modules/update/hipd/update.h 2010-11-22 14:27:43 +0000 @@ -45,6 +45,11 @@ #define HIP_UPDATE_ESP_ANCHOR 3 #define HIP_UPDATE_ESP_ANCHOR_ACK 4 +/* locator parameter types */ +#define HIP_LOCATOR_LOCATOR_TYPE_IPV6 0 +#define HIP_LOCATOR_LOCATOR_TYPE_ESP_SPI 1 +#define HIP_LOCATOR_LOCATOR_TYPE_UDP 2 + int hip_get_locator_addr_item_count(const struct hip_locator *locator); int hip_create_locators(hip_common_t *locator_msg, === modified file 'modules/update/hipd/update_legacy.c' --- modules/update/hipd/update_legacy.c 2010-11-19 17:23:54 +0000 +++ modules/update/hipd/update_legacy.c 2010-11-22 14:27:43 +0000 @@ -47,6 +47,10 @@ #include "update.h" #include "update_legacy.h" + +#define HIP_LOCATOR_TRAFFIC_TYPE_DUAL 0 +#define HIP_LOCATOR_TRAFFIC_TYPE_SIGNAL 1 + /** * build a LOCATOR parameter for an UPDATE packet *