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

Don't reinvent the wheel, use val_to_str/match_strval 

svn path=/trunk/; revision=16130
This commit is contained in:
Jörg Mayer 2005-10-05 15:44:04 +00:00
parent 5aea051727
commit 402c4dd9a7
2 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/packet-amr.c
View File

@ -81,7 +81,7 @@ static guint temp_dynamic_payload_type = 0;
gint amr_encoding_type = 0;
/* Currently only octet aligned works */
static gboolean octet_aligned = TRUE;
/* static gboolean octet_aligned = TRUE; */
static const value_string amr_encoding_type_value[] = {
{0, "RFC 3267"},
@ -138,7 +138,7 @@ static const true_false_string amr_sti_vals = {
"SID_FIRST"
};
static void
dissect_amr_if1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
dissect_amr_if1(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree){
int offset =0;
guint8 octet;
@ -163,7 +163,7 @@ dissect_amr_if1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
static void
dissect_amr_if2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
int offset =0, i;
int offset =0;
guint8 octet;
proto_tree_add_item(tree, hf_amr_if2_ft, tvb, offset, 1, FALSE);
@ -178,12 +178,9 @@ dissect_amr_if2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){
return;
proto_tree_add_text(tree, tvb, offset+1, -1, "Speech data");
for(i=0;amr_codec_mode_request_vals[i].value != 0 || amr_codec_mode_request_vals[i].strptr != NULL;++i) {
if(amr_codec_mode_request_vals[i].value == octet)
break;
}
if(amr_codec_mode_request_vals[i].strptr && check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", amr_codec_mode_request_vals[i].strptr );
if(check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
val_to_str(octet, amr_codec_mode_request_vals, "Unknown (%d)" ));
}
/* Code to actually dissect the packets */

22
epan/dissectors/packet-csm-encaps.c
View File

@ -193,32 +193,14 @@ gchar *csm_fc(guint16 fc, guint16 ct)
/* check to see if the message is an exclusive message send to host */
gboolean csm_to_host(guint16 fc, guint16 ct)
{
guint16 i=0;
if (fc == 0x0000)
{
while (1)
{
if (exclusive_to_host_ct_vals[i].strptr == NULL)
return FALSE;
else if (exclusive_to_host_ct_vals[i].value == ct)
return TRUE;
i++;
}
return (match_strval(ct, exclusive_to_host_ct_vals) != NULL);
}
else
{
while (1)
{
if (exclusive_to_host_vals[i].strptr == NULL)
return FALSE;
else if (exclusive_to_host_vals[i].value == fc)
return TRUE;
i++;
}
return (match_strval(fc, exclusive_to_host_vals) != NULL);
}
return FALSE;
}