From da711f681d6e33bbebd602bcd5fd1179e33ce685 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 15 Nov 2011 19:33:14 +0000 Subject: Clean up indentation. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39863 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-sip.c | 96 ++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'epan/dissectors/packet-sip.c') diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 8fa7e6848d..36ed9e8df9 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -1067,68 +1067,68 @@ dissect_sip_uri(tvbuff_t *tvb, packet_info *pinfo _U_, gint start_offset, in_ipv6 = (tvb_get_guint8(tvb, parameter_end_offset) == '['); while (parameter_end_offset < line_end_offset) { + parameter_end_offset++; + c = tvb_get_guint8(tvb, parameter_end_offset); + switch (c) { + case '>': + case ',': + goto uri_host_end_found; + case ';': + uri_offsets->uri_parameters_start = parameter_end_offset + 1; + goto uri_host_end_found; + case '?': + case ' ': + case '\r': + goto uri_host_end_found; + case ':': + if (!in_ipv6) + goto uri_host_end_found; + break; + case '[': + in_ipv6 = TRUE; + break; + case ']': + in_ipv6 = FALSE; + break; + default : + break; + } + } + +uri_host_end_found: + + uri_offsets->uri_host_end = parameter_end_offset - 1; + + if (c == ':') + { + uri_offsets->uri_host_port_start = parameter_end_offset + 1; + parameter_end_offset = uri_offsets->uri_host_port_start; + while (parameter_end_offset < line_end_offset) + { parameter_end_offset++; c = tvb_get_guint8(tvb, parameter_end_offset); switch (c) { case '>': case ',': - goto uri_host_end_found; + goto uri_host_port_end_found; case ';': - uri_offsets->uri_parameters_start = parameter_end_offset + 1; - goto uri_host_end_found; + uri_offsets->uri_parameters_start = parameter_end_offset + 1; + goto uri_host_port_end_found; case '?': case ' ': case '\r': - goto uri_host_end_found; - case ':': - if (!in_ipv6) - goto uri_host_end_found; - break; - case '[': - in_ipv6 = TRUE; - break; - case ']': - in_ipv6 = FALSE; - break; + goto uri_host_port_end_found; default : break; - } - } - - uri_host_end_found: - - uri_offsets->uri_host_end = parameter_end_offset - 1; - - if (c == ':') - { - uri_offsets->uri_host_port_start = parameter_end_offset + 1; - parameter_end_offset = uri_offsets->uri_host_port_start; - while (parameter_end_offset < line_end_offset) - { - parameter_end_offset++; - c = tvb_get_guint8(tvb, parameter_end_offset); - switch (c) { - case '>': - case ',': - goto uri_host_port_end_found; - case ';': - uri_offsets->uri_parameters_start = parameter_end_offset + 1; - goto uri_host_port_end_found; - case '?': - case ' ': - case '\r': - goto uri_host_port_end_found; - default : - break; - } - } + } + } - uri_host_port_end_found: + uri_host_port_end_found: - uri_offsets->uri_host_port_end = parameter_end_offset -1; - } + uri_offsets->uri_host_port_end = parameter_end_offset -1; + } - return uri_offsets->name_addr_end; + return uri_offsets->name_addr_end; } /* -- cgit v1.2.3