[hipl-commit] [tiny] Rev 3604: Removed relicts corresponding revision 3603.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 3 Mar 2010 16:20:10 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Wed Mar 03 15:18:49 2010 +0100
Revision: 3604
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Removed relicts corresponding revision 3603.
  
  Now all references to hip_tcptimeout_status are removed.

Modified:
  M  lib/conf/hipconf.c
  M  lib/core/builder.c

=== modified file 'lib/conf/hipconf.c'
--- lib/conf/hipconf.c  2010-03-01 09:27:42 +0000
+++ lib/conf/hipconf.c  2010-03-03 14:18:49 +0000
@@ -2328,42 +2328,6 @@
     return err;
 }
 
-/**
- * Handles the hipconf commands where the type is @ tcptimeout. Experimental.
- * Tries to pimp up TCP using /proc file system to tolerate mobility better.
- *
- * @param msg    a pointer to the buffer where the message for hipd will
- *               be written.
- * @param action the numeric action identifier for the action to be performed.
- * @param opt    an array of pointers to the command line arguments after
- *               the action and type.
- * @param optc   the number of elements in the array (@b 0).
- * @return       zero on success, or negative error value on error.
- */
-static int hip_conf_handle_tcptimeout(struct hip_common *msg,
-                                      int action,
-                                      const char *opt[],
-                                      int optc,
-                                      int send_only)
-{
-    int err = 0, status = 0;
-
-    if (!strcmp("on", opt[0])) {
-        HIP_INFO("tcptimeout set on\n");
-        status = SO_HIP_SET_TCPTIMEOUT_ON;
-    } else if (!strcmp("off", opt[0])) {
-        HIP_INFO("tcptimeout set off\n");
-        status = SO_HIP_SET_TCPTIMEOUT_OFF;
-    } else {
-        HIP_IFEL(1, -1, "bad args\n");
-        // err = -1;
-    }
-    HIP_IFEL(hip_build_user_hdr(msg, status, 0), -1, "build hdr failed: %s\n", 
strerror(err));
-
-out_err:
-    return err;
-}
-
 static int hip_conf_handle_nsupdate(hip_common_t *msg,
                                     int action,
                                     const char *opt[],
@@ -2710,7 +2674,7 @@
     NULL,                               /* 22: unused, was TYPE_DHT */
     hip_conf_handle_opptcp,             /* 23: TYPE_OPPTCP */
     hip_conf_handle_trans_order,        /* 24: TYPE_ORDER */
-    hip_conf_handle_tcptimeout,         /* 25: TYPE_TCPTIMEOUT */
+    NULL,                               /* 25: unused, was TYPE_TCPTIMEOUT */
     NULL,                               /* 26: unused, was TYPE_HIPPROXY */
     hip_conf_handle_heartbeat,          /* 27: TYPE_HEARTBEAT */
     NULL,                               /* 28: unused, was TYPE_HI3 */

=== modified file 'lib/core/builder.c'
--- lib/core/builder.c  2010-02-26 13:55:48 +0000
+++ lib/core/builder.c  2010-03-03 14:18:49 +0000
@@ -1246,8 +1246,6 @@
     case SO_HIP_SET_NAT_NONE:       return "SO_HIP_SET_NAT_NONE";
     case SO_HIP_OPPTCP_UNBLOCK_AND_BLACKLIST: return 
"SO_HIP_OPPTCP_UNBLOCK_AND_BLACKLIST";
     case SO_HIP_FW_BEX_DONE:        return "SO_HIP_FW_BEX_DONE";
-    case SO_HIP_SET_TCPTIMEOUT_ON:  return "SO_HIP_SET_TCPTIMEOUT_ON";
-    case SO_HIP_SET_TCPTIMEOUT_OFF: return "SO_HIP_SET_TCPTIMEOUT_OFF";
     case SO_HIP_SET_NAT_ICE_UDP:    return "SO_HIP_SET_NAT_ICE_UDP";
     case SO_HIP_IPSEC_ADD_SA:       return "SO_HIP_IPSEC_ADD_SA";
     case SO_HIP_USERSPACE_IPSEC:    return "SO_HIP_USERSPACE_IPSEC";

Other related posts:

  • » [hipl-commit] [tiny] Rev 3604: Removed relicts corresponding revision 3603. - Tim Just