diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2005-08-25 02:25:30 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-08-25 02:25:30 +0000 |
| commit | bf6bc6d4fd293447be123a2ae6fb9e89b7b775be (patch) | |
| tree | 30ba91a1490ba180d290fee1c0a3237f0b5a7fe5 /channels/chan_sip.c | |
| parent | 5c4fa40a8f4d919e35d71be7bb39ec09336cecab (diff) | |
clean up rtcaching config options (issue #4075)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6401 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rwxr-xr-x | channels/chan_sip.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7289c392b..1a047d594 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -494,7 +494,7 @@ struct sip_auth { /* a new page of flags for peer */ #define SIP_PAGE2_RTCACHEFRIENDS (1 << 0) -#define SIP_PAGE2_RTNOUPDATE (1 << 1) +#define SIP_PAGE2_RTUPDATE (1 << 1) #define SIP_PAGE2_RTAUTOCLEAR (1 << 2) #define SIP_PAGE2_RTIGNOREREGEXPIRE (1 << 3) @@ -1552,7 +1552,7 @@ static void sip_destroy_peer(struct sip_peer *peer) /*--- update_peer: Update peer data in database (if used) ---*/ static void update_peer(struct sip_peer *p, int expiry) { - if (!ast_test_flag((&global_flags_page2), SIP_PAGE2_RTNOUPDATE) && + if (ast_test_flag((&global_flags_page2), SIP_PAGE2_RTUPDATE) && (ast_test_flag(p, SIP_REALTIME) || ast_test_flag(&(p->flags_page2), SIP_PAGE2_RTCACHEFRIENDS))) { realtime_update_peer(p->name, &p->addr, p->username, expiry); @@ -7496,7 +7496,7 @@ static int sip_show_settings(int fd, int argc, char *argv[]) ast_cli(fd, " Realtime Peers: %s\n", realtimepeers ? "Yes" : "No"); ast_cli(fd, " Realtime Users: %s\n", realtimeusers ? "Yes" : "No"); ast_cli(fd, " Cache Friends: %s\n", ast_test_flag(&global_flags_page2, SIP_PAGE2_RTCACHEFRIENDS) ? "Yes" : "No"); - ast_cli(fd, " No update: %s\n", ast_test_flag(&global_flags_page2, SIP_PAGE2_RTNOUPDATE) ? "Yes" : "No"); + ast_cli(fd, " Update: %s\n", ast_test_flag(&global_flags_page2, SIP_PAGE2_RTUPDATE) ? "Yes" : "No"); ast_cli(fd, " Ignore Reg. Expire: %s\n", ast_test_flag(&global_flags_page2, SIP_PAGE2_RTIGNOREREGEXPIRE) ? "Yes" : "No"); ast_cli(fd, " Auto Clear: %d\n", global_rtautoclear); } @@ -11177,6 +11177,7 @@ static int reload_config(void) ast_set_flag(&global_flags, SIP_DTMF_RFC2833); ast_set_flag(&global_flags, SIP_NAT_RFC3581); ast_set_flag(&global_flags, SIP_CAN_REINVITE); + ast_set_flag(&global_flags_page2, SIP_PAGE2_RTUPDATE); global_mwitime = DEFAULT_MWITIME; strcpy(global_vmexten, DEFAULT_VMEXTEN); srvlookup = 0; @@ -11205,8 +11206,8 @@ static int reload_config(void) default_useragent); } else if (!strcasecmp(v->name, "rtcachefriends")) { ast_set2_flag((&global_flags_page2), ast_true(v->value), SIP_PAGE2_RTCACHEFRIENDS); - } else if (!strcasecmp(v->name, "rtnoupdate")) { - ast_set2_flag((&global_flags_page2), ast_true(v->value), SIP_PAGE2_RTNOUPDATE); + } else if (!strcasecmp(v->name, "rtupdate")) { + ast_set2_flag((&global_flags_page2), ast_true(v->value), SIP_PAGE2_RTUPDATE); } else if (!strcasecmp(v->name, "rtignoreregexpire")) { ast_set2_flag((&global_flags_page2), ast_true(v->value), SIP_PAGE2_RTIGNOREREGEXPIRE); } else if (!strcasecmp(v->name, "rtautoclear")) { |