| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
it's like vxlan, but different. the most interesting difference to
vxlan is that the protocol adds support for adding optional metadata
to packets (like nsh). this diff currently just skips that stuff
and just handles the payload. for now.
|
|
|
|
| |
from Matt Dunwoodie and Jason A. Donenfeld
|
|
|
|
| |
ok dlg@
|
|
|
|
| |
ok deraadt@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
it looks like this code was using draft-ietf-dhc-dhcpv6-14 from
1999. there were 27 drafts, and by the time it got to draft 23 and
the rfc it was significantly different. this code for draft 14
cannot handle actual dhcpv6 messages. im kind of surprised
(disappointed?) that noone noticed before. i only noticed cos the
code was segfaulting on sparc64, and when i tried to fix it the
resulting messages looked nothing like what stock tcpdump produced.
the main difference between the early drafts and what ended up in
the rfc is that the base dhcpv6 messages in early drafts were large
structure with a lot of fixed fields, while the rfc settled on a 4
byte header that contains a 1 byte message type and a 3 byte
transaction id. the rest of the messages are built from dhcp options
fields.
this cuts all the old handling out, and fixes the fault in the
options handling by using EXTRACT_16BITS to get at the code and
length fields instead of using ntohs. dhcpv6 explicitly states that
it does not align options, so this is necessary to avoid faults on
strict alignment archs anyway. no options are pretty printed at the
moment, you just get a numeric type, a length, and a hexdump of the
value. this is still better than the garbage that the draft parsing
produced.
if someone is interested in making this easier to read, it would
be a straightforward and well contained project to better handle
option printing.
ok deraadt@
|
|
|
|
|
|
|
| |
this lets me configure a custom gre protocol on a dell s4810 or
s5048 and see what's inside it when it lands on an openbsd box.
ok lteo@
|
|
|
|
| |
ok deraadt@ mpi@ sthen@
|
|
|
|
|
|
|
|
|
|
|
|
| |
There's not reason to build without IPv6 support, `-U INET6' builds were
broken anyway.
Fix an empty redefine for IPPROTO_IPV6 in print-ip.c while here.
No object change on amd64 and sparc64 with clang, gcc compiles differently
but behaviour stays the same.
OK denis deraadt
|
|
|
|
|
| |
I personally think vxlan looks suspiciously like gre, so I put the
parser in print-gre.c
|
|
|
|
|
|
|
| |
This forces UDP packets to be parsed as tftp messages, which is useful
to see the DATA and ACK packets. They're usually on high ports which don't
get matched by udp_print, which by default only handled tftp packets on
port 69.
|
|
|
|
| |
This allows arbitrary UDP packets to be parsed as MPLS.
|
|
|
|
| |
This allows arbitrary UDP packets to be parsed as GRE packets.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This originally started as trying to put a consistent space between
the UDP header information and the payload parsing, but while doing
that I noticed inconsistent IPv4 vs IPv6 handling.
Apart from the default "srcip.srcport > dstip.dstpor" output, all
the other places that IP addresses were printed assumed IPv4. It
looks like it is possible that udp_print() can be called without
an IP header, which made these blind IPv4 prints turn into NULL
derefs.
This fixes the problem above by only having a single place that
prints the addresses out, and makes sure to get the difference
between IPv4, IPv6 and no IP correct.
This changes how the checksum is calculated. It incrementally builds
the UDP checksum by feeding the IPv4 and v6 addresses in separately,
then using common code for the rest of the pseudo header and actual
payload.
Lastly, this does make printing the space between the UDP header
and its payload consistent. The UDP code is now responsible for
adding a space after itself so the payload parsers don't have to.
They got it wrong in some cases anyway, so this should be a lot
more uniform.
help and ok sthen@
|
|
|
|
|
|
|
|
| |
this is part of a bigger change that refactors udp handling, but
works on hosts of both endians.
discussed at length with proctor@
ok sthen@
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
this started cos i was looking at pptp, which came out like this:
23:52:00.197893 call 24 seq 7: gre-ppp-payload (gre encap)
23:52:00.198930 call 1 seq 7 ack 7: gre-ppp-payload (gre encap)
now it looks like this:
23:52:00.197893 20.0.0.2 > 20.0.0.1: pptp callid 24 seq 7: 17.1.1.122 > 40.0.0.2: icmp: echo request
23:52:00.198930 20.0.0.1 > 20.0.0.2: pptp callid 1 seq 7 ack 7: 40.0.0.2 > 17.1.1.122: icmp: echo reply
the big improvement in ppp parsing is it stops parsing based on
what the ppp headers say, rather than what bytes have been captured.
this also adds parsing of EAP packets.
DLT_PPP_SERIAL is now recognised and printed. gre now prints the
outer addresses always, not just when it's encapsulated by ipv6 or
-v is passed to tcpdump.
ok sthen@
|
|
|
|
|
|
| |
in wireshark.
ok deraadt@, dlg@
|
|
|
|
|
|
|
|
| |
eg. tcpdump -y openflow -i switch0
Includes a minor bump for libpcap.
Feedback and OK rzalamena@
|
|
|
|
|
|
|
|
|
|
|
| |
supports the following message types: hello, error, echo request/reply,
feature request/reply, set config, packet-in, packet-out, flow removed and
flow mod.
We currently only support printing this messages for OpenFlow 1.3.5, however
it is possible to reuse some functions and get other versions working too.
ok deraadt@
|
|
|
|
|
|
| |
support to print encapsulated ethernet packets as well.
"Looks good" deraadt@
|
|
|
|
| |
ok daniel@, discussed on hackers@
|
|
|
|
|
|
| |
reference.
ok sthen@ jca@ deraadt@
|
|
|
|
|
|
|
|
|
|
|
| |
ip_print() and others.
Allows code deciding on a minimum length to memmove()
to work as intended, preventing various crashes found
with the afl fuzzer. Callers of ip6_print() should of
course be fixed to provide sane lengths as well.
ok deraadt@ djm@
|
|
|
|
|
|
|
| |
upcoming commit which will fix and improve the display of bad checksums
for the major protocols.
ok henning@
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
packet without the IP header. This is needed by the next commit that
will allow tcpdump to detect bad ICMP checksums.
Related functions like {tcp,udp,icmp6}_print() already accept this
length variable, so this change makes icmp_print() consistent with
them as well.
This commit makes no functional change to tcpdump itself.
OK florian@
|
|
|
|
|
|
| |
cleaned up to be less gross after some suggestions from stsp.
ok stsp@
|
|
|
|
| |
calculation. Mostly from tcpdump.org; ok jsing@
|
|
|
|
|
|
|
|
|
|
| |
used to carry GPRS data over IP for GSM and UMTS networks. The decoder
understands GTPv0, GTPv0', GTPv1-C, GTPv1-U and GTPv1' traffic, however
at this stage not all TLV fields are fully decoded.
This work has been kindly sponsored by SystemNet AS (www.systemnet.no).
"commit" deraadt@
|
|
|
|
| |
without knobs. ok djm, deraadt.
|
|
|
|
|
|
| |
Code from tcpdump.org with cleanup and shrinkage by me.
Help and ideas for extra sanity checks from canacar@
OK canacar@
|
| |
|
|
|
|
| |
ok hshoexer, henning, mcbridge (some time ago)
|
|
|
|
|
|
|
| |
to etherip_print() and do all the bounds checking with it. Also add
bounds checks to ether_print(). This fixes even more crashes.
ok canacar@
|
| |
|
|
|
|
|
|
|
|
|
| |
Protocol.
LLDP is used by some switch vendors as a replacement for the non-free
Cizzco Discovery Protocol (CDP) due to some Cisco patentry...
ok brad@
|
|
|
|
| |
ok canacar@, tested by aanriot@ and others
|
|
|
|
|
|
|
| |
Since the encapsulated protocol information is not always
available in the MPLS tag stack. The decoder attempts
to guess the protocol.
ok brad@
|
|
|
|
| |
ok canacar@
|
|
|
|
|
|
| |
use -y IEEE802_11 or IEEE802_11_RADIO if supported by the driver.
ok canacar@
|
| |
|
|
|
|
|
| |
- bad format string "\%s" -> "%s" in print-ike.c
fixes parsing using CIL, discussed with millert@ niklas@
|
|
|
|
|
|
| |
ok canacar@
From: Marc Huber <pppoe at pro-bono-publico dot de>
|
|
|
|
| |
ok markus@ pb@
|
|
|
|
|
| |
tested by avsm@ vincent@ dhartmei@ markus@ hshoexer@ and others
go for it deraadt@
|
|
|
|
|
|
| |
DNS traffic.
ok canacar@ jakob@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Implemented as an in-kernel multicast IP protocol.
Turn it on like this:
# ifconfig pfsync0 up syncif fxp0
There is not yet any authentication on this protocol, so the syncif
must be on a trusted network. ie, a crossover cable between the two
firewalls.
NOTABLE CHANGES:
- A new index based on a unique (creatorid, stateid) tuple has been
added to the state tree.
- Updates now appear on the pfsync(4) interface; multiple updates may
be compressed into a single update.
- Applications which use bpf on pfsync(4) will need modification;
packets on pfsync no longer contains regular pf_state structs,
but pfsync_state structs which contain no pointers.
Much more to come.
ok deraadt@
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
old datalink type is still recognized.
ok henning@ dhartmei@ frantzen@
|