mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-03 06:45:37 -08:00
Code

fix pfsync_encap to cope with pfsync_sendout changes.

Browse Source 
problem noticed by hrvoje popovski
This commit is contained in:
dlg 2024-12-11 04:18:52 +00:00
parent 0c21bd8129
commit 780061c369
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/net/if_pfsync.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: if_pfsync.c,v 1.327 2024/11/19 02:11:03 dlg Exp $ */ /* $OpenBSD: if_pfsync.c,v 1.328 2024/12/11 04:18:52 dlg Exp $ */
/* /*
* Copyright (c) 2002 Michael Shalayeff * Copyright (c) 2002 Michael Shalayeff
@ -849,28 +849,16 @@ put:
static struct mbuf * static struct mbuf *
pfsync_encap(struct pfsync_softc *sc, struct mbuf *m) pfsync_encap(struct pfsync_softc *sc, struct mbuf *m)
{ {
struct { struct pfsync_header *ph;
struct ip ip;
struct pfsync_header ph;
} __packed __aligned(4) *h;
unsigned int mlen = m->m_pkthdr.len;
m = m_prepend(m, sizeof(*h), M_DONTWAIT); m = m_prepend(m, sizeof(*ph), M_DONTWAIT);
if (m == NULL) if (m == NULL)
return (NULL); return (NULL);
h = mtod(m, void *); ph = mtod(m, struct pfsync_header *);
memset(h, 0, sizeof(*h)); memset(ph, 0, sizeof(*ph));
ph->version = PFSYNC_VERSION;
mlen += sizeof(h->ph); ph->len = htons(m->m_pkthdr.len);
h->ph.version = PFSYNC_VERSION;
h->ph.len = htons(mlen);
/* h->ph.pfcksum */
mlen += sizeof(h->ip);
h->ip = sc->sc_template;
h->ip.ip_len = htons(mlen);
h->ip.ip_id = htons(ip_randomid());
return (m); return (m);
} }
@ -1874,10 +1862,7 @@ pfsync_clear_states(u_int32_t creatorid, const char *ifname)
if (sc == NULL) if (sc == NULL)
return; return;
hlen = sizeof(sc->sc_template) + hlen = sizeof(struct pfsync_header) + sizeof(*h);
sizeof(struct pfsync_header) +
sizeof(*h);
mlen = max_linkhdr + hlen; mlen = max_linkhdr + hlen;
m = m_gethdr(M_DONTWAIT, MT_DATA); m = m_gethdr(M_DONTWAIT, MT_DATA);
@ -3069,7 +3054,7 @@ pfsync_upd_req_init(struct pfsync_softc *sc, unsigned int count)
return (NULL); return (NULL);
} }
mlen = max_linkhdr + sizeof(sc->sc_template) + mlen = max_linkhdr +
sizeof(struct pfsync_header) + sizeof(struct pfsync_header) +
sizeof(struct pfsync_subheader) + sizeof(struct pfsync_subheader) +
sizeof(struct pfsync_upd_req) * count; sizeof(struct pfsync_upd_req) * count;