Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv11884/channels
Modified Files:
chan_iax2.c
Log Message:
make chan_iax2 rtupdate behave the same as chan_sip
Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -d -r1.338 -r1.339
--- chan_iax2.c 1 Sep 2005 22:28:33 -0000 1.338
+++ chan_iax2.c 2 Sep 2005 14:19:36 -0000 1.339
@@ -239,7 +239,7 @@
#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_RTUPDATE (1 << 18) /* 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 */
#define IAX_RTIGNOREREGEXPIRE (1 << 21)
@@ -5517,7 +5517,7 @@
memset(&ied, 0, sizeof(ied));
p = find_peer(name, 1);
if (p) {
- if (!ast_test_flag((&globalflags), IAX_RTNOUPDATE) &&
(ast_test_flag(p, IAX_TEMPONLY|IAX_RTCACHEFRIENDS)))
+ if (ast_test_flag((&globalflags), IAX_RTUPDATE) &&
(ast_test_flag(p, IAX_TEMPONLY|IAX_RTCACHEFRIENDS)))
realtime_update_peer(name, sin);
if (inaddrcmp(&p->addr, sin)) {
if (iax2_regfunk)
@@ -8426,6 +8426,7 @@
/* Reset Global Flags */
memset(&globalflags, 0, sizeof(globalflags));
+ ast_set_flag(&globalflags, IAX_RTUPDATE);
#ifdef SO_NO_CHECK
nochecksums = 0;
@@ -8520,8 +8521,8 @@
ast_set2_flag((&globalflags), ast_true(v->value),
IAX_RTCACHEFRIENDS);
else if (!strcasecmp(v->name, "rtignoreregexpire"))
ast_set2_flag((&globalflags), ast_true(v->value),
IAX_RTIGNOREREGEXPIRE);
- else if (!strcasecmp(v->name, "rtnoupdate"))
- ast_set2_flag((&globalflags), ast_true(v->value),
IAX_RTNOUPDATE);
+ else if (!strcasecmp(v->name, "rtupdate"))
+ ast_set2_flag((&globalflags), ast_true(v->value),
IAX_RTUPDATE);
else if (!strcasecmp(v->name, "trunktimestamps"))
ast_set2_flag(&globalflags, ast_true(v->value),
IAX_TRUNKTIMESTAMPS);
else if (!strcasecmp(v->name, "rtautoclear")) {
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
