#endif
/* Some basic utility functions that are specific to this dissector */
-static gint tvb_skip_wsp(tvbuff_t* tvb, gint offset);
-static gint tvb_skip_wsp_return(tvbuff_t* tvb, gint offset);
+static gint megaco_tvb_skip_wsp(tvbuff_t* tvb, gint offset);
+static gint megaco_tvb_skip_wsp_return(tvbuff_t* tvb, gint offset);
/*
* The various functions that either dissect some
* subpart of MEGACO. These aren't really proto dissectors but they
* for the "MEGACO" string or a "!".This needs to be improved when supporting
* binary encodings. Bugfix add skipping of leading spaces.
*/
- tvb_offset = tvb_skip_wsp(tvb, tvb_offset);
+ tvb_offset = megaco_tvb_skip_wsp(tvb, tvb_offset);
line_start_offset = tvb_offset;
/* Quick fix for MEGACO not following the RFC, hopfully not breaking any thing
* Turned out to be TPKT in case of TCP, added some code to handle that.
if ( (tvb_current_offset=tvb_find_guint8(tvb, tvb_previous_offset, tokenlen, ' ')) != -1 ) {
/* SEP after mID might be spaces only */
tokenlen = tvb_current_offset-tvb_previous_offset;
- tvb_next_offset = tvb_skip_wsp(tvb, tvb_current_offset);
+ tvb_next_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset);
}
/* Att this point we should point to the "\n" ending the mId element
tvb_previous_offset, tokenlen,
"TransactionResponseAck" );
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_offset+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_offset+1);
tvb_current_offset = tvb_find_guint8(tvb, tvb_offset+1, tvb_len, '}');
- tvb_current_offset = tvb_skip_wsp_return(tvb, tvb_current_offset)-1; /* cut last RBRKT */
+ tvb_current_offset = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset)-1; /* cut last RBRKT */
len = tvb_current_offset - tvb_previous_offset;
if (check_col(pinfo->cinfo, COL_INFO) )
trx_type = GCP_TRX_PENDING;
tvb_offset = tvb_find_guint8(tvb, tvb_previous_offset, tvb_len, '=')+1;
- tvb_offset = tvb_skip_wsp(tvb, tvb_offset);
+ tvb_offset = megaco_tvb_skip_wsp(tvb, tvb_offset);
tvb_LBRKT = tvb_find_guint8(tvb, tvb_offset, tvb_len, '{');
tvb_current_offset = tvb_LBRKT;
ti = proto_tree_add_text(megaco_tree, tvb, tvb_previous_offset, tvb_current_offset-tvb_previous_offset,
"%s",tvb_format_text(tvb, tvb_previous_offset, tvb_current_offset-tvb_previous_offset+1));
message_body_tree = proto_item_add_subtree(ti, ett_megaco_message_body);
- tvb_current_offset = tvb_skip_wsp_return(tvb, tvb_current_offset-1);
+ tvb_current_offset = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset-1);
len = tvb_current_offset - tvb_offset;
if (tree)
my_proto_tree_add_string(message_body_tree, hf_megaco_transaction, tvb,
"Reply" );
tvb_offset = tvb_find_guint8(tvb, tvb_previous_offset, tvb_len, '=')+1;
- tvb_offset = tvb_skip_wsp(tvb, tvb_offset);
- tvb_current_offset = tvb_skip_wsp_return(tvb, tvb_LBRKT-1);
+ tvb_offset = megaco_tvb_skip_wsp(tvb, tvb_offset);
+ tvb_current_offset = megaco_tvb_skip_wsp_return(tvb, tvb_LBRKT-1);
len = tvb_current_offset - tvb_offset;
if (check_col(pinfo->cinfo, COL_INFO) )
tvb_offset, len, tvb_format_text(tvb,tvb_offset,len));
/* Find if we have a errorDescriptor or actionReplyList */
- tvb_offset = tvb_skip_wsp(tvb, tvb_LBRKT+1);
+ tvb_offset = megaco_tvb_skip_wsp(tvb, tvb_LBRKT+1);
tempchar = tvb_get_guint8(tvb,tvb_offset);
if ((tempchar == 'E')||(tempchar == 'e')){
dissect_megaco_errordescriptor(tvb, megaco_tree, tvb_len-1, tvb_offset);
tvb_previous_offset, tokenlen,
"Request" );
tvb_offset = tvb_find_guint8(tvb, tvb_offset, tvb_len, '=')+1;
- tvb_offset = tvb_skip_wsp(tvb, tvb_offset);
- tvb_current_offset = tvb_skip_wsp_return(tvb, tvb_current_offset-1);
+ tvb_offset = megaco_tvb_skip_wsp(tvb, tvb_offset);
+ tvb_current_offset = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset-1);
len = tvb_current_offset - tvb_offset;
if (check_col(pinfo->cinfo, COL_INFO) )
col_add_fstr(pinfo->cinfo, COL_INFO, "%s Request",
my_proto_tree_add_string(message_body_tree, hf_megaco_transid, tvb, tvb_offset,len,
tvb_format_text(tvb,tvb_offset,len));
/* Offset should be at first printarable char after { */
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_LBRKT+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_LBRKT+1);
break;
default :
tvb_previous_offset = tvb_find_guint8(tvb, tvb_current_offset,
tvb_len, '=')+1;
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_previous_offset);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_previous_offset);
if (tvb_current_offset >= tvb_next_offset) {
proto_tree_add_text(megaco_tree, tvb, 0, 0, "[ Parse error: Invalid offset ]");
return;
/* Find Commands */
/* If Transaction is is Request, Reply or Pending */
- tvb_command_start_offset = tvb_skip_wsp(tvb, tvb_current_offset +1);
+ tvb_command_start_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset +1);
tvb_command_end_offset = tvb_command_start_offset;
tvb_LBRKT = tvb_command_start_offset;
len = tvb_previous_offset - tvb_command_start_offset;
- tvb_previous_offset = tvb_skip_wsp_return(tvb, tvb_previous_offset -1);
+ tvb_previous_offset = megaco_tvb_skip_wsp_return(tvb, tvb_previous_offset -1);
tokenlen = tvb_previous_offset - tvb_command_start_offset;
else{
len = tvb_current_offset - tvb_command_start_offset;
- tvb_current_offset = tvb_skip_wsp_return(tvb, tvb_current_offset -1);
+ tvb_current_offset = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset -1);
tokenlen = tvb_current_offset - tvb_command_start_offset;
}
else{
len = tvb_current_offset - tvb_command_start_offset;
- tvb_current_offset = tvb_skip_wsp_return(tvb, tvb_current_offset -1);
+ tvb_current_offset = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset -1);
tokenlen = tvb_current_offset - tvb_command_start_offset;
}
tvb_offset = tvb_find_guint8(tvb, tvb_command_start_offset,
tvb_len, '=');
- tvb_offset = tvb_skip_wsp_return(tvb, tvb_offset -1);
+ tvb_offset = megaco_tvb_skip_wsp_return(tvb, tvb_offset -1);
tokenlen = tvb_offset - tvb_command_start_offset;
tempchar = tvb_get_guint8(tvb, tvb_command_start_offset);
tvb_offset = tvb_find_guint8(tvb, tvb_command_start_offset,
tvb_len, '=');
- tvb_offset = tvb_skip_wsp(tvb, tvb_offset+1);
+ tvb_offset = megaco_tvb_skip_wsp(tvb, tvb_offset+1);
tokenlen = tvb_next_offset - tvb_offset;
tempchar = tvb_get_guint8(tvb, tvb_offset);
}
RBRKT_counter = 0;
LBRKT_counter = 0;
- tvb_command_start_offset = tvb_skip_wsp(tvb, tvb_command_end_offset +1);
+ tvb_command_start_offset = megaco_tvb_skip_wsp(tvb, tvb_command_end_offset +1);
tvb_LBRKT = tvb_command_start_offset;
tvb_RBRKT = tvb_command_start_offset;
LBRKT_counter = 0;
- tvb_LBRKT = tvb_skip_wsp(tvb, tvb_descriptors_start_offset +1);
+ tvb_LBRKT = megaco_tvb_skip_wsp(tvb, tvb_descriptors_start_offset +1);
tvb_previous_offset = tvb_LBRKT;
tvb_RBRKT = tvb_descriptors_start_offset;
tvb_current_offset = tvb_RBRKT;
}
- tvb_RBRKT = tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
+ tvb_RBRKT = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
}
/* Descriptor includes Parameters */
proto_tree_add_text(megaco_tree_command_line, tvb, tvb_previous_offset, tokenlen,
"%s", tvb_format_text(tvb, tvb_previous_offset, tokenlen));
- tvb_previous_offset = tvb_skip_wsp(tvb, temp_offset +1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, temp_offset +1);
dissect_megaco_mediadescriptor(tvb, megaco_tree_command_line, pinfo, tvb_RBRKT, tvb_previous_offset);
break;
case MEGACO_SIGNALS_TOKEN:
if (tvb_current_offset == -1 ){
tvb_current_offset = tvb_descriptors_end_offset;
}
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_current_offset+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset+1);
tvb_LBRKT = tvb_previous_offset;
tvb_RBRKT = tvb_previous_offset;
*/
while ( tvb_previous_offset < tvb_last_RBRKT){
/* Start of token */
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_previous_offset);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_previous_offset);
/* Find token length */
for (tvb_next_offset=tvb_current_offset; tvb_next_offset < tvb_last_RBRKT; tvb_next_offset++){
switch ( mediaParm ){
case MEGACO_LOCAL_TOKEN:
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_LBRKT+1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_LBRKT+1);
dissect_megaco_Localdescriptor(tvb,megaco_tree_command_line , pinfo,
tvb_RBRKT, tvb_current_offset);
tvb_current_offset = tvb_RBRKT;
break;
case MEGACO_REMOTE_TOKEN:
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_LBRKT+1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_LBRKT+1);
dissect_megaco_Localdescriptor(tvb,megaco_tree_command_line , pinfo,
tvb_RBRKT, tvb_current_offset);
tvb_current_offset = tvb_RBRKT;
break;
case MEGACO_LOCAL_CONTROL_TOKEN:
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_LBRKT+1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_LBRKT+1);
dissect_megaco_LocalControldescriptor(tvb,megaco_tree_command_line, pinfo ,
tvb_RBRKT, tvb_current_offset);
tvb_current_offset = tvb_RBRKT;
megaco_mediadescriptor_tree = proto_item_add_subtree(megaco_mediadescriptor_ti, ett_megaco_mediadescriptor);
equal_offset = tvb_find_guint8(tvb, tvb_previous_offset, tvb_last_RBRKT, '=');
- tvb_current_offset = tvb_skip_wsp(tvb, equal_offset+1);
- tvb_offset = tvb_skip_wsp_return(tvb, tvb_LBRKT-1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, equal_offset+1);
+ tvb_offset = megaco_tvb_skip_wsp_return(tvb, tvb_LBRKT-1);
tokenlen = tvb_offset - tvb_current_offset;
proto_tree_add_string(megaco_mediadescriptor_tree, hf_megaco_streamid, tvb,
tvb_previous_offset = tvb_LBRKT+1;
continue;
case MEGACO_TERMINATION_STATE_DESC:
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_LBRKT+1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_LBRKT+1);
dissect_megaco_TerminationStatedescriptor(tvb,megaco_tree_command_line ,
tvb_RBRKT, tvb_current_offset);
tvb_current_offset = tvb_RBRKT;
if ( tvb_current_offset < tvb_RBRKT && tvb_current_offset != -1 ){
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_current_offset +1);
- tvb_help_offset = tvb_skip_wsp_return(tvb, tvb_next_offset-1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset +1);
+ tvb_help_offset = megaco_tvb_skip_wsp_return(tvb, tvb_next_offset-1);
tokenlen = tvb_help_offset - tvb_current_offset;
tvb_RBRKT = tvb_next_offset+1;
tvb_LBRKT = tvb_next_offset+1;
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_next_offset+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_next_offset+1);
do {
if ( tvb_LBRKT > tvb_current_offset || tvb_LBRKT == -1 ){
- tvb_RBRKT = tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
+ tvb_RBRKT = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
}
/* Descriptor includes Parameters */
requested_event_start_offset = tvb_help_offset;
requested_event_end_offset = tvb_RBRKT;
- tvb_help_offset = tvb_skip_wsp_return(tvb, tvb_help_offset-1);
+ tvb_help_offset = megaco_tvb_skip_wsp_return(tvb, tvb_help_offset-1);
tokenlen = tvb_help_offset - tvb_previous_offset;
}
/* no parameters */
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
- tvb_help_offset = tvb_skip_wsp(tvb, requested_event_start_offset +1);
+ tvb_help_offset = megaco_tvb_skip_wsp(tvb, requested_event_start_offset +1);
tempchar = tvb_get_guint8(tvb, tvb_help_offset);
- requested_event_start_offset = tvb_skip_wsp(tvb, requested_event_start_offset +1);
- requested_event_end_offset = tvb_skip_wsp_return(tvb, requested_event_end_offset-1);
+ requested_event_start_offset = megaco_tvb_skip_wsp(tvb, requested_event_start_offset +1);
+ requested_event_end_offset = megaco_tvb_skip_wsp_return(tvb, requested_event_end_offset-1);
if ( tempchar == 'D' || tempchar == 'd'){
dissect_megaco_digitmapdescriptor(tvb, megaco_requestedevent_tree, requested_event_end_offset, requested_event_start_offset);
tvb_current_offset = tvb_events_end_offset;
}
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_current_offset+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset+1);
tvb_LBRKT = tvb_previous_offset;
tvb_RBRKT = tvb_previous_offset;
else
tokenlen = 7; /* token must be verbose text (Signals) */
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_previous_offset+tokenlen);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_previous_offset+tokenlen);
if(tvb_get_guint8(tvb, tvb_current_offset)!='{') { /* {} has been omitted */
*/
tvb_current_offset = tvb_LBRKT;
- tvb_next_offset = tvb_skip_wsp(tvb, tvb_current_offset+1);
+ tvb_next_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset+1);
if (check_col(pinfo->cinfo, COL_INFO) )
col_append_fstr(pinfo->cinfo, COL_INFO, " (Signal:%s)",tvb_format_text(tvb, tvb_current_offset,tokenlen-tvb_current_offset+tvb_previous_offset));
if ( tvb_LBRKT > tvb_current_offset || tvb_LBRKT == -1 ){
- tvb_RBRKT = tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
+ tvb_RBRKT = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
}
/* Descriptor includes Parameters */
requested_signal_start_offset = tvb_help_offset;
requested_signal_end_offset = tvb_RBRKT;
- tvb_help_offset = tvb_skip_wsp_return(tvb, tvb_help_offset-1);
+ tvb_help_offset = megaco_tvb_skip_wsp_return(tvb, tvb_help_offset-1);
pkg_tokenlen = tvb_help_offset - tvb_previous_offset;
tokenlen = tvb_LBRKT+1 - tvb_previous_offset;
}
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
gchar *msg;
- requested_signal_start_offset = tvb_skip_wsp(tvb, requested_signal_start_offset +1);
- requested_signal_end_offset = tvb_skip_wsp_return(tvb, requested_signal_end_offset-1);
+ requested_signal_start_offset = megaco_tvb_skip_wsp(tvb, requested_signal_start_offset +1);
+ requested_signal_end_offset = megaco_tvb_skip_wsp_return(tvb, requested_signal_end_offset-1);
tokenlen = requested_signal_end_offset - requested_signal_start_offset;
tvb_current_offset = tvb_signals_end_offset;
}
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_current_offset+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset+1);
tvb_LBRKT = tvb_previous_offset;
tvb_RBRKT = tvb_previous_offset;
tvb_previous_offset = tvb_find_guint8(tvb, tvb_previous_offset, tvb_RBRKT, '{');
- if ( tvb_skip_wsp(tvb, tvb_previous_offset +1) != tvb_RBRKT ){
+ if ( megaco_tvb_skip_wsp(tvb, tvb_previous_offset +1) != tvb_RBRKT ){
dissect_megaco_descriptors(tvb, megaco_tree, pinfo, tvb_previous_offset,tvb_RBRKT);
}else{
proto_tree_add_text(megaco_tree, tvb, tvb_RBRKT, 1,
/* Start dissecting serviceChangeParm */
tvb_previous_offset = tvb_LBRKT + 1;
while (more_params){
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_previous_offset);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_previous_offset);
/* Find token length */
for (tvb_offset=tvb_previous_offset; tvb_offset < tvb_RBRKT; tvb_offset++){
if (!isalpha(tvb_get_guint8(tvb, tvb_offset ))){
tvb_offset = tvb_find_guint8(tvb, tvb_offset, tvb_RBRKT, ',');
if ((tvb_offset == -1)||(tvb_offset >=tvb_RBRKT)){
more_params = FALSE;
- tvb_offset = tvb_skip_wsp_return(tvb, tvb_RBRKT-1);
+ tvb_offset = megaco_tvb_skip_wsp_return(tvb, tvb_RBRKT-1);
}
tokenlen = tvb_offset - tvb_previous_offset;
if (more_params == TRUE )
if ( tvb_current_offset < tvb_RBRKT && tvb_current_offset != -1 ){
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_current_offset +1);
- tvb_help_offset = tvb_skip_wsp_return(tvb, tvb_next_offset-1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset +1);
+ tvb_help_offset = megaco_tvb_skip_wsp_return(tvb, tvb_next_offset-1);
tokenlen = tvb_help_offset - tvb_current_offset;
tvb_RBRKT = tvb_next_offset+1;
tvb_LBRKT = tvb_next_offset+1;
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_next_offset+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_next_offset+1);
do {
if ( tvb_LBRKT > tvb_current_offset || tvb_LBRKT == -1 ){
- tvb_RBRKT = tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
+ tvb_RBRKT = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
}
/* Descriptor includes Parameters */
requested_event_start_offset = tvb_help_offset;
requested_event_end_offset = tvb_RBRKT;
- tvb_help_offset = tvb_skip_wsp_return(tvb, tvb_help_offset-1);
+ tvb_help_offset = megaco_tvb_skip_wsp_return(tvb, tvb_help_offset-1);
pkg_tokenlen = tvb_help_offset - tvb_previous_offset;
tokenlen = tvb_LBRKT+1 - tvb_previous_offset;
}
if ( tvb_help_offset < tvb_RBRKT && tvb_help_offset != -1 ){
- tvb_help_offset = tvb_skip_wsp(tvb, requested_event_start_offset +1);
+ tvb_help_offset = megaco_tvb_skip_wsp(tvb, requested_event_start_offset +1);
tempchar = tvb_get_guint8(tvb, tvb_help_offset);
if ( (tempchar >= 'a')&& (tempchar <= 'z'))
tempchar = tempchar - 0x20;
- requested_event_start_offset = tvb_skip_wsp(tvb, requested_event_start_offset +1)-1;
- requested_event_end_offset = tvb_skip_wsp_return(tvb, requested_event_end_offset-1);
+ requested_event_start_offset = megaco_tvb_skip_wsp(tvb, requested_event_start_offset +1)-1;
+ requested_event_end_offset = megaco_tvb_skip_wsp_return(tvb, requested_event_end_offset-1);
tvb_help_offset = requested_event_start_offset;
do {
gchar *msg;
- param_start_offset = tvb_skip_wsp(tvb, tvb_help_offset+1);
+ param_start_offset = megaco_tvb_skip_wsp(tvb, tvb_help_offset+1);
tvb_help_offset = tvb_find_guint8(tvb, tvb_help_offset+1,requested_event_end_offset, ',');
tvb_help_offset = requested_event_end_offset;
}
- param_end_offset = tvb_skip_wsp(tvb, tvb_help_offset-1);
+ param_end_offset = megaco_tvb_skip_wsp(tvb, tvb_help_offset-1);
tokenlen = param_end_offset - param_start_offset+1;
msg=tvb_format_text(tvb,param_start_offset, tokenlen);
return;
}
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_current_offset+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset+1);
tvb_LBRKT = tvb_previous_offset;
tvb_RBRKT = tvb_previous_offset;
if ( tvb_current_offset < tvb_RBRKT && tvb_current_offset != -1 ){
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_current_offset +1);
- tvb_help_offset = tvb_skip_wsp_return(tvb, tvb_next_offset-1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset +1);
+ tvb_help_offset = megaco_tvb_skip_wsp_return(tvb, tvb_next_offset-1);
tokenlen = tvb_help_offset - tvb_current_offset;
tvb_RBRKT = tvb_next_offset+1;
tvb_LBRKT = tvb_next_offset+1;
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_next_offset+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_next_offset+1);
do {
if ( tvb_LBRKT > tvb_current_offset || tvb_LBRKT == -1 ){
- tvb_RBRKT = tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
+ tvb_RBRKT = megaco_tvb_skip_wsp_return(tvb, tvb_current_offset-1)-1;
}
/* Descriptor includes Parameters */
tvb_current_offset = tvb_packages_end_offset;
}
- tvb_previous_offset = tvb_skip_wsp(tvb, tvb_current_offset+1);
+ tvb_previous_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset+1);
tvb_LBRKT = tvb_previous_offset;
tvb_RBRKT = tvb_previous_offset;
tvb_len = 0;
tvb_current_offset = tvb_find_guint8(tvb, tvb_previous_offset , tvb_RBRKT, '=');
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_current_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_current_offset +1);
tvb_get_nstringz0(tvb,tvb_current_offset,4,error);
error_code = atoi(error);
proto_tree_add_string_hidden(megaco_tree_command_line, hf_megaco_error_descriptor, tvb,
while ( tvb_offset < tvb_next_offset && tvb_offset != -1 ){
tempchar = tvb_get_guint8(tvb, tvb_current_offset);
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
if ( (tempchar >= 'a')&& (tempchar <= 'z'))
tempchar = tempchar - 0x20;
}
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
tvb_offset = tvb_find_guint8(tvb, tvb_current_offset , tvb_next_offset, '=');
}
THROW(ReportedBoundsError);
/* Start search after '=' in case there is no SP*/
tvb_offset++;
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset);
/* find if there are more parameters or not */
tvb_offset = tvb_find_guint8(tvb, tvb_current_offset , tvb_offset, ',');
tvb_offset = tvb_next_offset;
}
- tokenlen = tvb_skip_wsp_return(tvb,tvb_offset-1) - tvb_current_offset;
+ tokenlen = megaco_tvb_skip_wsp_return(tvb,tvb_offset-1) - tvb_current_offset;
/* Debug Code
proto_tree_add_text(megaco_LocalControl_tree, tvb, tvb_current_offset, tokenlen,
"%s", tvb_format_text(tvb,tvb_current_offset,tokenlen));
tokenlen));
if (check_col(pinfo->cinfo, COL_INFO) )
col_append_fstr(pinfo->cinfo, COL_INFO, " (Mode:%s)",tvb_format_text(tvb, tvb_current_offset,tokenlen));
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
case MEGACO_RESERVEDVALUETOKEN: /* ReservedValue */
tvb_format_text(tvb, tvb_current_offset,
tokenlen));
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
case MEGACO_RESERVEDGROUPTOKEN: /* ReservedGroup */
proto_tree_add_string(megaco_mediadescriptor_tree, hf_megaco_reserve_group, tvb,
tvb_current_offset, tokenlen,
tvb_format_text(tvb, tvb_current_offset,
tokenlen));
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
case MEGACO_H324_H223CAPR: /* h324/h223capr */
tvb_format_text(tvb, tvb_current_offset,
tokenlen));
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
tokenlen = tvb_offset - tvb_help_offset;
msg=tvb_format_text(tvb,tvb_help_offset, tokenlen);
dissect_megaco_h324_h223caprn(tvb, pinfo, megaco_mediadescriptor_tree, tvb_help_offset, tokenlen, msg);
tvb_format_text(tvb, tvb_current_offset,
tokenlen));
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
tokenlen = tvb_offset - tvb_help_offset;
msg=tvb_format_text(tvb,tvb_help_offset, tokenlen);
tvb_format_text(tvb, tvb_current_offset,
tokenlen));
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
tokenlen = tvb_offset - tvb_help_offset;
msg=tvb_format_text(tvb,tvb_help_offset, tokenlen);
tvb_get_nstringz0(tvb,tvb_current_offset,3,code_str);
proto_item_append_text(item,"[ %s ]", val_to_str(strtoul(code_str,NULL,16), dscp_vals,"Unknown (%u)"));
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
case MEGACO_GM_SAF:
"%s", tvb_format_text(tvb,tvb_help_offset,
tokenlen));
proto_item_append_text(item," [Remote Source Address Filtering]");
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
case MEGACO_GM_SAM:
tokenlen = tvb_offset - tvb_help_offset;
"%s", tvb_format_text(tvb,tvb_help_offset,
tokenlen));
proto_item_append_text(item," [Remote Source Address Mask]");
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
case MEGACO_GM_SPF:
tokenlen = tvb_offset - tvb_help_offset;
"%s", tvb_format_text(tvb,tvb_help_offset,
tokenlen));
proto_item_append_text(item," [Remote Source Port Filtering]");
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
case MEGACO_GM_SPR:
tokenlen = tvb_offset - tvb_help_offset;
"%s", tvb_format_text(tvb,tvb_help_offset,
tokenlen));
proto_item_append_text(item," [Remote Source Port Range]");
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
case MEGACO_GM_ESAS:
tokenlen = tvb_offset - tvb_help_offset;
"%s", tvb_format_text(tvb,tvb_help_offset,
tokenlen));
proto_item_append_text(item," [Explicit Source Address Setting]");
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
default:
tokenlen = tvb_offset - tvb_help_offset;
proto_tree_add_text(megaco_mediadescriptor_tree, tvb, tvb_help_offset, tokenlen,
"%s", tvb_format_text(tvb,tvb_help_offset,
tokenlen));
- tvb_current_offset = tvb_skip_wsp(tvb, tvb_offset +1);
+ tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1);
break;
}
/*
-* tvb_skip_wsp - Returns the position in tvb of the first non-whitespace
+* megaco_tvb_skip_wsp - Returns the position in tvb of the first non-whitespace
* character following offset or offset + maxlength -1 whichever
* is smaller.
*
*
* Returns: The position in tvb of the first non-whitespace
*/
-static gint tvb_skip_wsp(tvbuff_t* tvb, gint offset ){
+static gint megaco_tvb_skip_wsp(tvbuff_t* tvb, gint offset ){
gint counter = offset;
gint end,tvb_len;
guint8 tempchar;
tempchar == '\t' || tempchar == '\n' || tempchar == '\r'); counter++);
return (counter);
}
-static gint tvb_skip_wsp_return(tvbuff_t* tvb, gint offset){
+static gint megaco_tvb_skip_wsp_return(tvbuff_t* tvb, gint offset){
gint counter = offset;
gint end;
guint8 tempchar;