osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Updates to NCP protocol dissector 

Add NCP 98
Fix NDSrequestprotocolflags not being captured on request so that reply
would offset correctly with CRC flag.

Change-Id: Ie45a1017326dd38393baf3f005f3ec9195438565
Reviewed-on: https://code.wireshark.org/review/33146
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Greg Morris 2019-05-09 15:35:57 -05:00 committed by Anders Broman
parent 5862b46380
commit 715f46b768
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-ncp2222.inc
View File

@ -8347,7 +8347,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_item(ncp_tree, hf_ncp_fragment_size, tvb, 12, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ncp_tree, hf_ncp_message_size, tvb, 16, 4, ENC_LITTLE_ENDIAN);
nds_prot_flags=tvb_get_letohs(tvb, 22);
proto_tree_add_bitmask(ncp_tree, tvb, 22, hf_ncp_nds_flag, ett_ncp, ndsprotflags, ENC_LITTLE_ENDIAN);
if (nds_version == 0) {

12
tools/ncp2222.py
View File

@ -1252,6 +1252,7 @@ AbortQueueFlag = val_string8("abort_q_flag", "Abort Queue Flag"
[ 0x01, "Do Not Place Spool File, Examine Flags" ],
])
AcceptedMaxSize = uint16("accepted_max_size", "Accepted Max Size")
AcceptedMaxSize64 = uint64("accepted_max_size64", "Accepted Max Size")
AccessControl = val_string8("access_control", "Access Control", [
[ 0x00, "Open for read by this client" ],
[ 0x01, "Open for write by this client" ],
@ -3405,6 +3406,7 @@ PropertyType = val_string8("property_type", "Property Type",
])
PropertyValue = fw_string("property_value", "Property Value", 128)
ProposedMaxSize = uint16("proposed_max_size", "Proposed Max Size")
ProposedMaxSize64 = uint64("proposed_max_size64", "Proposed Max Size")
protocolFlags = uint32("protocol_flags", "Protocol Flags")
protocolFlags.Display("BASE_HEX")
PurgeableBlocks = uint32("purgeable_blocks", "Purgeable Blocks")
@ -15530,6 +15532,16 @@ rec( 9, 4, ObjectID ),
rec( 12, 1, SecurityFlag ),
])
pkt.CompletionCodes([0x0000])
# 2222/62, 98
pkt = NCP(0x62, "Negotiate NDS connection buffer size", 'connection')
pkt.Request(15, [
rec( 7, 8, ProposedMaxSize64, ENC_BIG_ENDIAN, Info_str=(ProposedMaxSize, "Negotiate NDS connection - %d", ", %d")),
])
pkt.Reply(18, [
rec( 8, 8, AcceptedMaxSize64, ENC_BIG_ENDIAN ),
rec( 16, 2, EchoSocket, ENC_BIG_ENDIAN ),
])
pkt.CompletionCodes([0x0000])
# 2222/63, 99
pkt = NCP(0x63, "Undocumented Packet Burst", 'pburst')
pkt.Request(7)