Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
wireshark
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
Gregor Jasny
wireshark
Commits
514b38fb
Commit
514b38fb
authored
Sep 21, 2013
by
Pascal Quantin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make it more obvious that the function is using wmem memory
svn path=/trunk/; revision=52162
parent
c90d29c6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
epan/dissectors/packet-e212.c
epan/dissectors/packet-e212.c
+2
-2
epan/dissectors/packet-e212.h
epan/dissectors/packet-e212.h
+1
-1
epan/dissectors/packet-gtpv2.c
epan/dissectors/packet-gtpv2.c
+3
-3
epan/dissectors/packet-mip6.c
epan/dissectors/packet-mip6.c
+1
-1
No files found.
epan/dissectors/packet-e212.c
View file @
514b38fb
...
...
@@ -2503,7 +2503,7 @@ static expert_field ei_E212_mnc_non_decimal = EI_INIT;
* Return MCC MNC in a packet scope allocated string that can be used in labels.
*/
gchar
*
dissect_e212_mcc_mnc_packet_str
(
tvbuff_t
*
tvb
,
packet_info
*
pinfo
,
proto_tree
*
tree
,
int
offset
,
gboolean
little_endian
)
dissect_e212_mcc_mnc_
wmem_
packet_str
(
tvbuff_t
*
tvb
,
packet_info
*
pinfo
,
proto_tree
*
tree
,
int
offset
,
gboolean
little_endian
)
{
int
start_offset
,
mcc_mnc
;
...
...
@@ -2581,7 +2581,7 @@ dissect_e212_mcc_mnc_packet_str(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
int
dissect_e212_mcc_mnc
(
tvbuff_t
*
tvb
,
packet_info
*
pinfo
,
proto_tree
*
tree
,
int
offset
,
gboolean
little_endian
)
{
dissect_e212_mcc_mnc_packet_str
(
tvb
,
pinfo
,
tree
,
offset
,
little_endian
);
dissect_e212_mcc_mnc_
wmem_
packet_str
(
tvb
,
pinfo
,
tree
,
offset
,
little_endian
);
return
offset
+
3
;
}
...
...
epan/dissectors/packet-e212.h
View file @
514b38fb
...
...
@@ -31,7 +31,7 @@
extern
value_string_ext
E212_codes_ext
;
gchar
*
dissect_e212_mcc_mnc_packet_str
(
tvbuff_t
*
tvb
,
packet_info
*
pinfo
,
proto_tree
*
tree
,
int
offset
,
gboolean
little_endian
);
gchar
*
dissect_e212_mcc_mnc_
wmem_
packet_str
(
tvbuff_t
*
tvb
,
packet_info
*
pinfo
,
proto_tree
*
tree
,
int
offset
,
gboolean
little_endian
);
WS_DLL_PUBLIC
int
dissect_e212_mcc_mnc
(
tvbuff_t
*
tvb
,
packet_info
*
pinfo
,
proto_tree
*
tree
,
int
offset
,
gboolean
little_endian
);
WS_DLL_PUBLIC
...
...
epan/dissectors/packet-gtpv2.c
View file @
514b38fb
...
...
@@ -1794,7 +1794,7 @@ dissect_gtpv2_serv_net(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, prot
{
gchar
*
mcc_mnc_str
;
mcc_mnc_str
=
dissect_e212_mcc_mnc_packet_str
(
tvb
,
pinfo
,
tree
,
0
,
TRUE
);
mcc_mnc_str
=
dissect_e212_mcc_mnc_
wmem_
packet_str
(
tvb
,
pinfo
,
tree
,
0
,
TRUE
);
proto_item_append_text
(
item
,
"%s"
,
mcc_mnc_str
);
}
...
...
@@ -3715,7 +3715,7 @@ dissect_gtpv2_trace_reference(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
guint32
trace_id
;
gchar
*
mcc_mnc_str
;
mcc_mnc_str
=
dissect_e212_mcc_mnc_packet_str
(
tvb
,
pinfo
,
tree
,
0
,
TRUE
);
mcc_mnc_str
=
dissect_e212_mcc_mnc_
wmem_
packet_str
(
tvb
,
pinfo
,
tree
,
0
,
TRUE
);
offset
+=
3
;
trace_id
=
tvb_get_ntohs
(
tvb
,
offset
);
...
...
@@ -3978,7 +3978,7 @@ dissect_gtpv2_sel_plmn_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, p
{
gchar
*
mcc_mnc_str
;
mcc_mnc_str
=
dissect_e212_mcc_mnc_packet_str
(
tvb
,
pinfo
,
tree
,
0
,
FALSE
);
mcc_mnc_str
=
dissect_e212_mcc_mnc_
wmem_
packet_str
(
tvb
,
pinfo
,
tree
,
0
,
FALSE
);
proto_item_append_text
(
item
,
"%s"
,
mcc_mnc_str
);
}
...
...
epan/dissectors/packet-mip6.c
View file @
514b38fb
...
...
@@ -1806,7 +1806,7 @@ dissect_mip6_opt_vsm_3gpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
break
;
/* 13, Serving Network */
case
13
:
mcc_mnc_str
=
dissect_e212_mcc_mnc_packet_str
(
tvb
,
pinfo
,
tree
,
offset
,
TRUE
);
mcc_mnc_str
=
dissect_e212_mcc_mnc_
wmem_
packet_str
(
tvb
,
pinfo
,
tree
,
offset
,
TRUE
);
proto_item_append_text
(
hdr_item
,
" %s"
,
mcc_mnc_str
);
break
;
/* 14, APN Restriction */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment