diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-03-25 23:26:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-25 23:26:24 -0400 |
| commit | 0d0ab0378d67517a4f4ae3497706c13d9dd24af1 (patch) | |
| tree | c2fbd60d9b524fefa1ec96aef95db7942025c427 /include | |
| parent | 4ab9e64e5e3c0516577818804aaf13a630d67bc9 (diff) | |
[NETFILTER]: nf_conntrack_sip: support multiple media channels
Add support for multiple media channels and use it to create
expectations for video streams when present.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_sip.h | 14 | ||||
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/include/linux/netfilter/nf_conntrack_sip.h b/include/linux/netfilter/nf_conntrack_sip.h index eca3ad3f28dc..71fa3eb5f485 100644 --- a/include/linux/netfilter/nf_conntrack_sip.h +++ b/include/linux/netfilter/nf_conntrack_sip.h | |||
| @@ -12,10 +12,24 @@ struct nf_ct_sip_master { | |||
| 12 | enum sip_expectation_classes { | 12 | enum sip_expectation_classes { |
| 13 | SIP_EXPECT_SIGNALLING, | 13 | SIP_EXPECT_SIGNALLING, |
| 14 | SIP_EXPECT_AUDIO, | 14 | SIP_EXPECT_AUDIO, |
| 15 | SIP_EXPECT_VIDEO, | ||
| 15 | __SIP_EXPECT_MAX | 16 | __SIP_EXPECT_MAX |
| 16 | }; | 17 | }; |
| 17 | #define SIP_EXPECT_MAX (__SIP_EXPECT_MAX - 1) | 18 | #define SIP_EXPECT_MAX (__SIP_EXPECT_MAX - 1) |
| 18 | 19 | ||
| 20 | struct sdp_media_type { | ||
| 21 | const char *name; | ||
| 22 | unsigned int len; | ||
| 23 | enum sip_expectation_classes class; | ||
| 24 | }; | ||
| 25 | |||
| 26 | #define SDP_MEDIA_TYPE(__name, __class) \ | ||
| 27 | { \ | ||
| 28 | .name = (__name), \ | ||
| 29 | .len = sizeof(__name) - 1, \ | ||
| 30 | .class = (__class), \ | ||
| 31 | } | ||
| 32 | |||
| 19 | struct sip_handler { | 33 | struct sip_handler { |
| 20 | const char *method; | 34 | const char *method; |
| 21 | unsigned int len; | 35 | unsigned int len; |
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 4a4f870d2a5e..a3567a7a6d67 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h | |||
| @@ -78,7 +78,7 @@ do { \ | |||
| 78 | struct nf_conntrack_helper; | 78 | struct nf_conntrack_helper; |
| 79 | 79 | ||
| 80 | /* Must be kept in sync with the classes defined by helpers */ | 80 | /* Must be kept in sync with the classes defined by helpers */ |
| 81 | #define NF_CT_MAX_EXPECT_CLASSES 2 | 81 | #define NF_CT_MAX_EXPECT_CLASSES 3 |
| 82 | 82 | ||
| 83 | /* nf_conn feature for connections that have a helper */ | 83 | /* nf_conn feature for connections that have a helper */ |
| 84 | struct nf_conn_help { | 84 | struct nf_conn_help { |