From 618456b4f4f74528ac6b9d709b1870d0e1d70eb2 Mon Sep 17 00:00:00 2001 From: Michael Tuexen Date: Tue, 30 Apr 2019 09:31:34 +0200 Subject: sys/freebsd: include ioccom.h in pf.txt This is needed for the IORW() macros. --- sys/freebsd/gen/amd64.go | 15 ++------ sys/freebsd/pf.txt | 1 + sys/freebsd/pf_amd64.const | 92 +++++++++++++++++++++------------------------- 3 files changed, 46 insertions(+), 62 deletions(-) (limited to 'sys') diff --git a/sys/freebsd/gen/amd64.go b/sys/freebsd/gen/amd64.go index 83691bebe..6322b3459 100644 --- a/sys/freebsd/gen/amd64.go +++ b/sys/freebsd/gen/amd64.go @@ -2472,7 +2472,7 @@ var syscalls_amd64 = []*Syscall{ }}, {NR: 54, Name: "ioctl$DIOCRINADEFINE", CallName: "ioctl", Args: []Type{ &ResourceType{TypeCommon: TypeCommon{TypeName: "fd_pf", FldName: "fd", TypeSize: 4}}, - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 3293594699}, + &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "cmd", TypeSize: 8}}, Val: 3293594701}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "arg", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "pfioc_table"}}}, }}, {NR: 54, Name: "ioctl$DIOCRSETADDRS", CallName: "ioctl", Args: []Type{ @@ -4013,10 +4013,7 @@ var consts_amd64 = []ConstValue{ {Name: "DIOCCHANGEALTQV1", Value: 3241165873}, {Name: "DIOCCHANGERULE", Value: 3420472346}, {Name: "DIOCCLRIFFLAG", Value: 3223864410}, - {Name: "DIOCCLRRULECTRS", Value: 536888358}, - {Name: "DIOCCLRSRCNODES", Value: 536888405}, {Name: "DIOCCLRSTATES", Value: 3235922962}, - {Name: "DIOCCLRSTATUS", Value: 536888342}, {Name: "DIOCGETADDR", Value: 3295691830}, {Name: "DIOCGETADDRS", Value: 3295691829}, {Name: "DIOCGETALTQSV0", Value: 3238020143}, @@ -4040,11 +4037,9 @@ var consts_amd64 = []ConstValue{ {Name: "DIOCKILLSTATES", Value: 3235922985}, {Name: "DIOCNATLOOK", Value: 3226223639}, {Name: "DIOCOSFPADD", Value: 3230155855}, - {Name: "DIOCOSFPFLUSH", Value: 536888398}, {Name: "DIOCOSFPGET", Value: 3230155856}, {Name: "DIOCRADDADDRS", Value: 3293594691}, {Name: "DIOCRADDTABLES", Value: 3293594685}, - {Name: "DIOCRCLRADDRS", Value: 3293594690}, {Name: "DIOCRCLRASTATS", Value: 3293594696}, {Name: "DIOCRCLRTABLES", Value: 3293594684}, {Name: "DIOCRCLRTSTATS", Value: 3293594689}, @@ -4054,18 +4049,14 @@ var consts_amd64 = []ConstValue{ {Name: "DIOCRGETASTATS", Value: 3293594695}, {Name: "DIOCRGETTABLES", Value: 3293594687}, {Name: "DIOCRGETTSTATS", Value: 3293594688}, - {Name: "DIOCRINADEFINE", Value: 3293594699}, + {Name: "DIOCRINADEFINE", Value: 3293594701}, {Name: "DIOCRSETADDRS", Value: 3293594693}, {Name: "DIOCRSETTFLAGS", Value: 3293594698}, {Name: "DIOCRTSTADDRS", Value: 3293594697}, - {Name: "DIOCSETDEBUG", Value: 3221505048}, - {Name: "DIOCSETHOSTID", Value: 3221505110}, {Name: "DIOCSETIFFLAG", Value: 3223864409}, {Name: "DIOCSETLIMIT", Value: 3221767208}, {Name: "DIOCSETSTATUSIF", Value: 3222291476}, {Name: "DIOCSETTIMEOUT", Value: 3221767197}, - {Name: "DIOCSTARTALTQ", Value: 536888362}, - {Name: "DIOCSTOPALTQ", Value: 536888363}, {Name: "DIOCXBEGIN", Value: 3222291537}, {Name: "DIOCXCOMMIT", Value: 3222291538}, {Name: "DIOCXROLLBACK", Value: 3222291539}, @@ -4587,4 +4578,4 @@ var consts_amd64 = []ConstValue{ {Name: "WUNTRACED", Value: 2}, } -const revision_amd64 = "df0c7f110d9f80fc6efb916edd0244ecea6eeb9b" +const revision_amd64 = "4b5db889742657ae7fe970feaa45dbf6b13e405b" diff --git a/sys/freebsd/pf.txt b/sys/freebsd/pf.txt index cb38bbf1d..4def965bf 100644 --- a/sys/freebsd/pf.txt +++ b/sys/freebsd/pf.txt @@ -6,6 +6,7 @@ include include include include +include include include include diff --git a/sys/freebsd/pf_amd64.const b/sys/freebsd/pf_amd64.const index c89e21973..1bac897b6 100644 --- a/sys/freebsd/pf_amd64.const +++ b/sys/freebsd/pf_amd64.const @@ -1,73 +1,65 @@ +# AUTOGENERATED FILE # AT_FDCWD is not set -DIOCADDRULE = 3420472324 -DIOCGETRULES = 3420472326 -DIOCGETRULE = 3420472327 -DIOCCLRSTATES = 3235922962 -DIOCGETSTATE = 3237102611 -DIOCSETSTATUSIF = 3222291476 -DIOCGETSTATUS = 3248505877 -DIOCCLRSTATUS = 536888342 -DIOCNATLOOK = 3226223639 -DIOCSETDEBUG = 3221505048 -DIOCGETSTATES = 3222291481 -DIOCCHANGERULE = 3420472346 -DIOCSETTIMEOUT = 3221767197 -DIOCGETTIMEOUT = 3221767198 -DIOCADDSTATE = 3237102629 -DIOCCLRRULECTRS = 536888358 -DIOCGETLIMIT = 3221767207 -DIOCSETLIMIT = 3221767208 -DIOCKILLSTATES = 3235922985 -DIOCSTARTALTQ = 536888362 -DIOCSTOPALTQ = 536888363 +DIOCADDADDR = 3295691828 DIOCADDALTQV0 = 3238020141 DIOCADDALTQV1 = 3241165869 +DIOCADDRULE = 3420472324 +DIOCADDSTATE = 3237102629 +DIOCBEGINADDRS = 3295691827 +DIOCCHANGEADDR = 3295691831 +DIOCCHANGEALTQV0 = 3238020145 +DIOCCHANGEALTQV1 = 3241165873 +DIOCCHANGERULE = 3420472346 +DIOCCLRIFFLAG = 3223864410 +DIOCCLRSTATES = 3235922962 +DIOCGETADDR = 3295691830 +DIOCGETADDRS = 3295691829 DIOCGETALTQSV0 = 3238020143 DIOCGETALTQSV1 = 3241165871 DIOCGETALTQV0 = 3238020144 DIOCGETALTQV1 = 3241165872 -DIOCCHANGEALTQV0 = 3238020145 -DIOCCHANGEALTQV1 = 3241165873 +DIOCGETLIMIT = 3221767207 DIOCGETQSTATSV0 = 3222815794 DIOCGETQSTATSV1 = 3223340082 -DIOCBEGINADDRS = 3295691827 -DIOCADDADDR = 3295691828 -DIOCGETADDRS = 3295691829 -DIOCGETADDR = 3295691830 -DIOCCHANGEADDR = 3295691831 -DIOCGETRULESETS = 3292808250 +DIOCGETRULE = 3420472327 +DIOCGETRULES = 3420472326 DIOCGETRULESET = 3292808251 -DIOCRCLRTABLES = 3293594684 +DIOCGETRULESETS = 3292808250 +DIOCGETSRCNODES = 3222291540 +DIOCGETSTATE = 3237102611 +DIOCGETSTATES = 3222291481 +DIOCGETSTATUS = 3248505877 +DIOCGETTIMEOUT = 3221767198 +DIOCIGETIFACES = 3223864407 +DIOCKILLSRCNODES = 3229631579 +DIOCKILLSTATES = 3235922985 +DIOCNATLOOK = 3226223639 +DIOCOSFPADD = 3230155855 +DIOCOSFPGET = 3230155856 +DIOCRADDADDRS = 3293594691 DIOCRADDTABLES = 3293594685 -DIOCRDELTABLES = 3293594686 -DIOCRGETTABLES = 3293594687 -DIOCRGETTSTATS = 3293594688 +DIOCRCLRASTATS = 3293594696 +DIOCRCLRTABLES = 3293594684 DIOCRCLRTSTATS = 3293594689 -DIOCRCLRADDRS = 3293594690 -DIOCRADDADDRS = 3293594691 DIOCRDELADDRS = 3293594692 -DIOCRSETADDRS = 3293594693 +DIOCRDELTABLES = 3293594686 DIOCRGETADDRS = 3293594694 DIOCRGETASTATS = 3293594695 -DIOCRCLRASTATS = 3293594696 -DIOCRTSTADDRS = 3293594697 +DIOCRGETTABLES = 3293594687 +DIOCRGETTSTATS = 3293594688 +DIOCRINADEFINE = 3293594701 +DIOCRSETADDRS = 3293594693 DIOCRSETTFLAGS = 3293594698 -DIOCRINADEFINE = 3293594699 -DIOCOSFPFLUSH = 536888398 -DIOCOSFPADD = 3230155855 -DIOCOSFPGET = 3230155856 +DIOCRTSTADDRS = 3293594697 +DIOCSETIFFLAG = 3223864409 +DIOCSETLIMIT = 3221767208 +DIOCSETSTATUSIF = 3222291476 +DIOCSETTIMEOUT = 3221767197 DIOCXBEGIN = 3222291537 DIOCXCOMMIT = 3222291538 DIOCXROLLBACK = 3222291539 -DIOCGETSRCNODES = 3222291540 -DIOCCLRSRCNODES = 536888405 -DIOCSETHOSTID = 3221505110 -DIOCIGETIFACES = 3223864407 -DIOCSETIFFLAG = 3223864409 -DIOCCLRIFFLAG = 3223864410 -DIOCKILLSRCNODES = 3229631579 +IFNAMSIZ = 16 MAXPATHLEN = 1024 PF_TABLE_NAME_SIZE = 32 -IFNAMSIZ = 16 SYS_ioctl = 54 SYS_openat = 499 -- cgit mrf-deployment