Merged revisions 215955 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r215955 | dvossel | 2009-09-03 11:31:54 -0500 (Thu, 03 Sep 2009) | 6 lines
  
  Merge code associated with AST-2009-006
  
  (closes issue #12912)
  Reported by: rathaus
  Tested by: tilghman, russell, dvossel, dbrooks
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@216003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-09-03 18:40:12 +00:00
parent b439018381
commit a02a8d221d
9 changed files with 1318 additions and 150 deletions

View File

@@ -77,6 +77,8 @@ struct iax_ies {
struct ast_variable *vars;
char *osptokenblock[IAX_MAX_OSPBLOCK_NUM];
unsigned int ospblocklength[IAX_MAX_OSPBLOCK_NUM];
unsigned char calltoken;
unsigned char *calltokendata;
};
#define DIRECTION_INGRESS 1