| author |  Andrew Kelley <andrew@ziglang.org> 2019-03-13 01:00:12-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-03-13 01:00:12-04:00 |
| log | c73cd05468fba4bba5762a654aacdd9d90ecd272 |
| tree | b0d45aa88eaf7cca4b5073c298c6f3a7ba9b7419 |
| parent | 235ded6265b65e7e60a6386417456bbafbcdbc77 |
| signature |  Commit is signed but in an unrecognized format. |
musl: remove files that have case conflicts
9 files changed, 0 insertions(+), 162 deletions(-)
- CMakeLists.txt
libc- include
- generic-musl
- linux
- netfilter_ipv6
CMakeLists.txt-8
| ... | @@ -4274,21 +4274,16 @@ set(ZIG_LIBC_FILES | ... | @@ -4274,21 +4274,16 @@ set(ZIG_LIBC_FILES |
| 4274 | "include/generic-musl/linux/netfilter/xt_AUDIT.h" | 4274 | "include/generic-musl/linux/netfilter/xt_AUDIT.h" |
| 4275 | "include/generic-musl/linux/netfilter/xt_CHECKSUM.h" | 4275 | "include/generic-musl/linux/netfilter/xt_CHECKSUM.h" |
| 4276 | "include/generic-musl/linux/netfilter/xt_CLASSIFY.h" | 4276 | "include/generic-musl/linux/netfilter/xt_CLASSIFY.h" |
| 4277 | "include/generic-musl/linux/netfilter/xt_CONNMARK.h" | ||
| 4278 | "include/generic-musl/linux/netfilter/xt_CONNSECMARK.h" | 4277 | "include/generic-musl/linux/netfilter/xt_CONNSECMARK.h" |
| 4279 | "include/generic-musl/linux/netfilter/xt_CT.h" | 4278 | "include/generic-musl/linux/netfilter/xt_CT.h" |
| 4280 | "include/generic-musl/linux/netfilter/xt_DSCP.h" | ||
| 4281 | "include/generic-musl/linux/netfilter/xt_HMARK.h" | 4279 | "include/generic-musl/linux/netfilter/xt_HMARK.h" |
| 4282 | "include/generic-musl/linux/netfilter/xt_IDLETIMER.h" | 4280 | "include/generic-musl/linux/netfilter/xt_IDLETIMER.h" |
| 4283 | "include/generic-musl/linux/netfilter/xt_LED.h" | 4281 | "include/generic-musl/linux/netfilter/xt_LED.h" |
| 4284 | "include/generic-musl/linux/netfilter/xt_LOG.h" | 4282 | "include/generic-musl/linux/netfilter/xt_LOG.h" |
| 4285 | "include/generic-musl/linux/netfilter/xt_MARK.h" | ||
| 4286 | "include/generic-musl/linux/netfilter/xt_NFLOG.h" | 4283 | "include/generic-musl/linux/netfilter/xt_NFLOG.h" |
| 4287 | "include/generic-musl/linux/netfilter/xt_NFQUEUE.h" | 4284 | "include/generic-musl/linux/netfilter/xt_NFQUEUE.h" |
| 4288 | "include/generic-musl/linux/netfilter/xt_RATEEST.h" | ||
| 4289 | "include/generic-musl/linux/netfilter/xt_SECMARK.h" | 4285 | "include/generic-musl/linux/netfilter/xt_SECMARK.h" |
| 4290 | "include/generic-musl/linux/netfilter/xt_SYNPROXY.h" | 4286 | "include/generic-musl/linux/netfilter/xt_SYNPROXY.h" |
| 4291 | "include/generic-musl/linux/netfilter/xt_TCPMSS.h" | ||
| 4292 | "include/generic-musl/linux/netfilter/xt_TCPOPTSTRIP.h" | 4287 | "include/generic-musl/linux/netfilter/xt_TCPOPTSTRIP.h" |
| 4293 | "include/generic-musl/linux/netfilter/xt_TEE.h" | 4288 | "include/generic-musl/linux/netfilter/xt_TEE.h" |
| 4294 | "include/generic-musl/linux/netfilter/xt_TPROXY.h" | 4289 | "include/generic-musl/linux/netfilter/xt_TPROXY.h" |
| ... | @@ -4365,16 +4360,13 @@ set(ZIG_LIBC_FILES | ... | @@ -4365,16 +4360,13 @@ set(ZIG_LIBC_FILES |
| 4365 | "include/generic-musl/linux/netfilter_ipv4.h" | 4360 | "include/generic-musl/linux/netfilter_ipv4.h" |
| 4366 | "include/generic-musl/linux/netfilter_ipv4/ip_tables.h" | 4361 | "include/generic-musl/linux/netfilter_ipv4/ip_tables.h" |
| 4367 | "include/generic-musl/linux/netfilter_ipv4/ipt_CLUSTERIP.h" | 4362 | "include/generic-musl/linux/netfilter_ipv4/ipt_CLUSTERIP.h" |
| 4368 | "include/generic-musl/linux/netfilter_ipv4/ipt_ECN.h" | ||
| 4369 | "include/generic-musl/linux/netfilter_ipv4/ipt_LOG.h" | 4363 | "include/generic-musl/linux/netfilter_ipv4/ipt_LOG.h" |
| 4370 | "include/generic-musl/linux/netfilter_ipv4/ipt_REJECT.h" | 4364 | "include/generic-musl/linux/netfilter_ipv4/ipt_REJECT.h" |
| 4371 | "include/generic-musl/linux/netfilter_ipv4/ipt_TTL.h" | ||
| 4372 | "include/generic-musl/linux/netfilter_ipv4/ipt_ah.h" | 4365 | "include/generic-musl/linux/netfilter_ipv4/ipt_ah.h" |
| 4373 | "include/generic-musl/linux/netfilter_ipv4/ipt_ecn.h" | 4366 | "include/generic-musl/linux/netfilter_ipv4/ipt_ecn.h" |
| 4374 | "include/generic-musl/linux/netfilter_ipv4/ipt_ttl.h" | 4367 | "include/generic-musl/linux/netfilter_ipv4/ipt_ttl.h" |
| 4375 | "include/generic-musl/linux/netfilter_ipv6.h" | 4368 | "include/generic-musl/linux/netfilter_ipv6.h" |
| 4376 | "include/generic-musl/linux/netfilter_ipv6/ip6_tables.h" | 4369 | "include/generic-musl/linux/netfilter_ipv6/ip6_tables.h" |
| 4377 | "include/generic-musl/linux/netfilter_ipv6/ip6t_HL.h" | ||
| 4378 | "include/generic-musl/linux/netfilter_ipv6/ip6t_LOG.h" | 4370 | "include/generic-musl/linux/netfilter_ipv6/ip6t_LOG.h" |
| 4379 | "include/generic-musl/linux/netfilter_ipv6/ip6t_NPT.h" | 4371 | "include/generic-musl/linux/netfilter_ipv6/ip6t_NPT.h" |
| 4380 | "include/generic-musl/linux/netfilter_ipv6/ip6t_REJECT.h" | 4372 | "include/generic-musl/linux/netfilter_ipv6/ip6t_REJECT.h" |
libc/include/generic-musl/linux/netfilter/xt_CONNMARK.h deleted-7
| ... | @@ -1,7 +0,0 @@ | ||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | #ifndef _XT_CONNMARK_H_target | ||
| 3 | #define _XT_CONNMARK_H_target | ||
| 4 | |||
| 5 | #include <linux/netfilter/xt_connmark.h> | ||
| 6 | |||
| 7 | #endif /*_XT_CONNMARK_H_target*/ | ||
| \ No newline at end of file | |||
libc/include/generic-musl/linux/netfilter/xt_DSCP.h deleted-27
| ... | @@ -1,27 +0,0 @@ | ||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | /* x_tables module for setting the IPv4/IPv6 DSCP field | ||
| 3 | * | ||
| 4 | * (C) 2002 Harald Welte <laforge@gnumonks.org> | ||
| 5 | * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com> | ||
| 6 | * This software is distributed under GNU GPL v2, 1991 | ||
| 7 | * | ||
| 8 | * See RFC2474 for a description of the DSCP field within the IP Header. | ||
| 9 | * | ||
| 10 | * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp | ||
| 11 | */ | ||
| 12 | #ifndef _XT_DSCP_TARGET_H | ||
| 13 | #define _XT_DSCP_TARGET_H | ||
| 14 | #include <linux/netfilter/xt_dscp.h> | ||
| 15 | #include <linux/types.h> | ||
| 16 | |||
| 17 | /* target info */ | ||
| 18 | struct xt_DSCP_info { | ||
| 19 | __u8 dscp; | ||
| 20 | }; | ||
| 21 | |||
| 22 | struct xt_tos_target_info { | ||
| 23 | __u8 tos_value; | ||
| 24 | __u8 tos_mask; | ||
| 25 | }; | ||
| 26 | |||
| 27 | #endif /* _XT_DSCP_TARGET_H */ | ||
| \ No newline at end of file | |||
libc/include/generic-musl/linux/netfilter/xt_MARK.h deleted-7
| ... | @@ -1,7 +0,0 @@ | ||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | #ifndef _XT_MARK_H_target | ||
| 3 | #define _XT_MARK_H_target | ||
| 4 | |||
| 5 | #include <linux/netfilter/xt_mark.h> | ||
| 6 | |||
| 7 | #endif /*_XT_MARK_H_target */ | ||
| \ No newline at end of file | |||
libc/include/generic-musl/linux/netfilter/xt_RATEEST.h deleted-17
| ... | @@ -1,17 +0,0 @@ | ||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | #ifndef _XT_RATEEST_TARGET_H | ||
| 3 | #define _XT_RATEEST_TARGET_H | ||
| 4 | |||
| 5 | #include <linux/types.h> | ||
| 6 | #include <linux/if.h> | ||
| 7 | |||
| 8 | struct xt_rateest_target_info { | ||
| 9 | char name[IFNAMSIZ]; | ||
| 10 | __s8 interval; | ||
| 11 | __u8 ewma_log; | ||
| 12 | |||
| 13 | /* Used internally by the kernel */ | ||
| 14 | struct xt_rateest *est __attribute__((aligned(8))); | ||
| 15 | }; | ||
| 16 | |||
| 17 | #endif /* _XT_RATEEST_TARGET_H */ | ||
| \ No newline at end of file | |||
libc/include/generic-musl/linux/netfilter/xt_TCPMSS.h deleted-13
| ... | @@ -1,13 +0,0 @@ | ||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | #ifndef _XT_TCPMSS_H | ||
| 3 | #define _XT_TCPMSS_H | ||
| 4 | |||
| 5 | #include <linux/types.h> | ||
| 6 | |||
| 7 | struct xt_tcpmss_info { | ||
| 8 | __u16 mss; | ||
| 9 | }; | ||
| 10 | |||
| 11 | #define XT_TCPMSS_CLAMP_PMTU 0xffff | ||
| 12 | |||
| 13 | #endif /* _XT_TCPMSS_H */ | ||
| \ No newline at end of file | |||
libc/include/generic-musl/linux/netfilter_ipv4/ipt_ECN.h deleted-34
| ... | @@ -1,34 +0,0 @@ | ||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | /* Header file for iptables ipt_ECN target | ||
| 3 | * | ||
| 4 | * (C) 2002 by Harald Welte <laforge@gnumonks.org> | ||
| 5 | * | ||
| 6 | * This software is distributed under GNU GPL v2, 1991 | ||
| 7 | * | ||
| 8 | * ipt_ECN.h,v 1.3 2002/05/29 12:17:40 laforge Exp | ||
| 9 | */ | ||
| 10 | #ifndef _IPT_ECN_TARGET_H | ||
| 11 | #define _IPT_ECN_TARGET_H | ||
| 12 | |||
| 13 | #include <linux/types.h> | ||
| 14 | #include <linux/netfilter/xt_DSCP.h> | ||
| 15 | |||
| 16 | #define IPT_ECN_IP_MASK (~XT_DSCP_MASK) | ||
| 17 | |||
| 18 | #define IPT_ECN_OP_SET_IP 0x01 /* set ECN bits of IPv4 header */ | ||
| 19 | #define IPT_ECN_OP_SET_ECE 0x10 /* set ECE bit of TCP header */ | ||
| 20 | #define IPT_ECN_OP_SET_CWR 0x20 /* set CWR bit of TCP header */ | ||
| 21 | |||
| 22 | #define IPT_ECN_OP_MASK 0xce | ||
| 23 | |||
| 24 | struct ipt_ECN_info { | ||
| 25 | __u8 operation; /* bitset of operations */ | ||
| 26 | __u8 ip_ect; /* ECT codepoint of IPv4 header, pre-shifted */ | ||
| 27 | union { | ||
| 28 | struct { | ||
| 29 | __u8 ece:1, cwr:1; /* TCP ECT bits */ | ||
| 30 | } tcp; | ||
| 31 | } proto; | ||
| 32 | }; | ||
| 33 | |||
| 34 | #endif /* _IPT_ECN_TARGET_H */ | ||
| \ No newline at end of file | |||
libc/include/generic-musl/linux/netfilter_ipv4/ipt_TTL.h deleted-24
| ... | @@ -1,24 +0,0 @@ | ||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | /* TTL modification module for IP tables | ||
| 3 | * (C) 2000 by Harald Welte <laforge@netfilter.org> */ | ||
| 4 | |||
| 5 | #ifndef _IPT_TTL_H | ||
| 6 | #define _IPT_TTL_H | ||
| 7 | |||
| 8 | #include <linux/types.h> | ||
| 9 | |||
| 10 | enum { | ||
| 11 | IPT_TTL_SET = 0, | ||
| 12 | IPT_TTL_INC, | ||
| 13 | IPT_TTL_DEC | ||
| 14 | }; | ||
| 15 | |||
| 16 | #define IPT_TTL_MAXMODE IPT_TTL_DEC | ||
| 17 | |||
| 18 | struct ipt_TTL_info { | ||
| 19 | __u8 mode; | ||
| 20 | __u8 ttl; | ||
| 21 | }; | ||
| 22 | |||
| 23 | |||
| 24 | #endif | ||
| \ No newline at end of file | |||
libc/include/generic-musl/linux/netfilter_ipv6/ip6t_HL.h deleted-25
| ... | @@ -1,25 +0,0 @@ | ||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | /* Hop Limit modification module for ip6tables | ||
| 3 | * Maciej Soltysiak <solt@dns.toxicfilms.tv> | ||
| 4 | * Based on HW's TTL module */ | ||
| 5 | |||
| 6 | #ifndef _IP6T_HL_H | ||
| 7 | #define _IP6T_HL_H | ||
| 8 | |||
| 9 | #include <linux/types.h> | ||
| 10 | |||
| 11 | enum { | ||
| 12 | IP6T_HL_SET = 0, | ||
| 13 | IP6T_HL_INC, | ||
| 14 | IP6T_HL_DEC | ||
| 15 | }; | ||
| 16 | |||
| 17 | #define IP6T_HL_MAXMODE IP6T_HL_DEC | ||
| 18 | |||
| 19 | struct ip6t_HL_info { | ||
| 20 | __u8 mode; | ||
| 21 | __u8 hop_limit; | ||
| 22 | }; | ||
| 23 | |||
| 24 | |||
| 25 | #endif | ||
| \ No newline at end of file | |||