sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-12-05 00:01:49 -05:00
Code Issues Projects Releases Wiki Activity

pluto: Completely removed orphaned_holds.

Browse Source
This commit is contained in:
Tobias Brunner 2010-08-10 17:36:38 +02:00
parent f6697eadb9
commit 03ee9623f3
3 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/pluto/kernel.c
View File

@ -144,12 +144,6 @@ static void DBG_bare_shunt(const char *op, const struct bare_shunt *bs)
#define DBG_bare_shunt(op, bs) {}
#endif /* !DEBUG */
/* The orphaned_holds table records %holds for which we
* scan_proc_shunts found no representation of in any connection.
* The corresponding ACQUIRE message might have been lost.
*/
struct eroute_info *orphaned_holds = NULL;
/* forward declaration */
static bool shunt_eroute(connection_t *c, struct spd_route *sr,
enum routing_t rt_kind, unsigned int op,
@ -239,27 +233,6 @@ void record_and_initiate_opportunistic(const ip_subnet *ours,
networkof(his, &dst);
initiate_opportunistic(&src, &dst, transport_proto, TRUE, NULL_FD);
}
/* if present, remove from orphaned_holds list.
* NOTE: we do this last in case ours or his is a pointer into a member.
*/
{
struct eroute_info **pp, *p;
for (pp = &orphaned_holds; (p = *pp) != NULL; pp = &p->next)
{
if (samesubnet(ours, &p->ours)
&& samesubnet(his, &p->his)
&& transport_proto == p->transport_proto
&& portof(&ours->addr) == portof(&p->ours.addr)
&& portof(&his->addr) == portof(&p->his.addr))
{
*pp = p->next;
free(p);
break;
}
}
}
}
#endif /* KLIPS */

14
src/pluto/kernel.h
View File

@ -121,20 +121,6 @@ struct kernel_ops {
extern const struct kernel_ops *kernel_ops;
/* information from /proc/net/ipsec_eroute */
struct eroute_info {
unsigned long count;
ip_subnet ours;
ip_subnet his;
ip_address dst;
ip_said said;
int transport_proto;
struct eroute_info *next;
};
extern struct eroute_info *orphaned_holds;
extern void show_shunt_status(void);
#endif

13
src/pluto/kernel_pfkey.c
View File

@ -447,19 +447,6 @@ pfkey_dequeue(void)
pfkey_iq_head = it->next;
free(it);
}
/* Handle any orphaned holds, but only if no pfkey input is pending.
* For each, we initiate Opportunistic.
* note: we don't need to advance the pointer because
* record_and_initiate_opportunistic will remove the current
* record each time we call it.
*/
while (orphaned_holds != NULL && !pfkey_input_ready())
record_and_initiate_opportunistic(&orphaned_holds->ours
, &orphaned_holds->his
, orphaned_holds->transport_proto
, "%hold found-pfkey");
}
/* asynchronous messages directly from PF_KEY socket */