summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-proxy.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-proxy.c')
-rw-r--r--epan/dissectors/packet-proxy.c170
1 files changed, 85 insertions, 85 deletions
diff --git a/epan/dissectors/packet-proxy.c b/epan/dissectors/packet-proxy.c
index 2e41ff54..86502b6d 100644
--- a/epan/dissectors/packet-proxy.c
+++ b/epan/dissectors/packet-proxy.c
@@ -35,60 +35,60 @@
void proto_reg_handoff_proxy(void);
void proto_register_proxy(void);
-static int proto_proxy = -1;
+static int proto_proxy;
-static int hf_proxy_version = -1;
+static int hf_proxy_version;
-static int hf_proxy_src_ipv4 = -1;
-static int hf_proxy_dst_ipv4 = -1;
-static int hf_proxy_src_ipv6 = -1;
-static int hf_proxy_dst_ipv6 = -1;
-static int hf_proxy_srcport = -1;
-static int hf_proxy_dstport = -1;
+static int hf_proxy_src_ipv4;
+static int hf_proxy_dst_ipv4;
+static int hf_proxy_src_ipv6;
+static int hf_proxy_dst_ipv6;
+static int hf_proxy_srcport;
+static int hf_proxy_dstport;
/* V1 */
-static int hf_proxy1_magic = -1;
-static int hf_proxy1_proto = -1;
-static int hf_proxy1_unknown = -1;
+static int hf_proxy1_magic;
+static int hf_proxy1_proto;
+static int hf_proxy1_unknown;
/* V2 */
-static int hf_proxy2_magic = -1;
-static int hf_proxy2_ver = -1;
-static int hf_proxy2_cmd = -1;
-static int hf_proxy2_addr_family = -1;
-static int hf_proxy2_protocol = -1;
-static int hf_proxy2_addr_family_protocol = -1;
-static int hf_proxy2_len = -1;
-static int hf_proxy2_src_unix = -1;
-static int hf_proxy2_dst_unix = -1;
-
-static int hf_proxy2_unknown = -1;
-
-static int hf_proxy2_tlv = -1;
-static int hf_proxy2_tlv_type = -1;
-static int hf_proxy2_tlv_length = -1;
-static int hf_proxy2_tlv_value = -1;
-static int hf_proxy2_tlv_ssl_client = -1;
-static int hf_proxy2_tlv_ssl_verify = -1;
-static int hf_proxy2_tlv_ssl_version = -1;
-static int hf_proxy2_tlv_ssl_cn = -1;
-static int hf_proxy2_tlv_ssl_cipher = -1;
-static int hf_proxy2_tlv_ssl_sig_alg = -1;
-static int hf_proxy2_tlv_ssl_key_alg = -1;
-
-static expert_field ei_proxy_header_length_too_small = EI_INIT;
-static expert_field ei_proxy_bad_format = EI_INIT;
-
-
-static gint ett_proxy1 = -1;
-static gint ett_proxy2 = -1;
-static gint ett_proxy2_fampro = -1;
-static gint ett_proxy2_tlv = -1;
+static int hf_proxy2_magic;
+static int hf_proxy2_ver;
+static int hf_proxy2_cmd;
+static int hf_proxy2_addr_family;
+static int hf_proxy2_protocol;
+static int hf_proxy2_addr_family_protocol;
+static int hf_proxy2_len;
+static int hf_proxy2_src_unix;
+static int hf_proxy2_dst_unix;
+
+static int hf_proxy2_unknown;
+
+static int hf_proxy2_tlv;
+static int hf_proxy2_tlv_type;
+static int hf_proxy2_tlv_length;
+static int hf_proxy2_tlv_value;
+static int hf_proxy2_tlv_ssl_client;
+static int hf_proxy2_tlv_ssl_verify;
+static int hf_proxy2_tlv_ssl_version;
+static int hf_proxy2_tlv_ssl_cn;
+static int hf_proxy2_tlv_ssl_cipher;
+static int hf_proxy2_tlv_ssl_sig_alg;
+static int hf_proxy2_tlv_ssl_key_alg;
+
+static expert_field ei_proxy_header_length_too_small;
+static expert_field ei_proxy_bad_format;
+
+
+static int ett_proxy1;
+static int ett_proxy2;
+static int ett_proxy2_fampro;
+static int ett_proxy2_tlv;
static dissector_handle_t proxy_v1_handle;
static dissector_handle_t proxy_v2_handle;
-static const guint8 proxy_v2_magic[] = { 0x0d, 0x0a, 0x0d, 0x0a, 0x00, 0x0d, 0x0a, 0x51, 0x55, 0x49, 0x54, 0x0a };
+static const uint8_t proxy_v2_magic[] = { 0x0d, 0x0a, 0x0d, 0x0a, 0x00, 0x0d, 0x0a, 0x51, 0x55, 0x49, 0x54, 0x0a };
static const value_string proxy2_cmd_vals[] = {
{ 0x0, "LOCAL" },
@@ -250,7 +250,7 @@ dissect_proxy_v2_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *proxy_tree,
{
increment_dissection_depth(pinfo);
while (offset < next_offset) {
- guint32 type, length;
+ uint32_t type, length;
proto_item *ti_tlv;
proto_tree *tlv_tree;
@@ -305,73 +305,73 @@ dissect_proxy_v2_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *proxy_tree,
return offset;
}
-static gboolean
+static bool
is_proxy_v2(tvbuff_t* tvb)
{
int offset = 0;
int length = tvb_reported_length(tvb);
if (length < 16) {
- return FALSE;
+ return false;
}
- if (tvb_memeql(tvb, offset, (const guint8*)proxy_v2_magic, sizeof(proxy_v2_magic)) != 0) {
- return FALSE;
+ if (tvb_memeql(tvb, offset, (const uint8_t*)proxy_v2_magic, sizeof(proxy_v2_magic)) != 0) {
+ return false;
}
// TODO maybe check for "(hdr.v2.ver_cmd & 0xF0) == 0x20" as done in "9. Sample code" from
// https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt?
- return TRUE;
+ return true;
}
/* "a 108-byte buffer is always enough to store all the line and a trailing zero" */
#define PROXY_V1_MAX_LINE_LENGTH 107
-static gboolean
-is_proxy_v1(tvbuff_t *tvb, gint *header_length)
+static bool
+is_proxy_v1(tvbuff_t *tvb, int *header_length)
{
const int min_header_size = sizeof("PROXY \r\n") - 1;
int length = tvb_reported_length(tvb);
- gint next_offset;
+ int next_offset;
if (length < min_header_size) {
- return FALSE;
+ return false;
}
- if (tvb_memeql(tvb, 0, (const guint8*)"PROXY ", 6) != 0) {
- return FALSE;
+ if (tvb_memeql(tvb, 0, (const uint8_t*)"PROXY ", 6) != 0) {
+ return false;
}
length = MIN(length, PROXY_V1_MAX_LINE_LENGTH);
- if (tvb_find_line_end(tvb, 6, length, &next_offset, FALSE) == -1) {
- return FALSE;
+ if (tvb_find_line_end(tvb, 6, length, &next_offset, false) == -1) {
+ return false;
}
/* The line must end with a CRLF and not just a single CR or LF. */
- if (tvb_memeql(tvb, next_offset - 2, (const guint8*)"\r\n", 2) != 0) {
- return FALSE;
+ if (tvb_memeql(tvb, next_offset - 2, (const uint8_t*)"\r\n", 2) != 0) {
+ return false;
}
if (header_length) {
*header_length = next_offset;
}
- return TRUE;
+ return true;
}
/**
* Scan for the next non-empty token (terminated by a space). If invalid, add
- * expert info for the remaining part and return FALSE. Otherwise return TRUE
+ * expert info for the remaining part and return false. Otherwise return true
* and the token length.
*/
-static gboolean
-proxy_v1_get_token_length(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int header_length, gchar *token, gint *token_length)
+static bool
+proxy_v1_get_token_length(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int header_length, char *token, int *token_length)
{
- gint space_pos = tvb_find_guint8(tvb, offset, header_length - offset, ' ');
+ int space_pos = tvb_find_uint8(tvb, offset, header_length - offset, ' ');
if (space_pos == -1) {
proto_tree_add_expert(tree, pinfo, &ei_proxy_bad_format, tvb, offset, header_length - offset);
- return FALSE;
+ return false;
}
- gint length = space_pos - offset;
+ int length = space_pos - offset;
if (token && length) {
DISSECTOR_ASSERT(length + 1 < PROXY_V1_MAX_LINE_LENGTH);
tvb_memcpy(tvb, token, offset, length);
@@ -386,13 +386,13 @@ dissect_proxy_v1_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti;
proto_tree *proxy_tree;
- guint offset = 0;
- gint header_length = 0;
- gint token_length = 0;
- gint tcp_ip_version = 0;
- guint16 srcport, dstport;
- gchar buffer[PROXY_V1_MAX_LINE_LENGTH];
- guint32 src_ipv4, dst_ipv4;
+ unsigned offset = 0;
+ int header_length = 0;
+ int token_length = 0;
+ int tcp_ip_version = 0;
+ uint16_t srcport, dstport;
+ char buffer[PROXY_V1_MAX_LINE_LENGTH];
+ uint32_t src_ipv4, dst_ipv4;
ws_in6_addr src_ipv6, dst_ipv6;
address src_addr, dst_addr;
@@ -553,10 +553,10 @@ dissect_proxy_v2_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti , *ti_ver;
proto_tree *proxy_tree, *fampro_tree;
- guint offset = 0, next_offset;
- guint32 header_len, fam_pro, cmd;
+ unsigned offset = 0, next_offset;
+ uint32_t header_len, fam_pro, cmd;
address src_addr = ADDRESS_INIT_NONE, dst_addr = ADDRESS_INIT_NONE;
- guint32 srcport, dstport;
+ uint32_t srcport, dstport;
port_type ptype = PT_NONE;
if (!is_proxy_v2(tvb)) {
@@ -689,23 +689,23 @@ dissect_proxy_v2(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data
return offset;
}
-static gboolean
+static bool
dissect_proxy_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
conversation_t* conv = find_or_create_conversation(pinfo);
if (is_proxy_v2(tvb)) {
conversation_set_dissector(conv, proxy_v2_handle);
dissect_proxy_v2(tvb, pinfo, tree, data);
- return TRUE;
+ return true;
} else if (is_proxy_v1(tvb, NULL)) {
conversation_set_dissector(conv, proxy_v1_handle);
dissect_proxy_v1(tvb, pinfo, tree, data);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
-static gboolean
+static bool
dissect_proxy_heur_udp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data)
{
int offset;
@@ -723,14 +723,14 @@ dissect_proxy_heur_udp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void
* won't get called on the second pass. */
dissect_proxy_proxied(tvb, pinfo, tree, offset, data, NULL);
}
- return TRUE;
+ return true;
#if 0
/* Proxy v1 is only for TCP */
} else if (is_proxy_v1(tvb, NULL)) {
dissect_proxy_v1(tvb, pinfo, tree, data);
#endif
}
- return FALSE;
+ return false;
}
void
@@ -905,7 +905,7 @@ proto_register_proxy(void)
},
};
- static gint *ett[] = {
+ static int *ett[] = {
&ett_proxy1,
&ett_proxy2,
&ett_proxy2_fampro,
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 02:58:22 +0000