SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-07-27 19:47:41 +00:00
parent 06dd911763
commit f4c73361e2
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
31 changed files with 641 additions and 476 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sys/net/pipex.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: pipex.c,v 1.154 2024/06/07 13:43:21 jsg Exp $ */
/* $OpenBSD: pipex.c,v 1.155 2024/07/26 15:45:31 yasuoka Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@ -2031,7 +2031,13 @@ pipex_l2tp_input(struct mbuf *m0, int off0, struct pipex_session *session,
mtx_enter(&session->pxs_mtx);
l2tp_session = &session->proto.l2tp;
l2tp_session->ipsecflowinfo = ipsecflowinfo;
if (l2tp_session->ipsecflowinfo != ipsecflowinfo) {
pipex_session_log(session, LOG_DEBUG,
"received message is %s",
(ipsecflowinfo != 0)? "from invalid ipsec flow" :
"without ipsec");
goto drop;
}
m_copydata(m0, off0, sizeof(flags), &flags);

4
sys/net/pipex_local.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: pipex_local.h,v 1.52 2024/05/29 00:48:15 jsg Exp $ */
/* $OpenBSD: pipex_local.h,v 1.53 2024/07/26 15:51:09 yasuoka Exp $ */
/*
* Copyright (c) 2009 Internet Initiative Japan Inc.
@ -140,6 +140,7 @@ struct pipex_l2tp_session {
uint16_t peer_tunnel_id; /* [I] peer's tunnel-id */
uint32_t option_flags; /* [I] protocol options */
uint32_t ipsecflowinfo; /* [I] IPsec SA flow id for NAT-T */
int16_t ns_gap; /* [s] gap between userland and pipex */
int16_t nr_gap; /* [s] gap between userland and pipex */
@ -150,7 +151,6 @@ struct pipex_l2tp_session {
uint16_t nr_nxt; /* [s] next sequence number to recv */
uint16_t nr_acked; /* [s] acked sequence number to recv */
uint32_t ipsecflowinfo; /* [s] IPsec SA flow id for NAT-T */
};
#endif /* PIPEX_L2TP */