diff options
| author | George Joseph <george.joseph@fairview5.com> | 2014-09-18 15:14:38 +0000 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2014-09-18 15:14:38 +0000 |
| commit | 126334a7aa9a8ba27e5abe02f1a07e526675aab4 (patch) | |
| tree | cd513aa8ff34b42f10f5f532a83699ed84952898 /include/asterisk | |
| parent | b89491e39c130811d21e3c1229112f732837647d (diff) | |
res_pjsip: ami: Fix error in AMI output when an endpoint has no transport
When no transport is associated to an endpoint, the AMI output for
PJSIPShowEndpoint indicates an error instead of silently ignoring the
missing transport.
This patch causes the error to appear only if a transport was specified
on the endpoint and the transport doesn't exist. It also fixes an issue
with counting the objects that were actually found.
ASTERISK-24161 #close
ASTERISK-24331 #close
Tested by: George Joseph
Review: https://reviewboard.asterisk.org/r/3998/
........
Merged revisions 423282 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 423284 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@423285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/res_pjsip.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 45d9325ee..fdb2105cf 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -1727,6 +1727,8 @@ struct ast_sip_ami { const char *action_id; /*! user specified argument data */ void *arg; + /*! count of objects */ + int count; }; /*! |