ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

transport reqid, mark_in and mark_out in whack message

This commit is contained in:
Andreas Steffen 2010-07-09 12:19:39 +02:00
parent f65e0dc80f
commit db4ad736be
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/starter/starterwhack.c
View File

@ -287,6 +287,11 @@ int starter_whack_add_conn(starter_conn_t *conn)
msg.sa_keying_tries = conn->sa_keying_tries;
msg.policy = conn->policy;
msg.xauth_identity = conn->xauth_identity;
msg.reqid = conn->reqid;
msg.mark_in.value = conn->mark_in.value;
msg.mark_in.mask = conn->mark_in.mask;
msg.mark_out.value = conn->mark_out.value;
msg.mark_out.mask = conn->mark_out.mask;
/*
* Make sure the IKEv2-only policy bits are unset for IKEv1 connections

10
src/whack/whack.h
View File

@ -48,7 +48,7 @@ typedef enum {
*/
#define WHACK_BASIC_MAGIC (((((('w' << 8) + 'h') << 8) + 'k') << 8) + 24)
#define WHACK_MAGIC (((((('w' << 8) + 'h') << 8) + 'k') << 8) + 29)
#define WHACK_MAGIC (((((('w' << 8) + 'h') << 8) + 'k') << 8) + 30)
typedef struct whack_end whack_end_t;
@ -129,6 +129,14 @@ struct whack_message {
time_t dpd_timeout;
dpd_action_t dpd_action;
/* Assign optional fixed reqid and xfrm marks to IPsec SA */
u_int32_t reqid;
struct {
u_int32_t value;
u_int32_t mask;
} mark_in, mark_out;
/* note that each end contains string 2/5.id, string 3/6 cert,
* and string 4/7 updown
*/