From acdc3d771a57c03ac57c971e9539ffd7b911f653 Mon Sep 17 00:00:00 2001 From: Luis Ontanon Date: Mon, 6 Jun 2005 18:51:05 +0000 Subject: [PATCH] - make sure there's something to add to colinfo. - auditValueRequest is a request too svn path=/trunk/; revision=14567 --- asn1/h248/h248.cnf | 12 ++++-- epan/dissectors/packet-h248.c | 25 +++++++---- epan/dissectors/packet-h248.h | 78 +++++++++++++++++------------------ 3 files changed, 64 insertions(+), 51 deletions(-) diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf index 323d172e4d..63f0496250 100644 --- a/asn1/h248/h248.cnf +++ b/asn1/h248/h248.cnf @@ -119,6 +119,10 @@ ServiceChangeReply/terminationID terminationIDList command_string = "auditCapRequest {"; #.END +#.FN_HDR Command/auditValueRequest + command_string = "auditValueRequest {"; +#.END + #.FN_HDR Command/notifyReq command_string = "notifyReq {"; #.END @@ -160,17 +164,17 @@ ServiceChangeReply/terminationID terminationIDList #.END #.FN_HDR TerminationID - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, command_string); + if (check_col(pinfo->cinfo, COL_INFO) && command_string != NULL ) col_append_str(pinfo->cinfo, COL_INFO, command_string); it_is_wildcard = FALSE; #.END #.FN_FTR TerminationID - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "}"); + if (check_col(pinfo->cinfo, COL_INFO) && command_string != NULL ) col_append_str(pinfo->cinfo, COL_INFO, "}"); it_is_wildcard = FALSE; #.END #.FN_HDR WildcardField - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "*"); + if (check_col(pinfo->cinfo, COL_INFO) && command_string != NULL ) col_append_str(pinfo->cinfo, COL_INFO, "*"); it_is_wildcard = TRUE; #.END @@ -178,7 +182,7 @@ ServiceChangeReply/terminationID terminationIDList tvbuff_t* new_tvb; offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, &new_tvb); - if (! it_is_wildcard && check_col(pinfo->cinfo, COL_INFO)) + if (command_string != NULL && ! it_is_wildcard && check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, bytes_to_str(tvb_get_ptr(tvb,0,tvb->length),tvb->length)); #.END diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 53a584a31d..6749dca94a 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -143,7 +143,7 @@ static int hf_h248_moveReq = -1; /* T_moveReq */ static int hf_h248_modReq = -1; /* T_modReq */ static int hf_h248_subtractReq = -1; /* T_subtractReq */ static int hf_h248_auditCapRequest = -1; /* T_auditCapRequest */ -static int hf_h248_auditValueRequest = -1; /* AuditRequest */ +static int hf_h248_auditValueRequest = -1; /* T_auditValueRequest */ static int hf_h248_notifyReq = -1; /* T_notifyReq */ static int hf_h248_serviceChangeReq = -1; /* ServiceChangeRequest */ static int hf_h248_addReply = -1; /* T_addReply */ @@ -1498,7 +1498,7 @@ static int dissect_keepActive_impl(packet_info *pinfo, proto_tree *tree, tvbuff_ static int dissect_h248_WildcardField(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "*"); + if (check_col(pinfo->cinfo, COL_INFO) && command_string != NULL ) col_append_str(pinfo->cinfo, COL_INFO, "*"); it_is_wildcard = TRUE; offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); @@ -1530,7 +1530,7 @@ dissect_h248_T_id(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_i tvbuff_t* new_tvb; offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, &new_tvb); - if (! it_is_wildcard && check_col(pinfo->cinfo, COL_INFO)) + if (command_string != NULL && ! it_is_wildcard && check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, bytes_to_str(tvb_get_ptr(tvb,0,tvb->length),tvb->length)); @@ -1548,12 +1548,12 @@ static const ber_sequence_t TerminationID_sequence[] = { static int dissect_h248_TerminationID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, command_string); + if (check_col(pinfo->cinfo, COL_INFO) && command_string != NULL ) col_append_str(pinfo->cinfo, COL_INFO, command_string); it_is_wildcard = FALSE; offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, TerminationID_sequence, hf_index, ett_h248_TerminationID); - if (check_col(pinfo->cinfo, COL_INFO)) col_append_str(pinfo->cinfo, COL_INFO, "}"); + if (check_col(pinfo->cinfo, COL_INFO) && command_string != NULL ) col_append_str(pinfo->cinfo, COL_INFO, "}"); it_is_wildcard = FALSE; return offset; } @@ -3433,9 +3433,6 @@ dissect_h248_AuditRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, return offset; } -static int dissect_auditValueRequest_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - return dissect_h248_AuditRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_auditValueRequest); -} static int @@ -3449,6 +3446,18 @@ static int dissect_auditCapRequest_impl(packet_info *pinfo, proto_tree *tree, tv return dissect_h248_T_auditCapRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_auditCapRequest); } + +static int +dissect_h248_T_auditValueRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { + command_string = "auditValueRequest {"; + offset = dissect_h248_AuditRequest(implicit_tag, tvb, offset, pinfo, tree, hf_index); + + return offset; +} +static int dissect_auditValueRequest_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { + return dissect_h248_T_auditValueRequest(TRUE, tvb, offset, pinfo, tree, hf_h248_auditValueRequest); +} + static const ber_sequence_t TimeNotation_sequence[] = { { BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_date_impl }, { BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_time_impl }, diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index e3abab06c1..84099c67df 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -1,39 +1,39 @@ -/* Do not modify this file. */ -/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-h248.h */ -/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ - -/* Input file: packet-h248-template.h */ - -/* packet-h248.h - * Routines for H.248/MEGACO packet dissection - * Ronnie Sahlberg 2004 - * - * $Id$ - * - * Ethereal - Network traffic analyzer - * By Gerald Combs - * Copyright 1998 Gerald Combs - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef PACKET_H248_H -#define PACKET_H248_H - -/*#include "packet-h248-exp.h"*/ - -#endif /* PACKET_H248_H */ - +/* Do not modify this file. */ +/* It is created automatically by the ASN.1 to Ethereal dissector compiler */ +/* ./packet-h248.h */ +/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */ + +/* Input file: packet-h248-template.h */ + +/* packet-h248.h + * Routines for H.248/MEGACO packet dissection + * Ronnie Sahlberg 2004 + * + * $Id: packet-h248-template.h 12203 2004-10-05 09:18:55Z guy $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef PACKET_H248_H +#define PACKET_H248_H + +/*#include "packet-h248-exp.h"*/ + +#endif /* PACKET_H248_H */ +