~ubuntu-branches/ubuntu/intrepid/tcpdump/intrepid

« back to all changes in this revision

Viewing changes to print-l2tp.c

Committer: Bazaar Package Importer
Author(s): Romain Francoise
Date: 2005-12-10 14:26:20 UTC
mfrom: (1.1.1 upstream)
Revision ID: james.westby@ubuntu.com-20051210142620-t4ju0367w6j2x06i

Tags: 3.9.4-2

http://bugs.debian.org/342310

debian/patches/20_man_fixes.dpatch: Merge patch from A Costa
<agcosta@gis.net> fixing a few typos (closes: #342310).

files added:
bgp.h

cpack.c

cpack.h

dccp.h

debian/patches/30_vlan_eflag.dpatch

decode_prefix.h

ieee802_11_radio.h

ipproto.c

l2vpn.c

l2vpn.h

mpls.h

netdissect.h

nlpid.c

nlpid.h

pcap_dump_ftell.c

pmap_prot.h

print-dccp.c

print-eap.c

print-eigrp.c

print-juniper.c

print-lmp.c

print-lspping.c

print-pgm.c

print-sip.c

print-slow.c

print-symantec.c

print-syslog.c

rpc_auth.h

rpc_msg.h

tests/08-sunrise-sunset-aes.puu

tests/bgp-infinite-loop.pcap

tests/chdlc-slarp-short.pcap

tests/chdlc-slarp.pcap

tests/esp5.gdbinit

tests/esp5.out

tests/esp5.sh

tests/espudp1.out

tests/espudp1.puu

tests/espudp1.sh

tests/isakmp4.out

tests/isakmp4.sh

tests/isakmp4500.puu

tests/isis-infinite-loop.pcap

tests/ldp-infinite-loop.pcap

tests/lmp.out

tests/lmp.puu

tests/lmp.sh

tests/lspping-fec-ldp.pcap

tests/lspping-fec-rsvp.pcap

tests/mpls-ldp-hello.puu

tests/mpls-traceroute.pcap

tests/ospf-gmpls.puu

tests/print-A.out

tests/print-AA.out

tests/print-X.out

tests/print-XX.out

tests/print-capX.out

tests/print-capXX.out

tests/print-flags.puu

tests/print-flags.sh

tests/print-x.out

tests/print-xx.out

tests/rsvp-infinite-loop.pcap

files removed:
debian/patches/30_openssl_des.dpatch

debian/patches/40_ipv6cp.dpatch

tests/eapon1.pcap

tests/mpls-ldp-hello.pcap

tests/ospf-gmpls.pcap

win32/Include/Rpc

win32/Include/Rpc/rpc.h

files modified:
CHANGES

CREDITS

FILES

INSTALL

Makefile.in

README

VERSION

acconfig.h

aclocal.m4

addrtoname.c

appletalk.h

atm.h

bpf_dump.c

config.h.in

configure

configure.in

debian/changelog

debian/control

debian/copyright

debian/patches/00list

debian/patches/20_man_fixes.dpatch

ethertype.h

extract.h

gmpls.c

gmpls.h

gmt2local.c

icmp6.h

interface.h

ip.h

ip6.h

ipproto.h

llc.h

machdep.c

missing/bittypes.h

missing/datalinks.c

missing/dlnames.c

missing/getaddrinfo.c

missing/getnameinfo.c

missing/inet_aton.c

missing/inet_ntop.c

missing/inet_pton.c

missing/snprintf.c

missing/strlcat.c

missing/strlcpy.c

ntp.h

ospf.h

oui.c

oui.h

parsenfsfh.c

pcap-missing.h

pf.h

ppp.h

print-802_11.c

print-ah.c

print-aodv.c

print-ap1394.c

print-arcnet.c

print-arp.c

print-ascii.c

print-atalk.c

print-atm.c

print-beep.c

print-bfd.c

print-bgp.c

print-bootp.c

print-cdp.c

print-chdlc.c

print-cip.c

print-cnfp.c

print-decnet.c

print-dhcp6.c

print-domain.c

print-dvmrp.c

print-egp.c

print-enc.c

print-esp.c

print-ether.c

print-fddi.c

print-fr.c

print-frag6.c

print-gre.c

print-hsrp.c

print-icmp.c

print-icmp6.c

print-igmp.c

print-igrp.c

print-ip.c

print-ip6.c

print-ip6opts.c

print-ipcomp.c

print-ipfc.c

print-ipx.c

print-isakmp.c

print-isoclns.c

print-krb.c

print-l2tp.c

print-lane.c

print-ldp.c

print-llc.c

print-lwres.c

print-mobile.c

print-mobility.c

print-mpls.c

print-msdp.c

print-netbios.c

print-nfs.c

print-ntp.c

print-null.c

print-ospf.c

print-ospf6.c

print-pflog.c

print-pim.c

print-ppp.c

print-pppoe.c

print-pptp.c

print-radius.c

print-raw.c

print-rip.c

print-ripng.c

print-rsvp.c

print-rt6.c

print-rx.c

print-sctp.c

print-sl.c

print-sll.c

print-smb.c

print-snmp.c

print-stp.c

print-sunatm.c

print-sunrpc.c

print-tcp.c

print-telnet.c

print-tftp.c

print-timed.c

print-token.c

print-udp.c

print-vjc.c

print-vrrp.c

print-wb.c

print-zephyr.c

setsignal.c

smb.h

smbutil.c

strcasecmp.c

tcp.h

tcpdump-stdinc.h

tcpdump.1

tcpdump.c

tests/bgp_vpn_attrset.out

tests/eapon1.out

tests/eapon1.sh

tests/esp-secrets.txt

tests/esp0.out

tests/esp1.out

tests/esp1.sh

tests/esp2.out

tests/esp2.sh

tests/esp3.sh

tests/esp4.sh

tests/isakmp3.out

tests/isakmp3.sh

tests/mpls-ldp-hello.out

tests/mpls-ldp-hello.sh

tests/ospf-gmpls.out

tests/ospf-gmpls.sh

udp.h

util.c

vfprintf.c

win32/Src/getopt.c

win32/prj/GNUmakefile

win32/prj/WinDump.dsp

Show diffs side-by-side

added added

removed removed

print-l2tp.c

#ifndef lint

static const char rcsid[] _U_ =

"@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.14.2.3 2003/12/26 23:21:42 guy Exp $";

"@(#) $Header: /tcpdump/master/tcpdump/print-l2tp.c,v 1.17.2.2 2005/04/20 21:50:16 guy Exp $";

#endif

#ifdef HAVE_CONFIG_H

617

const u_int16_t *ptr = (u_int16_t *)dat;

618

u_int cnt = 0; /* total octets consumed */

619

u_int16_t pad;

620

int flag_t, flag_l, flag_s, flag_o, flag_p;

620

int flag_t, flag_l, flag_s, flag_o;

621

u_int16_t l2tp_len;

622

623

flag_t = flag_l = flag_s = flag_o = flag_p = FALSE;

623

flag_t = flag_l = flag_s = flag_o = FALSE;

624

625

TCHECK(*ptr); /* Flags & Version */

626

if ((EXTRACT_16BITS(ptr) & L2TP_VERSION_MASK) == L2TP_VERSION_L2TP) {

650

flag_o = TRUE;

651

printf("O");

652

}

653

if (EXTRACT_16BITS(ptr) & L2TP_FLAG_PRIORITY) {

654

flag_p = TRUE;

653

if (EXTRACT_16BITS(ptr) & L2TP_FLAG_PRIORITY)

655

654

printf("P");

656

}

657

655

printf("]");

658

656

659

657

ptr++;

690

688

cnt += (2 + pad);

691

689

}

692

690

691

if (flag_l) {

692

if (length < l2tp_len) {

693

printf(" Length %u larger than packet", l2tp_len);

694

return;

695

}

696

length = l2tp_len;

697

}

698

if (length < cnt) {

699

printf(" Length %u smaller than header length", length);

700

return;

701

}

693

702

if (flag_t) {

703

if (!flag_l) {

704

printf(" No length");

705

return;

706

}

694

707

if (length - cnt == 0) {

695

708

printf(" ZLB");

696

709

} else {

Older »