Added latest protocol info, and displayed some numerical values as decimal

Author: magicmonkey

wireshark/lifx.lua

@@ -47,13 +47,18 @@ local securityProtocolStrings = {
 	[7] = "WPA2_MIXED_PSK"
 }
 
+local serviceStrings = {
+	[1] = "UDP",
+	[2] = "TCP"
+}
+
 packetNames = {
-	[0x0002]   = "Get PAN Gateway",
-	[0x0003]   = "Device state response",
+	[0x0002]   = "Get PAN gateway",
+	[0x0003]   = "PAN gateway state",
 	[0x0004]   = "Get time",
 	[0x0005]   = "Set time",
 	[0x0006]   = "Time state",
-	[0x0007]   = "Get reset switch",
+	[0x0007]   = "Get reset switch state",
 	[0x0008]   = "Reset switch state",
 	[0x0009]   = "Get dummy load",
 	[0x000a]   = "Set dummy load",
@@ -73,15 +78,20 @@ packetNames = {
 	[0x0018]   = "Set bulb label",
 	[0x0019]   = "Bulb label",
 	[0x001a]   = "Get tags",
+	[0x001b]   = "Set tags",
 	[0x001c]   = "Tags",
 	[0x001d]   = "Get tag labels",
+	[0x001e]   = "Set tag labels",
 	[0x001f]   = "Tag labels",
 	[0x0020]   = "Get version",
+	[0x0021]   = "Version state",
 	[0x0022]   = "Get info",
-	[0x0023]   = "Info",
+	[0x0023]   = "Info state",
 	[0x0024]   = "Get MCU rail voltage",
 	[0x0025]   = "MCU rail voltage",
 	[0x0026]   = "Reboot",
+	[0x0027]   = "Set factory test mode",
+	[0x0028]   = "Disable factory test mode",
 	[0x0065]   = "Get light state",
 	[0x0066]   = "Set light colour",
 	[0x0067]   = "Set waveform",
@@ -96,31 +106,77 @@ packetNames = {
 	[0x0132]   = "Access point"
 }
 
-function deviceStateResponse(buffer, pinfo, tree)
-	tree:add(F.unknown, buffer(0, 1))
-	tree:add(F.unknown, buffer(1, 2))
+function panGatewayState(buffer, pinfo, tree)
+	tree:add(F.service, buffer(0, 1))
+	tree:add_le(F.port, buffer(1, 4))
 end
 
 function setTime(buffer, pinfo, tree)
 	tree:add(F.time, buffer(0, 8))
 end
 
-function getTime(buffer, pinfo, tree)
+function timeState(buffer, pinfo, tree)
 	tree:add(F.time, buffer(0, 8))
 end
 
 function resetSwitchState(buffer, pinfo, tree)
-	tree:add(F.time, buffer(0, 8))
+	tree:add(F.resetSwitch, buffer(0, 1))
+end
+
+function meshInfo(buffer, pinfo, tree)
+	tree:add(F.signal, buffer(0, 4))
+	tree:add(F.tx, buffer(4, 4))
+	tree:add(F.rx, buffer(8, 4))
+	tree:add(F.mcuTemperature, buffer(12, 2))
+end
+
+function meshFirmwareState(buffer, pinfo, tree)
+	local build   = tree:add(buffer(0, 8), "Build")
+	local install = tree:add(buffer(8, 8), "Install")
+
+	build:add(F.second, buffer(0, 1))
+	build:add(F.minute, buffer(1, 1))
+	build:add(F.hour,   buffer(2, 1))
+	build:add(F.day,    buffer(3, 1))
+	build:add(F.month,  buffer(4, 3))
+	build:add(F.year,   buffer(7, 1))
+
+	install:add(F.second, buffer(8,  1))
+	install:add(F.minute, buffer(9,  1))
+	install:add(F.hour,   buffer(10, 1))
+	install:add(F.day,    buffer(11, 1))
+	install:add(F.month,  buffer(14, 3))
+	install:add(F.year,   buffer(17, 1))
+
+	tree:add(F.version, buffer(18, 4))
 end
 
 function wifiInfo(buffer, pinfo, tree)
-	tree:add(F.unknown, buffer(0, 14))
+	tree:add(F.signal, buffer(0, 4))
+	tree:add(F.tx, buffer(4, 4))
+	tree:add(F.rx, buffer(8, 4))
+	tree:add(F.mcuTemperature, buffer(12, 2))
 end
 
 function wifiFirmwareState(buffer, pinfo, tree)
-	tree:add(F.unknown, buffer(0, 16))
-	tree:add(F.unknown, buffer(0, 2))
-	tree:add(F.unknown, buffer(0, 2))
+	local build   = tree:add(buffer(0, 8), "Build")
+	local install = tree:add(buffer(8, 8), "Install")
+
+	build:add(F.second, buffer(0, 1))
+	build:add(F.minute, buffer(1, 1))
+	build:add(F.hour,   buffer(2, 1))
+	build:add(F.day,    buffer(3, 1))
+	build:add(F.month,  buffer(4, 3))
+	build:add(F.year,   buffer(7, 1))
+
+	install:add(F.second, buffer(8,  1))
+	install:add(F.minute, buffer(9,  1))
+	install:add(F.hour,   buffer(10, 1))
+	install:add(F.day,    buffer(11, 1))
+	install:add(F.month,  buffer(14, 3))
+	install:add(F.year,   buffer(17, 1))
+
+	tree:add(F.version, buffer(18, 4))
 end
 
 function setPowerState(buffer, pinfo, tree)
@@ -139,14 +195,48 @@ function setBulbLabel(buffer, pinfo, tree)
 	tree:add(F.bulbName, buffer(0, 32))
 end
 
+function setTags(buffer, pinfo, tree)
+	tree:add(F.tags, buffer(0, 8))
+end
+
 function tags(buffer, pinfo, tree)
 	tree:add(F.tags, buffer(0, 8))
 end
 
+function getTagLabels(buffer, pinfo, tree)
+	tree:add(F.tags, buffer(0, 8))
+end
+
+function setTagLabels(buffer, pinfo, tree)
+	tree:add(F.tags,  buffer(0, 8))
+	tree:add(F.label, buffer(8, 40))
+end
+
+function tagLabels(buffer, pinfo, tree)
+	tree:add(F.tags,  buffer(0, 8))
+	tree:add(F.label, buffer(8, 40))
+end
+
+function versionState(buffer, pinfo, tree)
+	tree:add(F.vendor,  buffer(0, 4))
+	tree:add(F.product, buffer(4, 4))
+	tree:add(F.vendor,  buffer(8, 4))
+end
+
+function infoState(buffer, pinfo, tree)
+	tree:add(F.time,     buffer(0,  8))
+	tree:add(F.uptime,   buffer(8,  8))
+	tree:add(F.downtime, buffer(16, 8))
+end
+
 function mcuRailVoltage(buffer, pinfo, tree)
 	tree:add(F.voltage, buffer(0, 4))
 end
 
+function setFactoryTestMode(buffer, pinfo, tree)
+	tree:add(F.on, buffer(0, 1))
+end
+
 function setLightColour(buffer, pinfo, tree)
 	tree:add(F.stream       , buffer(0, 1))
 	tree:add_le(F.hue       , buffer(1, 2))
@@ -165,7 +255,8 @@ function setWaveform(buffer, pinfo, tree)
 	tree:add_le(F.kelvin    , buffer(8 , 2))
 	tree:add_le(F.period    , buffer(10, 4))
 	tree:add(F.cycles       , buffer(14, 4))
-	tree:add(F.waveform     , buffer(18, 1))
+	tree:add(F.dutyCycles   , buffer(18, 2))
+	tree:add(F.waveform     , buffer(20, 1))
 end
 
 function setDimAbsolute(buffer, pinfo, tree)
@@ -193,6 +284,13 @@ function getWifiState(buffer, pinfo, tree)
 	tree:add(F.interface, buffer(0, 1))
 end
 
+function setWifiState(buffer, pinfo, tree)
+	tree:add(F.interface , buffer(0, 1))
+	tree:add(F.wifiStatus, buffer(1, 1))
+	tree:add(F.ip4Address, buffer(2, 4))
+	tree:add(F.ip6Address, buffer(6, 16))
+end
+
 function wifiState(buffer, pinfo, tree)
 	tree:add(F.interface , buffer(0, 1))
 	tree:add(F.wifiStatus, buffer(1, 1))
@@ -207,13 +305,21 @@ function setAccessPoint(buffer, pinfo, tree)
 	tree:add(F.securityProtocol, buffer(97, 1))
 end
 
+function accessPoint(buffer, pinfo, tree)
+	tree:add(F.interface       , buffer(0 , 1))
+	tree:add(F.ssid            , buffer(1 , 32))
+	tree:add(F.securityProtocol, buffer(33, 1))
+	tree:add(F.strength,         buffer(34, 2))
+	tree:add(F.channel,          buffer(36, 2))
+end
+
 packetTable = switch {
 	[0x0002] = getPanGateway,
-	[0x0003] = deviceStateResponse,
+	[0x0003] = panGatewayState,
 	[0x0004] = getTime,
 	[0x0005] = setTime,
 	[0x0006] = timeState,
-	[0x0007] = getResetSwitch,
+	[0x0007] = getResetSwitchState,
 	[0x0008] = resetSwitchState,
 	[0x0009] = getDummyLoad,
 	[0x000a] = setDummyLoad,
@@ -233,15 +339,20 @@ packetTable = switch {
 	[0x0018] = setBulbLabel,
 	[0x0019] = bulbLabel,
 	[0x001a] = getTags,
+	[0x001b] = setTags,
 	[0x001c] = tags,
 	[0x001d] = getTagLabels,
+	[0x001e] = setTagLabels,
 	[0x001f] = tagLabels,
 	[0x0020] = getVersion,
+	[0x0021] = versionState,
 	[0x0022] = getInfo,
-	[0x0023] = info,
+	[0x0023] = infoState,
 	[0x0024] = getMcuRailVoltage,
 	[0x0025] = mcuRailVoltage,
 	[0x0026] = reboot,
+	[0x0027] = setFactoryTestMode,
+	[0x0028] = disableFactoryTestMode,
 	[0x0065] = getLightState,
 	[0x0066] = setLightColour,
 	[0x0067] = setWaveform,
@@ -256,41 +367,61 @@ packetTable = switch {
 	[0x0132] = accessPoint
 }
 
-F.size             = ProtoField.uint16("lifx.size"           , "Packet size"          , base.HEX)
+F.size             = ProtoField.uint16("lifx.size"           , "Packet size"          , base.DEC)
 F.protocol         = ProtoField.uint16("lifx.protocol"       , "LIFX protocol"        , base.HEX)
 F.reserved         = ProtoField.bytes("lifx.reserved"        , "Reserved"             , base.HEX)
 F.targetAddr       = ProtoField.ether("lifx.targetAddr"      , "Target address"       , base.HEX)
 F.site             = ProtoField.ether("lifx.site"            , "Site address"         , base.HEX)
 F.timestamp        = ProtoField.uint64("lifx.timestamp"      , "Timestamp"            , base.HEX)
 F.packetType       = ProtoField.uint16("lifx.packetType"     , "Packet type"          , base.HEX , packetNames)
-
 F.unknown          = ProtoField.bytes("lifx.unknown"         , "Unknown"              , base.HEX)
 F.onoffReq         = ProtoField.uint8("lifx.onoff"           , "On/off setting"       , base.HEX , onOffStrings)
 F.bulbName         = ProtoField.string("lifx.bulbName"       , "Bulb name"            , base.HEX)
-F.hue              = ProtoField.uint16("lifx.hue"            , "Hue"                  , base.HEX)
-F.saturation       = ProtoField.uint16("lifx.saturation"     , "Saturation"           , base.HEX)
-F.brightness       = ProtoField.uint16("lifx.brightness"     , "Brightness"           , base.HEX)
-F.kelvin           = ProtoField.uint16("lifx.kelvin"         , "Colour temperature"   , base.HEX)
-F.fadeTime         = ProtoField.uint16("lifx.fadeTime"       , "Fade time"            , base.HEX)
+F.hue              = ProtoField.uint16("lifx.hue"            , "Hue"                  , base.DEC)
+F.saturation       = ProtoField.uint16("lifx.saturation"     , "Saturation"           , base.DEC)
+F.brightness       = ProtoField.uint16("lifx.brightness"     , "Brightness"           , base.DEC)
+F.kelvin           = ProtoField.uint16("lifx.kelvin"         , "Colour temperature"   , base.DEC)
+F.fadeTime         = ProtoField.uint16("lifx.fadeTime"       , "Fade time"            , base.DEC)
 F.onoffRes         = ProtoField.uint16("lifx.onoffResponse"  , "On/off"               , base.HEX , onOffStrings)
 F.time             = ProtoField.uint64("lifx.time"           , "Time (us since epoch)", base.HEX)
+F.uptime           = ProtoField.uint64("lifx.uptime"         , "Uptime"               , base.DEC)
 F.resetSwitch      = ProtoField.uint8("lifx.resetSwitch"     , "Reset switch"         , base.HEX , resetSwitchStrings)
 F.tags             = ProtoField.uint64("lifx.tags"           , "Tags"                 , base.HEX)
-F.voltage          = ProtoField.uint64("lifx.voltage"        , "Voltage"              , base.HEX)
+F.voltage          = ProtoField.uint64("lifx.voltage"        , "Voltage"              , base.DEC)
 F.stream           = ProtoField.uint8("lifx.stream"          , "Stream"               , base.HEX)
 F.transient        = ProtoField.uint8("lifx.transient"       , "Transient"            , base.HEX)
 F.period           = ProtoField.uint32("lifx.period"         , "Period"               , base.HEX)
 F.cycles           = ProtoField.float("lifx.cycles"          , "Cycles"               , base.HEX)
+F.dutyCycles       = ProtoField.uint16("lifx.dutyCycles"     , "Duty cycles"          , base.HEX)
 F.waveform         = ProtoField.uint8("lifx.waveform"        , "Waveform"             , base.HEX)
-F.dim              = ProtoField.uint16("lifx.dim"            , "Dim"                  , base.HEX)
-F.power            = ProtoField.uint16("lifx.power"          , "Power"                , base.HEX)
-F.interface        = ProtoField.uint8("lifx.interface"       , "Interface"            , base.HEX , interfaceStrings)
+F.dim              = ProtoField.uint16("lifx.dim"            , "Dim"                  , base.DEC)
+F.power            = ProtoField.uint16("lifx.power"          , "Power"                , base.HEX , onOffStrings)
+F.interface        = ProtoField.uint8("lifx.interface"       , "Interface"            , base.DEC , interfaceStrings)
 F.wifiStatus       = ProtoField.uint8("lifx.wifiStatus"      , "Wifi status"          , base.HEX , wifiStatusStrings)
 F.ip4Address       = ProtoField.bytes("lifx.ip4Address"      , "IP4 address"          , base.HEX)
 F.ip6Address       = ProtoField.bytes("lifx.ip6Address"      , "IP6 address"          , base.HEX)
 F.ssid             = ProtoField.bytes("lifx.ssid"            , "SSID (UTF8)"          , base.HEX)
 F.password         = ProtoField.bytes("lifx.password"        , "Password (UTF8)"      , base.HEX)
 F.securityProtocol = ProtoField.bytes("lifx.securityProtocol", "Security protocol"    , base.HEX , securityProtocolStrings)
+F.signal           = ProtoField.float("lifx.signal"          , "Signal"               , base.DEC)
+F.tx               = ProtoField.uint32("lifx.tx"             , "Tx"                   , base.DEC)
+F.rx               = ProtoField.uint32("lifx.rx"             , "Rx"                   , base.DEC)
+F.mcuTemperature   = ProtoField.uint16("lifx.mcuTemperature" , "MCU temperature"      , base.DEC)
+F.second           = ProtoField.uint8("lifx.second"          , "Second"               , base.DEC)
+F.minute           = ProtoField.uint8("lifx.minute"          , "Minute"               , base.DEC)
+F.hour             = ProtoField.uint8("lifx.hour"            , "Hour"                 , base.DEC)
+F.day              = ProtoField.uint8("lifx.day"             , "Day"                  , base.DEC)
+F.month            = ProtoField.bytes("lifx.month"           , "Month"                , base.HEX)
+F.year             = ProtoField.uint8("lifx.year"            , "Year"                 , base.DEC)
+F.label            = ProtoField.bytes("lifx.label"           , "Label"                , base.HEX)
+F.version          = ProtoField.uint32("lifx.version"        , "Version"              , base.HEX)
+F.product          = ProtoField.uint32("lifx.product"        , "Product"              , base.HEX)
+F.vendor           = ProtoField.uint32("lifx.vendor"         , "Vendor"               , base.HEX)
+F.on               = ProtoField.uint8("lifx.on"              , "On"                   , base.HEX)
+F.strength         = ProtoField.uint8("lifx.strength"        , "Strength"             , base.DEC)
+F.channel          = ProtoField.uint8("lifx.channel"         , "Channel"              , base.DEC)
+F.service          = ProtoField.uint8("lifx.service"         , "Service"              , base.HEX , serviceStrings)
+F.port             = ProtoField.uint32("lifx.port"           , "Port"                 , base.DEC)
 
 function lifx.dissector(buffer, pinfo, tree)
 	analyse(buffer, pinfo, tree)