Re: svn commit: r225586 - in head/sys: modules/netgraph/ipfw netgraph

[Gleb Smirnoff]

On Sun, Oct 09, 2011 at 03:53:44PM +0400, Alexander V. Chernikov wrote:
A Understood. So can we use more descriptive ENOENT in code below?
A 
A tag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL);
A if (tag == NULL) {
A NG_FREE_M(m);
A return (EINVAL);/* XXX: find smth better */
A };

Let you decide that. However, you can first analyze other places in kernel,
where m_tag_locate() really should succeed but fails. After that you probably
would want to have the same error return value in all these places :)

A Please see an attached patch

Patch is ok from my view.

-- 
Totus tuus, Glebius.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

svn commit: r225586 - in head/sys: modules/netgraph/ipfw netgraph

[Andrey V. Elsukov]

Author: ae
Date: Thu Sep 15 12:28:17 2011
New Revision: 225586
URL: http://svn.freebsd.org/changeset/base/225586

Log:
  Add IPv6 support to the ng_ipfw(4) [1]. Also add ifdefs to be able
  build it with and without INET/INET6 support.
  
  Submitted by: Alexander V. Chernikov melifaro at yandex-team.ru [1]
  Tested by:Alexander V. Chernikov melifaro at yandex-team.ru [1]
  Approved by:  re (bz)
  MFC after:2 weeks

Modified:
  head/sys/modules/netgraph/ipfw/Makefile
  head/sys/netgraph/ng_ipfw.c

Modified: head/sys/modules/netgraph/ipfw/Makefile
==
--- head/sys/modules/netgraph/ipfw/Makefile Thu Sep 15 12:27:26 2011
(r225585)
+++ head/sys/modules/netgraph/ipfw/Makefile Thu Sep 15 12:28:17 2011
(r225586)
@@ -1,6 +1,20 @@
 # $FreeBSD$
 
+.include bsd.own.mk
+
 KMOD=  ng_ipfw
-SRCS=  ng_ipfw.c
+SRCS=  ng_ipfw.c opt_inet.h opt_inet6.h
+
+.if !defined(KERNBUILDDIR)
+
+.if ${MK_INET_SUPPORT} != no
+opt_inet.h:
+   echo #define INET 1  ${.TARGET}
+.endif
+.if ${MK_INET6_SUPPORT} != no
+opt_inet6.h:
+   echo #define INET6 1  ${.TARGET}
+.endif
+.endif
 
 .include bsd.kmod.mk

Modified: head/sys/netgraph/ng_ipfw.c
==
--- head/sys/netgraph/ng_ipfw.c Thu Sep 15 12:27:26 2011(r225585)
+++ head/sys/netgraph/ng_ipfw.c Thu Sep 15 12:28:17 2011(r225586)
@@ -26,6 +26,9 @@
  * $FreeBSD$
  */
 
+#include opt_inet.h
+#include opt_inet6.h
+
 #include sys/param.h
 #include sys/systm.h
 #include sys/kernel.h
@@ -47,6 +50,8 @@
 #include netinet/ip_fw.h
 #include netinet/ipfw/ip_fw_private.h
 #include netinet/ip.h
+#include netinet/ip6.h
+#include netinet6/ip6_var.h
 
 #include netgraph/ng_message.h
 #include netgraph/ng_parse.h
@@ -224,6 +229,7 @@ ng_ipfw_rcvdata(hook_p hook, item_p item
struct m_tag *tag;
struct ipfw_rule_ref *r;
struct mbuf *m;
+   struct ip *ip;
 
NGI_GET_M(item, m);
NG_FREE_ITEM(item);
@@ -234,23 +240,47 @@ ng_ipfw_rcvdata(hook_p hook, item_p item
return (EINVAL);/* XXX: find smth better */
};
 
+   if (m-m_len  sizeof(struct ip) 
+   (m = m_pullup(m, sizeof(struct ip))) == NULL)
+   return (EINVAL);
+
+   ip = mtod(m, struct ip *);
+
r = (struct ipfw_rule_ref *)(tag + 1);
if (r-info  IPFW_INFO_IN) {
-   ip_input(m);
+   switch (ip-ip_v) {
+#ifdef INET
+   case IPVERSION:
+   ip_input(m);
+   break;
+#endif
+#ifdef INET6
+   case IPV6_VERSION  4:
+   ip6_input(m);
+   break;
+#endif
+   default:
+   NG_FREE_M(m);
+   return (EINVAL);
+   }
return (0);
} else {
-   struct ip *ip;
-
-   if (m-m_len  sizeof(struct ip) 
-   (m = m_pullup(m, sizeof(struct ip))) == NULL)
+   switch (ip-ip_v) {
+#ifdef INET
+   case IPVERSION:
+   SET_HOST_IPLEN(ip);
+   return (ip_output(m, NULL, NULL, IP_FORWARDING,
+   NULL, NULL));
+#endif
+#ifdef INET6
+   case IPV6_VERSION  4:
+   return (ip6_output(m, NULL, NULL, 0, NULL,
+   NULL, NULL));
+#endif
+   default:
return (EINVAL);
-
-   ip = mtod(m, struct ip *);
-
-   SET_HOST_IPLEN(ip);
-
-   return ip_output(m, NULL, NULL, IP_FORWARDING, NULL, NULL);
-   }   
+   }
+   }
 }
 
 static int
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org