Committer: Tim Just <tim.just@xxxxxxxxxxxxxx> Date: Wed Mar 03 14:56:01 2010 +0100 Revision: 3603 Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Removed unused variable 'hip_tcptimeout_status' and their references. Modified: M hipd/hipd.c M hipd/hipd.h M hipd/user.c M lib/core/icomm.h === modified file 'hipd/hipd.c' --- hipd/hipd.c 2010-03-03 13:51:44 +0000 +++ hipd/hipd.c 2010-03-03 13:56:01 +0000 @@ -91,9 +91,6 @@ /* Tells to the daemon should it build LOCATOR parameters to R1 and I2 */ int hip_locator_status = SO_HIP_SET_LOCATOR_OFF; -/* It tells the daemon to set tcp timeout parameters. Added By Tao Wan, on 09.Jan.2008 */ -int hip_tcptimeout_status = SO_HIP_SET_TCPTIMEOUT_ON; - /* Create /etc/hip stuff and exit (used for binary hipfw packaging) */ int create_configs_and_exit = 0; === modified file 'hipd/hipd.h' --- hipd/hipd.h 2010-02-17 16:39:54 +0000 +++ hipd/hipd.h 2010-03-03 13:56:01 +0000 @@ -109,8 +109,6 @@ extern int hip_encrypt_i2_hi; -extern int hip_tcptimeout_status; - extern struct addrinfo *opendht_serving_gateway; extern int opendht_serving_gateway_ttl; extern int opendht_serving_gateway_port; === modified file 'hipd/user.c' --- hipd/user.c 2010-03-02 16:54:13 +0000 +++ hipd/user.c 2010-03-03 13:56:01 +0000 @@ -238,28 +238,6 @@ } break; #endif - case SO_HIP_SET_TCPTIMEOUT_ON: - HIP_DEBUG("Setting TCP TIMEOUT ON\n"); - hip_tcptimeout_status = SO_HIP_SET_TCPTIMEOUT_ON; - HIP_DEBUG("hip tcp timeout status = %d (should be %d)\n", - hip_tcptimeout_status, SO_HIP_SET_TCPTIMEOUT_ON); - - /* paramters setting to do here */ - HIP_IFEL(set_new_tcptimeout_parameters_value(), -1, - "set new tcptimeout parameters error\n"); - break; - - case SO_HIP_SET_TCPTIMEOUT_OFF: - HIP_DEBUG("Setting TCP TIMEOUT OFF\n"); - hip_tcptimeout_status = SO_HIP_SET_TCPTIMEOUT_OFF; - HIP_DEBUG("hip tcp timeout status = %d (should be %d)\n", - hip_tcptimeout_status, SO_HIP_SET_TCPTIMEOUT_OFF); - - /* paramters resetting */ - HIP_IFEL(reset_default_tcptimeout_parameters_value(), -1, - "reset tcptimeout parameters to be default error\n"); - - break; case SO_HIP_CERT_SPKI_VERIFY: { HIP_DEBUG("Got an request to verify SPKI cert\n"); === modified file 'lib/core/icomm.h' --- lib/core/icomm.h 2010-02-17 16:39:54 +0000 +++ lib/core/icomm.h 2010-03-03 13:56:01 +0000 @@ -146,8 +146,9 @@ */ #define SO_HIP_OPPTCP_UNBLOCK_AND_BLACKLIST 135 #define SO_HIP_IPSEC_ADD_SA 136 -#define SO_HIP_SET_TCPTIMEOUT_ON 137 -#define SO_HIP_SET_TCPTIMEOUT_OFF 138 +/* 137-138 unused, were SO_HIP_SET_TCPTIMEOUT_ON, + * SO_HIP_SET_TCPTIMEOUT_OFF + */ #define SO_HIP_SET_NAT_ICE_UDP 139 #define HIP_PARAM_INT 140 #define SO_HIP_CERT_SPKI_SIGN 141