parent
65bcd0d67f
commit
d0258115a6
|
@ -7,7 +7,7 @@
|
|||
*
|
||||
* For now all this is decoded just as "data".
|
||||
* It might be enough to just check
|
||||
* If the first byte of payload is the 0x7e delimeter and if so just
|
||||
* If the first byte of payload is the 0x7e delimiter and if so just
|
||||
* de escape it into a ep_alloc() buffer and then pass it to the ppp
|
||||
* dissector.
|
||||
*/
|
||||
|
@ -356,9 +356,9 @@ static void stream_buf_append(rfcomm_packet_state *rps,
|
|||
|
||||
if (byte == 0x7e) {
|
||||
if (ds->current == 0)
|
||||
continue; /* was start delimeter */
|
||||
continue; /* was start delimiter */
|
||||
|
||||
/* end delimeter*/
|
||||
/* end delimiter*/
|
||||
|
||||
add_ppp_frame(rps, ds->stream_buf, ds->current);
|
||||
|
||||
|
@ -727,7 +727,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
* ppp over rfcomm
|
||||
*
|
||||
* it might be sufficient to just check if the first byte is the 0x7e
|
||||
* delimeter and if so just unescape it all into an ep_alloc() buffer
|
||||
* delimiter and if so just unescape it all into an ep_alloc() buffer
|
||||
* and pass it to ppp.
|
||||
*/
|
||||
if(dlci&&frame_len){
|
||||
|
|
|
@ -2489,7 +2489,7 @@ get_string(tvbuff_t* tvb, guint offset, guint str_length, char *dest_buf)
|
|||
dest_buf[i+1] = '\0';
|
||||
return;
|
||||
}
|
||||
if (i >= 1023) { /* Don't process beyond the size of our varible */
|
||||
if (i >= 1023) { /* Don't process beyond the size of our variable */
|
||||
break; /* If string is too long just return the first 1K. */
|
||||
}
|
||||
}
|
||||
|
@ -3582,12 +3582,12 @@ print_es_type(proto_tree *estree, tvbuff_t *tvb, nds_val *values, guint32 vtype,
|
|||
ioffset = ioffset + 4;
|
||||
break;
|
||||
case 1: /* Unicode String */
|
||||
value1 = tvb_get_letohl(tvb, ioffset); /* Delimeter Set */
|
||||
value1 = tvb_get_letohl(tvb, ioffset); /* Delimiter Set */
|
||||
ioffset = ioffset + 4;
|
||||
get_string(tvb, ioffset, value1, mval_buf.buffer);
|
||||
values->vstring = mval_buf.buffer;
|
||||
proto_tree_add_string_format(estree, hf_mv_string, tvb, ioffset,
|
||||
value1, values->vstring, "Delimeter ->%s", values->vstring);
|
||||
value1, values->vstring, "Delimiter ->%s", values->vstring);
|
||||
ioffset=ioffset + value1;
|
||||
ioffset += align_4(tvb, ioffset);
|
||||
value2 = tvb_get_letohl(tvb, ioffset);
|
||||
|
@ -3620,12 +3620,12 @@ print_es_type(proto_tree *estree, tvbuff_t *tvb, nds_val *values, guint32 vtype,
|
|||
ioffset = ioffset + 4;
|
||||
break;
|
||||
case 1: /* Unicode String */
|
||||
value2 = tvb_get_letohl(tvb, ioffset); /* Delimeter Set */
|
||||
value2 = tvb_get_letohl(tvb, ioffset); /* Delimiter Set */
|
||||
ioffset = ioffset + 4;
|
||||
get_string(tvb, ioffset, value2, mval_buf.buffer);
|
||||
values->vstring = mval_buf.buffer;
|
||||
proto_tree_add_string_format(nestree, hf_mv_string, tvb, ioffset,
|
||||
value2, values->vstring, "Delimeter ->%s", values->vstring);
|
||||
value2, values->vstring, "Delimiter ->%s", values->vstring);
|
||||
ioffset=ioffset + value2;
|
||||
ioffset += align_4(tvb, ioffset);
|
||||
value3 = tvb_get_letohl(tvb, ioffset);
|
||||
|
@ -3663,7 +3663,7 @@ print_es_type(proto_tree *estree, tvbuff_t *tvb, nds_val *values, guint32 vtype,
|
|||
2, event_num);
|
||||
ioffset = ioffset + 2;
|
||||
}
|
||||
value4 = tvb_get_letohl(tvb, ioffset); /* Delimeter Set */
|
||||
value4 = tvb_get_letohl(tvb, ioffset); /* Delimiter Set */
|
||||
ioffset = ioffset + 4;
|
||||
get_string(tvb, ioffset, value4, mval_buf.buffer);
|
||||
values->vstring = mval_buf.buffer;
|
||||
|
@ -3709,12 +3709,12 @@ print_es_type(proto_tree *estree, tvbuff_t *tvb, nds_val *values, guint32 vtype,
|
|||
ioffset = ioffset + 4;
|
||||
break;
|
||||
case 1: /* Unicode String */
|
||||
value2 = tvb_get_letohl(tvb, ioffset); /* Delimeter Set */
|
||||
value2 = tvb_get_letohl(tvb, ioffset); /* Delimiter Set */
|
||||
ioffset = ioffset + 4;
|
||||
get_string(tvb, ioffset, value2, mval_buf.buffer);
|
||||
values->vstring = mval_buf.buffer;
|
||||
proto_tree_add_string_format(estree, hf_mv_string, tvb, ioffset,
|
||||
value2, values->vstring, "Delimeter ->%s", values->vstring);
|
||||
value2, values->vstring, "Delimiter ->%s", values->vstring);
|
||||
ioffset=ioffset + value2;
|
||||
ioffset += align_4(tvb, ioffset);
|
||||
value3 = tvb_get_letohl(tvb, ioffset);
|
||||
|
@ -3752,7 +3752,7 @@ print_es_type(proto_tree *estree, tvbuff_t *tvb, nds_val *values, guint32 vtype,
|
|||
2, event_num);
|
||||
ioffset = ioffset + 2;
|
||||
}
|
||||
value4 = tvb_get_letohl(tvb, ioffset); /* Delimeter Set */
|
||||
value4 = tvb_get_letohl(tvb, ioffset); /* Delimiter Set */
|
||||
ioffset = ioffset + 4;
|
||||
get_string(tvb, ioffset, value4, mval_buf.buffer);
|
||||
values->vstring = mval_buf.buffer;
|
||||
|
@ -3860,12 +3860,12 @@ print_es_type(proto_tree *estree, tvbuff_t *tvb, nds_val *values, guint32 vtype,
|
|||
ioffset = ioffset + 4;
|
||||
break;
|
||||
case 1: /* Unicode String */
|
||||
value2 = tvb_get_letohl(tvb, ioffset); /* Delimeter Set */
|
||||
value2 = tvb_get_letohl(tvb, ioffset); /* Delimiter Set */
|
||||
ioffset = ioffset + 4;
|
||||
get_string(tvb, ioffset, value2, mval_buf.buffer);
|
||||
values->vstring = mval_buf.buffer;
|
||||
proto_tree_add_string_format(estree, hf_mv_string, tvb, ioffset,
|
||||
value2, values->vstring, "Delimeter ->%s", values->vstring);
|
||||
value2, values->vstring, "Delimiter ->%s", values->vstring);
|
||||
ioffset=ioffset + value2;
|
||||
ioffset += align_4(tvb, ioffset);
|
||||
value3 = tvb_get_letohl(tvb, ioffset);
|
||||
|
@ -3903,7 +3903,7 @@ print_es_type(proto_tree *estree, tvbuff_t *tvb, nds_val *values, guint32 vtype,
|
|||
2, event_num);
|
||||
ioffset = ioffset + 2;
|
||||
}
|
||||
value4 = tvb_get_letohl(tvb, ioffset); /* Delimeter Set */
|
||||
value4 = tvb_get_letohl(tvb, ioffset); /* Delimiter Set */
|
||||
ioffset = ioffset + 4;
|
||||
get_string(tvb, ioffset, value4, mval_buf.buffer);
|
||||
values->vstring = mval_buf.buffer;
|
||||
|
@ -3956,7 +3956,7 @@ print_es_type(proto_tree *estree, tvbuff_t *tvb, nds_val *values, guint32 vtype,
|
|||
2, event_num);
|
||||
ioffset = ioffset + 2;
|
||||
}
|
||||
value3 = tvb_get_letohl(tvb, ioffset); /* Delimeter Set */
|
||||
value3 = tvb_get_letohl(tvb, ioffset); /* Delimiter Set */
|
||||
ioffset = ioffset + 4;
|
||||
get_string(tvb, ioffset, value3, mval_buf.buffer);
|
||||
values->vstring = mval_buf.buffer;
|
||||
|
|
Loading…
Reference in New Issue