From 78089aa1cf220ba78ffd68252a52bf22814dfb8b Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Fri, 7 Mar 2014 04:35:43 +0000 Subject: [PATCH] chan_sip: Allow static realtime members to be qualified during module load. When a static realtime peer with qualify=yes is loaded, Asterisk will fail to send an OPTIONS request due to the lastms being equal to 0. This results in the peer being unable to receive calls from Asterisk because the status is permanently UNKNOWN. This patch allows an OPTIONS request to be sent during module load by ignoring the lastms value on startup only. Review: https://reviewboard.asterisk.org/r/3294/ (closes issue ASTERISK-17523) Reported by: Maciej Krajewski Tested by: wushumasters patches: realtime_fix_11.7.0.txt uploaded by Trevor Peirce (license 6112) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@410105 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2945cd712e..97acd4cce7 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -28706,21 +28706,26 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str peer->socket.port = htons(((peer->socket.type & SIP_TRANSPORT_TLS) ? STANDARD_TLS_PORT : STANDARD_SIP_PORT)); } - if (!sip_cfg.ignore_regexpire && peer->host_dynamic && realtime) { - time_t nowtime = time(NULL); + if (realtime) { + int enablepoke = 1; - if ((nowtime - regseconds) > 0) { - destroy_association(peer); - memset(&peer->addr, 0, sizeof(peer->addr)); - peer->lastms = -1; - ast_debug(1, "Bah, we're expired (%d/%d/%d)!\n", (int)(nowtime - regseconds), (int)regseconds, (int)nowtime); + if (!sip_cfg.ignore_regexpire && peer->host_dynamic) { + time_t nowtime = time(NULL); + + if ((nowtime - regseconds) > 0) { + destroy_association(peer); + memset(&peer->addr, 0, sizeof(peer->addr)); + peer->lastms = -1; + enablepoke = 0; + ast_debug(1, "Bah, we're expired (%d/%d/%d)!\n", (int)(nowtime - regseconds), (int)regseconds, (int)nowtime); + } } - } - /* Startup regular pokes */ - if (!devstate_only && realtime && peer->lastms > 0) { - ref_peer(peer, "schedule qualify"); - sip_poke_peer(peer, 0); + /* Startup regular pokes */ + if (!devstate_only && enablepoke) { + ref_peer(peer, "schedule qualify"); + sip_poke_peer(peer, 0); + } } if (ast_test_flag(&peer->flags[1], SIP_PAGE2_ALLOWSUBSCRIBE)) { -- 2.47.3