* Adds support for the data packet protocol for the SliMP3
* See www.slimdevices.com for details.
*
- * $Id: packet-slimp3.c,v 1.7 2002/08/02 23:36:01 jmayer Exp $
+ * $Id: packet-slimp3.c,v 1.10 2003/02/27 05:54:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
#include <glib.h>
+#include <string.h>
#include <epan/packet.h>
static int proto_slimp3 = -1;
static int hf_slimp3_data = -1;
static int hf_slimp3_discover_request = -1;
static int hf_slimp3_discover_response = -1;
+static int hf_slimp3_data_ack = -1;
static gint ett_slimp3 = -1;
static dissector_handle_t slimp3_handle;
-#define UDP_PORT_SLIMP3 1069
+#define UDP_PORT_SLIMP3_V1 1069
+#define UDP_PORT_SLIMP3_V2 3483
#define SLIMP3_IR 'i'
#define SLIMP3_CONTROL 's'
#define SLIMP3_I2C '2'
#define SLIMP3_DISC_REQ 'd'
#define SLIMP3_DISC_RSP 'D'
+#define SLIMP3_DATA_ACK 'a'
static const value_string slimp3_opcode_vals[] = {
{ SLIMP3_IR, "Infrared Remote Code" },
{ SLIMP3_I2C, "I2C" },
{ SLIMP3_DISC_REQ, "Discovery Request" },
{ SLIMP3_DISC_RSP, "Discovery Response" },
+ { SLIMP3_DATA_ACK, "Ack" },
{ 0, NULL }
};
+/* IR remote control types */
+static const value_string slimp3_ir_types[] = {
+ { 0x02, "SLIMP3" },
+ { 0xff, "JVC DVD Player" },
+
+ { 0, NULL }
+};
+
+/* IR codes for the custom SLIMP3 remote control */
+static const value_string slimp3_ir_codes_slimp3[] = {
+ { 0x76899867, "0" },
+ { 0x7689f00f, "1" },
+ { 0x768908f7, "2" },
+ { 0x76898877, "3" },
+ { 0x768948b7, "4" },
+ { 0x7689c837, "5" },
+ { 0x768928d7, "6" },
+ { 0x7689a857, "7" },
+ { 0x76896897, "8" },
+ { 0x7689e817, "9" },
+ { 0x7689b04f, "arrow_down" },
+ { 0x7689906f, "arrow_left" },
+ { 0x7689d02f, "arrow_right" },
+ { 0x7689e01f, "arrow_up" },
+ { 0x768900ff, "voldown" },
+ { 0x7689807f, "volup" },
+ { 0x768940bf, "power" },
+ { 0x7689c03f, "rew" },
+ { 0x768920df, "pause" },
+ { 0x7689a05f, "fwd" },
+ { 0x7689609f, "add" },
+ { 0x768910ef, "play" },
+ { 0x768958a7, "search" },
+ { 0x7689d827, "shuffle" },
+ { 0x768938c7, "repeat" },
+ { 0x7689b847, "sleep" },
+ { 0x76897887, "now_playing" },
+ { 0x7689f807, "size" },
+ { 0x768904fb, "brightness" },
+
+ { 0, NULL }
+};
+
+/* IR codes for the JVC remote control */
static const value_string slimp3_ir_codes_jvc[] = {
- { 0xf786, "One" },
- { 0xf746, "Two" },
- { 0xf7c6, "Three" },
- { 0xf726, "Four" },
- { 0xf7a6, "Five" },
- { 0xf766, "Six" },
- { 0xf7e6, "Seven" },
- { 0xf716, "Eight" },
- { 0xf796, "Nine" },
- { 0xf776, "Ten" },
-
- { 0xf7f6, "Picture-In-Picture" },
+ { 0xf786, "One" },
+ { 0xf746, "Two" },
+ { 0xf7c6, "Three" },
+ { 0xf726, "Four" },
+ { 0xf7a6, "Five" },
+ { 0xf766, "Six" },
+ { 0xf7e6, "Seven" },
+ { 0xf716, "Eight" },
+ { 0xf796, "Nine" },
+ { 0xf776, "Ten" },
+
+ { 0xf7f6, "Picture-In-Picture" },
/* { 0xf7XX, "Enter" }, */
- { 0xf70e, "Back" },
- { 0xf732, "Play" },
- { 0xf76e, "Forward" },
- { 0xf743, "Record" },
- { 0xf7c2, "Stop" },
- { 0xf7b2, "Pause" },
+ { 0xf70e, "Back" },
+ { 0xf732, "Play" },
+ { 0xf76e, "Forward" },
+ { 0xf743, "Record" },
+ { 0xf7c2, "Stop" },
+ { 0xf7b2, "Pause" },
/* { 0xf7XX, "TV/Video" }, */
- { 0xf703, "Display" },
- { 0xf7b3, "Sleep" },
- { 0xf7b6, "Guide" },
- { 0xf70b, "Up" },
- { 0xf74b, "Left" },
- { 0xf7cb, "Right" },
- { 0xf78b, "Down" },
- { 0xf783, "Menu" },
- { 0xf72b, "OK" },
- { 0xf778, "Volume Up" },
- { 0xf7f8, "Volume Down" },
- { 0xf70d, "Channel Up" },
- { 0xf78d, "Channel Down" },
+ { 0xf703, "Display" },
+ { 0xf7b3, "Sleep" },
+ { 0xf7b6, "Guide" },
+ { 0xf70b, "Up" },
+ { 0xf74b, "Left" },
+ { 0xf7cb, "Right" },
+ { 0xf78b, "Down" },
+ { 0xf783, "Menu" },
+ { 0xf72b, "OK" },
+ { 0xf778, "Volume Up" },
+ { 0xf7f8, "Volume Down" },
+ { 0xf70d, "Channel Up" },
+ { 0xf78d, "Channel Down" },
/* { 0xf7XX, "Mute" }, */
- { 0xf7ab, "Recall" },
- { 0xf702, "Power" },
+ { 0xf7ab, "Recall" },
+ { 0xf702, "Power" },
+
+ { 0, NULL }
};
+
static const value_string slimp3_display_commands[] = {
{ 0x1, "Clear Display"},
{ 0x2, "Cursor to 1st Line Home"},
{ 0x5, "Mode: Decrement Address, Shift Display"},
{ 0x6, "Mode: Increment Address, Shift Cursor"},
{ 0x7, "Mode: Increment Address, Shift Display"},
-
+
{ 0x8, "Display Off"},
{ 0xd, "Display On, With Blinking"},
{ 0xe, "Display On, With Cursor"},
{ 0, NULL },
};
+
+static const value_string slimp3_mpg_control[] = {
+ { 0, "Go"}, /* Run the decoder */
+ { 1, "Stop"}, /* Halt decoder but don't reset rptr */
+ { 3, "Reset"}, /* Halt decoder and reset rptr */
+
+ { 0, NULL }
+};
+
static void
dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
guint16 opcode;
char addc_str[101];
char *addc_strp;
-
+ int to_server = FALSE;
+ int old_protocol = FALSE;
+ address tmp_addr;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SliMP3");
proto_tree_add_uint(slimp3_tree, hf_slimp3_opcode, tvb,
offset, 1, opcode);
}
+
+ /* The new protocol (v1.3 and later) uses an IANA-assigned port number.
+ * It usually uses the same number for both sizes of the conversation, so
+ * the port numbers can't always be used to determine client and server.
+ * The new protocol places the clients MAC address in the packet, so that
+ * is used to identify packets originating at the client.
+ */
+ if ((pinfo->destport == UDP_PORT_SLIMP3_V2) && (pinfo->srcport == UDP_PORT_SLIMP3_V2)) {
+ SET_ADDRESS(&tmp_addr, AT_ETHER, 6, tvb_get_ptr(tvb, offset+12, 6));
+ to_server = ADDRESSES_EQUAL(&tmp_addr, &pinfo->dl_src);
+ }
+ else if (pinfo->destport == UDP_PORT_SLIMP3_V2) {
+ to_server = TRUE;
+ }
+ else if (pinfo->srcport == UDP_PORT_SLIMP3_V2) {
+ to_server = FALSE;
+ }
+ if (pinfo->destport == UDP_PORT_SLIMP3_V1) {
+ to_server = TRUE;
+ old_protocol = TRUE;
+ }
+ else if (pinfo->srcport == UDP_PORT_SLIMP3_V1) {
+ to_server = FALSE;
+ old_protocol = TRUE;
+ }
+
switch (opcode) {
case SLIMP3_IR:
+ /* IR code
+ *
+ * [0] 'i' as in "IR"
+ * [1] 0x00
+ * [2..5] player's time since startup in ticks @625 KHz
+ * [6] IR code id, ff=JVC, 02=SLIMP3
+ * [7] number of meaningful bits - 16 for JVC, 32 for SLIMP3
+ * [8..11] the 32-bit IR code
+ * [12..17] reserved
+ */
if (tree) {
proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_ir, tvb, offset+8, 4, FALSE);
i1 = tvb_get_ntohl(tvb, offset+2);
- proto_tree_add_text(slimp3_tree, tvb, offset+2, 4, "Uptime: %u sec (%u ticks)",
+ proto_tree_add_text(slimp3_tree, tvb, offset+2, 4, "Uptime: %u sec (%u ticks)",
i1/625000, i1);
- proto_tree_add_text(slimp3_tree, tvb, offset+6, 1, "Code identifier: 0x%0x: %s",
- tvb_get_guint8(tvb, offset+6),
- tvb_get_guint8(tvb, offset+6)==0xff ? "JVC DVD Player" : "Unknown");
+ i1 = tvb_get_guint8(tvb, offset+6);
+ proto_tree_add_text(slimp3_tree, tvb, offset+6, 1, "Code identifier: 0x%0x: %s",
+ i1, val_to_str(i1, slimp3_ir_types, "Unknown"));
proto_tree_add_text(slimp3_tree, tvb, offset+7, 1, "Code bits: %d",
tvb_get_guint8(tvb, offset+7));
i1 = tvb_get_ntohl(tvb, offset+8);
- /* Is this a standard JVC remote code? */
- if (tvb_get_guint8(tvb, offset+6) == 0xff &&
- tvb_get_guint8(tvb, offset+7) == 16) {
-
- proto_tree_add_text(slimp3_tree, tvb, offset+8, 4,
- "Infrared Code: %s: 0x%0x",
- val_to_str(i1, slimp3_ir_codes_jvc, "Unknown"),
- tvb_get_ntohl(tvb, offset+8));
+ /* Check the code to figure out which remote is being used. */
+ if (tvb_get_guint8(tvb, offset+6) == 0x02 &&
+ tvb_get_guint8(tvb, offset+7) == 32) {
+ /* This is the custom SLIMP3 remote. */
+ proto_tree_add_text(slimp3_tree, tvb, offset+8, 4,
+ "Infrared Code: %s: 0x%0x",
+ val_to_str(i1, slimp3_ir_codes_slimp3, "Unknown"), i1);
+ }
+ else if (tvb_get_guint8(tvb, offset+6) == 0xff &&
+ tvb_get_guint8(tvb, offset+7) == 16) {
+ /* This is a JVC DVD player remote */
+ proto_tree_add_text(slimp3_tree, tvb, offset+8, 4,
+ "Infrared Code: %s: 0x%0x",
+ val_to_str(i1, slimp3_ir_codes_jvc, "Unknown"), i1);
} else {
/* Unknown code; just write it */
- proto_tree_add_text(slimp3_tree, tvb, offset+8, 4, "Infrared Code: 0x%0x",
- tvb_get_ntohl(tvb, offset+8));
+ proto_tree_add_text(slimp3_tree, tvb, offset+8, 4, "Infrared Code: 0x%0x", i1);
}
}
if (check_col(pinfo->cinfo, COL_INFO)) {
i1 = tvb_get_ntohl(tvb, offset+8);
- if (tvb_get_guint8(tvb, offset+6) == 0xff &&
- tvb_get_guint8(tvb, offset+7) == 16) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", JVC: %s",
+ if (tvb_get_guint8(tvb, offset+6) == 0x02 &&
+ tvb_get_guint8(tvb, offset+7) == 32) {
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", SLIMP3: %s",
+ val_to_str(i1, slimp3_ir_codes_slimp3, "Unknown (0x%0x)"));
+ }
+ else if (tvb_get_guint8(tvb, offset+6) == 0xff &&
+ tvb_get_guint8(tvb, offset+7) == 16) {
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", JVC: %s",
val_to_str(i1, slimp3_ir_codes_jvc, "Unknown (0x%0x)"));
} else {
/* Unknown code; just write it */
case SLIMP3_DISPLAY:
if (tree) {
- int in_str;
+ gboolean in_str;
+ int str_len;
proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_display,
tvb, offset, 1, FALSE);
/* Loop through the commands */
i1 = 18;
- in_str = 0;
+ in_str = FALSE;
+ str_len = 0;
while (i1 < tvb_reported_length_remaining(tvb, offset)) {
switch(tvb_get_guint8(tvb, offset + i1)) {
case 0:
- in_str = 0;
- proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2,
+ in_str = FALSE;
+ str_len = 0;
+ proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2,
"Delay (%d ms)", tvb_get_guint8(tvb, offset + i1 + 1));
i1 += 2;
break;
case 3:
if (ti && in_str) {
- proto_item_append_text(ti, "%c",
+ str_len += 2;
+ proto_item_append_text(ti, "%c",
tvb_get_guint8(tvb, offset + i1 + 1));
+ proto_item_set_len(ti, str_len);
} else {
- ti = proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2,
- "String: %c",
+ ti = proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2,
+ "String: %c",
tvb_get_guint8(tvb, offset + i1 + 1));
- in_str = 1;
+ in_str = TRUE;
+ str_len = 2;
}
i1 += 2;
break;
case 2:
- in_str = 0;
- ti = proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2,
- "Command: %s",
- val_to_str(tvb_get_guint8(tvb, offset + i1 + 1),
- slimp3_display_commands,
+ in_str = FALSE;
+ str_len = 0;
+ ti = proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2,
+ "Command: %s",
+ val_to_str(tvb_get_guint8(tvb, offset + i1 + 1),
+ slimp3_display_commands,
"Unknown (0x%0x)"));
- if ((tvb_get_guint8(tvb, offset + i1 + 1) & 0xf0) == 0x30) {
- proto_item_append_text(ti, ": %s",
+ if ((tvb_get_guint8(tvb, offset + i1 + 1) & 0xf0) == 0x30) {
+ proto_item_append_text(ti, ": %s",
val_to_str(tvb_get_guint8(tvb, offset + i1 + 2),
- slimp3_display_fset8,
+ slimp3_display_fset8,
"Unknown (0x%0x)"));
- i1 += 2 ;
+ i1 += 2;
}
i1 += 2;
break;
-
+
default:
- proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2,
- "Unknown 0x%0x, 0x%0x",
+ proto_tree_add_text(slimp3_tree, tvb, offset + i1, 2,
+ "Unknown 0x%0x, 0x%0x",
tvb_get_guint8(tvb, offset + i1),
tvb_get_guint8(tvb, offset + i1 + 1));
i1 += 2;
break;
case 2:
- *addc_strp++ = '|';
+ *addc_strp++ = '|';
if (tvb_offset_exists(tvb, offset + i1 + 1) &&
(tvb_get_guint8(tvb, offset + i1 + 1) & 0xf0) == 0x30)
i1 += 2;
case 3:
if (tvb_offset_exists(tvb, offset + i1 + 1)) {
- if (addc_strp == addc_str ||
+ if (addc_strp == addc_str ||
*(addc_strp-1) != ' ' ||
tvb_get_guint8(tvb, offset + i1 + 1) != ' ')
*addc_strp++ = tvb_get_guint8(tvb, offset + i1 + 1);
proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_control,
tvb, offset+1, 1, FALSE);
proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Command: %s",
- val_to_str(tvb_get_guint8(tvb, offset+1),
+ val_to_str(tvb_get_guint8(tvb, offset+1),
slimp3_stream_control, "Unknown (0x%0x)"));
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
- val_to_str(tvb_get_guint8(tvb, offset+1),
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ val_to_str(tvb_get_guint8(tvb, offset+1),
slimp3_stream_control, "Unknown (0x%0x)"));
}
break;
if (tree) {
proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_hello,
tvb, offset+1, 1, FALSE);
- if (pinfo->destport == UDP_PORT_SLIMP3) {
+ if (to_server) {
guint8 fw_ver = 0;
/* Hello response; client->server */
proto_tree_add_text(slimp3_tree, tvb, offset, 1, "Hello Response (Client --> Server)");
- proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Device ID: %d",
+ proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Device ID: %d",
tvb_get_guint8(tvb, offset+1));
fw_ver = tvb_get_guint8(tvb, offset+2);
- proto_tree_add_text(slimp3_tree, tvb, offset+2, 1, "Firmware Revision: %d.%d (0x%0x)",
+ proto_tree_add_text(slimp3_tree, tvb, offset+2, 1, "Firmware Revision: %d.%d (0x%0x)",
fw_ver>>4, fw_ver & 0xf, fw_ver);
} else {
/* Hello request; server->client */
if (tree) {
proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_i2c,
tvb, offset, 1, FALSE);
- if (pinfo->destport == UDP_PORT_SLIMP3) {
+ if (to_server) {
/* Hello response; client->server */
- proto_tree_add_text(slimp3_tree, tvb, offset, -1,
+ proto_tree_add_text(slimp3_tree, tvb, offset, -1,
"I2C Response (Client --> Server)");
} else {
/* Hello request; server->client */
- proto_tree_add_text(slimp3_tree, tvb, offset, -1,
+ proto_tree_add_text(slimp3_tree, tvb, offset, -1,
"I2C Request (Server --> Client)");
}
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- if (pinfo->destport == UDP_PORT_SLIMP3) {
+ if (to_server) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Response");
} else {
col_append_fstr(pinfo->cinfo, COL_INFO, ", Request");
if (tree) {
proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_data_request,
tvb, offset, 1, FALSE);
- proto_tree_add_text(slimp3_tree, tvb, offset+2, 2,
- "Requested offset: %d bytes.",
+ proto_tree_add_text(slimp3_tree, tvb, offset+2, 2,
+ "Requested offset: %d bytes.",
tvb_get_ntohs(tvb, offset+2)*2);
}
break;
case SLIMP3_DATA:
+ /* MPEG data (v1.3 and later)
+ *
+ * [0] 'm'
+ * [1..5] reserved
+ * [6..7] Write pointer (in words)
+ * [8..9] reserved
+ * [10..11] Sequence number
+ * [12..17] reserved
+ * [18..] MPEG data
+ */
if (tree) {
proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_data,
tvb, offset, 1, FALSE);
- proto_tree_add_text(slimp3_tree, tvb, offset, -1,
- "Length: %d bytes", tvb_reported_length_remaining(tvb, offset+18));
- proto_tree_add_text(slimp3_tree, tvb, offset+2, 2,
- "Buffer offset: %d bytes.",
- tvb_get_ntohs(tvb, offset+2) * 2);
+ if (old_protocol) {
+ proto_tree_add_text(slimp3_tree, tvb, offset, -1,
+ "Length: %d bytes",
+ tvb_reported_length_remaining(tvb, offset+18));
+ proto_tree_add_text(slimp3_tree, tvb, offset+2, 2,
+ "Buffer offset: %d bytes.",
+ tvb_get_ntohs(tvb, offset+2) * 2);
+ }
+ else {
+ proto_tree_add_text(slimp3_tree, tvb, offset+1, 1, "Command: %s",
+ val_to_str(tvb_get_guint8(tvb, offset+1),
+ slimp3_mpg_control, "Unknown (0x%0x)"));
+ proto_tree_add_text(slimp3_tree, tvb, offset, -1,
+ "Length: %d bytes",
+ tvb_reported_length_remaining(tvb, offset+18));
+ proto_tree_add_text(slimp3_tree, tvb, offset+6, 2,
+ "Write Pointer: %d",
+ tvb_get_ntohs(tvb, offset+6) * 2);
+ proto_tree_add_text(slimp3_tree, tvb, offset+10, 2,
+ "Sequence: %d",
+ tvb_get_ntohs(tvb, offset+10));
+ }
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Length: %d bytes, Offset: %d bytes.",
- tvb_reported_length_remaining(tvb, offset+18),
- tvb_get_ntohs(tvb, offset+2) * 2);
+ if (old_protocol) {
+ col_append_fstr(pinfo->cinfo, COL_INFO,
+ ", Length: %d bytes, Offset: %d bytes.",
+ tvb_reported_length_remaining(tvb, offset+18),
+ tvb_get_ntohs(tvb, offset+2) * 2);
+ }
+ else {
+ col_append_fstr(pinfo->cinfo, COL_INFO,
+ ", %s, %d bytes at %d, Sequence: %d",
+ val_to_str(tvb_get_guint8(tvb, offset+1),
+ slimp3_mpg_control, "Unknown (0x%0x)"),
+ tvb_reported_length_remaining(tvb, offset+18),
+ tvb_get_ntohs(tvb, offset+6) * 2,
+ tvb_get_ntohs(tvb, offset+10));
+ }
}
break;
proto_tree_add_text(slimp3_tree, tvb, offset+1, 1,
"Device ID: %d.", tvb_get_guint8(tvb, offset+1));
fw_ver = tvb_get_guint8(tvb, offset+2);
- proto_tree_add_text(slimp3_tree, tvb, offset+2, 1, "Firmware Revision: %d.%d (0x%0x)",
+ proto_tree_add_text(slimp3_tree, tvb, offset+2, 1, "Firmware Revision: %d.%d (0x%0x)",
fw_ver>>4, fw_ver & 0xf, fw_ver);
}
proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_discover_response,
tvb, offset, 1, FALSE);
proto_tree_add_text(slimp3_tree, tvb, offset+2, 4,
- "Server Address: %s.",
+ "Server Address: %s.",
ip_to_str(tvb_get_ptr(tvb, offset+2, 4)));
- proto_tree_add_text(slimp3_tree, tvb, offset+6, 2,
+ proto_tree_add_text(slimp3_tree, tvb, offset+6, 2,
"Server Port: %d", tvb_get_ntohs(tvb, offset + 6));
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Server Address: %s. Server Port: %d",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Server Address: %s. Server Port: %d",
ip_to_str(tvb_get_ptr(tvb, offset+2, 4)),
tvb_get_ntohs(tvb, offset + 6));
}
break;
+ case SLIMP3_DATA_ACK:
+ /* Acknowledge MPEG data
+ *
+ * [0] 'a'
+ * [1..5]
+ * [6..7] Write pointer (in words)
+ * [8..9] Read pointer (in words)
+ * [10..11] Sequence number
+ * [12..17] client MAC address (v1.3 and later)
+ */
+ if (tree) {
+ proto_tree_add_item_hidden(slimp3_tree, hf_slimp3_data_ack,
+ tvb, offset, 1, FALSE);
+ proto_tree_add_text(slimp3_tree, tvb, offset+6, 2,
+ "Write Pointer: %d",
+ tvb_get_ntohs(tvb, offset+6) * 2);
+ proto_tree_add_text(slimp3_tree, tvb, offset+8, 2,
+ "Read Pointer: %d",
+ tvb_get_ntohs(tvb, offset+8) * 2);
+ proto_tree_add_text(slimp3_tree, tvb, offset+10, 2,
+ "Sequence: %d",
+ tvb_get_ntohs(tvb, offset+10));
+ }
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Sequence: %d",
+ tvb_get_ntohs(tvb, offset+10));
+ }
+ break;
+
default:
if (tree) {
proto_tree_add_text(slimp3_tree, tvb, offset, -1,
FT_BOOLEAN, BASE_DEC, NULL, 0x0,
"SLIMP3 Discovery Response", HFILL }},
+ { &hf_slimp3_data_ack,
+ { "Data Ack", "slimp3.data_ack",
+ FT_BOOLEAN, BASE_DEC, NULL, 0x0,
+ "SLIMP3 Data Ack", HFILL }},
+
};
static gint *ett[] = {
&ett_slimp3,
void
proto_reg_handoff_slimp3(void)
{
- dissector_add("udp.port", UDP_PORT_SLIMP3, slimp3_handle);
+ dissector_add("udp.port", UDP_PORT_SLIMP3_V1, slimp3_handle);
+ dissector_add("udp.port", UDP_PORT_SLIMP3_V2, slimp3_handle);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff