diff options
| author | Terry Wilson <twilson@digium.com> | 2012-03-13 20:06:57 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-03-13 20:06:57 +0000 |
| commit | 699d2bd705ed98fa6917fe4e966ad9c7394a2076 (patch) | |
| tree | e2c02acf7fbe75ce88088e8b06ee13318db24c64 /channels | |
| parent | 78765216599c759b889f41375e0f91d6907c1997 (diff) | |
Make hints for invalid SIP devices return Unavail, not idle
This patch drastically simplifies the device state aggegation code.
The old method was not only overly complex, but also made it impossible
to return AST_DEVICE_INVALID from the aggregation code. The unit test
update is as a result of fixing that bug.
The SIP change stems from a bug introduced by removing a DNS lookup
for hostname-based SIP channels.
(closes issue ASTERISK-16702)
Review: https://reviewboard.asterisk.org/r/1808/
........
Merged revisions 358943 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358944 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3aa2bf262..3e9fee344 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -27507,8 +27507,6 @@ static int sip_devicestate(const char *data) res = AST_DEVICE_UNAVAILABLE; } sip_unref_peer(p, "sip_unref_peer, from sip_devicestate, release ref from sip_find_peer"); - } else { - res = AST_DEVICE_UNKNOWN; } return res; |