From aa258367d3e469c426d4b7188572372fd419771e Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 31 Mar 2018 16:33:37 +0200 Subject: sys/linux: fix misspelled const name Fixes #552 --- sys/linux/386.go | 7 ++++--- sys/linux/amd64.go | 7 ++++--- sys/linux/arm.go | 7 ++++--- sys/linux/arm64.go | 7 ++++--- sys/linux/netfilter_bridge.txt | 2 +- sys/linux/netfilter_bridge_386.const | 2 +- sys/linux/netfilter_bridge_amd64.const | 2 +- sys/linux/netfilter_bridge_arm.const | 2 +- sys/linux/netfilter_bridge_arm64.const | 2 +- sys/linux/netfilter_bridge_ppc64le.const | 2 +- sys/linux/ppc64le.go | 7 ++++--- 11 files changed, 26 insertions(+), 21 deletions(-) (limited to 'sys/linux') diff --git a/sys/linux/386.go b/sys/linux/386.go index 1ee8ec5d5..07994d228 100644 --- a/sys/linux/386.go +++ b/sys/linux/386.go @@ -1729,8 +1729,8 @@ var structDescs_386 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "dmsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "tos", TypeSize: 1}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "protocol", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_max", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "dport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, @@ -24063,6 +24063,7 @@ var consts_386 = []ConstValue{ {Name: "EBT_IP6_SPORT", Value: 16}, {Name: "EBT_IP6_TCLASS", Value: 4}, {Name: "EBT_IPROTO", Value: 1}, + {Name: "EBT_IP_DEST", Value: 2}, {Name: "EBT_IP_DPORT", Value: 32}, {Name: "EBT_IP_PROTO", Value: 8}, {Name: "EBT_IP_SOURCE", Value: 1}, @@ -27824,4 +27825,4 @@ var consts_386 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_386 = "3570cc104a8e4f69ab942283cea9c36aead1e7d0" +const revision_386 = "7424a62ff2a634075d9352a6bf1ba14b9377cce8" diff --git a/sys/linux/amd64.go b/sys/linux/amd64.go index c2850dfb1..999d80221 100644 --- a/sys/linux/amd64.go +++ b/sys/linux/amd64.go @@ -1797,8 +1797,8 @@ var structDescs_amd64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "dmsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "tos", TypeSize: 1}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "protocol", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_max", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "dport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, @@ -24694,6 +24694,7 @@ var consts_amd64 = []ConstValue{ {Name: "EBT_IP6_SPORT", Value: 16}, {Name: "EBT_IP6_TCLASS", Value: 4}, {Name: "EBT_IPROTO", Value: 1}, + {Name: "EBT_IP_DEST", Value: 2}, {Name: "EBT_IP_DPORT", Value: 32}, {Name: "EBT_IP_PROTO", Value: 8}, {Name: "EBT_IP_SOURCE", Value: 1}, @@ -28480,4 +28481,4 @@ var consts_amd64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_amd64 = "038a844b7995797839fc3e515efe1276c116f985" +const revision_amd64 = "f52cb963bdf72aed0f98688ac20cb16e40b3b2d3" diff --git a/sys/linux/arm.go b/sys/linux/arm.go index 1ae7549e3..8a68e0700 100644 --- a/sys/linux/arm.go +++ b/sys/linux/arm.go @@ -1714,8 +1714,8 @@ var structDescs_arm = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "dmsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "tos", TypeSize: 1}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "protocol", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_max", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "dport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, @@ -23877,6 +23877,7 @@ var consts_arm = []ConstValue{ {Name: "EBT_IP6_SPORT", Value: 16}, {Name: "EBT_IP6_TCLASS", Value: 4}, {Name: "EBT_IPROTO", Value: 1}, + {Name: "EBT_IP_DEST", Value: 2}, {Name: "EBT_IP_DPORT", Value: 32}, {Name: "EBT_IP_PROTO", Value: 8}, {Name: "EBT_IP_SOURCE", Value: 1}, @@ -27543,4 +27544,4 @@ var consts_arm = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm = "8474607329320b44dfeefacf1b065e564436dc41" +const revision_arm = "3972faa5a8bbad692d1ecd42060d3a0876823259" diff --git a/sys/linux/arm64.go b/sys/linux/arm64.go index 664746bb5..fd95f814e 100644 --- a/sys/linux/arm64.go +++ b/sys/linux/arm64.go @@ -1797,8 +1797,8 @@ var structDescs_arm64 = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "dmsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "tos", TypeSize: 1}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "protocol", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_max", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "dport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, @@ -24160,6 +24160,7 @@ var consts_arm64 = []ConstValue{ {Name: "EBT_IP6_SPORT", Value: 16}, {Name: "EBT_IP6_TCLASS", Value: 4}, {Name: "EBT_IPROTO", Value: 1}, + {Name: "EBT_IP_DEST", Value: 2}, {Name: "EBT_IP_DPORT", Value: 32}, {Name: "EBT_IP_PROTO", Value: 8}, {Name: "EBT_IP_SOURCE", Value: 1}, @@ -27862,4 +27863,4 @@ var consts_arm64 = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_arm64 = "fe357a7bb4ffc4edcba92c35976c5fb5a8e0b917" +const revision_arm64 = "527e225af73003b7222cbf51076b057e824248f6" diff --git a/sys/linux/netfilter_bridge.txt b/sys/linux/netfilter_bridge.txt index 3a04e5652..48d599762 100644 --- a/sys/linux/netfilter_bridge.txt +++ b/sys/linux/netfilter_bridge.txt @@ -254,7 +254,7 @@ ebt_ip_info { dport_max sock_port } -ebt_ip_flags = EBT_IP_SOURCE, BT_IP_DEST, EBT_IP_TOS, EBT_IP_PROTO, EBT_IP_SPORT, EBT_IP_DPORT +ebt_ip_flags = EBT_IP_SOURCE, EBT_IP_DEST, EBT_IP_TOS, EBT_IP_PROTO, EBT_IP_SPORT, EBT_IP_DPORT ebt_ip6_info { saddr ipv6_addr diff --git a/sys/linux/netfilter_bridge_386.const b/sys/linux/netfilter_bridge_386.const index fafc0c128..5fc2e416c 100644 --- a/sys/linux/netfilter_bridge_386.const +++ b/sys/linux/netfilter_bridge_386.const @@ -1,5 +1,4 @@ # AUTOGENERATED FILE -# BT_IP_DEST is not set EBT_802_3 = 4 EBT_802_3_F = 5 EBT_802_3_SAP = 1 @@ -35,6 +34,7 @@ EBT_IP6_SOURCE = 1 EBT_IP6_SPORT = 16 EBT_IP6_TCLASS = 4 EBT_IPROTO = 1 +EBT_IP_DEST = 2 EBT_IP_DPORT = 32 EBT_IP_PROTO = 8 EBT_IP_SOURCE = 1 diff --git a/sys/linux/netfilter_bridge_amd64.const b/sys/linux/netfilter_bridge_amd64.const index 1ffc83ed0..b76db19b3 100644 --- a/sys/linux/netfilter_bridge_amd64.const +++ b/sys/linux/netfilter_bridge_amd64.const @@ -1,5 +1,4 @@ # AUTOGENERATED FILE -# BT_IP_DEST is not set EBT_802_3 = 4 EBT_802_3_F = 5 EBT_802_3_SAP = 1 @@ -35,6 +34,7 @@ EBT_IP6_SOURCE = 1 EBT_IP6_SPORT = 16 EBT_IP6_TCLASS = 4 EBT_IPROTO = 1 +EBT_IP_DEST = 2 EBT_IP_DPORT = 32 EBT_IP_PROTO = 8 EBT_IP_SOURCE = 1 diff --git a/sys/linux/netfilter_bridge_arm.const b/sys/linux/netfilter_bridge_arm.const index 03cc65d56..b2e0338a0 100644 --- a/sys/linux/netfilter_bridge_arm.const +++ b/sys/linux/netfilter_bridge_arm.const @@ -1,5 +1,4 @@ # AUTOGENERATED FILE -# BT_IP_DEST is not set EBT_802_3 = 4 EBT_802_3_F = 5 EBT_802_3_SAP = 1 @@ -35,6 +34,7 @@ EBT_IP6_SOURCE = 1 EBT_IP6_SPORT = 16 EBT_IP6_TCLASS = 4 EBT_IPROTO = 1 +EBT_IP_DEST = 2 EBT_IP_DPORT = 32 EBT_IP_PROTO = 8 EBT_IP_SOURCE = 1 diff --git a/sys/linux/netfilter_bridge_arm64.const b/sys/linux/netfilter_bridge_arm64.const index 18418acf2..7b2b6f726 100644 --- a/sys/linux/netfilter_bridge_arm64.const +++ b/sys/linux/netfilter_bridge_arm64.const @@ -1,5 +1,4 @@ # AUTOGENERATED FILE -# BT_IP_DEST is not set EBT_802_3 = 4 EBT_802_3_F = 5 EBT_802_3_SAP = 1 @@ -35,6 +34,7 @@ EBT_IP6_SOURCE = 1 EBT_IP6_SPORT = 16 EBT_IP6_TCLASS = 4 EBT_IPROTO = 1 +EBT_IP_DEST = 2 EBT_IP_DPORT = 32 EBT_IP_PROTO = 8 EBT_IP_SOURCE = 1 diff --git a/sys/linux/netfilter_bridge_ppc64le.const b/sys/linux/netfilter_bridge_ppc64le.const index 5687fe045..151eec163 100644 --- a/sys/linux/netfilter_bridge_ppc64le.const +++ b/sys/linux/netfilter_bridge_ppc64le.const @@ -1,5 +1,4 @@ # AUTOGENERATED FILE -# BT_IP_DEST is not set EBT_802_3 = 4 EBT_802_3_F = 5 EBT_802_3_SAP = 1 @@ -35,6 +34,7 @@ EBT_IP6_SOURCE = 1 EBT_IP6_SPORT = 16 EBT_IP6_TCLASS = 4 EBT_IPROTO = 1 +EBT_IP_DEST = 2 EBT_IP_DPORT = 32 EBT_IP_PROTO = 8 EBT_IP_SOURCE = 1 diff --git a/sys/linux/ppc64le.go b/sys/linux/ppc64le.go index 679adabb6..12601910d 100644 --- a/sys/linux/ppc64le.go +++ b/sys/linux/ppc64le.go @@ -1791,8 +1791,8 @@ var structDescs_ppc64le = []*KeyedStruct{ &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_addr_mask_vals", FldName: "dmsk", TypeSize: 4}, BigEndian: true}, Vals: []uint64{0, 4278190080, 4294967040, 4294967295, 255}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "tos", TypeSize: 1}}}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ipv4_types", FldName: "protocol", TypeSize: 1}}, Vals: []uint64{0, 1, 2, 4, 6, 8, 12, 17, 22, 29, 33, 41, 46, 47, 50, 51, 92, 94, 98, 103, 108, 132, 136, 137, 255, 115}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "bitmask", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, + &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "ebt_ip_flags", FldName: "invflags", TypeSize: 1}}, Vals: []uint64{1, 2, 4, 8, 16, 32}}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "sport_max", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int16be", FldName: "dport_min", TypeSize: 2}, BigEndian: true}, Kind: 2, RangeBegin: 20000, RangeEnd: 20004}, @@ -23927,6 +23927,7 @@ var consts_ppc64le = []ConstValue{ {Name: "EBT_IP6_SPORT", Value: 16}, {Name: "EBT_IP6_TCLASS", Value: 4}, {Name: "EBT_IPROTO", Value: 1}, + {Name: "EBT_IP_DEST", Value: 2}, {Name: "EBT_IP_DPORT", Value: 32}, {Name: "EBT_IP_PROTO", Value: 8}, {Name: "EBT_IP_SOURCE", Value: 1}, @@ -27624,4 +27625,4 @@ var consts_ppc64le = []ConstValue{ {Name: "bpf_insn_load_imm_dw", Value: 24}, } -const revision_ppc64le = "e64905daf5267a3bd825927680131feb7764dea2" +const revision_ppc64le = "40f069e17536ef2ffed3727cb6238f8ba8d003ef" -- cgit mrf-deployment