diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
|---|---|---|
| committer | <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
| commit | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch) | |
| tree | 40b1cb534496a7f1ca0f5c314a523c69f1fee464 /net/ipv4/ip_masq_raudio.c | |
| parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) | |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'net/ipv4/ip_masq_raudio.c')
| -rw-r--r-- | net/ipv4/ip_masq_raudio.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/net/ipv4/ip_masq_raudio.c b/net/ipv4/ip_masq_raudio.c index 9fe4e8f15..85bba590e 100644 --- a/net/ipv4/ip_masq_raudio.c +++ b/net/ipv4/ip_masq_raudio.c @@ -2,7 +2,7 @@ * IP_MASQ_RAUDIO - Real Audio masquerading module * * - * Version: @(#)$Id: ip_masq_raudio.c,v 1.3 1996/05/20 13:24:26 nigel Exp $ + * Version: @(#)$Id: ip_masq_raudio.c,v 1.5 1997/04/03 08:52:02 davem Exp $ * * Author: Nigel Metheringham * [strongly based on ftp module by Juan Jose Ciarlante & Wouter Gadeyne] @@ -31,12 +31,13 @@ * * At present the "first packet" is defined as a packet starting with * the protocol ID string - "PNA". - * When the link is up there appears to be enough control data + * When the link is up there appears to be enough control data * crossing the control link to keep it open even if a long audio * piece is playing. - * + * */ +#include <linux/config.h> #include <linux/module.h> #include <asm/system.h> #include <linux/types.h> @@ -64,11 +65,11 @@ masq_raudio_init_1 (struct ip_masq_app *mapp, struct ip_masq *ms) { MOD_INC_USE_COUNT; if ((ms->app_data = kmalloc(sizeof(struct raudio_priv_data), - GFP_ATOMIC)) == NULL) + GFP_ATOMIC)) == NULL) printk(KERN_INFO "RealAudio: No memory for application data\n"); - else + else { - struct raudio_priv_data *priv = + struct raudio_priv_data *priv = (struct raudio_priv_data *)ms->app_data; priv->seen_start = 0; priv->data_conn = NULL; @@ -94,7 +95,7 @@ masq_raudio_out (struct ip_masq_app *mapp, struct ip_masq *ms, struct sk_buff ** char *p, *data, *data_limit; struct ip_masq *n_ms; unsigned short version, msg_id, msg_len, udp_port; - struct raudio_priv_data *priv = + struct raudio_priv_data *priv = (struct raudio_priv_data *)ms->app_data; /* Everything running correctly already */ @@ -102,7 +103,7 @@ masq_raudio_out (struct ip_masq_app *mapp, struct ip_masq *ms, struct sk_buff ** return 0; skb = *skb_p; - iph = skb->h.iph; + iph = skb->nh.iph; th = (struct tcphdr *)&(((char *)iph)[iph->ihl*4]); data = (char *)&th[1]; @@ -156,7 +157,7 @@ masq_raudio_out (struct ip_masq_app *mapp, struct ip_masq *ms, struct sk_buff ** ms->saddr, udp_port, ms->daddr, 0, IP_MASQ_F_NO_DPORT); - + if (n_ms==NULL) return 0; @@ -171,7 +172,7 @@ masq_raudio_out (struct ip_masq_app *mapp, struct ip_masq *ms, struct sk_buff ** if (priv) priv->data_conn = n_ms; - /* + /* * There is nothing else useful we can do * Maybe a development could do more, but for now * we exit gracefully! @@ -214,19 +215,19 @@ int ip_masq_raudio_done(void) } #ifdef MODULE +EXPORT_NO_SYMBOLS; int init_module(void) { if (ip_masq_raudio_init() != 0) return -EIO; - register_symtab(0); return 0; } void cleanup_module(void) { if (ip_masq_raudio_done() != 0) - printk("ip_masq_raudio: can't remove module"); + printk(KERN_INFO "ip_masq_raudio: can't remove module"); } #endif /* MODULE */ |