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

All: 

- whitespace cleanup;
   - Remove redundant code;

   packet-ymsg.c:
   - Check if bytes available before doing tvb fetch for heuristic check;
   - Required tcp pdu "fixed part length" is 10 (not 8);
   - Use val_to_str_const() as appropriate;
   - Remove some unneeded initializations.

svn path=/trunk/; revision=42802
This commit is contained in:
Bill Meier 2012-05-23 03:26:35 +00:00
parent e72c6574ef
commit 8f5f906146
2 changed files with 224 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
epan/dissectors/packet-yhoo.c
View File

@ -202,7 +202,6 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "YHOO");
offset = 0;
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s",
( tvb_memeql(tvb, offset + 0, "YPNS", 4) == 0 ) ? "Request" : "Response",
@ -211,8 +210,8 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (tree) {
ti = proto_tree_add_item(tree, proto_yhoo, tvb, offset, -1,
ENC_NA);
ti = proto_tree_add_item(tree, proto_yhoo, tvb,
offset, -1, ENC_NA);
yhoo_tree = proto_item_add_subtree(ti, ett_yhoo);
proto_tree_add_item(yhoo_tree, hf_yhoo_version, tvb,
@ -262,34 +261,34 @@ void
proto_register_yhoo(void)
{
static hf_register_info hf[] = {
{ &hf_yhoo_service, {
{ &hf_yhoo_service, {
"Service Type", "yhoo.service", FT_UINT32, BASE_DEC,
VALS(yhoo_service_vals), 0, NULL, HFILL }},
{ &hf_yhoo_msgtype, {
{ &hf_yhoo_msgtype, {
"Message Type", "yhoo.msgtype", FT_UINT32, BASE_DEC,
VALS(yhoo_msgtype_vals), 0, "Message Type Flags", HFILL }},
{ &hf_yhoo_connection_id, {
{ &hf_yhoo_connection_id, {
"Connection ID", "yhoo.connection_id", FT_UINT32, BASE_HEX,
NULL, 0, NULL, HFILL }},
{ &hf_yhoo_magic_id, {
{ &hf_yhoo_magic_id, {
"Magic ID", "yhoo.magic_id", FT_UINT32, BASE_HEX,
NULL, 0, NULL, HFILL }},
{ &hf_yhoo_unknown1, {
{ &hf_yhoo_unknown1, {
"Unknown 1", "yhoo.unknown1", FT_UINT32, BASE_HEX,
NULL, 0, NULL, HFILL }},
{ &hf_yhoo_len, {
{ &hf_yhoo_len, {
"Packet Length", "yhoo.len", FT_UINT32, BASE_DEC,
NULL, 0, NULL, HFILL }},
{ &hf_yhoo_nick1, {
{ &hf_yhoo_nick1, {
"Real Nick (nick1)", "yhoo.nick1", FT_STRING, BASE_NONE,
NULL, 0, NULL, HFILL }},
{ &hf_yhoo_nick2, {
{ &hf_yhoo_nick2, {
"Active Nick (nick2)", "yhoo.nick2", FT_STRING, BASE_NONE,
NULL, 0, NULL, HFILL }},
{ &hf_yhoo_content, {
{ &hf_yhoo_content, {
"Content", "yhoo.content", FT_STRING, BASE_NONE,
NULL, 0, "Data portion of the packet", HFILL }},
{ &hf_yhoo_version, {
{ &hf_yhoo_version, {
"Version", "yhoo.version", FT_STRING, BASE_NONE,
NULL, 0, "Packet version identifier", HFILL }},
};

422
epan/dissectors/packet-ymsg.c
View File

@ -51,8 +51,8 @@ static gint ett_ymsg = -1;
static gint ett_ymsg_content = -1;
static gint ett_ymsg_content_line = -1;
#define TCP_PORT_YMSG 23 /* XXX - this is Telnet! */
#define TCP_PORT_YMSG_2 25 /* And this is SMTP! */
#define TCP_PORT_YMSG 23 /* XXX - this is Telnet! */
#define TCP_PORT_YMSG_2 25 /* And this is SMTP! */
#define TCP_PORT_YMSG_3 5050 /* This, however, is regular Yahoo Messenger */
/* desegmentation of YMSG over TCP */
@ -84,29 +84,29 @@ static gboolean ymsg_desegment = TRUE;
/* Service constants */
enum yahoo_service { /* these are easier to see in hex */
YAHOO_SERVICE_LOGON = 1,
YAHOO_SERVICE_LOGON = 1,
YAHOO_SERVICE_LOGOFF,
YAHOO_SERVICE_ISAWAY,
YAHOO_SERVICE_ISBACK,
YAHOO_SERVICE_IDLE, /* 5 (placemarker) */
YAHOO_SERVICE_IDLE, /* 5 (placemarker) */
YAHOO_SERVICE_MESSAGE,
YAHOO_SERVICE_IDACT,
YAHOO_SERVICE_IDDEACT,
YAHOO_SERVICE_MAILSTAT,
YAHOO_SERVICE_USERSTAT, /* 0xa */
YAHOO_SERVICE_USERSTAT, /* 0xa */
YAHOO_SERVICE_NEWMAIL,
YAHOO_SERVICE_CHATINVITE,
YAHOO_SERVICE_CALENDAR,
YAHOO_SERVICE_NEWPERSONALMAIL,
YAHOO_SERVICE_NEWCONTACT,
YAHOO_SERVICE_ADDIDENT, /* 0x10 */
YAHOO_SERVICE_ADDIDENT, /* 0x10 */
YAHOO_SERVICE_ADDIGNORE,
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_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,
YAHOO_SERVICE_CONFDECLINE,
YAHOO_SERVICE_CONFLOGOFF,
@ -114,68 +114,68 @@ enum yahoo_service { /* these are easier to see in hex */
YAHOO_SERVICE_CONFMSG,
YAHOO_SERVICE_CHATLOGON,
YAHOO_SERVICE_CHATLOGOFF,
YAHOO_SERVICE_CHATMSG = 0x20,
YAHOO_SERVICE_GAMELOGON = 0x28,
YAHOO_SERVICE_CHATMSG = 0x20,
YAHOO_SERVICE_GAMELOGON = 0x28,
YAHOO_SERVICE_GAMELOGOFF,
YAHOO_SERVICE_GAMEMSG = 0x2a,
YAHOO_SERVICE_FILETRANSFER = 0x46,
YAHOO_SERVICE_VOICECHAT = 0x4A,
YAHOO_SERVICE_GAMEMSG = 0x2a,
YAHOO_SERVICE_FILETRANSFER = 0x46,
YAHOO_SERVICE_VOICECHAT = 0x4A,
YAHOO_SERVICE_NOTIFY,
YAHOO_SERVICE_VERIFY,
YAHOO_SERVICE_P2PFILEXFER,
YAHOO_SERVICE_PEERTOPEER = 0x4F, /* Checks if P2P possible */
YAHOO_SERVICE_PEERTOPEER = 0x4F, /* Checks if P2P possible */
YAHOO_SERVICE_WEBCAM,
YAHOO_SERVICE_AUTHRESP = 0x54,
YAHOO_SERVICE_AUTHRESP = 0x54,
YAHOO_SERVICE_LIST,
YAHOO_SERVICE_AUTH = 0x57,
YAHOO_SERVICE_AUTHBUDDY = 0x6d,
YAHOO_SERVICE_ADDBUDDY = 0x83,
YAHOO_SERVICE_AUTH = 0x57,
YAHOO_SERVICE_AUTHBUDDY = 0x6d,
YAHOO_SERVICE_ADDBUDDY = 0x83,
YAHOO_SERVICE_REMBUDDY,
YAHOO_SERVICE_IGNORECONTACT, /* > 1, 7, 13 < 1, 66, 13, 0*/
YAHOO_SERVICE_IGNORECONTACT, /* > 1, 7, 13 < 1, 66, 13, 0*/
YAHOO_SERVICE_REJECTCONTACT,
YAHOO_SERVICE_GROUPRENAME = 0x89, /* > 1, 65(new), 66(0), 67(old) */
YAHOO_SERVICE_KEEPALIVE = 0x8a,
YAHOO_SERVICE_CHATONLINE = 0x96, /* > 109(id), 1, 6(abcde) < 0,1*/
YAHOO_SERVICE_GROUPRENAME = 0x89, /* > 1, 65(new), 66(0), 67(old) */
YAHOO_SERVICE_KEEPALIVE = 0x8a,
YAHOO_SERVICE_CHATONLINE = 0x96, /* > 109(id), 1, 6(abcde) < 0,1*/
YAHOO_SERVICE_CHATGOTO,
YAHOO_SERVICE_CHATJOIN, /* > 1 104-room 129-1600326591 62-2 */
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_CHATEXIT = 0x9b,
YAHOO_SERVICE_CHATADDINVITE = 0x9d,
YAHOO_SERVICE_CHATLOGOUT = 0xa0,
YAHOO_SERVICE_CHATPING,
YAHOO_SERVICE_COMMENT = 0xa8,
YAHOO_SERVICE_GAME_INVITE = 0xb7,
YAHOO_SERVICE_STEALTH_PERM = 0xb9,
YAHOO_SERVICE_STEALTH_SESSION = 0xba,
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_YAB_UPDATE = 0xc4,
YAHOO_SERVICE_Y6_VISIBLE_TOGGLE = 0xc5, /* YMSG13, key 13: 2 = invisible, 1 = visible */
YAHOO_SERVICE_Y6_STATUS_UPDATE = 0xc6, /* YMSG13 */
YAHOO_SERVICE_PICTURE_STATUS = 0xc7, /* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */
YAHOO_SERVICE_VERIFY_ID_EXISTS = 0xc8,
YAHOO_SERVICE_AUDIBLE = 0xd0,
YAHOO_SERVICE_Y7_PHOTO_SHARING = 0xd2,
YAHOO_SERVICE_Y7_CONTACT_DETAILS = 0xd3,/* YMSG13 */
YAHOO_SERVICE_Y7_CHAT_SESSION = 0xd4,
YAHOO_SERVICE_Y7_AUTHORIZATION = 0xd6, /* YMSG13 */
YAHOO_SERVICE_Y7_FILETRANSFER = 0xdc, /* YMSG13 */
YAHOO_SERVICE_Y7_FILETRANSFERINFO, /* YMSG13 */
YAHOO_SERVICE_Y7_FILETRANSFERACCEPT, /* YMSG13 */
YAHOO_SERVICE_Y7_MINGLE = 0xe1, /* YMSG13 */
YAHOO_SERVICE_Y7_CHANGE_GROUP = 0xe7, /* YMSG13 */
YAHOO_SERVICE_STATUS_15 = 0xf0,
YAHOO_SERVICE_LIST_15 = 0xf1,
YAHOO_SERVICE_WEBLOGIN = 0x0226,
YAHOO_SERVICE_SMS_MSG = 0x02ea
YAHOO_SERVICE_COMMENT = 0xa8,
YAHOO_SERVICE_GAME_INVITE = 0xb7,
YAHOO_SERVICE_STEALTH_PERM = 0xb9,
YAHOO_SERVICE_STEALTH_SESSION = 0xba,
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_YAB_UPDATE = 0xc4,
YAHOO_SERVICE_Y6_VISIBLE_TOGGLE = 0xc5, /* YMSG13, key 13: 2 = invisible, 1 = visible */
YAHOO_SERVICE_Y6_STATUS_UPDATE = 0xc6, /* YMSG13 */
YAHOO_SERVICE_PICTURE_STATUS = 0xc7, /* YMSG13, key 213: 0 = none, 1 = avatar, 2 = picture */
YAHOO_SERVICE_VERIFY_ID_EXISTS = 0xc8,
YAHOO_SERVICE_AUDIBLE = 0xd0,
YAHOO_SERVICE_Y7_PHOTO_SHARING = 0xd2,
YAHOO_SERVICE_Y7_CONTACT_DETAILS = 0xd3, /* YMSG13 */
YAHOO_SERVICE_Y7_CHAT_SESSION = 0xd4,
YAHOO_SERVICE_Y7_AUTHORIZATION = 0xd6, /* YMSG13 */
YAHOO_SERVICE_Y7_FILETRANSFER = 0xdc, /* YMSG13 */
YAHOO_SERVICE_Y7_FILETRANSFERINFO, /* YMSG13 */
YAHOO_SERVICE_Y7_FILETRANSFERACCEPT, /* YMSG13 */
YAHOO_SERVICE_Y7_MINGLE = 0xe1, /* YMSG13 */
YAHOO_SERVICE_Y7_CHANGE_GROUP = 0xe7, /* YMSG13 */
YAHOO_SERVICE_STATUS_15 = 0xf0,
YAHOO_SERVICE_LIST_15 = 0xf1,
YAHOO_SERVICE_WEBLOGIN = 0x0226,
YAHOO_SERVICE_SMS_MSG = 0x02ea
};
/* Message flags */
enum yahoo_status {
YAHOO_STATUS_AVAILABLE = 0,
YAHOO_STATUS_AVAILABLE = 0,
YAHOO_STATUS_BRB,
YAHOO_STATUS_BUSY,
YAHOO_STATUS_NOTATHOME,
@ -185,26 +185,26 @@ enum yahoo_status {
YAHOO_STATUS_ONVACATION,
YAHOO_STATUS_OUTTOLUNCH,
YAHOO_STATUS_STEPPEDOUT,
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,
YAHOO_STATUS_DISCONNECTED = 0xffffffff /* in ymsg 15. doesnt mean the normal sense of 'disconnected' */
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,
YAHOO_STATUS_DISCONNECTED = 0xffffffff /* in ymsg 15. doesnt mean the normal sense of 'disconnected' */
};
enum ypacket_status {
YPACKET_STATUS_DISCONNECTED = -1,
YPACKET_STATUS_DEFAULT = 0,
YPACKET_STATUS_SERVERACK = 1,
YPACKET_STATUS_GAME = 0x2,
YPACKET_STATUS_AWAY = 0x4,
YPACKET_STATUS_CONTINUED = 0x5,
YPACKET_STATUS_INVISIBLE = 12,
YPACKET_STATUS_NOTIFY = 0x16, /* TYPING */
YPACKET_STATUS_WEBLOGIN = 0x5a55aa55,
YPACKET_STATUS_OFFLINE = 0x5a55aa56
YPACKET_STATUS_DEFAULT = 0,
YPACKET_STATUS_SERVERACK = 1,
YPACKET_STATUS_GAME = 0x2,
YPACKET_STATUS_AWAY = 0x4,
YPACKET_STATUS_CONTINUED = 0x5,
YPACKET_STATUS_INVISIBLE = 12,
YPACKET_STATUS_NOTIFY = 0x16, /* TYPING */
YPACKET_STATUS_WEBLOGIN = 0x5a55aa55,
YPACKET_STATUS_OFFLINE = 0x5a55aa56
};
/* The size of the below struct minus 6 bytes of content */
@ -225,104 +225,104 @@ struct yahoo_rawpacket
#endif
static const value_string ymsg_service_vals[] = {
{YAHOO_SERVICE_LOGON, "Pager Logon"},
{YAHOO_SERVICE_LOGOFF, "Pager Logoff"},
{YAHOO_SERVICE_ISAWAY, "Is Away"},
{YAHOO_SERVICE_ISBACK, "Is Back"},
{YAHOO_SERVICE_IDLE, "Idle"},
{YAHOO_SERVICE_MESSAGE, "Message"},
{YAHOO_SERVICE_IDACT, "Activate Identity"},
{YAHOO_SERVICE_IDDEACT, "Deactivate Identity"},
{YAHOO_SERVICE_MAILSTAT, "Mail Status"},
{YAHOO_SERVICE_USERSTAT, "User Status"},
{YAHOO_SERVICE_NEWMAIL, "New Mail"},
{YAHOO_SERVICE_CHATINVITE, "Chat Invitation"},
{YAHOO_SERVICE_CALENDAR, "Calendar Reminder"},
{YAHOO_SERVICE_NEWPERSONALMAIL, "New Personals Mail"},
{YAHOO_SERVICE_NEWCONTACT, "New Friend"},
{YAHOO_SERVICE_ADDIDENT, "Add Identity"},
{YAHOO_SERVICE_ADDIGNORE, "Add Ignore"},
{YAHOO_SERVICE_PING, "Ping"},
{YAHOO_SERVICE_GOTGROUPRENAME, "Got Group Rename"},
{YAHOO_SERVICE_SYSMESSAGE, "System Message"},
{YAHOO_SERVICE_SKINNAME, "Skinname"},
{YAHOO_SERVICE_PASSTHROUGH2, "Passthrough 2"},
{YAHOO_SERVICE_CONFINVITE, "Conference Invitation"},
{YAHOO_SERVICE_CONFLOGON, "Conference Logon"},
{YAHOO_SERVICE_CONFDECLINE, "Conference Decline"},
{YAHOO_SERVICE_CONFLOGOFF, "Conference Logoff"},
{YAHOO_SERVICE_CONFADDINVITE, "Conference Additional Invitation"},
{YAHOO_SERVICE_CONFMSG, "Conference Message"},
{YAHOO_SERVICE_CHATLOGON, "Chat Logon"},
{YAHOO_SERVICE_CHATLOGOFF, "Chat Logoff"},
{YAHOO_SERVICE_CHATMSG, "Chat Message"},
{YAHOO_SERVICE_GAMELOGON, "Game Logon"},
{YAHOO_SERVICE_GAMELOGOFF, "Game Logoff"},
{YAHOO_SERVICE_GAMEMSG, "Game Message"},
{YAHOO_SERVICE_FILETRANSFER, "File Transfer"},
{YAHOO_SERVICE_VOICECHAT, "Voice Chat"},
{YAHOO_SERVICE_NOTIFY, "Notify"},
{YAHOO_SERVICE_VERIFY, "Verify"},
{YAHOO_SERVICE_P2PFILEXFER, "P2P File Transfer"},
{YAHOO_SERVICE_PEERTOPEER, "Peer To Peer"},
{YAHOO_SERVICE_WEBCAM, "WebCam"},
{YAHOO_SERVICE_AUTHRESP, "Authentication Response"},
{YAHOO_SERVICE_LIST, "List"},
{YAHOO_SERVICE_AUTH, "Authentication"},
{YAHOO_SERVICE_AUTHBUDDY, "Authorize Buddy"},
{YAHOO_SERVICE_ADDBUDDY, "Add Buddy"},
{YAHOO_SERVICE_REMBUDDY, "Remove Buddy"},
{YAHOO_SERVICE_IGNORECONTACT, "Ignore Contact"},
{YAHOO_SERVICE_REJECTCONTACT, "Reject Contact"},
{YAHOO_SERVICE_GROUPRENAME, "Group Rename"},
{YAHOO_SERVICE_KEEPALIVE, "Keep Alive"},
{YAHOO_SERVICE_CHATONLINE, "Chat Online"},
{YAHOO_SERVICE_CHATGOTO, "Chat Goto"},
{YAHOO_SERVICE_CHATJOIN, "Chat Join"},
{YAHOO_SERVICE_CHATLEAVE, "Chat Leave"},
{YAHOO_SERVICE_CHATEXIT, "Chat Exit"},
{YAHOO_SERVICE_CHATADDINVITE, "Chat Invite"},
{YAHOO_SERVICE_CHATLOGOUT, "Chat Logout"},
{YAHOO_SERVICE_CHATPING, "Chat Ping"},
{YAHOO_SERVICE_COMMENT, "Comment"},
{YAHOO_SERVICE_GAME_INVITE,"Game Invite"},
{YAHOO_SERVICE_STEALTH_PERM, "Stealth Permanent"},
{YAHOO_SERVICE_STEALTH_SESSION, "Stealth Session"},
{YAHOO_SERVICE_AVATAR,"Avatar"},
{YAHOO_SERVICE_PICTURE_CHECKSUM,"Picture Checksum"},
{YAHOO_SERVICE_PICTURE,"Picture"},
{YAHOO_SERVICE_PICTURE_UPDATE,"Picture Update"},
{YAHOO_SERVICE_PICTURE_UPLOAD,"Picture Upload"},
{YAHOO_SERVICE_YAB_UPDATE,"Yahoo Address Book Update"},
{YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, "Y6 Visibility Toggle"},
{YAHOO_SERVICE_Y6_STATUS_UPDATE, "Y6 Status Update"},
{YAHOO_SERVICE_PICTURE_STATUS, "Picture Sharing Status"},
{YAHOO_SERVICE_VERIFY_ID_EXISTS, "Verify ID Exists"},
{YAHOO_SERVICE_AUDIBLE, "Audible"},
{YAHOO_SERVICE_Y7_CONTACT_DETAILS,"Y7 Contact Details"},
{YAHOO_SERVICE_Y7_CHAT_SESSION, "Y7 Chat Session"},
{YAHOO_SERVICE_Y7_AUTHORIZATION,"Y7 Buddy Authorization"},
{YAHOO_SERVICE_Y7_FILETRANSFER,"Y7 File Transfer"},
{YAHOO_SERVICE_Y7_FILETRANSFERINFO,"Y7 File Transfer Information"},
{YAHOO_SERVICE_Y7_FILETRANSFERACCEPT,"Y7 File Transfer Accept"},
{YAHOO_SERVICE_Y7_CHANGE_GROUP, "Y7 Change Group"},
{YAHOO_SERVICE_STATUS_15, "Status V15"},
{YAHOO_SERVICE_LIST_15, "List V15"},
{YAHOO_SERVICE_WEBLOGIN,"WebLogin"},
{YAHOO_SERVICE_SMS_MSG,"SMS Message"},
{YAHOO_SERVICE_LOGON, "Pager Logon"},
{YAHOO_SERVICE_LOGOFF, "Pager Logoff"},
{YAHOO_SERVICE_ISAWAY, "Is Away"},
{YAHOO_SERVICE_ISBACK, "Is Back"},
{YAHOO_SERVICE_IDLE, "Idle"},
{YAHOO_SERVICE_MESSAGE, "Message"},
{YAHOO_SERVICE_IDACT, "Activate Identity"},
{YAHOO_SERVICE_IDDEACT, "Deactivate Identity"},
{YAHOO_SERVICE_MAILSTAT, "Mail Status"},
{YAHOO_SERVICE_USERSTAT, "User Status"},
{YAHOO_SERVICE_NEWMAIL, "New Mail"},
{YAHOO_SERVICE_CHATINVITE, "Chat Invitation"},
{YAHOO_SERVICE_CALENDAR, "Calendar Reminder"},
{YAHOO_SERVICE_NEWPERSONALMAIL, "New Personals Mail"},
{YAHOO_SERVICE_NEWCONTACT, "New Friend"},
{YAHOO_SERVICE_ADDIDENT, "Add Identity"},
{YAHOO_SERVICE_ADDIGNORE, "Add Ignore"},
{YAHOO_SERVICE_PING, "Ping"},
{YAHOO_SERVICE_GOTGROUPRENAME, "Got Group Rename"},
{YAHOO_SERVICE_SYSMESSAGE, "System Message"},
{YAHOO_SERVICE_SKINNAME, "Skinname"},
{YAHOO_SERVICE_PASSTHROUGH2, "Passthrough 2"},
{YAHOO_SERVICE_CONFINVITE, "Conference Invitation"},
{YAHOO_SERVICE_CONFLOGON, "Conference Logon"},
{YAHOO_SERVICE_CONFDECLINE, "Conference Decline"},
{YAHOO_SERVICE_CONFLOGOFF, "Conference Logoff"},
{YAHOO_SERVICE_CONFADDINVITE, "Conference Additional Invitation"},
{YAHOO_SERVICE_CONFMSG, "Conference Message"},
{YAHOO_SERVICE_CHATLOGON, "Chat Logon"},
{YAHOO_SERVICE_CHATLOGOFF, "Chat Logoff"},
{YAHOO_SERVICE_CHATMSG, "Chat Message"},
{YAHOO_SERVICE_GAMELOGON, "Game Logon"},
{YAHOO_SERVICE_GAMELOGOFF, "Game Logoff"},
{YAHOO_SERVICE_GAMEMSG, "Game Message"},
{YAHOO_SERVICE_FILETRANSFER, "File Transfer"},
{YAHOO_SERVICE_VOICECHAT, "Voice Chat"},
{YAHOO_SERVICE_NOTIFY, "Notify"},
{YAHOO_SERVICE_VERIFY, "Verify"},
{YAHOO_SERVICE_P2PFILEXFER, "P2P File Transfer"},
{YAHOO_SERVICE_PEERTOPEER, "Peer To Peer"},
{YAHOO_SERVICE_WEBCAM, "WebCam"},
{YAHOO_SERVICE_AUTHRESP, "Authentication Response"},
{YAHOO_SERVICE_LIST, "List"},
{YAHOO_SERVICE_AUTH, "Authentication"},
{YAHOO_SERVICE_AUTHBUDDY, "Authorize Buddy"},
{YAHOO_SERVICE_ADDBUDDY, "Add Buddy"},
{YAHOO_SERVICE_REMBUDDY, "Remove Buddy"},
{YAHOO_SERVICE_IGNORECONTACT, "Ignore Contact"},
{YAHOO_SERVICE_REJECTCONTACT, "Reject Contact"},
{YAHOO_SERVICE_GROUPRENAME, "Group Rename"},
{YAHOO_SERVICE_KEEPALIVE, "Keep Alive"},
{YAHOO_SERVICE_CHATONLINE, "Chat Online"},
{YAHOO_SERVICE_CHATGOTO, "Chat Goto"},
{YAHOO_SERVICE_CHATJOIN, "Chat Join"},
{YAHOO_SERVICE_CHATLEAVE, "Chat Leave"},
{YAHOO_SERVICE_CHATEXIT, "Chat Exit"},
{YAHOO_SERVICE_CHATADDINVITE, "Chat Invite"},
{YAHOO_SERVICE_CHATLOGOUT, "Chat Logout"},
{YAHOO_SERVICE_CHATPING, "Chat Ping"},
{YAHOO_SERVICE_COMMENT, "Comment"},
{YAHOO_SERVICE_GAME_INVITE, "Game Invite"},
{YAHOO_SERVICE_STEALTH_PERM, "Stealth Permanent"},
{YAHOO_SERVICE_STEALTH_SESSION, "Stealth Session"},
{YAHOO_SERVICE_AVATAR, "Avatar"},
{YAHOO_SERVICE_PICTURE_CHECKSUM, "Picture Checksum"},
{YAHOO_SERVICE_PICTURE, "Picture"},
{YAHOO_SERVICE_PICTURE_UPDATE, "Picture Update"},
{YAHOO_SERVICE_PICTURE_UPLOAD, "Picture Upload"},
{YAHOO_SERVICE_YAB_UPDATE, "Yahoo Address Book Update"},
{YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, "Y6 Visibility Toggle"},
{YAHOO_SERVICE_Y6_STATUS_UPDATE, "Y6 Status Update"},
{YAHOO_SERVICE_PICTURE_STATUS, "Picture Sharing Status"},
{YAHOO_SERVICE_VERIFY_ID_EXISTS, "Verify ID Exists"},
{YAHOO_SERVICE_AUDIBLE, "Audible"},
{YAHOO_SERVICE_Y7_CONTACT_DETAILS, "Y7 Contact Details"},
{YAHOO_SERVICE_Y7_CHAT_SESSION, "Y7 Chat Session"},
{YAHOO_SERVICE_Y7_AUTHORIZATION, "Y7 Buddy Authorization"},
{YAHOO_SERVICE_Y7_FILETRANSFER, "Y7 File Transfer"},
{YAHOO_SERVICE_Y7_FILETRANSFERINFO, "Y7 File Transfer Information"},
{YAHOO_SERVICE_Y7_FILETRANSFERACCEPT, "Y7 File Transfer Accept"},
{YAHOO_SERVICE_Y7_CHANGE_GROUP, "Y7 Change Group"},
{YAHOO_SERVICE_STATUS_15, "Status V15"},
{YAHOO_SERVICE_LIST_15, "List V15"},
{YAHOO_SERVICE_WEBLOGIN, "WebLogin"},
{YAHOO_SERVICE_SMS_MSG, "SMS Message"},
{0, NULL}
};
static const value_string ymsg_status_vals[] = {
{YPACKET_STATUS_DISCONNECTED,"Disconnected"},
{YPACKET_STATUS_DEFAULT,"Default"},
{YPACKET_STATUS_SERVERACK,"Server Ack"},
{YPACKET_STATUS_GAME,"Playing Game"},
{YPACKET_STATUS_AWAY, "Away"},
{YPACKET_STATUS_CONTINUED,"More Packets??"},
{YPACKET_STATUS_NOTIFY, "Notify"},
{YPACKET_STATUS_WEBLOGIN,"Web Login"},
{YPACKET_STATUS_OFFLINE,"Offline"},
{YPACKET_STATUS_DISCONNECTED, "Disconnected"},
{YPACKET_STATUS_DEFAULT, "Default"},
{YPACKET_STATUS_SERVERACK, "Server Ack"},
{YPACKET_STATUS_GAME, "Playing Game"},
{YPACKET_STATUS_AWAY, "Away"},
{YPACKET_STATUS_CONTINUED, "More Packets??"},
{YPACKET_STATUS_NOTIFY, "Notify"},
{YPACKET_STATUS_WEBLOGIN, "Web Login"},
{YPACKET_STATUS_OFFLINE, "Offline"},
{0, NULL}
};
@ -339,7 +339,7 @@ static int get_content_item_length(tvbuff_t *tvb, int offset)
if (tvb_get_ntohs(tvb, offset) == 0xc080) {
break;
}
offset++;
offset += 1;
}
return offset - origoffset;
}
@ -348,49 +348,50 @@ static int get_content_item_length(tvbuff_t *tvb, int offset)
static gboolean
dissect_ymsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
if (tvb_length(tvb) < 4) {
return FALSE;
}
if (tvb_memeql(tvb, 0, "YMSG", 4) == -1) {
/* Not a Yahoo Messenger packet. */
return FALSE;
}
if (tvb_memeql(tvb, 0, "YMSG", 4) == -1) {
/* Not a Yahoo Messenger packet. */
return FALSE;
}
tcp_dissect_pdus(tvb, pinfo, tree, ymsg_desegment, 8, get_ymsg_pdu_len,
dissect_ymsg_pdu);
return TRUE;
tcp_dissect_pdus(tvb, pinfo, tree, ymsg_desegment, 10, get_ymsg_pdu_len,
dissect_ymsg_pdu);
return TRUE;
}
static guint
get_ymsg_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
{
guint16 plen;
guint plen;
/*
* Get the length of the YMSG packet.
*/
plen = tvb_get_ntohs(tvb, offset + 8);
/*
* Get the length of the YMSG packet.
*/
plen = tvb_get_ntohs(tvb, offset + 8);
/*
* That length doesn't include the length of the header itself; add that in.
*/
return plen + 20;
/*
* That length doesn't include the length of the header itself; add that in.
*/
return plen + YAHOO_HEADER_SIZE;
}
static void
dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *ymsg_tree, *ti;
proto_item *content_item;
proto_tree *content_tree;
char *keybuf;
char *valbuf;
int keylen = 0;
int vallen = 0;
int offset = 0;
int content_len = 0;
proto_tree *ymsg_tree, *ti;
proto_item *content_item;
proto_tree *content_tree;
char *keybuf;
char *valbuf;
int keylen;
int vallen;
int content_len;
int offset = 0;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "YMSG");
offset = 0;
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO,
"%s (status=%s) ",
@ -422,9 +423,9 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Service */
proto_item_append_text(ti, " (%s)",
val_to_str(tvb_get_ntohs(tvb, offset),
ymsg_service_vals,
"Unknown"));
val_to_str_const(tvb_get_ntohs(tvb, offset),
ymsg_service_vals,
"Unknown"));
proto_tree_add_item(ymsg_tree, hf_ymsg_service, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
@ -498,35 +499,35 @@ void
proto_register_ymsg(void)
{
static hf_register_info hf[] = {
{ &hf_ymsg_version, {
{ &hf_ymsg_version, {
"Version", "ymsg.version", FT_UINT16, BASE_DEC,
NULL, 0, "Packet version identifier", HFILL }},
{ &hf_ymsg_vendor, {
{ &hf_ymsg_vendor, {
"Vendor ID", "ymsg.vendor", FT_UINT16, BASE_DEC,
NULL, 0, "Vendor identifier", HFILL }},
{ &hf_ymsg_len, {
{ &hf_ymsg_len, {
"Packet Length", "ymsg.len", FT_UINT16, BASE_DEC,
NULL, 0, NULL, HFILL }},
{ &hf_ymsg_service, {
{ &hf_ymsg_service, {
"Service", "ymsg.service", FT_UINT16, BASE_DEC,
VALS(ymsg_service_vals), 0, "Service Type", HFILL }},
{ &hf_ymsg_status, {
{ &hf_ymsg_status, {
"Status", "ymsg.status", FT_UINT32, BASE_DEC,
VALS(ymsg_status_vals), 0, "Message Type Flags", HFILL }},
{ &hf_ymsg_session_id, {
{ &hf_ymsg_session_id, {
"Session ID", "ymsg.session_id", FT_UINT32, BASE_HEX,
NULL, 0, "Connection ID", HFILL }},
{ &hf_ymsg_content, {
{ &hf_ymsg_content, {
"Content", "ymsg.content", FT_STRING, BASE_NONE,
NULL, 0, "Data portion of the packet", HFILL }},
{ &hf_ymsg_content_line, {
{ &hf_ymsg_content_line, {
"Content-line", "ymsg.content-line", FT_STRING, BASE_NONE,
NULL, 0, "Data portion of the packet", HFILL }},
{ &hf_ymsg_content_line_key, {
{ &hf_ymsg_content_line_key, {
"Key", "ymsg.content-line.key", FT_STRING, BASE_NONE,
NULL, 0, "Content line key", HFILL }},
{ &hf_ymsg_content_line_value, {
{ &hf_ymsg_content_line_value, {
"Value", "ymsg.content-line.value", FT_STRING, BASE_NONE,
NULL, 0, "Content line value", HFILL }}
};
@ -548,7 +549,8 @@ proto_register_ymsg(void)
prefs_register_bool_preference(ymsg_module, "desegment",
"Reassemble YMSG messages spanning multiple TCP segments",
"Whether the YMSG dissector should reassemble messages spanning multiple TCP segments. "
"To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
"To use this option, you must also enable"
" \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
&ymsg_desegment);
}