[hipl-commit] [trunk] Rev 4723: hipd: update xfrm-related calls.

  • From: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 9 Jun 2010 01:11:26 +0300

Committer: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
Date: 09/06/2010 at 01:11:26
Revision: 4723
Revision-id: mircea.gherzan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  hipd: update xfrm-related calls.
  Some routines have one less parameter since rev 4716.

Modified:
  M  hipd/esp_prot_hipd_msg.c
  M  hipd/esp_prot_light_update.c
  M  hipd/hadb.c
  M  hipd/input.c
  M  hipd/output.c

=== modified file 'hipd/esp_prot_hipd_msg.c'
--- hipd/esp_prot_hipd_msg.c    2010-05-31 09:44:40 +0000
+++ hipd/esp_prot_hipd_msg.c    2010-06-08 22:10:30 +0000
@@ -967,7 +967,6 @@
                         entry->esp_transform,
                         &entry->esp_out,
                         &entry->auth_out,
-                        0,
                         HIP_SPI_DIRECTION_OUT,
                         1,
                         entry),

=== modified file 'hipd/esp_prot_light_update.c'
--- hipd/esp_prot_light_update.c        2010-05-31 09:44:40 +0000
+++ hipd/esp_prot_light_update.c        2010-06-08 22:10:30 +0000
@@ -258,7 +258,6 @@
                             ctx->hadb_entry->esp_transform,
                             &(ctx->hadb_entry)->esp_out,
                             &(ctx->hadb_entry)->auth_out,
-                            0,
                             HIP_SPI_DIRECTION_OUT,
                             1,
                             ctx->hadb_entry),

=== modified file 'hipd/hadb.c'
--- hipd/hadb.c 2010-06-03 12:43:56 +0000
+++ hipd/hadb.c 2010-06-08 22:10:30 +0000
@@ -798,7 +798,7 @@
      * should be 1 */
     HIP_DEBUG_HIT("our HIT", &ha->hit_our);
     HIP_DEBUG_HIT("peer HIT", &ha->hit_peer);
-    hip_delete_hit_sp_pair(&ha->hit_peer, &ha->hit_our, IPPROTO_ESP, 1);
+    hip_delete_hit_sp_pair(&ha->hit_peer, &ha->hit_our, 1);
 
 #ifdef CONFIG_HIP_OPPORTUNISTIC
     opp_entry = hip_oppdb_find_by_ip(&ha->peer_addr);
@@ -1462,8 +1462,8 @@
     int prev_spi_in  = ha->spi_inbound_current;
 
     // Delete previous security policies
-    hip_delete_hit_sp_pair(&ha->hit_our, &ha->hit_peer, IPPROTO_ESP, 1);
-    hip_delete_hit_sp_pair(&ha->hit_peer, &ha->hit_our, IPPROTO_ESP, 1);
+    hip_delete_hit_sp_pair(&ha->hit_our, &ha->hit_peer, 1);
+    hip_delete_hit_sp_pair(&ha->hit_peer, &ha->hit_our, 1);
 
     // Delete the previous SAs
     HIP_DEBUG("Previous SPI out =0x%x\n", prev_spi_out);
@@ -1474,12 +1474,10 @@
 
     hip_delete_sa(prev_spi_out,
                   &ha->peer_addr,
-                  &ha->our_addr,
                   HIP_SPI_DIRECTION_OUT,
                   ha);
     hip_delete_sa(prev_spi_in,
                   &ha->our_addr,
-                  &ha->peer_addr,
                   HIP_SPI_DIRECTION_IN,
                   ha);
 
@@ -1525,7 +1523,6 @@
                         ha->esp_transform,
                         &ha->esp_in,
                         &ha->auth_in,
-                        1,
                         HIP_SPI_DIRECTION_IN,
                         0,
                         ha),
@@ -1545,7 +1542,6 @@
                         ha->esp_transform,
                         &ha->esp_out,
                         &ha->auth_out,
-                        1,
                         HIP_SPI_DIRECTION_OUT,
                         0,
                         ha),

=== modified file 'hipd/input.c'
--- hipd/input.c        2010-06-01 15:27:31 +0000
+++ hipd/input.c        2010-06-08 22:10:30 +0000
@@ -1137,7 +1137,6 @@
                         tfm,
                         &(ctx->hadb_entry)->esp_in,
                         &(ctx->hadb_entry)->auth_in,
-                        0,
                         HIP_SPI_DIRECTION_IN,
                         0,
                         ctx->hadb_entry),
@@ -1152,7 +1151,6 @@
                         tfm,
                         &ctx->hadb_entry->esp_out,
                         &ctx->hadb_entry->auth_out,
-                        0,
                         HIP_SPI_DIRECTION_OUT,
                         0,
                         ctx->hadb_entry),
@@ -1775,7 +1773,6 @@
                      esp_tfm,
                      &ctx->hadb_entry->esp_in,
                      &ctx->hadb_entry->auth_in,
-                     retransmission,
                      HIP_SPI_DIRECTION_IN,
                      0,
                      ctx->hadb_entry);

=== modified file 'hipd/output.c'
--- hipd/output.c       2010-06-01 15:11:52 +0000
+++ hipd/output.c       2010-06-08 22:10:30 +0000
@@ -989,7 +989,6 @@
                      ctx->hadb_entry->esp_transform,
                      &ctx->hadb_entry->esp_out,
                      &ctx->hadb_entry->auth_out,
-                     1,
                      HIP_SPI_DIRECTION_OUT,
                      0,
                      ctx->hadb_entry);

Other related posts:

  • » [hipl-commit] [trunk] Rev 4723: hipd: update xfrm-related calls. - Mircea Gherzan