[hipl-commit] [tiny] Rev 3597: Removed 'blind' leavings.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Tue, 2 Mar 2010 15:48:24 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Tue Mar 02 14:47:43 2010 +0100
Revision: 3597
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Removed 'blind' leavings.

Modified:
  M  doc/doxygen.h
  M  hipd/cookie.c
  M  hipd/hidb.c
  M  hipd/hipd.c
  M  hipd/input.c
  M  hipd/output.c
  M  lib/core/state.h

=== modified file 'doc/doxygen.h'
--- doc/doxygen.h       2010-02-18 13:55:51 +0000
+++ doc/doxygen.h       2010-03-02 13:47:43 +0000
@@ -451,8 +451,6 @@
  * @def HIP_PARAM_REG_REQUEST
  * @def HIP_PARAM_REG_RESPONSE
  * @def HIP_PARAM_REG_FAILED
- * @def HIP_PARAM_BLIND_NONCE
- *      Pass blind nonce
  * @def HIP_PARAM_OPENDHT_GW_INFO
  * @def HIP_PARAM_ENCAPS_MSG
  * @def HIP_PARAM_PORTPAIR

=== modified file 'hipd/cookie.c'
--- hipd/cookie.c       2010-02-17 15:59:39 +0000
+++ hipd/cookie.c       2010-03-02 13:47:43 +0000
@@ -306,7 +306,7 @@
     struct hip_host_id_entry *hid = NULL;
     int err                       = 0;
 
-    /* Find the proper R1 table, no blind used */
+    /* Find the proper R1 table */
     HIP_IFEL(!(hid = hip_get_hostid_entry_by_lhi_and_algo(
                    HIP_DB_LOCAL_HID, &hdr->hitr, HIP_ANY_ALGO,
                    -1)),

=== modified file 'hipd/hidb.c'
--- hipd/hidb.c 2010-02-17 15:59:39 +0000
+++ hipd/hidb.c 2010-03-02 13:47:43 +0000
@@ -101,11 +101,6 @@
     if (id->r1) {
         hip_uninit_r1(id->r1);
     }
-#ifdef CONFIG_HIP_BLIND
-    if (id->blindr1) {
-        hip_uninit_r1(id->blindr1);
-    }
-#endif
 
     if (hip_get_host_id_algo(id->host_id) == HIP_HI_RSA && id->private_key) {
         RSA_free(id->private_key);

=== modified file 'hipd/hipd.c'
--- hipd/hipd.c 2010-03-01 13:22:56 +0000
+++ hipd/hipd.c 2010-03-02 13:47:43 +0000
@@ -29,7 +29,6 @@
 
 int is_active_mhaddr                 = 1; /**< Which mhaddr to use active or 
lazy? (default: active) */
 int is_hard_handover                 = 0; /**< if hard handover is forced to 
be used (default: no) */
-int hip_blind_status                 = 0; /**< Blind status */
 
 /** Suppress advertising of none, AF_INET or AF_INET6 address in UPDATEs.
  *  0 = none = default, AF_INET, AF_INET6 */

=== modified file 'hipd/input.c'
--- hipd/input.c        2010-03-02 10:31:25 +0000
+++ hipd/input.c        2010-03-02 13:47:43 +0000
@@ -9,7 +9,7 @@
  * @author  Anthony D. Joseph
  * @author  Bing Zhou
  * @author  Tobias Heer
- * @author  Laura Takkinen (blind code)
+ * @author  Laura Takkinen
  * @author  Rene Hummen
  * @author  Samu Varjonen
  * @author  Tim Just

=== modified file 'hipd/output.c'
--- hipd/output.c       2010-03-01 09:27:42 +0000
+++ hipd/output.c       2010-03-02 13:47:43 +0000
@@ -340,10 +340,14 @@
  * Sends an I1 packet to the peer. Used internally by hip_send_i1
  * Check hip_send_i1 & hip_send_pkt for the parameters.
  */
-static int hip_send_i1_pkt(struct hip_common *i1, hip_hit_t *dst_hit,
-                           struct in6_addr *local_addr, struct in6_addr 
*peer_addr,
-                           in_port_t src_port, in_port_t dst_port, struct 
hip_common *i1_blind,
-                           hip_ha_t *entry, int retransmit)
+static int hip_send_i1_pkt(struct hip_common *i1,
+                           hip_hit_t *dst_hit,
+                           struct in6_addr *local_addr,
+                           struct in6_addr *peer_addr,
+                           in_port_t src_port,
+                           in_port_t dst_port,
+                           hip_ha_t *entry,
+                           int retransmit)
 {
     int err = 0;
 
@@ -405,7 +409,6 @@
     int err                     = 0;
     hip_list_t *item            = NULL, *tmp = NULL;
     struct hip_peer_addr_list_item *addr;
-    struct hip_common *i1_blind = NULL;
     int i                       = 0;
     struct in6_addr *local_addr = NULL;
     struct in6_addr peer_addr;
@@ -456,13 +459,14 @@
                  "No preferred IP address for the peer.\n");
 
         local_addr = &entry->our_addr;
-        err        = hip_send_i1_pkt(i1, dst_hit,
-                                     local_addr, &peer_addr,
+        err        = hip_send_i1_pkt(i1,
+                                     dst_hit,
+                                     local_addr,
+                                     &peer_addr,
                                      entry->local_udp_port,
                                      entry->peer_udp_port,
-                                     //(entry->nat_mode ? 
hip_get_local_nat_udp_port() : 0),
-                                     //(entry->nat_mode ? 
hip_get_peer_nat_udp_port() : 0),
-                                     i1_blind, entry, 1);
+                                     entry,
+                                     1);
     } else {
         HIP_DEBUG("Number of items in the peer addr list: %d ",
                   ((struct lhash_st *) 
entry->peer_addr_list_to_be_added)->num_items);
@@ -471,11 +475,14 @@
             addr = (struct hip_peer_addr_list_item *) list_entry(item);
             ipv6_addr_copy(&peer_addr, &addr->address);
 
-            err  = hip_send_i1_pkt(i1, dst_hit,
-                                   NULL, &peer_addr,
+            err  = hip_send_i1_pkt(i1,
+                                   dst_hit,
+                                   NULL,
+                                   &peer_addr,
                                    entry->local_udp_port,
                                    entry->peer_udp_port,
-                                   i1_blind, entry, 1);
+                                   entry,
+                                   1);
 
             /* Do not bail out on error with shotgun. Some
              * address pairs just might fail. */

=== modified file 'lib/core/state.h'
--- lib/core/state.h    2010-02-22 18:30:02 +0000
+++ lib/core/state.h    2010-03-02 13:47:43 +0000
@@ -256,7 +256,6 @@
     struct hip_host_id *host_id;     /* allocated dynamically */
     void *              private_key; /* RSA or DSA */
     struct hip_r1entry *r1;     /* precreated R1s */
-    struct hip_r1entry *blindr1;     /* pre-created R1s for blind*/
     /* Handler to call after insert with an argument, return 0 if OK*/
     int                 (*insert)(struct hip_host_id_entry *, void **arg);
     /* Handler to call before remove with an argument, return 0 if OK*/

Other related posts:

  • » [hipl-commit] [tiny] Rev 3597: Removed 'blind' leavings. - Tim Just