put protocols to obey the latest structure schema

This commit is contained in:
Marcel 2015-01-04 17:23:56 +01:00
parent 3d13e11e13
commit 2ad156086a
3 changed files with 43 additions and 58 deletions

View File

@ -4,45 +4,42 @@ protocol: &ethframe
name: eth-frame name: eth-frame
osilayer: 2 osilayer: 2
fields: fields:
- - field: dstmac
field: destination MAC desc: destination MAC
length: 6 length: 6
- - field: srcmac
field: source MAC desc: source MAC
length: 6 length: 6
- - field: vlantag
field: vlan tag desc: VLAN tag
length: 4 length: 4
subfields: subfields:
- - field: tpid
field: tag protocol identifier (0x8100) desc: tag protocol identifier (0x8100)
length: 2 length: 2
- - field: tci
field: tag control information desc: tag control information
length: 2 length: 2
subfields: subfields:
- - field: pcp
field: priority code point (PCP) desc: priority code point (PCP)
bitfield: yes bitfield: yes
length: 3 length: 3
- - field: dei
field: drop eligible indicator (DEI) desc: drop eligible indicator (DEI)
bitfield: yes bitfield: yes
length: 1 length: 1
- - field: vid
field: VLAN identifier (VID) desc: VLAN identifier (VID)
bitfield: yes bitfield: yes
length: 12 length: 12
- - field: protocolid
field: protocolid
desc: Ethertype (Eth II) or length (IEEE 802.3) desc: Ethertype (Eth II) or length (IEEE 802.3)
length: 2 length: 2
nextlayer: yes nextlayer: yes
- - field: data
field: data
data: true data: true
- - field: CRC
field: CRC
desc: FCS (32-bit CRC) desc: FCS (32-bit CRC)
length: 4 length: 4
optional: yes #most network stacks compute that automatically optional: yes #most network stacks compute that automatically

View File

@ -3,11 +3,10 @@ protocol: &ethpacket
name: eth-packet name: eth-packet
osilayer: 1 osilayer: 1
fields: fields:
- - field: preamble
field: preamble
length: 7 length: 7
- - field: sfd
field: Start of frame delimiter desc: Start of frame delimiter
length: 1 length: 1
- field: eth-frame - field: eth-frame
data: true data: true

View File

@ -2,62 +2,51 @@
protocol: &tcp protocol: &tcp
name: TCP name: TCP
fields: fields:
- - field: srcport
field: source port desc: source port
length: 2 length: 2
- - field: dstport
field: destination port desc: destination port
length: 2 length: 2
- - field: seqno
field: sequence number desc: sequence number
length: 4 length: 4
- - field: ackno
field: acknowledgment number desc: acknowledgment number
length: 4 length: 4
- - field: dataoffset
field: data offset desc: data offset
bitfield: yes bitfield: yes
length: 4 length: 4
- - field: reserved
field: reserved
bitfield: yes bitfield: yes
length: 6 length: 6
- - field: URG
field: URG
bitfield: yes bitfield: yes
length: 1 length: 1
- - field: ACK
field: ACK
bitfield: yes bitfield: yes
length: 1 length: 1
- - field: PSH
field: PSH
bitfield: yes bitfield: yes
length: 1 length: 1
- - field: RST
field: RST
bitfield: yes bitfield: yes
length: 1 length: 1
- - field: SYN
field: SYN
bitfield: yes bitfield: yes
length: 1 length: 1
- - field: FIN
field: FIN
bitfield: yes bitfield: yes
length: 1 length: 1
- - field: window
field: window
length: 2 length: 2
- - field: checksum
field: checksum
length: 2 length: 2
- - field: options
field: options
length: 4 length: 4
optional: true optional: true
repeatable: true repeatable: true
- - field: data
field: data
data: true data: true
osilayer: 4 osilayer: 4