forked from mirrors/linux
		
	[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port
Add IPv4 and IPv6 capable nf_conntrack port of the H.323 conntrack/NAT helper. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
		
							parent
							
								
									1695890057
								
							
						
					
					
						commit
						f587de0e2f
					
				
					 15 changed files with 2600 additions and 14 deletions
				
			
		
							
								
								
									
										92
									
								
								include/linux/netfilter/nf_conntrack_h323.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										92
									
								
								include/linux/netfilter/nf_conntrack_h323.h
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,92 @@ | |||
| #ifndef _NF_CONNTRACK_H323_H | ||||
| #define _NF_CONNTRACK_H323_H | ||||
| 
 | ||||
| #ifdef __KERNEL__ | ||||
| 
 | ||||
| #include <linux/netfilter/nf_conntrack_h323_asn1.h> | ||||
| 
 | ||||
| #define RAS_PORT 1719 | ||||
| #define Q931_PORT 1720 | ||||
| #define H323_RTP_CHANNEL_MAX 4	/* Audio, video, FAX and other */ | ||||
| 
 | ||||
| /* This structure exists only once per master */ | ||||
| struct nf_ct_h323_master { | ||||
| 
 | ||||
| 	/* Original and NATed Q.931 or H.245 signal ports */ | ||||
| 	__be16 sig_port[IP_CT_DIR_MAX]; | ||||
| 
 | ||||
| 	/* Original and NATed RTP ports */ | ||||
| 	__be16 rtp_port[H323_RTP_CHANNEL_MAX][IP_CT_DIR_MAX]; | ||||
| 
 | ||||
| 	union { | ||||
| 		/* RAS connection timeout */ | ||||
| 		u_int32_t timeout; | ||||
| 
 | ||||
| 		/* Next TPKT length (for separate TPKT header and data) */ | ||||
| 		u_int16_t tpkt_len[IP_CT_DIR_MAX]; | ||||
| 	}; | ||||
| }; | ||||
| 
 | ||||
| struct nf_conn; | ||||
| 
 | ||||
| extern int get_h225_addr(struct nf_conn *ct, unsigned char *data, | ||||
| 			 TransportAddress *taddr, | ||||
| 			 union nf_conntrack_address *addr, __be16 *port); | ||||
| extern void nf_conntrack_h245_expect(struct nf_conn *new, | ||||
| 				     struct nf_conntrack_expect *this); | ||||
| extern void nf_conntrack_q931_expect(struct nf_conn *new, | ||||
| 				     struct nf_conntrack_expect *this); | ||||
| extern int (*set_h245_addr_hook) (struct sk_buff **pskb, | ||||
| 				  unsigned char **data, int dataoff, | ||||
| 				  H245_TransportAddress *taddr, | ||||
| 				  union nf_conntrack_address *addr, | ||||
| 				  __be16 port); | ||||
| extern int (*set_h225_addr_hook) (struct sk_buff **pskb, | ||||
| 				  unsigned char **data, int dataoff, | ||||
| 				  TransportAddress *taddr, | ||||
| 				  union nf_conntrack_address *addr, | ||||
| 				  __be16 port); | ||||
| extern int (*set_sig_addr_hook) (struct sk_buff **pskb, | ||||
| 				 struct nf_conn *ct, | ||||
| 				 enum ip_conntrack_info ctinfo, | ||||
| 				 unsigned char **data, | ||||
| 				 TransportAddress *taddr, int count); | ||||
| extern int (*set_ras_addr_hook) (struct sk_buff **pskb, | ||||
| 				 struct nf_conn *ct, | ||||
| 				 enum ip_conntrack_info ctinfo, | ||||
| 				 unsigned char **data, | ||||
| 				 TransportAddress *taddr, int count); | ||||
| extern int (*nat_rtp_rtcp_hook) (struct sk_buff **pskb, | ||||
| 				 struct nf_conn *ct, | ||||
| 				 enum ip_conntrack_info ctinfo, | ||||
| 				 unsigned char **data, int dataoff, | ||||
| 				 H245_TransportAddress *taddr, | ||||
| 				 __be16 port, __be16 rtp_port, | ||||
| 				 struct nf_conntrack_expect *rtp_exp, | ||||
| 				 struct nf_conntrack_expect *rtcp_exp); | ||||
| extern int (*nat_t120_hook) (struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 			     enum ip_conntrack_info ctinfo, | ||||
| 			     unsigned char **data, int dataoff, | ||||
| 			     H245_TransportAddress *taddr, __be16 port, | ||||
| 			     struct nf_conntrack_expect *exp); | ||||
| extern int (*nat_h245_hook) (struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 			     enum ip_conntrack_info ctinfo, | ||||
| 			     unsigned char **data, int dataoff, | ||||
| 			     TransportAddress *taddr, __be16 port, | ||||
| 			     struct nf_conntrack_expect *exp); | ||||
| extern int (*nat_callforwarding_hook) (struct sk_buff **pskb, | ||||
| 				       struct nf_conn *ct, | ||||
| 				       enum ip_conntrack_info ctinfo, | ||||
| 				       unsigned char **data, int dataoff, | ||||
| 				       TransportAddress *taddr, | ||||
| 				       __be16 port, | ||||
| 				       struct nf_conntrack_expect *exp); | ||||
| extern int (*nat_q931_hook) (struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 			     enum ip_conntrack_info ctinfo, | ||||
| 			     unsigned char **data, TransportAddress *taddr, | ||||
| 			     int idx, __be16 port, | ||||
| 			     struct nf_conntrack_expect *exp); | ||||
| 
 | ||||
| #endif | ||||
| 
 | ||||
| #endif | ||||
|  | @ -1,5 +1,5 @@ | |||
| /****************************************************************************
 | ||||
|  * ip_conntrack_helper_h323_asn1.h - BER and PER decoding library for H.323 | ||||
|  * ip_conntrack_h323_asn1.h - BER and PER decoding library for H.323 | ||||
|  * 			      conntrack/NAT module. | ||||
|  * | ||||
|  * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net> | ||||
|  | @ -34,13 +34,13 @@ | |||
|  * | ||||
|  ****************************************************************************/ | ||||
| 
 | ||||
| #ifndef _IP_CONNTRACK_HELPER_H323_ASN1_H_ | ||||
| #define _IP_CONNTRACK_HELPER_H323_ASN1_H_ | ||||
| #ifndef _NF_CONNTRACK_HELPER_H323_ASN1_H_ | ||||
| #define _NF_CONNTRACK_HELPER_H323_ASN1_H_ | ||||
| 
 | ||||
| /*****************************************************************************
 | ||||
|  * H.323 Types | ||||
|  ****************************************************************************/ | ||||
| #include "ip_conntrack_helper_h323_types.h" | ||||
| #include "nf_conntrack_h323_types.h" | ||||
| 
 | ||||
| typedef struct { | ||||
| 	enum { | ||||
|  | @ -10,6 +10,11 @@ typedef struct TransportAddress_ipAddress {	/* SEQUENCE */ | |||
| 	unsigned ip; | ||||
| } TransportAddress_ipAddress; | ||||
| 
 | ||||
| typedef struct TransportAddress_ip6Address {	/* SEQUENCE */ | ||||
| 	int options;		/* No use */ | ||||
| 	unsigned ip6; | ||||
| } TransportAddress_ip6Address; | ||||
| 
 | ||||
| typedef struct TransportAddress {	/* CHOICE */ | ||||
| 	enum { | ||||
| 		eTransportAddress_ipAddress, | ||||
|  | @ -22,6 +27,7 @@ typedef struct TransportAddress {	/* CHOICE */ | |||
| 	} choice; | ||||
| 	union { | ||||
| 		TransportAddress_ipAddress ipAddress; | ||||
| 		TransportAddress_ip6Address ip6Address; | ||||
| 	}; | ||||
| } TransportAddress; | ||||
| 
 | ||||
|  | @ -93,6 +99,11 @@ typedef struct UnicastAddress_iPAddress {	/* SEQUENCE */ | |||
| 	unsigned network; | ||||
| } UnicastAddress_iPAddress; | ||||
| 
 | ||||
| typedef struct UnicastAddress_iP6Address {	/* SEQUENCE */ | ||||
| 	int options;		/* No use */ | ||||
| 	unsigned network; | ||||
| } UnicastAddress_iP6Address; | ||||
| 
 | ||||
| typedef struct UnicastAddress {	/* CHOICE */ | ||||
| 	enum { | ||||
| 		eUnicastAddress_iPAddress, | ||||
|  | @ -105,6 +116,7 @@ typedef struct UnicastAddress {	/* CHOICE */ | |||
| 	} choice; | ||||
| 	union { | ||||
| 		UnicastAddress_iPAddress iPAddress; | ||||
| 		UnicastAddress_iP6Address iP6Address; | ||||
| 	}; | ||||
| } UnicastAddress; | ||||
| 
 | ||||
|  | @ -1,6 +1,4 @@ | |||
| header-y += ip_conntrack_helper.h | ||||
| header-y += ip_conntrack_helper_h323_asn1.h | ||||
| header-y += ip_conntrack_helper_h323_types.h | ||||
| header-y += ip_conntrack_protocol.h | ||||
| header-y += ip_conntrack_sctp.h | ||||
| header-y += ip_conntrack_tcp.h | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ | |||
| 
 | ||||
| #ifdef __KERNEL__ | ||||
| 
 | ||||
| #include <linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h> | ||||
| #include <linux/netfilter/nf_conntrack_h323_asn1.h> | ||||
| 
 | ||||
| #define RAS_PORT 1719 | ||||
| #define Q931_PORT 1720 | ||||
|  |  | |||
|  | @ -41,11 +41,13 @@ union nf_conntrack_expect_proto { | |||
| 
 | ||||
| /* Add protocol helper include file here */ | ||||
| #include <linux/netfilter/nf_conntrack_ftp.h> | ||||
| #include <linux/netfilter/nf_conntrack_h323.h> | ||||
| 
 | ||||
| /* per conntrack: application helper private data */ | ||||
| union nf_conntrack_help { | ||||
| 	/* insert conntrack helper private data (master) here */ | ||||
| 	struct nf_ct_ftp_master ct_ftp_info; | ||||
| 	struct nf_ct_h323_master ct_h323_info; | ||||
| }; | ||||
| 
 | ||||
| #include <linux/types.h> | ||||
|  |  | |||
|  | @ -41,6 +41,7 @@ struct nf_conntrack_expect | |||
| 	unsigned int flags; | ||||
| 
 | ||||
| #ifdef CONFIG_NF_NAT_NEEDED | ||||
| 	__be32 saved_ip; | ||||
| 	/* This is the original per-proto part, used to map the
 | ||||
| 	 * expected connection the way the recipient expects. */ | ||||
| 	union nf_conntrack_man_proto saved_proto; | ||||
|  |  | |||
|  | @ -529,6 +529,11 @@ config IP_NF_NAT_H323 | |||
| 	default IP_NF_NAT if IP_NF_H323=y | ||||
| 	default m if IP_NF_H323=m | ||||
| 
 | ||||
| config NF_NAT_H323 | ||||
| 	tristate | ||||
| 	depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT | ||||
| 	default NF_NAT && NF_CONNTRACK_H323 | ||||
| 
 | ||||
| config IP_NF_NAT_SIP | ||||
| 	tristate | ||||
| 	depends on IP_NF_IPTABLES!=n && IP_NF_CONNTRACK!=n && IP_NF_NAT!=n | ||||
|  |  | |||
|  | @ -15,7 +15,7 @@ endif | |||
| ip_conntrack_pptp-objs	:= ip_conntrack_helper_pptp.o ip_conntrack_proto_gre.o | ||||
| ip_nat_pptp-objs	:= ip_nat_helper_pptp.o ip_nat_proto_gre.o | ||||
| 
 | ||||
| ip_conntrack_h323-objs := ip_conntrack_helper_h323.o ip_conntrack_helper_h323_asn1.o | ||||
| ip_conntrack_h323-objs := ip_conntrack_helper_h323.o ../../netfilter/nf_conntrack_h323_asn1.o | ||||
| ip_nat_h323-objs := ip_nat_helper_h323.o | ||||
| 
 | ||||
| # connection tracking
 | ||||
|  | @ -52,6 +52,7 @@ obj-$(CONFIG_IP_NF_NAT_SIP) += ip_nat_sip.o | |||
| # NAT helpers (nf_conntrack)
 | ||||
| obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o | ||||
| obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o | ||||
| obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o | ||||
| 
 | ||||
| # generic IP tables 
 | ||||
| obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o | ||||
|  |  | |||
							
								
								
									
										596
									
								
								net/ipv4/netfilter/nf_nat_h323.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										596
									
								
								net/ipv4/netfilter/nf_nat_h323.c
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,596 @@ | |||
| /*
 | ||||
|  * H.323 extension for NAT alteration. | ||||
|  * | ||||
|  * Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net> | ||||
|  * | ||||
|  * This source code is licensed under General Public License version 2. | ||||
|  * | ||||
|  * Based on the 'brute force' H.323 NAT module by | ||||
|  * Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | ||||
|  */ | ||||
| 
 | ||||
| #include <linux/module.h> | ||||
| #include <linux/moduleparam.h> | ||||
| #include <linux/tcp.h> | ||||
| #include <net/tcp.h> | ||||
| 
 | ||||
| #include <net/netfilter/nf_nat.h> | ||||
| #include <net/netfilter/nf_nat_helper.h> | ||||
| #include <net/netfilter/nf_nat_rule.h> | ||||
| #include <net/netfilter/nf_conntrack_helper.h> | ||||
| #include <net/netfilter/nf_conntrack_expect.h> | ||||
| #include <linux/netfilter/nf_conntrack_h323.h> | ||||
| 
 | ||||
| #if 0 | ||||
| #define DEBUGP printk | ||||
| #else | ||||
| #define DEBUGP(format, args...) | ||||
| #endif | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int set_addr(struct sk_buff **pskb, | ||||
| 		    unsigned char **data, int dataoff, | ||||
| 		    unsigned int addroff, __be32 ip, __be16 port) | ||||
| { | ||||
| 	enum ip_conntrack_info ctinfo; | ||||
| 	struct nf_conn *ct = ip_conntrack_get(*pskb, &ctinfo); | ||||
| 	struct { | ||||
| 		__be32 ip; | ||||
| 		__be16 port; | ||||
| 	} __attribute__ ((__packed__)) buf; | ||||
| 	struct tcphdr _tcph, *th; | ||||
| 
 | ||||
| 	buf.ip = ip; | ||||
| 	buf.port = port; | ||||
| 	addroff += dataoff; | ||||
| 
 | ||||
| 	if ((*pskb)->nh.iph->protocol == IPPROTO_TCP) { | ||||
| 		if (!nf_nat_mangle_tcp_packet(pskb, ct, ctinfo, | ||||
| 					      addroff, sizeof(buf), | ||||
| 					      (char *) &buf, sizeof(buf))) { | ||||
| 			if (net_ratelimit()) | ||||
| 				printk("nf_nat_h323: nf_nat_mangle_tcp_packet" | ||||
| 				       " error\n"); | ||||
| 			return -1; | ||||
| 		} | ||||
| 
 | ||||
| 		/* Relocate data pointer */ | ||||
| 		th = skb_header_pointer(*pskb, (*pskb)->nh.iph->ihl * 4, | ||||
| 					sizeof(_tcph), &_tcph); | ||||
| 		if (th == NULL) | ||||
| 			return -1; | ||||
| 		*data = (*pskb)->data + (*pskb)->nh.iph->ihl * 4 + | ||||
| 		    th->doff * 4 + dataoff; | ||||
| 	} else { | ||||
| 		if (!nf_nat_mangle_udp_packet(pskb, ct, ctinfo, | ||||
| 					      addroff, sizeof(buf), | ||||
| 					      (char *) &buf, sizeof(buf))) { | ||||
| 			if (net_ratelimit()) | ||||
| 				printk("nf_nat_h323: nf_nat_mangle_udp_packet" | ||||
| 				       " error\n"); | ||||
| 			return -1; | ||||
| 		} | ||||
| 		/* nf_nat_mangle_udp_packet uses skb_make_writable() to copy
 | ||||
| 		 * or pull everything in a linear buffer, so we can safely | ||||
| 		 * use the skb pointers now */ | ||||
| 		*data = (*pskb)->data + (*pskb)->nh.iph->ihl * 4 + | ||||
| 		    sizeof(struct udphdr); | ||||
| 	} | ||||
| 
 | ||||
| 	return 0; | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int set_h225_addr(struct sk_buff **pskb, | ||||
| 			 unsigned char **data, int dataoff, | ||||
| 			 TransportAddress *taddr, | ||||
| 			 union nf_conntrack_address *addr, __be16 port) | ||||
| { | ||||
| 	return set_addr(pskb, data, dataoff, taddr->ipAddress.ip, | ||||
| 			addr->ip, port); | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int set_h245_addr(struct sk_buff **pskb, | ||||
| 			 unsigned char **data, int dataoff, | ||||
| 			 H245_TransportAddress *taddr, | ||||
| 			 union nf_conntrack_address *addr, __be16 port) | ||||
| { | ||||
| 	return set_addr(pskb, data, dataoff, | ||||
| 			taddr->unicastAddress.iPAddress.network, | ||||
| 			addr->ip, port); | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int set_sig_addr(struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 			enum ip_conntrack_info ctinfo, | ||||
| 			unsigned char **data, | ||||
| 			TransportAddress *taddr, int count) | ||||
| { | ||||
| 	struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; | ||||
| 	int dir = CTINFO2DIR(ctinfo); | ||||
| 	int i; | ||||
| 	__be16 port; | ||||
| 	union nf_conntrack_address addr; | ||||
| 
 | ||||
| 	for (i = 0; i < count; i++) { | ||||
| 		if (get_h225_addr(ct, *data, &taddr[i], &addr, &port)) { | ||||
| 			if (addr.ip == ct->tuplehash[dir].tuple.src.u3.ip && | ||||
| 			    port == info->sig_port[dir]) { | ||||
| 				/* GW->GK */ | ||||
| 
 | ||||
| 				/* Fix for Gnomemeeting */ | ||||
| 				if (i > 0 && | ||||
| 				    get_h225_addr(ct, *data, &taddr[0], | ||||
| 						  &addr, &port) && | ||||
| 				    (ntohl(addr.ip) & 0xff000000) == 0x7f000000) | ||||
| 					i = 0; | ||||
| 
 | ||||
| 				DEBUGP | ||||
| 				    ("nf_nat_ras: set signal address " | ||||
| 				     "%u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n", | ||||
| 				     NIPQUAD(ip), port, | ||||
| 				     NIPQUAD(ct->tuplehash[!dir].tuple.dst. | ||||
| 					     ip), info->sig_port[!dir]); | ||||
| 				return set_h225_addr(pskb, data, 0, &taddr[i], | ||||
| 						     &ct->tuplehash[!dir]. | ||||
| 						     tuple.dst.u3, | ||||
| 						     info->sig_port[!dir]); | ||||
| 			} else if (addr.ip == ct->tuplehash[dir].tuple.dst.u3.ip && | ||||
| 				   port == info->sig_port[dir]) { | ||||
| 				/* GK->GW */ | ||||
| 				DEBUGP | ||||
| 				    ("nf_nat_ras: set signal address " | ||||
| 				     "%u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n", | ||||
| 				     NIPQUAD(ip), port, | ||||
| 				     NIPQUAD(ct->tuplehash[!dir].tuple.src. | ||||
| 					     ip), info->sig_port[!dir]); | ||||
| 				return set_h225_addr(pskb, data, 0, &taddr[i], | ||||
| 						     &ct->tuplehash[!dir]. | ||||
| 						     tuple.src.u3, | ||||
| 						     info->sig_port[!dir]); | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	return 0; | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int set_ras_addr(struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 			enum ip_conntrack_info ctinfo, | ||||
| 			unsigned char **data, | ||||
| 			TransportAddress *taddr, int count) | ||||
| { | ||||
| 	int dir = CTINFO2DIR(ctinfo); | ||||
| 	int i; | ||||
| 	__be16 port; | ||||
| 	union nf_conntrack_address addr; | ||||
| 
 | ||||
| 	for (i = 0; i < count; i++) { | ||||
| 		if (get_h225_addr(ct, *data, &taddr[i], &addr, &port) && | ||||
| 		    addr.ip == ct->tuplehash[dir].tuple.src.u3.ip && | ||||
| 		    port == ct->tuplehash[dir].tuple.src.u.udp.port) { | ||||
| 			DEBUGP("nf_nat_ras: set rasAddress " | ||||
| 			       "%u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n", | ||||
| 			       NIPQUAD(ip), ntohs(port), | ||||
| 			       NIPQUAD(ct->tuplehash[!dir].tuple.dst.u3.ip), | ||||
| 			       ntohs(ct->tuplehash[!dir].tuple.dst.u.udp. | ||||
| 				     port)); | ||||
| 			return set_h225_addr(pskb, data, 0, &taddr[i], | ||||
| 					     &ct->tuplehash[!dir].tuple.dst.u3, | ||||
| 					     ct->tuplehash[!dir].tuple. | ||||
| 								dst.u.udp.port); | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	return 0; | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int nat_rtp_rtcp(struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 			enum ip_conntrack_info ctinfo, | ||||
| 			unsigned char **data, int dataoff, | ||||
| 			H245_TransportAddress *taddr, | ||||
| 			__be16 port, __be16 rtp_port, | ||||
| 			struct nf_conntrack_expect *rtp_exp, | ||||
| 			struct nf_conntrack_expect *rtcp_exp) | ||||
| { | ||||
| 	struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; | ||||
| 	int dir = CTINFO2DIR(ctinfo); | ||||
| 	int i; | ||||
| 	u_int16_t nated_port; | ||||
| 
 | ||||
| 	/* Set expectations for NAT */ | ||||
| 	rtp_exp->saved_proto.udp.port = rtp_exp->tuple.dst.u.udp.port; | ||||
| 	rtp_exp->expectfn = nf_nat_follow_master; | ||||
| 	rtp_exp->dir = !dir; | ||||
| 	rtcp_exp->saved_proto.udp.port = rtcp_exp->tuple.dst.u.udp.port; | ||||
| 	rtcp_exp->expectfn = nf_nat_follow_master; | ||||
| 	rtcp_exp->dir = !dir; | ||||
| 
 | ||||
| 	/* Lookup existing expects */ | ||||
| 	for (i = 0; i < H323_RTP_CHANNEL_MAX; i++) { | ||||
| 		if (info->rtp_port[i][dir] == rtp_port) { | ||||
| 			/* Expected */ | ||||
| 
 | ||||
| 			/* Use allocated ports first. This will refresh
 | ||||
| 			 * the expects */ | ||||
| 			rtp_exp->tuple.dst.u.udp.port = info->rtp_port[i][dir]; | ||||
| 			rtcp_exp->tuple.dst.u.udp.port = | ||||
| 			    htons(ntohs(info->rtp_port[i][dir]) + 1); | ||||
| 			break; | ||||
| 		} else if (info->rtp_port[i][dir] == 0) { | ||||
| 			/* Not expected */ | ||||
| 			break; | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	/* Run out of expectations */ | ||||
| 	if (i >= H323_RTP_CHANNEL_MAX) { | ||||
| 		if (net_ratelimit()) | ||||
| 			printk("nf_nat_h323: out of expectations\n"); | ||||
| 		return 0; | ||||
| 	} | ||||
| 
 | ||||
| 	/* Try to get a pair of ports. */ | ||||
| 	for (nated_port = ntohs(rtp_exp->tuple.dst.u.udp.port); | ||||
| 	     nated_port != 0; nated_port += 2) { | ||||
| 		rtp_exp->tuple.dst.u.udp.port = htons(nated_port); | ||||
| 		if (nf_conntrack_expect_related(rtp_exp) == 0) { | ||||
| 			rtcp_exp->tuple.dst.u.udp.port = | ||||
| 			    htons(nated_port + 1); | ||||
| 			if (nf_conntrack_expect_related(rtcp_exp) == 0) | ||||
| 				break; | ||||
| 			nf_conntrack_unexpect_related(rtp_exp); | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	if (nated_port == 0) {	/* No port available */ | ||||
| 		if (net_ratelimit()) | ||||
| 			printk("nf_nat_h323: out of RTP ports\n"); | ||||
| 		return 0; | ||||
| 	} | ||||
| 
 | ||||
| 	/* Modify signal */ | ||||
| 	if (set_h245_addr(pskb, data, dataoff, taddr, | ||||
| 			  &ct->tuplehash[!dir].tuple.dst.u3, | ||||
| 			  htons((port & htons(1)) ? nated_port + 1 : | ||||
| 			  			    nated_port)) == 0) { | ||||
| 		/* Save ports */ | ||||
| 		info->rtp_port[i][dir] = rtp_port; | ||||
| 		info->rtp_port[i][!dir] = htons(nated_port); | ||||
| 	} else { | ||||
| 		nf_conntrack_unexpect_related(rtp_exp); | ||||
| 		nf_conntrack_unexpect_related(rtcp_exp); | ||||
| 		return -1; | ||||
| 	} | ||||
| 
 | ||||
| 	/* Success */ | ||||
| 	DEBUGP("nf_nat_h323: expect RTP %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n", | ||||
| 	       NIPQUAD(rtp_exp->tuple.src.ip), | ||||
| 	       ntohs(rtp_exp->tuple.src.u.udp.port), | ||||
| 	       NIPQUAD(rtp_exp->tuple.dst.ip), | ||||
| 	       ntohs(rtp_exp->tuple.dst.u.udp.port)); | ||||
| 	DEBUGP("nf_nat_h323: expect RTCP %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n", | ||||
| 	       NIPQUAD(rtcp_exp->tuple.src.ip), | ||||
| 	       ntohs(rtcp_exp->tuple.src.u.udp.port), | ||||
| 	       NIPQUAD(rtcp_exp->tuple.dst.ip), | ||||
| 	       ntohs(rtcp_exp->tuple.dst.u.udp.port)); | ||||
| 
 | ||||
| 	return 0; | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int nat_t120(struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 		    enum ip_conntrack_info ctinfo, | ||||
| 		    unsigned char **data, int dataoff, | ||||
| 		    H245_TransportAddress *taddr, __be16 port, | ||||
| 		    struct nf_conntrack_expect *exp) | ||||
| { | ||||
| 	int dir = CTINFO2DIR(ctinfo); | ||||
| 	u_int16_t nated_port = ntohs(port); | ||||
| 
 | ||||
| 	/* Set expectations for NAT */ | ||||
| 	exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port; | ||||
| 	exp->expectfn = nf_nat_follow_master; | ||||
| 	exp->dir = !dir; | ||||
| 
 | ||||
| 	/* Try to get same port: if not, try to change it. */ | ||||
| 	for (; nated_port != 0; nated_port++) { | ||||
| 		exp->tuple.dst.u.tcp.port = htons(nated_port); | ||||
| 		if (nf_conntrack_expect_related(exp) == 0) | ||||
| 			break; | ||||
| 	} | ||||
| 
 | ||||
| 	if (nated_port == 0) {	/* No port available */ | ||||
| 		if (net_ratelimit()) | ||||
| 			printk("nf_nat_h323: out of TCP ports\n"); | ||||
| 		return 0; | ||||
| 	} | ||||
| 
 | ||||
| 	/* Modify signal */ | ||||
| 	if (set_h245_addr(pskb, data, dataoff, taddr, | ||||
| 			  &ct->tuplehash[!dir].tuple.dst.u3, | ||||
| 			  htons(nated_port)) < 0) { | ||||
| 		nf_conntrack_unexpect_related(exp); | ||||
| 		return -1; | ||||
| 	} | ||||
| 
 | ||||
| 	DEBUGP("nf_nat_h323: expect T.120 %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n", | ||||
| 	       NIPQUAD(exp->tuple.src.ip), ntohs(exp->tuple.src.u.tcp.port), | ||||
| 	       NIPQUAD(exp->tuple.dst.ip), ntohs(exp->tuple.dst.u.tcp.port)); | ||||
| 
 | ||||
| 	return 0; | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int nat_h245(struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 		    enum ip_conntrack_info ctinfo, | ||||
| 		    unsigned char **data, int dataoff, | ||||
| 		    TransportAddress *taddr, __be16 port, | ||||
| 		    struct nf_conntrack_expect *exp) | ||||
| { | ||||
| 	struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; | ||||
| 	int dir = CTINFO2DIR(ctinfo); | ||||
| 	u_int16_t nated_port = ntohs(port); | ||||
| 
 | ||||
| 	/* Set expectations for NAT */ | ||||
| 	exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port; | ||||
| 	exp->expectfn = nf_nat_follow_master; | ||||
| 	exp->dir = !dir; | ||||
| 
 | ||||
| 	/* Check existing expects */ | ||||
| 	if (info->sig_port[dir] == port) | ||||
| 		nated_port = ntohs(info->sig_port[!dir]); | ||||
| 
 | ||||
| 	/* Try to get same port: if not, try to change it. */ | ||||
| 	for (; nated_port != 0; nated_port++) { | ||||
| 		exp->tuple.dst.u.tcp.port = htons(nated_port); | ||||
| 		if (nf_conntrack_expect_related(exp) == 0) | ||||
| 			break; | ||||
| 	} | ||||
| 
 | ||||
| 	if (nated_port == 0) {	/* No port available */ | ||||
| 		if (net_ratelimit()) | ||||
| 			printk("nf_nat_q931: out of TCP ports\n"); | ||||
| 		return 0; | ||||
| 	} | ||||
| 
 | ||||
| 	/* Modify signal */ | ||||
| 	if (set_h225_addr(pskb, data, dataoff, taddr, | ||||
| 			  &ct->tuplehash[!dir].tuple.dst.u3, | ||||
| 			  htons(nated_port)) == 0) { | ||||
| 		/* Save ports */ | ||||
| 		info->sig_port[dir] = port; | ||||
| 		info->sig_port[!dir] = htons(nated_port); | ||||
| 	} else { | ||||
| 		nf_conntrack_unexpect_related(exp); | ||||
| 		return -1; | ||||
| 	} | ||||
| 
 | ||||
| 	DEBUGP("nf_nat_q931: expect H.245 %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n", | ||||
| 	       NIPQUAD(exp->tuple.src.ip), ntohs(exp->tuple.src.u.tcp.port), | ||||
| 	       NIPQUAD(exp->tuple.dst.ip), ntohs(exp->tuple.dst.u.tcp.port)); | ||||
| 
 | ||||
| 	return 0; | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************
 | ||||
|  * This conntrack expect function replaces nf_conntrack_q931_expect() | ||||
|  * which was set by nf_conntrack_h323.c. | ||||
|  ****************************************************************************/ | ||||
| static void ip_nat_q931_expect(struct nf_conn *new, | ||||
| 			       struct nf_conntrack_expect *this) | ||||
| { | ||||
| 	struct ip_nat_range range; | ||||
| 
 | ||||
| 	if (this->tuple.src.u3.ip != 0) {	/* Only accept calls from GK */ | ||||
| 		nf_nat_follow_master(new, this); | ||||
| 		return; | ||||
| 	} | ||||
| 
 | ||||
| 	/* This must be a fresh one. */ | ||||
| 	BUG_ON(new->status & IPS_NAT_DONE_MASK); | ||||
| 
 | ||||
| 	/* Change src to where master sends to */ | ||||
| 	range.flags = IP_NAT_RANGE_MAP_IPS; | ||||
| 	range.min_ip = range.max_ip = new->tuplehash[!this->dir].tuple.src.u3.ip; | ||||
| 
 | ||||
| 	/* hook doesn't matter, but it has to do source manip */ | ||||
| 	nf_nat_setup_info(new, &range, NF_IP_POST_ROUTING); | ||||
| 
 | ||||
| 	/* For DST manip, map port here to where it's expected. */ | ||||
| 	range.flags = (IP_NAT_RANGE_MAP_IPS | IP_NAT_RANGE_PROTO_SPECIFIED); | ||||
| 	range.min = range.max = this->saved_proto; | ||||
| 	range.min_ip = range.max_ip = | ||||
| 	    new->master->tuplehash[!this->dir].tuple.src.u3.ip; | ||||
| 
 | ||||
| 	/* hook doesn't matter, but it has to do destination manip */ | ||||
| 	nf_nat_setup_info(new, &range, NF_IP_PRE_ROUTING); | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int nat_q931(struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 		    enum ip_conntrack_info ctinfo, | ||||
| 		    unsigned char **data, TransportAddress *taddr, int idx, | ||||
| 		    __be16 port, struct nf_conntrack_expect *exp) | ||||
| { | ||||
| 	struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info; | ||||
| 	int dir = CTINFO2DIR(ctinfo); | ||||
| 	u_int16_t nated_port = ntohs(port); | ||||
| 	union nf_conntrack_address addr; | ||||
| 
 | ||||
| 	/* Set expectations for NAT */ | ||||
| 	exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port; | ||||
| 	exp->expectfn = ip_nat_q931_expect; | ||||
| 	exp->dir = !dir; | ||||
| 
 | ||||
| 	/* Check existing expects */ | ||||
| 	if (info->sig_port[dir] == port) | ||||
| 		nated_port = ntohs(info->sig_port[!dir]); | ||||
| 
 | ||||
| 	/* Try to get same port: if not, try to change it. */ | ||||
| 	for (; nated_port != 0; nated_port++) { | ||||
| 		exp->tuple.dst.u.tcp.port = htons(nated_port); | ||||
| 		if (nf_conntrack_expect_related(exp) == 0) | ||||
| 			break; | ||||
| 	} | ||||
| 
 | ||||
| 	if (nated_port == 0) {	/* No port available */ | ||||
| 		if (net_ratelimit()) | ||||
| 			printk("nf_nat_ras: out of TCP ports\n"); | ||||
| 		return 0; | ||||
| 	} | ||||
| 
 | ||||
| 	/* Modify signal */ | ||||
| 	if (set_h225_addr(pskb, data, 0, &taddr[idx], | ||||
| 			  &ct->tuplehash[!dir].tuple.dst.u3, | ||||
| 			  htons(nated_port)) == 0) { | ||||
| 		/* Save ports */ | ||||
| 		info->sig_port[dir] = port; | ||||
| 		info->sig_port[!dir] = htons(nated_port); | ||||
| 
 | ||||
| 		/* Fix for Gnomemeeting */ | ||||
| 		if (idx > 0 && | ||||
| 		    get_h225_addr(ct, *data, &taddr[0], &addr, &port) && | ||||
| 		    (ntohl(addr.ip) & 0xff000000) == 0x7f000000) { | ||||
| 			set_h225_addr_hook(pskb, data, 0, &taddr[0], | ||||
| 					   &ct->tuplehash[!dir].tuple.dst.u3, | ||||
| 					   info->sig_port[!dir]); | ||||
| 		} | ||||
| 	} else { | ||||
| 		nf_conntrack_unexpect_related(exp); | ||||
| 		return -1; | ||||
| 	} | ||||
| 
 | ||||
| 	/* Success */ | ||||
| 	DEBUGP("nf_nat_ras: expect Q.931 %u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n", | ||||
| 	       NIPQUAD(exp->tuple.src.ip), ntohs(exp->tuple.src.u.tcp.port), | ||||
| 	       NIPQUAD(exp->tuple.dst.ip), ntohs(exp->tuple.dst.u.tcp.port)); | ||||
| 
 | ||||
| 	return 0; | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static void ip_nat_callforwarding_expect(struct nf_conn *new, | ||||
| 					 struct nf_conntrack_expect *this) | ||||
| { | ||||
| 	struct nf_nat_range range; | ||||
| 
 | ||||
| 	/* This must be a fresh one. */ | ||||
| 	BUG_ON(new->status & IPS_NAT_DONE_MASK); | ||||
| 
 | ||||
| 	/* Change src to where master sends to */ | ||||
| 	range.flags = IP_NAT_RANGE_MAP_IPS; | ||||
| 	range.min_ip = range.max_ip = new->tuplehash[!this->dir].tuple.src.u3.ip; | ||||
| 
 | ||||
| 	/* hook doesn't matter, but it has to do source manip */ | ||||
| 	nf_nat_setup_info(new, &range, NF_IP_POST_ROUTING); | ||||
| 
 | ||||
| 	/* For DST manip, map port here to where it's expected. */ | ||||
| 	range.flags = (IP_NAT_RANGE_MAP_IPS | IP_NAT_RANGE_PROTO_SPECIFIED); | ||||
| 	range.min = range.max = this->saved_proto; | ||||
| 	range.min_ip = range.max_ip = this->saved_ip; | ||||
| 
 | ||||
| 	/* hook doesn't matter, but it has to do destination manip */ | ||||
| 	nf_nat_setup_info(new, &range, NF_IP_PRE_ROUTING); | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int nat_callforwarding(struct sk_buff **pskb, struct nf_conn *ct, | ||||
| 			      enum ip_conntrack_info ctinfo, | ||||
| 			      unsigned char **data, int dataoff, | ||||
| 			      TransportAddress *taddr, __be16 port, | ||||
| 			      struct nf_conntrack_expect *exp) | ||||
| { | ||||
| 	int dir = CTINFO2DIR(ctinfo); | ||||
| 	u_int16_t nated_port; | ||||
| 
 | ||||
| 	/* Set expectations for NAT */ | ||||
| 	exp->saved_ip = exp->tuple.dst.u3.ip; | ||||
| 	exp->tuple.dst.u3.ip = ct->tuplehash[!dir].tuple.dst.u3.ip; | ||||
| 	exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port; | ||||
| 	exp->expectfn = ip_nat_callforwarding_expect; | ||||
| 	exp->dir = !dir; | ||||
| 
 | ||||
| 	/* Try to get same port: if not, try to change it. */ | ||||
| 	for (nated_port = ntohs(port); nated_port != 0; nated_port++) { | ||||
| 		exp->tuple.dst.u.tcp.port = htons(nated_port); | ||||
| 		if (nf_conntrack_expect_related(exp) == 0) | ||||
| 			break; | ||||
| 	} | ||||
| 
 | ||||
| 	if (nated_port == 0) {	/* No port available */ | ||||
| 		if (net_ratelimit()) | ||||
| 			printk("nf_nat_q931: out of TCP ports\n"); | ||||
| 		return 0; | ||||
| 	} | ||||
| 
 | ||||
| 	/* Modify signal */ | ||||
| 	if (!set_h225_addr(pskb, data, dataoff, taddr, | ||||
| 			   &ct->tuplehash[!dir].tuple.dst.u3, | ||||
| 			   htons(nated_port)) == 0) { | ||||
| 		nf_conntrack_unexpect_related(exp); | ||||
| 		return -1; | ||||
| 	} | ||||
| 
 | ||||
| 	/* Success */ | ||||
| 	DEBUGP("nf_nat_q931: expect Call Forwarding " | ||||
| 	       "%u.%u.%u.%u:%hu->%u.%u.%u.%u:%hu\n", | ||||
| 	       NIPQUAD(exp->tuple.src.ip), ntohs(exp->tuple.src.u.tcp.port), | ||||
| 	       NIPQUAD(exp->tuple.dst.ip), ntohs(exp->tuple.dst.u.tcp.port)); | ||||
| 
 | ||||
| 	return 0; | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static int __init init(void) | ||||
| { | ||||
| 	BUG_ON(rcu_dereference(set_h245_addr_hook) != NULL); | ||||
| 	BUG_ON(rcu_dereference(set_h225_addr_hook) != NULL); | ||||
| 	BUG_ON(rcu_dereference(set_sig_addr_hook) != NULL); | ||||
| 	BUG_ON(rcu_dereference(set_ras_addr_hook) != NULL); | ||||
| 	BUG_ON(rcu_dereference(nat_rtp_rtcp_hook) != NULL); | ||||
| 	BUG_ON(rcu_dereference(nat_t120_hook) != NULL); | ||||
| 	BUG_ON(rcu_dereference(nat_h245_hook) != NULL); | ||||
| 	BUG_ON(rcu_dereference(nat_callforwarding_hook) != NULL); | ||||
| 	BUG_ON(rcu_dereference(nat_q931_hook) != NULL); | ||||
| 
 | ||||
| 	rcu_assign_pointer(set_h245_addr_hook, set_h245_addr); | ||||
| 	rcu_assign_pointer(set_h225_addr_hook, set_h225_addr); | ||||
| 	rcu_assign_pointer(set_sig_addr_hook, set_sig_addr); | ||||
| 	rcu_assign_pointer(set_ras_addr_hook, set_ras_addr); | ||||
| 	rcu_assign_pointer(nat_rtp_rtcp_hook, nat_rtp_rtcp); | ||||
| 	rcu_assign_pointer(nat_t120_hook, nat_t120); | ||||
| 	rcu_assign_pointer(nat_h245_hook, nat_h245); | ||||
| 	rcu_assign_pointer(nat_callforwarding_hook, nat_callforwarding); | ||||
| 	rcu_assign_pointer(nat_q931_hook, nat_q931); | ||||
| 
 | ||||
| 	DEBUGP("nf_nat_h323: init success\n"); | ||||
| 	return 0; | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| static void __exit fini(void) | ||||
| { | ||||
| 	rcu_assign_pointer(set_h245_addr_hook, NULL); | ||||
| 	rcu_assign_pointer(set_h225_addr_hook, NULL); | ||||
| 	rcu_assign_pointer(set_sig_addr_hook, NULL); | ||||
| 	rcu_assign_pointer(set_ras_addr_hook, NULL); | ||||
| 	rcu_assign_pointer(nat_rtp_rtcp_hook, NULL); | ||||
| 	rcu_assign_pointer(nat_t120_hook, NULL); | ||||
| 	rcu_assign_pointer(nat_h245_hook, NULL); | ||||
| 	rcu_assign_pointer(nat_callforwarding_hook, NULL); | ||||
| 	rcu_assign_pointer(nat_q931_hook, NULL); | ||||
| 	synchronize_rcu(); | ||||
| } | ||||
| 
 | ||||
| /****************************************************************************/ | ||||
| module_init(init); | ||||
| module_exit(fini); | ||||
| 
 | ||||
| MODULE_AUTHOR("Jing Min Zhao <zhaojingmin@users.sourceforge.net>"); | ||||
| MODULE_DESCRIPTION("H.323 NAT helper"); | ||||
| MODULE_LICENSE("GPL"); | ||||
| MODULE_ALIAS("ip_nat_h323"); | ||||
|  | @ -160,6 +160,25 @@ config NF_CONNTRACK_FTP | |||
| 
 | ||||
| 	  To compile it as a module, choose M here.  If unsure, say N. | ||||
| 
 | ||||
| config NF_CONNTRACK_H323 | ||||
| 	tristate "H.323 protocol support (EXPERIMENTAL)" | ||||
| 	depends on EXPERIMENTAL && NF_CONNTRACK | ||||
| 	help | ||||
| 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most | ||||
| 	  important VoIP protocols, it is widely used by voice hardware and | ||||
| 	  software including voice gateways, IP phones, Netmeeting, OpenPhone, | ||||
| 	  Gnomemeeting, etc. | ||||
| 
 | ||||
| 	  With this module you can support H.323 on a connection tracking/NAT | ||||
| 	  firewall. | ||||
| 
 | ||||
| 	  This module supports RAS, Fast Start, H.245 Tunnelling, Call | ||||
| 	  Forwarding, RTP/RTCP and T.120 based audio, video, fax, chat, | ||||
| 	  whiteboard, file transfer, etc. For more information, please | ||||
| 	  visit http://nath323.sourceforge.net/. | ||||
| 
 | ||||
| 	  To compile it as a module, choose M here.  If unsure, say N. | ||||
| 
 | ||||
| config NF_CT_NETLINK | ||||
| 	tristate 'Connection tracking netlink interface (EXPERIMENTAL)' | ||||
| 	depends on EXPERIMENTAL && NF_CONNTRACK && NETFILTER_NETLINK | ||||
|  |  | |||
|  | @ -20,8 +20,11 @@ obj-$(CONFIG_NF_CT_PROTO_SCTP) += nf_conntrack_proto_sctp.o | |||
| obj-$(CONFIG_NF_CT_NETLINK) += nf_conntrack_netlink.o | ||||
| 
 | ||||
| # connection tracking helpers
 | ||||
| nf_conntrack_h323-objs := nf_conntrack_h323_main.o nf_conntrack_h323_asn1.o | ||||
| 
 | ||||
| obj-$(CONFIG_NF_CONNTRACK_AMANDA) += nf_conntrack_amanda.o | ||||
| obj-$(CONFIG_NF_CONNTRACK_FTP) += nf_conntrack_ftp.o | ||||
| obj-$(CONFIG_NF_CONNTRACK_H323) += nf_conntrack_h323.o | ||||
| 
 | ||||
| # generic X tables 
 | ||||
| obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o | ||||
|  |  | |||
|  | @ -15,7 +15,7 @@ | |||
| #else | ||||
| #include <stdio.h> | ||||
| #endif | ||||
| #include <linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h> | ||||
| #include <linux/netfilter/nf_conntrack_h323_asn1.h> | ||||
| 
 | ||||
| /* Trace Flag */ | ||||
| #ifndef H323_TRACE | ||||
|  | @ -144,7 +144,7 @@ static decoder_t Decoders[] = { | |||
| /****************************************************************************
 | ||||
|  * H.323 Types | ||||
|  ****************************************************************************/ | ||||
| #include "ip_conntrack_helper_h323_types.c" | ||||
| #include "nf_conntrack_h323_types.c" | ||||
| 
 | ||||
| /****************************************************************************
 | ||||
|  * Functions | ||||
							
								
								
									
										1856
									
								
								net/netfilter/nf_conntrack_h323_main.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1856
									
								
								net/netfilter/nf_conntrack_h323_main.c
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							|  | @ -36,7 +36,8 @@ static field_t _TransportAddress_ipxAddress[] = {	/* SEQUENCE */ | |||
| }; | ||||
| 
 | ||||
| static field_t _TransportAddress_ip6Address[] = {	/* SEQUENCE */ | ||||
| 	{FNAME("ip") OCTSTR, FIXD, 16, 0, SKIP, 0, NULL}, | ||||
| 	{FNAME("ip") OCTSTR, FIXD, 16, 0, DECODE, | ||||
| 	 offsetof(TransportAddress_ip6Address, ip6), NULL}, | ||||
| 	{FNAME("port") INT, WORD, 0, 0, SKIP, 0, NULL}, | ||||
| }; | ||||
| 
 | ||||
|  | @ -65,8 +66,8 @@ static field_t _TransportAddress[] = {	/* CHOICE */ | |||
| 	 _TransportAddress_ipSourceRoute}, | ||||
| 	{FNAME("ipxAddress") SEQ, 0, 3, 3, SKIP, 0, | ||||
| 	 _TransportAddress_ipxAddress}, | ||||
| 	{FNAME("ip6Address") SEQ, 0, 2, 2, SKIP | EXT, 0, | ||||
| 	 _TransportAddress_ip6Address}, | ||||
| 	{FNAME("ip6Address") SEQ, 0, 2, 2, DECODE | EXT, | ||||
| 	offsetof(TransportAddress, ip6Address), _TransportAddress_ip6Address}, | ||||
| 	{FNAME("netBios") OCTSTR, FIXD, 16, 0, SKIP, 0, NULL}, | ||||
| 	{FNAME("nsap") OCTSTR, 5, 1, 0, SKIP, 0, NULL}, | ||||
| 	{FNAME("nonStandardAddress") SEQ, 0, 2, 2, SKIP, 0, | ||||
		Loading…
	
		Reference in a new issue
	
	 Patrick McHardy
						Patrick McHardy