diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-10 00:40:57 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-10 00:40:57 +0000 |
| commit | be94f38009b80e372a3b2bdf5998e40d4b19c5a9 (patch) | |
| tree | e653620c20f6cc81ee92da1a177d905223e42f59 /include/asterisk | |
| parent | 0fbac396a5c9b2ae302f55a3538d1e2eb266b205 (diff) | |
Merged revisions 53810 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r53810 | russell | 2007-02-09 18:35:09 -0600 (Fri, 09 Feb 2007) | 24 lines
Merge team/russell/sla_rewrite
This is a completely new implementation of the SLA functionality introduced in
Asterisk 1.4. It is now functional and ready for testing. However, I will be
adding some additional features over the next week, as well.
For information on how to set this up, see configs/sla.conf.sample
and doc/sla.txt.
In addition to the changes in app_meetme.c for the SLA implementation itself,
this merge brings in various other changes:
chan_sip:
- Add the ability to indicate HOLD state in NOTIFY messages.
- Queue HOLD and UNHOLD control frames even if the channel is not bridged to
another channel.
linkedlists.h:
- Add support for rwlock based linked lists.
dial.c:
- Add the ability to run ast_dial_start() without a reference channel to
inherit information from.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@53817 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/app.h | 3 | ||||
| -rw-r--r-- | include/asterisk/dial.h | 2 | ||||
| -rw-r--r-- | include/asterisk/utils.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/asterisk/app.h b/include/asterisk/app.h index d12b6b6b9..9921344d9 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -308,6 +308,9 @@ struct ast_app_option { unsigned int arg_index; }; +#define BEGIN_OPTIONS { +#define END_OPTIONS } + /*! \brief Declares an array of options for an application. \param holder The name of the array to be created diff --git a/include/asterisk/dial.h b/include/asterisk/dial.h index 71ce6cfc8..92220e8cb 100644 --- a/include/asterisk/dial.h +++ b/include/asterisk/dial.h @@ -42,7 +42,7 @@ enum ast_dial_option { /*! \brief List of return codes for dial run API calls */ enum ast_dial_result { - AST_DIAL_RESULT_INVALID = 0, /*!< Invalid options were passed to run function */ + AST_DIAL_RESULT_INVALID, /*!< Invalid options were passed to run function */ AST_DIAL_RESULT_FAILED, /*!< Attempts to dial failed before reaching critical state */ AST_DIAL_RESULT_TRYING, /*!< Currently trying to dial */ AST_DIAL_RESULT_RINGING, /*!< Dial is presently ringing */ diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 714574b19..fbda15757 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -553,5 +553,8 @@ int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, c */ void ast_enable_packet_fragmentation(int sock); +#define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0])) + #include "asterisk/strings.h" + #endif /* _ASTERISK_UTILS_H */ |