From Samuel Thibault,

Some updates to the yahoo msg dissector.

svn path=/trunk/; revision=14632

1 files changed, 29 insertions, 1 deletions

diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c
index 55100f084e..34e2743dd0 100644
--- a/epan/dissectors/packet-ymsg.c
+++ b/epan/dissectors/packet-ymsg.c
@@ -101,6 +101,7 @@ enum yahoo_service { /* these are easier to see in hex */
 	YAHOO_SERVICE_PING,
 	YAHOO_SERVICE_GOTGROUPRENAME, /* < 1, 36(old), 37(new) */
 	YAHOO_SERVICE_SYSMESSAGE = 0x14,
+	YAHOO_SERVICE_SKINNAME = 0x15,
 	YAHOO_SERVICE_PASSTHROUGH2 = 0x16,
 	YAHOO_SERVICE_CONFINVITE = 0x18,
 	YAHOO_SERVICE_CONFLOGON,
@@ -120,6 +121,7 @@ enum yahoo_service { /* these are easier to see in hex */
 	YAHOO_SERVICE_VERIFY,
 	YAHOO_SERVICE_P2PFILEXFER,
 	YAHOO_SERVICE_PEERTOPEER = 0x4F,        /* Checks if P2P possible */
+	YAHOO_SERVICE_WEBCAM,
 	YAHOO_SERVICE_AUTHRESP = 0x54,
 	YAHOO_SERVICE_LIST,
 	YAHOO_SERVICE_AUTH = 0x57,
@@ -133,9 +135,20 @@ enum yahoo_service { /* these are easier to see in hex */
 	YAHOO_SERVICE_CHATJOIN, /* > 1 104-room 129-1600326591 62-2 */
 	YAHOO_SERVICE_CHATLEAVE,
 	YAHOO_SERVICE_CHATEXIT = 0x9b,
+	YAHOO_SERVICE_CHATADDINVITE = 0x9d,
 	YAHOO_SERVICE_CHATLOGOUT = 0xa0,
 	YAHOO_SERVICE_CHATPING,
-	YAHOO_SERVICE_COMMENT = 0xa8
+	YAHOO_SERVICE_COMMENT = 0xa8,
+	YAHOO_SERVICE_AVATAR = 0xbc,
+	YAHOO_SERVICE_PICTURE_CHECKSUM = 0xbd,
+	YAHOO_SERVICE_PICTURE = 0xbe,
+	YAHOO_SERVICE_PICTURE_UPDATE = 0xc1,
+	YAHOO_SERVICE_PICTURE_UPLOAD = 0xc2,
+	YAHOO_SERVICE_YAHOO6_STATUS_UPDATE = 0xc6,
+	YAHOO_SERVICE_AVATAR_UPDATE = 0xc7,
+	YAHOO_SERVICE_AUDIBLE = 0xd0,
+	YAHOO_SERVICE_WEBLOGIN = 0x0226,
+	YAHOO_SERVICE_SMS_MSG = 0x02ea
 };
 
 /* Message flags */
@@ -153,6 +166,7 @@ enum yahoo_status {
         YAHOO_STATUS_INVISIBLE = 12,
         YAHOO_STATUS_CUSTOM = 99,
         YAHOO_STATUS_IDLE = 999,
+	YAHOO_STATUS_WEBLOGIN = 0x5a55aa55,
         YAHOO_STATUS_OFFLINE = 0x5a55aa56, /* don't ask */
         YAHOO_STATUS_TYPING = 0x16
 };
@@ -189,6 +203,7 @@ static const value_string ymsg_service_vals[] = {
 	{YAHOO_SERVICE_PING, "Ping"},
 	{YAHOO_SERVICE_GOTGROUPRENAME, "YAHOO_SERVICE_GOTGROUPRENAME"},
 	{YAHOO_SERVICE_SYSMESSAGE, "System Message"},
+	{YAHOO_SERVICE_SKINNAME, "YAHOO_SERVICE_SKINNAME"},
 	{YAHOO_SERVICE_PASSTHROUGH2, "Passthrough 2"},
 	{YAHOO_SERVICE_CONFINVITE, "Conference Invitation"},
 	{YAHOO_SERVICE_CONFLOGON, "Conference Logon"},
@@ -208,6 +223,7 @@ static const value_string ymsg_service_vals[] = {
 	{YAHOO_SERVICE_VERIFY, "YAHOO_SERVICE_VERIFY"},
 	{YAHOO_SERVICE_P2PFILEXFER, "YAHOO_SERVICE_P2PFILEXFER"}, 
 	{YAHOO_SERVICE_PEERTOPEER, "YAHOO_SERVICE_PEERTOPEER"},
+	{YAHOO_SERVICE_WEBCAM, "YAHOO_SERVICE_WEBCAM"},
 	{YAHOO_SERVICE_AUTHRESP, "YAHOO_SERVICE_AUTHRESP"},
 	{YAHOO_SERVICE_LIST, "YAHOO_SERVICE_LIST"},
 	{YAHOO_SERVICE_AUTH, "YAHOO_SERVICE_AUTH"},
@@ -221,9 +237,20 @@ static const value_string ymsg_service_vals[] = {
 	{YAHOO_SERVICE_CHATJOIN, "YAHOO_SERVICE_CHATJOIN"},
 	{YAHOO_SERVICE_CHATLEAVE, "YAHOO_SERVICE_CHATLEAVE"},
 	{YAHOO_SERVICE_CHATEXIT, "YAHOO_SERVICE_CHATEXIT"},
+	{YAHOO_SERVICE_CHATADDINVITE, "YAHOO_SERVICE_CHATADDINVITE"},
 	{YAHOO_SERVICE_CHATLOGOUT, "YAHOO_SERVICE_CHATLOGOUT"},
 	{YAHOO_SERVICE_CHATPING, "YAHOO_SERVICE_CHATPING"},
 	{YAHOO_SERVICE_COMMENT, "YAHOO_SERVICE_COMMENT"},
+	{YAHOO_SERVICE_AVATAR, "YAHOO_SERVICE_AVATAR"},
+	{YAHOO_SERVICE_PICTURE_CHECKSUM, "YAHOO_SERVICE_PICTURE_CHECKSUM"},
+	{YAHOO_SERVICE_PICTURE, "YAHOO_SERVICE_PICTURE"},
+	{YAHOO_SERVICE_PICTURE_UPDATE, "YAHOO_SERVICE_PICTURE_UPDATE"},
+	{YAHOO_SERVICE_PICTURE_UPLOAD, "YAHOO_SERVICE_PICTURE_UPLOAD"},
+	{YAHOO_SERVICE_YAHOO6_STATUS_UPDATE, "YAHOO_SERVICE_YAHOO6_STATUS_UPDATE"},
+	{YAHOO_SERVICE_AVATAR_UPDATE, "YAHOO_SERVICE_AVATAR_UPDATE"},
+	{YAHOO_SERVICE_AUDIBLE, "YAHOO_SERVICE_AUDIBLE"},
+	{YAHOO_SERVICE_WEBLOGIN, "YAHOO_SERVICE_WEBLOGIN"},
+	{YAHOO_SERVICE_SMS_MSG, "YAHOO_SERVICE_SMS_MSG"},
 	{0, NULL}
 };
 
@@ -241,6 +268,7 @@ static const value_string ymsg_status_vals[] = {
 	{YAHOO_STATUS_INVISIBLE, "YAHOO_STATUS_INVISIBLE"},
 	{YAHOO_STATUS_CUSTOM, "YAHOO_STATUS_CUSTOM"},
 	{YAHOO_STATUS_IDLE, "YAHOO_STATUS_IDLE"},
+	{YAHOO_STATUS_WEBLOGIN, "YAHOO_STATUS_WEBLOGIN"},
 	{YAHOO_STATUS_OFFLINE, "YAHOO_STATUS_OFFLINE"},
 	{YAHOO_STATUS_TYPING, "YAHOO_STATUS_TYPING"},
 	{0, NULL}