diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-02-11 18:31:59 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-02-11 18:31:59 +0000 |
| commit | 95151cead29f76d6aaa3ebcfa5329fe9bd136a33 (patch) | |
| tree | 5c41daa1c544d5af1e159c2fd22ea4d3cd5e0011 /include | |
| parent | 1f06418500e153887675d187e8dd2e72b7c89f90 (diff) | |
Merged revisions 9581 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r9581 | russell | 2006-02-11 13:15:00 -0500 (Sat, 11 Feb 2006) | 2 lines
now that CDR is a loadable module, don't depend on it elsewhere (issue #6460)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 2 | ||||
| -rw-r--r-- | include/asterisk/manager.h | 8 | ||||
| -rw-r--r-- | include/asterisk/pbx.h | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 94d776e46..545724774 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -481,6 +481,7 @@ struct chanmon; oh.priority = priority; \ oh.cid_num = cid_num; \ oh.cid_name = cid_name; \ + oh.account = account; \ oh.vars = vars; \ oh.parent_channel = NULL; \ } @@ -491,6 +492,7 @@ struct outgoing_helper { int priority; const char *cid_num; const char *cid_name; + const char *account; struct ast_variable *vars; struct ast_channel *parent_channel; }; diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 5d62b300b..523ccfaae 100644 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -56,8 +56,8 @@ #define EVENT_FLAG_USER (1 << 6) /* Ability to read/set user info */ /* Export manager structures */ -#define MAX_HEADERS 80 -#define MAX_LEN 256 +#define AST_MAX_MANHEADERS 80 +#define AST_MAX_MANHEADER_LEN 256 struct eventqent { struct eventqent *next; @@ -88,7 +88,7 @@ struct mansession { /*! Authorization for writing */ int writeperm; /*! Buffer */ - char inbuf[MAX_LEN]; + char inbuf[AST_MAX_MANHEADER_LEN]; int inlen; int send_events; /* Queued events that we've not had the ability to send yet */ @@ -101,7 +101,7 @@ struct mansession { struct message { int hdrcount; - char headers[MAX_HEADERS][MAX_LEN]; + char headers[AST_MAX_MANHEADERS][AST_MAX_MANHEADER_LEN]; }; struct manager_action { diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index 19d928411..e8d6507bb 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -563,11 +563,11 @@ int ast_async_goto_by_name(const char *chan, const char *context, const char *ex /* Synchronously or asynchronously make an outbound call and send it to a particular extension */ -int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout, const char *context, const char *exten, int priority, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, struct ast_channel **locked_channel); +int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout, const char *context, const char *exten, int priority, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, const char *account, struct ast_channel **locked_channel); /* Synchronously or asynchronously make an outbound call and send it to a particular application with given extension */ -int ast_pbx_outgoing_app(const char *type, int format, void *data, int timeout, const char *app, const char *appdata, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, struct ast_channel **locked_channel); +int ast_pbx_outgoing_app(const char *type, int format, void *data, int timeout, const char *app, const char *appdata, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, const char *account, struct ast_channel **locked_channel); /* Functions for returning values from structures */ const char *ast_get_context_name(struct ast_context *con); |