diff options
| author | des <des@FreeBSD.org> | 2004-07-06 12:13:28 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-07-06 12:13:28 +0000 |
| commit | 93180ebf2d291b1bba586c96cddb79d028f53e29 (patch) | |
| tree | 26f30e4465d6cc4e19885a8912879ee00b6630f9 /lib/libalias/alias_ftp.c | |
| parent | 858232d10a73b399e1b8a7eedd3dc58a225442a6 (diff) | |
| download | FreeBSD-src-93180ebf2d291b1bba586c96cddb79d028f53e29.zip FreeBSD-src-93180ebf2d291b1bba586c96cddb79d028f53e29.tar.gz | |
Introduce inline {ip,udp,tcp}_next() functions which take a pointer to an
{ip,udp,tcp} header and return a void * pointing to the payload (i.e. the
first byte past the end of the header and any required padding). Use them
consistently throughout libalias to a) reduce code duplication, b) improve
code legibility, c) get rid of a bunch of alignment warnings.
Diffstat (limited to 'lib/libalias/alias_ftp.c')
| -rw-r--r-- | lib/libalias/alias_ftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalias/alias_ftp.c b/lib/libalias/alias_ftp.c index 79938db..b628528 100644 --- a/lib/libalias/alias_ftp.c +++ b/lib/libalias/alias_ftp.c @@ -114,7 +114,7 @@ AliasHandleFtpOut( int ftp_message_type; /* Calculate data length of TCP packet */ - tc = (struct tcphdr *)((char *)pip + (pip->ip_hl << 2)); + tc = (struct tcphdr *)ip_next(pip); hlen = (pip->ip_hl + tc->th_off) << 2; tlen = ntohs(pip->ip_len); dlen = tlen - hlen; @@ -578,7 +578,7 @@ NewFtpMessage(struct libalias *la, struct ip *pip, #endif /* Calculate data length of TCP packet */ - tc = (struct tcphdr *)((char *)pip + (pip->ip_hl << 2)); + tc = (struct tcphdr *)ip_next(pip); hlen = (pip->ip_hl + tc->th_off) << 2; tlen = ntohs(pip->ip_len); dlen = tlen - hlen; |
