diff options
| author | ps <ps@FreeBSD.org> | 2001-10-05 05:45:27 +0000 |
|---|---|---|
| committer | ps <ps@FreeBSD.org> | 2001-10-05 05:45:27 +0000 |
| commit | d0afbb304af764bf12d6222552917b0f272c5201 (patch) | |
| tree | 0b476ffbda93b6f592ea67ee5913d3d077fee0cf /sys/netinet/raw_ip.c | |
| parent | da7f535b3c9dff24f74f65a207240841d391ec18 (diff) | |
| download | FreeBSD-src-d0afbb304af764bf12d6222552917b0f272c5201.zip FreeBSD-src-d0afbb304af764bf12d6222552917b0f272c5201.tar.gz | |
Make it so dummynet and bridge can be loaded as modules.
Submitted by: billf
Diffstat (limited to 'sys/netinet/raw_ip.c')
| -rw-r--r-- | sys/netinet/raw_ip.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 178b483..54c30ac 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -63,19 +63,21 @@ #include <netinet/ip_mroute.h> #include <netinet/ip_fw.h> +#include <netinet/ip_dummynet.h> #ifdef IPSEC #include <netinet6/ipsec.h> #endif /*IPSEC*/ #include "opt_ipdn.h" -#ifdef DUMMYNET -#include <netinet/ip_dummynet.h> -#endif struct inpcbhead ripcb; struct inpcbinfo ripcbinfo; +/* control hooks for ipfw and dummynet */ +ip_fw_ctl_t *ip_fw_ctl_ptr; +ip_dn_ctl_t *ip_dn_ctl_ptr; + /* * Nominal space allocated to a raw ip socket. */ @@ -287,20 +289,18 @@ rip_ctloutput(so, sopt) case IP_FW_ADD: case IP_FW_GET: - if (ip_fw_ctl_ptr == 0) + if (ip_fw_ctl_ptr == NULL) error = ENOPROTOOPT; else error = ip_fw_ctl_ptr(sopt); break; -#ifdef DUMMYNET case IP_DUMMYNET_GET: if (ip_dn_ctl_ptr == NULL) - error = ENOPROTOOPT ; + error = ENOPROTOOPT; else error = ip_dn_ctl_ptr(sopt); break ; -#endif /* DUMMYNET */ case MRT_INIT: case MRT_DONE: @@ -343,7 +343,6 @@ rip_ctloutput(so, sopt) error = ip_fw_ctl_ptr(sopt); break; -#ifdef DUMMYNET case IP_DUMMYNET_CONFIGURE: case IP_DUMMYNET_DEL: case IP_DUMMYNET_FLUSH: @@ -352,7 +351,6 @@ rip_ctloutput(so, sopt) else error = ip_dn_ctl_ptr(sopt); break ; -#endif case IP_RSVP_ON: error = ip_rsvp_init(so); |
