D29948.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D29948.diff
View Options

	diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c
	--- a/sbin/ifconfig/ifpfsync.c
	+++ b/sbin/ifconfig/ifpfsync.c
	@@ -206,7 +206,10 @@
	if (preq.pfsyncr_syncdev[0] != '\0' \|\|
	preq.pfsyncr_syncpeer.s_addr != htonl(INADDR_PFSYNC_GROUP)) {
	printf("maxupd: %d ", preq.pfsyncr_maxupdates);
	- printf("defer: %s\n", preq.pfsyncr_defer ? "on" : "off");
	+ printf("defer: %s\n",
	+ (preq.pfsyncr_defer & PFSYNCF_DEFER) ? "on" : "off");
	+ printf("\tsyncok: %d\n",
	+ (preq.pfsyncr_defer & PFSYNCF_OK) ? 1 : 0);
	}
	}

	diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h
	--- a/sys/net/if_pfsync.h
	+++ b/sys/net/if_pfsync.h
	@@ -236,6 +236,8 @@
	char pfsyncr_syncdev[IFNAMSIZ];
	struct in_addr pfsyncr_syncpeer;
	int pfsyncr_maxupdates;
	+#define PFSYNCF_OK 0x00000001
	+#define PFSYNCF_DEFER 0x00000002
	int pfsyncr_defer;
	};

	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
	@@ -215,8 +215,6 @@
	struct ip_moptions sc_imo;
	struct in_addr sc_sync_peer;
	uint32_t sc_flags;
	-#define PFSYNCF_OK 0x00000001
	-#define PFSYNCF_DEFER 0x00000002
	uint8_t sc_maxupdates;
	struct ip sc_template;
	struct mtx sc_mtx;
	@@ -1375,8 +1373,7 @@
	}
	pfsyncr.pfsyncr_syncpeer = sc->sc_sync_peer;
	pfsyncr.pfsyncr_maxupdates = sc->sc_maxupdates;
	- pfsyncr.pfsyncr_defer = (PFSYNCF_DEFER ==
	- (sc->sc_flags & PFSYNCF_DEFER));
	+ pfsyncr.pfsyncr_defer = sc->sc_flags;
	PFSYNC_UNLOCK(sc);
	return (copyout(&pfsyncr, ifr_data_get_ptr(ifr),
	sizeof(pfsyncr)));