[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5974: remove insertion of esp_tuple on 1st update
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Fri, 24 Jun 2011 14:10:55 -0000
------------------------------------------------------------
revno: 5974
committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2011-06-24 15:53:09 +0200
message:
remove insertion of esp_tuple on 1st update
The same operations are already performed in
insert_connection_from_update().
modified:
firewall/conntrack.c
--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk
Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'firewall/conntrack.c'
--- firewall/conntrack.c 2011-06-24 13:50:27 +0000
+++ firewall/conntrack.c 2011-06-24 13:53:09 +0000
@@ -1506,9 +1506,7 @@
/* attempt to create state for new connection */
if (esp_info && locator && seq) {
- struct hip_data *data = NULL;
- struct slist *other_dir_esps = NULL;
- struct esp_tuple *esp_tuple = NULL;
+ struct hip_data *data = NULL;
HIP_DEBUG("setting up a new connection...\n");
@@ -1534,26 +1532,6 @@
/* insertion successful -> go on */
tuple = get_tuple_by_hits(&common->hits, &common->hitr);
-
- if (tuple->direction == ORIGINAL_DIR) {
- other_dir_tuple = &tuple->connection->reply;
- other_dir_esps = tuple->connection->reply.esp_tuples;
- } else {
- other_dir_tuple = &tuple->connection->original;
- other_dir_esps = tuple->connection->original.esp_tuples;
- }
-
- /* we have to consider the src ip address in case of cascading
NATs (see above FIXME) */
- esp_tuple = esp_tuple_from_esp_info(esp_info, ip6_src,
other_dir_tuple);
- if (!esp_tuple) {
- free(data);
- HIP_OUT_ERR(0, "Unable to create esp_tuple object from update
message");
- }
-
- other_dir_tuple->esp_tuples = append_to_slist(other_dir_esps,
- esp_tuple);
- insert_esp_tuple(esp_tuple);
-
HIP_DEBUG("connection insertion successful\n");
free(data);
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5974: remove insertion of esp_tuple on 1st update - noreply
