Page MenuHomeFreeBSD
Files F154467517

D38586.diff
No OneTemporary
Actions

D38586.diff
View Options

diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -103,9 +103,13 @@
#include <netinet/tcp_fsm.h>
#include <netinet/tcp_seq.h>
+#include <netinet/ip6.h>
+#include <netinet6/ip6_var.h>
+
#include <netpfil/pf/pfsync_nv.h>
struct pfsync_bucket;
+struct pfsync_softc;
union inet_template {
struct ip ipv4;
@@ -171,6 +175,7 @@
static void pfsync_q_del(struct pf_kstate *, bool, struct pfsync_bucket *);
static void pfsync_update_state(struct pf_kstate *);
+static void pfsync_tx(struct pfsync_softc *, struct mbuf *);
struct pfsync_upd_req_item {
TAILQ_ENTRY(pfsync_upd_req_item) ur_entry;
@@ -187,8 +192,6 @@
struct mbuf *pd_m;
};
-struct pfsync_sofct;
-
struct pfsync_bucket
{
int b_id;
@@ -1837,13 +1840,7 @@
free(pd, M_PFSYNC);
PFSYNC_BUCKET_UNLOCK(b);
- switch (sc->sc_sync_peer.ss_family) {
-#ifdef INET
- case AF_INET:
- ip_output(m, NULL, NULL, 0, NULL, NULL);
- break;
-#endif
- }
+ pfsync_tx(sc, m);
pf_release_state(st);
@@ -2326,6 +2323,56 @@
}
}
+static void
+pfsync_tx(struct pfsync_softc *sc, struct mbuf *m)
+{
+ struct ip *ip;
+ int error, af;
+
+ ip = mtod(m, struct ip *);
+ MPASS(ip->ip_v == IPVERSION || ip->ip_v == (IPV6_VERSION >> 4));
+
+ af = ip->ip_v == IPVERSION ? AF_INET : AF_INET6;
+
+ /*
+ * We distinguish between a deferral packet and our
+ * own pfsync packet based on M_SKIP_FIREWALL
+ * flag. This is XXX.
+ */
+ switch (af) {
+#ifdef INET
+ case AF_INET:
+ if (m->m_flags & M_SKIP_FIREWALL) {
+ error = ip_output(m, NULL, NULL, 0,
+ NULL, NULL);
+ } else {
+ error = ip_output(m, NULL, NULL,
+ IP_RAWOUTPUT, &sc->sc_imo, NULL);
+ }
+ break;
+#endif
+#ifdef INET6
+ case AF_INET6:
+ if (m->m_flags & M_SKIP_FIREWALL) {
+ error = ip6_output(m, NULL, NULL, 0,
+ NULL, NULL, NULL);
+ } else {
+ MPASS(false);
+ /* We don't support pfsync over IPv6. */
+ /*error = ip6_output(m, NULL, NULL,
+ IP_RAWOUTPUT, &sc->sc_imo6, NULL);*/
+ }
+ break;
+#endif
+ }
+
+ if (error == 0)
+ V_pfsyncstats.pfsyncs_opackets++;
+ else
+ V_pfsyncstats.pfsyncs_oerrors++;
+
+}
+
static void
pfsyncintr(void *arg)
{
@@ -2333,7 +2380,7 @@
struct pfsync_softc *sc = arg;
struct pfsync_bucket *b;
struct mbuf *m, *n;
- int c, error;
+ int c;
NET_EPOCH_ENTER(et);
CURVNET_SET(sc->sc_ifp->if_vnet);
@@ -2353,29 +2400,7 @@
n = m->m_nextpkt;
m->m_nextpkt = NULL;
- /*
- * We distinguish between a deferral packet and our
- * own pfsync packet based on M_SKIP_FIREWALL
- * flag. This is XXX.
- */
- switch (sc->sc_sync_peer.ss_family) {
-#ifdef INET
- case AF_INET:
- if (m->m_flags & M_SKIP_FIREWALL) {
- error = ip_output(m, NULL, NULL, 0,
- NULL, NULL);
- } else {
- error = ip_output(m, NULL, NULL,
- IP_RAWOUTPUT, &sc->sc_imo, NULL);
- }
- break;
-#endif
- }
-
- if (error == 0)
- V_pfsyncstats.pfsyncs_opackets++;
- else
- V_pfsyncstats.pfsyncs_oerrors++;
+ pfsync_tx(sc, m);
}
}
CURVNET_RESTORE();

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 29, 4:48 PM (18 h, 18 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32361783
Default Alt Text
D38586.diff (3 KB)

Event Timeline