osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Hand off to the PPC-in-HDLC-like-framing dissector. 

There might be HDLC-like framing inside SSTP, even if it eventually gets
negotiated away.

Bug: 14559
Change-Id: Ibc254f221f26c0da905ceff4edff7859a3fec635
Reviewed-on: https://code.wireshark.org/review/26619
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-03-23 20:28:18 -07:00
parent bff1f7f70e
commit 0f34a866bb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-sstp.c
View File

@ -100,7 +100,7 @@ void proto_reg_handoff_sstp(void);
#define SSTP_ATTRIB_STATUS_UNRECOGNIZED_ATTRIBUTE 0x000002
#define SSTP_ATTRIB_STATUS_VALUE_NOT_SUPPORTED 0x000004
static dissector_handle_t ppp_handle = NULL;
static dissector_handle_t ppp_hdlc_handle = NULL;
static gint ett_sstp = -1;
static gint ett_sstp_attribute = -1;
static gint ett_sstp_version = -1;
@ -317,7 +317,7 @@ dissect_sstp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
/* our work here is done, since sstp encapsulates ppp, we hand the remaining buffer
over to the ppp dissector for further analysis */
tvb_next = tvb_new_subset_remaining(tvb, SSTP_OFFSET_DATA);
call_dissector(ppp_handle, tvb_next, pinfo, tree);
call_dissector(ppp_hdlc_handle, tvb_next, pinfo, tree);
}
return tvb_captured_length(tvb);
@ -502,7 +502,7 @@ proto_register_sstp(void)
void
proto_reg_handoff_sstp(void)
{
ppp_handle = find_dissector_add_dependency("ppp", proto_sstp);
ppp_hdlc_handle = find_dissector_add_dependency("ppp_hdlc", proto_sstp);
}
/*