Committer: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx> Date: Fri Feb 26 12:16:16 2010 +0100 Revision: 3711 Revision-id: mircea.gherzan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: trunk Log: Fix compile errors on full-featured build. Modified: M hipd/hiprelay.c M hipd/input.c M hipd/input.h M lib/conf/hipconf.c === modified file 'hipd/hiprelay.c' --- hipd/hiprelay.c 2010-02-12 15:40:01 +0000 +++ hipd/hiprelay.c 2010-02-26 11:16:16 +0000 @@ -1040,7 +1040,9 @@ hip_tlv_type_t param_type; // struct hip_relay_from *relay_from = NULL; struct hip_from *from = NULL; +#ifdef CONFIG_HIP_RVS hip_ha_t *rvs_ha_entry = NULL; +#endif /* Check if the incoming I1 packet has a FROM parameters. */ @@ -1115,7 +1117,9 @@ { hip_tlv_type_t param_type; struct hip_relay_from *relay_from = NULL; +#ifdef CONFIG_HIP_RVS hip_ha_t *relay_ha_entry = NULL; +#endif /* Check if the incoming I1 packet has RELAY_FROM parameters. */ relay_from = (struct hip_relay_from *) === modified file 'hipd/input.c' --- hipd/input.c 2010-02-16 21:54:14 +0000 +++ hipd/input.c 2010-02-26 11:16:16 +0000 @@ -1890,10 +1890,13 @@ hip_ha_t *entry, hip_portpair_t *i2_info) { /* Primitive data types. */ - int err = 0, retransmission = 0, state = 0, host_id_found = 0, is_loopback = 0; + int err = 0, retransmission = 0, host_id_found = 0, is_loopback = 0; uint16_t crypto_len = 0; uint32_t spi_in = 0, spi_out = 0; in_port_t dest_port = 0; // For the port in RELAY_FROM +#ifdef CONFIG_HIP_RVS + int state = 0; +#endif /* Pointers */ char *tmp_enc = NULL, *enc = NULL; unsigned char *iv = NULL; @@ -2981,7 +2984,11 @@ HIP_DEBUG("Start PERF_BASE\n"); hip_perf_start_benchmark(perf_set, PERF_BASE); #endif - int err = 0, state; + +#ifdef CONFIG_HIP_RVS + int state = 0; +#endif + int err = 0; hip_tlv_type_t relay_para_type = 0; in6_addr_t dest; // For the IP address in FROM/RELAY_FROM in_port_t dest_port = 0; // For the port in RELAY_FROM === modified file 'hipd/input.h' --- hipd/input.h 2010-02-17 13:08:39 +0000 +++ hipd/input.h 2010-02-26 11:16:16 +0000 @@ -23,6 +23,7 @@ #include "hiprelay.h" #endif +#include "lib/core/state.h" #include "lib/core/debug.h" #include "lib/core/protodefs.h" === modified file 'lib/conf/hipconf.c' --- lib/conf/hipconf.c 2010-02-24 12:43:02 +0000 +++ lib/conf/hipconf.c 2010-02-26 11:16:16 +0000 @@ -2828,7 +2828,11 @@ int optc, int send_only) { - int err = 0, status = 0; + int err = 0; +#ifdef CONFIG_HIP_HIPPROXY + int status = 0; +#endif + HIP_DEBUG("hip_conf_handle_hipproxy()\n"); #ifdef CONFIG_HIP_HIPPROXY @@ -2841,9 +2845,9 @@ } HIP_IFEL(hip_build_user_hdr(msg, status, 0), -1, "build hdr failed: %s\n", strerror(err)); + +out_err: #endif - -out_err: return err; }