diff options
| author | Henri Herscher <henri@oreka.org> | 2007-07-03 16:42:00 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2007-07-03 16:42:00 +0000 |
| commit | ed63e37f8466f27a990f7310bbcf1faf86697e9a (patch) | |
| tree | f41023ee2eb219ed5eeaa836515da8dd7a1c594c /orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h | |
| parent | 1b42814d7ab545334fa97982b1b3023731a0cd64 (diff) | |
Fixed rare but potential crashes by making sure orkaudio cannot read memory beyond the end of any captured packet data.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@452 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h')
| -rw-r--r-- | orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h index c01303a..f054c43 100644 --- a/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h +++ b/orkaudio/audiocaptureplugins/voip/PacketHeaderDefs.h @@ -111,7 +111,7 @@ typedef struct // and some more fields } SkStartMediaTransmissionStruct; -bool SkinnyValidateStartMediaTransmission(SkStartMediaTransmissionStruct *); +bool SkinnyValidateStartMediaTransmission(SkStartMediaTransmissionStruct *, u_char* packetEnd); typedef struct @@ -121,6 +121,7 @@ typedef struct unsigned long passThruPartyId; } SkStopMediaTransmissionStruct; +bool SkinnyValidateStopMediaTransmission(SkStopMediaTransmissionStruct*, u_char* packetEnd); typedef struct { @@ -145,7 +146,7 @@ typedef struct unsigned long callType; } SkCallInfoStruct; -bool SkinnyValidateCallInfo(SkCallInfoStruct *); +bool SkinnyValidateCallInfo(SkCallInfoStruct *, u_char* packetEnd); #define SKINNY_CCM5_PARTIES_BLOCK_SIZE 76 @@ -159,7 +160,7 @@ typedef struct char parties[SKINNY_CCM5_PARTIES_BLOCK_SIZE]; } SkCcm5CallInfoStruct; -bool SkinnyValidateCcm5CallInfo(SkCcm5CallInfoStruct *); +bool SkinnyValidateCcm5CallInfo(SkCcm5CallInfoStruct *, u_char* packetEnd); #define SKINNY_LINE_DIR_NUMBER_SIZE 24 #define SKINNY_DISPLAY_NAME_SIZE 40 @@ -171,7 +172,7 @@ typedef struct char displayName[SKINNY_DISPLAY_NAME_SIZE]; } SkLineStatStruct; -bool SkinnyValidateLineStat(SkLineStatStruct*); +bool SkinnyValidateLineStat(SkLineStatStruct*, u_char* packetEnd); // Endpoint -> Cisco Callmanager messages typedef struct @@ -183,7 +184,7 @@ typedef struct unsigned long passThruPartyId; } SkOpenReceiveChannelAckStruct; -bool SkinnyValidateOpenReceiveChannelAck(SkOpenReceiveChannelAckStruct *); +bool SkinnyValidateOpenReceiveChannelAck(SkOpenReceiveChannelAckStruct *, u_char* packetEnd); typedef struct { @@ -193,7 +194,7 @@ typedef struct unsigned long callIdentifier; } SkSoftKeyEventMessageStruct; -bool SkinnyValidateSoftKeyEvent(SkSoftKeyEventMessageStruct *); +bool SkinnyValidateSoftKeyEvent(SkSoftKeyEventMessageStruct *, u_char* packetEnd); #define SKINNY_CTRL_PORT 2000 #define SKINNY_MIN_MESSAGE_SIZE 12 @@ -331,5 +332,15 @@ struct Iax2MetaTrunkEntryTs { struct Iax2MiniHeader mini; }; +//============================================== +// SIP + +#define SIP_METHOD_INVITE_SIZE 6 +#define SIP_METHOD_BYE_SIZE 3 +#define SIP_METHOD_INVITE "INVITE" +#define SIP_METHOD_BYE "BYE" + #endif + + |