[Asterisk-cvs] asterisk/channels chan_iax2.c,1.257,1.258
markster at lists.digium.com
markster at lists.digium.com
Wed Mar 23 00:02:01 CST 2005
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv20228/channels
Modified Files:
chan_iax2.c
Log Message:
Merge Russell's formatting patch (bug #3838)
Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- chan_iax2.c 18 Mar 2005 00:32:49 -0000 1.257
+++ chan_iax2.c 23 Mar 2005 05:56:31 -0000 1.258
@@ -212,14 +212,14 @@
#define IAX_ALREADYGONE (1 << 9) /* Already disconnected */
#define IAX_PROVISION (1 << 10) /* This is a provisioning request */
#define IAX_QUELCH (1 << 11) /* Whether or not we quelch audio */
-#define IAX_ENCRYPTED (1 << 12) /* Whether we should assume encrypted tx/rx */
-#define IAX_KEYPOPULATED (1 << 13) /* Whether we have a key populated */
-#define IAX_CODEC_USER_FIRST (1 << 14) /* are we willing to let the other guy choose the codec? */
-#define IAX_CODEC_NOPREFS (1 << 15) /* Force old behaviour by turning off prefs */
-#define IAX_CODEC_NOCAP (1 << 16) /* only consider requested format and ignore capabilities*/
-#define IAX_RTCACHEFRIENDS (1 << 17) /* let realtime stay till your reload */
-#define IAX_RTNOUPDATE (1 << 18) /* Don't send a realtime update */
-#define IAX_RTAUTOCLEAR (1 << 19) /* erase me on expire */
+#define IAX_ENCRYPTED (1 << 12) /* Whether we should assume encrypted tx/rx */
+#define IAX_KEYPOPULATED (1 << 13) /* Whether we have a key populated */
+#define IAX_CODEC_USER_FIRST (1 << 14) /* are we willing to let the other guy choose the codec? */
+#define IAX_CODEC_NOPREFS (1 << 15) /* Force old behaviour by turning off prefs */
+#define IAX_CODEC_NOCAP (1 << 16) /* only consider requested format and ignore capabilities*/
+#define IAX_RTCACHEFRIENDS (1 << 17) /* let realtime stay till your reload */
+#define IAX_RTNOUPDATE (1 << 18) /* Don't send a realtime update */
+#define IAX_RTAUTOCLEAR (1 << 19) /* erase me on expire */
#define IAX_FORCEJITTERBUF (1 << 20) /* Force jitterbuffer, even when bridged to a channel that can take jitter */
static int global_rtautoclear = 120;
@@ -261,7 +261,7 @@
struct ast_codec_pref prefs;
struct sockaddr_in addr;
int formats;
- int sockfd; /* Socket to use for transmission */
+ int sockfd; /* Socket to use for transmission */
struct in_addr mask;
unsigned int flags;
More information about the svn-commits
mailing list