denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pluto: Make marks available in updown script.

Browse Source
This commit is contained in:
Tobias Brunner
2010-09-02 19:04:25 +02:00
parent 190ee00c94
commit f8edbc22c7
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pluto/kernel.c
+18
View File
@@ -294,6 +294,8 @@ static bool do_command(connection_t *c, struct spd_route *sr, struct state *st,
peerclientnet_str[ADDRTOT_BUF], peerclientnet_str[ADDRTOT_BUF],
peerclientmask_str[ADDRTOT_BUF], peerclientmask_str[ADDRTOT_BUF],
peerca_str[BUF_LEN], peerca_str[BUF_LEN],
mark_in[BUF_LEN] = "",
mark_out[BUF_LEN] = "",
udp_encap[BUF_LEN] = "", udp_encap[BUF_LEN] = "",
xauth_id_str[BUF_LEN] = "", xauth_id_str[BUF_LEN] = "",
secure_myid_str[BUF_LEN] = "", secure_myid_str[BUF_LEN] = "",
@@ -327,6 +329,18 @@ static bool do_command(connection_t *c, struct spd_route *sr, struct state *st,
strncat(srcip_str, "' ", sizeof(srcip_str)); strncat(srcip_str, "' ", sizeof(srcip_str));
} }
if (sr->mark_in.value)
{
snprintf(mark_in, sizeof(mark_in), "PLUTO_MARK_IN='%u/0x%08x' ",
sr->mark_in.value, sr->mark_in.mask);
}
if (sr->mark_out.value)
{
snprintf(mark_out, sizeof(mark_out), "PLUTO_MARK_OUT='%u/0x%08x' ",
sr->mark_out.value, sr->mark_out.mask);
}
if (st && (st->nat_traversal & NAT_T_DETECTED)) if (st && (st->nat_traversal & NAT_T_DETECTED))
{ {
snprintf(udp_encap, sizeof(udp_encap), "PLUTO_UDP_ENC='%u' ", snprintf(udp_encap, sizeof(udp_encap), "PLUTO_UDP_ENC='%u' ",
@@ -410,6 +424,8 @@ static bool do_command(connection_t *c, struct spd_route *sr, struct state *st,
"PLUTO_PEER_CA='%s' " "PLUTO_PEER_CA='%s' "
"%s" /* optional PLUTO_MY_SRCIP */ "%s" /* optional PLUTO_MY_SRCIP */
"%s" /* optional PLUTO_XAUTH_ID */ "%s" /* optional PLUTO_XAUTH_ID */
"%s" /* optional PLUTO_MARK_IN */
"%s" /* optional PLUTO_MARK_OUT */
"%s" /* optional PLUTO_UDP_ENC */ "%s" /* optional PLUTO_UDP_ENC */
"%s" /* actual script */ "%s" /* actual script */
, verb, verb_suffix , verb, verb_suffix
@@ -435,6 +451,8 @@ static bool do_command(connection_t *c, struct spd_route *sr, struct state *st,
, secure_peerca_str , secure_peerca_str
, srcip_str , srcip_str
, xauth_id_str , xauth_id_str
, mark_in
, mark_out
, udp_encap , udp_encap
, sr->this.updown == NULL? DEFAULT_UPDOWN : sr->this.updown)) , sr->this.updown == NULL? DEFAULT_UPDOWN : sr->this.updown))
{ {