From: "Filip Sneppe (Cronos)" <filip.sneppe@cronos.be>
To: Harald Welte <laforge@gnumonks.org>
Cc: netfilter-devel@lists.netfilter.org
Subject: Re: [PATCH] conntracker/nat helper for Microsoft Media Services
Date: 24 Sep 2002 14:35:34 +0200 [thread overview]
Message-ID: <1032870935.6100.10.camel@xbox> (raw)
In-Reply-To: <20020924133925.M3810@sunbeam.de.gnumonks.org>
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
On Tue, 2002-09-24 at 13:39, Harald Welte wrote:
> Thanks a lot for contributing this helper to the netfilter project, I have
> committed your patch to CVS right now.
>
> However, there is a small remaining issue:
>
...
>
> Those hunks should not be part of the .patch itself, but seperate pom-files,
> since this clashes with other helpers. See
> netfilter/patch-o-matic/talk-conntrack-nat.patch.ip_conntrack.h*
>
> Please submit an incremental diff against the code which is now in CVS.
> Thanks.
>
My mistake. Patch attached. Sorry for the inconvenience.
Regards,
Filip
[-- Attachment #2: diff.mms.ip_conntrack.h.fixup.20020924-1 --]
[-- Type: text/x-patch, Size: 3463 bytes --]
diff -urN netfilter-orig/patch-o-matic/extra/mms-conntrack-nat.patch netfilter-changed/patch-o-matic/extra/mms-conntrack-nat.patch
--- netfilter-orig/patch-o-matic/extra/mms-conntrack-nat.patch 2002-09-24 13:49:09.000000000 +0200
+++ netfilter-changed/patch-o-matic/extra/mms-conntrack-nat.patch 2002-09-24 14:08:12.000000000 +0200
@@ -1,29 +1,3 @@
-diff -urN -X dontdiff linux-2.4.20-pre7/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.4.20-pre7-mms/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-2.4.20-pre7/include/linux/netfilter_ipv4/ip_conntrack.h 2002-09-22 19:50:53.000000000 +0200
-+++ linux-2.4.20-pre7-mms/include/linux/netfilter_ipv4/ip_conntrack.h 2002-09-17 04:08:25.000000000 +0200
-@@ -60,12 +60,14 @@
- /* Add protocol helper include file here */
- #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
- #include <linux/netfilter_ipv4/ip_conntrack_irc.h>
-+#include <linux/netfilter_ipv4/ip_conntrack_mms.h>
-
- /* per expectation: application helper private data */
- union ip_conntrack_expect_help {
- /* insert conntrack helper private data (expect) here */
- struct ip_ct_ftp_expect exp_ftp_info;
- struct ip_ct_irc_expect exp_irc_info;
-+ struct ip_ct_mms_expect exp_mms_info;
-
- #ifdef CONFIG_IP_NF_NAT_NEEDED
- union {
-@@ -79,6 +81,7 @@
- /* insert conntrack helper private data (master) here */
- struct ip_ct_ftp_master ct_ftp_info;
- struct ip_ct_irc_master ct_irc_info;
-+ struct ip_ct_mms_master ct_mms_info;
- };
-
- #ifdef CONFIG_IP_NF_NAT_NEEDED
diff -urN -X dontdiff linux-2.4.20-pre7/include/linux/netfilter_ipv4/ip_conntrack_mms.h linux-2.4.20-pre7-mms/include/linux/netfilter_ipv4/ip_conntrack_mms.h
--- linux-2.4.20-pre7/include/linux/netfilter_ipv4/ip_conntrack_mms.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.4.20-pre7-mms/include/linux/netfilter_ipv4/ip_conntrack_mms.h 2002-09-17 04:08:25.000000000 +0200
diff -urN netfilter-orig/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h netfilter-changed/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h
--- netfilter-orig/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h 1970-01-01 01:00:00.000000000 +0100
+++ netfilter-changed/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h 2002-09-24 14:10:13.000000000 +0200
@@ -0,0 +1,2 @@
+/* Add protocol helper include file here */
+#include <linux/netfilter_ipv4/ip_conntrack_mms.h>
diff -urN netfilter-orig/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h-2 netfilter-changed/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h-2
--- netfilter-orig/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h-2 1970-01-01 01:00:00.000000000 +0100
+++ netfilter-changed/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h-2 2002-09-24 14:11:42.000000000 +0200
@@ -0,0 +1,2 @@
+ /* insert conntrack helper private data (expect) here */
+ struct ip_ct_mms_expect exp_mms_info;
diff -urN netfilter-orig/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h-3 netfilter-changed/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h-3
--- netfilter-orig/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h-3 1970-01-01 01:00:00.000000000 +0100
+++ netfilter-changed/patch-o-matic/extra/mms-conntrack-nat.patch.ip_conntrack.h-3 2002-09-24 14:12:16.000000000 +0200
@@ -0,0 +1,2 @@
+ /* insert conntrack helper private data (master) here */
+ struct ip_ct_mms_master ct_mms_info;
next prev parent reply other threads:[~2002-09-24 12:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-09-22 22:15 [PATCH] conntracker/nat helper for Microsoft Media Services Filip Sneppe (Cronos)
2002-09-24 11:39 ` Harald Welte
2002-09-24 12:35 ` Filip Sneppe (Cronos) [this message]
2002-09-25 11:32 ` Martin Josefsson
2002-10-10 14:55 ` Martin Josefsson
2002-10-14 11:02 ` Harald Welte
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1032870935.6100.10.camel@xbox \
--to=filip.sneppe@cronos.be \
--cc=laforge@gnumonks.org \
--cc=netfilter-devel@lists.netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.