summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rsvp.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
commita86c5f7cae7ec9a3398300555a0b644689d946a1 (patch)
tree39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-rsvp.h
parentReleasing progress-linux version 4.2.6-1~progress7.99u1. (diff)
downloadwireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz
wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-rsvp.h')
-rw-r--r--epan/dissectors/packet-rsvp.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-rsvp.h b/epan/dissectors/packet-rsvp.h
index 8969948e..26228dd1 100644
--- a/epan/dissectors/packet-rsvp.h
+++ b/epan/dissectors/packet-rsvp.h
@@ -14,16 +14,16 @@
/* RSVP conversations support */
typedef struct rsvp_conversation_info
{
- guint8 session_type;
+ uint8_t session_type;
address source;
address destination;
- guint16 udp_source_port;
- guint16 udp_dest_port;
- guint8 protocol;
- guint32 ext_tunnel_id;
- guint64 ext_tunnel_id_ipv6_pre;
- guint64 ext_tunnel_id_ipv6_post;
- guint8 dscp;
+ uint16_t udp_source_port;
+ uint16_t udp_dest_port;
+ uint8_t protocol;
+ uint32_t ext_tunnel_id;
+ uint64_t ext_tunnel_id_ipv6_pre;
+ uint64_t ext_tunnel_id_ipv6_post;
+ uint8_t dscp;
} rsvp_conversation_info;
extern const range_string gmpls_switching_type_rvals[];