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

Move the definition of TEXT_LAYER_LENGTH to packet-tpkt.c. 

It's not used by anything outside the TPKT dissector - and probably
*shouldn't* be used by anything outside the TPKT dissector.

Clean up some white space while we're at it.

Change-Id: I9bb9642a002fb9e8bd6c36d80d7653ef9af615d4
Reviewed-on: https://code.wireshark.org/review/13204
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-01-11 21:02:22 -08:00
parent 6f47bcd902
commit b09286cf5b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,6 +198,12 @@ parseReservedText ( guint8* pTpktData )
return value;
}
/*
* Length of the TPKT text-layer header.
*/
static const int TEXT_LAYER_LENGTH = 9;
/*
* Dissect ASCII TPKT-encapsulated data in a TCP stream.
*/

5
epan/dissectors/packet-tpkt.h
View File

@ -35,8 +35,6 @@
* TPKT header must be at least "4+min_len" in order for this to be a
* valid TPKT PDU for the protocol in question.
*/
static const int TEXT_LAYER_LENGTH = 9;
WS_DLL_PUBLIC int is_tpkt(tvbuff_t *tvb, int min_len);
/*
@ -46,7 +44,6 @@ WS_DLL_PUBLIC void dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, gboolean desegment,
dissector_handle_t subdissector_handle);
/*
* Check whether this could be a ASCII TPKT-encapsulated PDU.
* Returns -1 if it's not, and the PDU length from the TPKT header
@ -56,7 +53,6 @@ WS_DLL_PUBLIC void dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo,
* TPKT header must be at least "8+min_len" in order for this to be a
* valid TPKT PDU for the protocol in question.
*/
extern guint16 is_asciitpkt(tvbuff_t *tvb);
/*
@ -64,4 +60,3 @@ extern guint16 is_asciitpkt(tvbuff_t *tvb);
*/
extern void dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, dissector_handle_t subdissector_handle);