diff options
| author | Olle Johansson <oej@edvina.net> | 2009-09-07 11:31:19 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2009-09-07 11:31:19 +0000 |
| commit | 109cab686295d2263c70f770db9e48c47470f4e8 (patch) | |
| tree | 3f2f7e27fe56fa2185bb6a8fe46eee34efb3d76c | |
| parent | 4596fdb788435d8fe3fdf5c70afad718b6f214da (diff) | |
Simplify the code in this function
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@216652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 656cf4ba1..90b8742dd 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -23198,20 +23198,21 @@ int st_get_se(struct sip_pvt *p, int max) } p->stimer->st_cached_max_se = global_max_se; return (p->stimer->st_cached_max_se); - } else { - if (p->stimer->st_cached_min_se) { - return p->stimer->st_cached_min_se; - } else if (p->peername) { - struct sip_peer *pp = find_peer(p->peername, NULL, TRUE, FINDPEERS, FALSE, 0); - if (pp) { - p->stimer->st_cached_min_se = pp->stimer.st_min_se; - unref_peer(pp, "unref peer pointer from find_peer call in st_get_se (2)"); - return (p->stimer->st_cached_min_se); - } + } + /* Find Min SE timer */ + if (p->stimer->st_cached_min_se) { + return p->stimer->st_cached_min_se; + } + if (p->peername) { + struct sip_peer *pp = find_peer(p->peername, NULL, TRUE, FINDPEERS, FALSE, 0); + if (pp) { + p->stimer->st_cached_min_se = pp->stimer.st_min_se; + unref_peer(pp, "unref peer pointer from find_peer call in st_get_se (2)"); + return (p->stimer->st_cached_min_se); } - p->stimer->st_cached_min_se = global_min_se; - return (p->stimer->st_cached_min_se); } + p->stimer->st_cached_min_se = global_min_se; + return (p->stimer->st_cached_min_se); } |