* Copyright (c) 2003-2012 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
+ *
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
* unlawful or unlicensed copies of an Apple operating system, or to
* circumvent, violate, or enable the circumvention or violation of, any
* terms of an Apple operating system software license agreement.
- *
+ *
* Please obtain a copy of the License at
* http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
+ *
* The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
* Please see the License for the specific language governing rights and
* limitations under the License.
- *
+ *
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
#endif
#include <string.h>
-#include <machine/spl.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
static int fw6_verbose_limit = 0;
#endif
-LIST_HEAD (ip6_fw_head, ip6_fw_chain) ip6_fw_chain;
+LIST_HEAD(ip6_fw_head, ip6_fw_chain) ip6_fw_chain;
static void ip6fw_kev_post_msg(u_int32_t );
static int ip6fw_sysctl SYSCTL_HANDLER_ARGS;
SYSCTL_DECL(_net_inet6_ip6);
-SYSCTL_NODE(_net_inet6_ip6, OID_AUTO, fw, CTLFLAG_RW|CTLFLAG_LOCKED, 0, "Firewall");
-SYSCTL_PROC(_net_inet6_ip6_fw, OID_AUTO, enable,
- CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
- &ip6_fw_enable, 0, ip6fw_sysctl, "I", "Enable ip6fw");
+SYSCTL_NODE(_net_inet6_ip6, OID_AUTO, fw, CTLFLAG_RW | CTLFLAG_LOCKED, 0, "Firewall");
+SYSCTL_PROC(_net_inet6_ip6_fw, OID_AUTO, enable,
+ CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+ &ip6_fw_enable, 0, ip6fw_sysctl, "I", "Enable ip6fw");
SYSCTL_INT(_net_inet6_ip6_fw, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_LOCKED, &fw6_debug, 0, "");
SYSCTL_INT(_net_inet6_ip6_fw, OID_AUTO, verbose, CTLFLAG_RW | CTLFLAG_LOCKED, &fw6_verbose, 0, "");
SYSCTL_INT(_net_inet6_ip6_fw, OID_AUTO, verbose_limit, CTLFLAG_RW | CTLFLAG_LOCKED, &fw6_verbose_limit, 0, "");
{
#pragma unused(arg1, arg2)
int error;
-
+
error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
- if (error || !req->newptr)
- return (error);
-
+ if (error || !req->newptr) {
+ return error;
+ }
+
ip6fw_kev_post_msg(KEV_IP6FW_ENABLE);
-
+
return error;
}
#endif
-#define dprintf(a) do { \
- if (fw6_debug) \
- printf a; \
- } while (0)
+#define dprintf(a) do { \
+ if (fw6_debug) \
+ printf a; \
+ } while (0)
#define SNPARGS(buf, len) buf + len, sizeof(buf) > len ? sizeof(buf) - len : 0
-static int add_entry6 __P((struct ip6_fw_head *chainptr, struct ip6_fw *frwl));
-static int del_entry6 __P((struct ip6_fw_head *chainptr, u_short number));
-static int zero_entry6 __P((struct ip6_fw *frwl));
+static int add_entry6 __P((struct ip6_fw_head *chainptr, struct ip6_fw *frwl));
+static int del_entry6 __P((struct ip6_fw_head *chainptr, u_short number));
+static int zero_entry6 __P((struct ip6_fw *frwl));
static struct ip6_fw *check_ip6fw_struct __P((struct ip6_fw *m));
-static int ip6opts_match __P((struct ip6_hdr **ip6, struct ip6_fw *f,
- struct mbuf **m,
- int *off, int *nxt, u_short *offset));
-static int port_match6 __P((u_short *portptr, int nports, u_short port,
- int range_flag));
-static int tcp6flg_match __P((struct tcphdr *tcp6, struct ip6_fw *f));
-static int icmp6type_match __P((struct icmp6_hdr * icmp, struct ip6_fw * f));
-static void ip6fw_report __P((struct ip6_fw *f, struct ip6_hdr *ip6,
- struct ifnet *rif, struct ifnet *oif, int off, int nxt));
-
-static int ip6_fw_chk __P((struct ip6_hdr **pip6,
- struct ifnet *oif, u_int16_t *cookie, struct mbuf **m));
-static int ip6_fw_ctl __P((struct sockopt *));
+static int ip6opts_match __P((struct ip6_hdr **ip6, struct ip6_fw *f,
+ struct mbuf **m,
+ int *off, int *nxt, u_short *offset));
+static int port_match6 __P((u_short *portptr, int nports, u_short port,
+ int range_flag));
+static int tcp6flg_match __P((struct tcphdr *tcp6, struct ip6_fw *f));
+static int icmp6type_match __P((struct icmp6_hdr * icmp, struct ip6_fw * f));
+static void ip6fw_report __P((struct ip6_fw *f, struct ip6_hdr *ip6,
+ struct ifnet *rif, struct ifnet *oif, int off, int nxt));
+
+static int ip6_fw_chk __P((struct ip6_hdr **pip6,
+ struct ifnet *oif, u_int16_t *cookie, struct mbuf **m));
+static int ip6_fw_ctl __P((struct sockopt *));
static void cp_to_user_64( struct ip6_fw_64 *userrule_64, struct ip6_fw *rule);
static void cp_from_user_64( struct ip6_fw_64 *userrule_64, struct ip6_fw *rule);
static void cp_to_user_32( struct ip6_fw_32 *userrule_32, struct ip6_fw *rule);
__inline int
port_match6(u_short *portptr, int nports, u_short port, int range_flag)
{
- if (!nports)
+ if (!nports) {
return 1;
+ }
if (range_flag) {
if (portptr[0] <= port && port <= portptr[1]) {
return 1;
static int
tcp6flg_match(struct tcphdr *tcp6, struct ip6_fw *f)
{
- u_char flg_set, flg_clr;
-
+ u_char flg_set, flg_clr;
+
/*
* If an established connection is required, reject packets that
* have only SYN of RST|ACK|SYN set. Otherwise, fall through to
*/
if ((f->fw_ipflg & IPV6_FW_IF_TCPEST) &&
((tcp6->th_flags & (IPV6_FW_TCPF_RST | IPV6_FW_TCPF_ACK |
- IPV6_FW_TCPF_SYN)) == IPV6_FW_TCPF_SYN))
+ IPV6_FW_TCPF_SYN)) == IPV6_FW_TCPF_SYN)) {
return 0;
+ }
flg_set = tcp6->th_flags & f->fw_tcpf;
flg_clr = tcp6->th_flags & f->fw_tcpnf;
- if (flg_set != f->fw_tcpf)
+ if (flg_set != f->fw_tcpf) {
return 0;
- if (flg_clr)
+ }
+ if (flg_clr) {
return 0;
+ }
return 1;
}
{
int type;
- if (!(f->fw_flg & IPV6_FW_F_ICMPBIT))
- return(1);
+ if (!(f->fw_flg & IPV6_FW_F_ICMPBIT)) {
+ return 1;
+ }
type = icmp6->icmp6_type;
/* check for matching type in the bitmap */
if (type < IPV6_FW_ICMPTYPES_DIM * sizeof(unsigned) * 8 &&
- (f->fw_icmp6types[type / (sizeof(unsigned) * 8)] &
- (1U << (type % (8 * sizeof(unsigned))))))
- return(1);
+ (f->fw_icmp6types[type / (sizeof(unsigned) * 8)] &
+ (1U << (type % (8 * sizeof(unsigned)))))) {
+ return 1;
+ }
- return(0); /* no match */
+ return 0; /* no match */
}
static int
icmp6_type == ICMP6_MEMBERSHIP_QUERY ||
icmp6_type == ICMP6_WRUREQUEST ||
icmp6_type == ICMP6_FQDN_QUERY ||
- icmp6_type == ICMP6_NI_QUERY)
- return(1);
+ icmp6_type == ICMP6_NI_QUERY) {
+ return 1;
+ }
- return(0);
+ return 0;
}
static int
ip6opts_match(struct ip6_hdr **pip6, struct ip6_fw *f, struct mbuf **m,
- int *off, int *nxt, u_short *offset)
+ int *off, int *nxt, u_short *offset)
{
int len;
struct ip6_hdr *ip6 = *pip6;
struct ip6_ext *ip6e;
- u_char opts, nopts, nopts_sve;
+ u_char opts, nopts, nopts_sve;
opts = f->fw_ip6opt;
nopts = nopts_sve = f->fw_ip6nopt;
len = ntohs(ip6->ip6_plen) + sizeof(struct ip6_hdr);
while (*off < len) {
ip6e = (struct ip6_ext *)((caddr_t) ip6 + *off);
- if ((*m)->m_len < *off + sizeof(*ip6e))
- goto opts_check; /* XXX */
-
- switch(*nxt) {
+ if ((*m)->m_len < *off + sizeof(*ip6e)) {
+ goto opts_check; /* XXX */
+ }
+ switch (*nxt) {
case IPPROTO_FRAGMENT:
if ((*m)->m_len >= *off + sizeof(struct ip6_frag)) {
struct ip6_frag *ip6f;
break;
}
*nxt = ip6e->ip6e_nxt;
-
}
- opts_check:
- if (f->fw_ip6opt == f->fw_ip6nopt) /* XXX */
+opts_check:
+ if (f->fw_ip6opt == f->fw_ip6nopt) { /* XXX */
return 1;
+ }
- if (opts == 0 && nopts == nopts_sve)
+ if (opts == 0 && nopts == nopts_sve) {
return 1;
- else
+ } else {
return 0;
+ }
}
static
if (byname) {
/* Check unit number (-1 is wildcard) */
if (ifu->fu_via_if.unit != -1
- && ifp->if_unit != ifu->fu_via_if.unit)
- return(0);
+ && ifp->if_unit != ifu->fu_via_if.unit) {
+ return 0;
+ }
/* Check name */
- if (strncmp(ifp->if_name, ifu->fu_via_if.name, IP6FW_IFNLEN))
- return(0);
- return(1);
- } else if (!IN6_IS_ADDR_UNSPECIFIED(&ifu->fu_via_ip6)) { /* Zero == wildcard */
+ if (strncmp(ifp->if_name, ifu->fu_via_if.name, IP6FW_IFNLEN)) {
+ return 0;
+ }
+ return 1;
+ } else if (!IN6_IS_ADDR_UNSPECIFIED(&ifu->fu_via_ip6)) { /* Zero == wildcard */
struct ifaddr *ia;
ifnet_lock_shared(ifp);
for (ia = ifp->if_addrlist.tqh_first; ia;
- ia = ia->ifa_list.tqe_next)
- {
+ ia = ia->ifa_list.tqe_next) {
IFA_LOCK_SPIN(ia);
if (ia->ifa_addr->sa_family != AF_INET6) {
IFA_UNLOCK(ia);
}
IFA_UNLOCK(ia);
ifnet_lock_done(ifp);
- return(1);
+ return 1;
}
ifnet_lock_done(ifp);
- return(0);
+ return 0;
}
- return(1);
+ return 1;
}
static void
ip6fw_report(struct ip6_fw *f, struct ip6_hdr *ip6,
- struct ifnet *rif, struct ifnet *oif, int off, int nxt)
+ struct ifnet *rif, struct ifnet *oif, int off, int nxt)
{
static int counter;
- struct tcphdr *const tcp6 = (struct tcphdr *) ((caddr_t) ip6+ off);
- struct udphdr *const udp = (struct udphdr *) ((caddr_t) ip6+ off);
- struct icmp6_hdr *const icmp6 = (struct icmp6_hdr *) ((caddr_t) ip6+ off);
+ struct tcphdr *const tcp6 = (struct tcphdr *) ((caddr_t) ip6 + off);
+ struct udphdr *const udp = (struct udphdr *) ((caddr_t) ip6 + off);
+ struct icmp6_hdr *const icmp6 = (struct icmp6_hdr *) ((caddr_t) ip6 + off);
int count;
const char *action;
char action2[32], proto[102], name[18];
int len;
count = f ? f->fw_pcnt : ++counter;
- if (fw6_verbose_limit != 0 && count > fw6_verbose_limit)
+ if (fw6_verbose_limit != 0 && count > fw6_verbose_limit) {
return;
+ }
/* Print command name */
snprintf(SNPARGS(name, 0), "ip6fw: %d", f ? f->fw_number : -1);
action = action2;
- if (!f)
+ if (!f) {
action = "Refuse";
- else {
+ } else {
switch (f->fw_flg & IPV6_FW_F_COMMAND) {
case IPV6_FW_F_DENY:
action = "Deny";
break;
case IPV6_FW_F_REJECT:
- if (f->fw_reject_code == IPV6_FW_REJECT_RST)
+ if (f->fw_reject_code == IPV6_FW_REJECT_RST) {
action = "Reset";
- else
+ } else {
action = "Unreach";
+ }
break;
case IPV6_FW_F_ACCEPT:
action = "Accept";
snprintf(SNPARGS(action2, 0), "SkipTo %d",
f->fw_skipto_rule);
break;
- default:
+ default:
action = "UNKNOWN";
break;
}
case IPPROTO_TCP:
len = snprintf(SNPARGS(proto, 0), "TCP [%s]",
ip6_sprintf(&ip6->ip6_src));
- if (off > 0)
+ if (off > 0) {
len += snprintf(SNPARGS(proto, len), ":%d ",
ntohs(tcp6->th_sport));
- else
+ } else {
len += snprintf(SNPARGS(proto, len), " ");
+ }
len += snprintf(SNPARGS(proto, len), "[%s]",
ip6_sprintf(&ip6->ip6_dst));
- if (off > 0)
+ if (off > 0) {
snprintf(SNPARGS(proto, len), ":%d",
ntohs(tcp6->th_dport));
+ }
break;
case IPPROTO_UDP:
len = snprintf(SNPARGS(proto, 0), "UDP [%s]",
ip6_sprintf(&ip6->ip6_src));
- if (off > 0)
+ if (off > 0) {
len += snprintf(SNPARGS(proto, len), ":%d ",
ntohs(udp->uh_sport));
- else
- len += snprintf(SNPARGS(proto, len), " ");
+ } else {
+ len += snprintf(SNPARGS(proto, len), " ");
+ }
len += snprintf(SNPARGS(proto, len), "[%s]",
ip6_sprintf(&ip6->ip6_dst));
- if (off > 0)
+ if (off > 0) {
snprintf(SNPARGS(proto, len), ":%d",
ntohs(udp->uh_dport));
+ }
break;
case IPPROTO_ICMPV6:
- if (off > 0)
+ if (off > 0) {
len = snprintf(SNPARGS(proto, 0), "IPV6-ICMP:%u.%u ",
icmp6->icmp6_type, icmp6->icmp6_code);
- else
+ } else {
len = snprintf(SNPARGS(proto, 0), "IPV6-ICMP ");
+ }
len += snprintf(SNPARGS(proto, len), "[%s]",
ip6_sprintf(&ip6->ip6_src));
snprintf(SNPARGS(proto, len), " [%s]",
break;
}
- if (oif)
+ if (oif) {
log(LOG_AUTHPRIV | LOG_INFO, "%s %s %s out via %s\n",
name, action, proto, if_name(oif));
- else if (rif)
+ } else if (rif) {
log(LOG_AUTHPRIV | LOG_INFO, "%s %s %s in via %s\n",
name, action, proto, if_name(rif));
- else
+ } else {
log(LOG_AUTHPRIV | LOG_INFO, "%s %s %s",
name, action, proto);
- if (fw6_verbose_limit != 0 && count == fw6_verbose_limit)
- log(LOG_AUTHPRIV | LOG_INFO, "ip6fw: limit reached on entry %d\n",
- f ? f->fw_number : -1);
+ }
+ if (fw6_verbose_limit != 0 && count == fw6_verbose_limit) {
+ log(LOG_AUTHPRIV | LOG_INFO, "ip6fw: limit reached on entry %d\n",
+ f ? f->fw_number : -1);
+ }
}
/*
* Return value:
*
* 0 The packet is to be accepted and routed normally OR
- * the packet was denied/rejected and has been dropped;
+ * the packet was denied/rejected and has been dropped;
* in the latter case, *m is equal to NULL upon return.
* port Divert the packet to port.
*/
static int
ip6_fw_chk(struct ip6_hdr **pip6,
- struct ifnet *oif, u_int16_t *cookie, struct mbuf **m)
+ struct ifnet *oif, u_int16_t *cookie, struct mbuf **m)
{
struct ip6_fw_chain *chain;
struct ip6_fw *rule = NULL;
u_short offset = 0;
int off = sizeof(struct ip6_hdr), nxt = ip6->ip6_nxt;
u_short src_port, dst_port;
-#ifdef IP6FW_DIVERT_RESTART
+#ifdef IP6FW_DIVERT_RESTART
u_int16_t skipto = *cookie;
#else
u_int16_t ignport = ntohs(*cookie);
#endif
struct timeval timenow;
+ struct tcp_respond_args tra;
getmicrotime(&timenow);
chain = LIST_FIRST(&ip6_fw_chain);
#ifdef IP6FW_DIVERT_RESTART
if (skipto) {
- if (skipto >= 65535)
+ if (skipto >= 65535) {
goto dropit;
+ }
while (chain && (chain->rule->fw_number <= skipto)) {
chain = LIST_NEXT(chain, chain);
}
- if (! chain) goto dropit;
+ if (!chain) {
+ goto dropit;
+ }
}
#endif /* IP6FW_DIVERT_RESTART */
for (; chain; chain = LIST_NEXT(chain, chain)) {
if (oif) {
/* Check direction outbound */
- if (!(f->fw_flg & IPV6_FW_F_OUT))
+ if (!(f->fw_flg & IPV6_FW_F_OUT)) {
continue;
+ }
} else {
/* Check direction inbound */
- if (!(f->fw_flg & IPV6_FW_F_IN))
+ if (!(f->fw_flg & IPV6_FW_F_IN)) {
continue;
+ }
}
-#define IN6_ARE_ADDR_MASKEQUAL(x,y,z) (\
+#define IN6_ARE_ADDR_MASKEQUAL(x, y, z) (\
(((x)->s6_addr32[0] & (y)->s6_addr32[0]) == (z)->s6_addr32[0]) && \
(((x)->s6_addr32[1] & (y)->s6_addr32[1]) == (z)->s6_addr32[1]) && \
(((x)->s6_addr32[2] & (y)->s6_addr32[2]) == (z)->s6_addr32[2]) && \
/* If src-addr doesn't match, not this rule. */
if (((f->fw_flg & IPV6_FW_F_INVSRC) != 0) ^
- (!IN6_ARE_ADDR_MASKEQUAL(&ip6->ip6_src,&f->fw_smsk,&f->fw_src)))
+ (!IN6_ARE_ADDR_MASKEQUAL(&ip6->ip6_src, &f->fw_smsk, &f->fw_src))) {
continue;
+ }
/* If dest-addr doesn't match, not this rule. */
if (((f->fw_flg & IPV6_FW_F_INVDST) != 0) ^
- (!IN6_ARE_ADDR_MASKEQUAL(&ip6->ip6_dst,&f->fw_dmsk,&f->fw_dst)))
+ (!IN6_ARE_ADDR_MASKEQUAL(&ip6->ip6_dst, &f->fw_dmsk, &f->fw_dst))) {
continue;
+ }
#undef IN6_ARE_ADDR_MASKEQUAL
/* Interface check */
/* Backwards compatibility hack for "via" */
if (!iface || !iface_match(iface,
- &f->fw_in_if, f->fw_flg & IPV6_FW_F_OIFNAME))
+ &f->fw_in_if, f->fw_flg & IPV6_FW_F_OIFNAME)) {
continue;
+ }
} else {
/* Check receive interface */
if ((f->fw_flg & IPV6_FW_F_IIFACE)
&& (!rif || !iface_match(rif,
- &f->fw_in_if, f->fw_flg & IPV6_FW_F_IIFNAME)))
+ &f->fw_in_if, f->fw_flg & IPV6_FW_F_IIFNAME))) {
continue;
+ }
/* Check outgoing interface */
if ((f->fw_flg & IPV6_FW_F_OIFACE)
&& (!oif || !iface_match(oif,
- &f->fw_out_if, f->fw_flg & IPV6_FW_F_OIFNAME)))
+ &f->fw_out_if, f->fw_flg & IPV6_FW_F_OIFNAME))) {
continue;
+ }
}
/* Check IP options */
- if (!ip6opts_match(&ip6, f, m, &off, &nxt, &offset))
+ if (!ip6opts_match(&ip6, f, m, &off, &nxt, &offset)) {
continue;
+ }
/* Fragments */
- if ((f->fw_flg & IPV6_FW_F_FRAG) && !offset)
+ if ((f->fw_flg & IPV6_FW_F_FRAG) && !offset) {
continue;
+ }
/* Check protocol; if wildcard, match */
- if (f->fw_prot == IPPROTO_IPV6)
+ if (f->fw_prot == IPPROTO_IPV6) {
goto got_match;
+ }
/* If different, don't match */
- if (nxt != f->fw_prot)
+ if (nxt != f->fw_prot) {
continue;
+ }
-#define PULLUP_TO(len) do { \
- if ((*m)->m_len < (len) \
- && (*m = m_pullup(*m, (len))) == 0) { \
- goto dropit; \
- } \
- *pip6 = ip6 = mtod(*m, struct ip6_hdr *); \
- } while (0)
+#define PULLUP_TO(len) do { \
+ if ((*m)->m_len < (len) \
+ && (*m = m_pullup(*m, (len))) == 0) { \
+ goto dropit; \
+ } \
+ *pip6 = ip6 = mtod(*m, struct ip6_hdr *); \
+ } while (0)
/* Protocol specific checks */
switch (nxt) {
case IPPROTO_TCP:
- {
+ {
struct tcphdr *tcp6;
- if (offset == 1) { /* cf. RFC 1858 */
+ if (offset == 1) { /* cf. RFC 1858 */
PULLUP_TO(off + 4); /* XXX ? */
goto bogusfrag;
}
* we consider the rule a non-match.
*/
if (f->fw_nports != 0 ||
- f->fw_tcpf != f->fw_tcpnf)
+ f->fw_tcpf != f->fw_tcpnf) {
continue;
+ }
break;
}
PULLUP_TO(off + 14);
tcp6 = (struct tcphdr *) ((caddr_t)ip6 + off);
if (((f->fw_tcpf != f->fw_tcpnf) ||
- (f->fw_ipflg & IPV6_FW_IF_TCPEST)) &&
- !tcp6flg_match(tcp6, f))
+ (f->fw_ipflg & IPV6_FW_IF_TCPEST)) &&
+ !tcp6flg_match(tcp6, f)) {
continue;
+ }
src_port = ntohs(tcp6->th_sport);
dst_port = ntohs(tcp6->th_dport);
goto check_ports;
- }
+ }
case IPPROTO_UDP:
- {
+ {
struct udphdr *udp;
if (offset != 0) {
* rule specifies a port, we consider the rule
* a non-match.
*/
- if (f->fw_nports != 0)
+ if (f->fw_nports != 0) {
continue;
+ }
break;
}
check_ports:
if (!port_match6(&f->fw_pts[0],
IPV6_FW_GETNSRCP(f), src_port,
- f->fw_flg & IPV6_FW_F_SRNG))
+ f->fw_flg & IPV6_FW_F_SRNG)) {
continue;
+ }
if (!port_match6(&f->fw_pts[IPV6_FW_GETNSRCP(f)],
IPV6_FW_GETNDSTP(f), dst_port,
- f->fw_flg & IPV6_FW_F_DRNG))
+ f->fw_flg & IPV6_FW_F_DRNG)) {
continue;
+ }
break;
- }
+ }
case IPPROTO_ICMPV6:
- {
+ {
struct icmp6_hdr *icmp;
- if (offset != 0) /* Type isn't valid */
+ if (offset != 0) { /* Type isn't valid */
break;
+ }
PULLUP_TO(off + 2);
icmp = (struct icmp6_hdr *) ((caddr_t)ip6 + off);
- if (!icmp6type_match(icmp, f))
+ if (!icmp6type_match(icmp, f)) {
continue;
+ }
break;
- }
+ }
#undef PULLUP_TO
bogusfrag:
- if (fw6_verbose)
+ if (fw6_verbose) {
ip6fw_report(NULL, ip6, rif, oif, off, nxt);
+ }
goto dropit;
}
switch (f->fw_flg & IPV6_FW_F_COMMAND) {
case IPV6_FW_F_DIVERT:
case IPV6_FW_F_TEE:
- if (f->fw_divert_port == ignport)
+ if (f->fw_divert_port == ignport) {
continue; /* ignore this rule */
+ }
break;
}
f->timestamp = timenow.tv_sec;
/* Log to console if desired */
- if ((f->fw_flg & IPV6_FW_F_PRN) && fw6_verbose)
+ if ((f->fw_flg & IPV6_FW_F_PRN) && fw6_verbose) {
ip6fw_report(f, ip6, rif, oif, off, nxt);
+ }
/* Take appropriate action */
switch (f->fw_flg & IPV6_FW_F_COMMAND) {
case IPV6_FW_F_ACCEPT:
- return(0);
+ return 0;
case IPV6_FW_F_COUNT:
continue;
case IPV6_FW_F_DIVERT:
#else
*cookie = htons(f->fw_divert_port);
#endif /* IP6FW_DIVERT_RESTART */
- return(f->fw_divert_port);
+ return f->fw_divert_port;
case IPV6_FW_F_TEE:
/*
* XXX someday tee packet here, but beware that you
#ifdef DIAGNOSTIC
while (chain->chain.le_next
&& chain->chain.le_next->rule->fw_number
- < f->fw_skipto_rule)
+ < f->fw_skipto_rule)
#else
while (chain->chain.le_next->rule->fw_number
< f->fw_skipto_rule)
#endif
- chain = chain->chain.le_next;
+ { chain = chain->chain.le_next;}
continue;
}
#ifdef DIAGNOSTIC
/* Rule 65535 should always be there and should always match */
- if (!chain)
+ if (!chain) {
panic("ip6_fw: chain");
+ }
#endif
/*
*/
if ((rule->fw_flg & IPV6_FW_F_COMMAND) == IPV6_FW_F_REJECT
&& (nxt != IPPROTO_ICMPV6 || is_icmp6_query(ip6, off))
- && !((*m)->m_flags & (M_BCAST|M_MCAST))
+ && !((*m)->m_flags & (M_BCAST | M_MCAST))
&& !IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
switch (rule->fw_reject_code) {
case IPV6_FW_REJECT_RST:
- {
+ {
struct tcphdr *const tcp =
- (struct tcphdr *) ((caddr_t)ip6 + off);
+ (struct tcphdr *) ((caddr_t)ip6 + off);
struct {
struct ip6_hdr ip6;
struct tcphdr th;
tcp_seq ack, seq;
int flags;
- if (offset != 0 || (tcp->th_flags & TH_RST))
+ if (offset != 0 || (tcp->th_flags & TH_RST)) {
break;
+ }
ti.ip6 = *ip6;
ti.th = *tcp;
ack = ti.th.th_seq;
if (((*m)->m_flags & M_PKTHDR) != 0) {
ack += (*m)->m_pkthdr.len - off
- - (ti.th.th_off << 2);
+ - (ti.th.th_off << 2);
} else if (ip6->ip6_plen) {
ack += ntohs(ip6->ip6_plen) + sizeof(*ip6)
- - off - (ti.th.th_off << 2);
+ - off - (ti.th.th_off << 2);
} else {
m_freem(*m);
*m = 0;
break;
}
seq = 0;
- flags = TH_RST|TH_ACK;
+ flags = TH_RST | TH_ACK;
}
bcopy(&ti, ip6, sizeof(ti));
+ bzero(&tra, sizeof(tra));
+ tra.ifscope = IFSCOPE_NONE;
+ tra.awdl_unrestricted = 1;
tcp_respond(NULL, ip6, (struct tcphdr *)(ip6 + 1),
- *m, ack, seq, flags, IFSCOPE_NONE, 0);
+ *m, ack, seq, flags, &tra);
*m = NULL;
break;
- }
- default: /* Send an ICMP unreachable using code */
- if (oif)
+ }
+ default: /* Send an ICMP unreachable using code */
+ if (oif) {
(*m)->m_pkthdr.rcvif = oif;
+ }
icmp6_error(*m, ICMP6_DST_UNREACH,
rule->fw_reject_code, 0);
*m = NULL;
m_freem(*m);
*m = NULL;
}
- return(0);
+ return 0;
}
static int
struct ip6_fw *ftmp = 0;
struct ip6_fw_chain *fwc = 0, *fcp, *fcpl = 0;
u_short nbr = 0;
- int s;
fwc = _MALLOC(sizeof *fwc, M_IP6FW, M_WAITOK);
ftmp = _MALLOC(sizeof *ftmp, M_IP6FW, M_WAITOK);
if (!fwc || !ftmp) {
dprintf(("%s malloc said no\n", err_prefix));
- if (fwc) FREE(fwc, M_IP6FW);
- if (ftmp) FREE(ftmp, M_IP6FW);
- return (ENOSPC);
+ if (fwc) {
+ FREE(fwc, M_IP6FW);
+ }
+ if (ftmp) {
+ FREE(ftmp, M_IP6FW);
+ }
+ return ENOSPC;
}
bcopy(frwl, ftmp, sizeof(struct ip6_fw));
ftmp->fw_pcnt = 0L;
ftmp->fw_bcnt = 0L;
fwc->rule = ftmp;
-
- s = splnet();
if (!chainptr->lh_first) {
LIST_INSERT_HEAD(chainptr, fwc, chain);
- splx(s);
- return(0);
- } else if (ftmp->fw_number == (u_short)-1) {
- if (fwc) FREE(fwc, M_IP6FW);
- if (ftmp) FREE(ftmp, M_IP6FW);
- splx(s);
+ return 0;
+ } else if (ftmp->fw_number == (u_short) - 1) {
+ if (fwc) {
+ FREE(fwc, M_IP6FW);
+ }
+ if (ftmp) {
+ FREE(ftmp, M_IP6FW);
+ }
dprintf(("%s bad rule number\n", err_prefix));
- return (EINVAL);
- }
+ return EINVAL;
+ }
/* If entry number is 0, find highest numbered rule and add 100 */
if (ftmp->fw_number == 0) {
for (fcp = chainptr->lh_first; fcp; fcp = fcp->chain.le_next) {
- if (fcp->rule->fw_number != (u_short)-1)
+ if (fcp->rule->fw_number != (u_short) - 1) {
nbr = fcp->rule->fw_number;
- else
+ } else {
break;
+ }
}
- if (nbr < (u_short)-1 - 100)
+ if (nbr < (u_short) - 1 - 100) {
nbr += 100;
+ }
ftmp->fw_number = nbr;
}
}
bcopy(ftmp, frwl, sizeof(struct ip6_fw));
- splx(s);
- return (0);
+ return 0;
}
static int
del_entry6(struct ip6_fw_head *chainptr, u_short number)
{
struct ip6_fw_chain *fcp;
- int s;
-
- s = splnet();
fcp = chainptr->lh_first;
- if (number != (u_short)-1) {
+ if (number != (u_short) - 1) {
for (; fcp; fcp = fcp->chain.le_next) {
if (fcp->rule->fw_number == number) {
LIST_REMOVE(fcp, chain);
- splx(s);
FREE(fcp->rule, M_IP6FW);
FREE(fcp, M_IP6FW);
return 0;
}
}
- splx(s);
- return (EINVAL);
+ return EINVAL;
}
static int
zero_entry6(struct ip6_fw *frwl)
{
struct ip6_fw_chain *fcp;
- int s;
/*
* It's possible to insert multiple chain entries with the
* same number, so we don't stop after finding the first
* match if zeroing a specific entry.
*/
- s = splnet();
- for (fcp = ip6_fw_chain.lh_first; fcp; fcp = fcp->chain.le_next)
+ for (fcp = ip6_fw_chain.lh_first; fcp; fcp = fcp->chain.le_next) {
if (!frwl || frwl->fw_number == 0 || frwl->fw_number == fcp->rule->fw_number) {
fcp->rule->fw_bcnt = fcp->rule->fw_pcnt = 0;
fcp->rule->timestamp = 0;
}
- splx(s);
+ }
if (fw6_verbose) {
- if (frwl)
+ if (frwl) {
log(LOG_AUTHPRIV | LOG_NOTICE,
"ip6fw: Entry %d cleared.\n", frwl->fw_number);
- else
+ } else {
log(LOG_AUTHPRIV | LOG_NOTICE,
"ip6fw: Accounting cleared.\n");
+ }
}
- return(0);
+ return 0;
}
static struct ip6_fw *
if ((frwl->fw_flg & ~IPV6_FW_F_MASK) != 0) {
dprintf(("%s undefined flag bits set (flags=%x)\n",
err_prefix, frwl->fw_flg));
- return (NULL);
+ return NULL;
}
/* Must apply to incoming or outgoing (or both) */
if (!(frwl->fw_flg & (IPV6_FW_F_IN | IPV6_FW_F_OUT))) {
dprintf(("%s neither in nor out\n", err_prefix));
- return (NULL);
+ return NULL;
}
/* Empty interface name is no good */
if (((frwl->fw_flg & IPV6_FW_F_IIFNAME)
- && !*frwl->fw_in_if.fu_via_if.name)
+ && !*frwl->fw_in_if.fu_via_if.name)
|| ((frwl->fw_flg & IPV6_FW_F_OIFNAME)
- && !*frwl->fw_out_if.fu_via_if.name)) {
+ && !*frwl->fw_out_if.fu_via_if.name)) {
dprintf(("%s empty interface name\n", err_prefix));
- return (NULL);
+ return NULL;
}
/* Sanity check interface matching */
if ((frwl->fw_flg & IF6_FW_F_VIAHACK) == IF6_FW_F_VIAHACK) {
- ; /* allow "via" backwards compatibility */
+ ; /* allow "via" backwards compatibility */
} else if ((frwl->fw_flg & IPV6_FW_F_IN)
&& (frwl->fw_flg & IPV6_FW_F_OIFACE)) {
dprintf(("%s outgoing interface check on incoming\n",
err_prefix));
- return (NULL);
+ return NULL;
}
/* Sanity check port ranges */
if ((frwl->fw_flg & IPV6_FW_F_SRNG) && IPV6_FW_GETNSRCP(frwl) < 2) {
dprintf(("%s src range set but n_src_p=%d\n",
err_prefix, IPV6_FW_GETNSRCP(frwl)));
- return (NULL);
+ return NULL;
}
if ((frwl->fw_flg & IPV6_FW_F_DRNG) && IPV6_FW_GETNDSTP(frwl) < 2) {
dprintf(("%s dst range set but n_dst_p=%d\n",
err_prefix, IPV6_FW_GETNDSTP(frwl)));
- return (NULL);
+ return NULL;
}
if (IPV6_FW_GETNSRCP(frwl) + IPV6_FW_GETNDSTP(frwl) > IPV6_FW_MAX_PORTS) {
dprintf(("%s too many ports (%d+%d)\n",
err_prefix, IPV6_FW_GETNSRCP(frwl), IPV6_FW_GETNDSTP(frwl)));
- return (NULL);
+ return NULL;
}
/*
* Protocols other than TCP/UDP don't use port range
(IPV6_FW_GETNSRCP(frwl) || IPV6_FW_GETNDSTP(frwl))) {
dprintf(("%s port(s) specified for non TCP/UDP rule\n",
err_prefix));
- return(NULL);
+ return NULL;
}
/*
* to enforce whatever policy they deem appropriate.
*/
if ((frwl->fw_src.s6_addr32[0] & (~frwl->fw_smsk.s6_addr32[0])) ||
- (frwl->fw_src.s6_addr32[1] & (~frwl->fw_smsk.s6_addr32[1])) ||
- (frwl->fw_src.s6_addr32[2] & (~frwl->fw_smsk.s6_addr32[2])) ||
- (frwl->fw_src.s6_addr32[3] & (~frwl->fw_smsk.s6_addr32[3])) ||
- (frwl->fw_dst.s6_addr32[0] & (~frwl->fw_dmsk.s6_addr32[0])) ||
- (frwl->fw_dst.s6_addr32[1] & (~frwl->fw_dmsk.s6_addr32[1])) ||
- (frwl->fw_dst.s6_addr32[2] & (~frwl->fw_dmsk.s6_addr32[2])) ||
- (frwl->fw_dst.s6_addr32[3] & (~frwl->fw_dmsk.s6_addr32[3]))) {
+ (frwl->fw_src.s6_addr32[1] & (~frwl->fw_smsk.s6_addr32[1])) ||
+ (frwl->fw_src.s6_addr32[2] & (~frwl->fw_smsk.s6_addr32[2])) ||
+ (frwl->fw_src.s6_addr32[3] & (~frwl->fw_smsk.s6_addr32[3])) ||
+ (frwl->fw_dst.s6_addr32[0] & (~frwl->fw_dmsk.s6_addr32[0])) ||
+ (frwl->fw_dst.s6_addr32[1] & (~frwl->fw_dmsk.s6_addr32[1])) ||
+ (frwl->fw_dst.s6_addr32[2] & (~frwl->fw_dmsk.s6_addr32[2])) ||
+ (frwl->fw_dst.s6_addr32[3] & (~frwl->fw_dmsk.s6_addr32[3]))) {
dprintf(("%s rule never matches\n", err_prefix));
- return(NULL);
+ return NULL;
}
if ((frwl->fw_flg & IPV6_FW_F_FRAG) &&
- (frwl->fw_prot == IPPROTO_UDP || frwl->fw_prot == IPPROTO_TCP)) {
+ (frwl->fw_prot == IPPROTO_UDP || frwl->fw_prot == IPPROTO_TCP)) {
if (frwl->fw_nports) {
dprintf(("%s cannot mix 'frag' and ports\n", err_prefix));
- return(NULL);
+ return NULL;
}
if (frwl->fw_prot == IPPROTO_TCP &&
- frwl->fw_tcpf != frwl->fw_tcpnf) {
+ frwl->fw_tcpf != frwl->fw_tcpnf) {
dprintf(("%s cannot mix 'frag' with TCP flags\n", err_prefix));
- return(NULL);
+ return NULL;
}
}
/* Check command specific stuff */
- switch (frwl->fw_flg & IPV6_FW_F_COMMAND)
- {
+ switch (frwl->fw_flg & IPV6_FW_F_COMMAND) {
case IPV6_FW_F_REJECT:
if (frwl->fw_reject_code >= 0x100
&& !(frwl->fw_prot == IPPROTO_TCP
- && frwl->fw_reject_code == IPV6_FW_REJECT_RST)) {
+ && frwl->fw_reject_code == IPV6_FW_REJECT_RST)) {
dprintf(("%s unknown reject code\n", err_prefix));
- return(NULL);
+ return NULL;
}
break;
- case IPV6_FW_F_DIVERT: /* Diverting to port zero is invalid */
+ case IPV6_FW_F_DIVERT: /* Diverting to port zero is invalid */
case IPV6_FW_F_TEE:
if (frwl->fw_divert_port == 0) {
dprintf(("%s can't divert to port 0\n", err_prefix));
- return (NULL);
+ return NULL;
}
break;
case IPV6_FW_F_DENY:
break;
default:
dprintf(("%s invalid command\n", err_prefix));
- return(NULL);
+ return NULL;
}
return frwl;
static void
ip6fw_kev_post_msg(u_int32_t event_code)
{
- struct kev_msg ev_msg;
+ struct kev_msg ev_msg;
bzero(&ev_msg, sizeof(struct kev_msg));
-
+
ev_msg.vendor_code = KEV_VENDOR_APPLE;
ev_msg.kev_class = KEV_FIREWALL_CLASS;
ev_msg.kev_subclass = KEV_IP6FW_SUBCLASS;
ev_msg.event_code = event_code;
kev_post_msg(&ev_msg);
-
}
userrule_64->fw_flg = rule->fw_flg;
userrule_64->fw_ipflg = rule->fw_ipflg;
bcopy( rule->fw_pts, userrule_64->fw_pts, IPV6_FW_MAX_PORTS);
- userrule_64->fw_ip6opt= rule->fw_ip6opt;
+ userrule_64->fw_ip6opt = rule->fw_ip6opt;
userrule_64->fw_ip6nopt = rule->fw_ip6nopt;
userrule_64->fw_tcpf = rule->fw_tcpf;
userrule_64->fw_tcpnf = rule->fw_tcpnf;
userrule_32->fw_flg = rule->fw_flg;
userrule_32->fw_ipflg = rule->fw_ipflg;
bcopy( rule->fw_pts, userrule_32->fw_pts, IPV6_FW_MAX_PORTS);
- userrule_32->fw_ip6opt = rule->fw_ip6opt ;
+ userrule_32->fw_ip6opt = rule->fw_ip6opt;
userrule_32->fw_ip6nopt = rule->fw_ip6nopt;
userrule_32->fw_tcpf = rule->fw_tcpf;
userrule_32->fw_tcpnf = rule->fw_tcpnf;
ip6_fw_ctl(struct sockopt *sopt)
{
int error = 0;
- int spl;
int valsize;
struct ip6_fw rule;
- int is64user=0;
- size_t userrulesize;
+ int is64user = 0;
+ size_t userrulesize;
if (securelevel >= 3 &&
- (sopt->sopt_dir != SOPT_GET || sopt->sopt_name != IPV6_FW_GET))
- return (EPERM);
+ (sopt->sopt_dir != SOPT_GET || sopt->sopt_name != IPV6_FW_GET)) {
+ return EPERM;
+ }
- if ( proc_is64bit(sopt->sopt_p) ){
+ if (proc_is64bit(sopt->sopt_p)) {
is64user = 1;
- userrulesize = sizeof( struct ip6_fw_64 );
- } else
- userrulesize = sizeof( struct ip6_fw_32 );
-
+ userrulesize = sizeof(struct ip6_fw_64);
+ } else {
+ userrulesize = sizeof(struct ip6_fw_32);
+ }
+
/* We ALWAYS expect the client to pass in a rule structure so that we can
* check the version of the API that they are using. In the case of a
* IPV6_FW_GET operation, the first rule of the output buffer passed to us
* must have the version set. */
- if (!sopt->sopt_val || sopt->sopt_valsize < userrulesize) return EINVAL;
+ if (!sopt->sopt_val || sopt->sopt_valsize < userrulesize) {
+ return EINVAL;
+ }
/* save sopt->sopt_valsize */
valsize = sopt->sopt_valsize;
-
- if (is64user){
+
+ if (is64user) {
struct ip6_fw_64 userrule_64;
-
- if ((error = sooptcopyin(sopt, &userrule_64, userrulesize, userrulesize)))
+
+ if ((error = sooptcopyin(sopt, &userrule_64, userrulesize, userrulesize))) {
return error;
-
+ }
+
cp_from_user_64( &userrule_64, &rule );
- }
- else {
+ } else {
struct ip6_fw_32 userrule_32;
-
- if ((error = sooptcopyin(sopt, &userrule_32, userrulesize, userrulesize)))
+
+ if ((error = sooptcopyin(sopt, &userrule_32, userrulesize, userrulesize))) {
return error;
-
+ }
+
cp_from_user_32( &userrule_32, &rule );
}
-
- if (rule.version != IPV6_FW_CURRENT_API_VERSION) return EINVAL;
- rule.version = 0xFFFFFFFF; /* version is meaningless once rules "make it in the door". */
- switch (sopt->sopt_name)
+ if (rule.version != IPV6_FW_CURRENT_API_VERSION) {
+ return EINVAL;
+ }
+ rule.version = 0xFFFFFFFF; /* version is meaningless once rules "make it in the door". */
+
+ switch (sopt->sopt_name) {
+ case IPV6_FW_GET:
{
- case IPV6_FW_GET:
- {
- struct ip6_fw_chain *fcp;
- struct ip6_fw *buf;
- size_t size = 0;
- size_t rulesize = 0;
-
- spl = splnet();
-
- if ( is64user )
- rulesize = sizeof(struct ip6_fw_64 );
- else
- rulesize = sizeof(struct ip6_fw_32 );
-
- LIST_FOREACH(fcp, &ip6_fw_chain, chain)
- size += rulesize;
+ struct ip6_fw_chain *fcp;
+ struct ip6_fw *buf;
+ size_t size = 0;
+ size_t rulesize = 0;
+
+ if (is64user) {
+ rulesize = sizeof(struct ip6_fw_64);
+ } else {
+ rulesize = sizeof(struct ip6_fw_32);
+ }
+
+ LIST_FOREACH(fcp, &ip6_fw_chain, chain)
+ size += rulesize;
+
+ buf = _MALLOC(size, M_TEMP, M_WAITOK);
+ if (!buf) {
+ error = ENOBUFS;
+ } else {
+ //struct ip6_fw *bp = buf;
+ caddr_t bp = (caddr_t)buf;
- buf = _MALLOC(size, M_TEMP, M_WAITOK);
- if (!buf) error = ENOBUFS;
- else
+ LIST_FOREACH(fcp, &ip6_fw_chain, chain)
{
- //struct ip6_fw *bp = buf;
- caddr_t bp = (caddr_t)buf;
-
- LIST_FOREACH(fcp, &ip6_fw_chain, chain)
- {
- //bcopy(fcp->rule, bp, sizeof *bp);
- if ( is64user ){
- cp_to_user_64( (struct ip6_fw_64*)bp, fcp->rule);
- }
- else {
- cp_to_user_32( (struct ip6_fw_32*)bp, fcp->rule);
- }
-
- ( (struct ip6_fw*)bp)->version = IPV6_FW_CURRENT_API_VERSION;
- //bp++;
- bp += rulesize;
+ //bcopy(fcp->rule, bp, sizeof *bp);
+ if (is64user) {
+ cp_to_user_64((struct ip6_fw_64*)bp, fcp->rule);
+ } else {
+ cp_to_user_32((struct ip6_fw_32*)bp, fcp->rule);
}
- }
- splx(spl);
- if (buf)
- {
- sopt->sopt_valsize = valsize;
- error = sooptcopyout(sopt, buf, size);
- FREE(buf, M_TEMP);
+ ((struct ip6_fw*)bp)->version = IPV6_FW_CURRENT_API_VERSION;
+ //bp++;
+ bp += rulesize;
}
-
- break;
}
- case IPV6_FW_FLUSH:
- spl = splnet();
- while (ip6_fw_chain.lh_first &&
- ip6_fw_chain.lh_first->rule->fw_number != (u_short)-1)
- {
- struct ip6_fw_chain *fcp = ip6_fw_chain.lh_first;
- LIST_REMOVE(ip6_fw_chain.lh_first, chain);
- FREE(fcp->rule, M_IP6FW);
- FREE(fcp, M_IP6FW);
- }
- splx(spl);
- ip6fw_kev_post_msg(KEV_IP6FW_FLUSH);
- break;
+ if (buf) {
+ sopt->sopt_valsize = valsize;
+ error = sooptcopyout(sopt, buf, size);
+ FREE(buf, M_TEMP);
+ }
- case IPV6_FW_ZERO:
- error = zero_entry6(&rule);
- break;
+ break;
+ }
- case IPV6_FW_ADD:
- if (check_ip6fw_struct(&rule)) {
- error = add_entry6(&ip6_fw_chain, &rule);
+ case IPV6_FW_FLUSH:
+ while (ip6_fw_chain.lh_first &&
+ ip6_fw_chain.lh_first->rule->fw_number != (u_short) - 1) {
+ struct ip6_fw_chain *fcp = ip6_fw_chain.lh_first;
+ LIST_REMOVE(ip6_fw_chain.lh_first, chain);
+ FREE(fcp->rule, M_IP6FW);
+ FREE(fcp, M_IP6FW);
+ }
+ ip6fw_kev_post_msg(KEV_IP6FW_FLUSH);
+ break;
- ip6fw_kev_post_msg(KEV_IP6FW_ADD);
- } else
- error = EINVAL;
+ case IPV6_FW_ZERO:
+ error = zero_entry6(&rule);
+ break;
- if (is64user){
- struct ip6_fw_64 userrule_64;
- cp_to_user_64( &userrule_64, &rule);
- error = sooptcopyout(sopt, &userrule_64, userrulesize);
- }
- else {
- struct ip6_fw_32 userrule_32;
- cp_to_user_32( &userrule_32, &rule);
- error = sooptcopyout(sopt, &userrule_32, userrulesize);
- }
- break;
+ case IPV6_FW_ADD:
+ if (check_ip6fw_struct(&rule)) {
+ error = add_entry6(&ip6_fw_chain, &rule);
- case IPV6_FW_DEL:
- if (rule.fw_number == (u_short)-1)
- {
- dprintf(("%s can't delete rule 65535\n", err_prefix));
- error = EINVAL;
- }
- else {
- error = del_entry6(&ip6_fw_chain, rule.fw_number);
+ ip6fw_kev_post_msg(KEV_IP6FW_ADD);
+ } else {
+ error = EINVAL;
+ }
- ip6fw_kev_post_msg(KEV_IP6FW_DEL);
- }
- break;
+ if (is64user) {
+ struct ip6_fw_64 userrule_64;
+ cp_to_user_64( &userrule_64, &rule);
+ error = sooptcopyout(sopt, &userrule_64, userrulesize);
+ } else {
+ struct ip6_fw_32 userrule_32;
+ cp_to_user_32( &userrule_32, &rule);
+ error = sooptcopyout(sopt, &userrule_32, userrulesize);
+ }
+ break;
- default:
- dprintf(("%s invalid option %d\n", err_prefix, sopt->sopt_name));
+ case IPV6_FW_DEL:
+ if (rule.fw_number == (u_short) - 1) {
+ dprintf(("%s can't delete rule 65535\n", err_prefix));
error = EINVAL;
+ } else {
+ error = del_entry6(&ip6_fw_chain, rule.fw_number);
+
+ ip6fw_kev_post_msg(KEV_IP6FW_DEL);
+ }
+ break;
+
+ default:
+ dprintf(("%s invalid option %d\n", err_prefix, sopt->sopt_name));
+ error = EINVAL;
}
return error;
bzero(&default_rule, sizeof default_rule);
default_rule.fw_prot = IPPROTO_IPV6;
- default_rule.fw_number = (u_short)-1;
+ default_rule.fw_number = (u_short) - 1;
#ifdef IPV6FIREWALL_DEFAULT_TO_ACCEPT
default_rule.fw_flg |= IPV6_FW_F_ACCEPT;
#else
#endif
default_rule.fw_flg |= IPV6_FW_F_IN | IPV6_FW_F_OUT;
if (check_ip6fw_struct(&default_rule) == NULL ||
- add_entry6(&ip6_fw_chain, &default_rule))
+ add_entry6(&ip6_fw_chain, &default_rule)) {
panic("%s", __FUNCTION__);
+ }
printf("IPv6 packet filtering initialized, ");
#ifdef IPV6FIREWALL_DEFAULT_TO_ACCEPT
#ifndef IPV6FIREWALL_VERBOSE
printf("logging disabled\n");
#else
- if (fw6_verbose_limit == 0)
+ if (fw6_verbose_limit == 0) {
printf("unlimited logging\n");
- else
+ } else {
printf("logging limited to %d packets/entry\n",
fw6_verbose_limit);
+ }
#endif
}
-
projects / apple / xnu.git / blobdiff