osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2013-01-30 21:56:54 +00:00
parent a4714f643a
commit e9479b543f
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/dissectors/packet-daap.c
View File

@ -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);