diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-09-11 16:19:41 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-09-11 16:19:41 +0200 |
| commit | 189dbc5853ce73448ca0d2423bbac3aa23712478 (patch) | |
| tree | 21599062fa75ef75bf360b01072cce8e810f192b | |
| parent | 49540362b2a25aadbaf25fd087414776aa5a67a8 (diff) | |
| download | conntrack-tools-189dbc5853ce73448ca0d2423bbac3aa23712478.tar.gz conntrack-tools-189dbc5853ce73448ca0d2423bbac3aa23712478.zip | |
conntrackd: fix MTU for TCP channels
Use the TCP header size (20 bytes) instead of the UDP header size
(8 bytes) to calculate the maximum packet size.
Reported-by: Samuel Gauthier <samuel.gauthier@6wind.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | include/channel.h | 1 | ||||
| -rw-r--r-- | src/channel.c | 9 | ||||
| -rw-r--r-- | src/channel_mcast.c | 1 | ||||
| -rw-r--r-- | src/channel_tcp.c | 1 | ||||
| -rw-r--r-- | src/channel_udp.c | 1 |
5 files changed, 8 insertions, 5 deletions
diff --git a/include/channel.h b/include/channel.h index 98605d9..d06e510 100644 --- a/include/channel.h +++ b/include/channel.h @@ -52,6 +52,7 @@ struct channel_conf { struct nlif_handle; struct channel_ops { + int headersiz; void * (*open)(void *conf); void (*close)(void *channel); int (*send)(void *channel, const void *data, int len); diff --git a/src/channel.c b/src/channel.c index 76fb057..7374d1b 100644 --- a/src/channel.c +++ b/src/channel.c @@ -29,8 +29,6 @@ void channel_init(void) ops[CHANNEL_TCP] = &channel_tcp; } -#define HEADERSIZ 28 /* IP header (20 bytes) + UDP header 8 (bytes) */ - struct channel_buffer { char *data; int size; @@ -38,7 +36,7 @@ struct channel_buffer { }; static struct channel_buffer * -channel_buffer_open(int mtu) +channel_buffer_open(int mtu, int headersiz) { struct channel_buffer *b; @@ -46,7 +44,7 @@ channel_buffer_open(int mtu) if (b == NULL) return NULL; - b->size = mtu - HEADERSIZ; + b->size = mtu - headersiz; b->data = malloc(b->size); if (b->data == NULL) { @@ -108,7 +106,8 @@ channel_open(struct channel_conf *conf) c->ops = ops[conf->channel_type]; if (conf->channel_flags & CHANNEL_F_BUFFERED) { - c->buffer = channel_buffer_open(c->channel_ifmtu); + c->buffer = channel_buffer_open(c->channel_ifmtu, + c->ops->headersiz); if (c->buffer == NULL) { free(c); return NULL; diff --git a/src/channel_mcast.c b/src/channel_mcast.c index 9fcacac..35801d7 100644 --- a/src/channel_mcast.c +++ b/src/channel_mcast.c @@ -126,6 +126,7 @@ channel_mcast_accept_isset(struct channel *c, fd_set *readfds) } struct channel_ops channel_mcast = { + .headersiz = 28, /* IP header (20 bytes) + UDP header 8 (bytes) */ .open = channel_mcast_open, .close = channel_mcast_close, .send = channel_mcast_send, diff --git a/src/channel_tcp.c b/src/channel_tcp.c index 9fb4b07..f132840 100644 --- a/src/channel_tcp.c +++ b/src/channel_tcp.c @@ -136,6 +136,7 @@ channel_tcp_accept(struct channel *c) } struct channel_ops channel_tcp = { + .headersiz = 40, /* IP header (20 bytes) + TCP header 20 (bytes) */ .open = channel_tcp_open, .close = channel_tcp_close, .send = channel_tcp_send, diff --git a/src/channel_udp.c b/src/channel_udp.c index 5c88647..a46a2b1 100644 --- a/src/channel_udp.c +++ b/src/channel_udp.c @@ -126,6 +126,7 @@ channel_udp_accept_isset(struct channel *c, fd_set *readfds) } struct channel_ops channel_udp = { + .headersiz = 28, /* IP header (20 bytes) + UDP header 8 (bytes) */ .open = channel_udp_open, .close = channel_udp_close, .send = channel_udp_send, |