forked from osmocom/wireshark
parent
5d58e19323
commit
eff40f65db
|
@ -61,7 +61,7 @@ typedef enum {
|
|||
al2WithSequenceNumbers,
|
||||
al3,
|
||||
/*...*/
|
||||
// al?M: unimplemented annex C adaptation layers
|
||||
/* al?M: unimplemented annex C adaptation layers */
|
||||
al1M,
|
||||
al2M,
|
||||
al3M
|
||||
|
|
|
@ -37,7 +37,7 @@ typedef enum {
|
|||
H248_CMD_AUDITCAP,
|
||||
H248_CMD_AUDITVAL,
|
||||
H248_CMD_NOTIFY,
|
||||
H248_CMD_SVCCHG,
|
||||
H248_CMD_SVCCHG
|
||||
} h248_cmd_type_t;
|
||||
|
||||
typedef enum {
|
||||
|
@ -45,7 +45,7 @@ typedef enum {
|
|||
H248_TRX_REQUEST,
|
||||
H248_TRX_PENDING,
|
||||
H248_TRX_REPLY,
|
||||
H248_TRX_ACK,
|
||||
H248_TRX_ACK
|
||||
} h248_msg_type_t;
|
||||
|
||||
/* per command info */
|
||||
|
|
|
@ -69,7 +69,7 @@ static char *last_rdn = NULL;
|
|||
|
||||
#include "packet-x509if-fn.c"
|
||||
|
||||
const char * x509if_get_last_dn()
|
||||
const char * x509if_get_last_dn(void)
|
||||
{
|
||||
return last_dn;
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#include "packet-x509if-exp.h"
|
||||
|
||||
extern const char * x509if_get_last_dn();
|
||||
extern const char * x509if_get_last_dn(void);
|
||||
|
||||
#endif /* PACKET_X509IF_H */
|
||||
|
||||
|
|
|
@ -1485,7 +1485,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_cmp);
|
||||
}
|
||||
|
||||
dissect_cmp_pdu(tvb, pinfo, tree);
|
||||
return dissect_cmp_pdu(tvb, pinfo, tree);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -810,7 +810,7 @@ static gint ett_nt_policy_hnd = -1;
|
|||
*/
|
||||
#define HND_TYPE_CTX_HANDLE 0
|
||||
#define HND_TYPE_GUID 1
|
||||
int
|
||||
static int
|
||||
dissect_nt_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo,
|
||||
proto_tree *tree, guint8 *drep, int hfindex,
|
||||
e_ctx_hnd *pdata, proto_item **pitem,
|
||||
|
|
|
@ -184,7 +184,8 @@ static gboolean try_heuristic_first = FALSE;
|
|||
static gboolean dccp_check_checksum = TRUE;
|
||||
|
||||
|
||||
void decode_dccp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int sport, int dport)
|
||||
static void
|
||||
decode_dccp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int sport, int dport)
|
||||
{
|
||||
tvbuff_t *next_tvb;
|
||||
int low_port, high_port;
|
||||
|
|
|
@ -3973,7 +3973,8 @@ dissect_giop_tcp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
|
|||
get_giop_pdu_len, dissect_giop_common);
|
||||
}
|
||||
|
||||
gboolean dissect_giop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
|
||||
static gboolean
|
||||
dissect_giop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
|
||||
|
||||
guint tot_len;
|
||||
|
||||
|
|
|
@ -3378,7 +3378,7 @@ dissect_gnm_attribute_ObjectInstance(tvbuff_t *tvb, packet_info *pinfo, proto_tr
|
|||
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
dissect_gnm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
||||
{
|
||||
/* Dymmy function */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
|
||||
/* .\packet-h245.c */
|
||||
/* ./packet-h245.c */
|
||||
/* ../../tools/asn2eth.py -X -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */
|
||||
|
||||
/* Input file: packet-h245-template.c */
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* Do not modify this file. */
|
||||
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
|
||||
/* .\packet-h245.h */
|
||||
/* ./packet-h245.h */
|
||||
/* ../../tools/asn2eth.py -X -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */
|
||||
|
||||
/* Input file: packet-h245-template.h */
|
||||
|
@ -68,7 +68,7 @@ typedef enum {
|
|||
al2WithSequenceNumbers,
|
||||
al3,
|
||||
/*...*/
|
||||
// al?M: unimplemented annex C adaptation layers
|
||||
/* al?M: unimplemented annex C adaptation layers */
|
||||
al1M,
|
||||
al2M,
|
||||
al3M
|
||||
|
|
|
@ -44,7 +44,7 @@ typedef enum {
|
|||
H248_CMD_AUDITCAP,
|
||||
H248_CMD_AUDITVAL,
|
||||
H248_CMD_NOTIFY,
|
||||
H248_CMD_SVCCHG,
|
||||
H248_CMD_SVCCHG
|
||||
} h248_cmd_type_t;
|
||||
|
||||
typedef enum {
|
||||
|
@ -52,7 +52,7 @@ typedef enum {
|
|||
H248_TRX_REQUEST,
|
||||
H248_TRX_PENDING,
|
||||
H248_TRX_REPLY,
|
||||
H248_TRX_ACK,
|
||||
H248_TRX_ACK
|
||||
} h248_msg_type_t;
|
||||
|
||||
/* per command info */
|
||||
|
|
|
@ -314,7 +314,8 @@ static const value_string iuup_fqcs[] = {
|
|||
{0,NULL}
|
||||
};
|
||||
|
||||
proto_item* proto_tree_add_bits(proto_tree* tree, int hf, tvbuff_t* tvb, int offset, int bit_offset, guint bits, gchar** buf) {
|
||||
static proto_item*
|
||||
proto_tree_add_bits(proto_tree* tree, int hf, tvbuff_t* tvb, int offset, int bit_offset, guint bits, gchar** buf) {
|
||||
static const guint8 masks[] = {0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe};
|
||||
int len = (bits + bit_offset)/8 + ((bits + bit_offset)%8 ? 0 : 1);
|
||||
guint8* shifted_buffer;
|
||||
|
|
|
@ -1960,7 +1960,7 @@ dissect_krb5_etype_info_salt(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
|
|||
return offset;
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
dissect_krb5_etype_info2_salt(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
|
||||
{
|
||||
offset=dissect_ber_GeneralString(pinfo, tree, tvb, offset, hf_krb_etype_info2_salt, NULL, 0);
|
||||
|
|
|
@ -1481,7 +1481,7 @@ dissect_ppdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
|
|||
return offset;
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
||||
{
|
||||
int offset = 0, old_offset;
|
||||
|
|
|
@ -746,7 +746,7 @@ dissect_pvfs2_ds_type(tvbuff_t *tvb, proto_tree *tree, int offset,
|
|||
#define roundup4(x) (((x) + 3) & ~3)
|
||||
#define roundup8(x) (((x) + 7) & ~7)
|
||||
|
||||
int
|
||||
static int
|
||||
dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset,
|
||||
proto_tree *tree,
|
||||
packet_info *pinfo _U_,
|
||||
|
|
|
@ -229,7 +229,7 @@ static guint dissect_norm_hdrext(struct _norm *norm, struct _fec_ptr *f, proto_t
|
|||
struct _ext *e = &g_array_index(ext, struct _ext, i);
|
||||
|
||||
lct_ext_decode(e, &lctp, tvb, ext_tree, ett.hdrext, *f);
|
||||
// fec_decode_ext_fti(e, tvb, ext_tree, ett.hdrext, *f);
|
||||
/* fec_decode_ext_fti(e, tvb, ext_tree, ett.hdrext, *f); */
|
||||
}
|
||||
}
|
||||
g_array_free(ext, TRUE);
|
||||
|
|
|
@ -90,7 +90,7 @@ enum {
|
|||
NORM_FLAG_CC_PLR = 0x02,
|
||||
NORM_FLAG_CC_RTT = 0x04,
|
||||
NORM_FLAG_CC_START = 0x08,
|
||||
NORM_FLAG_CC_LEAVE = 0x10,
|
||||
NORM_FLAG_CC_LEAVE = 0x10
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -2165,7 +2165,7 @@ static void dissect_DistinguishedName_PDU(tvbuff_t *tvb, packet_info *pinfo, pro
|
|||
/*--- End of included file: packet-x509if-fn.c ---*/
|
||||
|
||||
|
||||
const char * x509if_get_last_dn()
|
||||
const char * x509if_get_last_dn(void)
|
||||
{
|
||||
return last_dn;
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ int dissect_x509if_MRSubstitution(gboolean implicit_tag, tvbuff_t *tvb, int offs
|
|||
/*--- End of included file: packet-x509if-exp.h ---*/
|
||||
|
||||
|
||||
extern const char * x509if_get_last_dn();
|
||||
extern const char * x509if_get_last_dn(void);
|
||||
|
||||
#endif /* PACKET_X509IF_H */
|
||||
|
||||
|
|
|
@ -348,7 +348,7 @@ static void after_closed_tag(void* tvbparse_data, const void* wanted_data _U_, t
|
|||
}
|
||||
}
|
||||
|
||||
void after_untag(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok){
|
||||
static void after_untag(void* tvbparse_data, const void* wanted_data _U_, tvbparse_elem_t* tok){
|
||||
GPtrArray* stack = tvbparse_data;
|
||||
xml_frame_t* current_frame = g_ptr_array_index(stack,stack->len - 1);
|
||||
|
||||
|
@ -444,7 +444,7 @@ static void unrecognized_token(void* tvbparse_data, const void* wanted_data _U_,
|
|||
|
||||
|
||||
|
||||
void init_xml_parser(void) {
|
||||
static void init_xml_parser(void) {
|
||||
tvbparse_wanted_t* want_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ",NULL,NULL,NULL);
|
||||
tvbparse_wanted_t* want_attr_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ:",NULL,NULL,NULL);
|
||||
|
||||
|
@ -572,7 +572,7 @@ void init_xml_parser(void) {
|
|||
}
|
||||
|
||||
|
||||
xml_ns_t* xml_new_namespace(GHashTable* hash, gchar* name, ...) {
|
||||
static xml_ns_t* xml_new_namespace(GHashTable* hash, gchar* name, ...) {
|
||||
xml_ns_t* ns = g_malloc(sizeof(xml_ns_t));
|
||||
va_list ap;
|
||||
gchar* attr_name;
|
||||
|
@ -600,7 +600,7 @@ xml_ns_t* xml_new_namespace(GHashTable* hash, gchar* name, ...) {
|
|||
}
|
||||
|
||||
|
||||
void add_xml_field(GArray* hfs, int* p_id, gchar* name, gchar* fqn) {
|
||||
static void add_xml_field(GArray* hfs, int* p_id, gchar* name, gchar* fqn) {
|
||||
hf_register_info hfri;
|
||||
|
||||
hfri.p_id = p_id;
|
||||
|
@ -621,14 +621,14 @@ void add_xml_field(GArray* hfs, int* p_id, gchar* name, gchar* fqn) {
|
|||
g_array_append_val(hfs,hfri);
|
||||
}
|
||||
|
||||
void add_xml_attribute_names(gpointer k, gpointer v, gpointer p) {
|
||||
static void add_xml_attribute_names(gpointer k, gpointer v, gpointer p) {
|
||||
struct _attr_reg_data* d = p;
|
||||
gchar* basename = g_strdup_printf("%s.%s",d->basename,(gchar*)k);
|
||||
add_xml_field(d->hf, (int*) v, (gchar*)k, basename);
|
||||
}
|
||||
|
||||
|
||||
void add_xmlpi_namespace(gpointer k _U_, gpointer v, gpointer p) {
|
||||
static void add_xmlpi_namespace(gpointer k _U_, gpointer v, gpointer p) {
|
||||
xml_ns_t* ns = v;
|
||||
gchar* basename = g_strdup_printf("%s.%s",(gchar*)p,ns->name);
|
||||
gint* ett_p = &(ns->ett);
|
||||
|
@ -1058,7 +1058,7 @@ next_attribute:
|
|||
# define CLOSEDIR_OP(dir) g_dir_close(dir)
|
||||
#endif
|
||||
|
||||
void init_xml_names(void) {
|
||||
static void init_xml_names(void) {
|
||||
xml_ns_t* xmlpi_xml_ns;
|
||||
guint i;
|
||||
DIRECTORY_T* dir;
|
||||
|
@ -1187,7 +1187,7 @@ proto_register_xml(void) {
|
|||
|
||||
}
|
||||
|
||||
void add_dissector_media(gpointer k, gpointer v _U_, gpointer p _U_) {
|
||||
static void add_dissector_media(gpointer k, gpointer v _U_, gpointer p _U_) {
|
||||
dissector_add_string("media_type", (gchar*)k, xml_handle);
|
||||
}
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ typedef enum _tvbparse_wanted_type_t {
|
|||
TVBPARSE_WANTED_SET_ONEOF, /* one of the given types */
|
||||
TVBPARSE_WANTED_SET_SEQ, /* an exact sequence of tokens of the given types */
|
||||
TVBPARSE_WANTED_CARDINALITY, /* one or more tokens of the given type */
|
||||
TVBPARSE_WANTED_HANDLE, /* a handle to another one */
|
||||
TVBPARSE_WANTED_HANDLE /* a handle to another one */
|
||||
|
||||
} tvbparse_type_t;
|
||||
|
||||
|
|
|
@ -499,7 +499,7 @@ voip_calls_sort_column(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
|
|||
{
|
||||
char *text1 = NULL;
|
||||
char *text2 = NULL;
|
||||
int i1, i2, i3, i4;
|
||||
guint i1, i2, i3, i4;
|
||||
|
||||
const GtkCListRow *row1 = (const GtkCListRow *) ptr1;
|
||||
const GtkCListRow *row2 = (const GtkCListRow *) ptr2;
|
||||
|
|
|
@ -146,7 +146,7 @@ static const fragment_items h223_al_frag_items = {
|
|||
"fragments"
|
||||
};
|
||||
|
||||
static guint32 pdu_offset; // offset of the last pdu to start being dissected in the last packet to start being dissected
|
||||
static guint32 pdu_offset; /* offset of the last pdu to start being dissected in the last packet to start being dissected */
|
||||
|
||||
/***************************************************************************
|
||||
*
|
||||
|
@ -302,8 +302,8 @@ static void add_h223_mux_element(h223_call_direction_data *direct, guint8 mc, h2
|
|||
if( framenum < old_li->first_frame || (framenum == old_li->first_frame && pdu_offset < old_li->pdu_offset) )
|
||||
return;
|
||||
else if ( framenum == old_li->first_frame && pdu_offset == old_li->pdu_offset )
|
||||
*old_li_ptr = li; // replace the tail of the list with the new item, since
|
||||
// a single h223 pdu has just set the same MC twice..
|
||||
*old_li_ptr = li; /* replace the tail of the list with the new item, since */
|
||||
/* a single h223 pdu has just set the same MC twice.. */
|
||||
else
|
||||
old_li->next = li;
|
||||
}
|
||||
|
@ -430,10 +430,10 @@ static h223_call_info *find_or_create_call_info ( packet_info * pinfo )
|
|||
conversation_t *conv = NULL;
|
||||
h223_call_info *data;
|
||||
|
||||
// look for a circuit (eg, IAX call) first
|
||||
/* look for a circuit (eg, IAX call) first */
|
||||
circ = find_circuit( pinfo->ctype, pinfo->circuit_id, pinfo->fd->num );
|
||||
if( circ == NULL ) {
|
||||
// assume we're running atop TCP; use the converstion support
|
||||
/* assume we're running atop TCP; use the converstion support */
|
||||
conv = find_conversation( pinfo->fd->num,
|
||||
&pinfo->src,&pinfo->dst,
|
||||
pinfo->ptype,
|
||||
|
@ -558,7 +558,7 @@ static guint8 h223_al2_crc8bit( tvbuff_t *tvb ) {
|
|||
static void dissect_mux_al_pdu( tvbuff_t *tvb,
|
||||
packet_info *pinfo,
|
||||
proto_tree *vc_tree,
|
||||
// circuit_t* vc_circuit,
|
||||
/* circuit_t* vc_circuit, */
|
||||
h223_lc_params* lc_params )
|
||||
{
|
||||
proto_tree *al_tree = NULL;
|
||||
|
|
|
@ -229,7 +229,7 @@ void proto_register_srp (void)
|
|||
|
||||
/* register our init routine to be called at the start of a capture,
|
||||
to clear out our hash tables etc */
|
||||
// register_init_routine(&srp_init_protocol);
|
||||
/* register_init_routine(&srp_init_protocol); */
|
||||
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue