[asterisk-commits] kpfleming: branch kpfleming/iax2_cleanup r264951 - /team/kpfleming/iax2_clean...

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Fri May 21 09:00:43 2010
New Revision: 264951

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=264951
Log:
more formatting to match IANA registry formats for values

Modified:
    team/kpfleming/iax2_cleanup/channels/iax2.h

Modified: team/kpfleming/iax2_cleanup/channels/iax2.h
URL: http://svnview.digium.com/svn/asterisk/team/kpfleming/iax2_cleanup/channels/iax2.h?view=diff&rev=264951&r1=264950&r2=264951
==============================================================================
--- team/kpfleming/iax2_cleanup/channels/iax2.h (original)
+++ team/kpfleming/iax2_cleanup/channels/iax2.h Fri May 21 09:00:43 2010
@@ -162,14 +162,14 @@
 #define IAX_MAX_OSPTOKEN_SIZE		(IAX_MAX_OSPBLOCK_SIZE * IAX_MAX_OSPBLOCK_NUM)
 #define IAX_MAX_OSPBUFF_SIZE		(IAX_MAX_OSPTOKEN_SIZE + 16)
 
-#define IAX_AUTH_PLAINTEXT			(1 << 0)
-#define IAX_AUTH_MD5				(1 << 1)
-#define IAX_AUTH_RSA				(1 << 2)
-
-#define IAX_ENCRYPT_AES128			(1 << 0)
-#define IAX_ENCRYPT_KEYROTATE			(1 << 15)       /*!< Keyrotation support */
-
-#define IAX_META_TRUNK				1		/*!< Trunk meta-message */
+#define IAX_AUTH_PLAINTEXT			0x0001
+#define IAX_AUTH_MD5				0x0002
+#define IAX_AUTH_RSA				0x0004
+
+#define IAX_ENCRYPT_AES128			0x0001
+#define IAX_ENCRYPT_KEYROTATE			0x8000		/*!< Keyrotation support */
+
+#define IAX_META_TRUNK				0x01		/*!< Trunk meta-message */
 
 #define IAX_META_TRUNK_SUPERMINI		0	/*!< This trunk frame contains classic supermini frames */
 #define IAX_META_TRUNK_MINI			1	/*!< This trunk frame contains trunked mini frames */
@@ -181,11 +181,11 @@
 #define IAX_RATE_44KHZ				(1 << 4) /*!< 44.1khz sampling */
 #define IAX_RATE_48KHZ				(1 << 5) /*!< 48khz sampling */
 
-#define IAX_DPSTATUS_EXISTS			(1 << 0)
-#define IAX_DPSTATUS_CANEXIST		(1 << 1)
-#define IAX_DPSTATUS_NONEXISTENT	(1 << 2)
-#define IAX_DPSTATUS_IGNOREPAT		(1 << 14)
-#define IAX_DPSTATUS_MATCHMORE		(1 << 15)
+#define IAX_DPSTATUS_EXISTS			0x0001
+#define IAX_DPSTATUS_CANEXIST			0x0002
+#define IAX_DPSTATUS_NONEXISTENT		0x0004
+#define IAX_DPSTATUS_IGNOREPAT			0x4000
+#define IAX_DPSTATUS_MATCHMORE			0x8000
 
 /*! Full frames are always delivered reliably */
 struct ast_iax2_full_hdr {