h323-conntrack-nat: port to Linux 2.6.13+, update descriptions
PATCH 1/1 h323-conntrack-nat: port to Linux 2.6.13+, update descriptions
h323-port_to_linux_2.6.13.patch
- port to the new API in Linux 2.6.13 and 2.6.14
- prerequisite:
svn copy patchlets/h323-conntrack-nat/linux-2.6.12 \
patchlets/h323-conntrack-nat/linux-2.6.13h323-update_descriptions.patch
- update descriptions, mention "Voice over IP" and "gnomemeeting" rather than only "netmeeting"
Wed Sep 21 21:16:53 CEST 2005 [email protected]
* port to linux 2.6.13
patchlets/h323-conntrack-nat/linux-2.6.13/net/ipv4/netfilter/ip_conntrack_h323_h225.c +9 -6
@@ -108,7 +108,7 @@ }if (ret && ip == ct->tuplehash[dir].tuple.src.ip) {/* match found: create an expectation */ - exp =ip_conntrack_expect_alloc (); + exp =ip_conntrack_expect_alloc (ct);if (exp ==NULL )return NF_ACCEPT ;
@@ -127,17 +127,20 @@/* call NAT hook and register expectation */ if (ip_nat_h225_hook !=NULL ) { -return ip_nat_h225_hook (pskb, ctinfo, i, - exp); + ret =ip_nat_h225_hook (pskb, ctinfo, i, + exp); }else {/* Can't expect this? Best to drop packet now. */ if (ip_conntrack_expect_related (exp) !=0 ) { -ip_conntrack_expect_free (exp); -return NF_DROP ; + ret =NF_DROP ; }else { -return NF_ACCEPT ; + ret =NF_ACCEPT ; } } + +ip_conntrack_expect_put (exp); + +return ret; } }
patchlets/h323-conntrack-nat/linux-2.6.13/net/ipv4/netfilter/ip_conntrack_h323_h245.c +34 -24
130 lines not on this page · raw message
patchlets/h323-conntrack-nat/linux-2.6.13/net/ipv4/netfilter/ip_nat_h323.c +2 -2
@@ -108,7 +108,7 @@ }if (port ==0 ) { -ip_conntrack_expect_free (exp); +ip_conntrack_expect_put (exp);return NF_DROP ; }
@@ -156,7 +156,7 @@ }if (port ==0 ) { -ip_conntrack_expect_free (exp); +ip_conntrack_expect_put (exp);return NF_DROP ; }
Wed Sep 21 22:19:04 CEST 2005 [email protected]
* mention gnomemeeting; replace "netmeeting" with "voice over IP"
patchlets/h323-conntrack-nat/help +6 -3
@@ -1,6 +1,7 @@ -This adds CONFIG_IP_NF_H323: H.323/netmeeting support module for netfilter -connection tracking and NAT. H.323 uses/relies on the following data streams: +This adds CONFIG_IP_NF_H323: H.323 (voice over IP) support module for +netfilter connection tracking and NAT. H.323 uses/relies on the +following data streams: Port Description 389 Internet Locator Server (TCP)
@@ -16,9 +17,11 @@ search/replace hack from the ip_masq_h323.c module for the 2.2 kernel series. -At the very minimum, H.323/netmeeting (video/audio) is functional by letting +At the very minimum, H.323 (video/audio) is functional by letting trough the 1720 port and loading these H.323 module(s). +This has been tested with Microsoft NetMeeting, gnomemeeting, ohphone. + The H.323 conntrack/NAT modules do not support - H.245 tunnelling
patchlets/h323-conntrack-nat/linux-2.6.13/net/ipv4/netfilter/Kconfig.ladd +2 -2
@@ -5,11 +5,11 @@ default m if IP_NF_H323=m config IP_NF_H323 - tristate 'H.323 (netmeeting) support' + tristate 'H.323 (voice over IP) support' depends on IP_NF_CONNTRACK help H.323 is a standard signalling protocol used by teleconferencing - softwares like netmeeting. With the ip_conntrack_h323 and + software like netmeeting or gnomemeeting. With the ip_conntrack_h323 and the ip_nat_h323 modules you can support the protocol on a connection tracking/NATing firewall.