sync code with last improvements from OpenBSD

This commit is contained in:
purplerain 2023-10-10 01:27:26 +00:00
parent cb73df2d98
commit e4e1b9f314
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
26 changed files with 382 additions and 253 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: ipsecctl.h,v 1.76 2023/08/07 04:10:08 dlg Exp $ */
/* $OpenBSD: ipsecctl.h,v 1.77 2023/10/09 15:32:14 tobhe Exp $ */
/*
* Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org>
*
@ -30,6 +30,8 @@
#define IPSECCTL_OPT_MONITOR 0x0400
#define IPSECCTL_OPT_SHOWKEY 0x0800
#define IPSECCTL_OPT_COLLAPSE 0x1000
#define IPSECCTL_OPT_SHOWFLOWS 0x2000
#define IPSECCTL_OPT_SHOWSAS 0x4000
enum {
ACTION_ADD, ACTION_DELETE
@ -244,7 +246,6 @@ int parse_rules(const char *, struct ipsecctl *);
int cmdline_symset(char *);
int ipsecctl_add_rule(struct ipsecctl *, struct ipsec_rule *);
void ipsecctl_free_rule(struct ipsec_rule *);
void ipsecctl_get_rules(struct ipsecctl *);
void ipsecctl_print_rule(struct ipsec_rule *, int);
int ike_print_config(struct ipsec_rule *, int);
int ike_ipsec_establish(int, struct ipsec_rule *, const char *);