diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-04-13 18:09:20 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-04-13 18:09:20 +0000 |
commit | db40bfac958d0f9f425f8d585b2989ae1b79ff9a (patch) | |
tree | 0c2a036189026a829e02c6ad3bfde51341553ec7 /epan/dissectors/packet-sip.c | |
parent | eb3e69da6d89c78285af8764aa65b7bb830d12be (diff) |
Try to please the build bot, fix indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28038 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-sip.c')
-rw-r--r-- | epan/dissectors/packet-sip.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 04c5445d81..56bc8b1dcb 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -2809,7 +2809,7 @@ dfilter_sip_request_line(tvbuff_t *tvb, proto_tree *tree, guint meth_len) gint next_offset, linelen, parameter_end_offset; guint offset = 0; guint parameter_len = meth_len; - guchar c; + guchar c= '\0'; proto_tree *ruri_item_tree = NULL; proto_item *ti; @@ -2838,58 +2838,58 @@ dfilter_sip_request_line(tvbuff_t *tvb, proto_tree *tree, guint meth_len) ti = proto_tree_add_item(tree, hf_sip_ruri, tvb, offset, parameter_len, FALSE); ruri_item_tree = proto_item_add_subtree(ti, ett_sip_ruri); - offset = (tvb_find_guint8(tvb, offset, linelen, ':'))+1; /* calc R-URI User/Host begin*/ - if ((tvb_find_guint8(tvb, offset, linelen, '@')) != -1){ + offset = (tvb_find_guint8(tvb, offset, linelen, ':'))+1; /* calc R-URI User/Host begin*/ + if ((tvb_find_guint8(tvb, offset, linelen, '@')) != -1){ /* R-URI: User Part found*/ parameter_len = (tvb_find_guint8(tvb, offset, linelen, '@'))-offset; /* calc R-URI User len*/ - if (parameter_len > 0) { + if (parameter_len > 0) { proto_tree_add_item(ruri_item_tree, hf_sip_ruri_user, tvb, offset, parameter_len, FALSE); } offset = offset + parameter_len + 1; + } + parameter_end_offset=offset; + + while (parameter_end_offset < linelen){ + parameter_end_offset++; + c = tvb_get_guint8(tvb, parameter_end_offset); + switch (c) { + case ':': + case ',': + case ';': + case '?': + case ' ': + goto host_end_found; + default : + break; } - parameter_end_offset=offset; - - while (parameter_end_offset < linelen){ - parameter_end_offset++; - c = tvb_get_guint8(tvb, parameter_end_offset); - switch (c) { - case ':': - case ',': - case ';': - case '?': - case ' ': - goto host_end_found; - default : - break; - } - } - host_end_found: - parameter_len = parameter_end_offset-offset; /* calc R-URI host len*/ - proto_tree_add_item(ruri_item_tree, hf_sip_ruri_host, tvb, offset, parameter_len, FALSE); + } + host_end_found: + parameter_len = parameter_end_offset-offset; /* calc R-URI host len*/ + proto_tree_add_item(ruri_item_tree, hf_sip_ruri_host, tvb, offset, parameter_len, FALSE); - offset = offset + parameter_len + 1; - - if (c == ':'){ + offset = offset + parameter_len + 1; + + if (c == ':'){ /* R-URI: Host Port found */ parameter_end_offset = offset; - while (parameter_end_offset < linelen){ - parameter_end_offset++; - c = tvb_get_guint8(tvb, parameter_end_offset); - switch (c) { - case ',': - case ';': - case '?': - case ' ': - goto host_port_end_found; - default : - break; - } - } + while (parameter_end_offset < linelen){ + parameter_end_offset++; + c = tvb_get_guint8(tvb, parameter_end_offset); + switch (c) { + case ',': + case ';': + case '?': + case ' ': + goto host_port_end_found; + default : + break; + } + } host_port_end_found: parameter_len = parameter_end_offset-offset; /* calc R-URI Host Port len*/ proto_tree_add_item(ruri_item_tree, hf_sip_ruri_port, tvb, offset, parameter_len, FALSE); - } + } /* end of Request-URI tree*/ } } |