diff options
Diffstat (limited to 'epan/dissectors/packet-drda.c')
| -rw-r--r-- | epan/dissectors/packet-drda.c | 397 |
1 files changed, 196 insertions, 201 deletions
diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index 30ffb9820b..21abce0b9d 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -37,7 +37,7 @@ * * Documentation: * DRDA Version 3 Vol. 3: Distributed Relational Database Architecture, -* Open Group. +* Open Group. * Reference for Remote DRDA Requesters and Servers, IBM. */ @@ -334,13 +334,13 @@ static const value_string drda_opcode_vals[] = { { DRDA_CP_MGRLVLLS, "Manager-Level List" }, { DRDA_CP_SUPERVISOR, "Supervisor" }, { DRDA_CP_SECMGR, "Security Manager" }, - { DRDA_CP_EXCSATRD, "Server Attributes Reply Data" }, - { DRDA_CP_CMNAPPC, "LU 6.2 Conversational Communications Manager" }, - { DRDA_CP_DICTIONARY, "Dictionary" }, - { DRDA_CP_MGRLVLN, "Manager-Level Number Attribute" }, - { DRDA_CP_CMNTCPIP, "TCP/IP CommunicationManager" }, - { DRDA_CP_FDODTA, "FD:OCA Data" }, - { DRDA_CP_CMNSYNCPT, + { DRDA_CP_EXCSATRD, "Server Attributes Reply Data" }, + { DRDA_CP_CMNAPPC, "LU 6.2 Conversational Communications Manager" }, + { DRDA_CP_DICTIONARY, "Dictionary" }, + { DRDA_CP_MGRLVLN, "Manager-Level Number Attribute" }, + { DRDA_CP_CMNTCPIP, "TCP/IP CommunicationManager" }, + { DRDA_CP_FDODTA, "FD:OCA Data" }, + { DRDA_CP_CMNSYNCPT, "SNA LU 6.2 Sync Point Conversational Communications Manager" }, { DRDA_CP_ACCSECRD, "Access Security Reply Data" }, { DRDA_CP_SYNCPTMGR, "Sync Point Manager" }, @@ -375,12 +375,12 @@ static const value_string drda_opcode_vals[] = { { DRDA_CP_RDBCOLID, "RDB Collection Identifier" }, { DRDA_CP_PKGID, "RDB Package Identifier" }, { DRDA_CP_PKGCNSTKN, "RDB Package Consistency Token" }, - { DRDA_CP_RTNSETSTT, "Return SET Statement" }, + { DRDA_CP_RTNSETSTT, "Return SET Statement" }, { DRDA_CP_RDBACCCL, "RDB Access Manager Class" }, { DRDA_CP_RDBNAM, "Relational Database Name" }, { DRDA_CP_OUTEXP, "Output Expected" }, { DRDA_CP_PKGNAMCT, "RDB Package Name and Consistency Token" }, - { DRDA_CP_PKGNAMCSN, + { DRDA_CP_PKGNAMCSN, "RDB Package Name, Consistency Token, and Section Number" }, { DRDA_CP_QRYBLKSZ, "Query Block Size" }, { DRDA_CP_UOWDSP, "Unit of Work Disposition" }, @@ -463,186 +463,186 @@ static const value_string drda_opcode_vals[] = { }; static const value_string drda_opcode_abbr[] = { - { DRDA_CP_DATA, "DATA" }, - { DRDA_CP_CODPNT, "CODPNT" }, - { DRDA_CP_FDODSC, "FDODSC" }, - { DRDA_CP_TYPDEFNAM, "TYPDEFNAM" }, - { DRDA_CP_TYPDEFOVR, "TYPDEFOVR" }, - { DRDA_CP_CODPNTDR, "CODPNTDR" }, - { DRDA_CP_EXCSAT, "EXCSAT" }, - { DRDA_CP_SYNCCTL, "SYNCCTL" }, - { DRDA_CP_SYNCRSY, "SYNCRSY" }, - { DRDA_CP_ACCSEC, "ACCSEC" }, - { DRDA_CP_SECCHK, "SECCHK" }, - { DRDA_CP_SYNCLOG, "SYNCLOG" }, - { DRDA_CP_RSCTYP, "RSCTYP" }, - { DRDA_CP_RSNCOD, "RSNCOD" }, - { DRDA_CP_RSCNAM, "RSCNAM" }, - { DRDA_CP_PRDID, "PRDID" }, - { DRDA_CP_PRCCNVCD, "PRCCNVCD" }, - { DRDA_CP_VRSNAM, "VRSNAM" }, - { DRDA_CP_SRVCLSNM, "SRVCLSNM" }, - { DRDA_CP_SVRCOD, "SVRCOD" }, - { DRDA_CP_SYNERRCD, "SYNERRCD" }, - { DRDA_CP_SRVDGN, "SRVDGN" }, - { DRDA_CP_SRVRLSLV, "SRVRLSLV" }, - { DRDA_CP_SPVNAM, "SPVNAM" }, - { DRDA_CP_EXTNAM, "EXTNAM" }, - { DRDA_CP_SRVNAM, "SRVNAM" }, - { DRDA_CP_SECMGRNM, "SECMGRNM" }, - { DRDA_CP_DEPERRCD, "DEPERRCD" }, - { DRDA_CP_CCSIDSBC, "CCSIDSBC" }, - { DRDA_CP_CCSIDDBC, "CCSIDDBC" }, - { DRDA_CP_CCSIDMBC, "CCSIDMBC" }, - { DRDA_CP_USRID, "USRID" }, - { DRDA_CP_PASSWORD, "PASSWORD" }, - { DRDA_CP_SECMEC, "SECMEC" }, - { DRDA_CP_SECCHKCD, "SECCHKCD" }, - { DRDA_CP_SVCERRNO, "SVCERRNO" }, - { DRDA_CP_SECTKN, "SECTKN" }, - { DRDA_CP_NEWPASSWORD, "NEWPASSWORD" }, - { DRDA_CP_MGRLVLRM, "MGRLVLRM" }, - { DRDA_CP_MGRDEPRM, "MGRDEPRM" }, - { DRDA_CP_SECCHKRM, "SECCHKRM" }, - { DRDA_CP_CMDATHRM, "CMDATHRM" }, - { DRDA_CP_AGNPRMRM, "AGNPRMRM" }, - { DRDA_CP_RSCLMTRM, "RSCLMTRM" }, - { DRDA_CP_PRCCNVRM, "PRCCNVRM" }, - { DRDA_CP_CMDCMPRM, "CMDCMPRM" }, - { DRDA_CP_SYNTAXRM, "SYNTAXRM" }, - { DRDA_CP_CMDNSPRM, "CMDNSPRM" }, - { DRDA_CP_PRMNSPRM, "PRMNSPRM" }, - { DRDA_CP_VALNSPRM, "VALNSPRM" }, - { DRDA_CP_OBJNSPRM, "OBJNSPRM" }, - { DRDA_CP_CMDCHKRM, "CMDCHKRM" }, - { DRDA_CP_TRGNSPRM, "TRGNSPRM" }, - { DRDA_CP_AGENT, "AGENT" }, - { DRDA_CP_MGRLVLLS, "MGRLVLLS" }, - { DRDA_CP_SUPERVISOR, "SUPERVISOR" }, - { DRDA_CP_SECMGR, "SECMGR" }, - { DRDA_CP_EXCSATRD, "EXCSATRD" }, - { DRDA_CP_CMNAPPC, "CMNAPPC" }, - { DRDA_CP_DICTIONARY, "DICTIONARY" }, - { DRDA_CP_MGRLVLN, "MGRLVLN" }, - { DRDA_CP_CMNTCPIP, "CMNTCPIP" }, - { DRDA_CP_FDODTA, "FDODTA" }, - { DRDA_CP_CMNSYNCPT, "CMNSYNCPT" }, - { DRDA_CP_ACCSECRD, "ACCSECRD" }, - { DRDA_CP_SYNCPTMGR, "SYNCPTMGR" }, - { DRDA_CP_RSYNCMGR, "RSYNCMGR" }, - { DRDA_CP_CCSIDMGR, "CCSIDMGR" }, - { DRDA_CP_MONITOR, "MONITOR" }, - { DRDA_CP_MONITORRD, "MONITORRD" }, - { DRDA_CP_XAMGR, "XAMGR" }, - { DRDA_CP_ACCRDB, "ACCRDB" }, - { DRDA_CP_BGNBND, "BGNBND" }, - { DRDA_CP_BNDSQLSTT, "BNDSQLSTT" }, - { DRDA_CP_CLSQRY, "CLSQRY" }, - { DRDA_CP_CNTQRY, "CNTQRY" }, - { DRDA_CP_DRPPKG, "DRPPKG" }, - { DRDA_CP_DSCSQLSTT, "DSCSQLSTT" }, - { DRDA_CP_ENDBND, "ENDBND" }, - { DRDA_CP_EXCSQLIMM, "EXCSQLIMM" }, - { DRDA_CP_EXCSQLSTT, "EXCSQLSTT" }, - { DRDA_CP_EXCSQLSET, "EXCSQLSET" }, - { DRDA_CP_OPNQRY, "OPNQRY" }, - { DRDA_CP_PRPSQLSTT, "PRPSQLSTT" }, - { DRDA_CP_RDBCMM, "RDBCMM" }, - { DRDA_CP_RDBRLLBCK, "RDBRLLBCK" }, - { DRDA_CP_REBIND, "REBIND" }, - { DRDA_CP_DSCRDBTBL, "DSCRDBTBL" }, - { DRDA_CP_EXCSQLSET, "EXCSQLSET" }, - { DRDA_CP_DSCERRCD, "DSCERRCD" }, - { DRDA_CP_QRYPRCTYP, "QRYPRCTYP" }, - { DRDA_CP_RDBINTTKN, "RDBINTTKN" }, - { DRDA_CP_PRDDTA, "PRDDTA" }, - { DRDA_CP_RDBCMTOK, "RDBCMTOK" }, - { DRDA_CP_RDBCOLID, "RDBCOLID" }, - { DRDA_CP_PKGID, "PKGID" }, - { DRDA_CP_PKGCNSTKN, "PKGCNSTKN" }, - { DRDA_CP_RTNSETSTT, "RTNSETSTT" }, - { DRDA_CP_RDBACCCL, "RDBACCCL" }, - { DRDA_CP_RDBNAM, "RDBNAM" }, - { DRDA_CP_OUTEXP, "OUTEXP" }, - { DRDA_CP_PKGNAMCT, "PKGNAMCT" }, - { DRDA_CP_PKGNAMCSN, "PKGNAMCSN" }, - { DRDA_CP_QRYBLKSZ, "QRYBLKSZ" }, - { DRDA_CP_UOWDSP, "UOWDSP" }, - { DRDA_CP_RTNSQLDA, "RTNSQLDA" }, - { DRDA_CP_RDBALWUPD, "RDBALWUPD" }, - { DRDA_CP_SQLCSRHLD, "SQLCSRHLD" }, - { DRDA_CP_STTSTRDEL, "STTSTRDEL" }, - { DRDA_CP_STTDECDEL, "STTDECDEL" }, - { DRDA_CP_PKGDFTCST, "PKGDFTCST" }, - { DRDA_CP_QRYBLKCTL, "QRYBLKCTL" }, - { DRDA_CP_CRRTKN, "CRRTKN" }, - { DRDA_CP_PRCNAM, "PRCNAM" }, - { DRDA_CP_PKGSNLST, "PKGSNLST" }, - { DRDA_CP_NBRROW, "NBRROW" }, - { DRDA_CP_TRGDFTRT, "TRGDFTRT" }, - { DRDA_CP_QRYRELSCR, "QRYRELSCR" }, - { DRDA_CP_QRYROWNBR, "QRYROWNBR" }, - { DRDA_CP_QRYRFRTBL, "QRYRFRTBL" }, - { DRDA_CP_MAXRSLCNT, "MAXRSLCNT" }, - { DRDA_CP_MAXBLKEXT, "MAXBLKEXT" }, - { DRDA_CP_RSLSETFLG, "RSLSETFLG" }, - { DRDA_CP_TYPSQLDA, "TYPSQLDA" }, - { DRDA_CP_OUTOVROPT, "OUTOVROPT" }, - { DRDA_CP_RTNEXTDTA, "RTNEXTDTA" }, - { DRDA_CP_QRYATTSCR, "QRYATTSCR" }, - { DRDA_CP_QRYATTUPD, "QRYATTUPD" }, - { DRDA_CP_QRYSCRORN, "QRYSCRORN" }, - { DRDA_CP_QRYROWSNS, "QRYROWSNS" }, - { DRDA_CP_QRYBLKRST, "QRYBLKRST" }, - { DRDA_CP_QRYRTNDTA, "QRYRTNDTA" }, - { DRDA_CP_QRYROWSET, "QRYROWSET" }, - { DRDA_CP_QRYATTSNS, "QRYATTSNS" }, - { DRDA_CP_QRYINSID, "QRYINSID" }, - { DRDA_CP_QRYCLSIMP, "QRYCLSIMP" }, - { DRDA_CP_QRYCLSRLS, "QRYCLSRLS" }, - { DRDA_CP_QRYOPTVAL, "QRYOPTVAL" }, - { DRDA_CP_DIAGLVL, "DIAGLVL" }, - { DRDA_CP_ACCRDBRM, "ACCRDBRM" }, - { DRDA_CP_QRYNOPRM, "QRYNOPRM" }, - { DRDA_CP_RDBNACRM, "RDBNACRM" }, - { DRDA_CP_OPNQRYRM, "OPNQRYRM" }, - { DRDA_CP_PKGBNARM, "PKGBNARM" }, - { DRDA_CP_RDBACCRM, "RDBACCRM" }, - { DRDA_CP_BGNBNDRM, "BGNBNDRM" }, - { DRDA_CP_PKGBPARM, "PKGBPARM" }, - { DRDA_CP_DSCINVRM, "DSCINVRM" }, - { DRDA_CP_ENDQRYRM, "ENDQRYRM" }, - { DRDA_CP_ENDUOWRM, "ENDUOWRM" }, - { DRDA_CP_ABNUOWRM, "ABNUOWRM" }, - { DRDA_CP_DTAMCHRM, "DTAMCHRM" }, - { DRDA_CP_QRYPOPRM, "QRYPOPRM" }, - { DRDA_CP_RDBNFNRM, "RDBNFNRM" }, - { DRDA_CP_OPNQFLRM, "OPNQFLRM" }, - { DRDA_CP_SQLERRRM, "SQLERRRM" }, - { DRDA_CP_RDBUPDRM, "RDBUPDRM" }, - { DRDA_CP_OPNQFLRM, "OPNQFLRM" }, - { DRDA_CP_RSLSETRM, "RSLSETRM" }, - { DRDA_CP_RDBAFLRM, "RDBAFLRM" }, - { DRDA_CP_CMDVLTRM, "CMDVLTRM" }, - { DRDA_CP_CMMRQSRM, "CMMRQSRM" }, - { DRDA_CP_RDBATHRM, "RDBATHRM" }, - { DRDA_CP_SQLAM, "SQLAM" }, - { DRDA_CP_SQLCARD, "SQLCARD" }, - { DRDA_CP_SQLCINRD, "SQLCINRD" }, - { DRDA_CP_SQLRSLRD, "SQLRSLRD" }, - { DRDA_CP_RDB, "RDB" }, - { DRDA_CP_FRCFIXROW, "FRCFIXROW" }, - { DRDA_CP_SQLDARD, "SQLDARD" }, - { DRDA_CP_SQLDTA, "SQLDTA" }, - { DRDA_CP_SQLDTARD, "SQLDTARD" }, - { DRDA_CP_SQLSTT, "SQLSTT" }, - { DRDA_CP_OUTOVR, "OUTOVR" }, - { DRDA_CP_LMTBLKPRC, "LMTBLKPRC" }, - { DRDA_CP_FIXROWPRC, "FIXROWPRC" }, - { DRDA_CP_SQLSTTVRB, "SQLSTTVRB" }, - { DRDA_CP_QRYDSC, "QRYDSC" }, - { DRDA_CP_QRYDTA, "QRYDTA" }, - { DRDA_CP_SQLATTR, "SQLATTR" }, + { DRDA_CP_DATA, "DATA" }, + { DRDA_CP_CODPNT, "CODPNT" }, + { DRDA_CP_FDODSC, "FDODSC" }, + { DRDA_CP_TYPDEFNAM, "TYPDEFNAM" }, + { DRDA_CP_TYPDEFOVR, "TYPDEFOVR" }, + { DRDA_CP_CODPNTDR, "CODPNTDR" }, + { DRDA_CP_EXCSAT, "EXCSAT" }, + { DRDA_CP_SYNCCTL, "SYNCCTL" }, + { DRDA_CP_SYNCRSY, "SYNCRSY" }, + { DRDA_CP_ACCSEC, "ACCSEC" }, + { DRDA_CP_SECCHK, "SECCHK" }, + { DRDA_CP_SYNCLOG, "SYNCLOG" }, + { DRDA_CP_RSCTYP, "RSCTYP" }, + { DRDA_CP_RSNCOD, "RSNCOD" }, + { DRDA_CP_RSCNAM, "RSCNAM" }, + { DRDA_CP_PRDID, "PRDID" }, + { DRDA_CP_PRCCNVCD, "PRCCNVCD" }, + { DRDA_CP_VRSNAM, "VRSNAM" }, + { DRDA_CP_SRVCLSNM, "SRVCLSNM" }, + { DRDA_CP_SVRCOD, "SVRCOD" }, + { DRDA_CP_SYNERRCD, "SYNERRCD" }, + { DRDA_CP_SRVDGN, "SRVDGN" }, + { DRDA_CP_SRVRLSLV, "SRVRLSLV" }, + { DRDA_CP_SPVNAM, "SPVNAM" }, + { DRDA_CP_EXTNAM, "EXTNAM" }, + { DRDA_CP_SRVNAM, "SRVNAM" }, + { DRDA_CP_SECMGRNM, "SECMGRNM" }, + { DRDA_CP_DEPERRCD, "DEPERRCD" }, + { DRDA_CP_CCSIDSBC, "CCSIDSBC" }, + { DRDA_CP_CCSIDDBC, "CCSIDDBC" }, + { DRDA_CP_CCSIDMBC, "CCSIDMBC" }, + { DRDA_CP_USRID, "USRID" }, + { DRDA_CP_PASSWORD, "PASSWORD" }, + { DRDA_CP_SECMEC, "SECMEC" }, + { DRDA_CP_SECCHKCD, "SECCHKCD" }, + { DRDA_CP_SVCERRNO, "SVCERRNO" }, + { DRDA_CP_SECTKN, "SECTKN" }, + { DRDA_CP_NEWPASSWORD, "NEWPASSWORD" }, + { DRDA_CP_MGRLVLRM, "MGRLVLRM" }, + { DRDA_CP_MGRDEPRM, "MGRDEPRM" }, + { DRDA_CP_SECCHKRM, "SECCHKRM" }, + { DRDA_CP_CMDATHRM, "CMDATHRM" }, + { DRDA_CP_AGNPRMRM, "AGNPRMRM" }, + { DRDA_CP_RSCLMTRM, "RSCLMTRM" }, + { DRDA_CP_PRCCNVRM, "PRCCNVRM" }, + { DRDA_CP_CMDCMPRM, "CMDCMPRM" }, + { DRDA_CP_SYNTAXRM, "SYNTAXRM" }, + { DRDA_CP_CMDNSPRM, "CMDNSPRM" }, + { DRDA_CP_PRMNSPRM, "PRMNSPRM" }, + { DRDA_CP_VALNSPRM, "VALNSPRM" }, + { DRDA_CP_OBJNSPRM, "OBJNSPRM" }, + { DRDA_CP_CMDCHKRM, "CMDCHKRM" }, + { DRDA_CP_TRGNSPRM, "TRGNSPRM" }, + { DRDA_CP_AGENT, "AGENT" }, + { DRDA_CP_MGRLVLLS, "MGRLVLLS" }, + { DRDA_CP_SUPERVISOR, "SUPERVISOR" }, + { DRDA_CP_SECMGR, "SECMGR" }, + { DRDA_CP_EXCSATRD, "EXCSATRD" }, + { DRDA_CP_CMNAPPC, "CMNAPPC" }, + { DRDA_CP_DICTIONARY, "DICTIONARY" }, + { DRDA_CP_MGRLVLN, "MGRLVLN" }, + { DRDA_CP_CMNTCPIP, "CMNTCPIP" }, + { DRDA_CP_FDODTA, "FDODTA" }, + { DRDA_CP_CMNSYNCPT, "CMNSYNCPT" }, + { DRDA_CP_ACCSECRD, "ACCSECRD" }, + { DRDA_CP_SYNCPTMGR, "SYNCPTMGR" }, + { DRDA_CP_RSYNCMGR, "RSYNCMGR" }, + { DRDA_CP_CCSIDMGR, "CCSIDMGR" }, + { DRDA_CP_MONITOR, "MONITOR" }, + { DRDA_CP_MONITORRD, "MONITORRD" }, + { DRDA_CP_XAMGR, "XAMGR" }, + { DRDA_CP_ACCRDB, "ACCRDB" }, + { DRDA_CP_BGNBND, "BGNBND" }, + { DRDA_CP_BNDSQLSTT, "BNDSQLSTT" }, + { DRDA_CP_CLSQRY, "CLSQRY" }, + { DRDA_CP_CNTQRY, "CNTQRY" }, + { DRDA_CP_DRPPKG, "DRPPKG" }, + { DRDA_CP_DSCSQLSTT, "DSCSQLSTT" }, + { DRDA_CP_ENDBND, "ENDBND" }, + { DRDA_CP_EXCSQLIMM, "EXCSQLIMM" }, + { DRDA_CP_EXCSQLSTT, "EXCSQLSTT" }, + { DRDA_CP_EXCSQLSET, "EXCSQLSET" }, + { DRDA_CP_OPNQRY, "OPNQRY" }, + { DRDA_CP_PRPSQLSTT, "PRPSQLSTT" }, + { DRDA_CP_RDBCMM, "RDBCMM" }, + { DRDA_CP_RDBRLLBCK, "RDBRLLBCK" }, + { DRDA_CP_REBIND, "REBIND" }, + { DRDA_CP_DSCRDBTBL, "DSCRDBTBL" }, + { DRDA_CP_EXCSQLSET, "EXCSQLSET" }, + { DRDA_CP_DSCERRCD, "DSCERRCD" }, + { DRDA_CP_QRYPRCTYP, "QRYPRCTYP" }, + { DRDA_CP_RDBINTTKN, "RDBINTTKN" }, + { DRDA_CP_PRDDTA, "PRDDTA" }, + { DRDA_CP_RDBCMTOK, "RDBCMTOK" }, + { DRDA_CP_RDBCOLID, "RDBCOLID" }, + { DRDA_CP_PKGID, "PKGID" }, + { DRDA_CP_PKGCNSTKN, "PKGCNSTKN" }, + { DRDA_CP_RTNSETSTT, "RTNSETSTT" }, + { DRDA_CP_RDBACCCL, "RDBACCCL" }, + { DRDA_CP_RDBNAM, "RDBNAM" }, + { DRDA_CP_OUTEXP, "OUTEXP" }, + { DRDA_CP_PKGNAMCT, "PKGNAMCT" }, + { DRDA_CP_PKGNAMCSN, "PKGNAMCSN" }, + { DRDA_CP_QRYBLKSZ, "QRYBLKSZ" }, + { DRDA_CP_UOWDSP, "UOWDSP" }, + { DRDA_CP_RTNSQLDA, "RTNSQLDA" }, + { DRDA_CP_RDBALWUPD, "RDBALWUPD" }, + { DRDA_CP_SQLCSRHLD, "SQLCSRHLD" }, + { DRDA_CP_STTSTRDEL, "STTSTRDEL" }, + { DRDA_CP_STTDECDEL, "STTDECDEL" }, + { DRDA_CP_PKGDFTCST, "PKGDFTCST" }, + { DRDA_CP_QRYBLKCTL, "QRYBLKCTL" }, + { DRDA_CP_CRRTKN, "CRRTKN" }, + { DRDA_CP_PRCNAM, "PRCNAM" }, + { DRDA_CP_PKGSNLST, "PKGSNLST" }, + { DRDA_CP_NBRROW, "NBRROW" }, + { DRDA_CP_TRGDFTRT, "TRGDFTRT" }, + { DRDA_CP_QRYRELSCR, "QRYRELSCR" }, + { DRDA_CP_QRYROWNBR, "QRYROWNBR" }, + { DRDA_CP_QRYRFRTBL, "QRYRFRTBL" }, + { DRDA_CP_MAXRSLCNT, "MAXRSLCNT" }, + { DRDA_CP_MAXBLKEXT, "MAXBLKEXT" }, + { DRDA_CP_RSLSETFLG, "RSLSETFLG" }, + { DRDA_CP_TYPSQLDA, "TYPSQLDA" }, + { DRDA_CP_OUTOVROPT, "OUTOVROPT" }, + { DRDA_CP_RTNEXTDTA, "RTNEXTDTA" }, + { DRDA_CP_QRYATTSCR, "QRYATTSCR" }, + { DRDA_CP_QRYATTUPD, "QRYATTUPD" }, + { DRDA_CP_QRYSCRORN, "QRYSCRORN" }, + { DRDA_CP_QRYROWSNS, "QRYROWSNS" }, + { DRDA_CP_QRYBLKRST, "QRYBLKRST" }, + { DRDA_CP_QRYRTNDTA, "QRYRTNDTA" }, + { DRDA_CP_QRYROWSET, "QRYROWSET" }, + { DRDA_CP_QRYATTSNS, "QRYATTSNS" }, + { DRDA_CP_QRYINSID, "QRYINSID" }, + { DRDA_CP_QRYCLSIMP, "QRYCLSIMP" }, + { DRDA_CP_QRYCLSRLS, "QRYCLSRLS" }, + { DRDA_CP_QRYOPTVAL, "QRYOPTVAL" }, + { DRDA_CP_DIAGLVL, "DIAGLVL" }, + { DRDA_CP_ACCRDBRM, "ACCRDBRM" }, + { DRDA_CP_QRYNOPRM, "QRYNOPRM" }, + { DRDA_CP_RDBNACRM, "RDBNACRM" }, + { DRDA_CP_OPNQRYRM, "OPNQRYRM" }, + { DRDA_CP_PKGBNARM, "PKGBNARM" }, + { DRDA_CP_RDBACCRM, "RDBACCRM" }, + { DRDA_CP_BGNBNDRM, "BGNBNDRM" }, + { DRDA_CP_PKGBPARM, "PKGBPARM" }, + { DRDA_CP_DSCINVRM, "DSCINVRM" }, + { DRDA_CP_ENDQRYRM, "ENDQRYRM" }, + { DRDA_CP_ENDUOWRM, "ENDUOWRM" }, + { DRDA_CP_ABNUOWRM, "ABNUOWRM" }, + { DRDA_CP_DTAMCHRM, "DTAMCHRM" }, + { DRDA_CP_QRYPOPRM, "QRYPOPRM" }, + { DRDA_CP_RDBNFNRM, "RDBNFNRM" }, + { DRDA_CP_OPNQFLRM, "OPNQFLRM" }, + { DRDA_CP_SQLERRRM, "SQLERRRM" }, + { DRDA_CP_RDBUPDRM, "RDBUPDRM" }, + { DRDA_CP_OPNQFLRM, "OPNQFLRM" }, + { DRDA_CP_RSLSETRM, "RSLSETRM" }, + { DRDA_CP_RDBAFLRM, "RDBAFLRM" }, + { DRDA_CP_CMDVLTRM, "CMDVLTRM" }, + { DRDA_CP_CMMRQSRM, "CMMRQSRM" }, + { DRDA_CP_RDBATHRM, "RDBATHRM" }, + { DRDA_CP_SQLAM, "SQLAM" }, + { DRDA_CP_SQLCARD, "SQLCARD" }, + { DRDA_CP_SQLCINRD, "SQLCINRD" }, + { DRDA_CP_SQLRSLRD, "SQLRSLRD" }, + { DRDA_CP_RDB, "RDB" }, + { DRDA_CP_FRCFIXROW, "FRCFIXROW" }, + { DRDA_CP_SQLDARD, "SQLDARD" }, + { DRDA_CP_SQLDTA, "SQLDTA" }, + { DRDA_CP_SQLDTARD, "SQLDTARD" }, + { DRDA_CP_SQLSTT, "SQLSTT" }, + { DRDA_CP_OUTOVR, "OUTOVR" }, + { DRDA_CP_LMTBLKPRC, "LMTBLKPRC" }, + { DRDA_CP_FIXROWPRC, "FIXROWPRC" }, + { DRDA_CP_SQLSTTVRB, "SQLSTTVRB" }, + { DRDA_CP_QRYDSC, "QRYDSC" }, + { DRDA_CP_QRYDTA, "QRYDTA" }, + { DRDA_CP_SQLATTR, "SQLATTR" }, { 0, NULL } }; @@ -690,7 +690,7 @@ dissect_drda(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) iCommand = tvb_get_ntohs(tvb, offset + 8); iLength = tvb_get_ntohs(tvb, offset + 0); - if (check_col(pinfo->cinfo, COL_INFO)) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_str(pinfo->cinfo, COL_INFO, val_to_str(iCommand, drda_opcode_abbr, "Unknown (0x%02x)")); } @@ -717,7 +717,7 @@ dissect_drda(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(drda_tree, hf_drda_ddm_format, tvb, offset + 3, 1, FALSE); drda_tree_sub = proto_item_add_subtree(ti, ett_drda_ddm_format); - proto_tree_add_boolean(drda_tree_sub, hf_drda_ddm_fmt_reserved, tvb, offset + 3, 1, iDSSFlags); + proto_tree_add_boolean(drda_tree_sub, hf_drda_ddm_fmt_reserved, tvb, offset + 3, 1, iDSSFlags); proto_tree_add_boolean(drda_tree_sub, hf_drda_ddm_fmt_chained, tvb, offset + 3, 1, iDSSFlags); proto_tree_add_boolean(drda_tree_sub, hf_drda_ddm_fmt_errcont, tvb, offset + 3, 1, iDSSFlags); proto_tree_add_boolean(drda_tree_sub, hf_drda_ddm_fmt_samecorr, tvb, offset + 3, 1, iDSSFlags); @@ -755,7 +755,7 @@ dissect_drda(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(drdaroot_tree, hf_drda_sqlstatement, next_tvb, 0, iLengthParam - 5, FALSE); proto_tree_add_item(drdaroot_tree, hf_drda_sqlstatement_ebcdic, next_tvb, 0, iLengthParam - 4, FALSE); } - } + } offset += iLengthParam; } else @@ -797,12 +797,7 @@ dissect_drda_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((tvb_get_guint8(tvb, 2) == DRDA_MAGIC) && ((cOuterLength - cInnerLength) == 6)) { /* Register this dissector for this conversation */ - conversation = NULL; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - if (conversation == NULL) - { - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); - } + conversation = find_or_create_conversation(pinfo); conversation_set_dissector(conversation, drda_tcp_handle); /* Dissect the packet */ @@ -871,7 +866,7 @@ proto_register_drda(void) }; static gint *ett[] = { &ett_drda, - &ett_drda_ddm, + &ett_drda_ddm, &ett_drda_ddm_format, &ett_drda_param }; @@ -881,7 +876,7 @@ proto_register_drda(void) proto_drda = proto_register_protocol("DRDA", "DRDA", "drda"); proto_register_field_array(proto_drda, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - + drda_module = prefs_register_protocol(proto_drda, NULL); prefs_register_bool_preference(drda_module, "desegment", "Reassemble DRDA messages spanning multiple TCP segments", |