summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-actrace.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:33 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:33 +0000
commit9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch)
tree2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/packet-actrace.h
parentAdding debian version 4.2.6-1. (diff)
downloadwireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz
wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-actrace.h')
-rw-r--r--epan/dissectors/packet-actrace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-actrace.h b/epan/dissectors/packet-actrace.h
index 118fa766..8830a329 100644
--- a/epan/dissectors/packet-actrace.h
+++ b/epan/dissectors/packet-actrace.h
@@ -16,7 +16,7 @@ typedef struct _actrace_info_t
int type; /* ACTRACE_CAS=1 ACTRACE_ISDN=2 */
int direction; /* direction BLADE_TO_PSTN=0 PSTN_TO_BLADE=1 */
int trunk;
- gint32 cas_bchannel;
- const gchar *cas_frame_label;
+ int32_t cas_bchannel;
+ const char *cas_frame_label;
} actrace_info_t;