diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-01-30 21:56:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-01-30 21:56:54 +0000 |
| commit | e9479b543f9344b0dd868be1744197fe5aa85764 (patch) | |
| tree | a64cbf0d0932bb95c297764ab78e89011246d9af /epan/dissectors/packet-daap.c | |
| parent | a4714f643a8de3b771e22274f4f5ebd5fe148894 (diff) | |
A "DAAP request" is just an HTTP request of a certain type, possibly on
port 3689. They don't have the media type application/x-dmap-tagged, so
they're not handed to us any more. (This means that the Info column now
shows the HTTP URI rather than just "DAAP Request", so that's arguably a
feature; if you want to see all the traffic in the session, use "Follow
TCP Stream" or look for port 3689.)
svn path=/trunk/; revision=47377
Diffstat (limited to 'epan/dissectors/packet-daap.c')
| -rw-r--r-- | epan/dissectors/packet-daap.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index e264dba623..8af948d92e 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -391,12 +391,6 @@ dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; proto_tree *daap_tree; guint first_tag = 0; - /* - * XXX - we now go by media type rather than TCP port, - * so is there another way to determine whether this - * is a request or response? - */ - gboolean is_request = (pinfo->destport == TCP_PORT_DAAP); first_tag = tvb_get_ntohl(tvb, 0); col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAAP"); @@ -412,17 +406,13 @@ dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - if (is_request) { - col_set_str(pinfo->cinfo, COL_INFO, "DAAP Request"); - } else { - /* This is done in two functions on purpose. If the tvb_get_xxx() - * functions fail, at least something will be in the info column - */ - col_set_str(pinfo->cinfo, COL_INFO, "DAAP Response"); - col_append_fstr(pinfo->cinfo, COL_INFO, " [first tag: %s, size: %d]", - tvb_format_text(tvb, 0, 4), - tvb_get_ntohl(tvb, 4)); - } + /* This is done in two functions on purpose. If the tvb_get_xxx() + * functions fail, at least something will be in the info column + */ + col_set_str(pinfo->cinfo, COL_INFO, "DAAP Response"); + col_append_fstr(pinfo->cinfo, COL_INFO, " [first tag: %s, size: %d]", + tvb_format_text(tvb, 0, 4), + tvb_get_ntohl(tvb, 4)); if (tree) { ti = proto_tree_add_item(tree, proto_daap, tvb, 0, -1, ENC_NA); |