diff options
Diffstat (limited to 'src/stroke/stroke_msg.h')
| -rw-r--r-- | src/stroke/stroke_msg.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h index b5fdacc00..9800d4319 100644 --- a/src/stroke/stroke_msg.h +++ b/src/stroke/stroke_msg.h @@ -105,15 +105,12 @@ enum purge_flag_t { PURGE_NONE = 0x0000, /** purge ocsp cache entries */ PURGE_OCSP = 0x0001, - /** purge IKE_SAs without a CHILD_SA */ - PURGE_IKE = 0x0002, -<<<<<<< HEAD -======= /** purge CRL cache entries */ - PURGE_CRLS = 0x0004, + PURGE_CRLS = 0x0002, /** purge X509 cache entries */ - PURGE_CERTS = 0x0008, ->>>>>>> upstream/4.5.1 + PURGE_CERTS = 0x0004, + /** purge IKE_SAs without a CHILD_SA */ + PURGE_IKE = 0x0008, }; typedef enum export_flag_t export_flag_t; @@ -152,10 +149,7 @@ struct stroke_end_t { char *ca; char *ca2; char *groups; -<<<<<<< HEAD -======= char *cert_policy; ->>>>>>> upstream/4.5.1 char *updown; char *address; u_int16_t ikeport; @@ -194,11 +188,8 @@ struct stroke_msg_t { STR_TERMINATE, /* terminate connection by peers srcip/virtual ip */ STR_TERMINATE_SRCIP, -<<<<<<< HEAD -======= /* rekey a connection */ STR_REKEY, ->>>>>>> upstream/4.5.1 /* show connection status */ STR_STATUS, /* show verbose connection status */ @@ -231,11 +222,7 @@ struct stroke_msg_t { /* data for STR_INITIATE, STR_ROUTE, STR_UP, STR_DOWN, ... */ struct { char *name; -<<<<<<< HEAD - } initiate, route, unroute, terminate, status, del_conn, del_ca; -======= } initiate, route, unroute, terminate, rekey, status, del_conn, del_ca; ->>>>>>> upstream/4.5.1 /* data for STR_TERMINATE_SRCIP */ struct { @@ -261,10 +248,7 @@ struct stroke_msg_t { int proxy_mode; int install_policy; u_int32_t reqid; -<<<<<<< HEAD -======= u_int32_t tfc; ->>>>>>> upstream/4.5.1 crl_policy_t crl_policy; int unique; |