diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2010-08-18 09:41:04 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2010-09-02 19:04:24 +0200 |
| commit | d499bdf393af91372cdcdfb91b6605c6e77330ed (patch) | |
| tree | 5591a1be7c8aa7bb85da37343675639285342948 /src/pluto/connections.c | |
| parent | b8bf01ddee09faa020d65992d12b4be42be582bb (diff) | |
| download | strongswan-d499bdf393af91372cdcdfb91b6605c6e77330ed.tar.bz2 strongswan-d499bdf393af91372cdcdfb91b6605c6e77330ed.tar.xz | |
pluto: Removed bare shunt table.
Diffstat (limited to 'src/pluto/connections.c')
| -rw-r--r-- | src/pluto/connections.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/pluto/connections.c b/src/pluto/connections.c index 6924b0d49..4d6af23aa 100644 --- a/src/pluto/connections.c +++ b/src/pluto/connections.c @@ -2146,25 +2146,6 @@ static void cannot_oppo(connection_t *c, struct find_oppo_bundle *b, err_t ugh) } return; } - - if (b->held) - { - /* Replace HOLD with b->failure_shunt. - * If no b->failure_shunt specified, use SPI_PASS -- THIS MAY CHANGE. - */ - if (b->failure_shunt == 0) - { - DBG(DBG_OPPO, DBG_log("no explicit failure shunt for %s to %s; installing %%pass" - , ocb, pcb)); - } - - (void) replace_bare_shunt(&b->our_client, &b->peer_client - , b->policy_prio - , b->failure_shunt - , b->failure_shunt != 0 - , b->transport_proto - , ugh); - } } static void initiate_opportunistic_body(struct find_oppo_bundle *b @@ -2201,14 +2182,6 @@ static void continue_oppo(struct adns_continuation *acr, err_t ugh) */ whack_log_fd = whackfd; - /* Discover and record whether %hold has gone away. - * This could have happened while we were awaiting DNS. - * We must check BEFORE any call to cannot_oppo. - */ - if (was_held) - cr->b.held = has_bare_hold(&cr->b.our_client, &cr->b.peer_client - , cr->b.transport_proto); - #ifdef DEBUG /* if we're going to ignore the error, at least note it in debugging log */ if (cr->b.failure_ok && ugh) @@ -2810,19 +2783,6 @@ static void initiate_opportunistic_body(struct find_oppo_bundle *b, "no suitable connection for opportunism " "between %s and %s with %Y as peer", ocb, pcb, ac->gateways_from_dns->gw_id); - - if (b->held) - { - /* Replace HOLD with PASS. - * The type of replacement *ought* to be - * specified by policy. - */ - (void) replace_bare_shunt(&b->our_client, &b->peer_client - , BOTTOM_PRIO - , SPI_PASS /* fail into PASS */ - , TRUE, b->transport_proto - , "no suitable connection"); - } } else { |