Permalink
Browse files

New code layout

Instead of having a patch, this is no setup up as an external module via
the kbuild system.
  • Loading branch information...
maru-sama committed Oct 29, 2008
1 parent 087855d commit 734f079120ec3d09f0e42ad7635e7c096636c658
@@ -0,0 +1,28 @@
ifneq ($(KERNELRELEASE),)
# kbuild part of makefile
ifndef CONFIG_NF_CONNTRACK
$(error ** You need to enable NF_CONNTRACK in your kernel **)
endif

obj-$(CONFIG_NF_CONNTRACK) := nf_conntrack_rtsp.o nf_nat_rtsp.o
else

# Normal Makefile

KERNELDIR := /lib/modules/`uname -r`/build
all:
$(MAKE) -C $(KERNELDIR) M=`pwd` modules

debug:
$(MAKE) -C $(KERNELDIR) EXTRA_CFLAGS=-DDEBUG M=`pwd` modules

modules_install:
$(MAKE) -C $(KERNELDIR) M=`pwd` modules_install

clean:
rm -f *.o *.ko *.mod.c
rm -f .*.cmd
rm -f Module.symvers modules.order
rm -rf .tmp_versions

endif
File renamed without changes.
@@ -37,15 +37,15 @@
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_expect.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <linux/netfilter/nf_conntrack_rtsp.h>
#include "nf_conntrack_rtsp.h"

#define NF_NEED_STRNCASECMP
#define NF_NEED_STRTOU16
#define NF_NEED_STRTOU32
#define NF_NEED_NEXTLINE
#include <linux/netfilter_helpers.h>
#include "netfilter_helpers.h"
#define NF_NEED_MIME_NEXTLINE
#include <linux/netfilter_mime.h>
#include "netfilter_mime.h"

#include <linux/ctype.h>
#define MAX_SIMUL_SETUP 8 /* XXX: use max_outstanding */
@@ -34,16 +34,16 @@
#include <net/tcp.h>
#include <net/netfilter/nf_nat_helper.h>
#include <net/netfilter/nf_nat_rule.h>
#include <linux/netfilter/nf_conntrack_rtsp.h>
#include "nf_conntrack_rtsp.h"
#include <net/netfilter/nf_conntrack_expect.h>

#include <linux/inet.h>
#include <linux/ctype.h>
#define NF_NEED_STRNCASECMP
#define NF_NEED_STRTOU16
#include <linux/netfilter_helpers.h>
#include "netfilter_helpers.h"
#define NF_NEED_MIME_NEXTLINE
#include <linux/netfilter_mime.h>
#include "netfilter_mime.h"

#define MAX_PORTS 8
#define DSTACT_AUTO 0
Oops, something went wrong.

0 comments on commit 734f079

Please sign in to comment.