forked from osmocom/wireshark
The "application_context_version" variables in the CAMEL and GSM MAP
dissectors aren't needed outside the dissectors, and having more than one of them exported causes build problems, at least on OS X - make them static. Fix indentation. svn path=/trunk/; revision=13951
This commit is contained in:
parent
62aa500e15
commit
9385c4b868
|
@ -86,7 +86,7 @@ dissector_handle_t camel_handle;
|
|||
|
||||
/* Global variables */
|
||||
|
||||
int application_context_version;
|
||||
static int application_context_version;
|
||||
|
||||
static int dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset);
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@ dissector_handle_t map_handle;
|
|||
/* Global variables */
|
||||
|
||||
static proto_tree *top_tree;
|
||||
int application_context_version;
|
||||
static int application_context_version;
|
||||
gint protocolId;
|
||||
static int gsm_map_tap = -1;
|
||||
|
||||
|
@ -928,15 +928,15 @@ static guint8 gsm_map_pdu_size = 0;
|
|||
static int
|
||||
dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo , proto_tree *tree, int hf_index) {
|
||||
|
||||
char *version_ptr, *version_str;
|
||||
char *version_ptr, *version_str;
|
||||
|
||||
opcode = 0;
|
||||
application_context_version = 0;
|
||||
if (pinfo->private_data != NULL){
|
||||
version_ptr = strrchr(pinfo->private_data,'.');
|
||||
version_str = g_strdup(version_ptr+1);
|
||||
application_context_version = atoi(version_str);
|
||||
}
|
||||
opcode = 0;
|
||||
application_context_version = 0;
|
||||
if (pinfo->private_data != NULL){
|
||||
version_ptr = strrchr(pinfo->private_data,'.');
|
||||
version_str = g_strdup(version_ptr+1);
|
||||
application_context_version = atoi(version_str);
|
||||
}
|
||||
|
||||
gsmmap_pdu_type = tvb_get_guint8(tvb, offset)&0x0f;
|
||||
/* Get the length and add 2 */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
|
||||
/* .\packet-camel.c */
|
||||
/* ./packet-camel.c */
|
||||
/* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */
|
||||
|
||||
/* Input file: packet-camel-template.c */
|
||||
|
@ -617,7 +617,7 @@ dissector_handle_t camel_handle;
|
|||
|
||||
/* Global variables */
|
||||
|
||||
int application_context_version;
|
||||
static int application_context_version;
|
||||
|
||||
static int dissect_invokeCmd(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset);
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
|
||||
/* .\packet-camel.h */
|
||||
/* ./packet-camel.h */
|
||||
/* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */
|
||||
|
||||
/* Input file: packet-camel-template.h */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
|
||||
/* .\packet-gsm_map.c */
|
||||
/* ./packet-gsm_map.c */
|
||||
/* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
|
||||
|
||||
/* Input file: packet-gsm_map-template.c */
|
||||
|
@ -1108,7 +1108,7 @@ dissector_handle_t map_handle;
|
|||
/* Global variables */
|
||||
|
||||
static proto_tree *top_tree;
|
||||
int application_context_version;
|
||||
static int application_context_version;
|
||||
gint protocolId;
|
||||
static int gsm_map_tap = -1;
|
||||
|
||||
|
@ -11198,15 +11198,15 @@ static guint8 gsm_map_pdu_size = 0;
|
|||
static int
|
||||
dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo , proto_tree *tree, int hf_index) {
|
||||
|
||||
char *version_ptr, *version_str;
|
||||
char *version_ptr, *version_str;
|
||||
|
||||
opcode = 0;
|
||||
application_context_version = 0;
|
||||
if (pinfo->private_data != NULL){
|
||||
version_ptr = strrchr(pinfo->private_data,'.');
|
||||
version_str = g_strdup(version_ptr+1);
|
||||
application_context_version = atoi(version_str);
|
||||
}
|
||||
opcode = 0;
|
||||
application_context_version = 0;
|
||||
if (pinfo->private_data != NULL){
|
||||
version_ptr = strrchr(pinfo->private_data,'.');
|
||||
version_str = g_strdup(version_ptr+1);
|
||||
application_context_version = atoi(version_str);
|
||||
}
|
||||
|
||||
gsmmap_pdu_type = tvb_get_guint8(tvb, offset)&0x0f;
|
||||
/* Get the length and add 2 */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
|
||||
/* .\packet-gsm_map.h */
|
||||
/* ./packet-gsm_map.h */
|
||||
/* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
|
||||
|
||||
/* Input file: packet-gsm_map-template.h */
|
||||
|
|
Loading…
Reference in New Issue